diff --git a/.backportrc.json b/.backportrc.json
index a62729789a26c..58dfbf669671f 100644
--- a/.backportrc.json
+++ b/.backportrc.json
@@ -3,6 +3,7 @@
   "repoName": "kibana",
   "targetBranchChoices": [
     "main",
+    "8.15",
     "8.14",
     "8.13",
     "8.12",
@@ -51,7 +52,7 @@
     "backport"
   ],
   "branchLabelMapping": {
-    "^v8.15.0$": "main",
+    "^v8.16.0$": "main",
     "^v(\\d+).(\\d+).\\d+$": "$1.$2"
   },
   "autoMerge": true,
diff --git a/.buildkite/ftr_configs.yml b/.buildkite/ftr_configs.yml
index 730b3aa460f4b..0a0d9d44d80ea 100644
--- a/.buildkite/ftr_configs.yml
+++ b/.buildkite/ftr_configs.yml
@@ -13,10 +13,8 @@ disabled:
   - x-pack/test/security_solution_api_integration/config/ess/config.base.basic.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.ts
   - x-pack/test/security_solution_api_integration/config/serverless/config.base.essentials.ts
-  - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/config.base.ts
   - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.base.ts
-  - x-pack/test/security_solution_endpoint/config.base.ts
-  - x-pack/test/security_solution_endpoint_api_int/config.base.ts
+  - x-pack/test/security_solution_endpoint/configs/config.base.ts
 
   # QA suites that are run out-of-band
   - x-pack/test/stack_functional_integration/configs/config.stack_functional_integration_base.js
@@ -91,6 +89,10 @@ disabled:
   - x-pack/test_serverless/api_integration/test_suites/security/config.feature_flags.ts
   - x-pack/test_serverless/functional/test_suites/security/config.feature_flags.ts
 
+  # http/2 security muted tests
+  - x-pack/test/security_functional/saml.http2.config.ts
+  - x-pack/test/security_functional/oidc.http2.config.ts
+
 defaultQueue: 'n2-4-spot'
 enabled:
   - test/accessibility/config.ts
@@ -401,11 +403,13 @@ enabled:
   - x-pack/test/security_functional/login_selector.config.ts
   - x-pack/test/security_functional/oidc.config.ts
   - x-pack/test/security_functional/saml.config.ts
-  - x-pack/test/security_functional/saml.http2.config.ts
-  - x-pack/test/security_functional/oidc.http2.config.ts
   - x-pack/test/security_functional/insecure_cluster_warning.config.ts
   - x-pack/test/security_functional/user_profiles.config.ts
   - x-pack/test/security_functional/expired_session.config.ts
+  - x-pack/test/security_solution_endpoint/configs/endpoint.config.ts
+  - x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
+  - x-pack/test/security_solution_endpoint/configs/integrations.config.ts
+  - x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
   - x-pack/test/session_view/basic/config.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/config_basic.ts
   - x-pack/test/spaces_api_integration/security_and_spaces/copy_to_space_config_basic.ts
@@ -578,7 +582,3 @@ enabled:
   - x-pack/test/security_solution_api_integration/test_suites/sources/indices/trial_license_complete_tier/configs/serverless.config.ts
   - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.ts
   - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/serverless.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/endpoint.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.endpoint.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/integrations.config.ts
-  - x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.integrations.config.ts
diff --git a/.buildkite/pipeline-resource-definitions/README.md b/.buildkite/pipeline-resource-definitions/README.md
new file mode 100644
index 0000000000000..07a3e54fd93bd
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/README.md
@@ -0,0 +1,28 @@
+# Buildkite pipeline resource definitions
+
+## Overview
+The pipeline resources are "RRE" (real resource entities) that are used to create/maintain buildkite pipelines.
+
+The resources described in these files are parsed and loaded to Backstage (https://backstage.elastic.dev).
+From there, [Terrazzo](https://buildkite.com/elastic/terrazzo/) is generating and updating the buildkite pipelines.
+
+These pipelines are referenced indirectly through the root's [`catalog-info.yaml`](../../catalog-info.yaml) file in order to reduce bloat in the main resources file.
+There's a location file that collects files defined in this folder ([locations.yml](locations.yml)), this file needs to be updated in order to keep track of local files.
+
+Available parameters and further help can be found here: https://docs.elastic.dev/ci/getting-started-with-buildkite-at-elastic
+
+## Creating a new pipeline resource definition
+The easiest way to create a new pipeline is either by copying and editing a similar pipeline, 
+or by copying a blank template (see [_new_pipeline.yml](_templates/_new_pipeline.yml)) and editing that.
+
+You can validate your pipeline's structural integrity, and it's conformity to baseline rules by running the following command:
+```bash
+.buildkite/pipeline-resource-definitions/scripts/validate-pipeline-definition.sh <path_to_your_pipeline_file>
+```
+
+Once you've added the file, you should update the [locations.yml](locations.yml) file to include the new pipeline, or run the following command to update it:
+```bash
+.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts
+```
+
+Add your pipeline implementation, commit & push & merge. The pipeline resource will appear in Backstage within minutes, then the pipeline will be added to Buildkite within ~10 minutes.
\ No newline at end of file
diff --git a/.buildkite/pipeline-resource-definitions/_template/template.yml b/.buildkite/pipeline-resource-definitions/_templates/_new_pipeline.yml
similarity index 100%
rename from .buildkite/pipeline-resource-definitions/_template/template.yml
rename to .buildkite/pipeline-resource-definitions/_templates/_new_pipeline.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml b/.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml
index 3c28f5de81662..e1c40f690f4ec 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-artifacts-snapshot.yml
@@ -22,7 +22,6 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
       allow_rebuilds: true
-      branch_configuration: main 8.14 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts.yml
@@ -44,16 +43,3 @@ spec:
           access_level: MANAGE_BUILD_AND_READ
         kibana-tech-leads:
           access_level: MANAGE_BUILD_AND_READ
-      schedules:
-        Daily build (main):
-          cronline: 0 7 * * * America/New_York
-          message: Daily build
-          branch: main
-        Daily build (8.14):
-          cronline: 0 7 * * * America/New_York
-          message: Daily build
-          branch: '8.14'
-        Daily build (7.17):
-          cronline: 0 7 * * * America/New_York
-          message: Daily build
-          branch: '7.17'
diff --git a/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml b/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
index def68475815a7..71bcc4079c50d 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
@@ -23,7 +23,6 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
       allow_rebuilds: true
-      branch_configuration: 7.17 8.14
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts.yml
       skip_intermediate_builds: false
@@ -44,12 +43,3 @@ spec:
           access_level: MANAGE_BUILD_AND_READ
         kibana-tech-leads:
           access_level: MANAGE_BUILD_AND_READ
-      schedules:
-        Daily build (8.14):
-          cronline: 0 7 * * * America/New_York
-          message: Daily build
-          branch: '8.14'
-        Daily build (7.17):
-          cronline: 0 7 * * * America/New_York
-          message: Daily build
-          branch: '7.17'
diff --git a/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml b/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
index c51728226f9b4..8a9585762de83 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
@@ -23,7 +23,6 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
       allow_rebuilds: true
-      branch_configuration: '8.14'
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/artifacts_trigger.yml
@@ -45,8 +44,3 @@ spec:
           access_level: MANAGE_BUILD_AND_READ
         kibana-tech-leads:
           access_level: MANAGE_BUILD_AND_READ
-      schedules:
-        Daily build (8.14):
-          cronline: 0 */2 * * * America/New_York
-          message: Daily build
-          branch: '8.14'
diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml b/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
new file mode 100644
index 0000000000000..dea4426e60e1b
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
@@ -0,0 +1,41 @@
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: bk-kibana-es-forward-compatibility-testing
+  description: Forward compatibility testing between Kibana 7.17 and ES 8+
+  links:
+    - url: 'https://buildkite.com/elastic/kibana-es-forward-compatibility-testing'
+      title: Pipeline link
+spec:
+  type: buildkite-pipeline
+  system: buildkite
+  owner: 'group:kibana-operations'
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: kibana / ES Forward Compatibility Testing
+      description: Forward compatibility testing between Kibana 7.17 and ES 8+
+    spec:
+      env:
+        SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+      allow_rebuilds: false
+      branch_configuration: main
+      default_branch: main
+      repository: elastic/kibana
+      pipeline_file: .buildkite/pipelines/es_forward.yml # Note: this file exists in 7.17 only
+      skip_intermediate_builds: false
+      provider_settings:
+        prefix_pull_request_fork_branch_names: false
+        trigger_mode: none
+      teams:
+        kibana-operations:
+          access_level: MANAGE_BUILD_AND_READ
+        appex-qa:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-tech-leads:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: BUILD_AND_READ
diff --git a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
index a012322971248..357f983339fd7 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.14 7.17
+      branch_configuration: main 8.15 8.14 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/build.yml
@@ -49,6 +49,10 @@ spec:
           cronline: 0 9 * * * America/New_York
           message: Daily build
           branch: main
+        Daily build (8.15):
+          cronline: 0 9 * * * America/New_York
+          message: Daily build
+          branch: '8.15'
         Daily build (8.14):
           cronline: 0 9 * * * America/New_York
           message: Daily build
@@ -82,7 +86,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.14 7.17
+      branch_configuration: main 8.15 8.14 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/promote.yml
@@ -130,7 +134,7 @@ spec:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.14 7.17
+      branch_configuration: main 8.15 8.14 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/es_snapshots/verify.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
index 9171e5ba2008d..d75ceba304d22 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-on-merge-unsupported-ftrs.yml
@@ -22,7 +22,7 @@ spec:
         SLACK_NOTIFICATIONS_CHANNEL: '#kibana-unsupported-ftrs-alerts'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 8.14 7.17
+      branch_configuration: main 8.15 8.14 7.17
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge_unsupported_ftrs.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml b/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
index 3240cf5e01777..98d9f1d143e43 100644
--- a/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
+++ b/.buildkite/pipeline-resource-definitions/kibana-on-merge.yml
@@ -25,7 +25,7 @@ spec:
         REPORT_FAILED_TESTS_TO_GITHUB: 'true'
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
       allow_rebuilds: true
-      branch_configuration: main 7.17 8.14
+      branch_configuration: main 7.17 8.14 8.15
       default_branch: main
       repository: elastic/kibana
       pipeline_file: .buildkite/pipelines/on_merge.yml
diff --git a/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml b/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
new file mode 100644
index 0000000000000..5911095262ac1
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
@@ -0,0 +1,30 @@
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: buildkite-pipeline-kibana-emergency-release
+  description: Emergency release
+  links:
+    - title: Pipeline
+      url: https://buildkite.com/elastic/kibana-emergency-release
+spec:
+  type: buildkite-pipeline
+  owner: group:kibana-operations
+  system: buildkite
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: kibana / emergency release
+    spec:
+      repository: elastic/kibana
+      provider_settings:
+        trigger_mode: none
+      pipeline_file: ".buildkite/pipelines/emergency_release.yml"
+      teams:
+        kibana-operations:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-release-operators:
+          access_level: BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
diff --git a/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml b/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml
new file mode 100644
index 0000000000000..1f57f2ca83250
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml
@@ -0,0 +1,33 @@
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: kibana-tests-pipeline
+  description: Definition of the kibana pipeline
+  links:
+    - title: Pipeline
+      url: https://buildkite.com/elastic/kibana-tests
+spec:
+  type: buildkite-pipeline
+  owner: group:kibana-tech-leads
+  system: buildkite
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: kibana-tests
+      description: Pipeline that tests the service integration in various environments
+    spec:
+      repository: elastic/kibana
+      pipeline_file: ./.buildkite/pipelines/quality-gates/pipeline.kibana-tests.yaml
+      provider_settings:
+        trigger_mode: none
+      teams:
+        kibana-operations:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-release-operators:
+          access_level: BUILD_AND_READ
+        cloud-tooling:
+          access_level: BUILD_AND_READ
+        everyone:
+          access_level: READ_ONLY
diff --git a/.buildkite/pipeline-resource-definitions/locations.yml b/.buildkite/pipeline-resource-definitions/locations.yml
index ccbc41c60ece1..35115b00e273b 100644
--- a/.buildkite/pipeline-resource-definitions/locations.yml
+++ b/.buildkite/pipeline-resource-definitions/locations.yml
@@ -14,6 +14,7 @@ spec:
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-staging.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-artifacts-trigger.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-coverage-daily.yml
+    - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-forward-testing.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-serverless-snapshots.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-es-snapshots.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-esql-grammar-sync.yml
@@ -27,6 +28,8 @@ spec:
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-performance-data-set-extraction-daily.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-pr.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-purge-cloud-deployments.yml
+    - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-emergency-release.yml
+    - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-quality-gates-emergency.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-release-testing.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/kibana-serverless-release.yml
@@ -39,3 +42,4 @@ spec:
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-gen-ai.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-investigations.yml
     - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/security-solution-quality-gate/kibana-serverless-security-solution-quality-gate-rule-management.yml
+    - https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
diff --git a/.buildkite/pipeline-resource-definitions/fix-location-collection.ts b/.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts
similarity index 83%
rename from .buildkite/pipeline-resource-definitions/fix-location-collection.ts
rename to .buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts
index d4e36f2559a89..1173cddeb15aa 100755
--- a/.buildkite/pipeline-resource-definitions/fix-location-collection.ts
+++ b/.buildkite/pipeline-resource-definitions/scripts/fix-location-collection.ts
@@ -11,7 +11,7 @@ import jsYaml from 'js-yaml';
 import path from 'path';
 import { execSync } from 'child_process';
 
-const EXCLUDE_LIST = ['locations.yml', '_template/template.yml'];
+const EXCLUDE_LIST = ['locations.yml', '_templates'];
 const REPO_FILES_BASE = 'https://github.com/elastic/kibana/blob/main';
 
 type BackstageLocationResource = object & {
@@ -20,19 +20,19 @@ type BackstageLocationResource = object & {
 
 async function main() {
   const repoRoot = execSync('git rev-parse --show-toplevel').toString().trim();
-  const resourceDefinitionsFolder = path.resolve(
+  const resourceDefinitionsRoot = path.resolve(
     repoRoot,
     '.buildkite',
     'pipeline-resource-definitions'
   );
   const resourceDefinitionsBaseUrl = `${REPO_FILES_BASE}/.buildkite/pipeline-resource-definitions`;
-  const locationFile = path.resolve(resourceDefinitionsFolder, 'locations.yml');
+  const locationFile = path.resolve(resourceDefinitionsRoot, 'locations.yml');
   const locationFileLines = fs.readFileSync(locationFile, 'utf8').split('\n');
 
-  const pipelines = readDirRecursively(resourceDefinitionsFolder)
+  const pipelines = readDirRecursively(resourceDefinitionsRoot)
     .filter((file) => file.endsWith('.yml'))
-    .map((file) => file.replace(`${resourceDefinitionsFolder}/`, ''))
-    .filter((f) => !EXCLUDE_LIST.includes(f));
+    .map((file) => file.replace(`${resourceDefinitionsRoot}/`, ''))
+    .filter((f) => EXCLUDE_LIST.every((excludeExpr) => !f.match(excludeExpr)));
 
   const preamble = locationFileLines.slice(0, 1);
 
diff --git a/.buildkite/pipeline-resource-definitions/scripts/validate-pipeline-definition.sh b/.buildkite/pipeline-resource-definitions/scripts/validate-pipeline-definition.sh
new file mode 100755
index 0000000000000..cd153b23f10ab
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/scripts/validate-pipeline-definition.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+# This script is used to validate a single RRE for a pipeline definition.
+
+TARGET_FILE=$1
+
+if [ -z "$TARGET_FILE" ]; then
+  echo "Usage: $0 <path_to_your_pipeline_file>"
+  exit 1
+fi
+
+echo "Validating $TARGET_FILE..."
+ABSOLUTE_PATH=$(realpath "$TARGET_FILE")
+FILE_NAME=$(basename "$ABSOLUTE_PATH")
+FOLDER_NAME=$(dirname "$ABSOLUTE_PATH")
+
+docker run -it \
+ --mount type=bind,source="$FOLDER_NAME",target=/home/app/ \
+  docker.elastic.co/ci-agent-images/pipelib \
+  rre validate --backstage-entity-aware "/home/app/$FILE_NAME"
+
+if [ $? -ne 0 ]; then
+  echo "$FILE_NAME invalid ❌"
+  exit 1
+else
+  echo "$FILE_NAME valid ✅"
+  exit 0
+fi
diff --git a/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml b/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
new file mode 100644
index 0000000000000..ea474356b137d
--- /dev/null
+++ b/.buildkite/pipeline-resource-definitions/trigger-version-dependent-jobs.yml
@@ -0,0 +1,71 @@
+###
+# For more information on authoring pipeline definitions,
+# follow the guides at https://docs.elastic.dev/ci/getting-started-with-buildkite-at-elastic
+###
+# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
+apiVersion: backstage.io/v1alpha1
+kind: Resource
+metadata:
+  name: bk-kibana-trigger-version-dependent-jobs
+  description: 'Trigger version-dependent jobs'
+  links:
+    - url: 'https://buildkite.com/elastic/kibana-trigger-version-dependent-jobs'
+      title: Pipeline link
+spec:
+  type: buildkite-pipeline
+  system: buildkite
+  owner: 'group:kibana-operations'
+  implementation:
+    apiVersion: buildkite.elastic.dev/v1
+    kind: Pipeline
+    metadata:
+      name: kibana / trigger version-dependent jobs
+      description: 'Trigger version-dependent jobs'
+    spec:
+      env:
+        SLACK_NOTIFICATIONS_CHANNEL: '#kibana-operations-alerts'
+        ELASTIC_SLACK_NOTIFICATIONS_ENABLED: 'true'
+
+      allow_rebuilds: false
+      branch_configuration: main
+      default_branch: main
+      repository: elastic/kibana
+      pipeline_file: .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
+      skip_intermediate_builds: false
+      provider_settings:
+        prefix_pull_request_fork_branch_names: false
+        skip_pull_request_builds_for_existing_commits: true
+        trigger_mode: none
+      teams:
+        kibana-operations:
+          access_level: MANAGE_BUILD_AND_READ
+        appex-qa:
+          access_level: MANAGE_BUILD_AND_READ
+        kibana-tech-leads:
+          access_level: MANAGE_BUILD_AND_READ
+        everyone:
+          access_level: BUILD_AND_READ
+      schedules:
+        Trigger ES forward compatibility tests:
+          cronline: 0 5 * * *
+          message: Trigger ES forward compatibility tests
+          env:
+            TRIGGER_PIPELINE_SET: es-forward
+        Trigger artifact staging builds:
+          cronline: 0 7 * * * America/New_York
+          message: Trigger artifact staging builds
+          env:
+            TRIGGER_PIPELINE_SET: artifacts-staging
+            MESSAGE: Daily staging build
+        Trigger artifact snapshot builds:
+          cronline: 0 7 * * * America/New_York
+          message: Trigger artifact snapshot builds
+          env:
+              TRIGGER_PIPELINE_SET: artifacts-snapshot
+              MESSAGE: Daily snapshot build
+        Run kibana-artifacts-trigger:
+          cronline: 0 */2 * * * America/New_York
+          message: Trigger 'kibana-artifacts-trigger'
+          env:
+            TRIGGER_PIPELINE_SET: artifacts-trigger
+            MESSAGE: Daily build
diff --git a/.buildkite/pipeline-utils/agent_images.ts b/.buildkite/pipeline-utils/agent_images.ts
index 0606f036b1c64..d139f7953e00f 100644
--- a/.buildkite/pipeline-utils/agent_images.ts
+++ b/.buildkite/pipeline-utils/agent_images.ts
@@ -52,4 +52,19 @@ function getAgentImageConfig({ returnYaml = false } = {}): string | AgentImageCo
   return config;
 }
 
-export { getAgentImageConfig };
+const expandAgentQueue = (queueName: string = 'n2-4-spot') => {
+  const [kind, cores, addition] = queueName.split('-');
+  const additionalProps =
+    {
+      spot: { preemptible: true },
+      virt: { localSsdInterface: 'nvme', enableNestedVirtualization: true, localSsds: 1 },
+    }[addition] || {};
+
+  return {
+    ...getAgentImageConfig(),
+    machineType: `${kind}-standard-${cores}`,
+    ...additionalProps,
+  };
+};
+
+export { getAgentImageConfig, expandAgentQueue };
diff --git a/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts b/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
index 20b2d366e6067..a24214b1e62b0 100644
--- a/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
+++ b/.buildkite/pipeline-utils/ci-stats/pick_test_group_run_order.ts
@@ -16,27 +16,10 @@ import { BuildkiteClient, BuildkiteStep } from '../buildkite';
 import { CiStatsClient, TestGroupRunOrderResponse } from './client';
 
 import DISABLED_JEST_CONFIGS from '../../disabled_jest_configs.json';
-import { getAgentImageConfig } from '#pipeline-utils';
+import { expandAgentQueue } from '#pipeline-utils';
 
 type RunGroup = TestGroupRunOrderResponse['types'][0];
 
-// TODO: remove this after https://github.com/elastic/kibana-operations/issues/15 is finalized
-/** This function bridges the agent targeting between gobld and kibana-buildkite agent targeting */
-const getAgentRule = (queueName: string = 'n2-4-spot') => {
-  if (process.env?.BUILDKITE_AGENT_META_DATA_QUEUE === 'gobld') {
-    const [kind, cores, spot] = queueName.split('-');
-    return {
-      ...getAgentImageConfig(),
-      machineType: `${kind}-standard-${cores}`,
-      preemptible: spot === 'spot',
-    };
-  } else {
-    return {
-      queue: queueName,
-    };
-  }
-};
-
 const getRequiredEnv = (name: string) => {
   const value = process.env[name];
   if (typeof value !== 'string' || !value) {
@@ -436,7 +419,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: unit.count,
             timeout_in_minutes: 120,
             key: 'jest',
-            agents: getAgentRule('n2-4-spot'),
+            agents: expandAgentQueue('n2-4-spot'),
             retry: {
               automatic: [
                 { exit_status: '-1', limit: 3 },
@@ -454,7 +437,7 @@ export async function pickTestGroupRunOrder() {
             parallelism: integration.count,
             timeout_in_minutes: 120,
             key: 'jest-integration',
-            agents: getAgentRule('n2-4-spot'),
+            agents: expandAgentQueue('n2-4-spot'),
             retry: {
               automatic: [
                 { exit_status: '-1', limit: 3 },
@@ -488,7 +471,7 @@ export async function pickTestGroupRunOrder() {
                   label: title,
                   command: getRequiredEnv('FTR_CONFIGS_SCRIPT'),
                   timeout_in_minutes: 90,
-                  agents: getAgentRule(queue),
+                  agents: expandAgentQueue(queue),
                   env: {
                     FTR_CONFIG_GROUP_KEY: key,
                     ...FTR_EXTRA_ARGS,
diff --git a/.buildkite/pipeline-utils/utils.test.ts b/.buildkite/pipeline-utils/utils.test.ts
new file mode 100644
index 0000000000000..2fece6082bc5c
--- /dev/null
+++ b/.buildkite/pipeline-utils/utils.test.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
+import { expect } from 'chai';
+import { getKibanaDir, getVersionsFile } from './utils';
+import fs from 'fs';
+
+// TODO: replace mocha with jest, and write tests that mock FS
+
+describe('getKibanaDir', () => {
+  it('should return the kibana directory', () => {
+    const kibanaDir = getKibanaDir();
+
+    expect(kibanaDir).to.be.ok;
+    expect(fs.existsSync(kibanaDir)).to.be.true;
+  });
+});
+
+describe('getVersionsFile', () => {
+  it('should return the versions file', () => {
+    const versionsFile = getVersionsFile();
+
+    expect(versionsFile).to.be.ok;
+    expect(versionsFile.versions).to.be.an('array');
+  });
+
+  it('should correctly find prevMajor and prevMinor versions', () => {
+    const versionsFile = getVersionsFile();
+
+    expect(versionsFile.prevMajors).to.be.an('array');
+    expect(versionsFile.prevMajors.length).to.eql(1);
+    expect(versionsFile.prevMajors[0].branch).to.eql('7.17');
+
+    expect(versionsFile.prevMinors).to.be.an('array');
+  });
+
+  // TODO: write more tests with mocking...
+});
diff --git a/.buildkite/pipeline-utils/utils.ts b/.buildkite/pipeline-utils/utils.ts
index e9a5cf9193334..9f7a27d6e1518 100644
--- a/.buildkite/pipeline-utils/utils.ts
+++ b/.buildkite/pipeline-utils/utils.ts
@@ -7,6 +7,8 @@
  */
 
 import { execSync } from 'child_process';
+import fs from 'fs';
+import path from 'path';
 
 const getKibanaDir = (() => {
   let kibanaDir: string | undefined;
@@ -21,4 +23,42 @@ const getKibanaDir = (() => {
   };
 })();
 
-export { getKibanaDir };
+export interface Version {
+  branch: string;
+  version: string;
+}
+export interface VersionsFile {
+  versions: Array<
+    {
+      previousMajor?: boolean;
+      previousMinor?: boolean;
+      currentMajor?: boolean;
+      currentMinor?: boolean;
+    } & Version
+  >;
+}
+const getVersionsFile = (() => {
+  let versions: VersionsFile & {
+    prevMinors: Version[];
+    prevMajors: Version[];
+    current: Version;
+  };
+  const versionsFileName = 'versions.json';
+  try {
+    const versionsJSON = JSON.parse(
+      fs.readFileSync(path.join(getKibanaDir(), versionsFileName)).toString()
+    );
+    versions = {
+      versions: versionsJSON.versions,
+      prevMinors: versionsJSON.versions.filter((v: any) => v.previousMinor),
+      prevMajors: versionsJSON.versions.filter((v: any) => v.previousMajor),
+      current: versionsJSON.versions.find((v: any) => v.currentMajor && v.currentMinor),
+    };
+  } catch (error) {
+    throw new Error(`Failed to read ${versionsFileName}: ${error}`);
+  }
+
+  return () => versions;
+})();
+
+export { getKibanaDir, getVersionsFile };
diff --git a/.buildkite/pipelines/flaky_tests/pipeline.ts b/.buildkite/pipelines/flaky_tests/pipeline.ts
index 6a5b7da38a143..d77504deacb45 100644
--- a/.buildkite/pipelines/flaky_tests/pipeline.ts
+++ b/.buildkite/pipelines/flaky_tests/pipeline.ts
@@ -7,7 +7,7 @@
  */
 
 import { groups } from './groups.json';
-import { BuildkiteStep } from '#pipeline-utils';
+import { BuildkiteStep, expandAgentQueue } from '#pipeline-utils';
 
 const configJson = process.env.KIBANA_FLAKY_TEST_RUNNER_CONFIG;
 if (!configJson) {
@@ -32,34 +32,6 @@ if (Number.isNaN(concurrency)) {
 const BASE_JOBS = 1;
 const MAX_JOBS = 500;
 
-// TODO: remove this after https://github.com/elastic/kibana-operations/issues/15 is finalized
-/** This function bridges the agent targeting between gobld and kibana-buildkite agent targeting */
-const getAgentRule = (queueName: string = 'n2-4-spot') => {
-  if (
-    process.env.BUILDKITE_AGENT_META_DATA_QUEUE === 'gobld' ||
-    process.env.BUILDKITE_AGENT_META_DATA_PROVIDER === 'k8s'
-  ) {
-    const [kind, cores, addition] = queueName.split('-');
-    const additionalProps =
-      {
-        spot: { preemptible: true },
-        virt: { localSsdInterface: 'nvme', enableNestedVirtualization: true, localSsds: 1 },
-      }[addition] || {};
-
-    return {
-      provider: 'gcp',
-      image: 'family/kibana-ubuntu-2004',
-      imageProject: 'elastic-images-prod',
-      machineType: `${kind}-standard-${cores}`,
-      ...additionalProps,
-    };
-  } else {
-    return {
-      queue: queueName,
-    };
-  }
-};
-
 function getTestSuitesFromJson(json: string) {
   const fail = (errorMsg: string) => {
     console.error('+++ Invalid test config provided');
@@ -150,7 +122,7 @@ const pipeline = {
 steps.push({
   command: '.buildkite/scripts/steps/build_kibana.sh',
   label: 'Build Kibana Distribution and Plugins',
-  agents: getAgentRule('c2-8'),
+  agents: expandAgentQueue('c2-8'),
   key: 'build',
   if: "build.env('KIBANA_BUILD_ID') == null || build.env('KIBANA_BUILD_ID') == ''",
 });
@@ -173,7 +145,7 @@ for (const testSuite of testSuites) {
       concurrency,
       concurrency_group: process.env.UUID,
       concurrency_method: 'eager',
-      agents: getAgentRule('n2-4-spot'),
+      agents: expandAgentQueue('n2-4-spot'),
       depends_on: 'build',
       timeout_in_minutes: 150,
       cancel_on_build_failing: true,
@@ -197,7 +169,7 @@ for (const testSuite of testSuites) {
       steps.push({
         command: `.buildkite/scripts/steps/functional/${suiteName}.sh`,
         label: group.name,
-        agents: getAgentRule(agentQueue),
+        agents: expandAgentQueue(agentQueue),
         key: `cypress-suite-${suiteIndex++}`,
         depends_on: 'build',
         timeout_in_minutes: 150,
@@ -233,7 +205,7 @@ pipeline.steps.push({
 pipeline.steps.push({
   command: 'ts-node .buildkite/pipelines/flaky_tests/post_stats_on_pr.ts',
   label: 'Post results on Github pull request',
-  agents: getAgentRule('n2-4-spot'),
+  agents: expandAgentQueue('n2-4-spot'),
   timeout_in_minutes: 15,
   retry: {
     automatic: [{ exit_status: '-1', limit: 3 }],
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
index ae6c05721ae84..4eb15c16970ef 100644
--- a/.buildkite/pipelines/on_merge.yml
+++ b/.buildkite/pipelines/on_merge.yml
@@ -16,28 +16,6 @@ steps:
           limit: 1
   - wait
 
-  - label: 'Triggering changes-based pipelines'
-    branches: main
-    agents:
-      image: family/kibana-ubuntu-2004
-      imageProject: elastic-images-prod
-      provider: gcp
-      machineType: n2-standard-2
-    # TODO: this can probably be deleted after the migration https://github.com/elastic/kibana-operations/issues/15
-    plugins:
-      - chronotc/monorepo-diff#v2.0.4:
-          watch:
-            - path:
-                - 'versions.json'
-              config:
-                command: 'ts-node .buildkite/scripts/steps/trigger_pipeline.ts kibana-buildkite-pipelines-deploy main'
-                label: 'Trigger pipeline deploy'
-                agents:
-                  image: family/kibana-ubuntu-2004
-                  imageProject: elastic-images-prod
-                  provider: gcp
-                  machineType: n2-standard-2
-
   - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
     label: Build Kibana Distribution and Plugins
     agents:
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_explore.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_explore.yml
index 7aff13525a2fc..7697da4b3edaf 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_explore.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_explore.yml
@@ -17,3 +17,66 @@ steps:
       automatic:
         - exit_status: '-1'
           limit: 1
+
+  - group: "API MKI - Explore"
+    key: api_test_explore
+    steps:
+      - label: Running explore:hosts:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:hosts:runner:qa:serverless
+        key: explore:hosts:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:network:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:network:runner:qa:serverless
+        key: explore:network:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:overview:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:overview:runner:qa:serverless
+        key: explore:overview:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:users:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:users:runner:qa:serverless
+        key: explore:users:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_gen_ai.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_gen_ai.yml
index 2d84e7d4e0315..3fe69ca56c38b 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_gen_ai.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_gen_ai.yml
@@ -1,6 +1,6 @@
 steps:
   - command: .buildkite/scripts/pipelines/security_solution_quality_gate/security_solution_cypress/mki_security_solution_cypress.sh cypress:run:qa:serverless:ai_assistant
-    label: "Cypress MKI - GenAI
+    label: "Cypress MKI - GenAI"
     key: test_ai_assistant
     env:
       BK_TEST_SUITE_KEY: "serverless-cypress-gen-ai"
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_investigations.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_investigations.yml
index d19d709231e31..0988bf6ecf6b8 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_investigations.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_periodic/mki_periodic_investigations.yml
@@ -17,3 +17,36 @@ steps:
       automatic:
         - exit_status: '-1'
           limit: 1
+
+  - group: "API MKI - Investigations"
+    key: api_test_investigations
+    steps:
+      - label: Running investigations:timeline:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh investigations:timeline:runner:qa:serverless
+        key: investigations:timeline:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running investigations:saved-objects:runner:qa:serverless
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh investigations:saved-objects:runner:qa:serverless
+        key: investigations:saved-objects:runner:qa:serverless
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_explore.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_explore.yml
index e60f4509fcb3e..2c518fa24efab 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_explore.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_explore.yml
@@ -17,3 +17,66 @@ steps:
       automatic:
         - exit_status: '-1'
           limit: 1
+
+  - group: "API MKI - Explore"
+    key: api_test_explore
+    steps:
+      - label: Running explore:hosts:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:hosts:runner:qa:serverless:release
+        key: explore:hosts:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:network:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:network:runner:qa:serverless:release
+        key: explore:network:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:overview:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:overview:runner:qa:serverless:release
+        key: explore:overview:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running explore:users:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh explore:users:runner:qa:serverless:release
+        key: explore:users:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
diff --git a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_investigations.yml b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_investigations.yml
index ed46611989b87..d3f57e40ec2cb 100644
--- a/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_investigations.yml
+++ b/.buildkite/pipelines/security_solution_quality_gate/mki_quality_gate/mki_quality_gate_investigations.yml
@@ -17,3 +17,36 @@ steps:
       automatic:
         - exit_status: '-1'
           limit: 1
+
+  - group: "API MKI - Investigations"
+    key: api_test_investigations
+    steps:
+      - label: Running investigations:timeline:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh investigations:timeline:runner:qa:serverless:release
+        key: investigations:timeline:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
+
+      - label: Running investigations:saved-objects:runner:qa:serverless:release
+        command: .buildkite/scripts/pipelines/security_solution_quality_gate/api_integration/api-integration-tests.sh investigations:saved-objects:runner:qa:serverless:release
+        key: investigations:saved-objects:runner:qa:serverless:release
+        agents:
+          image: family/kibana-ubuntu-2004
+          imageProject: elastic-images-prod
+          provider: gcp
+          machineType: n2-standard-4
+          preemptible: true
+        timeout_in_minutes: 120
+        retry:
+          automatic:
+            - exit_status: "1"
+              limit: 2
diff --git a/.buildkite/pull_requests.json b/.buildkite/pull_requests.json
index 0c6714d1c75b7..0758e0255247f 100644
--- a/.buildkite/pull_requests.json
+++ b/.buildkite/pull_requests.json
@@ -45,52 +45,6 @@
         "/__snapshots__/",
         "\\.test\\.(ts|tsx|js|jsx)"
       ]
-    },
-    {
-      "repoOwner": "elastic",
-      "repoName": "kibana",
-      "pipelineSlug": "kibana-kme-test",
-
-      "enabled": true,
-      "allow_org_users": true,
-      "allowed_repo_permissions": ["admin", "write"],
-      "set_commit_status": true,
-      "commit_status_context": "kibana-ci-test",
-      "build_on_commit": true,
-      "build_on_comment": false,
-      "trigger_comment_regex": "^(?:(?:buildkite\\W+)?(?:build|test)\\W+(?:this|it))",
-      "skip_ci_labels": [],
-      "labels": ["kme-test"],
-      "skip_target_branches": ["6.8", "7.11", "7.12"],
-      "enable_skippable_commits": true,
-      "skip_ci_on_only_changed": [
-        "^dev_docs/",
-        "^docs/",
-        "^rfcs/",
-        "^\\.github/",
-        "\\.md$",
-        "\\.mdx$",
-        "^api_docs/.+\\.devdocs\\.json$",
-        "^\\.backportrc\\.json$",
-        "^nav-kibana-dev\\.docnav\\.json$",
-        "^src/dev/prs/kibana_qa_pr_list\\.json$",
-        "^\\.buildkite/pull_requests\\.json$",
-        "^\\.catalog-info\\.yaml$"
-      ],
-      "always_require_ci_on_changed": [
-        "^docs/developer/plugin-list.asciidoc$",
-        "^\\.github/CODEOWNERS$",
-        "/plugins/[^/]+/readme\\.(md|asciidoc)$"
-      ],
-      "kibana_versions_check": true,
-      "kibana_build_reuse": true,
-      "kibana_build_reuse_pipeline_slugs": ["kibana-kme-test", "kibana-on-merge"],
-      "kibana_build_reuse_regexes": [
-        "^test/",
-        "^x-pack/test/",
-        "/__snapshots__/",
-        "\\.test\\.(ts|tsx|js|jsx)"
-      ]
     }
   ]
 }
diff --git a/.buildkite/scripts/common/util.sh b/.buildkite/scripts/common/util.sh
index 5630fed40bf93..bc5983e249669 100755
--- a/.buildkite/scripts/common/util.sh
+++ b/.buildkite/scripts/common/util.sh
@@ -172,3 +172,9 @@ npm_install_global() {
 download_artifact() {
   retry 3 1 timeout 3m buildkite-agent artifact download "$@"
 }
+
+print_if_dry_run() {
+  if [[ "${DRY_RUN:-}" =~ ^(1|true)$ ]]; then
+    echo "DRY_RUN is enabled."
+  fi
+}
diff --git a/.buildkite/scripts/lifecycle/post_command.sh b/.buildkite/scripts/lifecycle/post_command.sh
index b22293dbcb8b6..47e118a402408 100755
--- a/.buildkite/scripts/lifecycle/post_command.sh
+++ b/.buildkite/scripts/lifecycle/post_command.sh
@@ -6,13 +6,6 @@ echo '--- Log out of gcloud'
 ./.buildkite/scripts/common/activate_service_account.sh --unset-impersonation || echo "Failed to unset impersonation"
 ./.buildkite/scripts/common/activate_service_account.sh --logout-gcloud || echo "Failed to log out of gcloud"
 
-if [[ "${SKIP_NODE_SETUP:-}" =~ ^(1|true)$ ]]; then
-  echo '--- Skipping Agent Debug Info'
-else
-  echo '--- Agent Debug Info'
-  ts-node .buildkite/scripts/lifecycle/print_agent_links.ts || true
-fi
-
 IS_TEST_EXECUTION_STEP="$(buildkite-agent meta-data get "${BUILDKITE_JOB_ID}_is_test_execution_step" --default '')"
 
 if [[ "$IS_TEST_EXECUTION_STEP" == "true" ]]; then
diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh
index c0b08f474bbd2..3b2a3dcdcdad1 100755
--- a/.buildkite/scripts/lifecycle/pre_command.sh
+++ b/.buildkite/scripts/lifecycle/pre_command.sh
@@ -11,16 +11,6 @@ if [[ "${SKIP_NODE_SETUP:-}" =~ ^(1|true)$ ]]; then
 else
   source .buildkite/scripts/common/setup_node.sh
   source .buildkite/scripts/common/setup_buildkite_deps.sh
-
-  echo '--- Agent Debug/SSH Info'
-  ts-node .buildkite/scripts/lifecycle/print_agent_links.ts || true
-fi
-
-if [[ "$(curl -is metadata.google.internal || true)" ]]; then
-  echo ""
-  echo "To SSH into this agent, run:"
-  echo "gcloud compute ssh --tunnel-through-iap --project elastic-kibana-ci --zone \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/zone)\" \"$(curl -sH Metadata-Flavor:Google http://metadata.google.internal/computeMetadata/v1/instance/name)\""
-  echo ""
 fi
 
 if [[ "${BUILDKITE_LABEL:-}" == *"Run Dynamic Pipeline"* || "${BUILDKITE_LABEL:-}" == *"Upload Pipeline"* ]]; then
diff --git a/.buildkite/scripts/lifecycle/print_agent_links.ts b/.buildkite/scripts/lifecycle/print_agent_links.ts
deleted file mode 100644
index 428ec3dc0aaff..0000000000000
--- a/.buildkite/scripts/lifecycle/print_agent_links.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { BuildkiteClient } from '#pipeline-utils';
-
-(async () => {
-  try {
-    const client = new BuildkiteClient();
-    const build = await client.getCurrentBuild();
-
-    const job = build.jobs.find((j) => j.id === process.env.BUILDKITE_JOB_ID);
-    const startTime = job
-      ? new Date(job.started_at)
-      : new Date(new Date().getTime() - 60 * 60 * 1000);
-    const twoHours = new Date(startTime.getTime() + 2 * 60 * 60 * 1000);
-
-    const METRICS_URL = [
-      `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
-      `/app/metrics/link-to/host-detail/${process.env.BUILDKITE_AGENT_NAME}`,
-      `?to=${twoHours.getTime()}`,
-      `&from=${startTime.getTime()}`,
-    ].join('');
-
-    const LOGS_URL = [
-      `https://kibana-ops-buildkite-monitoring.kb.us-central1.gcp.cloud.es.io:9243`,
-      `/app/logs/link-to/host-logs/${process.env.BUILDKITE_AGENT_NAME}`,
-      `?time=${startTime.getTime()}`,
-    ].join('');
-
-    console.log('Agent Metrics:');
-    console.log('\u001b]1339;' + `url='${METRICS_URL}'\u0007`);
-    console.log('Agent Logs:');
-    console.log('\u001b]1339;' + `url='${LOGS_URL}'\u0007`);
-  } catch (ex) {
-    // Probably don't need to fail the build for this failure, just log it
-    console.error('Buildkite API Error', ex.message);
-    if (ex.response) {
-      console.error('HTTP Error Response Status', ex.response.status);
-      console.error('HTTP Error Response Body', ex.response.data);
-    }
-  }
-})();
diff --git a/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
new file mode 100755
index 0000000000000..500372eb91596
--- /dev/null
+++ b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -euo pipefail
+
+ts-node .buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.ts
diff --git a/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.test.ts b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.test.ts
new file mode 100644
index 0000000000000..45475301f1c49
--- /dev/null
+++ b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.test.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
+import { getVersionsFile } from '#pipeline-utils';
+import { expect } from 'chai';
+
+import {
+  getArtifactBuildTriggers,
+  getArtifactSnapshotPipelineTriggers,
+  getESForwardPipelineTriggers,
+  getArtifactStagingPipelineTriggers,
+} from './pipeline';
+
+const versionsFile = getVersionsFile();
+
+describe('pipeline trigger combinations', () => {
+  it('should trigger the correct pipelines for "es-forward"', () => {
+    const esForwardTriggers = getESForwardPipelineTriggers();
+    // tests 7.17 against 8.x versions
+    const targets = versionsFile.versions.filter((v) => v.currentMajor === true);
+
+    expect(esForwardTriggers.length).to.eql(targets.length);
+
+    expect(esForwardTriggers.every((trigger) => trigger.build?.branch === '7.17')).to.be.true;
+
+    const targetedManifests = esForwardTriggers.map((t) => t.build?.env?.ES_SNAPSHOT_MANIFEST);
+    targets.forEach((t) =>
+      expect(targetedManifests).to.include(
+        `https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${t.version}/manifest-latest-verified.json`
+      )
+    );
+  });
+
+  it('should trigger the correct pipelines for "artifacts-snapshot"', () => {
+    const snapshotTriggers = getArtifactSnapshotPipelineTriggers();
+    // triggers for all open branches
+    const branches = versionsFile.versions.map((v) => v.branch);
+
+    expect(snapshotTriggers.length).to.eql(branches.length);
+
+    branches.forEach((b) => {
+      expect(snapshotTriggers.some((trigger) => trigger.build?.branch === b)).to.be.true;
+    });
+  });
+
+  it('should trigger the correct pipelines for "artifacts-trigger"', () => {
+    const triggerTriggers = getArtifactBuildTriggers();
+    // all currentMajor+prevMinor branches
+    const branches = versionsFile.versions
+      .filter((v) => v.currentMajor === true && v.previousMinor === true)
+      .map((v) => v.branch);
+
+    expect(triggerTriggers.length).to.eql(branches.length);
+    branches.forEach((b) => {
+      expect(triggerTriggers.some((trigger) => trigger.build?.branch === b)).to.be.true;
+    });
+  });
+
+  it('should trigger the correct pipelines for "artifacts-staging"', () => {
+    const stagingTriggers = getArtifactStagingPipelineTriggers();
+    // all branches that are not currentMajor+currentMinor
+    const branches = versionsFile.versions
+      .filter((v) => !v.currentMajor || !v.currentMinor)
+      .map((v) => v.branch);
+
+    expect(stagingTriggers.length).to.eql(branches.length);
+    branches.forEach((b) => {
+      expect(stagingTriggers.some((trigger) => trigger.build?.branch === b)).to.be.true;
+    });
+  });
+});
diff --git a/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.ts b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.ts
new file mode 100755
index 0000000000000..314e3d2164688
--- /dev/null
+++ b/.buildkite/scripts/pipelines/trigger_version_dependent_jobs/pipeline.ts
@@ -0,0 +1,179 @@
+#!/usr/bin/env ts-node
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { getVersionsFile, BuildkiteTriggerStep } from '#pipeline-utils';
+
+const pipelineSets = {
+  'es-forward': 'kibana-es-forward-compatibility-testing',
+  'artifacts-snapshot': 'kibana-artifacts-snapshot',
+  'artifacts-staging': 'kibana-artifacts-staging',
+  'artifacts-trigger': 'kibana-artifacts-trigger',
+};
+
+/**
+ * This pipeline is used to emit trigger steps onto different pipelines, based on dynamic parameters retrieved from the repository.
+ */
+async function main() {
+  const pipelineSetNames = Object.keys(pipelineSets);
+  const pipelineSetName: string | undefined = process.env.TRIGGER_PIPELINE_SET;
+  const pipelineSteps: BuildkiteTriggerStep[] = [];
+
+  if (!pipelineSetName) {
+    throw new Error(
+      `Env var TRIGGER_PIPELINE_SET is required, and can be one of: ${pipelineSetNames}`
+    );
+  } else if (!pipelineSetNames.includes(pipelineSetName)) {
+    throw new Error(
+      `Invalid value for TRIGGER_PIPELINE_SET (${pipelineSetName}), can be one of: ${pipelineSetNames}`
+    );
+  }
+
+  switch (pipelineSetName) {
+    case 'es-forward': {
+      pipelineSteps.push(...getESForwardPipelineTriggers());
+      break;
+    }
+    case 'artifacts-snapshot': {
+      pipelineSteps.push(...getArtifactSnapshotPipelineTriggers());
+      break;
+    }
+    case 'artifacts-staging': {
+      pipelineSteps.push(...getArtifactStagingPipelineTriggers());
+      break;
+    }
+    case 'artifacts-trigger': {
+      pipelineSteps.push(...getArtifactBuildTriggers());
+      break;
+    }
+    default: {
+      throw new Error(`Unknown pipeline set: ${pipelineSetName}`);
+    }
+  }
+
+  emitPipeline(pipelineSteps);
+}
+
+/**
+ * This pipeline is testing the forward compatibility of Kibana with different versions of Elasticsearch.
+ * Should be triggered for combinations of (Kibana@7.17 + ES@8.x {current open branches on the same major})
+ */
+export function getESForwardPipelineTriggers(): BuildkiteTriggerStep[] {
+  const versions = getVersionsFile();
+  const kibanaPrevMajor = versions.prevMajors[0];
+  const targetESVersions = [versions.prevMinors, versions.current].flat();
+
+  return targetESVersions.map(({ version }) => {
+    return {
+      trigger: pipelineSets['es-forward'],
+      async: true,
+      label: `Triggering Kibana ${kibanaPrevMajor.version} + ES ${version} forward compatibility`,
+      build: {
+        message: process.env.MESSAGE || `ES forward-compatibility test for ES ${version}`,
+        branch: kibanaPrevMajor.branch,
+        commit: 'HEAD',
+        env: {
+          ES_SNAPSHOT_MANIFEST: `https://storage.googleapis.com/kibana-ci-es-snapshots-daily/${version}/manifest-latest-verified.json`,
+          DRY_RUN: process.env.DRY_RUN,
+        },
+      },
+    } as BuildkiteTriggerStep;
+  });
+}
+
+/**
+ * This pipeline creates Kibana artifact snapshots for all open branches.
+ * Should be triggered for all open branches in the versions.json: 7.x, 8.x
+ */
+export function getArtifactSnapshotPipelineTriggers() {
+  // Trigger for all named branches
+  const versions = getVersionsFile();
+  const targetVersions = [versions.prevMajors, versions.prevMinors, versions.current].flat();
+
+  return targetVersions.map(({ branch }) => {
+    return {
+      trigger: pipelineSets['artifacts-snapshot'],
+      async: true,
+      label: `Triggering snapshot artifact builds for ${branch}`,
+      build: {
+        message: process.env.MESSAGE || `Snapshot artifact build for ${branch}`,
+        branch,
+        commit: 'HEAD',
+        env: {
+          DRY_RUN: process.env.DRY_RUN,
+        },
+      },
+    } as BuildkiteTriggerStep;
+  });
+}
+
+/**
+ * This pipeline creates Kibana artifacts for branches that are not the current main.
+ * Should be triggered for all open branches in the versions.json: 7.x, 8.x, but not main.
+ */
+export function getArtifactStagingPipelineTriggers() {
+  // Trigger for all branches, that are not current minor+major
+  const versions = getVersionsFile();
+  const targetVersions = [versions.prevMajors, versions.prevMinors].flat();
+
+  return targetVersions.map(({ branch }) => {
+    return {
+      trigger: pipelineSets['artifacts-staging'],
+      async: true,
+      label: `Triggering staging artifact builds for ${branch}`,
+      build: {
+        message: process.env.MESSAGE || `Staging artifact build for ${branch}`,
+        branch,
+        commit: 'HEAD',
+        env: {
+          DRY_RUN: process.env.DRY_RUN,
+        },
+      },
+    } as BuildkiteTriggerStep;
+  });
+}
+
+/**
+ * This pipeline checks if there are any changes in the incorporated $BEATS_MANIFEST_LATEST_URL (beats version)
+ * and triggers a staging artifact build.
+ * Should be triggered only for the active minor versions that are not `main` and not `7.17`.
+ *
+ * TODO: we could basically do the check logic of .buildkite/scripts/steps/artifacts/trigger.sh in here, and remove kibana-artifacts-trigger
+ */
+export function getArtifactBuildTriggers() {
+  const versions = getVersionsFile();
+  const targetVersions = versions.prevMinors;
+
+  return targetVersions.map(
+    ({ branch }) =>
+      ({
+        trigger: pipelineSets['artifacts-trigger'],
+        async: true,
+        label: `Triggering artifact build for ${branch}`,
+        build: {
+          message: process.env.MESSAGE || `Artifact build for ${branch}`,
+          branch,
+          commit: 'HEAD',
+          env: {
+            DRY_RUN: process.env.DRY_RUN,
+          },
+        },
+      } as BuildkiteTriggerStep)
+  );
+}
+
+function emitPipeline(pipelineSteps: BuildkiteTriggerStep[]) {
+  console.log(JSON.stringify(pipelineSteps, null, 2));
+}
+
+if (require.main === module) {
+  main().catch((error) => {
+    console.error(error);
+    process.exit(1);
+  });
+}
diff --git a/.buildkite/scripts/steps/artifacts/cloud.sh b/.buildkite/scripts/steps/artifacts/cloud.sh
index e12cf7958c86e..86fa86f37bd3c 100644
--- a/.buildkite/scripts/steps/artifacts/cloud.sh
+++ b/.buildkite/scripts/steps/artifacts/cloud.sh
@@ -7,6 +7,11 @@ set -euo pipefail
 source "$(dirname "$0")/../../common/util.sh"
 source .buildkite/scripts/steps/artifacts/env.sh
 
+if [[ "${DRY_RUN:-}" =~ ^(true|1)$ ]]; then
+  echo "--- Nothing to do in DRY_RUN mode"
+  exit 0
+fi
+
 echo "--- Push docker image"
 mkdir -p target
 
diff --git a/.buildkite/scripts/steps/artifacts/docker_image.sh b/.buildkite/scripts/steps/artifacts/docker_image.sh
index 551910432c413..77790bf3d5a8a 100755
--- a/.buildkite/scripts/steps/artifacts/docker_image.sh
+++ b/.buildkite/scripts/steps/artifacts/docker_image.sh
@@ -18,46 +18,82 @@ export KIBANA_IMAGE="$KIBANA_BASE_IMAGE:$KIBANA_IMAGE_TAG"
 
 echo "--- Verify manifest does not already exist"
 echo "Checking manifest for $KIBANA_IMAGE"
-if docker manifest inspect $KIBANA_IMAGE &> /dev/null; then
-  echo "Manifest already exists, exiting"
-  exit 1
+SKIP_BUILD=false
+if docker manifest inspect "$KIBANA_IMAGE" &> /dev/null; then
+  # If a staging build manifest already exists, there's a workflow error and the root cause should be investigated.
+  if [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+    echo "Manifest already exists, exiting"
+    exit 1
+  else
+    echo "Manifest already exists, skipping build.  Look up previous build for artifacts."
+    SKIP_BUILD=true
+  fi
 fi
 
-echo "--- Build Kibana"
-node scripts/build \
-  --debug \
-  --release \
-  --serverless \
-  --docker-cross-compile \
-  --docker-namespace="kibana-ci" \
-  --docker-tag="$KIBANA_IMAGE_TAG"
-
-echo "--- Tag images"
-docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
-docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
-
-docker rmi "$KIBANA_IMAGE"
-docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
-docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
-
-echo "--- Push images"
-docker image push "$KIBANA_IMAGE-arm64"
-docker image push "$KIBANA_IMAGE-amd64"
-
-echo "--- Create and push manifests"
-docker manifest create \
-  "$KIBANA_IMAGE" \
-  --amend "$KIBANA_IMAGE-arm64" \
-  --amend "$KIBANA_IMAGE-amd64"
-docker manifest push "$KIBANA_IMAGE"
-
-if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+if [[ "$SKIP_BUILD" == "false" ]]; then
+  echo "--- Build Kibana"
+  node scripts/build \
+    --debug \
+    --release \
+    --serverless \
+    --docker-cross-compile \
+    --docker-namespace="kibana-ci" \
+    --docker-tag="$KIBANA_IMAGE_TAG"
+
+  echo "--- Tag images"
+  docker rmi "$KIBANA_IMAGE"
+  docker load < "target/kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+  docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-amd64"
+
+  docker rmi "$KIBANA_IMAGE"
+  docker load < "target/kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
+  docker tag "$KIBANA_IMAGE" "$KIBANA_IMAGE-arm64"
+
+  echo "--- Push images"
+  docker image push "$KIBANA_IMAGE-arm64"
+  docker image push "$KIBANA_IMAGE-amd64"
+
+  echo "--- Create and push manifests"
   docker manifest create \
-    "$KIBANA_BASE_IMAGE:latest" \
+    "$KIBANA_IMAGE" \
     --amend "$KIBANA_IMAGE-arm64" \
     --amend "$KIBANA_IMAGE-amd64"
-  docker manifest push "$KIBANA_BASE_IMAGE:latest"
+  docker manifest push "$KIBANA_IMAGE"
+
+  if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]] && [[ "${BUILDKITE_PULL_REQUEST:-false}" == "false" ]]; then
+    docker manifest create \
+      "$KIBANA_BASE_IMAGE:latest" \
+      --amend "$KIBANA_IMAGE-arm64" \
+      --amend "$KIBANA_IMAGE-amd64"
+    docker manifest push "$KIBANA_BASE_IMAGE:latest"
+  fi
+
+  echo "--- Build dependencies report"
+  node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
+
+  echo "--- Upload archives"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-x86_64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-aarch64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
+  buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-build-context.tar.gz"
+  buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
+  buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
+
+  echo "--- Upload CDN assets"
+  cd target
+  gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_KEY")
+
+  CDN_ASSETS_FOLDER=$(mktemp -d)
+  tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
+
+  gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
+  gcloud auth revoke "$GCS_SA_CDN_EMAIL"
+
+  echo "--- Validate CDN assets"
+  ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/validate_cdn_assets.ts" \
+    "$GCS_SA_CDN_URL" \
+    "$CDN_ASSETS_FOLDER"
 fi
 
 cat << EOF | buildkite-agent annotate --style "info" --context image
@@ -75,33 +111,6 @@ if [[ "${BUILDKITE_PULL_REQUEST:-false}" != "false" ]]; then
   buildkite-agent meta-data set pr_comment:early_comment_job_id "$BUILDKITE_JOB_ID"
 fi
 
-echo "--- Build dependencies report"
-node scripts/licenses_csv_report "--csv=target/dependencies-$GIT_ABBREV_COMMIT.csv"
-
-echo "--- Upload CDN assets"
-cd target
-gcloud auth activate-service-account --key-file <(echo "$GCS_SA_CDN_KEY")
-
-CDN_ASSETS_FOLDER=$(mktemp -d)
-tar -xf "kibana-$BASE_VERSION-cdn-assets.tar.gz" -C "$CDN_ASSETS_FOLDER" --strip=1
-
-gsutil -m cp -r "$CDN_ASSETS_FOLDER/*" "gs://$GCS_SA_CDN_BUCKET/$GIT_ABBREV_COMMIT"
-gcloud auth revoke "$GCS_SA_CDN_EMAIL"
-
-echo "--- Validate CDN assets"
-ts-node "$(git rev-parse --show-toplevel)/.buildkite/scripts/steps/artifacts/validate_cdn_assets.ts" \
-  "$GCS_SA_CDN_URL" \
-  "$CDN_ASSETS_FOLDER"
-
-echo "--- Upload archives"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-x86_64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-linux-aarch64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-image-aarch64.tar.gz"
-buildkite-agent artifact upload "kibana-serverless-$BASE_VERSION-docker-build-context.tar.gz"
-buildkite-agent artifact upload "kibana-$BASE_VERSION-cdn-assets.tar.gz"
-buildkite-agent artifact upload "dependencies-$GIT_ABBREV_COMMIT.csv"
-
 # This part is related with updating the configuration of kibana-controller,
 # so that new stack instances contain the latest and greatest image of kibana,
 # and the respective stack components of course.
diff --git a/.buildkite/scripts/steps/artifacts/publish.sh b/.buildkite/scripts/steps/artifacts/publish.sh
index 40ea04fc33fea..08c6ecc1e25ad 100644
--- a/.buildkite/scripts/steps/artifacts/publish.sh
+++ b/.buildkite/scripts/steps/artifacts/publish.sh
@@ -5,6 +5,8 @@ set -euo pipefail
 source .buildkite/scripts/common/util.sh
 source .buildkite/scripts/steps/artifacts/env.sh
 
+print_if_dry_run
+
 echo "--- Download and verify artifacts"
 function download {
   download_artifact "$1" . --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
@@ -60,6 +62,7 @@ if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
   download_artifact beats_manifest.json /tmp --build "${KIBANA_BUILD_ID:-$BUILDKITE_BUILD_ID}"
   export BEATS_MANIFEST_URL=$(jq -r .manifest_url /tmp/beats_manifest.json)
 
+  PUBLISH_CMD=$(cat << EOF
   docker run --rm \
     --name release-manager \
     -e VAULT_ADDR \
@@ -76,6 +79,13 @@ if [[ "$BUILDKITE_BRANCH" == "$KIBANA_BASE_BRANCH" ]]; then
         --qualifier "$VERSION_QUALIFIER" \
         --dependency "beats:$BEATS_MANIFEST_URL" \
         --artifact-set main
+EOF
+)
+  if [[ "${DRY_RUN:-}" =~ ^(1|true)$ ]]; then
+    PUBLISH_CMD+=(" --dry-run")
+  fi
+
+  "${PUBLISH_CMD[@]}"
 
   KIBANA_SUMMARY=$(curl -s "$KIBANA_MANIFEST_LATEST" | jq -re '.summary_url')
 
diff --git a/.buildkite/scripts/steps/serverless/deploy.sh b/.buildkite/scripts/steps/serverless/deploy.sh
index 0c6f52b6f1982..325aadf187b5b 100644
--- a/.buildkite/scripts/steps/serverless/deploy.sh
+++ b/.buildkite/scripts/steps/serverless/deploy.sh
@@ -160,9 +160,12 @@ EOF
 
 is_pr_with_label "ci:project-deploy-elasticsearch" && deploy "elasticsearch"
 if is_pr_with_label "ci:project-deploy-observability" ; then
-  create_github_issue_oblt_test_environments
-  echo "--- Deploy observability with Kibana CI"
-  deploy "observability"
+  # Only deploy observability if the PR is targeting main
+  if [[ "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" == "main" ]]; then
+    create_github_issue_oblt_test_environments
+    echo "--- Deploy observability with Kibana CI"
+    deploy "observability"
+  fi
 fi
 is_pr_with_label "ci:project-deploy-security" && deploy "security"
 
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 2dd7f2a8c6aee..d22a59072a86d 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -28,6 +28,7 @@ x-pack/plugins/alerting @elastic/response-ops
 x-pack/packages/kbn-alerting-state-types @elastic/response-ops
 packages/kbn-alerting-types @elastic/response-ops
 packages/kbn-alerts-as-data-utils @elastic/response-ops
+packages/kbn-alerts-grouping @elastic/response-ops
 x-pack/test/alerting_api_integration/common/plugins/alerts_restricted @elastic/response-ops
 packages/kbn-alerts-ui-shared @elastic/response-ops
 packages/kbn-ambient-common-types @elastic/kibana-operations
@@ -406,6 +407,7 @@ packages/kbn-eslint-plugin-imports @elastic/kibana-operations
 packages/kbn-eslint-plugin-telemetry @elastic/obs-knowledge-team
 examples/eso_model_version_example @elastic/kibana-security
 x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin @elastic/kibana-security
+src/plugins/esql @elastic/kibana-esql
 packages/kbn-esql-ast @elastic/kibana-esql
 examples/esql_ast_inspector @elastic/kibana-esql
 src/plugins/esql_datagrid @elastic/kibana-esql
@@ -421,7 +423,7 @@ x-pack/plugins/event_log @elastic/response-ops
 packages/kbn-expandable-flyout @elastic/security-threat-hunting-investigations
 packages/kbn-expect @elastic/kibana-operations @elastic/appex-qa
 x-pack/examples/exploratory_view_example @elastic/obs-ux-infra_services-team
-x-pack/plugins/observability_solution/exploratory_view @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/exploratory_view @elastic/obs-ux-management-team
 src/plugins/expression_error @elastic/kibana-presentation
 src/plugins/chart_expressions/expression_gauge @elastic/kibana-visualizations
 src/plugins/chart_expressions/expression_heatmap @elastic/kibana-visualizations
@@ -504,7 +506,7 @@ x-pack/plugins/integration_assistant @elastic/security-solution
 src/plugins/interactive_setup @elastic/kibana-security
 test/interactive_setup_api_integration/plugins/test_endpoints @elastic/kibana-security
 packages/kbn-interpreter @elastic/kibana-visualizations
-x-pack/plugins/observability_solution/investigate @elastic/obs-ai-assistant
+x-pack/plugins/observability_solution/investigate @elastic/obs-ux-management-team
 packages/kbn-io-ts-utils @elastic/obs-knowledge-team
 packages/kbn-ipynb @elastic/search-kibana
 packages/kbn-jest-serializers @elastic/kibana-operations
@@ -657,6 +659,7 @@ packages/react/kibana_context/root @elastic/appex-sharedux
 packages/react/kibana_context/styled @elastic/appex-sharedux
 packages/react/kibana_context/theme @elastic/appex-sharedux
 packages/react/kibana_mount @elastic/appex-sharedux
+packages/kbn-recently-accessed @elastic/appex-sharedux
 x-pack/plugins/remote_clusters @elastic/kibana-management
 test/plugin_functional/plugins/rendering_plugin @elastic/kibana-core
 packages/kbn-repo-file-maps @elastic/kibana-operations
@@ -847,7 +850,7 @@ test/server_integration/plugins/status_plugin_b @elastic/kibana-core
 packages/kbn-std @elastic/kibana-core
 packages/kbn-stdio-dev-helpers @elastic/kibana-operations
 packages/kbn-storybook @elastic/kibana-operations
-x-pack/plugins/observability_solution/synthetics @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/synthetics @elastic/obs-ux-management-team
 x-pack/test/alerting_api_integration/common/plugins/task_manager_fixture @elastic/response-ops
 x-pack/test/plugin_api_perf/plugins/task_manager_performance @elastic/response-ops
 x-pack/plugins/task_manager @elastic/response-ops
@@ -864,7 +867,6 @@ packages/kbn-test-jest-helpers @elastic/kibana-operations @elastic/appex-qa
 packages/kbn-test-subj-selector @elastic/kibana-operations @elastic/appex-qa
 x-pack/examples/testing_embedded_lens @elastic/kibana-visualizations
 packages/kbn-text-based-editor @elastic/kibana-esql
-src/plugins/text_based_languages @elastic/kibana-esql
 x-pack/examples/third_party_lens_navigation_prompt @elastic/kibana-visualizations
 x-pack/examples/third_party_vis_lens_example @elastic/kibana-visualizations
 x-pack/plugins/threat_intelligence @elastic/security-threat-hunting-investigations
@@ -903,7 +905,7 @@ src/plugins/unified_search @elastic/kibana-visualizations
 packages/kbn-unsaved-changes-badge @elastic/kibana-data-discovery
 packages/kbn-unsaved-changes-prompt @elastic/kibana-management
 x-pack/plugins/upgrade_assistant @elastic/kibana-management
-x-pack/plugins/observability_solution/uptime @elastic/obs-ux-infra_services-team
+x-pack/plugins/observability_solution/uptime @elastic/obs-ux-management-team
 x-pack/plugins/drilldowns/url_drilldown @elastic/appex-sharedux
 src/plugins/url_forwarding @elastic/kibana-visualizations
 src/plugins/usage_collection @elastic/kibana-core
@@ -1141,15 +1143,15 @@ x-pack/test/observability_ai_assistant_functional @elastic/obs-ai-assistant
 #CC# /x-pack/plugins/observability_solution/observability/ @elastic/apm-ui
 
 # Uptime
-/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/uptime/ @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/apps/uptime @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/es_archives/uptime @elastic/obs-ux-infra_services-team
-/x-pack/test/functional/services/uptime @elastic/obs-ux-infra_services-team
-/x-pack/test/api_integration/apis/uptime @elastic/obs-ux-infra_services-team
-/x-pack/test/api_integration/apis/synthetics @elastic/obs-ux-infra_services-team
-/x-pack/test/alerting_api_integration/observability/synthetics_rule.ts @elastic/obs-ux-infra_services-team
+/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/uptime/ @elastic/obs-ux-management-team
+/x-pack/test/functional/apps/uptime @elastic/obs-ux-management-team
+/x-pack/test/functional/es_archives/uptime @elastic/obs-ux-management-team
+/x-pack/test/functional/services/uptime @elastic/obs-ux-management-team
+/x-pack/test/api_integration/apis/uptime @elastic/obs-ux-management-team
+/x-pack/test/api_integration/apis/synthetics @elastic/obs-ux-management-team
+/x-pack/test/alerting_api_integration/observability/synthetics_rule.ts @elastic/obs-ux-management-team
 /x-pack/test/alerting_api_integration/observability/index.ts @elastic/obs-ux-management-team
-/x-pack/test_serverless/api_integration/test_suites/observability/synthetics @elastic/obs-ux-infra_services-team
+/x-pack/test_serverless/api_integration/test_suites/observability/synthetics @elastic/obs-ux-management-team
 
 # Logs
 /x-pack/test/api_integration/apis/logs_ui @elastic/obs-ux-logs-team
@@ -1424,7 +1426,7 @@ x-pack/test/security_solution_api_integration/test_suites/sources @elastic/secur
 /x-pack/test/security_solution_cypress/cypress/* @elastic/security-engineering-productivity
 /x-pack/test/security_solution_cypress/cypress/tasks/login.ts @elastic/security-engineering-productivity
 /x-pack/test/security_solution_cypress/es_archives @elastic/security-engineering-productivity
-/x-pack/plugins/security_solution/scripts/run_cypress @MadameSheema @patrykkopycinski @oatkiller @maximpn @banderror
+/x-pack/plugins/security_solution/scripts/run_cypress @MadameSheema @patrykkopycinski @maximpn @banderror
 
 ## Security Solution sub teams - Threat Hunting Investigations
 
@@ -1615,7 +1617,7 @@ x-pack/test/security_solution_cypress/cypress/tasks/expandable_flyout  @elastic/
 /x-pack/plugins/security_solution/server/lib/license/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/server/fleet_integration/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution/scripts/endpoint/ @elastic/security-defend-workflows
-/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/ @elastic/security-defend-workflows
+/x-pack/test/security_solution_endpoint/ @elastic/security-defend-workflows
 /x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/ @elastic/security-defend-workflows
 /x-pack/test_serverless/shared/lib/security/kibana_roles/ @elastic/security-defend-workflows
 /x-pack/plugins/security_solution_serverless/public/upselling/sections/endpoint_management @elastic/security-defend-workflows
@@ -1733,9 +1735,9 @@ packages/react @elastic/appex-sharedux
 x-pack/plugins/actions/server/saved_objects/index.ts @elastic/response-ops @elastic/kibana-security
 x-pack/plugins/alerting/server/saved_objects/index.ts @elastic/response-ops @elastic/kibana-security
 x-pack/plugins/fleet/server/saved_objects/index.ts @elastic/fleet @elastic/kibana-security
-x-pack/plugins/observability_solution/synthetics/server/saved_objects/saved_objects.ts @elastic/obs-ux-infra_services-team @elastic/kibana-security
-x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor.ts @elastic/obs-ux-infra_services-team @elastic/kibana-security
-x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_param.ts @elastic/obs-ux-infra_services-team @elastic/kibana-security
+x-pack/plugins/observability_solution/synthetics/server/saved_objects/saved_objects.ts @elastic/obs-ux-management-team @elastic/kibana-security
+x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor.ts @elastic/obs-ux-management-team @elastic/kibana-security
+x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_param.ts @elastic/obs-ux-management-team @elastic/kibana-security
 
 # Specialised GitHub workflows for the Observability robots
 /.github/workflows/deploy-my-kibana.yml   @elastic/observablt-robots @elastic/kibana-operations
diff --git a/.github/paths-labeller.yml b/.github/paths-labeller.yml
index 49c2f6dba53b0..dbbefda24c9ac 100644
--- a/.github/paths-labeller.yml
+++ b/.github/paths-labeller.yml
@@ -14,14 +14,15 @@
     - 'packages/kbn-apm-synthtrace/**/*.*'
     - 'packages/kbn-apm-synthtrace-client/**/*.*'
     - 'packages/kbn-apm-utils/**/*.*'
-    - 'x-pack/plugins/observability_solution/synthetics/**/*.*'
     - 'x-pack/plugins/observability_solution/ux/**/*.*'
-    - 'x-pack/plugins/observability_solution/exploratory_view/**/*.*'
 - 'Team:Fleet':
     - 'x-pack/plugins/fleet/**/*.*'
     - 'x-pack/test/fleet_api_integration/**/*.*'
 - 'Team:obs-ux-management':
     - 'x-pack/plugins/observability_solution/observability/**/*.*'
+    - 'x-pack/plugins/observability_solution/slo/**/*.*'
+    - 'x-pack/plugins/observability_solution/synthetics/**/*.*'
+    - 'x-pack/plugins/observability_solution/exploratory_view/**/*.*'
 - 'Team:Obs AI Assistant':
     - 'x-pack/plugins/observability_solution/observability_ai_assistant/**/*.*'
     - 'x-pack/plugins/observability_solution/observability_ai_assistant_*/**/*.*'
diff --git a/.github/workflows/auto-approve-api-docs.yml b/.github/workflows/auto-approve-api-docs.yml
index 503ea9634d00e..11e28d46d9cc2 100644
--- a/.github/workflows/auto-approve-api-docs.yml
+++ b/.github/workflows/auto-approve-api-docs.yml
@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     branches:
       - main
     types:
diff --git a/.github/workflows/auto-approve-backports.yml b/.github/workflows/auto-approve-backports.yml
index 2f73696406d92..4c08e2bbb718c 100644
--- a/.github/workflows/auto-approve-backports.yml
+++ b/.github/workflows/auto-approve-backports.yml
@@ -1,5 +1,5 @@
 on:
-  pull_request:
+  pull_request_target:
     branches-ignore:
       - main
     types:
diff --git a/.i18nrc.json b/.i18nrc.json
index 0053dc5d2ad51..bab7cdc68d81d 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -59,6 +59,7 @@
     "flot": "packages/kbn-flot-charts/lib",
     "generateCsv": "packages/kbn-generate-csv",
     "grouping": "packages/kbn-grouping/src",
+    "alertsGrouping": "packages/kbn-alerts-grouping",
     "guidedOnboarding": "src/plugins/guided_onboarding",
     "guidedOnboardingPackage": "packages/kbn-guided-onboarding",
     "home": "src/plugins/home",
@@ -115,7 +116,7 @@
     "serverlessPackages": "packages/serverless",
     "coloring": "packages/kbn-coloring/src",
     "languageDocumentationPopover": "packages/kbn-language-documentation-popover/src",
-    "textBasedLanguages": "src/plugins/text_based_languages",
+    "esql": "src/plugins/esql",
     "esqlDataGrid": "src/plugins/esql_datagrid",
     "statusPage": "src/legacy/core_plugins/status_page",
     "telemetry": ["src/plugins/telemetry", "src/plugins/telemetry_management_section"],
diff --git a/api_docs/actions.mdx b/api_docs/actions.mdx
index 4747cbb25d843..b6fffb4194b6b 100644
--- a/api_docs/actions.mdx
+++ b/api_docs/actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/actions
 title: "actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the actions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'actions']
 ---
 import actionsObj from './actions.devdocs.json';
diff --git a/api_docs/advanced_settings.mdx b/api_docs/advanced_settings.mdx
index dc62e81a5ffc5..6492dd6984167 100644
--- a/api_docs/advanced_settings.mdx
+++ b/api_docs/advanced_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/advancedSettings
 title: "advancedSettings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the advancedSettings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'advancedSettings']
 ---
 import advancedSettingsObj from './advanced_settings.devdocs.json';
diff --git a/api_docs/ai_assistant_management_selection.mdx b/api_docs/ai_assistant_management_selection.mdx
index 23028b42ea8ab..8d2b1f6fef27c 100644
--- a/api_docs/ai_assistant_management_selection.mdx
+++ b/api_docs/ai_assistant_management_selection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiAssistantManagementSelection
 title: "aiAssistantManagementSelection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiAssistantManagementSelection plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiAssistantManagementSelection']
 ---
 import aiAssistantManagementSelectionObj from './ai_assistant_management_selection.devdocs.json';
diff --git a/api_docs/aiops.mdx b/api_docs/aiops.mdx
index a848dde158657..729b2feaf6311 100644
--- a/api_docs/aiops.mdx
+++ b/api_docs/aiops.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/aiops
 title: "aiops"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the aiops plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'aiops']
 ---
 import aiopsObj from './aiops.devdocs.json';
diff --git a/api_docs/alerting.mdx b/api_docs/alerting.mdx
index 9a88ab625db7e..830bc1ebcdbe3 100644
--- a/api_docs/alerting.mdx
+++ b/api_docs/alerting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/alerting
 title: "alerting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the alerting plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'alerting']
 ---
 import alertingObj from './alerting.devdocs.json';
diff --git a/api_docs/apm.devdocs.json b/api_docs/apm.devdocs.json
index 9890cb6043243..d88ea5a9e24d1 100644
--- a/api_docs/apm.devdocs.json
+++ b/api_docs/apm.devdocs.json
@@ -418,7 +418,7 @@
         "label": "APIEndpoint",
         "description": [],
         "signature": [
-          "\"POST /internal/apm/data_view/static\" | \"GET /internal/apm/data_view/index_pattern\" | \"GET /internal/apm/environments\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics_by_transaction_name\" | \"POST /internal/apm/services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/samples\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/error/{errorId}\" | \"GET /internal/apm/services/{serviceName}/errors/distribution\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/top_erroneous_transactions\" | \"POST /internal/apm/latency/overall_distribution/transactions\" | \"GET /internal/apm/services/{serviceName}/metrics/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/nodes\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/summary\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/functions_overview\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/active_instances\" | \"GET /internal/apm/observability_overview\" | \"GET /internal/apm/observability_overview/has_data\" | \"GET /internal/apm/service-map\" | \"GET /internal/apm/service-map/service/{serviceName}\" | \"GET /internal/apm/service-map/dependency\" | \"GET /internal/apm/services\" | \"POST /internal/apm/services/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/metadata/details\" | \"GET /internal/apm/services/{serviceName}/metadata/icons\" | \"GET /internal/apm/services/{serviceName}/agent\" | \"GET /internal/apm/services/{serviceName}/transaction_types\" | \"GET /internal/apm/services/{serviceName}/node/{serviceNodeName}/metadata\" | \"GET /api/apm/services/{serviceName}/annotation/search 2023-10-31\" | \"POST /api/apm/services/{serviceName}/annotation 2023-10-31\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}\" | \"GET /internal/apm/services/{serviceName}/throughput\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/dependencies\" | \"GET /internal/apm/services/{serviceName}/dependencies/breakdown\" | \"GET /internal/apm/services/{serviceName}/anomaly_charts\" | \"GET /internal/apm/services/{serviceName}/alerts_count\" | \"GET /internal/apm/entities/services\" | \"GET /internal/apm/service-groups\" | \"GET /internal/apm/service-group\" | \"POST /internal/apm/service-group\" | \"DELETE /internal/apm/service-group\" | \"GET /internal/apm/service-group/services\" | \"GET /internal/apm/service-group/counts\" | \"GET /internal/apm/suggestions\" | \"GET /internal/apm/traces/{traceId}\" | \"GET /internal/apm/traces\" | \"GET /internal/apm/traces/{traceId}/root_transaction\" | \"GET /internal/apm/transactions/{transactionId}\" | \"GET /internal/apm/traces/find\" | \"POST /internal/apm/traces/aggregated_critical_path\" | \"GET /internal/apm/traces/{traceId}/transactions/{transactionId}\" | \"GET /internal/apm/traces/{traceId}/spans/{spanId}\" | \"GET /internal/apm/transactions\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/latency\" | \"GET /internal/apm/services/{serviceName}/transactions/traces/samples\" | \"GET /internal/apm/services/{serviceName}/transaction/charts/breakdown\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/error_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate_by_transaction_name\" | \"GET /internal/apm/rule_types/transaction_error_rate/chart_preview\" | \"GET /internal/apm/rule_types/error_count/chart_preview\" | \"GET /internal/apm/rule_types/transaction_duration/chart_preview\" | \"GET /api/apm/settings/agent-configuration 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/view 2023-10-31\" | \"DELETE /api/apm/settings/agent-configuration 2023-10-31\" | \"PUT /api/apm/settings/agent-configuration 2023-10-31\" | \"POST /api/apm/settings/agent-configuration/search 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/environments 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/agent_name 2023-10-31\" | \"GET /internal/apm/settings/anomaly-detection/jobs\" | \"POST /internal/apm/settings/anomaly-detection/jobs\" | \"GET /internal/apm/settings/anomaly-detection/environments\" | \"POST /internal/apm/settings/anomaly-detection/update_to_v3\" | \"GET /internal/apm/settings/apm-index-settings\" | \"GET /internal/apm/settings/apm-indices\" | \"POST /internal/apm/settings/apm-indices/save\" | \"GET /internal/apm/settings/custom_links/transaction\" | \"GET /internal/apm/settings/custom_links\" | \"POST /internal/apm/settings/custom_links\" | \"PUT /internal/apm/settings/custom_links/{id}\" | \"DELETE /internal/apm/settings/custom_links/{id}\" | \"GET /api/apm/sourcemaps 2023-10-31\" | \"POST /api/apm/sourcemaps 2023-10-31\" | \"DELETE /api/apm/sourcemaps/{id} 2023-10-31\" | \"POST /internal/apm/sourcemaps/migrate_fleet_artifacts\" | \"GET /internal/apm/fleet/has_apm_policies\" | \"GET /internal/apm/fleet/agents\" | \"POST /api/apm/fleet/apm_server_schema 2023-10-31\" | \"GET /internal/apm/fleet/apm_server_schema/unsupported\" | \"GET /internal/apm/fleet/migration_check\" | \"POST /internal/apm/fleet/cloud_apm_package_policy\" | \"GET /internal/apm/fleet/java_agent_versions\" | \"GET /internal/apm/dependencies/top_dependencies\" | \"GET /internal/apm/dependencies/upstream_services\" | \"GET /internal/apm/dependencies/metadata\" | \"GET /internal/apm/dependencies/charts/latency\" | \"GET /internal/apm/dependencies/charts/throughput\" | \"GET /internal/apm/dependencies/charts/error_rate\" | \"GET /internal/apm/dependencies/operations\" | \"GET /internal/apm/dependencies/charts/distribution\" | \"GET /internal/apm/dependencies/operations/spans\" | \"GET /internal/apm/correlations/field_candidates/transactions\" | \"GET /internal/apm/correlations/field_value_stats/transactions\" | \"POST /internal/apm/correlations/field_value_pairs/transactions\" | \"POST /internal/apm/correlations/significant_correlations/transactions\" | \"POST /internal/apm/correlations/p_values/transactions\" | \"GET /internal/apm/fallback_to_transactions\" | \"GET /internal/apm/has_data\" | \"GET /internal/apm/event_metadata/{processorEvent}/{id}\" | \"GET /internal/apm/agent_keys\" | \"GET /internal/apm/agent_keys/privileges\" | \"POST /internal/apm/api_key/invalidate\" | \"POST /api/apm/agent_keys 2023-10-31\" | \"GET /internal/apm/storage_explorer\" | \"GET /internal/apm/services/{serviceName}/storage_details\" | \"GET /internal/apm/storage_chart\" | \"GET /internal/apm/storage_explorer/privileges\" | \"GET /internal/apm/storage_explorer_summary_stats\" | \"GET /internal/apm/storage_explorer/is_cross_cluster_search\" | \"GET /internal/apm/storage_explorer/get_services\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/parents\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/children\" | \"GET /internal/apm/services/{serviceName}/infrastructure_attributes\" | \"GET /internal/apm/debug-telemetry\" | \"GET /internal/apm/time_range_metadata\" | \"GET /internal/apm/settings/labs\" | \"GET /internal/apm/get_agents_per_service\" | \"GET /internal/apm/get_latest_agent_versions\" | \"GET /internal/apm/services/{serviceName}/agent_instances\" | \"GET /internal/apm/mobile-services/{serviceName}/error/http_error_rate\" | \"GET /internal/apm/mobile-services/{serviceName}/errors/groups/main_statistics\" | \"POST /internal/apm/mobile-services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/error_terms\" | \"POST /internal/apm/mobile-services/{serviceName}/crashes/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/groups/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/distribution\" | \"GET /internal/apm/services/{serviceName}/mobile/filters\" | \"GET /internal/apm/mobile-services/{serviceName}/most_used_charts\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/sessions\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/http_requests\" | \"GET /internal/apm/mobile-services/{serviceName}/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/location/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/terms\" | \"GET /internal/apm/mobile-services/{serviceName}/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/detailed_statistics\" | \"GET /internal/apm/diagnostics\" | \"POST /internal/apm/assistant/get_apm_timeseries\" | \"GET /internal/apm/assistant/get_downstream_dependencies\" | \"GET /internal/apm/services/{serviceName}/profiling/flamegraph\" | \"GET /internal/apm/profiling/status\" | \"GET /internal/apm/services/{serviceName}/profiling/functions\" | \"GET /internal/apm/services/{serviceName}/profiling/hosts/flamegraph\" | \"GET /internal/apm/services/{serviceName}/profiling/hosts/functions\" | \"POST /internal/apm/custom-dashboard\" | \"DELETE /internal/apm/custom-dashboard\" | \"GET /internal/apm/services/{serviceName}/dashboards\""
+          "\"POST /internal/apm/data_view/static\" | \"GET /internal/apm/data_view/index_pattern\" | \"GET /internal/apm/environments\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/groups/main_statistics_by_transaction_name\" | \"POST /internal/apm/services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/samples\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/error/{errorId}\" | \"GET /internal/apm/services/{serviceName}/errors/distribution\" | \"GET /internal/apm/services/{serviceName}/errors/{groupId}/top_erroneous_transactions\" | \"POST /internal/apm/latency/overall_distribution/transactions\" | \"GET /internal/apm/services/{serviceName}/metrics/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/nodes\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/charts\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/summary\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/functions_overview\" | \"GET /internal/apm/services/{serviceName}/metrics/serverless/active_instances\" | \"GET /internal/apm/observability_overview\" | \"GET /internal/apm/observability_overview/has_data\" | \"GET /internal/apm/service-map\" | \"GET /internal/apm/service-map/service/{serviceName}\" | \"GET /internal/apm/service-map/dependency\" | \"GET /internal/apm/services\" | \"POST /internal/apm/services/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/metadata/details\" | \"GET /internal/apm/services/{serviceName}/metadata/icons\" | \"GET /internal/apm/services/{serviceName}/agent\" | \"GET /internal/apm/services/{serviceName}/transaction_types\" | \"GET /internal/apm/services/{serviceName}/node/{serviceNodeName}/metadata\" | \"GET /api/apm/services/{serviceName}/annotation/search 2023-10-31\" | \"POST /api/apm/services/{serviceName}/annotation 2023-10-31\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}\" | \"GET /internal/apm/services/{serviceName}/throughput\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/main_statistics\" | \"GET /internal/apm/services/{serviceName}/service_overview_instances/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/dependencies\" | \"GET /internal/apm/services/{serviceName}/dependencies/breakdown\" | \"GET /internal/apm/services/{serviceName}/anomaly_charts\" | \"GET /internal/apm/services/{serviceName}/alerts_count\" | \"GET /internal/apm/entities/services\" | \"GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries\" | \"GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries\" | \"GET /internal/apm/service-groups\" | \"GET /internal/apm/service-group\" | \"POST /internal/apm/service-group\" | \"DELETE /internal/apm/service-group\" | \"GET /internal/apm/service-group/services\" | \"GET /internal/apm/service-group/counts\" | \"GET /internal/apm/suggestions\" | \"GET /internal/apm/traces/{traceId}\" | \"GET /internal/apm/traces\" | \"GET /internal/apm/traces/{traceId}/root_transaction\" | \"GET /internal/apm/transactions/{transactionId}\" | \"GET /internal/apm/traces/find\" | \"POST /internal/apm/traces/aggregated_critical_path\" | \"GET /internal/apm/traces/{traceId}/transactions/{transactionId}\" | \"GET /internal/apm/traces/{traceId}/spans/{spanId}\" | \"GET /internal/apm/transactions\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/main_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/groups/detailed_statistics\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/latency\" | \"GET /internal/apm/services/{serviceName}/transactions/traces/samples\" | \"GET /internal/apm/services/{serviceName}/transaction/charts/breakdown\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/error_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate\" | \"GET /internal/apm/services/{serviceName}/transactions/charts/coldstart_rate_by_transaction_name\" | \"GET /internal/apm/rule_types/transaction_error_rate/chart_preview\" | \"GET /internal/apm/rule_types/error_count/chart_preview\" | \"GET /internal/apm/rule_types/transaction_duration/chart_preview\" | \"GET /api/apm/settings/agent-configuration 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/view 2023-10-31\" | \"DELETE /api/apm/settings/agent-configuration 2023-10-31\" | \"PUT /api/apm/settings/agent-configuration 2023-10-31\" | \"POST /api/apm/settings/agent-configuration/search 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/environments 2023-10-31\" | \"GET /api/apm/settings/agent-configuration/agent_name 2023-10-31\" | \"GET /internal/apm/settings/anomaly-detection/jobs\" | \"POST /internal/apm/settings/anomaly-detection/jobs\" | \"GET /internal/apm/settings/anomaly-detection/environments\" | \"POST /internal/apm/settings/anomaly-detection/update_to_v3\" | \"GET /internal/apm/settings/apm-index-settings\" | \"GET /internal/apm/settings/apm-indices\" | \"POST /internal/apm/settings/apm-indices/save\" | \"GET /internal/apm/settings/custom_links/transaction\" | \"GET /internal/apm/settings/custom_links\" | \"POST /internal/apm/settings/custom_links\" | \"PUT /internal/apm/settings/custom_links/{id}\" | \"DELETE /internal/apm/settings/custom_links/{id}\" | \"GET /api/apm/sourcemaps 2023-10-31\" | \"POST /api/apm/sourcemaps 2023-10-31\" | \"DELETE /api/apm/sourcemaps/{id} 2023-10-31\" | \"POST /internal/apm/sourcemaps/migrate_fleet_artifacts\" | \"GET /internal/apm/fleet/has_apm_policies\" | \"GET /internal/apm/fleet/agents\" | \"POST /api/apm/fleet/apm_server_schema 2023-10-31\" | \"GET /internal/apm/fleet/apm_server_schema/unsupported\" | \"GET /internal/apm/fleet/migration_check\" | \"POST /internal/apm/fleet/cloud_apm_package_policy\" | \"GET /internal/apm/fleet/java_agent_versions\" | \"GET /internal/apm/dependencies/top_dependencies\" | \"GET /internal/apm/dependencies/upstream_services\" | \"GET /internal/apm/dependencies/metadata\" | \"GET /internal/apm/dependencies/charts/latency\" | \"GET /internal/apm/dependencies/charts/throughput\" | \"GET /internal/apm/dependencies/charts/error_rate\" | \"GET /internal/apm/dependencies/operations\" | \"GET /internal/apm/dependencies/charts/distribution\" | \"GET /internal/apm/dependencies/operations/spans\" | \"GET /internal/apm/correlations/field_candidates/transactions\" | \"GET /internal/apm/correlations/field_value_stats/transactions\" | \"POST /internal/apm/correlations/field_value_pairs/transactions\" | \"POST /internal/apm/correlations/significant_correlations/transactions\" | \"POST /internal/apm/correlations/p_values/transactions\" | \"GET /internal/apm/fallback_to_transactions\" | \"GET /internal/apm/has_data\" | \"GET /internal/apm/event_metadata/{processorEvent}/{id}\" | \"GET /internal/apm/agent_keys\" | \"GET /internal/apm/agent_keys/privileges\" | \"POST /internal/apm/api_key/invalidate\" | \"POST /api/apm/agent_keys 2023-10-31\" | \"GET /internal/apm/storage_explorer\" | \"GET /internal/apm/services/{serviceName}/storage_details\" | \"GET /internal/apm/storage_chart\" | \"GET /internal/apm/storage_explorer/privileges\" | \"GET /internal/apm/storage_explorer_summary_stats\" | \"GET /internal/apm/storage_explorer/is_cross_cluster_search\" | \"GET /internal/apm/storage_explorer/get_services\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/parents\" | \"GET /internal/apm/traces/{traceId}/span_links/{spanId}/children\" | \"GET /internal/apm/services/{serviceName}/infrastructure_attributes\" | \"GET /internal/apm/debug-telemetry\" | \"GET /internal/apm/time_range_metadata\" | \"GET /internal/apm/settings/labs\" | \"GET /internal/apm/get_agents_per_service\" | \"GET /internal/apm/get_latest_agent_versions\" | \"GET /internal/apm/services/{serviceName}/agent_instances\" | \"GET /internal/apm/mobile-services/{serviceName}/error/http_error_rate\" | \"GET /internal/apm/mobile-services/{serviceName}/errors/groups/main_statistics\" | \"POST /internal/apm/mobile-services/{serviceName}/errors/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/error_terms\" | \"POST /internal/apm/mobile-services/{serviceName}/crashes/groups/detailed_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/groups/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/crashes/distribution\" | \"GET /internal/apm/services/{serviceName}/mobile/filters\" | \"GET /internal/apm/mobile-services/{serviceName}/most_used_charts\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/sessions\" | \"GET /internal/apm/mobile-services/{serviceName}/transactions/charts/http_requests\" | \"GET /internal/apm/mobile-services/{serviceName}/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/location/stats\" | \"GET /internal/apm/mobile-services/{serviceName}/terms\" | \"GET /internal/apm/mobile-services/{serviceName}/main_statistics\" | \"GET /internal/apm/mobile-services/{serviceName}/detailed_statistics\" | \"GET /internal/apm/diagnostics\" | \"POST /internal/apm/assistant/get_apm_timeseries\" | \"GET /internal/apm/assistant/get_downstream_dependencies\" | \"GET /internal/apm/services/{serviceName}/profiling/flamegraph\" | \"GET /internal/apm/profiling/status\" | \"GET /internal/apm/services/{serviceName}/profiling/functions\" | \"GET /internal/apm/services/{serviceName}/profiling/hosts/flamegraph\" | \"GET /internal/apm/services/{serviceName}/profiling/hosts/functions\" | \"POST /internal/apm/custom-dashboard\" | \"DELETE /internal/apm/custom-dashboard\" | \"GET /internal/apm/services/{serviceName}/dashboards\""
         ],
         "path": "x-pack/plugins/observability_solution/apm/server/routes/apm_routes/get_global_apm_server_route_repository.ts",
         "deprecated": false,
@@ -472,14 +472,24 @@
           "<{ serviceName: ",
           "StringC",
           "; }>; query: ",
+          "IntersectionC",
+          "<[",
           "TypeC",
           "<{ start: ",
           "Type",
           "<number, string, unknown>; end: ",
           "Type",
-          "<number, string, unknown>; }>; }> | undefined; handler: ({}: ",
+          "<number, string, unknown>; }>, ",
+          "PartialC",
+          "<{ checkFor: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"entities\">, ",
+          "LiteralC",
+          "<\"services\">]>; }>]>; }> | undefined; handler: ({}: ",
           "APMRouteHandlerResources",
-          " & { params: { path: { serviceName: string; }; query: { start: number; end: number; }; }; }) => Promise<{ serviceDashboards: ",
+          " & { params: { path: { serviceName: string; }; query: { start: number; end: number; } & { checkFor?: \"entities\" | \"services\" | undefined; }; }; }) => Promise<{ serviceDashboards: ",
           "SavedApmCustomDashboard",
           "[]; }>; } & ",
           "APMRouteCreateOptions",
@@ -5661,6 +5671,114 @@
           "SavedServiceGroup",
           "[]; }>; } & ",
           "APMRouteCreateOptions",
+          "; \"GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries\": { endpoint: \"GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries\"; params?: ",
+          "TypeC",
+          "<{ path: ",
+          "TypeC",
+          "<{ serviceName: ",
+          "StringC",
+          "; }>; query: ",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ environment: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"ENVIRONMENT_NOT_DEFINED\">, ",
+          "LiteralC",
+          "<\"ENVIRONMENT_ALL\">, ",
+          "BrandC",
+          "<",
+          "StringC",
+          ", ",
+          {
+            "pluginId": "@kbn/io-ts-utils",
+            "scope": "common",
+            "docId": "kibKbnIoTsUtilsPluginApi",
+            "section": "def-common.NonEmptyStringBrand",
+            "text": "NonEmptyStringBrand"
+          },
+          ">]>; }>, ",
+          "TypeC",
+          "<{ kuery: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ start: ",
+          "Type",
+          "<number, string, unknown>; end: ",
+          "Type",
+          "<number, string, unknown>; }>]>; }> | undefined; handler: ({}: ",
+          "APMRouteHandlerResources",
+          " & { params: { path: { serviceName: string; }; query: { environment: \"ENVIRONMENT_NOT_DEFINED\" | \"ENVIRONMENT_ALL\" | ",
+          "Branded",
+          "<string, ",
+          {
+            "pluginId": "@kbn/io-ts-utils",
+            "scope": "common",
+            "docId": "kibKbnIoTsUtilsPluginApi",
+            "section": "def-common.NonEmptyStringBrand",
+            "text": "NonEmptyStringBrand"
+          },
+          ">; } & { kuery: string; } & { start: number; end: number; }; }; }) => Promise<{ currentPeriod: ",
+          "LogsErrorRateTimeseriesReturnType",
+          "; }>; } & ",
+          "APMRouteCreateOptions",
+          "; \"GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries\": { endpoint: \"GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries\"; params?: ",
+          "TypeC",
+          "<{ path: ",
+          "TypeC",
+          "<{ serviceName: ",
+          "StringC",
+          "; }>; query: ",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ environment: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"ENVIRONMENT_NOT_DEFINED\">, ",
+          "LiteralC",
+          "<\"ENVIRONMENT_ALL\">, ",
+          "BrandC",
+          "<",
+          "StringC",
+          ", ",
+          {
+            "pluginId": "@kbn/io-ts-utils",
+            "scope": "common",
+            "docId": "kibKbnIoTsUtilsPluginApi",
+            "section": "def-common.NonEmptyStringBrand",
+            "text": "NonEmptyStringBrand"
+          },
+          ">]>; }>, ",
+          "TypeC",
+          "<{ kuery: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ start: ",
+          "Type",
+          "<number, string, unknown>; end: ",
+          "Type",
+          "<number, string, unknown>; }>]>; }> | undefined; handler: ({}: ",
+          "APMRouteHandlerResources",
+          " & { params: { path: { serviceName: string; }; query: { environment: \"ENVIRONMENT_NOT_DEFINED\" | \"ENVIRONMENT_ALL\" | ",
+          "Branded",
+          "<string, ",
+          {
+            "pluginId": "@kbn/io-ts-utils",
+            "scope": "common",
+            "docId": "kibKbnIoTsUtilsPluginApi",
+            "section": "def-common.NonEmptyStringBrand",
+            "text": "NonEmptyStringBrand"
+          },
+          ">; } & { kuery: string; } & { start: number; end: number; }; }; }) => Promise<{ currentPeriod: ",
+          "LogsRateTimeseriesReturnType",
+          "; }>; } & ",
+          "APMRouteCreateOptions",
           "; \"GET /internal/apm/entities/services\": { endpoint: \"GET /internal/apm/entities/services\"; params?: ",
           "TypeC",
           "<{ query: ",
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
index a458a7510759d..3e3688dce2c04 100644
--- a/api_docs/apm.mdx
+++ b/api_docs/apm.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apm
 title: "apm"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apm plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apm']
 ---
 import apmObj from './apm.devdocs.json';
diff --git a/api_docs/apm_data_access.mdx b/api_docs/apm_data_access.mdx
index 3cdbbc06563a1..21b67dd6160cc 100644
--- a/api_docs/apm_data_access.mdx
+++ b/api_docs/apm_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/apmDataAccess
 title: "apmDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the apmDataAccess plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'apmDataAccess']
 ---
 import apmDataAccessObj from './apm_data_access.devdocs.json';
diff --git a/api_docs/assets_data_access.mdx b/api_docs/assets_data_access.mdx
index 5a3e457132829..3ea04a6401275 100644
--- a/api_docs/assets_data_access.mdx
+++ b/api_docs/assets_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/assetsDataAccess
 title: "assetsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the assetsDataAccess plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'assetsDataAccess']
 ---
 import assetsDataAccessObj from './assets_data_access.devdocs.json';
diff --git a/api_docs/banners.mdx b/api_docs/banners.mdx
index a5cf4003f841e..ecf938f654271 100644
--- a/api_docs/banners.mdx
+++ b/api_docs/banners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/banners
 title: "banners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the banners plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'banners']
 ---
 import bannersObj from './banners.devdocs.json';
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index e7a24b638dd17..a9ea60f5a4f42 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/bfetch
 title: "bfetch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the bfetch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'bfetch']
 ---
 import bfetchObj from './bfetch.devdocs.json';
diff --git a/api_docs/canvas.mdx b/api_docs/canvas.mdx
index 0ae826313a983..24d534fd65a08 100644
--- a/api_docs/canvas.mdx
+++ b/api_docs/canvas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/canvas
 title: "canvas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the canvas plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'canvas']
 ---
 import canvasObj from './canvas.devdocs.json';
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 16e773f455e28..e322a93eaebd9 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cases
 title: "cases"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cases plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cases']
 ---
 import casesObj from './cases.devdocs.json';
diff --git a/api_docs/charts.mdx b/api_docs/charts.mdx
index 0d73eba87c794..de9a785c6f3ed 100644
--- a/api_docs/charts.mdx
+++ b/api_docs/charts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/charts
 title: "charts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the charts plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'charts']
 ---
 import chartsObj from './charts.devdocs.json';
diff --git a/api_docs/cloud.mdx b/api_docs/cloud.mdx
index a3c6b7dc61be1..f502cdf61f118 100644
--- a/api_docs/cloud.mdx
+++ b/api_docs/cloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloud
 title: "cloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloud plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloud']
 ---
 import cloudObj from './cloud.devdocs.json';
diff --git a/api_docs/cloud_data_migration.mdx b/api_docs/cloud_data_migration.mdx
index 3d1741ee97cc3..1e031cba557ed 100644
--- a/api_docs/cloud_data_migration.mdx
+++ b/api_docs/cloud_data_migration.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDataMigration
 title: "cloudDataMigration"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDataMigration plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDataMigration']
 ---
 import cloudDataMigrationObj from './cloud_data_migration.devdocs.json';
diff --git a/api_docs/cloud_defend.devdocs.json b/api_docs/cloud_defend.devdocs.json
index a147bd238d697..fc5809fff4cc6 100644
--- a/api_docs/cloud_defend.devdocs.json
+++ b/api_docs/cloud_defend.devdocs.json
@@ -739,7 +739,7 @@
         "label": "CloudDefendStatusCode",
         "description": [],
         "signature": [
-          "\"unprivileged\" | \"indexed\" | \"indexing\" | \"index-timeout\" | \"not-deployed\" | \"not-installed\""
+          "\"indexed\" | \"unprivileged\" | \"indexing\" | \"index-timeout\" | \"not-deployed\" | \"not-installed\""
         ],
         "path": "x-pack/plugins/cloud_defend/common/v1.ts",
         "deprecated": false,
diff --git a/api_docs/cloud_defend.mdx b/api_docs/cloud_defend.mdx
index 98baf5078cb43..20c6b22cbb41b 100644
--- a/api_docs/cloud_defend.mdx
+++ b/api_docs/cloud_defend.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudDefend
 title: "cloudDefend"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudDefend plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudDefend']
 ---
 import cloudDefendObj from './cloud_defend.devdocs.json';
diff --git a/api_docs/cloud_experiments.mdx b/api_docs/cloud_experiments.mdx
index 2e146c9771c96..ae517fc661661 100644
--- a/api_docs/cloud_experiments.mdx
+++ b/api_docs/cloud_experiments.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudExperiments
 title: "cloudExperiments"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudExperiments plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudExperiments']
 ---
 import cloudExperimentsObj from './cloud_experiments.devdocs.json';
diff --git a/api_docs/cloud_security_posture.mdx b/api_docs/cloud_security_posture.mdx
index 03402c8c53987..847acbfa0de75 100644
--- a/api_docs/cloud_security_posture.mdx
+++ b/api_docs/cloud_security_posture.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/cloudSecurityPosture
 title: "cloudSecurityPosture"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the cloudSecurityPosture plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'cloudSecurityPosture']
 ---
 import cloudSecurityPostureObj from './cloud_security_posture.devdocs.json';
diff --git a/api_docs/console.mdx b/api_docs/console.mdx
index 3ba10527aeae4..0825074a8d879 100644
--- a/api_docs/console.mdx
+++ b/api_docs/console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/console
 title: "console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the console plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'console']
 ---
 import consoleObj from './console.devdocs.json';
diff --git a/api_docs/content_management.mdx b/api_docs/content_management.mdx
index 449310eac3fa5..eb4b9b449e09b 100644
--- a/api_docs/content_management.mdx
+++ b/api_docs/content_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/contentManagement
 title: "contentManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the contentManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'contentManagement']
 ---
 import contentManagementObj from './content_management.devdocs.json';
diff --git a/api_docs/controls.devdocs.json b/api_docs/controls.devdocs.json
index 06a783deb4ac9..0596e5df7d55e 100644
--- a/api_docs/controls.devdocs.json
+++ b/api_docs/controls.devdocs.json
@@ -4897,7 +4897,7 @@
             "label": "chainingSystem",
             "description": [],
             "signature": [
-              "\"HIERARCHICAL\" | \"NONE\""
+              "\"NONE\" | \"HIERARCHICAL\""
             ],
             "path": "src/plugins/controls/common/control_group/types.ts",
             "deprecated": false,
@@ -7174,7 +7174,7 @@
             "label": "chainingSystem",
             "description": [],
             "signature": [
-              "\"HIERARCHICAL\" | \"NONE\""
+              "\"NONE\" | \"HIERARCHICAL\""
             ],
             "path": "src/plugins/controls/common/control_group/types.ts",
             "deprecated": false,
@@ -7728,7 +7728,7 @@
         "label": "ControlGroupChainingSystem",
         "description": [],
         "signature": [
-          "\"HIERARCHICAL\" | \"NONE\""
+          "\"NONE\" | \"HIERARCHICAL\""
         ],
         "path": "src/plugins/controls/common/control_group/types.ts",
         "deprecated": false,
diff --git a/api_docs/controls.mdx b/api_docs/controls.mdx
index 1992af56c5a13..ed3402a2c87db 100644
--- a/api_docs/controls.mdx
+++ b/api_docs/controls.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/controls
 title: "controls"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the controls plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'controls']
 ---
 import controlsObj from './controls.devdocs.json';
diff --git a/api_docs/custom_integrations.mdx b/api_docs/custom_integrations.mdx
index dc1ad335a03ba..f93ee1c9104b1 100644
--- a/api_docs/custom_integrations.mdx
+++ b/api_docs/custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/customIntegrations
 title: "customIntegrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the customIntegrations plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'customIntegrations']
 ---
 import customIntegrationsObj from './custom_integrations.devdocs.json';
diff --git a/api_docs/dashboard.devdocs.json b/api_docs/dashboard.devdocs.json
index de3639ca81e09..96fa2e226b69f 100644
--- a/api_docs/dashboard.devdocs.json
+++ b/api_docs/dashboard.devdocs.json
@@ -1105,9 +1105,9 @@
           "label": "registerDashboardPanelPlacementSetting",
           "description": [],
           "signature": [
-            "(embeddableType: string, getPanelPlacementSettings: ",
+            "<SerializedState extends object = object>(embeddableType: string, getPanelPlacementSettings: ",
             "GetPanelPlacementSettings",
-            "<object>) => void"
+            "<SerializedState>) => void"
           ],
           "path": "src/plugins/dashboard/public/plugin.tsx",
           "deprecated": false,
@@ -1137,7 +1137,7 @@
               "description": [],
               "signature": [
                 "GetPanelPlacementSettings",
-                "<object>"
+                "<SerializedState>"
               ],
               "path": "src/plugins/dashboard/public/plugin.tsx",
               "deprecated": false,
diff --git a/api_docs/dashboard.mdx b/api_docs/dashboard.mdx
index 1907d6d2bffa5..bf7dabe1a8958 100644
--- a/api_docs/dashboard.mdx
+++ b/api_docs/dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboard
 title: "dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboard plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboard']
 ---
 import dashboardObj from './dashboard.devdocs.json';
diff --git a/api_docs/dashboard_enhanced.mdx b/api_docs/dashboard_enhanced.mdx
index 992fa5ef3a7e7..8621e73a61b7a 100644
--- a/api_docs/dashboard_enhanced.mdx
+++ b/api_docs/dashboard_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dashboardEnhanced
 title: "dashboardEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dashboardEnhanced plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dashboardEnhanced']
 ---
 import dashboardEnhancedObj from './dashboard_enhanced.devdocs.json';
diff --git a/api_docs/data.mdx b/api_docs/data.mdx
index e5a7220a0c4a1..1b14f907dc075 100644
--- a/api_docs/data.mdx
+++ b/api_docs/data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data
 title: "data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data']
 ---
 import dataObj from './data.devdocs.json';
diff --git a/api_docs/data_quality.devdocs.json b/api_docs/data_quality.devdocs.json
index 9ed104a5f220d..1abc27872df38 100644
--- a/api_docs/data_quality.devdocs.json
+++ b/api_docs/data_quality.devdocs.json
@@ -47,70 +47,9 @@
   "common": {
     "classes": [],
     "functions": [],
-    "interfaces": [
-      {
-        "parentPluginId": "dataQuality",
-        "id": "def-common.DataQualityLocatorParams",
-        "type": "Interface",
-        "tags": [],
-        "label": "DataQualityLocatorParams",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "dataQuality",
-            "scope": "common",
-            "docId": "kibDataQualityPluginApi",
-            "section": "def-common.DataQualityLocatorParams",
-            "text": "DataQualityLocatorParams"
-          },
-          " extends ",
-          {
-            "pluginId": "@kbn/utility-types",
-            "scope": "common",
-            "docId": "kibKbnUtilityTypesPluginApi",
-            "section": "def-common.SerializableRecord",
-            "text": "SerializableRecord"
-          }
-        ],
-        "path": "x-pack/plugins/data_quality/common/locators/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "dataQuality",
-            "id": "def-common.DataQualityLocatorParams.filters",
-            "type": "Object",
-            "tags": [],
-            "label": "filters",
-            "description": [],
-            "signature": [
-              "Filters | undefined"
-            ],
-            "path": "x-pack/plugins/data_quality/common/locators/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
+    "interfaces": [],
     "enums": [],
     "misc": [
-      {
-        "parentPluginId": "dataQuality",
-        "id": "def-common.DATA_QUALITY_LOCATOR_ID",
-        "type": "string",
-        "tags": [],
-        "label": "DATA_QUALITY_LOCATOR_ID",
-        "description": [],
-        "signature": [
-          "\"DATA_QUALITY_LOCATOR\""
-        ],
-        "path": "x-pack/plugins/data_quality/common/locators/types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "dataQuality",
         "id": "def-common.DATA_QUALITY_URL_STATE_KEY",
diff --git a/api_docs/data_quality.mdx b/api_docs/data_quality.mdx
index 9811b3652fa6c..e3303471571cd 100644
--- a/api_docs/data_quality.mdx
+++ b/api_docs/data_quality.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataQuality
 title: "dataQuality"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataQuality plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataQuality']
 ---
 import dataQualityObj from './data_quality.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 8 | 0 | 8 | 0 |
+| 5 | 0 | 5 | 0 |
 
 ## Client
 
@@ -33,9 +33,6 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 ## Common
 
-### Interfaces
-<DocDefinitionList data={dataQualityObj.common.interfaces}/>
-
 ### Consts, variables and types
 <DocDefinitionList data={dataQualityObj.common.misc}/>
 
diff --git a/api_docs/data_query.mdx b/api_docs/data_query.mdx
index d1accbc8147be..234d0de08b169 100644
--- a/api_docs/data_query.mdx
+++ b/api_docs/data_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-query
 title: "data.query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.query plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.query']
 ---
 import dataQueryObj from './data_query.devdocs.json';
diff --git a/api_docs/data_search.mdx b/api_docs/data_search.mdx
index 26185cb25bab9..174dfd5a5f487 100644
--- a/api_docs/data_search.mdx
+++ b/api_docs/data_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/data-search
 title: "data.search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the data.search plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'data.search']
 ---
 import dataSearchObj from './data_search.devdocs.json';
diff --git a/api_docs/data_view_editor.mdx b/api_docs/data_view_editor.mdx
index 3b1afc2f13ff6..2d73601ae56a8 100644
--- a/api_docs/data_view_editor.mdx
+++ b/api_docs/data_view_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewEditor
 title: "dataViewEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewEditor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewEditor']
 ---
 import dataViewEditorObj from './data_view_editor.devdocs.json';
diff --git a/api_docs/data_view_field_editor.mdx b/api_docs/data_view_field_editor.mdx
index 8f874598ff42e..ea063ed0ddeeb 100644
--- a/api_docs/data_view_field_editor.mdx
+++ b/api_docs/data_view_field_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewFieldEditor
 title: "dataViewFieldEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewFieldEditor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewFieldEditor']
 ---
 import dataViewFieldEditorObj from './data_view_field_editor.devdocs.json';
diff --git a/api_docs/data_view_management.mdx b/api_docs/data_view_management.mdx
index a99ef71bca1e3..477ea83571529 100644
--- a/api_docs/data_view_management.mdx
+++ b/api_docs/data_view_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViewManagement
 title: "dataViewManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViewManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViewManagement']
 ---
 import dataViewManagementObj from './data_view_management.devdocs.json';
diff --git a/api_docs/data_views.devdocs.json b/api_docs/data_views.devdocs.json
index 0b0e2fb4147bb..611d75c419502 100644
--- a/api_docs/data_views.devdocs.json
+++ b/api_docs/data_views.devdocs.json
@@ -12992,6 +12992,10 @@
                 "plugin": "controls",
                 "path": "src/plugins/controls/public/services/options_list/options_list_service.ts"
               },
+              {
+                "plugin": "@kbn/lens-embeddable-utils",
+                "path": "packages/kbn-lens-embeddable-utils/config_builder/columns/breakdown.ts"
+              },
               {
                 "plugin": "triggersActionsUi",
                 "path": "x-pack/plugins/triggers_actions_ui/public/common/lib/data_apis.ts"
@@ -13116,10 +13120,6 @@
                 "plugin": "ml",
                 "path": "x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/source_selection/source_selection.tsx"
               },
-              {
-                "plugin": "@kbn/lens-embeddable-utils",
-                "path": "packages/kbn-lens-embeddable-utils/config_builder/columns/breakdown.ts"
-              },
               {
                 "plugin": "@kbn/ml-data-view-utils",
                 "path": "x-pack/packages/ml/data_view_utils/actions/data_view_handler.ts"
diff --git a/api_docs/data_views.mdx b/api_docs/data_views.mdx
index 0c3df626e6016..10a355586b1b7 100644
--- a/api_docs/data_views.mdx
+++ b/api_docs/data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataViews
 title: "dataViews"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataViews plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataViews']
 ---
 import dataViewsObj from './data_views.devdocs.json';
diff --git a/api_docs/data_visualizer.mdx b/api_docs/data_visualizer.mdx
index c980289746483..fb4dbd51a2442 100644
--- a/api_docs/data_visualizer.mdx
+++ b/api_docs/data_visualizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/dataVisualizer
 title: "dataVisualizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the dataVisualizer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'dataVisualizer']
 ---
 import dataVisualizerObj from './data_visualizer.devdocs.json';
diff --git a/api_docs/dataset_quality.devdocs.json b/api_docs/dataset_quality.devdocs.json
index 48297e463fbda..e585856f949a4 100644
--- a/api_docs/dataset_quality.devdocs.json
+++ b/api_docs/dataset_quality.devdocs.json
@@ -159,7 +159,7 @@
           "KeyofC",
           "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; }; }; }) => Promise<{ integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; dashboards?: { id: string; title: string; }[] | undefined; })[]; }>; } & ",
+          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; }; }; }) => Promise<{ integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; })[]; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; \"GET /internal/dataset_quality/data_streams/{dataStream}/settings\": { endpoint: \"GET /internal/dataset_quality/data_streams/{dataStream}/settings\"; params?: ",
           "TypeC",
@@ -169,7 +169,7 @@
           "StringC",
           "; }>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { path: { dataStream: string; }; }; }) => Promise<{ createdOn?: number | null | undefined; }>; } & ",
+          " & { params: { path: { dataStream: string; }; }; }) => Promise<{ createdOn?: number | null | undefined; integration?: string | undefined; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; \"GET /internal/dataset_quality/data_streams/{dataStream}/details\": { endpoint: \"GET /internal/dataset_quality/data_streams/{dataStream}/details\"; params?: ",
           "TypeC",
@@ -314,7 +314,7 @@
           "KeyofC",
           "<{ logs: null; metrics: null; traces: null; synthetics: null; profiling: null; }>; }>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; }; }; }) => Promise<{ integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; dashboards?: { id: string; title: string; }[] | undefined; })[]; }>; } & ",
+          " & { params: { query: { type?: \"metrics\" | \"synthetics\" | \"traces\" | \"logs\" | \"profiling\" | undefined; }; }; }) => Promise<{ integrations: ({ name: string; } & { title?: string | undefined; version?: string | undefined; icons?: ({ path: string; src: string; } & { title?: string | undefined; size?: string | undefined; type?: string | undefined; })[] | undefined; datasets?: { [x: string]: string; } | undefined; })[]; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; \"GET /internal/dataset_quality/data_streams/{dataStream}/settings\": { endpoint: \"GET /internal/dataset_quality/data_streams/{dataStream}/settings\"; params?: ",
           "TypeC",
@@ -324,7 +324,7 @@
           "StringC",
           "; }>; }> | undefined; handler: ({}: ",
           "DatasetQualityRouteHandlerResources",
-          " & { params: { path: { dataStream: string; }; }; }) => Promise<{ createdOn?: number | null | undefined; }>; } & ",
+          " & { params: { path: { dataStream: string; }; }; }) => Promise<{ createdOn?: number | null | undefined; integration?: string | undefined; }>; } & ",
           "DatasetQualityRouteCreateOptions",
           "; \"GET /internal/dataset_quality/data_streams/{dataStream}/details\": { endpoint: \"GET /internal/dataset_quality/data_streams/{dataStream}/details\"; params?: ",
           "TypeC",
diff --git a/api_docs/dataset_quality.mdx b/api_docs/dataset_quality.mdx
index 153062b25a0f6..4dabd7b5e9c45 100644
--- a/api_docs/dataset_quality.mdx
+++ b/api_docs/dataset_quality.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/datasetQuality
 title: "datasetQuality"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the datasetQuality plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'datasetQuality']
 ---
 import datasetQualityObj from './dataset_quality.devdocs.json';
diff --git a/api_docs/deprecations_by_api.mdx b/api_docs/deprecations_by_api.mdx
index b4f9423a76875..a07ed2211d123 100644
--- a/api_docs/deprecations_by_api.mdx
+++ b/api_docs/deprecations_by_api.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByApi
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-api
 title: Deprecated API usage by API
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -17,8 +17,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | Deprecated API | Referencing plugin(s) | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibAlertingPluginApi" section="def-public.PluginSetupContract.registerNavigation" text="registerNavigation"/> | ml, stackAlerts | - |
-| <DocLink id="kibDataViewsPluginApi" section="def-common.AbstractDataView.title" text="title"/> | data, @kbn/search-errors, savedObjectsManagement, unifiedSearch, @kbn/unified-field-list, lens, controls, triggersActionsUi, dataVisualizer, canvas, presentationUtil, logsShared, fleet, ml, @kbn/lens-embeddable-utils, @kbn/ml-data-view-utils, enterpriseSearch, graph, visTypeTimeseries, exploratoryView, stackAlerts, infra, securitySolution, timelines, transform, upgradeAssistant, uptime, ux, maps, dataViewManagement, eventAnnotationListing, inputControlVis, visDefaultEditor, visTypeTimelion, visTypeVega | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | encryptedSavedObjects, ml, securitySolution | - |
+| <DocLink id="kibDataViewsPluginApi" section="def-common.AbstractDataView.title" text="title"/> | data, @kbn/search-errors, savedObjectsManagement, unifiedSearch, @kbn/unified-field-list, lens, controls, @kbn/lens-embeddable-utils, triggersActionsUi, dataVisualizer, canvas, presentationUtil, logsShared, fleet, ml, @kbn/ml-data-view-utils, enterpriseSearch, graph, visTypeTimeseries, exploratoryView, stackAlerts, infra, securitySolution, timelines, transform, upgradeAssistant, uptime, ux, maps, dataViewManagement, eventAnnotationListing, inputControlVis, visDefaultEditor, visTypeTimelion, visTypeVega | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | ml, securitySolution | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authz" text="authz"/> | actions, savedObjectsTagging, ml, enterpriseSearch | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SimpleSavedObject" text="SimpleSavedObject"/> | @kbn/core-saved-objects-browser-internal, @kbn/core, savedObjects, visualizations, aiops, dataVisualizer, ml, dashboardEnhanced, graph, lens, securitySolution, eventAnnotation, @kbn/core-saved-objects-browser-mocks | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttributes" text="SavedObjectAttributes"/> | @kbn/core, savedObjects, embeddable, visualizations, canvas, graph, ml, @kbn/core-saved-objects-common, @kbn/core-saved-objects-server, actions, @kbn/alerting-types, alerting, savedSearch, enterpriseSearch, securitySolution, taskManager, @kbn/core-saved-objects-server-internal, @kbn/core-saved-objects-api-server | - |
@@ -39,7 +39,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDataPluginApi" section="def-common.EqlSearchStrategyRequest.options" text="options"/> | securitySolution | - |
 | <DocLink id="kibFleetPluginApi" section="def-public.NewPackagePolicy.policy_id" text="policy_id"/> | cloudDefend, osquery, securitySolution, synthetics | - |
 | <DocLink id="kibFleetPluginApi" section="def-common.NewPackagePolicy.policy_id" text="policy_id"/> | cloudDefend, osquery, securitySolution, synthetics | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.authc" text="authc"/> | alerting, observabilityAIAssistant, fleet, cloudSecurityPosture, enterpriseSearch, securitySolution, serverlessSearch, transform, upgradeAssistant, apm, entityManager, observabilityOnboarding, synthetics, security | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.userProfiles" text="userProfiles"/> | cases, securitySolution, security | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.DeprecatedCellValueElementProps" text="DeprecatedCellValueElementProps"/> | @kbn/securitysolution-data-table, securitySolution | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.DeprecatedRowRenderer" text="DeprecatedRowRenderer"/> | @kbn/securitysolution-data-table, securitySolution | - |
@@ -66,8 +65,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSecuritysolutionListConstantsPluginApi" section="def-common.ENDPOINT_BLOCKLISTS_LIST_DESCRIPTION" text="ENDPOINT_BLOCKLISTS_LIST_DESCRIPTION"/> | securitySolution | - |
 | <DocLink id="kibKbnUiThemePluginApi" section="def-common.darkMode" text="darkMode"/> | @kbn/monaco, securitySolution | - |
 | <DocLink id="kibDiscoverPluginApi" section="def-common.DiscoverAppLocatorParams.indexPatternId" text="indexPatternId"/> | fleet, cloudSecurityPosture, exploratoryView, osquery, synthetics | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.authc" text="authc"/> | alerting, observabilityAIAssistant, fleet, cloudSecurityPosture, enterpriseSearch, serverlessSearch, transform, upgradeAssistant, apm, entityManager, observabilityOnboarding, synthetics, security | - |
 | <DocLink id="kibTaskManagerPluginApi" section="def-server.TaskManagerSetupContract.index" text="index"/> | actions, alerting | - |
-| <DocLink id="kibEmbeddablePluginApi" section="def-public.EmbeddableSetup.registerEmbeddableFactory" text="registerEmbeddableFactory"/> | visualizations, lens, controls, dashboard, discover, links | - |
+| <DocLink id="kibEmbeddablePluginApi" section="def-public.EmbeddableSetup.registerEmbeddableFactory" text="registerEmbeddableFactory"/> | visualizations, lens, controls, dashboard, discover | - |
 | <DocLink id="kibSharePluginApi" section="def-public.ShareContext.shareableUrlForSavedObject" text="shareableUrlForSavedObject"/> | discover, @kbn/reporting-public | - |
 | <DocLink id="kibUiActionsPluginApi" section="def-public.UiActionsService.executeTriggerActions" text="executeTriggerActions"/> | data, discover, imageEmbeddable, embeddable | - |
 | <DocLink id="kibKbnCoreLifecycleBrowserPluginApi" section="def-common.CoreStart.savedObjects" text="savedObjects"/> | @kbn/core-plugins-browser-internal, @kbn/core-root-browser-internal, home, savedObjects, unifiedSearch, visualizations, fileUpload, dashboardEnhanced, transform, discover, dataVisualizer | - |
@@ -153,13 +153,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSecurityPluginTypesPublicPluginApi" section="def-public.SecurityPluginSetup.authc" text="authc"/> | security | - |
 | <DocLink id="kibKibanaReactPluginApi" section="def-public.toMountPoint" text="toMountPoint"/> | observabilityShared | - |
 | <DocLink id="kibKibanaReactPluginApi" section="def-common.KibanaStyledComponentsThemeProviderDecorator" text="KibanaStyledComponentsThemeProviderDecorator"/> | @kbn/react-kibana-context-styled, kibanaReact | - |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectMigrationContext.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | encryptedSavedObjects | - |
 | <DocLink id="kibKbnContentManagementTableListViewTablePluginApi" section="def-public.TableListViewTableProps.withoutPageTemplateWrapper" text="withoutPageTemplateWrapper"/> | @kbn/content-management-table-list-view, filesManagement | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkUpdateOptions" text="SavedObjectsBulkUpdateOptions"/> | @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsApiBrowserPluginApi" section="def-common.SavedObjectsBulkResolveResponse" text="SavedObjectsBulkResolveResponse"/> | @kbn/core | - |
 | <DocLink id="kibKbnCoreSavedObjectsBrowserMocksPluginApi" section="def-common.savedObjectsServiceMock" text="savedObjectsServiceMock"/> | @kbn/core-lifecycle-browser-mocks, @kbn/core, @kbn/core-plugins-browser-internal | - |
 | <DocLink id="kibKbnCoreSavedObjectsCommonPluginApi" section="def-common.SavedObjectAttributeSingle" text="SavedObjectAttributeSingle"/> | @kbn/core | - |
 | <DocLink id="kibKbnCorePluginsServerPluginApi" section="def-common.PluginManifest.extraPublicDirs" text="extraPublicDirs"/> | @kbn/core-plugins-server-internal | - |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectMigrationContext.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | encryptedSavedObjects | - |
 | <DocLink id="kibKbnReportingExportTypesCsvPluginApi" section="def-server.CsvSearchSourceImmediateExportType" text="CsvSearchSourceImmediateExportType"/> | reporting | - |
 | <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.JobParamsDownloadCSV" text="JobParamsDownloadCSV"/> | @kbn/reporting-export-types-csv, reporting | - |
 | <DocLink id="kibKbnReportingExportTypesCsvCommonPluginApi" section="def-common.CSV_SEARCHSOURCE_IMMEDIATE_TYPE" text="CSV_SEARCHSOURCE_IMMEDIATE_TYPE"/> | @kbn/reporting-export-types-csv, reporting | - |
diff --git a/api_docs/deprecations_by_plugin.mdx b/api_docs/deprecations_by_plugin.mdx
index 651a7cedc8166..f1fb99dcd5ae9 100644
--- a/api_docs/deprecations_by_plugin.mdx
+++ b/api_docs/deprecations_by_plugin.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsByPlugin
 slug: /kibana-dev-docs/api-meta/deprecated-api-list-by-plugin
 title: Deprecated API usage by plugin
 description: A list of deprecated APIs, which plugins are still referencing them, and when they need to be removed by.
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -736,7 +736,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | [encryption_key_rotation_service.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts#:~:text=authc), [index.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts#:~:text=authc) | - |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectMigrationContext.convertToMultiNamespaceTypeVersion" text="convertToMultiNamespaceTypeVersion"/> | [create_migration.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts#:~:text=convertToMultiNamespaceTypeVersion), [create_migration.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/encrypted_saved_objects/server/create_migration.ts#:~:text=convertToMultiNamespaceTypeVersion) | - |
 
 
@@ -990,7 +989,6 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Deprecated API | Reference location(s) | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibEmbeddablePluginApi" section="def-public.EmbeddableSetup.registerEmbeddableFactory" text="registerEmbeddableFactory"/> | [plugin.ts](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/plugin.ts#:~:text=registerEmbeddableFactory) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 |
 | <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" section="def-common.SavedObjectsType.migrations" text="migrations"/> | [links.ts](https://github.com/elastic/kibana/tree/main/src/plugins/links/server/saved_objects/links.ts#:~:text=migrations) | - |
 
@@ -1330,8 +1328,7 @@ migrates to using the Kibana Privilege model: https://github.com/elastic/kibana/
 | <DocLink id="kibLicensingPluginApi" section="def-public.PublicLicense.mode" text="mode"/> | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 |
 | <DocLink id="kibLicensingPluginApi" section="def-server.PublicLicense.mode" text="mode"/> | [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [policy_config.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/common/license/policy_config.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [fleet_integration.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/fleet_integration.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [create_default_policy.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/fleet_integration/handlers/create_default_policy.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode), [license_watch.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/lib/policy/license_watch.test.ts#:~:text=mode)+ 7 more | 8.8.0 |
 | <DocLink id="kibLicensingPluginApi" section="def-server.LicensingPluginSetup.license$" text="license$"/> | [get_is_alert_suppression_active.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_is_alert_suppression_active.ts#:~:text=license%24), [create_threat_signals.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/indicator_match/threat_mapping/create_threat_signals.ts#:~:text=license%24), [query.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/query/query.ts#:~:text=license%24), [threshold.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/threshold/threshold.ts#:~:text=license%24), [get_is_alert_suppression_active.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_is_alert_suppression_active.test.ts#:~:text=license%24), [get_is_alert_suppression_active.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_is_alert_suppression_active.test.ts#:~:text=license%24), [get_is_alert_suppression_active.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/utils/get_is_alert_suppression_active.test.ts#:~:text=license%24) | 8.8.0 |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | [request_context_factory.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/request_context_factory.ts#:~:text=authc), [route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts#:~:text=authc), [create_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts#:~:text=authc), [delete_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts#:~:text=authc), [finalize_signals_migration_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts#:~:text=authc), [common.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts#:~:text=authc) | - |
-| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.authc" text="authc"/> | [endpoint_app_context_services.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts#:~:text=authc), [open_close_signals_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts#:~:text=authc), [open_close_signals_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts#:~:text=authc), [file_info_handler.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts#:~:text=authc), [file_download_handler.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts#:~:text=authc), [response_actions.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts#:~:text=authc), [list.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/list.test.ts#:~:text=authc), [response_actions.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts#:~:text=authc), [state.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/actions/state.test.ts#:~:text=authc), [index.test.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/endpoint/routes/suggestions/index.test.ts#:~:text=authc)+ 14 more | - |
+| <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginSetup.authc" text="authc"/> | [route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts#:~:text=authc) | - |
 | <DocLink id="kibSecurityPluginApi" section="def-server.SecurityPluginStart.userProfiles" text="userProfiles"/> | [suggest_user_profiles_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/users/suggest_user_profiles_route.ts#:~:text=userProfiles), [suggest_user_profiles_route.ts](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/server/lib/detection_engine/routes/users/suggest_user_profiles_route.ts#:~:text=userProfiles) | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.DeprecatedCellValueElementProps" text="DeprecatedCellValueElementProps"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedCellValueElementProps), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedCellValueElementProps) | - |
 | <DocLink id="kibTimelinesPluginApi" section="def-common.DeprecatedRowRenderer" text="DeprecatedRowRenderer"/> | [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedRowRenderer), [index.tsx](https://github.com/elastic/kibana/tree/main/x-pack/plugins/security_solution/public/common/components/events_viewer/index.tsx#:~:text=DeprecatedRowRenderer) | - |
diff --git a/api_docs/deprecations_by_team.mdx b/api_docs/deprecations_by_team.mdx
index a7d49eac71da0..2cc94d7fa75f6 100644
--- a/api_docs/deprecations_by_team.mdx
+++ b/api_docs/deprecations_by_team.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsDeprecationsDueByTeam
 slug: /kibana-dev-docs/api-meta/deprecations-due-by-team
 title: Deprecated APIs due to be removed, by team
 description: Lists the teams that are referencing deprecated APIs with a remove by date.
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -71,7 +71,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Plugin | Deprecated API | Reference location(s) | Remove By |
 | --------|-------|-----------|-----------|
-| dashboard | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [add_to_library_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.tsx#:~:text=SavedObjectSaveModal), [add_to_library_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 |
+| dashboard | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [save_modal.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_container/embeddable/api/overlays/save_modal.tsx#:~:text=SavedObjectSaveModal), [add_to_library_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.tsx#:~:text=SavedObjectSaveModal), [add_to_library_action.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/dashboard/public/dashboard_actions/add_to_library_action.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [saved_object_save_modal_dashboard.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/presentation_util/public/components/saved_object_save_modal_dashboard.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [attribute_service.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal), [save_to_library.tsx](https://github.com/elastic/kibana/tree/main/src/plugins/links/public/content_management/save_to_library.tsx#:~:text=SavedObjectSaveModal) | 8.8.0 |
 
 
 
diff --git a/api_docs/dev_tools.mdx b/api_docs/dev_tools.mdx
index 9514703a5dbbf..562287dd1cb42 100644
--- a/api_docs/dev_tools.mdx
+++ b/api_docs/dev_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/devTools
 title: "devTools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the devTools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'devTools']
 ---
 import devToolsObj from './dev_tools.devdocs.json';
diff --git a/api_docs/discover.mdx b/api_docs/discover.mdx
index 951a0fdc8c848..90f85106e8612 100644
--- a/api_docs/discover.mdx
+++ b/api_docs/discover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discover
 title: "discover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discover plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discover']
 ---
 import discoverObj from './discover.devdocs.json';
diff --git a/api_docs/discover_enhanced.mdx b/api_docs/discover_enhanced.mdx
index 4bbd636677ffe..053a1991eb618 100644
--- a/api_docs/discover_enhanced.mdx
+++ b/api_docs/discover_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverEnhanced
 title: "discoverEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverEnhanced plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverEnhanced']
 ---
 import discoverEnhancedObj from './discover_enhanced.devdocs.json';
diff --git a/api_docs/discover_shared.mdx b/api_docs/discover_shared.mdx
index 24820743acd45..231fe7f410a82 100644
--- a/api_docs/discover_shared.mdx
+++ b/api_docs/discover_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/discoverShared
 title: "discoverShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the discoverShared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'discoverShared']
 ---
 import discoverSharedObj from './discover_shared.devdocs.json';
diff --git a/api_docs/ecs_data_quality_dashboard.mdx b/api_docs/ecs_data_quality_dashboard.mdx
index d46c4eff5be3f..a8a4ee382dab3 100644
--- a/api_docs/ecs_data_quality_dashboard.mdx
+++ b/api_docs/ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ecsDataQualityDashboard
 title: "ecsDataQualityDashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ecsDataQualityDashboard plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ecsDataQualityDashboard']
 ---
 import ecsDataQualityDashboardObj from './ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/elastic_assistant.mdx b/api_docs/elastic_assistant.mdx
index d193fdc596172..fccf3d6b64831 100644
--- a/api_docs/elastic_assistant.mdx
+++ b/api_docs/elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/elasticAssistant
 title: "elasticAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the elasticAssistant plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'elasticAssistant']
 ---
 import elasticAssistantObj from './elastic_assistant.devdocs.json';
diff --git a/api_docs/embeddable.devdocs.json b/api_docs/embeddable.devdocs.json
index 8219bbabc6b24..24ed6961df2c9 100644
--- a/api_docs/embeddable.devdocs.json
+++ b/api_docs/embeddable.devdocs.json
@@ -14495,10 +14495,6 @@
             {
               "plugin": "discover",
               "path": "src/plugins/discover/public/plugin.tsx"
-            },
-            {
-              "plugin": "links",
-              "path": "src/plugins/links/public/plugin.ts"
             }
           ],
           "children": [
diff --git a/api_docs/embeddable.mdx b/api_docs/embeddable.mdx
index 143df9035fa41..ba0258d8589df 100644
--- a/api_docs/embeddable.mdx
+++ b/api_docs/embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddable
 title: "embeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddable plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddable']
 ---
 import embeddableObj from './embeddable.devdocs.json';
diff --git a/api_docs/embeddable_enhanced.mdx b/api_docs/embeddable_enhanced.mdx
index 85de11513ad38..6ea23c886a0f7 100644
--- a/api_docs/embeddable_enhanced.mdx
+++ b/api_docs/embeddable_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/embeddableEnhanced
 title: "embeddableEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the embeddableEnhanced plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'embeddableEnhanced']
 ---
 import embeddableEnhancedObj from './embeddable_enhanced.devdocs.json';
diff --git a/api_docs/encrypted_saved_objects.mdx b/api_docs/encrypted_saved_objects.mdx
index 73af7fd2425ee..5b3f5a9f72c75 100644
--- a/api_docs/encrypted_saved_objects.mdx
+++ b/api_docs/encrypted_saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/encryptedSavedObjects
 title: "encryptedSavedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the encryptedSavedObjects plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'encryptedSavedObjects']
 ---
 import encryptedSavedObjectsObj from './encrypted_saved_objects.devdocs.json';
diff --git a/api_docs/enterprise_search.mdx b/api_docs/enterprise_search.mdx
index 9bdb57a786cf2..0b4ee2c5256d1 100644
--- a/api_docs/enterprise_search.mdx
+++ b/api_docs/enterprise_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/enterpriseSearch
 title: "enterpriseSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the enterpriseSearch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'enterpriseSearch']
 ---
 import enterpriseSearchObj from './enterprise_search.devdocs.json';
diff --git a/api_docs/entity_manager.devdocs.json b/api_docs/entity_manager.devdocs.json
index f8f2a8dde90aa..145b8f97ff63a 100644
--- a/api_docs/entity_manager.devdocs.json
+++ b/api_docs/entity_manager.devdocs.json
@@ -77,6 +77,96 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_API_KEY_NOT_FOUND",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_API_KEY_NOT_FOUND",
+        "description": [],
+        "signature": [
+          "\"api_key_not_found\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_API_KEY_NOT_VALID",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_API_KEY_NOT_VALID",
+        "description": [],
+        "signature": [
+          "\"api_key_not_valid\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_API_KEY_SERVICE_DISABLED",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_API_KEY_SERVICE_DISABLED",
+        "description": [],
+        "signature": [
+          "\"api_key_service_disabled\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_DEFINITION_STOPPED",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_DEFINITION_STOPPED",
+        "description": [],
+        "signature": [
+          "\"error_definition_stopped\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_PARTIAL_BUILTIN_INSTALLATION",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_PARTIAL_BUILTIN_INSTALLATION",
+        "description": [],
+        "signature": [
+          "\"partial_builtin_installation\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "entityManager",
+        "id": "def-public.ERROR_USER_NOT_AUTHORIZED",
+        "type": "string",
+        "tags": [],
+        "label": "ERROR_USER_NOT_AUTHORIZED",
+        "description": [],
+        "signature": [
+          "\"user_not_authorized\""
+        ],
+        "path": "x-pack/plugins/observability_solution/entity_manager/common/errors.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": []
diff --git a/api_docs/entity_manager.mdx b/api_docs/entity_manager.mdx
index c454acf8cb01c..359efb8f409c7 100644
--- a/api_docs/entity_manager.mdx
+++ b/api_docs/entity_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/entityManager
 title: "entityManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the entityManager plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'entityManager']
 ---
 import entityManagerObj from './entity_manager.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 8 | 0 | 8 | 1 |
+| 14 | 0 | 14 | 1 |
 
 ## Client
 
diff --git a/api_docs/es_ui_shared.mdx b/api_docs/es_ui_shared.mdx
index 861fe5c3af635..7e4c7ae8ed8e7 100644
--- a/api_docs/es_ui_shared.mdx
+++ b/api_docs/es_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esUiShared
 title: "esUiShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esUiShared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esUiShared']
 ---
 import esUiSharedObj from './es_ui_shared.devdocs.json';
diff --git a/api_docs/esql.devdocs.json b/api_docs/esql.devdocs.json
new file mode 100644
index 0000000000000..f3d9e7db3931c
--- /dev/null
+++ b/api_docs/esql.devdocs.json
@@ -0,0 +1,547 @@
+{
+  "id": "esql",
+  "client": {
+    "classes": [],
+    "functions": [
+      {
+        "parentPluginId": "esql",
+        "id": "def-public.TextBasedLangEditor",
+        "type": "Function",
+        "tags": [],
+        "label": "TextBasedLangEditor",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/text-based-editor",
+            "scope": "public",
+            "docId": "kibKbnTextBasedEditorPluginApi",
+            "section": "def-public.TextBasedLanguagesEditorProps",
+            "text": "TextBasedLanguagesEditorProps"
+          },
+          ") => JSX.Element"
+        ],
+        "path": "src/plugins/esql/public/create_editor.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLangEditor.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "props",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/text-based-editor",
+                "scope": "public",
+                "docId": "kibKbnTextBasedEditorPluginApi",
+                "section": "def-public.TextBasedLanguagesEditorProps",
+                "text": "TextBasedLanguagesEditorProps"
+              }
+            ],
+            "path": "src/plugins/esql/public/create_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "esql",
+        "id": "def-public.EsqlPluginStart",
+        "type": "Interface",
+        "tags": [],
+        "label": "EsqlPluginStart",
+        "description": [],
+        "path": "src/plugins/esql/public/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.EsqlPluginStart.Editor",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "Editor",
+            "description": [],
+            "signature": [
+              "React.ComponentClass<",
+              {
+                "pluginId": "@kbn/text-based-editor",
+                "scope": "public",
+                "docId": "kibKbnTextBasedEditorPluginApi",
+                "section": "def-public.TextBasedLanguagesEditorProps",
+                "text": "TextBasedLanguagesEditorProps"
+              },
+              ", any> | React.FunctionComponent<",
+              {
+                "pluginId": "@kbn/text-based-editor",
+                "scope": "public",
+                "docId": "kibKbnTextBasedEditorPluginApi",
+                "section": "def-public.TextBasedLanguagesEditorProps",
+                "text": "TextBasedLanguagesEditorProps"
+              },
+              ">"
+            ],
+            "path": "src/plugins/esql/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "esql",
+        "id": "def-public.TextBasedLanguagesEditorProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "TextBasedLanguagesEditorProps",
+        "description": [],
+        "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.query",
+            "type": "Object",
+            "tags": [],
+            "label": "query",
+            "description": [
+              "The aggregate type query"
+            ],
+            "signature": [
+              "{ esql: string; }"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.onTextLangQueryChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onTextLangQueryChange",
+            "description": [
+              "Callback running everytime the query changes"
+            ],
+            "signature": [
+              "(query: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.AggregateQuery",
+                "text": "AggregateQuery"
+              },
+              ") => void"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "esql",
+                "id": "def-public.TextBasedLanguagesEditorProps.onTextLangQueryChange.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "query",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.AggregateQuery",
+                    "text": "AggregateQuery"
+                  }
+                ],
+                "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.onTextLangQuerySubmit",
+            "type": "Function",
+            "tags": [],
+            "label": "onTextLangQuerySubmit",
+            "description": [
+              "Callback running when the user submits the query"
+            ],
+            "signature": [
+              "(query?: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.AggregateQuery",
+                "text": "AggregateQuery"
+              },
+              " | undefined, abortController?: AbortController | undefined) => Promise<void>"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "esql",
+                "id": "def-public.TextBasedLanguagesEditorProps.onTextLangQuerySubmit.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "query",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.AggregateQuery",
+                    "text": "AggregateQuery"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "esql",
+                "id": "def-public.TextBasedLanguagesEditorProps.onTextLangQuerySubmit.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "abortController",
+                "description": [],
+                "signature": [
+                  "AbortController | undefined"
+                ],
+                "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.expandCodeEditor",
+            "type": "Function",
+            "tags": [],
+            "label": "expandCodeEditor",
+            "description": [
+              "Can be used to expand/minimize the editor"
+            ],
+            "signature": [
+              "(status: boolean) => void"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "esql",
+                "id": "def-public.TextBasedLanguagesEditorProps.expandCodeEditor.$1",
+                "type": "boolean",
+                "tags": [],
+                "label": "status",
+                "description": [],
+                "signature": [
+                  "boolean"
+                ],
+                "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.isCodeEditorExpanded",
+            "type": "boolean",
+            "tags": [],
+            "label": "isCodeEditorExpanded",
+            "description": [
+              "If it is true, the editor initializes with height EDITOR_INITIAL_HEIGHT_EXPANDED"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.detectTimestamp",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "detectTimestamp",
+            "description": [
+              "If it is true, the editor displays the message @timestamp found\nThe text based queries are relying on adhoc dataviews which\ncan have an @timestamp timefield or nothing"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.errors",
+            "type": "Array",
+            "tags": [],
+            "label": "errors",
+            "description": [
+              "Array of errors"
+            ],
+            "signature": [
+              "Error[] | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.warning",
+            "type": "string",
+            "tags": [],
+            "label": "warning",
+            "description": [
+              "Warning string as it comes from ES"
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.isLoading",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isLoading",
+            "description": [
+              "Disables the editor and displays loading icon in run button\nIt is also used for hiding the history component if it is not defined"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.isDisabled",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isDisabled",
+            "description": [
+              "Disables the editor"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.isDarkMode",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isDarkMode",
+            "description": [
+              "Indicator if the editor is on dark mode"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.dataTestSubj",
+            "type": "string",
+            "tags": [],
+            "label": "dataTestSubj",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.hideMinimizeButton",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideMinimizeButton",
+            "description": [
+              "If true it hides the minimize button and the user can't return to the minimized version\nUseful when the application doesn't want to give this capability"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.hideRunQueryText",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideRunQueryText",
+            "description": [
+              "Hide the Run query information which appears on the footer"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.editorIsInline",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "editorIsInline",
+            "description": [
+              "This is used for applications (such as the inline editing flyout in dashboards)\nwhich want to add the editor without being part of the Unified search component\nIt renders a submit query button inside the editor"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.disableSubmitAction",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "disableSubmitAction",
+            "description": [
+              "Disables the submit query action"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.allowQueryCancellation",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "allowQueryCancellation",
+            "description": [
+              "when set to true enables query cancellation"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.hideTimeFilterInfo",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideTimeFilterInfo",
+            "description": [
+              "hide @timestamp info"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.hideQueryHistory",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideQueryHistory",
+            "description": [
+              "hide query history"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "esql",
+            "id": "def-public.TextBasedLanguagesEditorProps.hideHeaderWhenExpanded",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "hideHeaderWhenExpanded",
+            "description": [
+              "hide header buttons when editor is expanded"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-text-based-editor/src/text_based_languages_editor.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/esql.mdx b/api_docs/esql.mdx
new file mode 100644
index 0000000000000..8d8b7f0c0b679
--- /dev/null
+++ b/api_docs/esql.mdx
@@ -0,0 +1,33 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibEsqlPluginApi
+slug: /kibana-dev-docs/api/esql
+title: "esql"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the esql plugin
+date: 2024-07-11
+tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esql']
+---
+import esqlObj from './esql.devdocs.json';
+
+
+
+Contact [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 29 | 0 | 10 | 0 |
+
+## Client
+
+### Functions
+<DocDefinitionList data={esqlObj.client.functions}/>
+
+### Interfaces
+<DocDefinitionList data={esqlObj.client.interfaces}/>
+
diff --git a/api_docs/esql_data_grid.mdx b/api_docs/esql_data_grid.mdx
index 594a6b3e1a844..ca621bfee4b02 100644
--- a/api_docs/esql_data_grid.mdx
+++ b/api_docs/esql_data_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/esqlDataGrid
 title: "esqlDataGrid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the esqlDataGrid plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'esqlDataGrid']
 ---
 import esqlDataGridObj from './esql_data_grid.devdocs.json';
diff --git a/api_docs/event_annotation.mdx b/api_docs/event_annotation.mdx
index 83727da213201..7427bc363bf0e 100644
--- a/api_docs/event_annotation.mdx
+++ b/api_docs/event_annotation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotation
 title: "eventAnnotation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotation plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotation']
 ---
 import eventAnnotationObj from './event_annotation.devdocs.json';
diff --git a/api_docs/event_annotation_listing.mdx b/api_docs/event_annotation_listing.mdx
index 1b30aa5156b08..a65650e5685ce 100644
--- a/api_docs/event_annotation_listing.mdx
+++ b/api_docs/event_annotation_listing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventAnnotationListing
 title: "eventAnnotationListing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventAnnotationListing plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventAnnotationListing']
 ---
 import eventAnnotationListingObj from './event_annotation_listing.devdocs.json';
diff --git a/api_docs/event_log.mdx b/api_docs/event_log.mdx
index 862f911ab0688..0154024c4e5f2 100644
--- a/api_docs/event_log.mdx
+++ b/api_docs/event_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/eventLog
 title: "eventLog"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the eventLog plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'eventLog']
 ---
 import eventLogObj from './event_log.devdocs.json';
diff --git a/api_docs/exploratory_view.mdx b/api_docs/exploratory_view.mdx
index 384e24252a637..2cd5df3e65687 100644
--- a/api_docs/exploratory_view.mdx
+++ b/api_docs/exploratory_view.mdx
@@ -8,14 +8,14 @@ slug: /kibana-dev-docs/api/exploratoryView
 title: "exploratoryView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the exploratoryView plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'exploratoryView']
 ---
 import exploratoryViewObj from './exploratory_view.devdocs.json';
 
 
 
-Contact [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) for questions regarding this plugin.
+Contact [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) for questions regarding this plugin.
 
 **Code health stats**
 
diff --git a/api_docs/expression_error.mdx b/api_docs/expression_error.mdx
index 1a60d5744254b..61400637bd16c 100644
--- a/api_docs/expression_error.mdx
+++ b/api_docs/expression_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionError
 title: "expressionError"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionError plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionError']
 ---
 import expressionErrorObj from './expression_error.devdocs.json';
diff --git a/api_docs/expression_gauge.mdx b/api_docs/expression_gauge.mdx
index 1f82bda684ad4..1add6ebb11b99 100644
--- a/api_docs/expression_gauge.mdx
+++ b/api_docs/expression_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionGauge
 title: "expressionGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionGauge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionGauge']
 ---
 import expressionGaugeObj from './expression_gauge.devdocs.json';
diff --git a/api_docs/expression_heatmap.mdx b/api_docs/expression_heatmap.mdx
index f49917248cc10..a46147400ad60 100644
--- a/api_docs/expression_heatmap.mdx
+++ b/api_docs/expression_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionHeatmap
 title: "expressionHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionHeatmap plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionHeatmap']
 ---
 import expressionHeatmapObj from './expression_heatmap.devdocs.json';
diff --git a/api_docs/expression_image.mdx b/api_docs/expression_image.mdx
index 8d84415dac8b3..5de5767ec431d 100644
--- a/api_docs/expression_image.mdx
+++ b/api_docs/expression_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionImage
 title: "expressionImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionImage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionImage']
 ---
 import expressionImageObj from './expression_image.devdocs.json';
diff --git a/api_docs/expression_legacy_metric_vis.mdx b/api_docs/expression_legacy_metric_vis.mdx
index 290ef8afabcd6..5478834bbe46c 100644
--- a/api_docs/expression_legacy_metric_vis.mdx
+++ b/api_docs/expression_legacy_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionLegacyMetricVis
 title: "expressionLegacyMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionLegacyMetricVis plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionLegacyMetricVis']
 ---
 import expressionLegacyMetricVisObj from './expression_legacy_metric_vis.devdocs.json';
diff --git a/api_docs/expression_metric.mdx b/api_docs/expression_metric.mdx
index 4562b54274c19..c513aec5c05f0 100644
--- a/api_docs/expression_metric.mdx
+++ b/api_docs/expression_metric.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetric
 title: "expressionMetric"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetric plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetric']
 ---
 import expressionMetricObj from './expression_metric.devdocs.json';
diff --git a/api_docs/expression_metric_vis.devdocs.json b/api_docs/expression_metric_vis.devdocs.json
index 3212eb93a18fe..920c0a7b141d0 100644
--- a/api_docs/expression_metric_vis.devdocs.json
+++ b/api_docs/expression_metric_vis.devdocs.json
@@ -449,6 +449,62 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricArguments.titlesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "titlesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricArguments.valuesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valuesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricArguments.iconAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "iconAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricArguments.valueFontSize",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valueFontSize",
+            "description": [],
+            "signature": [
+              "number | \"default\" | \"fit\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "expressionMetricVis",
             "id": "def-common.MetricArguments.color",
@@ -745,6 +801,62 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricVisParam.titlesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "titlesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricVisParam.valuesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valuesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricVisParam.iconAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "iconAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "expressionMetricVis",
+            "id": "def-common.MetricVisParam.valueFontSize",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valueFontSize",
+            "description": [],
+            "signature": [
+              "number | \"default\" | \"fit\""
+            ],
+            "path": "src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "expressionMetricVis",
             "id": "def-common.MetricVisParam.maxCols",
diff --git a/api_docs/expression_metric_vis.mdx b/api_docs/expression_metric_vis.mdx
index 5c0fce0eb1f22..9b335fd928ddc 100644
--- a/api_docs/expression_metric_vis.mdx
+++ b/api_docs/expression_metric_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionMetricVis
 title: "expressionMetricVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionMetricVis plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionMetricVis']
 ---
 import expressionMetricVisObj from './expression_metric_vis.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 67 | 0 | 67 | 2 |
+| 75 | 0 | 75 | 2 |
 
 ## Client
 
diff --git a/api_docs/expression_partition_vis.mdx b/api_docs/expression_partition_vis.mdx
index a83c184c36f4d..1bf57bb07c913 100644
--- a/api_docs/expression_partition_vis.mdx
+++ b/api_docs/expression_partition_vis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionPartitionVis
 title: "expressionPartitionVis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionPartitionVis plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionPartitionVis']
 ---
 import expressionPartitionVisObj from './expression_partition_vis.devdocs.json';
diff --git a/api_docs/expression_repeat_image.mdx b/api_docs/expression_repeat_image.mdx
index a2cad0f2f6b12..663c37f0336cd 100644
--- a/api_docs/expression_repeat_image.mdx
+++ b/api_docs/expression_repeat_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRepeatImage
 title: "expressionRepeatImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRepeatImage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRepeatImage']
 ---
 import expressionRepeatImageObj from './expression_repeat_image.devdocs.json';
diff --git a/api_docs/expression_reveal_image.mdx b/api_docs/expression_reveal_image.mdx
index 26c579cd24293..883291f327bca 100644
--- a/api_docs/expression_reveal_image.mdx
+++ b/api_docs/expression_reveal_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionRevealImage
 title: "expressionRevealImage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionRevealImage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionRevealImage']
 ---
 import expressionRevealImageObj from './expression_reveal_image.devdocs.json';
diff --git a/api_docs/expression_shape.devdocs.json b/api_docs/expression_shape.devdocs.json
index 63d5a0c2ce2f2..5b9ce734491bf 100644
--- a/api_docs/expression_shape.devdocs.json
+++ b/api_docs/expression_shape.devdocs.json
@@ -635,7 +635,7 @@
             "label": "strokeLinecap",
             "description": [],
             "signature": [
-              "\"inherit\" | \"butt\" | \"round\" | \"square\" | undefined"
+              "\"square\" | \"inherit\" | \"butt\" | \"round\" | undefined"
             ],
             "path": "src/plugins/expression_shape/public/components/reusable/types.tsx",
             "deprecated": false,
diff --git a/api_docs/expression_shape.mdx b/api_docs/expression_shape.mdx
index b955c09fe2461..7030d0e522164 100644
--- a/api_docs/expression_shape.mdx
+++ b/api_docs/expression_shape.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionShape
 title: "expressionShape"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionShape plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionShape']
 ---
 import expressionShapeObj from './expression_shape.devdocs.json';
diff --git a/api_docs/expression_tagcloud.mdx b/api_docs/expression_tagcloud.mdx
index 1adc253b59bf3..b95138d54ab47 100644
--- a/api_docs/expression_tagcloud.mdx
+++ b/api_docs/expression_tagcloud.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionTagcloud
 title: "expressionTagcloud"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionTagcloud plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionTagcloud']
 ---
 import expressionTagcloudObj from './expression_tagcloud.devdocs.json';
diff --git a/api_docs/expression_x_y.devdocs.json b/api_docs/expression_x_y.devdocs.json
index 1d66fc5d9a257..ea7e85c389e76 100644
--- a/api_docs/expression_x_y.devdocs.json
+++ b/api_docs/expression_x_y.devdocs.json
@@ -417,7 +417,7 @@
             "label": "mode",
             "description": [],
             "signature": [
-              "\"full\" | \"custom\" | \"dataBounds\""
+              "\"custom\" | \"full\" | \"dataBounds\""
             ],
             "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
             "deprecated": false,
@@ -2363,7 +2363,7 @@
         "label": "AxisExtentMode",
         "description": [],
         "signature": [
-          "\"full\" | \"custom\" | \"dataBounds\""
+          "\"custom\" | \"full\" | \"dataBounds\""
         ],
         "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
         "deprecated": false,
@@ -2378,7 +2378,7 @@
         "label": "AxisMode",
         "description": [],
         "signature": [
-          "\"percentage\" | \"normal\" | \"wiggle\" | \"silhouette\""
+          "\"normal\" | \"percentage\" | \"wiggle\" | \"silhouette\""
         ],
         "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
         "deprecated": false,
@@ -3626,7 +3626,7 @@
         "label": "YScaleType",
         "description": [],
         "signature": [
-          "\"log\" | \"time\" | \"linear\" | \"sqrt\""
+          "\"log\" | \"sqrt\" | \"time\" | \"linear\""
         ],
         "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
         "deprecated": false,
diff --git a/api_docs/expression_x_y.mdx b/api_docs/expression_x_y.mdx
index 7b00acb9611cf..908c8f388039c 100644
--- a/api_docs/expression_x_y.mdx
+++ b/api_docs/expression_x_y.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressionXY
 title: "expressionXY"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressionXY plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressionXY']
 ---
 import expressionXYObj from './expression_x_y.devdocs.json';
diff --git a/api_docs/expressions.mdx b/api_docs/expressions.mdx
index f76eeee947d8d..2c7741a342025 100644
--- a/api_docs/expressions.mdx
+++ b/api_docs/expressions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/expressions
 title: "expressions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the expressions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'expressions']
 ---
 import expressionsObj from './expressions.devdocs.json';
diff --git a/api_docs/features.mdx b/api_docs/features.mdx
index 0b0f391e4ac86..b3e14b5434c3b 100644
--- a/api_docs/features.mdx
+++ b/api_docs/features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/features
 title: "features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the features plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'features']
 ---
 import featuresObj from './features.devdocs.json';
diff --git a/api_docs/field_formats.mdx b/api_docs/field_formats.mdx
index ae8bdd69376fe..0f2a1c1d4bd9c 100644
--- a/api_docs/field_formats.mdx
+++ b/api_docs/field_formats.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldFormats
 title: "fieldFormats"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldFormats plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldFormats']
 ---
 import fieldFormatsObj from './field_formats.devdocs.json';
diff --git a/api_docs/fields_metadata.mdx b/api_docs/fields_metadata.mdx
index da48a9856d91c..98e8397418109 100644
--- a/api_docs/fields_metadata.mdx
+++ b/api_docs/fields_metadata.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fieldsMetadata
 title: "fieldsMetadata"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fieldsMetadata plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fieldsMetadata']
 ---
 import fieldsMetadataObj from './fields_metadata.devdocs.json';
diff --git a/api_docs/file_upload.mdx b/api_docs/file_upload.mdx
index 9e2f5abf99d37..3e073cfc2b353 100644
--- a/api_docs/file_upload.mdx
+++ b/api_docs/file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fileUpload
 title: "fileUpload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fileUpload plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fileUpload']
 ---
 import fileUploadObj from './file_upload.devdocs.json';
diff --git a/api_docs/files.mdx b/api_docs/files.mdx
index 163d7562ea18b..176485460c7db 100644
--- a/api_docs/files.mdx
+++ b/api_docs/files.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/files
 title: "files"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the files plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'files']
 ---
 import filesObj from './files.devdocs.json';
diff --git a/api_docs/files_management.mdx b/api_docs/files_management.mdx
index c693e7ec71ed6..0348766c93248 100644
--- a/api_docs/files_management.mdx
+++ b/api_docs/files_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/filesManagement
 title: "filesManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the filesManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'filesManagement']
 ---
 import filesManagementObj from './files_management.devdocs.json';
diff --git a/api_docs/fleet.devdocs.json b/api_docs/fleet.devdocs.json
index fec8ffac9edc5..b0da7aab43721 100644
--- a/api_docs/fleet.devdocs.json
+++ b/api_docs/fleet.devdocs.json
@@ -25871,6 +25871,20 @@
             "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "fleet",
+            "id": "def-common.RegistryVarsEntry.RegistryVarsEntryKeys.full_width",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "[RegistryVarsEntryKeys.full_width]",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/plugins/fleet/common/types/models/epm.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/fleet.mdx b/api_docs/fleet.mdx
index 35261f949a14c..e99b668273f28 100644
--- a/api_docs/fleet.mdx
+++ b/api_docs/fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/fleet
 title: "fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the fleet plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'fleet']
 ---
 import fleetObj from './fleet.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 1348 | 5 | 1226 | 72 |
+| 1349 | 5 | 1227 | 72 |
 
 ## Client
 
diff --git a/api_docs/global_search.mdx b/api_docs/global_search.mdx
index e210aa1ada864..d8a4778b5dfb4 100644
--- a/api_docs/global_search.mdx
+++ b/api_docs/global_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/globalSearch
 title: "globalSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the globalSearch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'globalSearch']
 ---
 import globalSearchObj from './global_search.devdocs.json';
diff --git a/api_docs/guided_onboarding.mdx b/api_docs/guided_onboarding.mdx
index f22d604d4ecf1..cd0a584abd942 100644
--- a/api_docs/guided_onboarding.mdx
+++ b/api_docs/guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/guidedOnboarding
 title: "guidedOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the guidedOnboarding plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'guidedOnboarding']
 ---
 import guidedOnboardingObj from './guided_onboarding.devdocs.json';
diff --git a/api_docs/home.mdx b/api_docs/home.mdx
index d708d283ae03e..12cd9e9a7fd41 100644
--- a/api_docs/home.mdx
+++ b/api_docs/home.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/home
 title: "home"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the home plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'home']
 ---
 import homeObj from './home.devdocs.json';
diff --git a/api_docs/image_embeddable.mdx b/api_docs/image_embeddable.mdx
index b5f64ad1003da..a285787fe67ac 100644
--- a/api_docs/image_embeddable.mdx
+++ b/api_docs/image_embeddable.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/imageEmbeddable
 title: "imageEmbeddable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the imageEmbeddable plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'imageEmbeddable']
 ---
 import imageEmbeddableObj from './image_embeddable.devdocs.json';
diff --git a/api_docs/index_lifecycle_management.mdx b/api_docs/index_lifecycle_management.mdx
index bf57ddb676b32..d5e4649658817 100644
--- a/api_docs/index_lifecycle_management.mdx
+++ b/api_docs/index_lifecycle_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexLifecycleManagement
 title: "indexLifecycleManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexLifecycleManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexLifecycleManagement']
 ---
 import indexLifecycleManagementObj from './index_lifecycle_management.devdocs.json';
diff --git a/api_docs/index_management.mdx b/api_docs/index_management.mdx
index da486f2571083..9e81464ca56ea 100644
--- a/api_docs/index_management.mdx
+++ b/api_docs/index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/indexManagement
 title: "indexManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the indexManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'indexManagement']
 ---
 import indexManagementObj from './index_management.devdocs.json';
diff --git a/api_docs/infra.mdx b/api_docs/infra.mdx
index 530c32a0e69d0..20783144b93a1 100644
--- a/api_docs/infra.mdx
+++ b/api_docs/infra.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/infra
 title: "infra"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the infra plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'infra']
 ---
 import infraObj from './infra.devdocs.json';
diff --git a/api_docs/ingest_pipelines.mdx b/api_docs/ingest_pipelines.mdx
index 9a13d3eb8cb2d..bda1a481df694 100644
--- a/api_docs/ingest_pipelines.mdx
+++ b/api_docs/ingest_pipelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ingestPipelines
 title: "ingestPipelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ingestPipelines plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ingestPipelines']
 ---
 import ingestPipelinesObj from './ingest_pipelines.devdocs.json';
diff --git a/api_docs/inspector.mdx b/api_docs/inspector.mdx
index 3806f2ea0d909..5f4f529bd6388 100644
--- a/api_docs/inspector.mdx
+++ b/api_docs/inspector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/inspector
 title: "inspector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the inspector plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'inspector']
 ---
 import inspectorObj from './inspector.devdocs.json';
diff --git a/api_docs/integration_assistant.devdocs.json b/api_docs/integration_assistant.devdocs.json
index 7bc21089a09fd..fb01a65e33531 100644
--- a/api_docs/integration_assistant.devdocs.json
+++ b/api_docs/integration_assistant.devdocs.json
@@ -231,7 +231,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }"
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts",
         "deprecated": false,
@@ -397,7 +397,7 @@
         "label": "EcsMappingRequestBody",
         "description": [],
         "signature": [
-          "{ connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; }"
+          "{ connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts",
         "deprecated": false,
@@ -630,7 +630,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }"
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/related/related_route.ts",
         "deprecated": false,
@@ -917,7 +917,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }>; connectorId: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
+          "[] | undefined; }>; connectorId: Zod.ZodString; langSmithOptions: Zod.ZodOptional<Zod.ZodObject<{ projectName: Zod.ZodString; apiKey: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { apiKey: string; projectName: string; }, { apiKey: string; projectName: string; }>>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
           {
             "pluginId": "integrationAssistant",
             "scope": "common",
@@ -933,7 +933,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
           {
             "pluginId": "integrationAssistant",
             "scope": "common",
@@ -949,7 +949,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }>"
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }>"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts",
         "deprecated": false,
@@ -1359,7 +1359,7 @@
         "label": "EcsMappingRequestBody",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ packageName: Zod.ZodString; dataStreamName: Zod.ZodString; rawSamples: Zod.ZodArray<Zod.ZodString, \"many\">; mapping: Zod.ZodOptional<Zod.ZodObject<{}, \"passthrough\", Zod.ZodTypeAny, Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\">, Zod.objectInputType<{}, Zod.ZodTypeAny, \"passthrough\">>>; connectorId: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectInputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; }>"
+          "Zod.ZodObject<{ packageName: Zod.ZodString; dataStreamName: Zod.ZodString; rawSamples: Zod.ZodArray<Zod.ZodString, \"many\">; mapping: Zod.ZodOptional<Zod.ZodObject<{}, \"passthrough\", Zod.ZodTypeAny, Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\">, Zod.objectInputType<{}, Zod.ZodTypeAny, \"passthrough\">>>; connectorId: Zod.ZodString; langSmithOptions: Zod.ZodOptional<Zod.ZodObject<{ projectName: Zod.ZodString; apiKey: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { apiKey: string; projectName: string; }, { apiKey: string; projectName: string; }>>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectOutputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; mapping?: Zod.objectInputType<{}, Zod.ZodTypeAny, \"passthrough\"> | undefined; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }>"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts",
         "deprecated": false,
@@ -1849,7 +1849,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }>; connectorId: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
+          "[] | undefined; }>; connectorId: Zod.ZodString; langSmithOptions: Zod.ZodOptional<Zod.ZodObject<{ projectName: Zod.ZodString; apiKey: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { apiKey: string; projectName: string; }, { apiKey: string; projectName: string; }>>; }, \"strip\", Zod.ZodTypeAny, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
           {
             "pluginId": "integrationAssistant",
             "scope": "common",
@@ -1865,7 +1865,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }, { connectorId: string; packageName: string; rawSamples: string[]; dataStreamName: string; currentPipeline: { processors: ",
           {
             "pluginId": "integrationAssistant",
             "scope": "common",
@@ -1881,7 +1881,7 @@
             "section": "def-common.ESProcessorItem",
             "text": "ESProcessorItem"
           },
-          "[] | undefined; }; }>"
+          "[] | undefined; }; langSmithOptions?: { apiKey: string; projectName: string; } | undefined; }>"
         ],
         "path": "x-pack/plugins/integration_assistant/common/api/related/related_route.ts",
         "deprecated": false,
diff --git a/api_docs/integration_assistant.mdx b/api_docs/integration_assistant.mdx
index b4278160dd929..6d0242e8a2069 100644
--- a/api_docs/integration_assistant.mdx
+++ b/api_docs/integration_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/integrationAssistant
 title: "integrationAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the integrationAssistant plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'integrationAssistant']
 ---
 import integrationAssistantObj from './integration_assistant.devdocs.json';
diff --git a/api_docs/interactive_setup.mdx b/api_docs/interactive_setup.mdx
index 87337ba4e3b3a..c47d63303a0a3 100644
--- a/api_docs/interactive_setup.mdx
+++ b/api_docs/interactive_setup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/interactiveSetup
 title: "interactiveSetup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the interactiveSetup plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'interactiveSetup']
 ---
 import interactiveSetupObj from './interactive_setup.devdocs.json';
diff --git a/api_docs/investigate.mdx b/api_docs/investigate.mdx
index 3d2113d301630..7722afcb762e4 100644
--- a/api_docs/investigate.mdx
+++ b/api_docs/investigate.mdx
@@ -8,14 +8,14 @@ slug: /kibana-dev-docs/api/investigate
 title: "investigate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the investigate plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'investigate']
 ---
 import investigateObj from './investigate.devdocs.json';
 
 
 
-Contact [@elastic/obs-ai-assistant](https://github.com/orgs/elastic/teams/obs-ai-assistant) for questions regarding this plugin.
+Contact [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) for questions regarding this plugin.
 
 **Code health stats**
 
diff --git a/api_docs/kbn_ace.mdx b/api_docs/kbn_ace.mdx
index d5cdb2ce95870..fc68672cf88f7 100644
--- a/api_docs/kbn_ace.mdx
+++ b/api_docs/kbn_ace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ace
 title: "@kbn/ace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ace plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ace']
 ---
 import kbnAceObj from './kbn_ace.devdocs.json';
diff --git a/api_docs/kbn_actions_types.mdx b/api_docs/kbn_actions_types.mdx
index 9fc3108fe6875..7036d7e54f77e 100644
--- a/api_docs/kbn_actions_types.mdx
+++ b/api_docs/kbn_actions_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-actions-types
 title: "@kbn/actions-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/actions-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/actions-types']
 ---
 import kbnActionsTypesObj from './kbn_actions_types.devdocs.json';
diff --git a/api_docs/kbn_aiops_components.mdx b/api_docs/kbn_aiops_components.mdx
index cfa9af7ad6760..bbf1801c680f1 100644
--- a/api_docs/kbn_aiops_components.mdx
+++ b/api_docs/kbn_aiops_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-components
 title: "@kbn/aiops-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-components']
 ---
 import kbnAiopsComponentsObj from './kbn_aiops_components.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_pattern_analysis.mdx b/api_docs/kbn_aiops_log_pattern_analysis.mdx
index 738a2eb602682..95d4e6f07fcc3 100644
--- a/api_docs/kbn_aiops_log_pattern_analysis.mdx
+++ b/api_docs/kbn_aiops_log_pattern_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-pattern-analysis
 title: "@kbn/aiops-log-pattern-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-pattern-analysis plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-pattern-analysis']
 ---
 import kbnAiopsLogPatternAnalysisObj from './kbn_aiops_log_pattern_analysis.devdocs.json';
diff --git a/api_docs/kbn_aiops_log_rate_analysis.mdx b/api_docs/kbn_aiops_log_rate_analysis.mdx
index de759389c82e2..9e6677bd8b7ae 100644
--- a/api_docs/kbn_aiops_log_rate_analysis.mdx
+++ b/api_docs/kbn_aiops_log_rate_analysis.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-aiops-log-rate-analysis
 title: "@kbn/aiops-log-rate-analysis"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/aiops-log-rate-analysis plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/aiops-log-rate-analysis']
 ---
 import kbnAiopsLogRateAnalysisObj from './kbn_aiops_log_rate_analysis.devdocs.json';
diff --git a/api_docs/kbn_alerting_api_integration_helpers.mdx b/api_docs/kbn_alerting_api_integration_helpers.mdx
index 9977315783ea8..684e0747d51b3 100644
--- a/api_docs/kbn_alerting_api_integration_helpers.mdx
+++ b/api_docs/kbn_alerting_api_integration_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-api-integration-helpers
 title: "@kbn/alerting-api-integration-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-api-integration-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-api-integration-helpers']
 ---
 import kbnAlertingApiIntegrationHelpersObj from './kbn_alerting_api_integration_helpers.devdocs.json';
diff --git a/api_docs/kbn_alerting_comparators.mdx b/api_docs/kbn_alerting_comparators.mdx
index bd6b2f1f9e3c2..64bbc439d1091 100644
--- a/api_docs/kbn_alerting_comparators.mdx
+++ b/api_docs/kbn_alerting_comparators.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-comparators
 title: "@kbn/alerting-comparators"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-comparators plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-comparators']
 ---
 import kbnAlertingComparatorsObj from './kbn_alerting_comparators.devdocs.json';
diff --git a/api_docs/kbn_alerting_state_types.mdx b/api_docs/kbn_alerting_state_types.mdx
index 3b7d7514be488..4b29160e5d927 100644
--- a/api_docs/kbn_alerting_state_types.mdx
+++ b/api_docs/kbn_alerting_state_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-state-types
 title: "@kbn/alerting-state-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-state-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-state-types']
 ---
 import kbnAlertingStateTypesObj from './kbn_alerting_state_types.devdocs.json';
diff --git a/api_docs/kbn_alerting_types.mdx b/api_docs/kbn_alerting_types.mdx
index eaf12747ee150..b7bbb6492201a 100644
--- a/api_docs/kbn_alerting_types.mdx
+++ b/api_docs/kbn_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerting-types
 title: "@kbn/alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerting-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerting-types']
 ---
 import kbnAlertingTypesObj from './kbn_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_alerts_as_data_utils.mdx b/api_docs/kbn_alerts_as_data_utils.mdx
index 140e9ebc8e34f..fd2b3675e12b8 100644
--- a/api_docs/kbn_alerts_as_data_utils.mdx
+++ b/api_docs/kbn_alerts_as_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-as-data-utils
 title: "@kbn/alerts-as-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-as-data-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-as-data-utils']
 ---
 import kbnAlertsAsDataUtilsObj from './kbn_alerts_as_data_utils.devdocs.json';
diff --git a/api_docs/kbn_alerts_grouping.devdocs.json b/api_docs/kbn_alerts_grouping.devdocs.json
new file mode 100644
index 0000000000000..f734613aca44b
--- /dev/null
+++ b/api_docs/kbn_alerts_grouping.devdocs.json
@@ -0,0 +1,492 @@
+{
+  "id": "@kbn/alerts-grouping",
+  "client": {
+    "classes": [],
+    "functions": [
+      {
+        "parentPluginId": "@kbn/alerts-grouping",
+        "id": "def-public.AlertsGrouping",
+        "type": "Function",
+        "tags": [],
+        "label": "AlertsGrouping",
+        "description": [
+          "\nA coordinator component to show multiple alert tables grouped by one or more fields\n"
+        ],
+        "signature": [
+          "React.NamedExoticComponent<",
+          {
+            "pluginId": "@kbn/alerts-grouping",
+            "scope": "public",
+            "docId": "kibKbnAlertsGroupingPluginApi",
+            "section": "def-public.AlertsGroupingProps",
+            "text": "AlertsGroupingProps"
+          },
+          "<{}>> & { readonly type: (props: ",
+          {
+            "pluginId": "@kbn/alerts-grouping",
+            "scope": "public",
+            "docId": "kibKbnAlertsGroupingPluginApi",
+            "section": "def-public.AlertsGroupingProps",
+            "text": "AlertsGroupingProps"
+          },
+          "<{}>) => JSX.Element; }"
+        ],
+        "path": "packages/kbn-alerts-grouping/src/components/alerts_grouping.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "returnComment": [],
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGrouping.$1",
+            "type": "Uncategorized",
+            "tags": [],
+            "label": "props",
+            "description": [],
+            "signature": [
+              "P"
+            ],
+            "path": "node_modules/@types/react/index.d.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-grouping",
+        "id": "def-public.useAlertsGroupingState",
+        "type": "Function",
+        "tags": [],
+        "label": "useAlertsGroupingState",
+        "description": [],
+        "signature": [
+          "(groupingId: string) => { grouping: ",
+          "GroupModel",
+          "; updateGrouping: (groupModel: Partial<",
+          "GroupModel",
+          "> | null) => void; }"
+        ],
+        "path": "packages/kbn-alerts-grouping/src/contexts/alerts_grouping_context.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.useAlertsGroupingState.$1",
+            "type": "string",
+            "tags": [],
+            "label": "groupingId",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/contexts/alerts_grouping_context.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "@kbn/alerts-grouping",
+        "id": "def-public.AlertsGroupingProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "AlertsGroupingProps",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/alerts-grouping",
+            "scope": "public",
+            "docId": "kibKbnAlertsGroupingPluginApi",
+            "section": "def-public.AlertsGroupingProps",
+            "text": "AlertsGroupingProps"
+          },
+          "<T>"
+        ],
+        "path": "packages/kbn-alerts-grouping/src/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.children",
+            "type": "Function",
+            "tags": [],
+            "label": "children",
+            "description": [
+              "\nThe leaf component that will be rendered in the grouping panels"
+            ],
+            "signature": [
+              "(groupingFilters: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-grouping",
+                "id": "def-public.AlertsGroupingProps.children.$1",
+                "type": "Array",
+                "tags": [],
+                "label": "groupingFilters",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Filter",
+                    "text": "Filter"
+                  },
+                  "[]"
+                ],
+                "path": "packages/kbn-alerts-grouping/src/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.renderGroupPanel",
+            "type": "Function",
+            "tags": [],
+            "label": "renderGroupPanel",
+            "description": [
+              "\nRender function for the group panel header"
+            ],
+            "signature": [
+              "GroupPanelRenderer",
+              "<T> | undefined"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.getGroupStats",
+            "type": "Function",
+            "tags": [],
+            "label": "getGroupStats",
+            "description": [
+              "\nA function that given the current grouping field and aggregation results, returns an array of\nstat items to be rendered in the group panel"
+            ],
+            "signature": [
+              "GetGroupStats",
+              "<T> | undefined"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.defaultFilters",
+            "type": "Array",
+            "tags": [],
+            "label": "defaultFilters",
+            "description": [
+              "\nDefault search filters"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.globalFilters",
+            "type": "Array",
+            "tags": [],
+            "label": "globalFilters",
+            "description": [
+              "\nGlobal search filters"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[]"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.takeActionItems",
+            "type": "Function",
+            "tags": [],
+            "label": "takeActionItems",
+            "description": [
+              "\nItems that will be rendered in the `Take Actions` menu"
+            ],
+            "signature": [
+              "((groupFilters: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[], groupNumber: number) => JSX.Element[]) | undefined"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.defaultGroupingOptions",
+            "type": "Array",
+            "tags": [],
+            "label": "defaultGroupingOptions",
+            "description": [
+              "\nThe default fields available for grouping"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/grouping",
+                "scope": "common",
+                "docId": "kibKbnGroupingPluginApi",
+                "section": "def-common.GroupOption",
+                "text": "GroupOption"
+              },
+              "[]"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.featureIds",
+            "type": "Array",
+            "tags": [],
+            "label": "featureIds",
+            "description": [
+              "\nThe alerting feature ids this grouping covers"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/rule-data-utils",
+                "scope": "common",
+                "docId": "kibKbnRuleDataUtilsPluginApi",
+                "section": "def-common.AlertConsumers",
+                "text": "AlertConsumers"
+              },
+              "[]"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.from",
+            "type": "string",
+            "tags": [],
+            "label": "from",
+            "description": [
+              "\nTime filter start"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.to",
+            "type": "string",
+            "tags": [],
+            "label": "to",
+            "description": [
+              "\nTime filter end"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.globalQuery",
+            "type": "Object",
+            "tags": [],
+            "label": "globalQuery",
+            "description": [
+              "\nGlobal search query (i.e. from the KQL bar)"
+            ],
+            "signature": [
+              "{ query: string | { [key: string]: any; }; language: string; }"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.loading",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "loading",
+            "description": [
+              "\nExternal loading state"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.groupingId",
+            "type": "string",
+            "tags": [],
+            "label": "groupingId",
+            "description": [
+              "\nID used to retrieve the current grouping configuration from the state"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.getAggregationsByGroupingField",
+            "type": "Function",
+            "tags": [],
+            "label": "getAggregationsByGroupingField",
+            "description": [
+              "\nResolves an array of aggregations for a given grouping field"
+            ],
+            "signature": [
+              "(field: string) => ",
+              {
+                "pluginId": "@kbn/grouping",
+                "scope": "common",
+                "docId": "kibKbnGroupingPluginApi",
+                "section": "def-common.NamedAggregation",
+                "text": "NamedAggregation"
+              },
+              "[]"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-grouping",
+                "id": "def-public.AlertsGroupingProps.getAggregationsByGroupingField.$1",
+                "type": "string",
+                "tags": [],
+                "label": "field",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-alerts-grouping/src/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-grouping",
+            "id": "def-public.AlertsGroupingProps.services",
+            "type": "Object",
+            "tags": [],
+            "label": "services",
+            "description": [
+              "\nServices required for the grouping component"
+            ],
+            "signature": [
+              "{ notifications: ",
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.NotificationsStart",
+                "text": "NotificationsStart"
+              },
+              "; dataViews: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "public",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-public.DataViewsServicePublic",
+                "text": "DataViewsServicePublic"
+              },
+              "; http: ",
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              },
+              "; }"
+            ],
+            "path": "packages/kbn-alerts-grouping/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/kbn_alerts_grouping.mdx b/api_docs/kbn_alerts_grouping.mdx
new file mode 100644
index 0000000000000..77bdc915dbdc3
--- /dev/null
+++ b/api_docs/kbn_alerts_grouping.mdx
@@ -0,0 +1,33 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibKbnAlertsGroupingPluginApi
+slug: /kibana-dev-docs/api/kbn-alerts-grouping
+title: "@kbn/alerts-grouping"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the @kbn/alerts-grouping plugin
+date: 2024-07-11
+tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-grouping']
+---
+import kbnAlertsGroupingObj from './kbn_alerts_grouping.devdocs.json';
+
+
+
+Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 22 | 0 | 5 | 1 |
+
+## Client
+
+### Functions
+<DocDefinitionList data={kbnAlertsGroupingObj.client.functions}/>
+
+### Interfaces
+<DocDefinitionList data={kbnAlertsGroupingObj.client.interfaces}/>
+
diff --git a/api_docs/kbn_alerts_ui_shared.devdocs.json b/api_docs/kbn_alerts_ui_shared.devdocs.json
index db705acc3d45a..404c573dafc06 100644
--- a/api_docs/kbn_alerts_ui_shared.devdocs.json
+++ b/api_docs/kbn_alerts_ui_shared.devdocs.json
@@ -197,253 +197,6 @@
         "returnComment": [],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.fetchAadFields",
-        "type": "Function",
-        "tags": [],
-        "label": "fetchAadFields",
-        "description": [],
-        "signature": [
-          "({\n  http,\n  ruleTypeId,\n}: { http: ",
-          {
-            "pluginId": "@kbn/core-http-browser",
-            "scope": "common",
-            "docId": "kibKbnCoreHttpBrowserPluginApi",
-            "section": "def-common.HttpSetup",
-            "text": "HttpSetup"
-          },
-          "; ruleTypeId?: string | undefined; }) => Promise<",
-          {
-            "pluginId": "dataViews",
-            "scope": "common",
-            "docId": "kibDataViewsPluginApi",
-            "section": "def-common.DataViewField",
-            "text": "DataViewField"
-          },
-          "[]>"
-        ],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.fetchAadFields.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n  http,\n  ruleTypeId,\n}",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAadFields.$1.http",
-                "type": "Object",
-                "tags": [],
-                "label": "http",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-http-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreHttpBrowserPluginApi",
-                    "section": "def-common.HttpSetup",
-                    "text": "HttpSetup"
-                  }
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAadFields.$1.ruleTypeId",
-                "type": "string",
-                "tags": [],
-                "label": "ruleTypeId",
-                "description": [],
-                "signature": [
-                  "string | undefined"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.fetchAlertFields",
-        "type": "Function",
-        "tags": [],
-        "label": "fetchAlertFields",
-        "description": [],
-        "signature": [
-          "({\n  http,\n  featureIds,\n}: { http: ",
-          {
-            "pluginId": "@kbn/core-http-browser",
-            "scope": "common",
-            "docId": "kibKbnCoreHttpBrowserPluginApi",
-            "section": "def-common.HttpSetup",
-            "text": "HttpSetup"
-          },
-          "; featureIds: ",
-          {
-            "pluginId": "@kbn/rule-data-utils",
-            "scope": "common",
-            "docId": "kibKbnRuleDataUtilsPluginApi",
-            "section": "def-common.AlertConsumers",
-            "text": "AlertConsumers"
-          },
-          "[]; }) => Promise<",
-          {
-            "pluginId": "dataViews",
-            "scope": "common",
-            "docId": "kibDataViewsPluginApi",
-            "section": "def-common.FieldSpec",
-            "text": "FieldSpec"
-          },
-          "[]>"
-        ],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.fetchAlertFields.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n  http,\n  featureIds,\n}",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAlertFields.$1.http",
-                "type": "Object",
-                "tags": [],
-                "label": "http",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-http-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreHttpBrowserPluginApi",
-                    "section": "def-common.HttpSetup",
-                    "text": "HttpSetup"
-                  }
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAlertFields.$1.featureIds",
-                "type": "Array",
-                "tags": [],
-                "label": "featureIds",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/rule-data-utils",
-                    "scope": "common",
-                    "docId": "kibKbnRuleDataUtilsPluginApi",
-                    "section": "def-common.AlertConsumers",
-                    "text": "AlertConsumers"
-                  },
-                  "[]"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.fetchAlertIndexNames",
-        "type": "Function",
-        "tags": [],
-        "label": "fetchAlertIndexNames",
-        "description": [],
-        "signature": [
-          "({\n  http,\n  features,\n}: { http: ",
-          {
-            "pluginId": "@kbn/core-http-browser",
-            "scope": "common",
-            "docId": "kibKbnCoreHttpBrowserPluginApi",
-            "section": "def-common.HttpSetup",
-            "text": "HttpSetup"
-          },
-          "; features: string; }) => Promise<string[]>"
-        ],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.fetchAlertIndexNames.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n  http,\n  features,\n}",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAlertIndexNames.$1.http",
-                "type": "Object",
-                "tags": [],
-                "label": "http",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-http-browser",
-                    "scope": "common",
-                    "docId": "kibKbnCoreHttpBrowserPluginApi",
-                    "section": "def-common.HttpSetup",
-                    "text": "HttpSetup"
-                  }
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.fetchAlertIndexNames.$1.features",
-                "type": "string",
-                "tags": [],
-                "label": "features",
-                "description": [],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
         "id": "def-common.MaintenanceWindowCallout",
@@ -565,7 +318,7 @@
             "text": "UseAlertDataViewResult"
           }
         ],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -585,7 +338,7 @@
                 "text": "UseAlertDataViewProps"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
             "deprecated": false,
             "trackAdoption": false,
             "isRequired": true
@@ -596,10 +349,10 @@
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.useRuleAADFields",
+        "id": "def-common.useCreateRule",
         "type": "Function",
         "tags": [],
-        "label": "useRuleAADFields",
+        "label": "useCreateRule",
         "description": [],
         "signature": [
           "(props: ",
@@ -607,25 +360,54 @@
             "pluginId": "@kbn/alerts-ui-shared",
             "scope": "common",
             "docId": "kibKbnAlertsUiSharedPluginApi",
-            "section": "def-common.UseRuleAADFieldsProps",
-            "text": "UseRuleAADFieldsProps"
+            "section": "def-common.UseCreateRuleProps",
+            "text": "UseCreateRuleProps"
           },
           ") => ",
+          "UseMutationResult",
+          "<",
           {
             "pluginId": "@kbn/alerts-ui-shared",
             "scope": "common",
             "docId": "kibKbnAlertsUiSharedPluginApi",
-            "section": "def-common.UseRuleAADFieldsResult",
-            "text": "UseRuleAADFieldsResult"
-          }
+            "section": "def-common.Rule",
+            "text": "Rule"
+          },
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeParams",
+            "text": "RuleTypeParams"
+          },
+          ">, ",
+          {
+            "pluginId": "@kbn/core-http-browser",
+            "scope": "common",
+            "docId": "kibKbnCoreHttpBrowserPluginApi",
+            "section": "def-common.IHttpFetchError",
+            "text": "IHttpFetchError"
+          },
+          "<{ message: string; }>, { formData: ",
+          "CreateRuleBody",
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeParams",
+            "text": "RuleTypeParams"
+          },
+          ">; }, unknown>"
         ],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.useRuleAADFields.$1",
+            "id": "def-common.useCreateRule.$1",
             "type": "Object",
             "tags": [],
             "label": "props",
@@ -635,11 +417,11 @@
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.UseRuleAADFieldsProps",
-                "text": "UseRuleAADFieldsProps"
+                "section": "def-common.UseCreateRuleProps",
+                "text": "UseCreateRuleProps"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
             "deprecated": false,
             "trackAdoption": false,
             "isRequired": true
@@ -647,472 +429,684 @@
         ],
         "returnComment": [],
         "initialIsOpen": false
-      }
-    ],
-    "interfaces": [
+      },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.ActionConnectorFieldsProps",
-        "type": "Interface",
+        "id": "def-common.useFindAlertsQuery",
+        "type": "Function",
         "tags": [],
-        "label": "ActionConnectorFieldsProps",
-        "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+        "label": "useFindAlertsQuery",
+        "description": [
+          "\nA generic hook to find alerts\n\nStill applies alerts authorization rules but, unlike triggers_actions_ui's `useFetchAlerts` hook,\nallows to perform arbitrary queries"
+        ],
+        "signature": [
+          "<T>({ http, toasts, enabled, params, }: ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseFindAlertsQueryProps",
+            "text": "UseFindAlertsQueryProps"
+          },
+          ") => ",
+          "UseQueryResult",
+          "<",
+          "SearchResponseBody",
+          "<{}, T>, Error>"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorFieldsProps.readOnly",
-            "type": "boolean",
-            "tags": [],
-            "label": "readOnly",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorFieldsProps.isEdit",
-            "type": "boolean",
-            "tags": [],
-            "label": "isEdit",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorFieldsProps.registerPreSubmitValidator",
-            "type": "Function",
+            "id": "def-common.useFindAlertsQuery.$1",
+            "type": "Object",
             "tags": [],
-            "label": "registerPreSubmitValidator",
+            "label": "{\n  http,\n  toasts,\n  enabled = true,\n  params,\n}",
             "description": [],
             "signature": [
-              "(validator: ",
               {
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ConnectorValidationFunc",
-                "text": "ConnectorValidationFunc"
-              },
-              ") => void"
+                "section": "def-common.UseFindAlertsQueryProps",
+                "text": "UseFindAlertsQueryProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionConnectorFieldsProps.registerPreSubmitValidator.$1",
-                "type": "Function",
-                "tags": [],
-                "label": "validator",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/alerts-ui-shared",
-                    "scope": "common",
-                    "docId": "kibKbnAlertsUiSharedPluginApi",
-                    "section": "def-common.ConnectorValidationFunc",
-                    "text": "ConnectorValidationFunc"
-                  }
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+            "isRequired": true
           }
         ],
+        "returnComment": [],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.ActionConnectorProps",
-        "type": "Interface",
+        "id": "def-common.useGetAlertsGroupAggregationsQuery",
+        "type": "Function",
         "tags": [],
-        "label": "ActionConnectorProps",
-        "description": [],
+        "label": "useGetAlertsGroupAggregationsQuery",
+        "description": [
+          "\nFetches alerts aggregations for a given groupByField.\n\nSome default aggregations are applied:\n- `groupByFields`, to get the buckets based on the provided grouping field,\n  - `unitsCount`, to count the number of alerts in each bucket,\n- `unitsCount`, to count the total number of alerts targeted by the query,\n- `groupsCount`, to count the total number of groups.\n\nThe provided `aggregations` are applied within `groupByFields`. Here the `groupByField` runtime\nfield can be used to perform grouping-based aggregations.\n\nApplies alerting RBAC through featureIds."
+        ],
         "signature": [
+          "<T>({ http, toasts, enabled, params, }: ",
           {
             "pluginId": "@kbn/alerts-ui-shared",
             "scope": "common",
             "docId": "kibKbnAlertsUiSharedPluginApi",
-            "section": "def-common.ActionConnectorProps",
-            "text": "ActionConnectorProps"
+            "section": "def-common.UseGetAlertsGroupAggregationsQueryProps",
+            "text": "UseGetAlertsGroupAggregationsQueryProps"
           },
-          "<Config, Secrets>"
+          ") => ",
+          "UseQueryResult",
+          "<",
+          "SearchResponseBody",
+          "<{}, T>, Error>"
         ],
-        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.secrets",
-            "type": "Uncategorized",
+            "id": "def-common.useGetAlertsGroupAggregationsQuery.$1",
+            "type": "Object",
             "tags": [],
-            "label": "secrets",
+            "label": "{\n  http,\n  toasts,\n  enabled = true,\n  params,\n}",
             "description": [],
             "signature": [
-              "Secrets"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseGetAlertsGroupAggregationsQueryProps",
+                "text": "UseGetAlertsGroupAggregationsQueryProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
             "deprecated": false,
-            "trackAdoption": false
-          },
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useHealthCheck",
+        "type": "Function",
+        "tags": [],
+        "label": "useHealthCheck",
+        "description": [],
+        "signature": [
+          "(props: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.id",
-            "type": "string",
-            "tags": [],
-            "label": "id",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseHealthCheckProps",
+            "text": "UseHealthCheckProps"
           },
+          ") => { isLoading: boolean; isInitialLoading: boolean; error: \"alertsError\" | \"encryptionError\" | \"apiKeysDisabledError\" | \"apiKeysAndEncryptionError\" | null; }"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.actionTypeId",
-            "type": "string",
+            "id": "def-common.useHealthCheck.$1",
+            "type": "Object",
             "tags": [],
-            "label": "actionTypeId",
+            "label": "props",
             "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "signature": [
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseHealthCheckProps",
+                "text": "UseHealthCheckProps"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
             "deprecated": false,
-            "trackAdoption": false
-          },
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useLoadAlertingFrameworkHealth",
+        "type": "Function",
+        "tags": [],
+        "label": "useLoadAlertingFrameworkHealth",
+        "description": [],
+        "signature": [
+          "(props: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.name",
-            "type": "string",
-            "tags": [],
-            "label": "name",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseLoadAlertingFrameworkHealthProps",
+            "text": "UseLoadAlertingFrameworkHealthProps"
           },
+          ") => { data: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.referencedByCount",
-            "type": "number",
-            "tags": [],
-            "label": "referencedByCount",
-            "description": [],
-            "signature": [
-              "number | undefined"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerting-types",
+            "scope": "common",
+            "docId": "kibKbnAlertingTypesPluginApi",
+            "section": "def-common.AlertingFrameworkHealth",
+            "text": "AlertingFrameworkHealth"
           },
+          " | undefined; isLoading: boolean; isInitialLoading: boolean; isSuccess: boolean; isError: boolean; error: unknown; }"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_alerting_framework_health.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.config",
-            "type": "Uncategorized",
+            "id": "def-common.useLoadAlertingFrameworkHealth.$1",
+            "type": "Object",
             "tags": [],
-            "label": "config",
+            "label": "props",
             "description": [],
             "signature": [
-              "Config"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseLoadAlertingFrameworkHealthProps",
+                "text": "UseLoadAlertingFrameworkHealthProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_alerting_framework_health.ts",
             "deprecated": false,
-            "trackAdoption": false
-          },
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useLoadRuleTypesQuery",
+        "type": "Function",
+        "tags": [],
+        "label": "useLoadRuleTypesQuery",
+        "description": [],
+        "signature": [
+          "({ http, toasts, filteredRuleTypes, registeredRuleTypes, enabled, }: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.isPreconfigured",
-            "type": "boolean",
-            "tags": [],
-            "label": "isPreconfigured",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseRuleTypesProps",
+            "text": "UseRuleTypesProps"
           },
+          ") => { ruleTypesState: { isInitialLoad: boolean; isLoading: boolean; data: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.isDeprecated",
-            "type": "boolean",
-            "tags": [],
-            "label": "isDeprecated",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeIndexWithDescriptions",
+            "text": "RuleTypeIndexWithDescriptions"
           },
+          "; error: Error | null; }; hasAnyAuthorizedRuleType: boolean; authorizedRuleTypes: ",
           {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.isSystemAction",
-            "type": "boolean",
-            "tags": [],
-            "label": "isSystemAction",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeWithDescription",
+            "text": "RuleTypeWithDescription"
           },
+          "[]; authorizedToReadAnyRules: boolean; authorizedToCreateAnyRules: boolean; isSuccess: boolean; }"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionConnectorProps.isMissingSecrets",
-            "type": "CompoundType",
+            "id": "def-common.useLoadRuleTypesQuery.$1",
+            "type": "Object",
             "tags": [],
-            "label": "isMissingSecrets",
+            "label": "{\n  http,\n  toasts,\n  filteredRuleTypes,\n  registeredRuleTypes,\n  enabled = true,\n}",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseRuleTypesProps",
+                "text": "UseRuleTypesProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "isRequired": true
           }
         ],
+        "returnComment": [],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.ActionParamsProps",
-        "type": "Interface",
+        "id": "def-common.useLoadUiConfig",
+        "type": "Function",
         "tags": [],
-        "label": "ActionParamsProps",
+        "label": "useLoadUiConfig",
         "description": [],
         "signature": [
+          "(props: ",
           {
             "pluginId": "@kbn/alerts-ui-shared",
             "scope": "common",
             "docId": "kibKbnAlertsUiSharedPluginApi",
-            "section": "def-common.ActionParamsProps",
-            "text": "ActionParamsProps"
+            "section": "def-common.UseLoadUiConfigProps",
+            "text": "UseLoadUiConfigProps"
           },
-          "<TParams>"
+          ") => { data: ",
+          "UiConfig",
+          " | undefined; isLoading: boolean; isInitialLoading: boolean; isSuccess: boolean; isError: boolean; error: unknown; }"
         ],
-        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_config.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.actionParams",
+            "id": "def-common.useLoadUiConfig.$1",
             "type": "Object",
             "tags": [],
-            "label": "actionParams",
+            "label": "props",
             "description": [],
             "signature": [
-              "{ [P in keyof TParams]?: TParams[P] | undefined; }"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseLoadUiConfigProps",
+                "text": "UseLoadUiConfigProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_config.ts",
             "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.index",
-            "type": "number",
-            "tags": [],
-            "label": "index",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useLoadUiHealth",
+        "type": "Function",
+        "tags": [],
+        "label": "useLoadUiHealth",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseLoadUiHealthProps",
+            "text": "UseLoadUiHealthProps"
           },
+          ") => { data: ",
+          "UiHealthCheck",
+          " | undefined; isLoading: boolean; isInitialLoading: boolean; isSuccess: boolean; isError: boolean; error: unknown; }"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_health.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.editAction",
-            "type": "Function",
+            "id": "def-common.useLoadUiHealth.$1",
+            "type": "Object",
             "tags": [],
-            "label": "editAction",
+            "label": "props",
             "description": [],
             "signature": [
-              "(key: string, value: ",
               {
-                "pluginId": "@kbn/core-saved-objects-common",
+                "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObjectAttribute",
-                "text": "SavedObjectAttribute"
-              },
-              ", index: number) => void"
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseLoadUiHealthProps",
+                "text": "UseLoadUiHealthProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_health.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionParamsProps.editAction.$1",
-                "type": "string",
-                "tags": [],
-                "label": "key",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionParamsProps.editAction.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "value",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-saved-objects-common",
-                    "scope": "common",
-                    "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                    "section": "def-common.SavedObjectAttribute",
-                    "text": "SavedObjectAttribute"
-                  }
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              },
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionParamsProps.editAction.$3",
-                "type": "number",
-                "tags": [],
-                "label": "index",
-                "description": [],
-                "signature": [
-                  "number"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useResolveRule",
+        "type": "Function",
+        "tags": [],
+        "label": "useResolveRule",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseResolveProps",
+            "text": "UseResolveProps"
+          },
+          ") => { data: ",
+          "RuleFormData",
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeParams",
+            "text": "RuleTypeParams"
           },
+          "> | null | undefined; isLoading: boolean; isInitialLoading: boolean; isSuccess: boolean; isError: boolean; error: unknown; }"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.errors",
+            "id": "def-common.useResolveRule.$1",
             "type": "Object",
             "tags": [],
-            "label": "errors",
+            "label": "props",
             "description": [],
             "signature": [
               {
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.RuleFormParamsErrors",
-                "text": "RuleFormParamsErrors"
+                "section": "def-common.UseResolveProps",
+                "text": "UseResolveProps"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useRuleAADFields",
+        "type": "Function",
+        "tags": [],
+        "label": "useRuleAADFields",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseRuleAADFieldsProps",
+            "text": "UseRuleAADFieldsProps"
           },
+          ") => ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseRuleAADFieldsResult",
+            "text": "UseRuleAADFieldsResult"
+          }
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.ruleTypeId",
-            "type": "string",
+            "id": "def-common.useRuleAADFields.$1",
+            "type": "Object",
             "tags": [],
-            "label": "ruleTypeId",
+            "label": "props",
             "description": [],
             "signature": [
-              "string | undefined"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseRuleAADFieldsProps",
+                "text": "UseRuleAADFieldsProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.useUpdateRule",
+        "type": "Function",
+        "tags": [],
+        "label": "useUpdateRule",
+        "description": [],
+        "signature": [
+          "(props: ",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.UseUpdateRuleProps",
+            "text": "UseUpdateRuleProps"
+          },
+          ") => ",
+          "UseMutationResult",
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.Rule",
+            "text": "Rule"
+          },
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeParams",
+            "text": "RuleTypeParams"
+          },
+          ">, ",
+          {
+            "pluginId": "@kbn/core-http-browser",
+            "scope": "common",
+            "docId": "kibKbnCoreHttpBrowserPluginApi",
+            "section": "def-common.IHttpFetchError",
+            "text": "IHttpFetchError"
+          },
+          "<{ message: string; }>, { id: string; formData: ",
+          "UpdateRuleBody",
+          "<",
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.RuleTypeParams",
+            "text": "RuleTypeParams"
           },
+          ">; }, unknown>"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.messageVariables",
-            "type": "Array",
+            "id": "def-common.useUpdateRule.$1",
+            "type": "Object",
             "tags": [],
-            "label": "messageVariables",
+            "label": "props",
             "description": [],
             "signature": [
               {
-                "pluginId": "@kbn/alerting-types",
+                "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
-                "docId": "kibKbnAlertingTypesPluginApi",
-                "section": "def-common.ActionVariable",
-                "text": "ActionVariable"
-              },
-              "[] | undefined"
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.UseUpdateRuleProps",
+                "text": "UseUpdateRuleProps"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
             "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.defaultMessage",
-            "type": "string",
-            "tags": [],
-            "label": "defaultMessage",
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
+    "interfaces": [
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.ActionConnectorFieldsProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "ActionConnectorFieldsProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.ActionConnectorFieldsProps.readOnly",
+            "type": "boolean",
+            "tags": [],
+            "label": "readOnly",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.useDefaultMessage",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorFieldsProps.isEdit",
+            "type": "boolean",
             "tags": [],
-            "label": "useDefaultMessage",
+            "label": "isEdit",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.actionConnector",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorFieldsProps.registerPreSubmitValidator",
+            "type": "Function",
             "tags": [],
-            "label": "actionConnector",
+            "label": "registerPreSubmitValidator",
             "description": [],
             "signature": [
+              "(validator: ",
               {
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionConnector",
-                "text": "ActionConnector"
+                "section": "def-common.ConnectorValidationFunc",
+                "text": "ConnectorValidationFunc"
               },
-              "<Record<string, unknown>, Record<string, unknown>> | undefined"
+              ") => void"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionConnectorFieldsProps.registerPreSubmitValidator.$1",
+                "type": "Function",
+                "tags": [],
+                "label": "validator",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/alerts-ui-shared",
+                    "scope": "common",
+                    "docId": "kibKbnAlertsUiSharedPluginApi",
+                    "section": "def-common.ConnectorValidationFunc",
+                    "text": "ConnectorValidationFunc"
+                  }
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.ActionConnectorProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "ActionConnectorProps",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.ActionConnectorProps",
+            "text": "ActionConnectorProps"
           },
+          "<Config, Secrets>"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.isLoading",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorProps.secrets",
+            "type": "Uncategorized",
             "tags": [],
-            "label": "isLoading",
+            "label": "secrets",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              "Secrets"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1120,62 +1114,46 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.isDisabled",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorProps.id",
+            "type": "string",
             "tags": [],
-            "label": "isDisabled",
+            "label": "id",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.selectedActionGroupId",
+            "id": "def-common.ActionConnectorProps.actionTypeId",
             "type": "string",
             "tags": [],
-            "label": "selectedActionGroupId",
+            "label": "actionTypeId",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.showEmailSubjectAndMessage",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorProps.name",
+            "type": "string",
             "tags": [],
-            "label": "showEmailSubjectAndMessage",
+            "label": "name",
             "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.executionMode",
-            "type": "CompoundType",
+            "id": "def-common.ActionConnectorProps.referencedByCount",
+            "type": "number",
             "tags": [],
-            "label": "executionMode",
+            "label": "referencedByCount",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/alerts-ui-shared",
-                "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionConnectorMode",
-                "text": "ActionConnectorMode"
-              },
-              " | undefined"
+              "number | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1183,70 +1161,35 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.onBlur",
-            "type": "Function",
+            "id": "def-common.ActionConnectorProps.config",
+            "type": "Uncategorized",
             "tags": [],
-            "label": "onBlur",
+            "label": "config",
             "description": [],
             "signature": [
-              "((field?: string | undefined) => void) | undefined"
+              "Config"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionParamsProps.onBlur.$1",
-                "type": "string",
-                "tags": [],
-                "label": "field",
-                "description": [],
-                "signature": [
-                  "string | undefined"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionParamsProps.producerId",
-            "type": "string",
+            "id": "def-common.ActionConnectorProps.isPreconfigured",
+            "type": "boolean",
             "tags": [],
-            "label": "producerId",
+            "label": "isPreconfigured",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.ActionReadOnlyElementProps",
-        "type": "Interface",
-        "tags": [],
-        "label": "ActionReadOnlyElementProps",
-        "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionReadOnlyElementProps.connectorId",
-            "type": "string",
+            "id": "def-common.ActionConnectorProps.isDeprecated",
+            "type": "boolean",
             "tags": [],
-            "label": "connectorId",
+            "label": "isDeprecated",
             "description": [],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1254,11 +1197,25 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionReadOnlyElementProps.connectorName",
-            "type": "string",
+            "id": "def-common.ActionConnectorProps.isSystemAction",
+            "type": "boolean",
             "tags": [],
-            "label": "connectorName",
+            "label": "isSystemAction",
+            "description": [],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.ActionConnectorProps.isMissingSecrets",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isMissingSecrets",
             "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
@@ -1268,20 +1225,20 @@
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.ActionTypeModel",
+        "id": "def-common.ActionParamsProps",
         "type": "Interface",
         "tags": [],
-        "label": "ActionTypeModel",
+        "label": "ActionParamsProps",
         "description": [],
         "signature": [
           {
             "pluginId": "@kbn/alerts-ui-shared",
             "scope": "common",
             "docId": "kibKbnAlertsUiSharedPluginApi",
-            "section": "def-common.ActionTypeModel",
-            "text": "ActionTypeModel"
+            "section": "def-common.ActionParamsProps",
+            "text": "ActionParamsProps"
           },
-          "<ActionConfig, ActionSecrets, ActionParams>"
+          "<TParams>"
         ],
         "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
         "deprecated": false,
@@ -1289,71 +1246,46 @@
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.id",
-            "type": "string",
+            "id": "def-common.ActionParamsProps.actionParams",
+            "type": "Object",
             "tags": [],
-            "label": "id",
+            "label": "actionParams",
             "description": [],
+            "signature": [
+              "{ [P in keyof TParams]?: TParams[P] | undefined; }"
+            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.iconClass",
-            "type": "CompoundType",
+            "id": "def-common.ActionParamsProps.index",
+            "type": "number",
             "tags": [],
-            "label": "iconClass",
+            "label": "index",
             "description": [],
-            "signature": [
-              "string | React.ComponentType<{}>"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.selectMessage",
-            "type": "string",
-            "tags": [],
-            "label": "selectMessage",
-            "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.actionTypeTitle",
-            "type": "string",
-            "tags": [],
-            "label": "actionTypeTitle",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.validateParams",
+            "id": "def-common.ActionParamsProps.editAction",
             "type": "Function",
             "tags": [],
-            "label": "validateParams",
+            "label": "editAction",
             "description": [],
             "signature": [
-              "(actionParams: ActionParams) => Promise<",
+              "(key: string, value: ",
               {
-                "pluginId": "@kbn/alerts-ui-shared",
+                "pluginId": "@kbn/core-saved-objects-common",
                 "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.GenericValidationResult",
-                "text": "GenericValidationResult"
+                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                "section": "def-common.SavedObjectAttribute",
+                "text": "SavedObjectAttribute"
               },
-              "<unknown>>"
+              ", index: number) => void"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1361,13 +1293,49 @@
             "children": [
               {
                 "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionTypeModel.validateParams.$1",
-                "type": "Uncategorized",
+                "id": "def-common.ActionParamsProps.editAction.$1",
+                "type": "string",
                 "tags": [],
-                "label": "actionParams",
+                "label": "key",
                 "description": [],
                 "signature": [
-                  "ActionParams"
+                  "string"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionParamsProps.editAction.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-saved-objects-common",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
+                    "section": "def-common.SavedObjectAttribute",
+                    "text": "SavedObjectAttribute"
+                  }
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              },
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionParamsProps.editAction.$3",
+                "type": "number",
+                "tags": [],
+                "label": "index",
+                "description": [],
+                "signature": [
+                  "number"
                 ],
                 "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
                 "deprecated": false,
@@ -1379,21 +1347,19 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.actionConnectorFields",
-            "type": "CompoundType",
+            "id": "def-common.ActionParamsProps.errors",
+            "type": "Object",
             "tags": [],
-            "label": "actionConnectorFields",
+            "label": "errors",
             "description": [],
             "signature": [
-              "React.LazyExoticComponent<React.ComponentType<",
               {
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionConnectorFieldsProps",
-                "text": "ActionConnectorFieldsProps"
-              },
-              ">> | null"
+                "section": "def-common.RuleFormParamsErrors",
+                "text": "RuleFormParamsErrors"
+              }
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1401,84 +1367,34 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.actionParamsFields",
-            "type": "Function",
+            "id": "def-common.ActionParamsProps.ruleTypeId",
+            "type": "string",
             "tags": [],
-            "label": "actionParamsFields",
+            "label": "ruleTypeId",
             "description": [],
             "signature": [
-              "React.ExoticComponent<(",
-              {
-                "pluginId": "@kbn/alerts-ui-shared",
-                "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionParamsProps",
-                "text": "ActionParamsProps"
-              },
-              "<ActionParams> & React.RefAttributes<React.Component<",
-              {
-                "pluginId": "@kbn/alerts-ui-shared",
-                "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionParamsProps",
-                "text": "ActionParamsProps"
-              },
-              "<ActionParams>, any, any>>) | (",
-              {
-                "pluginId": "@kbn/alerts-ui-shared",
-                "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionParamsProps",
-                "text": "ActionParamsProps"
-              },
-              "<ActionParams> & { children?: React.ReactNode; })> & { readonly _result: React.ComponentType<",
-              {
-                "pluginId": "@kbn/alerts-ui-shared",
-                "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionParamsProps",
-                "text": "ActionParamsProps"
-              },
-              "<ActionParams>>; }"
+              "string | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionTypeModel.actionParamsFields.$1",
-                "type": "Uncategorized",
-                "tags": [],
-                "label": "props",
-                "description": [],
-                "signature": [
-                  "P"
-                ],
-                "path": "node_modules/@types/react/index.d.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.actionReadOnlyExtraComponent",
-            "type": "Function",
+            "id": "def-common.ActionParamsProps.messageVariables",
+            "type": "Array",
             "tags": [],
-            "label": "actionReadOnlyExtraComponent",
+            "label": "messageVariables",
             "description": [],
             "signature": [
-              "React.LazyExoticComponent<React.ComponentType<",
               {
-                "pluginId": "@kbn/alerts-ui-shared",
+                "pluginId": "@kbn/alerting-types",
                 "scope": "common",
-                "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.ActionReadOnlyElementProps",
-                "text": "ActionReadOnlyElementProps"
+                "docId": "kibKbnAlertingTypesPluginApi",
+                "section": "def-common.ActionVariable",
+                "text": "ActionVariable"
               },
-              ">> | undefined"
+              "[] | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1486,14 +1402,13 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.defaultActionParams",
-            "type": "Object",
+            "id": "def-common.ActionParamsProps.defaultMessage",
+            "type": "string",
             "tags": [],
-            "label": "defaultActionParams",
+            "label": "defaultMessage",
             "description": [],
             "signature": [
-              "RecursivePartial",
-              "<ActionParams> | undefined"
+              "string | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1501,14 +1416,13 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.defaultRecoveredActionParams",
-            "type": "Object",
+            "id": "def-common.ActionParamsProps.useDefaultMessage",
+            "type": "CompoundType",
             "tags": [],
-            "label": "defaultRecoveredActionParams",
+            "label": "useDefaultMessage",
             "description": [],
             "signature": [
-              "RecursivePartial",
-              "<ActionParams> | undefined"
+              "boolean | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1516,20 +1430,20 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.customConnectorSelectItem",
-            "type": "Object",
+            "id": "def-common.ActionParamsProps.actionConnector",
+            "type": "CompoundType",
             "tags": [],
-            "label": "customConnectorSelectItem",
+            "label": "actionConnector",
             "description": [],
             "signature": [
               {
                 "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
                 "docId": "kibKbnAlertsUiSharedPluginApi",
-                "section": "def-common.CustomConnectorSelectionItem",
-                "text": "CustomConnectorSelectionItem"
+                "section": "def-common.ActionConnector",
+                "text": "ActionConnector"
               },
-              " | undefined"
+              "<Record<string, unknown>, Record<string, unknown>> | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1537,10 +1451,10 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.isExperimental",
+            "id": "def-common.ActionParamsProps.isLoading",
             "type": "CompoundType",
             "tags": [],
-            "label": "isExperimental",
+            "label": "isLoading",
             "description": [],
             "signature": [
               "boolean | undefined"
@@ -1551,13 +1465,13 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.subtype",
-            "type": "Array",
+            "id": "def-common.ActionParamsProps.isDisabled",
+            "type": "CompoundType",
             "tags": [],
-            "label": "subtype",
+            "label": "isDisabled",
             "description": [],
             "signature": [
-              "{ id: string; name: string; }[] | undefined"
+              "boolean | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1565,42 +1479,24 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.convertParamsBetweenGroups",
-            "type": "Function",
+            "id": "def-common.ActionParamsProps.selectedActionGroupId",
+            "type": "string",
             "tags": [],
-            "label": "convertParamsBetweenGroups",
+            "label": "selectedActionGroupId",
             "description": [],
             "signature": [
-              "((params: ActionParams) => {} | ActionParams) | undefined"
+              "string | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.ActionTypeModel.convertParamsBetweenGroups.$1",
-                "type": "Uncategorized",
-                "tags": [],
-                "label": "params",
-                "description": [],
-                "signature": [
-                  "ActionParams"
-                ],
-                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.hideInUi",
+            "id": "def-common.ActionParamsProps.showEmailSubjectAndMessage",
             "type": "CompoundType",
             "tags": [],
-            "label": "hideInUi",
+            "label": "showEmailSubjectAndMessage",
             "description": [],
             "signature": [
               "boolean | undefined"
@@ -1611,13 +1507,20 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.modalWidth",
-            "type": "number",
+            "id": "def-common.ActionParamsProps.executionMode",
+            "type": "CompoundType",
             "tags": [],
-            "label": "modalWidth",
+            "label": "executionMode",
             "description": [],
             "signature": [
-              "number | undefined"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionConnectorMode",
+                "text": "ActionConnectorMode"
+              },
+              " | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
@@ -1625,68 +1528,47 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.ActionTypeModel.isSystemActionType",
-            "type": "CompoundType",
+            "id": "def-common.ActionParamsProps.onBlur",
+            "type": "Function",
             "tags": [],
-            "label": "isSystemActionType",
+            "label": "onBlur",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              "((field?: string | undefined) => void) | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.AlertFieldsTableProps",
-        "type": "Interface",
-        "tags": [],
-        "label": "AlertFieldsTableProps",
-        "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertFieldsTableProps.alert",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "alert",
-            "description": [
-              "\nThe raw alert object"
-            ],
-            "signature": [
+            "trackAdoption": false,
+            "children": [
               {
-                "pluginId": "@kbn/alerting-types",
-                "scope": "common",
-                "docId": "kibKbnAlertingTypesPluginApi",
-                "section": "def-common.BasicFields",
-                "text": "BasicFields"
-              },
-              " & { \"@timestamp\"?: string[] | undefined; \"event.action\"?: string[] | undefined; tags?: string[] | undefined; kibana?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.case_ids\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.flapping\"?: string[] | undefined; \"kibana.alert.maintenance_window_ids\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.time_range\"?: string[] | undefined; \"kibana.alert.workflow_assignee_ids\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.alert.workflow_tags\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"kibana.alert.context\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"kibana.alert.evaluation.values\"?: string[] | undefined; \"kibana.alert.group\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.suppression.docs_count\"?: string[] | undefined; \"kibana.alert.suppression.end\"?: string[] | undefined; \"kibana.alert.suppression.start\"?: string[] | undefined; \"kibana.alert.suppression.terms.field\"?: string[] | undefined; \"kibana.alert.suppression.terms.value\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.rule.threat.framework\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.id\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.name\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.reference\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.group.field\"?: string[] | undefined; \"kibana.alert.group.value\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert.suppression.terms\"?: string[] | undefined; } & { [x: string]: unknown[]; }"
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionParamsProps.onBlur.$1",
+                "type": "string",
+                "tags": [],
+                "label": "field",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
-            "deprecated": false,
-            "trackAdoption": false
+            "returnComment": []
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertFieldsTableProps.fields",
-            "type": "Array",
+            "id": "def-common.ActionParamsProps.producerId",
+            "type": "string",
             "tags": [],
-            "label": "fields",
-            "description": [
-              "\nA list of alert field keys to be shown in the table.\nWhen not defined, all the fields are shown."
-            ],
+            "label": "producerId",
+            "description": [],
             "signature": [
-              "(string | number)[] | undefined"
+              "string | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -1695,40 +1577,34 @@
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.AlertLifecycleStatusBadgeProps",
+        "id": "def-common.ActionReadOnlyElementProps",
         "type": "Interface",
         "tags": [],
-        "label": "AlertLifecycleStatusBadgeProps",
+        "label": "ActionReadOnlyElementProps",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertLifecycleStatusBadgeProps.alertStatus",
-            "type": "CompoundType",
+            "id": "def-common.ActionReadOnlyElementProps.connectorId",
+            "type": "string",
             "tags": [],
-            "label": "alertStatus",
+            "label": "connectorId",
             "description": [],
-            "signature": [
-              "\"recovered\" | \"active\" | \"untracked\""
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertLifecycleStatusBadgeProps.flapping",
-            "type": "CompoundType",
+            "id": "def-common.ActionReadOnlyElementProps.connectorName",
+            "type": "string",
             "tags": [],
-            "label": "flapping",
+            "label": "connectorName",
             "description": [],
-            "signature": [
-              "string | boolean | undefined"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -1737,364 +1613,326 @@
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.AlertsSearchBarProps",
+        "id": "def-common.ActionTypeModel",
         "type": "Interface",
         "tags": [],
-        "label": "AlertsSearchBarProps",
+        "label": "ActionTypeModel",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+        "signature": [
+          {
+            "pluginId": "@kbn/alerts-ui-shared",
+            "scope": "common",
+            "docId": "kibKbnAlertsUiSharedPluginApi",
+            "section": "def-common.ActionTypeModel",
+            "text": "ActionTypeModel"
+          },
+          "<ActionConfig, ActionSecrets, ActionParams>"
+        ],
+        "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.appName",
+            "id": "def-common.ActionTypeModel.id",
             "type": "string",
             "tags": [],
-            "label": "appName",
+            "label": "id",
             "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.disableQueryLanguageSwitcher",
+            "id": "def-common.ActionTypeModel.iconClass",
             "type": "CompoundType",
             "tags": [],
-            "label": "disableQueryLanguageSwitcher",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.featureIds",
-            "type": "Array",
-            "tags": [],
-            "label": "featureIds",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "@kbn/rule-data-utils",
-                "scope": "common",
-                "docId": "kibKbnRuleDataUtilsPluginApi",
-                "section": "def-common.AlertConsumers",
-                "text": "AlertConsumers"
-              },
-              "[]"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.rangeFrom",
-            "type": "string",
-            "tags": [],
-            "label": "rangeFrom",
+            "label": "iconClass",
             "description": [],
             "signature": [
-              "string | undefined"
+              "string | React.ComponentType<{}>"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.rangeTo",
+            "id": "def-common.ActionTypeModel.selectMessage",
             "type": "string",
             "tags": [],
-            "label": "rangeTo",
+            "label": "selectMessage",
             "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.query",
+            "id": "def-common.ActionTypeModel.actionTypeTitle",
             "type": "string",
             "tags": [],
-            "label": "query",
+            "label": "actionTypeTitle",
             "description": [],
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.filters",
-            "type": "Array",
+            "id": "def-common.ActionTypeModel.validateParams",
+            "type": "Function",
             "tags": [],
-            "label": "filters",
+            "label": "validateParams",
             "description": [],
             "signature": [
+              "(actionParams: ActionParams) => Promise<",
               {
-                "pluginId": "@kbn/es-query",
+                "pluginId": "@kbn/alerts-ui-shared",
                 "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Filter",
-                "text": "Filter"
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.GenericValidationResult",
+                "text": "GenericValidationResult"
               },
-              "[] | undefined"
+              "<unknown>>"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionTypeModel.validateParams.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "actionParams",
+                "description": [],
+                "signature": [
+                  "ActionParams"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.showFilterBar",
+            "id": "def-common.ActionTypeModel.actionConnectorFields",
             "type": "CompoundType",
             "tags": [],
-            "label": "showFilterBar",
+            "label": "actionConnectorFields",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              "React.LazyExoticComponent<React.ComponentType<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionConnectorFieldsProps",
+                "text": "ActionConnectorFieldsProps"
+              },
+              ">> | null"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.showDatePicker",
-            "type": "CompoundType",
+            "id": "def-common.ActionTypeModel.actionParamsFields",
+            "type": "Function",
             "tags": [],
-            "label": "showDatePicker",
+            "label": "actionParamsFields",
             "description": [],
             "signature": [
-              "boolean | undefined"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+              "React.ExoticComponent<(",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionParamsProps",
+                "text": "ActionParamsProps"
+              },
+              "<ActionParams> & React.RefAttributes<React.Component<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionParamsProps",
+                "text": "ActionParamsProps"
+              },
+              "<ActionParams>, any, any>>) | (",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionParamsProps",
+                "text": "ActionParamsProps"
+              },
+              "<ActionParams> & { children?: React.ReactNode; })> & { readonly _result: React.ComponentType<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionParamsProps",
+                "text": "ActionParamsProps"
+              },
+              "<ActionParams>>; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.ActionTypeModel.actionParamsFields.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "props",
+                "description": [],
+                "signature": [
+                  "P"
+                ],
+                "path": "node_modules/@types/react/index.d.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.showSubmitButton",
-            "type": "CompoundType",
+            "id": "def-common.ActionTypeModel.actionReadOnlyExtraComponent",
+            "type": "Function",
             "tags": [],
-            "label": "showSubmitButton",
+            "label": "actionReadOnlyExtraComponent",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              "React.LazyExoticComponent<React.ComponentType<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.ActionReadOnlyElementProps",
+                "text": "ActionReadOnlyElementProps"
+              },
+              ">> | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.placeholder",
-            "type": "string",
+            "id": "def-common.ActionTypeModel.defaultActionParams",
+            "type": "Object",
             "tags": [],
-            "label": "placeholder",
+            "label": "defaultActionParams",
             "description": [],
             "signature": [
-              "string | undefined"
+              "RecursivePartial",
+              "<ActionParams> | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.submitOnBlur",
-            "type": "CompoundType",
+            "id": "def-common.ActionTypeModel.defaultRecoveredActionParams",
+            "type": "Object",
             "tags": [],
-            "label": "submitOnBlur",
+            "label": "defaultRecoveredActionParams",
             "description": [],
             "signature": [
-              "boolean | undefined"
+              "RecursivePartial",
+              "<ActionParams> | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.ruleTypeId",
-            "type": "string",
+            "id": "def-common.ActionTypeModel.customConnectorSelectItem",
+            "type": "Object",
             "tags": [],
-            "label": "ruleTypeId",
+            "label": "customConnectorSelectItem",
             "description": [],
             "signature": [
-              "string | undefined"
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.CustomConnectorSelectionItem",
+                "text": "CustomConnectorSelectionItem"
+              },
+              " | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.onQueryChange",
-            "type": "Function",
+            "id": "def-common.ActionTypeModel.isExperimental",
+            "type": "CompoundType",
             "tags": [],
-            "label": "onQueryChange",
+            "label": "isExperimental",
             "description": [],
             "signature": [
-              "((query: { dateRange: { from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }; query?: string | undefined; }) => void) | undefined"
+              "boolean | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.AlertsSearchBarProps.onQueryChange.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "query",
-                "description": [],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "children": [
-                  {
-                    "parentPluginId": "@kbn/alerts-ui-shared",
-                    "id": "def-common.AlertsSearchBarProps.onQueryChange.$1.dateRange",
-                    "type": "Object",
-                    "tags": [],
-                    "label": "dateRange",
-                    "description": [],
-                    "signature": [
-                      "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }"
-                    ],
-                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  },
-                  {
-                    "parentPluginId": "@kbn/alerts-ui-shared",
-                    "id": "def-common.AlertsSearchBarProps.onQueryChange.$1.query",
-                    "type": "string",
-                    "tags": [],
-                    "label": "query",
-                    "description": [],
-                    "signature": [
-                      "string | undefined"
-                    ],
-                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  }
-                ]
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.onQuerySubmit",
-            "type": "Function",
+            "id": "def-common.ActionTypeModel.subtype",
+            "type": "Array",
             "tags": [],
-            "label": "onQuerySubmit",
+            "label": "subtype",
             "description": [],
             "signature": [
-              "(query: { dateRange: { from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }; query?: string | undefined; }) => void"
+              "{ id: string; name: string; }[] | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "query",
-                "description": [],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "children": [
-                  {
-                    "parentPluginId": "@kbn/alerts-ui-shared",
-                    "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1.dateRange",
-                    "type": "Object",
-                    "tags": [],
-                    "label": "dateRange",
-                    "description": [],
-                    "signature": [
-                      "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }"
-                    ],
-                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  },
-                  {
-                    "parentPluginId": "@kbn/alerts-ui-shared",
-                    "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1.query",
-                    "type": "string",
-                    "tags": [],
-                    "label": "query",
-                    "description": [],
-                    "signature": [
-                      "string | undefined"
-                    ],
-                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
-                    "deprecated": false,
-                    "trackAdoption": false
-                  }
-                ]
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.onFiltersUpdated",
+            "id": "def-common.ActionTypeModel.convertParamsBetweenGroups",
             "type": "Function",
             "tags": [],
-            "label": "onFiltersUpdated",
+            "label": "convertParamsBetweenGroups",
             "description": [],
             "signature": [
-              "((filters: ",
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Filter",
-                "text": "Filter"
-              },
-              "[]) => void) | undefined"
+              "((params: ActionParams) => {} | ActionParams) | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.AlertsSearchBarProps.onFiltersUpdated.$1",
-                "type": "Array",
+                "id": "def-common.ActionTypeModel.convertParamsBetweenGroups.$1",
+                "type": "Uncategorized",
                 "tags": [],
-                "label": "filters",
+                "label": "params",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "@kbn/es-query",
-                    "scope": "common",
-                    "docId": "kibKbnEsQueryPluginApi",
-                    "section": "def-common.Filter",
-                    "text": "Filter"
-                  },
-                  "[]"
+                  "ActionParams"
                 ],
-                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2104,39 +1942,175 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.http",
-            "type": "Object",
+            "id": "def-common.ActionTypeModel.hideInUi",
+            "type": "CompoundType",
             "tags": [],
-            "label": "http",
+            "label": "hideInUi",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.ActionTypeModel.modalWidth",
+            "type": "number",
+            "tags": [],
+            "label": "modalWidth",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.ActionTypeModel.isSystemActionType",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "isSystemActionType",
             "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.AlertFieldsTableProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "AlertFieldsTableProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertFieldsTableProps.alert",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "alert",
+            "description": [
+              "\nThe raw alert object"
+            ],
             "signature": [
               {
-                "pluginId": "@kbn/core-http-browser",
+                "pluginId": "@kbn/alerting-types",
                 "scope": "common",
-                "docId": "kibKbnCoreHttpBrowserPluginApi",
-                "section": "def-common.HttpSetup",
-                "text": "HttpSetup"
-              }
+                "docId": "kibKbnAlertingTypesPluginApi",
+                "section": "def-common.BasicFields",
+                "text": "BasicFields"
+              },
+              " & { \"@timestamp\"?: string[] | undefined; \"event.action\"?: string[] | undefined; tags?: string[] | undefined; kibana?: string[] | undefined; \"kibana.alert.rule.rule_type_id\"?: string[] | undefined; \"kibana.alert.rule.consumer\"?: string[] | undefined; \"kibana.alert.rule.execution.uuid\"?: string[] | undefined; \"kibana.alert.instance.id\"?: string[] | undefined; \"kibana.alert.rule.category\"?: string[] | undefined; \"kibana.alert.rule.name\"?: string[] | undefined; \"kibana.alert.rule.producer\"?: string[] | undefined; \"kibana.alert.rule.uuid\"?: string[] | undefined; \"kibana.alert.status\"?: string[] | undefined; \"kibana.alert.uuid\"?: string[] | undefined; \"kibana.space_ids\"?: string[] | undefined; \"event.kind\"?: string[] | undefined; \"kibana.alert.action_group\"?: string[] | undefined; \"kibana.alert.case_ids\"?: string[] | undefined; \"kibana.alert.duration.us\"?: string[] | undefined; \"kibana.alert.end\"?: string[] | undefined; \"kibana.alert.flapping\"?: string[] | undefined; \"kibana.alert.maintenance_window_ids\"?: string[] | undefined; \"kibana.alert.reason\"?: string[] | undefined; \"kibana.alert.rule.parameters\"?: string[] | undefined; \"kibana.alert.rule.tags\"?: string[] | undefined; \"kibana.alert.start\"?: string[] | undefined; \"kibana.alert.time_range\"?: string[] | undefined; \"kibana.alert.workflow_assignee_ids\"?: string[] | undefined; \"kibana.alert.workflow_status\"?: string[] | undefined; \"kibana.alert.workflow_tags\"?: string[] | undefined; \"kibana.version\"?: string[] | undefined; \"kibana.alert.context\"?: string[] | undefined; \"kibana.alert.evaluation.threshold\"?: string[] | undefined; \"kibana.alert.evaluation.value\"?: string[] | undefined; \"kibana.alert.evaluation.values\"?: string[] | undefined; \"kibana.alert.group\"?: string[] | undefined; \"ecs.version\"?: string[] | undefined; \"kibana.alert.risk_score\"?: string[] | undefined; \"kibana.alert.rule.author\"?: string[] | undefined; \"kibana.alert.rule.created_at\"?: string[] | undefined; \"kibana.alert.rule.created_by\"?: string[] | undefined; \"kibana.alert.rule.description\"?: string[] | undefined; \"kibana.alert.rule.enabled\"?: string[] | undefined; \"kibana.alert.rule.from\"?: string[] | undefined; \"kibana.alert.rule.interval\"?: string[] | undefined; \"kibana.alert.rule.license\"?: string[] | undefined; \"kibana.alert.rule.note\"?: string[] | undefined; \"kibana.alert.rule.references\"?: string[] | undefined; \"kibana.alert.rule.rule_id\"?: string[] | undefined; \"kibana.alert.rule.rule_name_override\"?: string[] | undefined; \"kibana.alert.rule.to\"?: string[] | undefined; \"kibana.alert.rule.type\"?: string[] | undefined; \"kibana.alert.rule.updated_at\"?: string[] | undefined; \"kibana.alert.rule.updated_by\"?: string[] | undefined; \"kibana.alert.rule.version\"?: string[] | undefined; \"kibana.alert.severity\"?: string[] | undefined; \"kibana.alert.suppression.docs_count\"?: string[] | undefined; \"kibana.alert.suppression.end\"?: string[] | undefined; \"kibana.alert.suppression.start\"?: string[] | undefined; \"kibana.alert.suppression.terms.field\"?: string[] | undefined; \"kibana.alert.suppression.terms.value\"?: string[] | undefined; \"kibana.alert.system_status\"?: string[] | undefined; \"kibana.alert.workflow_reason\"?: string[] | undefined; \"kibana.alert.workflow_user\"?: string[] | undefined; \"event.module\"?: string[] | undefined; \"kibana.alert.rule.threat.framework\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.id\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.name\"?: string[] | undefined; \"kibana.alert.rule.threat.tactic.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.reference\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.id\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.name\"?: string[] | undefined; \"kibana.alert.rule.threat.technique.subtechnique.reference\"?: string[] | undefined; \"kibana.alert.building_block_type\"?: string[] | undefined; \"kibana.alert\"?: string[] | undefined; \"kibana.alert.group.field\"?: string[] | undefined; \"kibana.alert.group.value\"?: string[] | undefined; \"kibana.alert.rule\"?: string[] | undefined; \"kibana.alert.rule.exceptions_list\"?: string[] | undefined; \"kibana.alert.rule.namespace\"?: string[] | undefined; \"kibana.alert.suppression.terms\"?: string[] | undefined; } & { [x: string]: unknown[]; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertFieldsTableProps.fields",
+            "type": "Array",
+            "tags": [],
+            "label": "fields",
+            "description": [
+              "\nA list of alert field keys to be shown in the table.\nWhen not defined, all the fields are shown."
+            ],
+            "signature": [
+              "(string | number)[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alert_fields_table/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.AlertLifecycleStatusBadgeProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "AlertLifecycleStatusBadgeProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertLifecycleStatusBadgeProps.alertStatus",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "alertStatus",
+            "description": [],
+            "signature": [
+              "\"recovered\" | \"active\" | \"untracked\""
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertLifecycleStatusBadgeProps.flapping",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "flapping",
+            "description": [],
+            "signature": [
+              "string | boolean | undefined"
             ],
+            "path": "packages/kbn-alerts-ui-shared/src/alert_lifecycle_status_badge/index.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.AlertsSearchBarProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "AlertsSearchBarProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.appName",
+            "type": "string",
+            "tags": [],
+            "label": "appName",
+            "description": [],
             "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.toasts",
-            "type": "Object",
+            "id": "def-common.AlertsSearchBarProps.disableQueryLanguageSwitcher",
+            "type": "CompoundType",
             "tags": [],
-            "label": "toasts",
+            "label": "disableQueryLanguageSwitcher",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-notifications-browser",
-                "scope": "common",
-                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
-                "section": "def-common.IToasts",
-                "text": "IToasts"
-              }
+              "boolean | undefined"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
             "deprecated": false,
@@ -2144,93 +2118,464 @@
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.unifiedSearchBar",
-            "type": "Function",
+            "id": "def-common.AlertsSearchBarProps.featureIds",
+            "type": "Array",
             "tags": [],
-            "label": "unifiedSearchBar",
+            "label": "featureIds",
             "description": [],
             "signature": [
-              "(props: ",
-              {
-                "pluginId": "unifiedSearch",
-                "scope": "public",
-                "docId": "kibUnifiedSearchPluginApi",
-                "section": "def-public.StatefulSearchBarProps",
-                "text": "StatefulSearchBarProps"
-              },
-              "<",
               {
-                "pluginId": "@kbn/es-query",
+                "pluginId": "@kbn/rule-data-utils",
                 "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.Query",
-                "text": "Query"
+                "docId": "kibKbnRuleDataUtilsPluginApi",
+                "section": "def-common.AlertConsumers",
+                "text": "AlertConsumers"
               },
-              ">) => React.ReactElement<any, string | React.JSXElementConstructor<any>>"
+              "[]"
             ],
             "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "returnComment": [],
-            "children": [
-              {
-                "parentPluginId": "@kbn/alerts-ui-shared",
-                "id": "def-common.AlertsSearchBarProps.unifiedSearchBar.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "props",
-                "description": [],
-                "signature": [
-                  "Omit<",
-                  "SearchBarOwnProps",
-                  "<",
-                  {
-                    "pluginId": "@kbn/es-query",
-                    "scope": "common",
-                    "docId": "kibKbnEsQueryPluginApi",
-                    "section": "def-common.Query",
-                    "text": "Query"
-                  },
-                  ">, \"showSaveQuery\"> & { appName: string; useDefaultBehaviors?: boolean | undefined; savedQueryId?: string | undefined; saveQueryMenuVisibility?: ",
-                  "SavedQueryMenuVisibility",
-                  " | undefined; onSavedQueryIdChange?: ((savedQueryId?: string | undefined) => void) | undefined; onFiltersUpdated?: ((filters: ",
-                  {
-                    "pluginId": "@kbn/es-query",
-                    "scope": "common",
-                    "docId": "kibKbnEsQueryPluginApi",
-                    "section": "def-common.Filter",
-                    "text": "Filter"
-                  },
-                  "[]) => void) | undefined; }"
-                ],
-                "path": "src/plugins/unified_search/public/types.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.AlertsSearchBarProps.dataViewsService",
-            "type": "Object",
+            "id": "def-common.AlertsSearchBarProps.rangeFrom",
+            "type": "string",
             "tags": [],
-            "label": "dataViewsService",
+            "label": "rangeFrom",
             "description": [],
             "signature": [
-              "{ create: (spec: ",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewSpec",
-                "text": "DataViewSpec"
-              },
-              ", skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.rangeTo",
+            "type": "string",
+            "tags": [],
+            "label": "rangeTo",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.query",
+            "type": "string",
+            "tags": [],
+            "label": "query",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.filters",
+            "type": "Array",
+            "tags": [],
+            "label": "filters",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.showFilterBar",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "showFilterBar",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.showDatePicker",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "showDatePicker",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.showSubmitButton",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "showSubmitButton",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.placeholder",
+            "type": "string",
+            "tags": [],
+            "label": "placeholder",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.submitOnBlur",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "submitOnBlur",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.ruleTypeId",
+            "type": "string",
+            "tags": [],
+            "label": "ruleTypeId",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.onQueryChange",
+            "type": "Function",
+            "tags": [],
+            "label": "onQueryChange",
+            "description": [],
+            "signature": [
+              "((query: { dateRange: { from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }; query?: string | undefined; }) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.AlertsSearchBarProps.onQueryChange.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "query",
+                "description": [],
+                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "@kbn/alerts-ui-shared",
+                    "id": "def-common.AlertsSearchBarProps.onQueryChange.$1.dateRange",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "dateRange",
+                    "description": [],
+                    "signature": [
+                      "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }"
+                    ],
+                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "@kbn/alerts-ui-shared",
+                    "id": "def-common.AlertsSearchBarProps.onQueryChange.$1.query",
+                    "type": "string",
+                    "tags": [],
+                    "label": "query",
+                    "description": [],
+                    "signature": [
+                      "string | undefined"
+                    ],
+                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.onQuerySubmit",
+            "type": "Function",
+            "tags": [],
+            "label": "onQuerySubmit",
+            "description": [],
+            "signature": [
+              "(query: { dateRange: { from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }; query?: string | undefined; }) => void"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "query",
+                "description": [],
+                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "@kbn/alerts-ui-shared",
+                    "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1.dateRange",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "dateRange",
+                    "description": [],
+                    "signature": [
+                      "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }"
+                    ],
+                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "@kbn/alerts-ui-shared",
+                    "id": "def-common.AlertsSearchBarProps.onQuerySubmit.$1.query",
+                    "type": "string",
+                    "tags": [],
+                    "label": "query",
+                    "description": [],
+                    "signature": [
+                      "string | undefined"
+                    ],
+                    "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.onFiltersUpdated",
+            "type": "Function",
+            "tags": [],
+            "label": "onFiltersUpdated",
+            "description": [],
+            "signature": [
+              "((filters: ",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Filter",
+                "text": "Filter"
+              },
+              "[]) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.AlertsSearchBarProps.onFiltersUpdated.$1",
+                "type": "Array",
+                "tags": [],
+                "label": "filters",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Filter",
+                    "text": "Filter"
+                  },
+                  "[]"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.toasts",
+            "type": "Object",
+            "tags": [],
+            "label": "toasts",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.IToasts",
+                "text": "IToasts"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.unifiedSearchBar",
+            "type": "Function",
+            "tags": [],
+            "label": "unifiedSearchBar",
+            "description": [],
+            "signature": [
+              "(props: ",
+              {
+                "pluginId": "unifiedSearch",
+                "scope": "public",
+                "docId": "kibUnifiedSearchPluginApi",
+                "section": "def-public.StatefulSearchBarProps",
+                "text": "StatefulSearchBarProps"
+              },
+              "<",
+              {
+                "pluginId": "@kbn/es-query",
+                "scope": "common",
+                "docId": "kibKbnEsQueryPluginApi",
+                "section": "def-common.Query",
+                "text": "Query"
+              },
+              ">) => React.ReactElement<any, string | React.JSXElementConstructor<any>>"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.AlertsSearchBarProps.unifiedSearchBar.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "props",
+                "description": [],
+                "signature": [
+                  "Omit<",
+                  "SearchBarOwnProps",
+                  "<",
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Query",
+                    "text": "Query"
+                  },
+                  ">, \"showSaveQuery\"> & { appName: string; useDefaultBehaviors?: boolean | undefined; savedQueryId?: string | undefined; saveQueryMenuVisibility?: ",
+                  "SavedQueryMenuVisibility",
+                  " | undefined; onSavedQueryIdChange?: ((savedQueryId?: string | undefined) => void) | undefined; onFiltersUpdated?: ((filters: ",
+                  {
+                    "pluginId": "@kbn/es-query",
+                    "scope": "common",
+                    "docId": "kibKbnEsQueryPluginApi",
+                    "section": "def-common.Filter",
+                    "text": "Filter"
+                  },
+                  "[]) => void) | undefined; }"
+                ],
+                "path": "src/plugins/unified_search/public/types.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.AlertsSearchBarProps.dataViewsService",
+            "type": "Object",
+            "tags": [],
+            "label": "dataViewsService",
+            "description": [],
+            "signature": [
+              "{ create: (spec: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewSpec",
+                "text": "DataViewSpec"
+              },
+              ", skipFetchFields?: boolean, displayErrors?: boolean) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
                 "text": "DataView"
               },
               ">; get: (id: string, displayErrors?: boolean, refreshFields?: boolean) => Promise<",
@@ -3128,15 +3473,62 @@
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.GenericValidationResult.errors",
-            "type": "Object",
+            "id": "def-common.GenericValidationResult.errors",
+            "type": "Object",
+            "tags": [],
+            "label": "errors",
+            "description": [],
+            "signature": [
+              "{ [P in Extract<keyof T, string>]: unknown; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.HealthStatus",
+        "type": "Interface",
+        "tags": [],
+        "label": "HealthStatus",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.HealthStatus.isRulesAvailable",
+            "type": "boolean",
             "tags": [],
-            "label": "errors",
+            "label": "isRulesAvailable",
             "description": [],
-            "signature": [
-              "{ [P in Extract<keyof T, string>]: unknown; }"
-            ],
-            "path": "packages/kbn-alerts-ui-shared/src/common/types/action_types.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.HealthStatus.isSufficientlySecure",
+            "type": "boolean",
+            "tags": [],
+            "label": "isSufficientlySecure",
+            "description": [],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.HealthStatus.hasPermanentEncryptionKey",
+            "type": "boolean",
+            "tags": [],
+            "label": "hasPermanentEncryptionKey",
+            "description": [],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -3947,7 +4339,7 @@
         "tags": [],
         "label": "UseAlertDataViewProps",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -3968,7 +4360,7 @@
               },
               "[]"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3988,7 +4380,7 @@
                 "text": "HttpSetup"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4234,91 +4626,625 @@
               },
               ">; createSavedObject: (dataView: ",
               {
-                "pluginId": "dataViews",
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.AbstractDataView",
+                "text": "AbstractDataView"
+              },
+              ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.AbstractDataView",
+                "text": "AbstractDataView"
+              },
+              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              " | null>; toDataView: (dataViewLazy: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ">; toDataViewLazy: (dataView: ",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataViewLazy",
+                "text": "DataViewLazy"
+              },
+              ">; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseAlertDataViewProps.toasts",
+            "type": "Object",
+            "tags": [],
+            "label": "toasts",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.IToasts",
+                "text": "IToasts"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseAlertDataViewResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseAlertDataViewResult",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseAlertDataViewResult.dataViews",
+            "type": "Array",
+            "tags": [],
+            "label": "dataViews",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "dataViews",
+                "scope": "common",
+                "docId": "kibDataViewsPluginApi",
+                "section": "def-common.DataView",
+                "text": "DataView"
+              },
+              "[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseAlertDataViewResult.loading",
+            "type": "boolean",
+            "tags": [],
+            "label": "loading",
+            "description": [],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseCreateRuleProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseCreateRuleProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseCreateRuleProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseCreateRuleProps.onSuccess",
+            "type": "Function",
+            "tags": [],
+            "label": "onSuccess",
+            "description": [],
+            "signature": [
+              "((formData: ",
+              "CreateRuleBody",
+              "<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.RuleTypeParams",
+                "text": "RuleTypeParams"
+              },
+              ">) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.UseCreateRuleProps.onSuccess.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "formData",
+                "description": [],
+                "signature": [
+                  "CreateRuleBody",
+                  "<",
+                  {
+                    "pluginId": "@kbn/alerts-ui-shared",
+                    "scope": "common",
+                    "docId": "kibKbnAlertsUiSharedPluginApi",
+                    "section": "def-common.RuleTypeParams",
+                    "text": "RuleTypeParams"
+                  },
+                  ">"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseCreateRuleProps.onError",
+            "type": "Function",
+            "tags": [],
+            "label": "onError",
+            "description": [],
+            "signature": [
+              "((error: ",
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.IHttpFetchError",
+                "text": "IHttpFetchError"
+              },
+              "<{ message: string; }>) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.UseCreateRuleProps.onError.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "error",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpBrowserPluginApi",
+                    "section": "def-common.IHttpFetchError",
+                    "text": "IHttpFetchError"
+                  },
+                  "<{ message: string; }>"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_create_rule.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseFindAlertsQueryProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseFindAlertsQueryProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseFindAlertsQueryProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.AbstractDataView",
-                "text": "AbstractDataView"
-              },
-              ", overwrite?: boolean) => Promise<void>; updateSavedObject: (indexPattern: ",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseFindAlertsQueryProps.toasts",
+            "type": "Object",
+            "tags": [],
+            "label": "toasts",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-notifications-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.AbstractDataView",
-                "text": "AbstractDataView"
-              },
-              ", saveAttempts?: number, ignoreErrors?: boolean, displayErrors?: boolean) => Promise<void>; defaultDataViewExists: () => Promise<boolean>; getDefaultDataViewLazy: () => Promise<",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.IToasts",
+                "text": "IToasts"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseFindAlertsQueryProps.enabled",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "enabled",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseFindAlertsQueryProps.params",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "params",
+            "description": [],
+            "signature": [
+              "{ trackTotalHits?: boolean | undefined; } & ",
+              "SearchRequest",
+              " & { feature_ids?: string[] | undefined; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseGetAlertsGroupAggregationsQueryProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseGetAlertsGroupAggregationsQueryProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseGetAlertsGroupAggregationsQueryProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewLazy",
-                "text": "DataViewLazy"
-              },
-              " | null>; getDefaultDataView: (options?: { displayErrors?: boolean | undefined; refreshFields?: boolean | undefined; }) => Promise<",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseGetAlertsGroupAggregationsQueryProps.toasts",
+            "type": "Object",
+            "tags": [],
+            "label": "toasts",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-notifications-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              " | null>; toDataView: (dataViewLazy: ",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.IToasts",
+                "text": "IToasts"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseGetAlertsGroupAggregationsQueryProps.enabled",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "enabled",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseGetAlertsGroupAggregationsQueryProps.params",
+            "type": "Object",
+            "tags": [],
+            "label": "params",
+            "description": [],
+            "signature": [
+              "{ featureIds: ",
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/rule-data-utils",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewLazy",
-                "text": "DataViewLazy"
+                "docId": "kibKbnRuleDataUtilsPluginApi",
+                "section": "def-common.AlertConsumers",
+                "text": "AlertConsumers"
               },
-              ") => Promise<",
+              "[]; groupByField: string; aggregations?: Record<string, ",
+              "AggregationsAggregationContainer",
+              "> | undefined; filters?: ",
+              "QueryDslQueryContainer",
+              "[] | undefined; sort?: ",
+              "SortCombinations",
+              "[] | undefined; pageIndex?: number | undefined; pageSize?: number | undefined; }"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseHealthCheckProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseHealthCheckProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseHealthCheckProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ">; toDataViewLazy: (dataView: ",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseHealthCheckResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseHealthCheckResult",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseHealthCheckResult.isLoading",
+            "type": "boolean",
+            "tags": [],
+            "label": "isLoading",
+            "description": [],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseHealthCheckResult.healthCheckError",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "healthCheckError",
+            "description": [],
+            "signature": [
+              "HealthCheckErrors",
+              " | null"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_health_check.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseLoadAlertingFrameworkHealthProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseLoadAlertingFrameworkHealthProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_alerting_framework_health.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseLoadAlertingFrameworkHealthProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              ") => Promise<",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_alerting_framework_health.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseLoadUiConfigProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseLoadUiConfigProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_config.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseLoadUiConfigProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataViewLazy",
-                "text": "DataViewLazy"
-              },
-              ">; }"
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_config.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseLoadUiHealthProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseLoadUiHealthProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_health.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.UseAlertDataViewProps.toasts",
+            "id": "def-common.UseLoadUiHealthProps.http",
             "type": "Object",
             "tags": [],
-            "label": "toasts",
+            "label": "http",
             "description": [],
             "signature": [
               {
-                "pluginId": "@kbn/core-notifications-browser",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
-                "section": "def-common.IToasts",
-                "text": "IToasts"
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_ui_health.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4327,44 +5253,46 @@
       },
       {
         "parentPluginId": "@kbn/alerts-ui-shared",
-        "id": "def-common.UseAlertDataViewResult",
+        "id": "def-common.UseResolveProps",
         "type": "Interface",
         "tags": [],
-        "label": "UseAlertDataViewResult",
+        "label": "UseResolveProps",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.UseAlertDataViewResult.dataViews",
-            "type": "Array",
+            "id": "def-common.UseResolveProps.http",
+            "type": "Object",
             "tags": [],
-            "label": "dataViews",
+            "label": "http",
             "description": [],
             "signature": [
               {
-                "pluginId": "dataViews",
+                "pluginId": "@kbn/core-http-browser",
                 "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.DataView",
-                "text": "DataView"
-              },
-              "[] | undefined"
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/alerts-ui-shared",
-            "id": "def-common.UseAlertDataViewResult.loading",
-            "type": "boolean",
+            "id": "def-common.UseResolveProps.id",
+            "type": "string",
             "tags": [],
-            "label": "loading",
+            "label": "id",
             "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts",
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_resolve_rule.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4378,7 +5306,7 @@
         "tags": [],
         "label": "UseRuleAADFieldsProps",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -4392,7 +5320,7 @@
             "signature": [
               "string | undefined"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4412,7 +5340,7 @@
                 "text": "HttpSetup"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4432,7 +5360,7 @@
                 "text": "IToasts"
               }
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4446,7 +5374,7 @@
         "tags": [],
         "label": "UseRuleAADFieldsResult",
         "description": [],
-        "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -4467,7 +5395,7 @@
               },
               "[]"
             ],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4478,9 +5406,237 @@
             "tags": [],
             "label": "loading",
             "description": [],
-            "path": "packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts",
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseRuleTypesProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseRuleTypesProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseRuleTypesProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseRuleTypesProps.toasts",
+            "type": "Object",
+            "tags": [],
+            "label": "toasts",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-notifications-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreNotificationsBrowserPluginApi",
+                "section": "def-common.IToasts",
+                "text": "IToasts"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseRuleTypesProps.filteredRuleTypes",
+            "type": "Array",
+            "tags": [],
+            "label": "filteredRuleTypes",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseRuleTypesProps.registeredRuleTypes",
+            "type": "Array",
+            "tags": [],
+            "label": "registeredRuleTypes",
+            "description": [],
+            "signature": [
+              "{ id: string; description: string; }[] | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseRuleTypesProps.enabled",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "enabled",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_load_rule_types_query.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/alerts-ui-shared",
+        "id": "def-common.UseUpdateRuleProps",
+        "type": "Interface",
+        "tags": [],
+        "label": "UseUpdateRuleProps",
+        "description": [],
+        "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseUpdateRuleProps.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.HttpSetup",
+                "text": "HttpSetup"
+              }
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseUpdateRuleProps.onSuccess",
+            "type": "Function",
+            "tags": [],
+            "label": "onSuccess",
+            "description": [],
+            "signature": [
+              "((formData: ",
+              "UpdateRuleBody",
+              "<",
+              {
+                "pluginId": "@kbn/alerts-ui-shared",
+                "scope": "common",
+                "docId": "kibKbnAlertsUiSharedPluginApi",
+                "section": "def-common.RuleTypeParams",
+                "text": "RuleTypeParams"
+              },
+              ">) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.UseUpdateRuleProps.onSuccess.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "formData",
+                "description": [],
+                "signature": [
+                  "UpdateRuleBody",
+                  "<",
+                  {
+                    "pluginId": "@kbn/alerts-ui-shared",
+                    "scope": "common",
+                    "docId": "kibKbnAlertsUiSharedPluginApi",
+                    "section": "def-common.RuleTypeParams",
+                    "text": "RuleTypeParams"
+                  },
+                  ">"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/alerts-ui-shared",
+            "id": "def-common.UseUpdateRuleProps.onError",
+            "type": "Function",
+            "tags": [],
+            "label": "onError",
+            "description": [],
+            "signature": [
+              "((error: ",
+              {
+                "pluginId": "@kbn/core-http-browser",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpBrowserPluginApi",
+                "section": "def-common.IHttpFetchError",
+                "text": "IHttpFetchError"
+              },
+              "<{ message: string; }>) => void) | undefined"
+            ],
+            "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/alerts-ui-shared",
+                "id": "def-common.UseUpdateRuleProps.onError.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "error",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-browser",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpBrowserPluginApi",
+                    "section": "def-common.IHttpFetchError",
+                    "text": "IHttpFetchError"
+                  },
+                  "<{ message: string; }>"
+                ],
+                "path": "packages/kbn-alerts-ui-shared/src/common/hooks/use_update_rule.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
           }
         ],
         "initialIsOpen": false
diff --git a/api_docs/kbn_alerts_ui_shared.mdx b/api_docs/kbn_alerts_ui_shared.mdx
index 3d9460e9d7934..fd5677fce9f74 100644
--- a/api_docs/kbn_alerts_ui_shared.mdx
+++ b/api_docs/kbn_alerts_ui_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-alerts-ui-shared
 title: "@kbn/alerts-ui-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/alerts-ui-shared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/alerts-ui-shared']
 ---
 import kbnAlertsUiSharedObj from './kbn_alerts_ui_shared.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 245 | 0 | 231 | 2 |
+| 299 | 0 | 283 | 8 |
 
 ## Common
 
diff --git a/api_docs/kbn_analytics.mdx b/api_docs/kbn_analytics.mdx
index 5752c900bff1a..6896546ffb32a 100644
--- a/api_docs/kbn_analytics.mdx
+++ b/api_docs/kbn_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics
 title: "@kbn/analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics']
 ---
 import kbnAnalyticsObj from './kbn_analytics.devdocs.json';
diff --git a/api_docs/kbn_analytics_collection_utils.mdx b/api_docs/kbn_analytics_collection_utils.mdx
index 540ad398c9e8b..1c052b7b6c4d2 100644
--- a/api_docs/kbn_analytics_collection_utils.mdx
+++ b/api_docs/kbn_analytics_collection_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-analytics-collection-utils
 title: "@kbn/analytics-collection-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/analytics-collection-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/analytics-collection-utils']
 ---
 import kbnAnalyticsCollectionUtilsObj from './kbn_analytics_collection_utils.devdocs.json';
diff --git a/api_docs/kbn_apm_config_loader.mdx b/api_docs/kbn_apm_config_loader.mdx
index cecbf6d87dfe9..52f46921b8a6c 100644
--- a/api_docs/kbn_apm_config_loader.mdx
+++ b/api_docs/kbn_apm_config_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-config-loader
 title: "@kbn/apm-config-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-config-loader plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-config-loader']
 ---
 import kbnApmConfigLoaderObj from './kbn_apm_config_loader.devdocs.json';
diff --git a/api_docs/kbn_apm_data_view.mdx b/api_docs/kbn_apm_data_view.mdx
index f85c9d57d3659..8c863c11ca3d9 100644
--- a/api_docs/kbn_apm_data_view.mdx
+++ b/api_docs/kbn_apm_data_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-data-view
 title: "@kbn/apm-data-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-data-view plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-data-view']
 ---
 import kbnApmDataViewObj from './kbn_apm_data_view.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace.mdx b/api_docs/kbn_apm_synthtrace.mdx
index 0ce6f02362ad7..2e6cd4d8a33c6 100644
--- a/api_docs/kbn_apm_synthtrace.mdx
+++ b/api_docs/kbn_apm_synthtrace.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace
 title: "@kbn/apm-synthtrace"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace']
 ---
 import kbnApmSynthtraceObj from './kbn_apm_synthtrace.devdocs.json';
diff --git a/api_docs/kbn_apm_synthtrace_client.devdocs.json b/api_docs/kbn_apm_synthtrace_client.devdocs.json
index 0456a1802ee4f..c6dbb4c5fa952 100644
--- a/api_docs/kbn_apm_synthtrace_client.devdocs.json
+++ b/api_docs/kbn_apm_synthtrace_client.devdocs.json
@@ -2631,7 +2631,7 @@
         "label": "LogDocument",
         "description": [],
         "signature": [
-          "{ '@timestamp'?: number | undefined; } & Partial<{ 'input.type': string; 'log.file.path'?: string | undefined; 'service.name'?: string | undefined; 'data_stream.namespace': string; 'data_stream.type': string; 'data_stream.dataset': string; message?: string | undefined; 'error.message'?: string | undefined; 'event.original'?: string | undefined; 'event.dataset': string; 'log.level'?: string | undefined; 'host.name'?: string | undefined; 'container.id'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.id'?: string | undefined; 'agent.id'?: string | undefined; 'agent.name'?: string | undefined; 'orchestrator.cluster.name'?: string | undefined; 'orchestrator.cluster.id'?: string | undefined; 'orchestrator.resource.id'?: string | undefined; 'kubernetes.pod.uid'?: string | undefined; 'aws.s3.bucket.name'?: string | undefined; 'orchestrator.namespace'?: string | undefined; 'container.name'?: string | undefined; 'cloud.provider'?: string | undefined; 'cloud.region'?: string | undefined; 'cloud.availability_zone'?: string | undefined; 'cloud.project.id'?: string | undefined; 'cloud.instance.id'?: string | undefined; 'error.stack_trace'?: string | undefined; 'error.exception.stacktrace'?: string | undefined; 'error.log.stacktrace'?: string | undefined; 'log.custom': Record<string, unknown>; }>"
+          "{ '@timestamp'?: number | undefined; } & Partial<{ 'input.type': string; 'log.file.path'?: string | undefined; 'service.name'?: string | undefined; 'service.environment'?: string | undefined; 'data_stream.namespace': string; 'data_stream.type': string; 'data_stream.dataset': string; message?: string | undefined; 'error.message'?: string | undefined; 'event.original'?: string | undefined; 'event.dataset': string; 'log.level'?: string | undefined; 'host.name'?: string | undefined; 'container.id'?: string | undefined; 'trace.id'?: string | undefined; 'transaction.id'?: string | undefined; 'agent.id'?: string | undefined; 'agent.name'?: string | undefined; 'orchestrator.cluster.name'?: string | undefined; 'orchestrator.cluster.id'?: string | undefined; 'orchestrator.resource.id'?: string | undefined; 'kubernetes.pod.uid'?: string | undefined; 'aws.s3.bucket.name'?: string | undefined; 'orchestrator.namespace'?: string | undefined; 'container.name'?: string | undefined; 'cloud.provider'?: string | undefined; 'cloud.region'?: string | undefined; 'cloud.availability_zone'?: string | undefined; 'cloud.project.id'?: string | undefined; 'cloud.instance.id'?: string | undefined; 'error.stack_trace'?: string | undefined; 'error.exception.stacktrace'?: string | undefined; 'error.log.stacktrace'?: string | undefined; 'log.custom': Record<string, unknown>; }>"
         ],
         "path": "packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_apm_synthtrace_client.mdx b/api_docs/kbn_apm_synthtrace_client.mdx
index 57129a7e5d96d..bee339a7a5b96 100644
--- a/api_docs/kbn_apm_synthtrace_client.mdx
+++ b/api_docs/kbn_apm_synthtrace_client.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-synthtrace-client
 title: "@kbn/apm-synthtrace-client"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-synthtrace-client plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-synthtrace-client']
 ---
 import kbnApmSynthtraceClientObj from './kbn_apm_synthtrace_client.devdocs.json';
diff --git a/api_docs/kbn_apm_utils.mdx b/api_docs/kbn_apm_utils.mdx
index 6371dfd7d6126..412a59fff7245 100644
--- a/api_docs/kbn_apm_utils.mdx
+++ b/api_docs/kbn_apm_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-apm-utils
 title: "@kbn/apm-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/apm-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/apm-utils']
 ---
 import kbnApmUtilsObj from './kbn_apm_utils.devdocs.json';
diff --git a/api_docs/kbn_axe_config.mdx b/api_docs/kbn_axe_config.mdx
index a7a9c93dbdb7c..4802854b39e3e 100644
--- a/api_docs/kbn_axe_config.mdx
+++ b/api_docs/kbn_axe_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-axe-config
 title: "@kbn/axe-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/axe-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/axe-config']
 ---
 import kbnAxeConfigObj from './kbn_axe_config.devdocs.json';
diff --git a/api_docs/kbn_bfetch_error.mdx b/api_docs/kbn_bfetch_error.mdx
index c95f74cf65901..d42e2b360aebd 100644
--- a/api_docs/kbn_bfetch_error.mdx
+++ b/api_docs/kbn_bfetch_error.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-bfetch-error
 title: "@kbn/bfetch-error"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/bfetch-error plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/bfetch-error']
 ---
 import kbnBfetchErrorObj from './kbn_bfetch_error.devdocs.json';
diff --git a/api_docs/kbn_calculate_auto.mdx b/api_docs/kbn_calculate_auto.mdx
index f328b26e73f3e..a4ccd68d6f248 100644
--- a/api_docs/kbn_calculate_auto.mdx
+++ b/api_docs/kbn_calculate_auto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-auto
 title: "@kbn/calculate-auto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-auto plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-auto']
 ---
 import kbnCalculateAutoObj from './kbn_calculate_auto.devdocs.json';
diff --git a/api_docs/kbn_calculate_width_from_char_count.mdx b/api_docs/kbn_calculate_width_from_char_count.mdx
index 30eade23f7d1e..014436b53055d 100644
--- a/api_docs/kbn_calculate_width_from_char_count.mdx
+++ b/api_docs/kbn_calculate_width_from_char_count.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-calculate-width-from-char-count
 title: "@kbn/calculate-width-from-char-count"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/calculate-width-from-char-count plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/calculate-width-from-char-count']
 ---
 import kbnCalculateWidthFromCharCountObj from './kbn_calculate_width_from_char_count.devdocs.json';
diff --git a/api_docs/kbn_cases_components.mdx b/api_docs/kbn_cases_components.mdx
index 49b697256d4a2..be98393f76557 100644
--- a/api_docs/kbn_cases_components.mdx
+++ b/api_docs/kbn_cases_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cases-components
 title: "@kbn/cases-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cases-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cases-components']
 ---
 import kbnCasesComponentsObj from './kbn_cases_components.devdocs.json';
diff --git a/api_docs/kbn_cell_actions.mdx b/api_docs/kbn_cell_actions.mdx
index c1e2fc81a0154..1de24a4d18c68 100644
--- a/api_docs/kbn_cell_actions.mdx
+++ b/api_docs/kbn_cell_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cell-actions
 title: "@kbn/cell-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cell-actions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cell-actions']
 ---
 import kbnCellActionsObj from './kbn_cell_actions.devdocs.json';
diff --git a/api_docs/kbn_chart_expressions_common.mdx b/api_docs/kbn_chart_expressions_common.mdx
index 438e9a3262937..3019f08b578a8 100644
--- a/api_docs/kbn_chart_expressions_common.mdx
+++ b/api_docs/kbn_chart_expressions_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-expressions-common
 title: "@kbn/chart-expressions-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-expressions-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-expressions-common']
 ---
 import kbnChartExpressionsCommonObj from './kbn_chart_expressions_common.devdocs.json';
diff --git a/api_docs/kbn_chart_icons.mdx b/api_docs/kbn_chart_icons.mdx
index 7025c7c97d6a8..8703f4965b812 100644
--- a/api_docs/kbn_chart_icons.mdx
+++ b/api_docs/kbn_chart_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-chart-icons
 title: "@kbn/chart-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/chart-icons plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/chart-icons']
 ---
 import kbnChartIconsObj from './kbn_chart_icons.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_core.mdx b/api_docs/kbn_ci_stats_core.mdx
index 75f46ca2c08f6..22576ae2eac24 100644
--- a/api_docs/kbn_ci_stats_core.mdx
+++ b/api_docs/kbn_ci_stats_core.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-core
 title: "@kbn/ci-stats-core"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-core plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-core']
 ---
 import kbnCiStatsCoreObj from './kbn_ci_stats_core.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_performance_metrics.mdx b/api_docs/kbn_ci_stats_performance_metrics.mdx
index c20a0443afd1d..d8250347da8aa 100644
--- a/api_docs/kbn_ci_stats_performance_metrics.mdx
+++ b/api_docs/kbn_ci_stats_performance_metrics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-performance-metrics
 title: "@kbn/ci-stats-performance-metrics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-performance-metrics plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-performance-metrics']
 ---
 import kbnCiStatsPerformanceMetricsObj from './kbn_ci_stats_performance_metrics.devdocs.json';
diff --git a/api_docs/kbn_ci_stats_reporter.mdx b/api_docs/kbn_ci_stats_reporter.mdx
index f7452a05fd4a7..d42a537edf4b1 100644
--- a/api_docs/kbn_ci_stats_reporter.mdx
+++ b/api_docs/kbn_ci_stats_reporter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ci-stats-reporter
 title: "@kbn/ci-stats-reporter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ci-stats-reporter plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ci-stats-reporter']
 ---
 import kbnCiStatsReporterObj from './kbn_ci_stats_reporter.devdocs.json';
diff --git a/api_docs/kbn_cli_dev_mode.mdx b/api_docs/kbn_cli_dev_mode.mdx
index ffe2574b16f32..2929a1a2162c3 100644
--- a/api_docs/kbn_cli_dev_mode.mdx
+++ b/api_docs/kbn_cli_dev_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cli-dev-mode
 title: "@kbn/cli-dev-mode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cli-dev-mode plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cli-dev-mode']
 ---
 import kbnCliDevModeObj from './kbn_cli_dev_mode.devdocs.json';
diff --git a/api_docs/kbn_code_editor.mdx b/api_docs/kbn_code_editor.mdx
index b35ef9b77b935..48265e3c6f043 100644
--- a/api_docs/kbn_code_editor.mdx
+++ b/api_docs/kbn_code_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor
 title: "@kbn/code-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor']
 ---
 import kbnCodeEditorObj from './kbn_code_editor.devdocs.json';
diff --git a/api_docs/kbn_code_editor_mock.mdx b/api_docs/kbn_code_editor_mock.mdx
index fa2a193c8f8a0..e7f9b5fa5f2a6 100644
--- a/api_docs/kbn_code_editor_mock.mdx
+++ b/api_docs/kbn_code_editor_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-editor-mock
 title: "@kbn/code-editor-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-editor-mock plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-editor-mock']
 ---
 import kbnCodeEditorMockObj from './kbn_code_editor_mock.devdocs.json';
diff --git a/api_docs/kbn_code_owners.mdx b/api_docs/kbn_code_owners.mdx
index c62a5a7d7d696..d980134f35105 100644
--- a/api_docs/kbn_code_owners.mdx
+++ b/api_docs/kbn_code_owners.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-code-owners
 title: "@kbn/code-owners"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/code-owners plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/code-owners']
 ---
 import kbnCodeOwnersObj from './kbn_code_owners.devdocs.json';
diff --git a/api_docs/kbn_coloring.mdx b/api_docs/kbn_coloring.mdx
index 1f0e57101a9fd..fe48d5fddc2ff 100644
--- a/api_docs/kbn_coloring.mdx
+++ b/api_docs/kbn_coloring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-coloring
 title: "@kbn/coloring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/coloring plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/coloring']
 ---
 import kbnColoringObj from './kbn_coloring.devdocs.json';
diff --git a/api_docs/kbn_config.mdx b/api_docs/kbn_config.mdx
index b39d344030a5e..e6d2d81f5268b 100644
--- a/api_docs/kbn_config.mdx
+++ b/api_docs/kbn_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config
 title: "@kbn/config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config']
 ---
 import kbnConfigObj from './kbn_config.devdocs.json';
diff --git a/api_docs/kbn_config_mocks.mdx b/api_docs/kbn_config_mocks.mdx
index ad6514f176a43..dc4eeb2fc1564 100644
--- a/api_docs/kbn_config_mocks.mdx
+++ b/api_docs/kbn_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-mocks
 title: "@kbn/config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-mocks']
 ---
 import kbnConfigMocksObj from './kbn_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_config_schema.mdx b/api_docs/kbn_config_schema.mdx
index d8f89a770b844..91d2e4c2675af 100644
--- a/api_docs/kbn_config_schema.mdx
+++ b/api_docs/kbn_config_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-config-schema
 title: "@kbn/config-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/config-schema plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/config-schema']
 ---
 import kbnConfigSchemaObj from './kbn_config_schema.devdocs.json';
diff --git a/api_docs/kbn_content_management_content_editor.mdx b/api_docs/kbn_content_management_content_editor.mdx
index b54c440c5c105..423028ccf543d 100644
--- a/api_docs/kbn_content_management_content_editor.mdx
+++ b/api_docs/kbn_content_management_content_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-content-editor
 title: "@kbn/content-management-content-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-content-editor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-content-editor']
 ---
 import kbnContentManagementContentEditorObj from './kbn_content_management_content_editor.devdocs.json';
diff --git a/api_docs/kbn_content_management_tabbed_table_list_view.mdx b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
index b434e2769fb07..4668b77ab9918 100644
--- a/api_docs/kbn_content_management_tabbed_table_list_view.mdx
+++ b/api_docs/kbn_content_management_tabbed_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-tabbed-table-list-view
 title: "@kbn/content-management-tabbed-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-tabbed-table-list-view plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-tabbed-table-list-view']
 ---
 import kbnContentManagementTabbedTableListViewObj from './kbn_content_management_tabbed_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view.devdocs.json b/api_docs/kbn_content_management_table_list_view.devdocs.json
index f3827b9ca8123..2768884c3da7a 100644
--- a/api_docs/kbn_content_management_table_list_view.devdocs.json
+++ b/api_docs/kbn_content_management_table_list_view.devdocs.json
@@ -19,7 +19,7 @@
             "section": "def-common.UserContentCommonSchema",
             "text": "UserContentCommonSchema"
           },
-          ">({ title, description, entityName, entityNamePlural, initialFilter, headingId, initialPageSize, listingLimit, urlStateEnabled, customTableColumn, emptyPrompt, findItems, createItem, editItem, deleteItems, getDetailViewLink, getOnClickTitle, rowItemActions, id: listingId, contentEditor, children, titleColumnName, additionalRightSideActions, withoutPageTemplateWrapper, createdByEnabled, }: ",
+          ">({ title, description, entityName, entityNamePlural, initialFilter, headingId, initialPageSize, listingLimit, urlStateEnabled, customTableColumn, emptyPrompt, findItems, createItem, editItem, deleteItems, getDetailViewLink, getOnClickTitle, rowItemActions, id: listingId, contentEditor, children, titleColumnName, additionalRightSideActions, withoutPageTemplateWrapper, createdByEnabled, recentlyAccessed, }: ",
           {
             "pluginId": "@kbn/content-management-table-list-view",
             "scope": "public",
@@ -38,7 +38,7 @@
             "id": "def-public.TableListView.$1",
             "type": "CompoundType",
             "tags": [],
-            "label": "{\n  title,\n  description,\n  entityName,\n  entityNamePlural,\n  initialFilter,\n  headingId,\n  initialPageSize,\n  listingLimit,\n  urlStateEnabled = true,\n  customTableColumn,\n  emptyPrompt,\n  findItems,\n  createItem,\n  editItem,\n  deleteItems,\n  getDetailViewLink,\n  getOnClickTitle,\n  rowItemActions,\n  id: listingId,\n  contentEditor,\n  children,\n  titleColumnName,\n  additionalRightSideActions,\n  withoutPageTemplateWrapper,\n  createdByEnabled,\n}",
+            "label": "{\n  title,\n  description,\n  entityName,\n  entityNamePlural,\n  initialFilter,\n  headingId,\n  initialPageSize,\n  listingLimit,\n  urlStateEnabled = true,\n  customTableColumn,\n  emptyPrompt,\n  findItems,\n  createItem,\n  editItem,\n  deleteItems,\n  getDetailViewLink,\n  getOnClickTitle,\n  rowItemActions,\n  id: listingId,\n  contentEditor,\n  children,\n  titleColumnName,\n  additionalRightSideActions,\n  withoutPageTemplateWrapper,\n  createdByEnabled,\n  recentlyAccessed,\n}",
             "description": [],
             "signature": [
               {
@@ -79,7 +79,7 @@
             "section": "def-public.TableListViewTableProps",
             "text": "TableListViewTableProps"
           },
-          "<T>, \"id\" | \"entityName\" | \"entityNamePlural\" | \"initialFilter\" | \"headingId\" | \"initialPageSize\" | \"listingLimit\" | \"urlStateEnabled\" | \"customTableColumn\" | \"emptyPrompt\" | \"findItems\" | \"createItem\" | \"editItem\" | \"deleteItems\" | \"getDetailViewLink\" | \"getOnClickTitle\" | \"rowItemActions\" | \"contentEditor\" | \"titleColumnName\" | \"withoutPageTemplateWrapper\" | \"createdByEnabled\"> & { title: string; description?: string | undefined; additionalRightSideActions?: React.ReactNode[] | undefined; children?: React.ReactNode; }"
+          "<T>, \"id\" | \"entityName\" | \"entityNamePlural\" | \"initialFilter\" | \"headingId\" | \"initialPageSize\" | \"listingLimit\" | \"urlStateEnabled\" | \"customTableColumn\" | \"emptyPrompt\" | \"findItems\" | \"createItem\" | \"editItem\" | \"deleteItems\" | \"getDetailViewLink\" | \"getOnClickTitle\" | \"rowItemActions\" | \"contentEditor\" | \"titleColumnName\" | \"withoutPageTemplateWrapper\" | \"createdByEnabled\" | \"recentlyAccessed\"> & { title: string; description?: string | undefined; additionalRightSideActions?: React.ReactNode[] | undefined; children?: React.ReactNode; }"
         ],
         "path": "packages/content-management/table_list_view/src/table_list_view.tsx",
         "deprecated": false,
diff --git a/api_docs/kbn_content_management_table_list_view.mdx b/api_docs/kbn_content_management_table_list_view.mdx
index a5bdb8d78e644..9bc69d95bd8ef 100644
--- a/api_docs/kbn_content_management_table_list_view.mdx
+++ b/api_docs/kbn_content_management_table_list_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view
 title: "@kbn/content-management-table-list-view"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view']
 ---
 import kbnContentManagementTableListViewObj from './kbn_content_management_table_list_view.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_common.mdx b/api_docs/kbn_content_management_table_list_view_common.mdx
index 563e4d0348aa6..b78c1e5f21832 100644
--- a/api_docs/kbn_content_management_table_list_view_common.mdx
+++ b/api_docs/kbn_content_management_table_list_view_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-common
 title: "@kbn/content-management-table-list-view-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-common']
 ---
 import kbnContentManagementTableListViewCommonObj from './kbn_content_management_table_list_view_common.devdocs.json';
diff --git a/api_docs/kbn_content_management_table_list_view_table.devdocs.json b/api_docs/kbn_content_management_table_list_view_table.devdocs.json
index da65a4c927242..2cd0fa155534b 100644
--- a/api_docs/kbn_content_management_table_list_view_table.devdocs.json
+++ b/api_docs/kbn_content_management_table_list_view_table.devdocs.json
@@ -109,7 +109,7 @@
             "section": "def-common.UserContentCommonSchema",
             "text": "UserContentCommonSchema"
           },
-          ">({ tableCaption, entityName, entityNamePlural, initialFilter: initialQuery, headingId, initialPageSize, listingLimit, urlStateEnabled, customTableColumn, emptyPrompt, rowItemActions, findItems, createItem, editItem, deleteItems, getDetailViewLink, getOnClickTitle, id: listingId, contentEditor, titleColumnName, withoutPageTemplateWrapper, onFetchSuccess, refreshListBouncer, setPageDataTestSubject, createdByEnabled, }: ",
+          ">({ tableCaption, entityName, entityNamePlural, initialFilter: initialQuery, headingId, initialPageSize, listingLimit, urlStateEnabled, customTableColumn, emptyPrompt, rowItemActions, findItems, createItem, editItem, deleteItems, getDetailViewLink, getOnClickTitle, id: listingId, contentEditor, titleColumnName, withoutPageTemplateWrapper, onFetchSuccess, refreshListBouncer, setPageDataTestSubject, createdByEnabled, recentlyAccessed, }: ",
           {
             "pluginId": "@kbn/content-management-table-list-view-table",
             "scope": "public",
@@ -833,6 +833,28 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/content-management-table-list-view-table",
+            "id": "def-public.TableListViewTableProps.recentlyAccessed",
+            "type": "Object",
+            "tags": [],
+            "label": "recentlyAccessed",
+            "description": [],
+            "signature": [
+              "Pick<",
+              {
+                "pluginId": "@kbn/recently-accessed",
+                "scope": "common",
+                "docId": "kibKbnRecentlyAccessedPluginApi",
+                "section": "def-common.RecentlyAccessed",
+                "text": "RecentlyAccessed"
+              },
+              ", \"get\"> | undefined"
+            ],
+            "path": "packages/content-management/table_list_view_table/src/table_list_view_table.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/content-management-table-list-view-table",
             "id": "def-public.TableListViewTableProps.tableCaption",
diff --git a/api_docs/kbn_content_management_table_list_view_table.mdx b/api_docs/kbn_content_management_table_list_view_table.mdx
index 39ab11cb8ba15..bdc5a7d428729 100644
--- a/api_docs/kbn_content_management_table_list_view_table.mdx
+++ b/api_docs/kbn_content_management_table_list_view_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-table-list-view-table
 title: "@kbn/content-management-table-list-view-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-table-list-view-table plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-table-list-view-table']
 ---
 import kbnContentManagementTableListViewTableObj from './kbn_content_management_table_list_view_table.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sh
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 48 | 0 | 32 | 3 |
+| 49 | 0 | 33 | 3 |
 
 ## Client
 
diff --git a/api_docs/kbn_content_management_user_profiles.mdx b/api_docs/kbn_content_management_user_profiles.mdx
index 872ce70372c79..726b4e50bbf78 100644
--- a/api_docs/kbn_content_management_user_profiles.mdx
+++ b/api_docs/kbn_content_management_user_profiles.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-user-profiles
 title: "@kbn/content-management-user-profiles"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-user-profiles plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-user-profiles']
 ---
 import kbnContentManagementUserProfilesObj from './kbn_content_management_user_profiles.devdocs.json';
diff --git a/api_docs/kbn_content_management_utils.mdx b/api_docs/kbn_content_management_utils.mdx
index 2feef09b8d4cf..1a571a6235c67 100644
--- a/api_docs/kbn_content_management_utils.mdx
+++ b/api_docs/kbn_content_management_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-content-management-utils
 title: "@kbn/content-management-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/content-management-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/content-management-utils']
 ---
 import kbnContentManagementUtilsObj from './kbn_content_management_utils.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser.devdocs.json b/api_docs/kbn_core_analytics_browser.devdocs.json
index 0937f6f89d0f3..653be84cc5687 100644
--- a/api_docs/kbn_core_analytics_browser.devdocs.json
+++ b/api_docs/kbn_core_analytics_browser.devdocs.json
@@ -1427,6 +1427,10 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
+              },
               {
                 "plugin": "@kbn/ebt",
                 "path": "packages/analytics/ebt/client/src/analytics_client/mocks.ts"
diff --git a/api_docs/kbn_core_analytics_browser.mdx b/api_docs/kbn_core_analytics_browser.mdx
index 5d60e7bbbf988..376acad1aeca5 100644
--- a/api_docs/kbn_core_analytics_browser.mdx
+++ b/api_docs/kbn_core_analytics_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser
 title: "@kbn/core-analytics-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser']
 ---
 import kbnCoreAnalyticsBrowserObj from './kbn_core_analytics_browser.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_internal.mdx b/api_docs/kbn_core_analytics_browser_internal.mdx
index 1051a8fc09847..20c4f81eaba5d 100644
--- a/api_docs/kbn_core_analytics_browser_internal.mdx
+++ b/api_docs/kbn_core_analytics_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-internal
 title: "@kbn/core-analytics-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-internal']
 ---
 import kbnCoreAnalyticsBrowserInternalObj from './kbn_core_analytics_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_browser_mocks.mdx b/api_docs/kbn_core_analytics_browser_mocks.mdx
index f1d6e83ca9967..bca3557232102 100644
--- a/api_docs/kbn_core_analytics_browser_mocks.mdx
+++ b/api_docs/kbn_core_analytics_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-browser-mocks
 title: "@kbn/core-analytics-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-browser-mocks']
 ---
 import kbnCoreAnalyticsBrowserMocksObj from './kbn_core_analytics_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server.devdocs.json b/api_docs/kbn_core_analytics_server.devdocs.json
index 24de9bb5afba1..ea8766e2c7639 100644
--- a/api_docs/kbn_core_analytics_server.devdocs.json
+++ b/api_docs/kbn_core_analytics_server.devdocs.json
@@ -1427,6 +1427,10 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
+              },
               {
                 "plugin": "@kbn/ebt",
                 "path": "packages/analytics/ebt/client/src/analytics_client/mocks.ts"
diff --git a/api_docs/kbn_core_analytics_server.mdx b/api_docs/kbn_core_analytics_server.mdx
index da84a8ca0f2fc..9c0d4635cb73f 100644
--- a/api_docs/kbn_core_analytics_server.mdx
+++ b/api_docs/kbn_core_analytics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server
 title: "@kbn/core-analytics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server']
 ---
 import kbnCoreAnalyticsServerObj from './kbn_core_analytics_server.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_internal.mdx b/api_docs/kbn_core_analytics_server_internal.mdx
index 129879916d7be..3176235db7c47 100644
--- a/api_docs/kbn_core_analytics_server_internal.mdx
+++ b/api_docs/kbn_core_analytics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-internal
 title: "@kbn/core-analytics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-internal']
 ---
 import kbnCoreAnalyticsServerInternalObj from './kbn_core_analytics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_analytics_server_mocks.mdx b/api_docs/kbn_core_analytics_server_mocks.mdx
index 141bf88ba6f87..7e294c2b0f0fe 100644
--- a/api_docs/kbn_core_analytics_server_mocks.mdx
+++ b/api_docs/kbn_core_analytics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-analytics-server-mocks
 title: "@kbn/core-analytics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-analytics-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-analytics-server-mocks']
 ---
 import kbnCoreAnalyticsServerMocksObj from './kbn_core_analytics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser.mdx b/api_docs/kbn_core_application_browser.mdx
index ab72b17de203e..988172664fa0a 100644
--- a/api_docs/kbn_core_application_browser.mdx
+++ b/api_docs/kbn_core_application_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser
 title: "@kbn/core-application-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser']
 ---
 import kbnCoreApplicationBrowserObj from './kbn_core_application_browser.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_internal.mdx b/api_docs/kbn_core_application_browser_internal.mdx
index ec1a2decce516..5e75403ef5b0c 100644
--- a/api_docs/kbn_core_application_browser_internal.mdx
+++ b/api_docs/kbn_core_application_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-internal
 title: "@kbn/core-application-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-internal']
 ---
 import kbnCoreApplicationBrowserInternalObj from './kbn_core_application_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_application_browser_mocks.mdx b/api_docs/kbn_core_application_browser_mocks.mdx
index 3071caccc3e89..a871b9d73f3f3 100644
--- a/api_docs/kbn_core_application_browser_mocks.mdx
+++ b/api_docs/kbn_core_application_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-browser-mocks
 title: "@kbn/core-application-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-browser-mocks']
 ---
 import kbnCoreApplicationBrowserMocksObj from './kbn_core_application_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_application_common.mdx b/api_docs/kbn_core_application_common.mdx
index 4b9061264e7ba..50229a02dc606 100644
--- a/api_docs/kbn_core_application_common.mdx
+++ b/api_docs/kbn_core_application_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-application-common
 title: "@kbn/core-application-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-application-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-application-common']
 ---
 import kbnCoreApplicationCommonObj from './kbn_core_application_common.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_internal.mdx b/api_docs/kbn_core_apps_browser_internal.mdx
index 15c671d2d7861..c4659d860e4f0 100644
--- a/api_docs/kbn_core_apps_browser_internal.mdx
+++ b/api_docs/kbn_core_apps_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-internal
 title: "@kbn/core-apps-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-internal']
 ---
 import kbnCoreAppsBrowserInternalObj from './kbn_core_apps_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_apps_browser_mocks.mdx b/api_docs/kbn_core_apps_browser_mocks.mdx
index 729f7776f3c65..367d7d2181417 100644
--- a/api_docs/kbn_core_apps_browser_mocks.mdx
+++ b/api_docs/kbn_core_apps_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-browser-mocks
 title: "@kbn/core-apps-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-browser-mocks']
 ---
 import kbnCoreAppsBrowserMocksObj from './kbn_core_apps_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_apps_server_internal.mdx b/api_docs/kbn_core_apps_server_internal.mdx
index 72c3247afee83..cf6fd06bfc153 100644
--- a/api_docs/kbn_core_apps_server_internal.mdx
+++ b/api_docs/kbn_core_apps_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-apps-server-internal
 title: "@kbn/core-apps-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-apps-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-apps-server-internal']
 ---
 import kbnCoreAppsServerInternalObj from './kbn_core_apps_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_browser_mocks.mdx b/api_docs/kbn_core_base_browser_mocks.mdx
index 707e32c732619..9d8f9e0739bd5 100644
--- a/api_docs/kbn_core_base_browser_mocks.mdx
+++ b/api_docs/kbn_core_base_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-browser-mocks
 title: "@kbn/core-base-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-browser-mocks']
 ---
 import kbnCoreBaseBrowserMocksObj from './kbn_core_base_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_base_common.mdx b/api_docs/kbn_core_base_common.mdx
index b3dfbcee0efc2..5c37132b4f79f 100644
--- a/api_docs/kbn_core_base_common.mdx
+++ b/api_docs/kbn_core_base_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-common
 title: "@kbn/core-base-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-common']
 ---
 import kbnCoreBaseCommonObj from './kbn_core_base_common.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_internal.mdx b/api_docs/kbn_core_base_server_internal.mdx
index 352da914f0bb3..3b74753424a7e 100644
--- a/api_docs/kbn_core_base_server_internal.mdx
+++ b/api_docs/kbn_core_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-internal
 title: "@kbn/core-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-internal']
 ---
 import kbnCoreBaseServerInternalObj from './kbn_core_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_base_server_mocks.mdx b/api_docs/kbn_core_base_server_mocks.mdx
index b0ace97a8c08a..cbdf54801bf0d 100644
--- a/api_docs/kbn_core_base_server_mocks.mdx
+++ b/api_docs/kbn_core_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-base-server-mocks
 title: "@kbn/core-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-base-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-base-server-mocks']
 ---
 import kbnCoreBaseServerMocksObj from './kbn_core_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_browser_mocks.mdx b/api_docs/kbn_core_capabilities_browser_mocks.mdx
index d1c5a1f91fe7c..2e61f3936e5f8 100644
--- a/api_docs/kbn_core_capabilities_browser_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-browser-mocks
 title: "@kbn/core-capabilities-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-browser-mocks']
 ---
 import kbnCoreCapabilitiesBrowserMocksObj from './kbn_core_capabilities_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_common.mdx b/api_docs/kbn_core_capabilities_common.mdx
index 7e8a8f1d16c83..91c2525f2b051 100644
--- a/api_docs/kbn_core_capabilities_common.mdx
+++ b/api_docs/kbn_core_capabilities_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-common
 title: "@kbn/core-capabilities-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-common']
 ---
 import kbnCoreCapabilitiesCommonObj from './kbn_core_capabilities_common.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server.mdx b/api_docs/kbn_core_capabilities_server.mdx
index ae37b966a2919..e18d28c3d1d69 100644
--- a/api_docs/kbn_core_capabilities_server.mdx
+++ b/api_docs/kbn_core_capabilities_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server
 title: "@kbn/core-capabilities-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server']
 ---
 import kbnCoreCapabilitiesServerObj from './kbn_core_capabilities_server.devdocs.json';
diff --git a/api_docs/kbn_core_capabilities_server_mocks.mdx b/api_docs/kbn_core_capabilities_server_mocks.mdx
index e83019eb7a49b..15df05f10bf00 100644
--- a/api_docs/kbn_core_capabilities_server_mocks.mdx
+++ b/api_docs/kbn_core_capabilities_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-capabilities-server-mocks
 title: "@kbn/core-capabilities-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-capabilities-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-capabilities-server-mocks']
 ---
 import kbnCoreCapabilitiesServerMocksObj from './kbn_core_capabilities_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser.devdocs.json b/api_docs/kbn_core_chrome_browser.devdocs.json
index 19595edba49ec..2a76c438cc5ef 100644
--- a/api_docs/kbn_core_chrome_browser.devdocs.json
+++ b/api_docs/kbn_core_chrome_browser.devdocs.json
@@ -3716,7 +3716,7 @@
         "label": "AppDeepLinkId",
         "description": [],
         "signature": [
-          "\"fleet\" | \"graph\" | \"ml\" | \"monitoring\" | \"metrics\" | \"management\" | \"synthetics\" | \"ux\" | \"apm\" | \"logs\" | \"profiling\" | \"dashboards\" | \"observabilityAIAssistant\" | \"home\" | \"canvas\" | \"integrations\" | \"discover\" | \"observability-overview\" | \"appSearch\" | \"dev_tools\" | \"maps\" | \"visualize\" | \"dev_tools:console\" | \"dev_tools:searchprofiler\" | \"dev_tools:painless_lab\" | \"dev_tools:grokdebugger\" | \"ml:notifications\" | \"ml:nodes\" | \"ml:overview\" | \"ml:memoryUsage\" | \"ml:settings\" | \"ml:dataVisualizer\" | \"ml:anomalyDetection\" | \"ml:anomalyExplorer\" | \"ml:singleMetricViewer\" | \"ml:dataDrift\" | \"ml:dataFrameAnalytics\" | \"ml:resultExplorer\" | \"ml:analyticsMap\" | \"ml:aiOps\" | \"ml:logRateAnalysis\" | \"ml:logPatternAnalysis\" | \"ml:changePointDetections\" | \"ml:modelManagement\" | \"ml:nodesOverview\" | \"ml:esqlDataVisualizer\" | \"ml:fileUpload\" | \"ml:indexDataVisualizer\" | \"ml:calendarSettings\" | \"ml:filterListsSettings\" | \"osquery\" | \"management:transform\" | \"management:watcher\" | \"management:cases\" | \"management:tags\" | \"management:maintenanceWindows\" | \"management:settings\" | \"management:dataViews\" | \"management:spaces\" | \"management:users\" | \"management:migrate_data\" | \"management:search_sessions\" | \"management:data_quality\" | \"management:filesManagement\" | \"management:roles\" | \"management:reporting\" | \"management:aiAssistantManagementSelection\" | \"management:securityAiAssistantManagement\" | \"management:observabilityAiAssistantManagement\" | \"management:api_keys\" | \"management:cross_cluster_replication\" | \"management:license_management\" | \"management:index_lifecycle_management\" | \"management:index_management\" | \"management:ingest_pipelines\" | \"management:jobsListLink\" | \"management:objects\" | \"management:pipelines\" | \"management:remote_clusters\" | \"management:role_mappings\" | \"management:rollup_jobs\" | \"management:snapshot_restore\" | \"management:triggersActions\" | \"management:triggersActionsConnectors\" | \"management:upgrade_assistant\" | \"enterpriseSearch\" | \"enterpriseSearchContent\" | \"enterpriseSearchApplications\" | \"enterpriseSearchAnalytics\" | \"workplaceSearch\" | \"serverlessElasticsearch\" | \"serverlessConnectors\" | \"searchPlayground\" | \"searchInferenceEndpoints\" | \"searchHomepage\" | \"enterpriseSearchContent:connectors\" | \"enterpriseSearchContent:searchIndices\" | \"enterpriseSearchContent:webCrawlers\" | \"enterpriseSearchApplications:searchApplications\" | \"enterpriseSearchApplications:playground\" | \"appSearch:engines\" | \"observability-logs-explorer\" | \"observabilityOnboarding\" | \"slo\" | \"logs:settings\" | \"logs:stream\" | \"logs:log-categories\" | \"logs:anomalies\" | \"observability-overview:cases\" | \"observability-overview:alerts\" | \"observability-overview:rules\" | \"observability-overview:cases_create\" | \"observability-overview:cases_configure\" | \"metrics:settings\" | \"metrics:hosts\" | \"metrics:inventory\" | \"metrics:metrics-explorer\" | \"metrics:assetDetails\" | \"apm:traces\" | \"apm:dependencies\" | \"apm:service-map\" | \"apm:settings\" | \"apm:services\" | \"apm:service-groups-list\" | \"apm:storage-explorer\" | \"synthetics:overview\" | \"synthetics:certificates\" | \"profiling:stacktraces\" | \"profiling:flamegraphs\" | \"profiling:functions\" | \"securitySolutionUI\" | \"securitySolutionUI:\" | \"securitySolutionUI:cases\" | \"securitySolutionUI:alerts\" | \"securitySolutionUI:rules\" | \"securitySolutionUI:policy\" | \"securitySolutionUI:overview\" | \"securitySolutionUI:dashboards\" | \"securitySolutionUI:cases_create\" | \"securitySolutionUI:cases_configure\" | \"securitySolutionUI:hosts\" | \"securitySolutionUI:users\" | \"securitySolutionUI:cloud_defend-policies\" | \"securitySolutionUI:cloud_security_posture-dashboard\" | \"securitySolutionUI:cloud_security_posture-findings\" | \"securitySolutionUI:cloud_security_posture-benchmarks\" | \"securitySolutionUI:kubernetes\" | \"securitySolutionUI:network\" | \"securitySolutionUI:data_quality\" | \"securitySolutionUI:explore\" | \"securitySolutionUI:assets\" | \"securitySolutionUI:cloud_defend\" | \"securitySolutionUI:administration\" | \"securitySolutionUI:attack_discovery\" | \"securitySolutionUI:blocklist\" | \"securitySolutionUI:cloud_security_posture-rules\" | \"securitySolutionUI:detections\" | \"securitySolutionUI:detection_response\" | \"securitySolutionUI:endpoints\" | \"securitySolutionUI:event_filters\" | \"securitySolutionUI:exceptions\" | \"securitySolutionUI:host_isolation_exceptions\" | \"securitySolutionUI:hosts-all\" | \"securitySolutionUI:hosts-anomalies\" | \"securitySolutionUI:hosts-risk\" | \"securitySolutionUI:hosts-events\" | \"securitySolutionUI:hosts-sessions\" | \"securitySolutionUI:hosts-uncommon_processes\" | \"securitySolutionUI:investigations\" | \"securitySolutionUI:get_started\" | \"securitySolutionUI:machine_learning-landing\" | \"securitySolutionUI:network-anomalies\" | \"securitySolutionUI:network-dns\" | \"securitySolutionUI:network-events\" | \"securitySolutionUI:network-flows\" | \"securitySolutionUI:network-http\" | \"securitySolutionUI:network-tls\" | \"securitySolutionUI:response_actions_history\" | \"securitySolutionUI:rules-add\" | \"securitySolutionUI:rules-create\" | \"securitySolutionUI:rules-landing\" | \"securitySolutionUI:threat_intelligence\" | \"securitySolutionUI:timelines\" | \"securitySolutionUI:timelines-templates\" | \"securitySolutionUI:trusted_apps\" | \"securitySolutionUI:users-all\" | \"securitySolutionUI:users-anomalies\" | \"securitySolutionUI:users-authentications\" | \"securitySolutionUI:users-events\" | \"securitySolutionUI:users-risk\" | \"securitySolutionUI:entity_analytics\" | \"securitySolutionUI:entity_analytics-management\" | \"securitySolutionUI:entity_analytics-asset-classification\" | \"securitySolutionUI:coverage-overview\" | \"securitySolutionUI:notes-management\" | \"fleet:settings\" | \"fleet:policies\" | \"fleet:data_streams\" | \"fleet:enrollment_tokens\" | \"fleet:uninstall_tokens\" | \"fleet:agents\""
+          "\"fleet\" | \"graph\" | \"ml\" | \"monitoring\" | \"metrics\" | \"management\" | \"synthetics\" | \"ux\" | \"apm\" | \"logs\" | \"profiling\" | \"dashboards\" | \"observabilityAIAssistant\" | \"home\" | \"canvas\" | \"integrations\" | \"discover\" | \"observability-overview\" | \"appSearch\" | \"dev_tools\" | \"maps\" | \"visualize\" | \"dev_tools:console\" | \"dev_tools:searchprofiler\" | \"dev_tools:painless_lab\" | \"dev_tools:grokdebugger\" | \"ml:notifications\" | \"ml:nodes\" | \"ml:overview\" | \"ml:memoryUsage\" | \"ml:settings\" | \"ml:dataVisualizer\" | \"ml:anomalyDetection\" | \"ml:anomalyExplorer\" | \"ml:singleMetricViewer\" | \"ml:dataDrift\" | \"ml:dataFrameAnalytics\" | \"ml:resultExplorer\" | \"ml:analyticsMap\" | \"ml:aiOps\" | \"ml:logRateAnalysis\" | \"ml:logPatternAnalysis\" | \"ml:changePointDetections\" | \"ml:modelManagement\" | \"ml:nodesOverview\" | \"ml:esqlDataVisualizer\" | \"ml:fileUpload\" | \"ml:indexDataVisualizer\" | \"ml:calendarSettings\" | \"ml:filterListsSettings\" | \"osquery\" | \"management:transform\" | \"management:watcher\" | \"management:cases\" | \"management:tags\" | \"management:maintenanceWindows\" | \"management:dataViews\" | \"management:spaces\" | \"management:settings\" | \"management:users\" | \"management:migrate_data\" | \"management:search_sessions\" | \"management:data_quality\" | \"management:filesManagement\" | \"management:roles\" | \"management:reporting\" | \"management:aiAssistantManagementSelection\" | \"management:securityAiAssistantManagement\" | \"management:observabilityAiAssistantManagement\" | \"management:api_keys\" | \"management:cross_cluster_replication\" | \"management:license_management\" | \"management:index_lifecycle_management\" | \"management:index_management\" | \"management:ingest_pipelines\" | \"management:jobsListLink\" | \"management:objects\" | \"management:pipelines\" | \"management:remote_clusters\" | \"management:role_mappings\" | \"management:rollup_jobs\" | \"management:snapshot_restore\" | \"management:triggersActions\" | \"management:triggersActionsConnectors\" | \"management:upgrade_assistant\" | \"enterpriseSearch\" | \"enterpriseSearchContent\" | \"enterpriseSearchApplications\" | \"enterpriseSearchRelevance\" | \"enterpriseSearchAnalytics\" | \"workplaceSearch\" | \"serverlessElasticsearch\" | \"serverlessConnectors\" | \"searchPlayground\" | \"searchInferenceEndpoints\" | \"searchHomepage\" | \"enterpriseSearchContent:connectors\" | \"enterpriseSearchContent:searchIndices\" | \"enterpriseSearchContent:webCrawlers\" | \"enterpriseSearchApplications:searchApplications\" | \"enterpriseSearchApplications:playground\" | \"appSearch:engines\" | \"enterpriseSearchRelevance:inferenceEndpoints\" | \"observability-logs-explorer\" | \"observabilityOnboarding\" | \"slo\" | \"logs:settings\" | \"logs:stream\" | \"logs:log-categories\" | \"logs:anomalies\" | \"observability-overview:cases\" | \"observability-overview:alerts\" | \"observability-overview:rules\" | \"observability-overview:cases_create\" | \"observability-overview:cases_configure\" | \"metrics:settings\" | \"metrics:hosts\" | \"metrics:inventory\" | \"metrics:metrics-explorer\" | \"metrics:assetDetails\" | \"apm:traces\" | \"apm:dependencies\" | \"apm:service-map\" | \"apm:settings\" | \"apm:services\" | \"apm:service-groups-list\" | \"apm:storage-explorer\" | \"synthetics:overview\" | \"synthetics:certificates\" | \"profiling:stacktraces\" | \"profiling:flamegraphs\" | \"profiling:functions\" | \"securitySolutionUI\" | \"securitySolutionUI:\" | \"securitySolutionUI:cases\" | \"securitySolutionUI:alerts\" | \"securitySolutionUI:rules\" | \"securitySolutionUI:policy\" | \"securitySolutionUI:overview\" | \"securitySolutionUI:dashboards\" | \"securitySolutionUI:cases_create\" | \"securitySolutionUI:cases_configure\" | \"securitySolutionUI:hosts\" | \"securitySolutionUI:users\" | \"securitySolutionUI:cloud_defend-policies\" | \"securitySolutionUI:cloud_security_posture-dashboard\" | \"securitySolutionUI:cloud_security_posture-findings\" | \"securitySolutionUI:cloud_security_posture-benchmarks\" | \"securitySolutionUI:kubernetes\" | \"securitySolutionUI:network\" | \"securitySolutionUI:data_quality\" | \"securitySolutionUI:explore\" | \"securitySolutionUI:assets\" | \"securitySolutionUI:cloud_defend\" | \"securitySolutionUI:administration\" | \"securitySolutionUI:attack_discovery\" | \"securitySolutionUI:blocklist\" | \"securitySolutionUI:cloud_security_posture-rules\" | \"securitySolutionUI:detections\" | \"securitySolutionUI:detection_response\" | \"securitySolutionUI:endpoints\" | \"securitySolutionUI:event_filters\" | \"securitySolutionUI:exceptions\" | \"securitySolutionUI:host_isolation_exceptions\" | \"securitySolutionUI:hosts-all\" | \"securitySolutionUI:hosts-anomalies\" | \"securitySolutionUI:hosts-risk\" | \"securitySolutionUI:hosts-events\" | \"securitySolutionUI:hosts-sessions\" | \"securitySolutionUI:hosts-uncommon_processes\" | \"securitySolutionUI:investigations\" | \"securitySolutionUI:get_started\" | \"securitySolutionUI:machine_learning-landing\" | \"securitySolutionUI:network-anomalies\" | \"securitySolutionUI:network-dns\" | \"securitySolutionUI:network-events\" | \"securitySolutionUI:network-flows\" | \"securitySolutionUI:network-http\" | \"securitySolutionUI:network-tls\" | \"securitySolutionUI:response_actions_history\" | \"securitySolutionUI:rules-add\" | \"securitySolutionUI:rules-create\" | \"securitySolutionUI:rules-landing\" | \"securitySolutionUI:threat_intelligence\" | \"securitySolutionUI:timelines\" | \"securitySolutionUI:timelines-templates\" | \"securitySolutionUI:trusted_apps\" | \"securitySolutionUI:users-all\" | \"securitySolutionUI:users-anomalies\" | \"securitySolutionUI:users-authentications\" | \"securitySolutionUI:users-events\" | \"securitySolutionUI:users-risk\" | \"securitySolutionUI:entity_analytics\" | \"securitySolutionUI:entity_analytics-management\" | \"securitySolutionUI:entity_analytics-asset-classification\" | \"securitySolutionUI:coverage-overview\" | \"securitySolutionUI:notes-management\" | \"fleet:settings\" | \"fleet:policies\" | \"fleet:data_streams\" | \"fleet:enrollment_tokens\" | \"fleet:uninstall_tokens\" | \"fleet:agents\""
         ],
         "path": "packages/core/chrome/core-chrome-browser/src/project_navigation.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_core_chrome_browser.mdx b/api_docs/kbn_core_chrome_browser.mdx
index 9cb5d2a53d915..d2f73aae6c56a 100644
--- a/api_docs/kbn_core_chrome_browser.mdx
+++ b/api_docs/kbn_core_chrome_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser
 title: "@kbn/core-chrome-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser']
 ---
 import kbnCoreChromeBrowserObj from './kbn_core_chrome_browser.devdocs.json';
diff --git a/api_docs/kbn_core_chrome_browser_mocks.mdx b/api_docs/kbn_core_chrome_browser_mocks.mdx
index 7373765d0d017..f67dd9ab55dae 100644
--- a/api_docs/kbn_core_chrome_browser_mocks.mdx
+++ b/api_docs/kbn_core_chrome_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-chrome-browser-mocks
 title: "@kbn/core-chrome-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-chrome-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-chrome-browser-mocks']
 ---
 import kbnCoreChromeBrowserMocksObj from './kbn_core_chrome_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_config_server_internal.mdx b/api_docs/kbn_core_config_server_internal.mdx
index 378c94028bf64..4d00542bb07f5 100644
--- a/api_docs/kbn_core_config_server_internal.mdx
+++ b/api_docs/kbn_core_config_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-config-server-internal
 title: "@kbn/core-config-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-config-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-config-server-internal']
 ---
 import kbnCoreConfigServerInternalObj from './kbn_core_config_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser.mdx b/api_docs/kbn_core_custom_branding_browser.mdx
index 06b410cd07319..475603132fb38 100644
--- a/api_docs/kbn_core_custom_branding_browser.mdx
+++ b/api_docs/kbn_core_custom_branding_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser
 title: "@kbn/core-custom-branding-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser']
 ---
 import kbnCoreCustomBrandingBrowserObj from './kbn_core_custom_branding_browser.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_internal.mdx b/api_docs/kbn_core_custom_branding_browser_internal.mdx
index 9ed9b49db2dac..5a3daa48a0991 100644
--- a/api_docs/kbn_core_custom_branding_browser_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-internal
 title: "@kbn/core-custom-branding-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-internal']
 ---
 import kbnCoreCustomBrandingBrowserInternalObj from './kbn_core_custom_branding_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_browser_mocks.mdx b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
index d69e098b41aae..a51c29a157dc7 100644
--- a/api_docs/kbn_core_custom_branding_browser_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-browser-mocks
 title: "@kbn/core-custom-branding-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-browser-mocks']
 ---
 import kbnCoreCustomBrandingBrowserMocksObj from './kbn_core_custom_branding_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_common.mdx b/api_docs/kbn_core_custom_branding_common.mdx
index b89d96a9f13da..a968a84ebedb8 100644
--- a/api_docs/kbn_core_custom_branding_common.mdx
+++ b/api_docs/kbn_core_custom_branding_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-common
 title: "@kbn/core-custom-branding-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-common']
 ---
 import kbnCoreCustomBrandingCommonObj from './kbn_core_custom_branding_common.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server.mdx b/api_docs/kbn_core_custom_branding_server.mdx
index b3be44399b317..be06b7f5c071f 100644
--- a/api_docs/kbn_core_custom_branding_server.mdx
+++ b/api_docs/kbn_core_custom_branding_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server
 title: "@kbn/core-custom-branding-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server']
 ---
 import kbnCoreCustomBrandingServerObj from './kbn_core_custom_branding_server.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_internal.mdx b/api_docs/kbn_core_custom_branding_server_internal.mdx
index 7b5f869203f79..a8469ab10bd6c 100644
--- a/api_docs/kbn_core_custom_branding_server_internal.mdx
+++ b/api_docs/kbn_core_custom_branding_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-internal
 title: "@kbn/core-custom-branding-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-internal']
 ---
 import kbnCoreCustomBrandingServerInternalObj from './kbn_core_custom_branding_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_custom_branding_server_mocks.mdx b/api_docs/kbn_core_custom_branding_server_mocks.mdx
index bbf0a59e376b6..ff47ac18f388d 100644
--- a/api_docs/kbn_core_custom_branding_server_mocks.mdx
+++ b/api_docs/kbn_core_custom_branding_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-custom-branding-server-mocks
 title: "@kbn/core-custom-branding-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-custom-branding-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-custom-branding-server-mocks']
 ---
 import kbnCoreCustomBrandingServerMocksObj from './kbn_core_custom_branding_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser.mdx b/api_docs/kbn_core_deprecations_browser.mdx
index c451a8f7c07c9..8f547d585c521 100644
--- a/api_docs/kbn_core_deprecations_browser.mdx
+++ b/api_docs/kbn_core_deprecations_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser
 title: "@kbn/core-deprecations-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser']
 ---
 import kbnCoreDeprecationsBrowserObj from './kbn_core_deprecations_browser.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_internal.mdx b/api_docs/kbn_core_deprecations_browser_internal.mdx
index 7db21e9ea3a7c..0d1f50c631c94 100644
--- a/api_docs/kbn_core_deprecations_browser_internal.mdx
+++ b/api_docs/kbn_core_deprecations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-internal
 title: "@kbn/core-deprecations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-internal']
 ---
 import kbnCoreDeprecationsBrowserInternalObj from './kbn_core_deprecations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_browser_mocks.mdx b/api_docs/kbn_core_deprecations_browser_mocks.mdx
index 25c2c6800cc6b..588882107a59e 100644
--- a/api_docs/kbn_core_deprecations_browser_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-browser-mocks
 title: "@kbn/core-deprecations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-browser-mocks']
 ---
 import kbnCoreDeprecationsBrowserMocksObj from './kbn_core_deprecations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_common.mdx b/api_docs/kbn_core_deprecations_common.mdx
index 15acea6cb1d37..72c2fd828595f 100644
--- a/api_docs/kbn_core_deprecations_common.mdx
+++ b/api_docs/kbn_core_deprecations_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-common
 title: "@kbn/core-deprecations-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-common']
 ---
 import kbnCoreDeprecationsCommonObj from './kbn_core_deprecations_common.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server.mdx b/api_docs/kbn_core_deprecations_server.mdx
index 641b5a185ff0a..ad8707b012f6f 100644
--- a/api_docs/kbn_core_deprecations_server.mdx
+++ b/api_docs/kbn_core_deprecations_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server
 title: "@kbn/core-deprecations-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server']
 ---
 import kbnCoreDeprecationsServerObj from './kbn_core_deprecations_server.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_internal.mdx b/api_docs/kbn_core_deprecations_server_internal.mdx
index f34fdd8d60dfa..beb2ee0960c03 100644
--- a/api_docs/kbn_core_deprecations_server_internal.mdx
+++ b/api_docs/kbn_core_deprecations_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-internal
 title: "@kbn/core-deprecations-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-internal']
 ---
 import kbnCoreDeprecationsServerInternalObj from './kbn_core_deprecations_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_deprecations_server_mocks.mdx b/api_docs/kbn_core_deprecations_server_mocks.mdx
index 75a2b74b810a6..8631921d2992d 100644
--- a/api_docs/kbn_core_deprecations_server_mocks.mdx
+++ b/api_docs/kbn_core_deprecations_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-deprecations-server-mocks
 title: "@kbn/core-deprecations-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-deprecations-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-deprecations-server-mocks']
 ---
 import kbnCoreDeprecationsServerMocksObj from './kbn_core_deprecations_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser.mdx b/api_docs/kbn_core_doc_links_browser.mdx
index 1f5a4189168dc..c01a5ad288fc7 100644
--- a/api_docs/kbn_core_doc_links_browser.mdx
+++ b/api_docs/kbn_core_doc_links_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser
 title: "@kbn/core-doc-links-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser']
 ---
 import kbnCoreDocLinksBrowserObj from './kbn_core_doc_links_browser.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_browser_mocks.mdx b/api_docs/kbn_core_doc_links_browser_mocks.mdx
index 942dc89e69074..05a02d042fe8f 100644
--- a/api_docs/kbn_core_doc_links_browser_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-browser-mocks
 title: "@kbn/core-doc-links-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-browser-mocks']
 ---
 import kbnCoreDocLinksBrowserMocksObj from './kbn_core_doc_links_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server.mdx b/api_docs/kbn_core_doc_links_server.mdx
index 0fbdab2dc825e..34c6ab10fa7b1 100644
--- a/api_docs/kbn_core_doc_links_server.mdx
+++ b/api_docs/kbn_core_doc_links_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server
 title: "@kbn/core-doc-links-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server']
 ---
 import kbnCoreDocLinksServerObj from './kbn_core_doc_links_server.devdocs.json';
diff --git a/api_docs/kbn_core_doc_links_server_mocks.mdx b/api_docs/kbn_core_doc_links_server_mocks.mdx
index 3205139fd555f..0714172c5b8de 100644
--- a/api_docs/kbn_core_doc_links_server_mocks.mdx
+++ b/api_docs/kbn_core_doc_links_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-doc-links-server-mocks
 title: "@kbn/core-doc-links-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-doc-links-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-doc-links-server-mocks']
 ---
 import kbnCoreDocLinksServerMocksObj from './kbn_core_doc_links_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
index 7dd318b0c67e0..97ca9a1453d76 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-internal
 title: "@kbn/core-elasticsearch-client-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-internal']
 ---
 import kbnCoreElasticsearchClientServerInternalObj from './kbn_core_elasticsearch_client_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
index f0bf95a1cd52f..7dd9526228567 100644
--- a/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_client_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-client-server-mocks
 title: "@kbn/core-elasticsearch-client-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-client-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-client-server-mocks']
 ---
 import kbnCoreElasticsearchClientServerMocksObj from './kbn_core_elasticsearch_client_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server.mdx b/api_docs/kbn_core_elasticsearch_server.mdx
index 3351868931096..5eca94f8a20cb 100644
--- a/api_docs/kbn_core_elasticsearch_server.mdx
+++ b/api_docs/kbn_core_elasticsearch_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server
 title: "@kbn/core-elasticsearch-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server']
 ---
 import kbnCoreElasticsearchServerObj from './kbn_core_elasticsearch_server.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_internal.mdx b/api_docs/kbn_core_elasticsearch_server_internal.mdx
index 8633efabde5e9..99a59f4b23f87 100644
--- a/api_docs/kbn_core_elasticsearch_server_internal.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-internal
 title: "@kbn/core-elasticsearch-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-internal']
 ---
 import kbnCoreElasticsearchServerInternalObj from './kbn_core_elasticsearch_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_elasticsearch_server_mocks.mdx b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
index 7b443a8b11fe2..e2e309d7bd0de 100644
--- a/api_docs/kbn_core_elasticsearch_server_mocks.mdx
+++ b/api_docs/kbn_core_elasticsearch_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-elasticsearch-server-mocks
 title: "@kbn/core-elasticsearch-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-elasticsearch-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-elasticsearch-server-mocks']
 ---
 import kbnCoreElasticsearchServerMocksObj from './kbn_core_elasticsearch_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_internal.mdx b/api_docs/kbn_core_environment_server_internal.mdx
index 38b4146f24787..bb23363db38e1 100644
--- a/api_docs/kbn_core_environment_server_internal.mdx
+++ b/api_docs/kbn_core_environment_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-internal
 title: "@kbn/core-environment-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-internal']
 ---
 import kbnCoreEnvironmentServerInternalObj from './kbn_core_environment_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_environment_server_mocks.mdx b/api_docs/kbn_core_environment_server_mocks.mdx
index a1a858bb5be89..33b321249e0cc 100644
--- a/api_docs/kbn_core_environment_server_mocks.mdx
+++ b/api_docs/kbn_core_environment_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-environment-server-mocks
 title: "@kbn/core-environment-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-environment-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-environment-server-mocks']
 ---
 import kbnCoreEnvironmentServerMocksObj from './kbn_core_environment_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser.mdx b/api_docs/kbn_core_execution_context_browser.mdx
index da02a8935a0d3..fc956352f0656 100644
--- a/api_docs/kbn_core_execution_context_browser.mdx
+++ b/api_docs/kbn_core_execution_context_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser
 title: "@kbn/core-execution-context-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser']
 ---
 import kbnCoreExecutionContextBrowserObj from './kbn_core_execution_context_browser.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_internal.mdx b/api_docs/kbn_core_execution_context_browser_internal.mdx
index f59af70e46853..1ef300a06de87 100644
--- a/api_docs/kbn_core_execution_context_browser_internal.mdx
+++ b/api_docs/kbn_core_execution_context_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-internal
 title: "@kbn/core-execution-context-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-internal']
 ---
 import kbnCoreExecutionContextBrowserInternalObj from './kbn_core_execution_context_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_browser_mocks.mdx b/api_docs/kbn_core_execution_context_browser_mocks.mdx
index 4d65437673e39..a33c5c4e26238 100644
--- a/api_docs/kbn_core_execution_context_browser_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-browser-mocks
 title: "@kbn/core-execution-context-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-browser-mocks']
 ---
 import kbnCoreExecutionContextBrowserMocksObj from './kbn_core_execution_context_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_common.mdx b/api_docs/kbn_core_execution_context_common.mdx
index 717c142b37295..94084a3fe62d4 100644
--- a/api_docs/kbn_core_execution_context_common.mdx
+++ b/api_docs/kbn_core_execution_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-common
 title: "@kbn/core-execution-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-common']
 ---
 import kbnCoreExecutionContextCommonObj from './kbn_core_execution_context_common.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server.mdx b/api_docs/kbn_core_execution_context_server.mdx
index e42630e08b844..e66dbd0069486 100644
--- a/api_docs/kbn_core_execution_context_server.mdx
+++ b/api_docs/kbn_core_execution_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server
 title: "@kbn/core-execution-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server']
 ---
 import kbnCoreExecutionContextServerObj from './kbn_core_execution_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_internal.mdx b/api_docs/kbn_core_execution_context_server_internal.mdx
index d38a76050d05a..a927c475362de 100644
--- a/api_docs/kbn_core_execution_context_server_internal.mdx
+++ b/api_docs/kbn_core_execution_context_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-internal
 title: "@kbn/core-execution-context-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-internal']
 ---
 import kbnCoreExecutionContextServerInternalObj from './kbn_core_execution_context_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_execution_context_server_mocks.mdx b/api_docs/kbn_core_execution_context_server_mocks.mdx
index 19cebee1adc25..20cb7e687ce02 100644
--- a/api_docs/kbn_core_execution_context_server_mocks.mdx
+++ b/api_docs/kbn_core_execution_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-execution-context-server-mocks
 title: "@kbn/core-execution-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-execution-context-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-execution-context-server-mocks']
 ---
 import kbnCoreExecutionContextServerMocksObj from './kbn_core_execution_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser.mdx b/api_docs/kbn_core_fatal_errors_browser.mdx
index 09df105043fc1..064521832e249 100644
--- a/api_docs/kbn_core_fatal_errors_browser.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser
 title: "@kbn/core-fatal-errors-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser']
 ---
 import kbnCoreFatalErrorsBrowserObj from './kbn_core_fatal_errors_browser.devdocs.json';
diff --git a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
index 37b248aad2a74..45f97c1d78e79 100644
--- a/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
+++ b/api_docs/kbn_core_fatal_errors_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-fatal-errors-browser-mocks
 title: "@kbn/core-fatal-errors-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-fatal-errors-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-fatal-errors-browser-mocks']
 ---
 import kbnCoreFatalErrorsBrowserMocksObj from './kbn_core_fatal_errors_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser.mdx b/api_docs/kbn_core_http_browser.mdx
index e7f94c4069ab0..39124862a3323 100644
--- a/api_docs/kbn_core_http_browser.mdx
+++ b/api_docs/kbn_core_http_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser
 title: "@kbn/core-http-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser']
 ---
 import kbnCoreHttpBrowserObj from './kbn_core_http_browser.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_internal.mdx b/api_docs/kbn_core_http_browser_internal.mdx
index 7ac33b69787c7..95dfc7b0d171a 100644
--- a/api_docs/kbn_core_http_browser_internal.mdx
+++ b/api_docs/kbn_core_http_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-internal
 title: "@kbn/core-http-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-internal']
 ---
 import kbnCoreHttpBrowserInternalObj from './kbn_core_http_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_browser_mocks.mdx b/api_docs/kbn_core_http_browser_mocks.mdx
index 0344c80534a39..5ba46583dc125 100644
--- a/api_docs/kbn_core_http_browser_mocks.mdx
+++ b/api_docs/kbn_core_http_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-browser-mocks
 title: "@kbn/core-http-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-browser-mocks']
 ---
 import kbnCoreHttpBrowserMocksObj from './kbn_core_http_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_common.mdx b/api_docs/kbn_core_http_common.mdx
index 27e9324ee3910..93983bf356095 100644
--- a/api_docs/kbn_core_http_common.mdx
+++ b/api_docs/kbn_core_http_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-common
 title: "@kbn/core-http-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-common']
 ---
 import kbnCoreHttpCommonObj from './kbn_core_http_common.devdocs.json';
diff --git a/api_docs/kbn_core_http_context_server_mocks.mdx b/api_docs/kbn_core_http_context_server_mocks.mdx
index 9cd138367f4bb..01ca25c21e898 100644
--- a/api_docs/kbn_core_http_context_server_mocks.mdx
+++ b/api_docs/kbn_core_http_context_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-context-server-mocks
 title: "@kbn/core-http-context-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-context-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-context-server-mocks']
 ---
 import kbnCoreHttpContextServerMocksObj from './kbn_core_http_context_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_request_handler_context_server.mdx b/api_docs/kbn_core_http_request_handler_context_server.mdx
index 8802133a859e9..0cad736e16410 100644
--- a/api_docs/kbn_core_http_request_handler_context_server.mdx
+++ b/api_docs/kbn_core_http_request_handler_context_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-request-handler-context-server
 title: "@kbn/core-http-request-handler-context-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-request-handler-context-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-request-handler-context-server']
 ---
 import kbnCoreHttpRequestHandlerContextServerObj from './kbn_core_http_request_handler_context_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server.mdx b/api_docs/kbn_core_http_resources_server.mdx
index 8077c6d898552..5663ea45d0e3e 100644
--- a/api_docs/kbn_core_http_resources_server.mdx
+++ b/api_docs/kbn_core_http_resources_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server
 title: "@kbn/core-http-resources-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server']
 ---
 import kbnCoreHttpResourcesServerObj from './kbn_core_http_resources_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_internal.mdx b/api_docs/kbn_core_http_resources_server_internal.mdx
index 9446bbd64772d..a66883c9f2ebe 100644
--- a/api_docs/kbn_core_http_resources_server_internal.mdx
+++ b/api_docs/kbn_core_http_resources_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-internal
 title: "@kbn/core-http-resources-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-internal']
 ---
 import kbnCoreHttpResourcesServerInternalObj from './kbn_core_http_resources_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_resources_server_mocks.mdx b/api_docs/kbn_core_http_resources_server_mocks.mdx
index 573d50f8a8025..a03d2453be975 100644
--- a/api_docs/kbn_core_http_resources_server_mocks.mdx
+++ b/api_docs/kbn_core_http_resources_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-resources-server-mocks
 title: "@kbn/core-http-resources-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-resources-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-resources-server-mocks']
 ---
 import kbnCoreHttpResourcesServerMocksObj from './kbn_core_http_resources_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_internal.mdx b/api_docs/kbn_core_http_router_server_internal.mdx
index 05d5c6f837f20..6f7f444953b0e 100644
--- a/api_docs/kbn_core_http_router_server_internal.mdx
+++ b/api_docs/kbn_core_http_router_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-internal
 title: "@kbn/core-http-router-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-internal']
 ---
 import kbnCoreHttpRouterServerInternalObj from './kbn_core_http_router_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_http_router_server_mocks.mdx b/api_docs/kbn_core_http_router_server_mocks.mdx
index 72329d8b5e6df..a3d1fa4bc7086 100644
--- a/api_docs/kbn_core_http_router_server_mocks.mdx
+++ b/api_docs/kbn_core_http_router_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-router-server-mocks
 title: "@kbn/core-http-router-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-router-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-router-server-mocks']
 ---
 import kbnCoreHttpRouterServerMocksObj from './kbn_core_http_router_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_http_server.devdocs.json b/api_docs/kbn_core_http_server.devdocs.json
index ec187c7f4458f..6a882bc634e54 100644
--- a/api_docs/kbn_core_http_server.devdocs.json
+++ b/api_docs/kbn_core_http_server.devdocs.json
@@ -6484,6 +6484,10 @@
                 "plugin": "alerting",
                 "path": "x-pack/plugins/alerting/server/routes/backfill/apis/find/find_backfill_route.ts"
               },
+              {
+                "plugin": "ruleRegistry",
+                "path": "x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.ts"
+              },
               {
                 "plugin": "ruleRegistry",
                 "path": "x-pack/plugins/rule_registry/server/routes/update_alert_by_id.ts"
@@ -9634,6 +9638,10 @@
                 "plugin": "reporting",
                 "path": "x-pack/plugins/reporting/server/test_helpers/create_mock_reportingplugin.ts"
               },
+              {
+                "plugin": "searchInferenceEndpoints",
+                "path": "x-pack/plugins/search_inference_endpoints/server/routes.ts"
+              },
               {
                 "plugin": "serverlessSearch",
                 "path": "x-pack/plugins/serverless_search/server/routes/connectors_routes.ts"
@@ -14634,6 +14642,22 @@
                 "plugin": "infra",
                 "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_cluster_health/get_cluster_health_route.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_space_health/get_space_health_route.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/rule_execution_logs/get_rule_execution_events/get_rule_execution_events_route.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/rule_execution_logs/get_rule_execution_results/get_rule_execution_results_route.ts"
+              },
               {
                 "plugin": "osquery",
                 "path": "x-pack/plugins/osquery/server/routes/live_query/get_live_query_details_route.ts"
@@ -14706,22 +14730,6 @@
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_status/get_prebuilt_rules_status_route.ts"
               },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_cluster_health/get_cluster_health_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_space_health/get_space_health_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/rule_execution_logs/get_rule_execution_events/get_rule_execution_events_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/rule_execution_logs/get_rule_execution_results/get_rule_execution_results_route.ts"
-              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/find_rules/route.ts"
@@ -14830,6 +14838,10 @@
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/privileges.ts"
               },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/entity_analytics/risk_engine/routes/status.ts"
@@ -15309,10 +15321,6 @@
                 "plugin": "infra",
                 "path": "x-pack/plugins/observability_solution/infra/server/lib/adapters/framework/kibana_framework_adapter.ts"
               },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/install_prebuilt_rules_and_timelines_route.ts"
-              },
               {
                 "plugin": "osquery",
                 "path": "x-pack/plugins/osquery/server/routes/saved_query/update_saved_query_route.ts"
@@ -15321,6 +15329,10 @@
                 "plugin": "osquery",
                 "path": "x-pack/plugins/osquery/server/routes/pack/update_pack_route.ts"
               },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/install_prebuilt_rules_and_timelines/install_prebuilt_rules_and_timelines_route.ts"
+              },
               {
                 "plugin": "securitySolution",
                 "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_update_rules/route.ts"
@@ -16070,15 +16082,19 @@
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_cluster_health/get_cluster_health_route.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_rule_health/get_rule_health_route.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_space_health/get_space_health_route.ts"
+              },
+              {
+                "plugin": "securitySolution",
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/setup/setup_health_route.ts"
               },
               {
                 "plugin": "osquery",
@@ -16098,35 +16114,31 @@
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_installation/perform_rule_installation_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/perform_rule_upgrade_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_cluster_health/get_cluster_health_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_rule_health/get_rule_health_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/get_space_health/get_space_health_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_installation/perform_rule_installation_route.ts"
               },
               {
                 "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_monitoring/api/detection_engine_health/setup/setup_health_route.ts"
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/perform_rule_upgrade/perform_rule_upgrade_route.ts"
               },
               {
                 "plugin": "securitySolution",
diff --git a/api_docs/kbn_core_http_server.mdx b/api_docs/kbn_core_http_server.mdx
index b9d08d7077575..614c3b9a7b7e2 100644
--- a/api_docs/kbn_core_http_server.mdx
+++ b/api_docs/kbn_core_http_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server
 title: "@kbn/core-http-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server']
 ---
 import kbnCoreHttpServerObj from './kbn_core_http_server.devdocs.json';
diff --git a/api_docs/kbn_core_http_server_internal.devdocs.json b/api_docs/kbn_core_http_server_internal.devdocs.json
index e27b8b2b2a987..db84770e5f81f 100644
--- a/api_docs/kbn_core_http_server_internal.devdocs.json
+++ b/api_docs/kbn_core_http_server_internal.devdocs.json
@@ -1463,7 +1463,7 @@
         "label": "HttpConfigType",
         "description": [],
         "signature": [
-          "{ readonly uuid?: string | undefined; readonly basePath?: string | undefined; readonly publicBaseUrl?: string | undefined; readonly name: string; readonly ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; readonly host: string; readonly http2: Readonly<{} & { allowUnsecure: boolean; }>; readonly protocol: \"http1\" | \"http2\"; readonly port: number; readonly compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; readonly cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; readonly versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; readonly autoListen: boolean; readonly shutdownTimeout: moment.Duration; readonly cdn: Readonly<{ url?: string | null | undefined; } & {}>; readonly oas: Readonly<{} & { enabled: boolean; }>; readonly securityResponseHeaders: Readonly<{} & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; readonly customResponseHeaders: Record<string, any>; readonly maxPayload: ",
+          "{ readonly uuid?: string | undefined; readonly basePath?: string | undefined; readonly publicBaseUrl?: string | undefined; readonly name: string; readonly ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; readonly host: string; readonly http2: Readonly<{} & { allowUnsecure: boolean; }>; readonly protocol: \"http1\" | \"http2\"; readonly port: number; readonly compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; readonly cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; readonly versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; readonly autoListen: boolean; readonly shutdownTimeout: moment.Duration; readonly cdn: Readonly<{ url?: string | null | undefined; } & {}>; readonly oas: Readonly<{} & { enabled: boolean; }>; readonly securityResponseHeaders: Readonly<{ permissionsPolicyReportOnly?: string | null | undefined; } & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; readonly customResponseHeaders: Record<string, any>; readonly maxPayload: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -1717,6 +1717,60 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-http-server-internal",
+        "id": "def-common.permissionsPolicyConfig",
+        "type": "Object",
+        "tags": [],
+        "label": "permissionsPolicyConfig",
+        "description": [],
+        "path": "packages/core/http/core-http-server-internal/src/permissions_policy/config.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-http-server-internal",
+            "id": "def-common.permissionsPolicyConfig.path",
+            "type": "string",
+            "tags": [],
+            "label": "path",
+            "description": [],
+            "path": "packages/core/http/core-http-server-internal/src/permissions_policy/config.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-http-server-internal",
+            "id": "def-common.permissionsPolicyConfig.schema",
+            "type": "Object",
+            "tags": [],
+            "label": "schema",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.ObjectType",
+                "text": "ObjectType"
+              },
+              "<{ report_to: ",
+              {
+                "pluginId": "@kbn/config-schema",
+                "scope": "common",
+                "docId": "kibKbnConfigSchemaPluginApi",
+                "section": "def-common.Type",
+                "text": "Type"
+              },
+              "<string[]>; }>"
+            ],
+            "path": "packages/core/http/core-http-server-internal/src/permissions_policy/config.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
       }
     ]
   }
diff --git a/api_docs/kbn_core_http_server_internal.mdx b/api_docs/kbn_core_http_server_internal.mdx
index 23dd73e1eb0ea..2d330ecb3f7b3 100644
--- a/api_docs/kbn_core_http_server_internal.mdx
+++ b/api_docs/kbn_core_http_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-internal
 title: "@kbn/core-http-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-internal']
 ---
 import kbnCoreHttpServerInternalObj from './kbn_core_http_server_internal.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 92 | 0 | 79 | 10 |
+| 95 | 0 | 82 | 10 |
 
 ## Common
 
diff --git a/api_docs/kbn_core_http_server_mocks.devdocs.json b/api_docs/kbn_core_http_server_mocks.devdocs.json
index 765ba95d4de08..142e3ae6eba5b 100644
--- a/api_docs/kbn_core_http_server_mocks.devdocs.json
+++ b/api_docs/kbn_core_http_server_mocks.devdocs.json
@@ -27,7 +27,7 @@
         "label": "createConfigService",
         "description": [],
         "signature": [
-          "({ server, externalUrl, csp, }?: Partial<{ server: Partial<Readonly<{ uuid?: string | undefined; basePath?: string | undefined; publicBaseUrl?: string | undefined; } & { name: string; ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; host: string; http2: Readonly<{} & { allowUnsecure: boolean; }>; protocol: \"http1\" | \"http2\"; port: number; compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; autoListen: boolean; shutdownTimeout: moment.Duration; cdn: Readonly<{ url?: string | null | undefined; } & {}>; oas: Readonly<{} & { enabled: boolean; }>; securityResponseHeaders: Readonly<{} & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; customResponseHeaders: Record<string, any>; maxPayload: ",
+          "({ server, externalUrl, csp, }?: Partial<{ server: Partial<Readonly<{ uuid?: string | undefined; basePath?: string | undefined; publicBaseUrl?: string | undefined; } & { name: string; ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; host: string; http2: Readonly<{} & { allowUnsecure: boolean; }>; protocol: \"http1\" | \"http2\"; port: number; compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; autoListen: boolean; shutdownTimeout: moment.Duration; cdn: Readonly<{ url?: string | null | undefined; } & {}>; oas: Readonly<{} & { enabled: boolean; }>; securityResponseHeaders: Readonly<{ permissionsPolicyReportOnly?: string | null | undefined; } & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; customResponseHeaders: Record<string, any>; maxPayload: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -64,7 +64,7 @@
             "label": "{\n  server,\n  externalUrl,\n  csp,\n}",
             "description": [],
             "signature": [
-              "Partial<{ server: Partial<Readonly<{ uuid?: string | undefined; basePath?: string | undefined; publicBaseUrl?: string | undefined; } & { name: string; ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; host: string; http2: Readonly<{} & { allowUnsecure: boolean; }>; protocol: \"http1\" | \"http2\"; port: number; compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; autoListen: boolean; shutdownTimeout: moment.Duration; cdn: Readonly<{ url?: string | null | undefined; } & {}>; oas: Readonly<{} & { enabled: boolean; }>; securityResponseHeaders: Readonly<{} & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; customResponseHeaders: Record<string, any>; maxPayload: ",
+              "Partial<{ server: Partial<Readonly<{ uuid?: string | undefined; basePath?: string | undefined; publicBaseUrl?: string | undefined; } & { name: string; ssl: Readonly<{ key?: string | undefined; certificateAuthorities?: string | string[] | undefined; certificate?: string | undefined; keyPassphrase?: string | undefined; redirectHttpFromPort?: number | undefined; } & { enabled: boolean; keystore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; truststore: Readonly<{ password?: string | undefined; path?: string | undefined; } & {}>; cipherSuites: string[]; supportedProtocols: string[]; clientAuthentication: \"none\" | \"optional\" | \"required\"; }>; host: string; http2: Readonly<{} & { allowUnsecure: boolean; }>; protocol: \"http1\" | \"http2\"; port: number; compression: Readonly<{ referrerWhitelist?: string[] | undefined; } & { enabled: boolean; brotli: Readonly<{} & { enabled: boolean; quality: number; }>; }>; cors: Readonly<{} & { enabled: boolean; allowCredentials: boolean; allowOrigin: string[] | \"*\"[]; }>; versioned: Readonly<{} & { useVersionResolutionStrategyForInternalPaths: string[]; versionResolution: \"none\" | \"oldest\" | \"newest\"; strictClientVersionCheck: boolean; }>; autoListen: boolean; shutdownTimeout: moment.Duration; cdn: Readonly<{ url?: string | null | undefined; } & {}>; oas: Readonly<{} & { enabled: boolean; }>; securityResponseHeaders: Readonly<{ permissionsPolicyReportOnly?: string | null | undefined; } & { referrerPolicy: \"origin\" | \"no-referrer\" | \"no-referrer-when-downgrade\" | \"origin-when-cross-origin\" | \"same-origin\" | \"strict-origin\" | \"strict-origin-when-cross-origin\" | \"unsafe-url\" | null; strictTransportSecurity: string | null; xContentTypeOptions: \"nosniff\" | null; permissionsPolicy: string | null; disableEmbedding: boolean; crossOriginOpenerPolicy: \"same-origin\" | \"unsafe-none\" | \"same-origin-allow-popups\" | null; }>; customResponseHeaders: Record<string, any>; maxPayload: ",
               {
                 "pluginId": "@kbn/config-schema",
                 "scope": "common",
diff --git a/api_docs/kbn_core_http_server_mocks.mdx b/api_docs/kbn_core_http_server_mocks.mdx
index 22068d6c6344f..cfded8d56635f 100644
--- a/api_docs/kbn_core_http_server_mocks.mdx
+++ b/api_docs/kbn_core_http_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-http-server-mocks
 title: "@kbn/core-http-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-http-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-http-server-mocks']
 ---
 import kbnCoreHttpServerMocksObj from './kbn_core_http_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser.mdx b/api_docs/kbn_core_i18n_browser.mdx
index 0d334ee353c3f..d7a3c9641cc07 100644
--- a/api_docs/kbn_core_i18n_browser.mdx
+++ b/api_docs/kbn_core_i18n_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser
 title: "@kbn/core-i18n-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser']
 ---
 import kbnCoreI18nBrowserObj from './kbn_core_i18n_browser.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_browser_mocks.mdx b/api_docs/kbn_core_i18n_browser_mocks.mdx
index 5b6acb3311459..b06ad10414620 100644
--- a/api_docs/kbn_core_i18n_browser_mocks.mdx
+++ b/api_docs/kbn_core_i18n_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-browser-mocks
 title: "@kbn/core-i18n-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-browser-mocks']
 ---
 import kbnCoreI18nBrowserMocksObj from './kbn_core_i18n_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server.mdx b/api_docs/kbn_core_i18n_server.mdx
index 6cd1be3691db1..c7b11d5a18cb9 100644
--- a/api_docs/kbn_core_i18n_server.mdx
+++ b/api_docs/kbn_core_i18n_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server
 title: "@kbn/core-i18n-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server']
 ---
 import kbnCoreI18nServerObj from './kbn_core_i18n_server.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_internal.mdx b/api_docs/kbn_core_i18n_server_internal.mdx
index 74f03676bf70b..dd078b381f972 100644
--- a/api_docs/kbn_core_i18n_server_internal.mdx
+++ b/api_docs/kbn_core_i18n_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-internal
 title: "@kbn/core-i18n-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-internal']
 ---
 import kbnCoreI18nServerInternalObj from './kbn_core_i18n_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_i18n_server_mocks.mdx b/api_docs/kbn_core_i18n_server_mocks.mdx
index 03b7e3166b315..0f1a495092a62 100644
--- a/api_docs/kbn_core_i18n_server_mocks.mdx
+++ b/api_docs/kbn_core_i18n_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-i18n-server-mocks
 title: "@kbn/core-i18n-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-i18n-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-i18n-server-mocks']
 ---
 import kbnCoreI18nServerMocksObj from './kbn_core_i18n_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
index 9343732449d42..aeb737f9486a5 100644
--- a/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
+++ b/api_docs/kbn_core_injected_metadata_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-injected-metadata-browser-mocks
 title: "@kbn/core-injected-metadata-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-injected-metadata-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-injected-metadata-browser-mocks']
 ---
 import kbnCoreInjectedMetadataBrowserMocksObj from './kbn_core_injected_metadata_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_internal.mdx b/api_docs/kbn_core_integrations_browser_internal.mdx
index 09321f2d90d6c..132a752867fed 100644
--- a/api_docs/kbn_core_integrations_browser_internal.mdx
+++ b/api_docs/kbn_core_integrations_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-internal
 title: "@kbn/core-integrations-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-internal']
 ---
 import kbnCoreIntegrationsBrowserInternalObj from './kbn_core_integrations_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_integrations_browser_mocks.mdx b/api_docs/kbn_core_integrations_browser_mocks.mdx
index ea1efdb2409ef..69b7fcfccb430 100644
--- a/api_docs/kbn_core_integrations_browser_mocks.mdx
+++ b/api_docs/kbn_core_integrations_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-integrations-browser-mocks
 title: "@kbn/core-integrations-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-integrations-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-integrations-browser-mocks']
 ---
 import kbnCoreIntegrationsBrowserMocksObj from './kbn_core_integrations_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser.mdx b/api_docs/kbn_core_lifecycle_browser.mdx
index edc79194fb8c0..2f90e1916554e 100644
--- a/api_docs/kbn_core_lifecycle_browser.mdx
+++ b/api_docs/kbn_core_lifecycle_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser
 title: "@kbn/core-lifecycle-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser']
 ---
 import kbnCoreLifecycleBrowserObj from './kbn_core_lifecycle_browser.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_browser_mocks.mdx b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
index 0e0a13a837f21..20bc6881efb28 100644
--- a/api_docs/kbn_core_lifecycle_browser_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-browser-mocks
 title: "@kbn/core-lifecycle-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-browser-mocks']
 ---
 import kbnCoreLifecycleBrowserMocksObj from './kbn_core_lifecycle_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server.mdx b/api_docs/kbn_core_lifecycle_server.mdx
index 5dae2c747e3af..84afe340bafaf 100644
--- a/api_docs/kbn_core_lifecycle_server.mdx
+++ b/api_docs/kbn_core_lifecycle_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server
 title: "@kbn/core-lifecycle-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server']
 ---
 import kbnCoreLifecycleServerObj from './kbn_core_lifecycle_server.devdocs.json';
diff --git a/api_docs/kbn_core_lifecycle_server_mocks.mdx b/api_docs/kbn_core_lifecycle_server_mocks.mdx
index 016e933ac2929..09f38b1e9e14b 100644
--- a/api_docs/kbn_core_lifecycle_server_mocks.mdx
+++ b/api_docs/kbn_core_lifecycle_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-lifecycle-server-mocks
 title: "@kbn/core-lifecycle-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-lifecycle-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-lifecycle-server-mocks']
 ---
 import kbnCoreLifecycleServerMocksObj from './kbn_core_lifecycle_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_browser_mocks.mdx b/api_docs/kbn_core_logging_browser_mocks.mdx
index 5a8771709a080..4e327029c6e75 100644
--- a/api_docs/kbn_core_logging_browser_mocks.mdx
+++ b/api_docs/kbn_core_logging_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-browser-mocks
 title: "@kbn/core-logging-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-browser-mocks']
 ---
 import kbnCoreLoggingBrowserMocksObj from './kbn_core_logging_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_logging_common_internal.mdx b/api_docs/kbn_core_logging_common_internal.mdx
index ea76e4f731e3b..d913047ca8b58 100644
--- a/api_docs/kbn_core_logging_common_internal.mdx
+++ b/api_docs/kbn_core_logging_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-common-internal
 title: "@kbn/core-logging-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-common-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-common-internal']
 ---
 import kbnCoreLoggingCommonInternalObj from './kbn_core_logging_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server.mdx b/api_docs/kbn_core_logging_server.mdx
index 16c903cab3135..aa313b06ce52e 100644
--- a/api_docs/kbn_core_logging_server.mdx
+++ b/api_docs/kbn_core_logging_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server
 title: "@kbn/core-logging-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server']
 ---
 import kbnCoreLoggingServerObj from './kbn_core_logging_server.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_internal.mdx b/api_docs/kbn_core_logging_server_internal.mdx
index 6465278b4bf60..8f4f0db0e831b 100644
--- a/api_docs/kbn_core_logging_server_internal.mdx
+++ b/api_docs/kbn_core_logging_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-internal
 title: "@kbn/core-logging-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-internal']
 ---
 import kbnCoreLoggingServerInternalObj from './kbn_core_logging_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_logging_server_mocks.devdocs.json b/api_docs/kbn_core_logging_server_mocks.devdocs.json
index 329bb66b1d81f..ea54ba1fab35b 100644
--- a/api_docs/kbn_core_logging_server_mocks.devdocs.json
+++ b/api_docs/kbn_core_logging_server_mocks.devdocs.json
@@ -158,7 +158,7 @@
                 "section": "def-common.LoggerFactory",
                 "text": "LoggerFactory"
               },
-              ") => { debug: [message: string, meta?: ",
+              ") => { debug: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -166,7 +166,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; error: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; error: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -174,7 +174,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; fatal: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; fatal: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -182,7 +182,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; info: [message: string, meta?: ",
+              " | undefined])[]; info: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -190,9 +190,9 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; log: [record: ",
+              " | undefined])[]; log: [record: ",
               "LogRecord",
-              "][]; trace: [message: string, meta?: ",
+              "][]; trace: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -200,7 +200,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; warn: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; warn: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -208,7 +208,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; }"
+              " | undefined])[]; }"
             ],
             "path": "packages/core/logging/core-logging-server-mocks/src/logging_system.mock.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_core_logging_server_mocks.mdx b/api_docs/kbn_core_logging_server_mocks.mdx
index fd43647355239..5e3f3f033a40c 100644
--- a/api_docs/kbn_core_logging_server_mocks.mdx
+++ b/api_docs/kbn_core_logging_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-logging-server-mocks
 title: "@kbn/core-logging-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-logging-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-logging-server-mocks']
 ---
 import kbnCoreLoggingServerMocksObj from './kbn_core_logging_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_internal.mdx b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
index 9378f2bf4e6ce..b40391cf960de 100644
--- a/api_docs/kbn_core_metrics_collectors_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-internal
 title: "@kbn/core-metrics-collectors-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-internal']
 ---
 import kbnCoreMetricsCollectorsServerInternalObj from './kbn_core_metrics_collectors_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
index 52011a479a28e..eae30f58c6863 100644
--- a/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_collectors_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-collectors-server-mocks
 title: "@kbn/core-metrics-collectors-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-collectors-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-collectors-server-mocks']
 ---
 import kbnCoreMetricsCollectorsServerMocksObj from './kbn_core_metrics_collectors_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server.devdocs.json b/api_docs/kbn_core_metrics_server.devdocs.json
index 94105c95f94cd..6dfa3e47827bf 100644
--- a/api_docs/kbn_core_metrics_server.devdocs.json
+++ b/api_docs/kbn_core_metrics_server.devdocs.json
@@ -908,7 +908,7 @@
           "\nProtocol(s) used by the Elasticsearch Client"
         ],
         "signature": [
-          "\"none\" | \"http\" | \"mixed\" | \"https\""
+          "\"none\" | \"mixed\" | \"http\" | \"https\""
         ],
         "path": "packages/core/metrics/core-metrics-server/src/metrics.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_core_metrics_server.mdx b/api_docs/kbn_core_metrics_server.mdx
index 4b73f7c6e5c61..adb6933ac0b3e 100644
--- a/api_docs/kbn_core_metrics_server.mdx
+++ b/api_docs/kbn_core_metrics_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server
 title: "@kbn/core-metrics-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server']
 ---
 import kbnCoreMetricsServerObj from './kbn_core_metrics_server.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_internal.mdx b/api_docs/kbn_core_metrics_server_internal.mdx
index 6164195df38cf..bd353e1fbb474 100644
--- a/api_docs/kbn_core_metrics_server_internal.mdx
+++ b/api_docs/kbn_core_metrics_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-internal
 title: "@kbn/core-metrics-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-internal']
 ---
 import kbnCoreMetricsServerInternalObj from './kbn_core_metrics_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_metrics_server_mocks.mdx b/api_docs/kbn_core_metrics_server_mocks.mdx
index 6ccf8f3b59c5b..ed05e8b871e13 100644
--- a/api_docs/kbn_core_metrics_server_mocks.mdx
+++ b/api_docs/kbn_core_metrics_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-metrics-server-mocks
 title: "@kbn/core-metrics-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-metrics-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-metrics-server-mocks']
 ---
 import kbnCoreMetricsServerMocksObj from './kbn_core_metrics_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_mount_utils_browser.mdx b/api_docs/kbn_core_mount_utils_browser.mdx
index d52a9efb9c932..785347717a7b0 100644
--- a/api_docs/kbn_core_mount_utils_browser.mdx
+++ b/api_docs/kbn_core_mount_utils_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-mount-utils-browser
 title: "@kbn/core-mount-utils-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-mount-utils-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-mount-utils-browser']
 ---
 import kbnCoreMountUtilsBrowserObj from './kbn_core_mount_utils_browser.devdocs.json';
diff --git a/api_docs/kbn_core_node_server.mdx b/api_docs/kbn_core_node_server.mdx
index 3aeeb1d4836d9..6703f92b23c37 100644
--- a/api_docs/kbn_core_node_server.mdx
+++ b/api_docs/kbn_core_node_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server
 title: "@kbn/core-node-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server']
 ---
 import kbnCoreNodeServerObj from './kbn_core_node_server.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_internal.mdx b/api_docs/kbn_core_node_server_internal.mdx
index 53f6518c996fa..b36d927b144df 100644
--- a/api_docs/kbn_core_node_server_internal.mdx
+++ b/api_docs/kbn_core_node_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-internal
 title: "@kbn/core-node-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-internal']
 ---
 import kbnCoreNodeServerInternalObj from './kbn_core_node_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_node_server_mocks.mdx b/api_docs/kbn_core_node_server_mocks.mdx
index f5d0a6b98fd4a..2098ce8ef277f 100644
--- a/api_docs/kbn_core_node_server_mocks.mdx
+++ b/api_docs/kbn_core_node_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-node-server-mocks
 title: "@kbn/core-node-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-node-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-node-server-mocks']
 ---
 import kbnCoreNodeServerMocksObj from './kbn_core_node_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser.mdx b/api_docs/kbn_core_notifications_browser.mdx
index d1d47b2400ce8..13d674307226e 100644
--- a/api_docs/kbn_core_notifications_browser.mdx
+++ b/api_docs/kbn_core_notifications_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser
 title: "@kbn/core-notifications-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser']
 ---
 import kbnCoreNotificationsBrowserObj from './kbn_core_notifications_browser.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_internal.mdx b/api_docs/kbn_core_notifications_browser_internal.mdx
index ea61f98a87994..a537901ed8762 100644
--- a/api_docs/kbn_core_notifications_browser_internal.mdx
+++ b/api_docs/kbn_core_notifications_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-internal
 title: "@kbn/core-notifications-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-internal']
 ---
 import kbnCoreNotificationsBrowserInternalObj from './kbn_core_notifications_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_notifications_browser_mocks.mdx b/api_docs/kbn_core_notifications_browser_mocks.mdx
index 8e7b5f8eab110..5708b905aa3c1 100644
--- a/api_docs/kbn_core_notifications_browser_mocks.mdx
+++ b/api_docs/kbn_core_notifications_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-notifications-browser-mocks
 title: "@kbn/core-notifications-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-notifications-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-notifications-browser-mocks']
 ---
 import kbnCoreNotificationsBrowserMocksObj from './kbn_core_notifications_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser.mdx b/api_docs/kbn_core_overlays_browser.mdx
index eeba1761a32fe..98308898b1c03 100644
--- a/api_docs/kbn_core_overlays_browser.mdx
+++ b/api_docs/kbn_core_overlays_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser
 title: "@kbn/core-overlays-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser']
 ---
 import kbnCoreOverlaysBrowserObj from './kbn_core_overlays_browser.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_internal.mdx b/api_docs/kbn_core_overlays_browser_internal.mdx
index b7efa868694df..62cf0ec701516 100644
--- a/api_docs/kbn_core_overlays_browser_internal.mdx
+++ b/api_docs/kbn_core_overlays_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-internal
 title: "@kbn/core-overlays-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-internal']
 ---
 import kbnCoreOverlaysBrowserInternalObj from './kbn_core_overlays_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_overlays_browser_mocks.mdx b/api_docs/kbn_core_overlays_browser_mocks.mdx
index 84db54c131980..996f481cda36f 100644
--- a/api_docs/kbn_core_overlays_browser_mocks.mdx
+++ b/api_docs/kbn_core_overlays_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-overlays-browser-mocks
 title: "@kbn/core-overlays-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-overlays-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-overlays-browser-mocks']
 ---
 import kbnCoreOverlaysBrowserMocksObj from './kbn_core_overlays_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser.mdx b/api_docs/kbn_core_plugins_browser.mdx
index a9c377b5092e5..78fdf2ecdf3a7 100644
--- a/api_docs/kbn_core_plugins_browser.mdx
+++ b/api_docs/kbn_core_plugins_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser
 title: "@kbn/core-plugins-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser']
 ---
 import kbnCorePluginsBrowserObj from './kbn_core_plugins_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_browser_mocks.mdx b/api_docs/kbn_core_plugins_browser_mocks.mdx
index d5b661bdeb583..9e5f4ecc16e7f 100644
--- a/api_docs/kbn_core_plugins_browser_mocks.mdx
+++ b/api_docs/kbn_core_plugins_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-browser-mocks
 title: "@kbn/core-plugins-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-browser-mocks']
 ---
 import kbnCorePluginsBrowserMocksObj from './kbn_core_plugins_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_contracts_browser.mdx b/api_docs/kbn_core_plugins_contracts_browser.mdx
index 6e36c980e38f6..04d4ac0d9b488 100644
--- a/api_docs/kbn_core_plugins_contracts_browser.mdx
+++ b/api_docs/kbn_core_plugins_contracts_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-browser
 title: "@kbn/core-plugins-contracts-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-browser']
 ---
 import kbnCorePluginsContractsBrowserObj from './kbn_core_plugins_contracts_browser.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_contracts_server.mdx b/api_docs/kbn_core_plugins_contracts_server.mdx
index cd59df2d717e1..6fc8f8d6a7299 100644
--- a/api_docs/kbn_core_plugins_contracts_server.mdx
+++ b/api_docs/kbn_core_plugins_contracts_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-contracts-server
 title: "@kbn/core-plugins-contracts-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-contracts-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-contracts-server']
 ---
 import kbnCorePluginsContractsServerObj from './kbn_core_plugins_contracts_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server.mdx b/api_docs/kbn_core_plugins_server.mdx
index 88830270e4e1f..4ea22f25705aa 100644
--- a/api_docs/kbn_core_plugins_server.mdx
+++ b/api_docs/kbn_core_plugins_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server
 title: "@kbn/core-plugins-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server']
 ---
 import kbnCorePluginsServerObj from './kbn_core_plugins_server.devdocs.json';
diff --git a/api_docs/kbn_core_plugins_server_mocks.mdx b/api_docs/kbn_core_plugins_server_mocks.mdx
index 3267edeb8fe84..5a7b6ad659133 100644
--- a/api_docs/kbn_core_plugins_server_mocks.mdx
+++ b/api_docs/kbn_core_plugins_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-plugins-server-mocks
 title: "@kbn/core-plugins-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-plugins-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-plugins-server-mocks']
 ---
 import kbnCorePluginsServerMocksObj from './kbn_core_plugins_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server.mdx b/api_docs/kbn_core_preboot_server.mdx
index 83d3f9b77fa62..64ad58587ebfb 100644
--- a/api_docs/kbn_core_preboot_server.mdx
+++ b/api_docs/kbn_core_preboot_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server
 title: "@kbn/core-preboot-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server']
 ---
 import kbnCorePrebootServerObj from './kbn_core_preboot_server.devdocs.json';
diff --git a/api_docs/kbn_core_preboot_server_mocks.mdx b/api_docs/kbn_core_preboot_server_mocks.mdx
index 739236c540114..7ad29baf7ae44 100644
--- a/api_docs/kbn_core_preboot_server_mocks.mdx
+++ b/api_docs/kbn_core_preboot_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-preboot-server-mocks
 title: "@kbn/core-preboot-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-preboot-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-preboot-server-mocks']
 ---
 import kbnCorePrebootServerMocksObj from './kbn_core_preboot_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_browser_mocks.mdx b/api_docs/kbn_core_rendering_browser_mocks.mdx
index a46f291daab36..d8fbd475a2841 100644
--- a/api_docs/kbn_core_rendering_browser_mocks.mdx
+++ b/api_docs/kbn_core_rendering_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-browser-mocks
 title: "@kbn/core-rendering-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-browser-mocks']
 ---
 import kbnCoreRenderingBrowserMocksObj from './kbn_core_rendering_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_internal.mdx b/api_docs/kbn_core_rendering_server_internal.mdx
index c1831f182f50c..4ce95e2b3defe 100644
--- a/api_docs/kbn_core_rendering_server_internal.mdx
+++ b/api_docs/kbn_core_rendering_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-internal
 title: "@kbn/core-rendering-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-internal']
 ---
 import kbnCoreRenderingServerInternalObj from './kbn_core_rendering_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_rendering_server_mocks.mdx b/api_docs/kbn_core_rendering_server_mocks.mdx
index ee41e82b5e4f7..650588837018d 100644
--- a/api_docs/kbn_core_rendering_server_mocks.mdx
+++ b/api_docs/kbn_core_rendering_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-rendering-server-mocks
 title: "@kbn/core-rendering-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-rendering-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-rendering-server-mocks']
 ---
 import kbnCoreRenderingServerMocksObj from './kbn_core_rendering_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_root_server_internal.mdx b/api_docs/kbn_core_root_server_internal.mdx
index e44d1dcd2fe8a..82850711751d7 100644
--- a/api_docs/kbn_core_root_server_internal.mdx
+++ b/api_docs/kbn_core_root_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-root-server-internal
 title: "@kbn/core-root-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-root-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-root-server-internal']
 ---
 import kbnCoreRootServerInternalObj from './kbn_core_root_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_browser.mdx b/api_docs/kbn_core_saved_objects_api_browser.mdx
index 33f2e7a47a52f..74f7284f16963 100644
--- a/api_docs/kbn_core_saved_objects_api_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_api_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-browser
 title: "@kbn/core-saved-objects-api-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-browser']
 ---
 import kbnCoreSavedObjectsApiBrowserObj from './kbn_core_saved_objects_api_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server.mdx b/api_docs/kbn_core_saved_objects_api_server.mdx
index 086644833edde..f145e5ae7c0cc 100644
--- a/api_docs/kbn_core_saved_objects_api_server.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server
 title: "@kbn/core-saved-objects-api-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server']
 ---
 import kbnCoreSavedObjectsApiServerObj from './kbn_core_saved_objects_api_server.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
index d4e7a50e5aea1..e3f63ec5585af 100644
--- a/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_api_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-api-server-mocks
 title: "@kbn/core-saved-objects-api-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-api-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-api-server-mocks']
 ---
 import kbnCoreSavedObjectsApiServerMocksObj from './kbn_core_saved_objects_api_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_internal.mdx b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
index 3325b2331e365..d66e01dbe82b9 100644
--- a/api_docs/kbn_core_saved_objects_base_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-internal
 title: "@kbn/core-saved-objects-base-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-internal']
 ---
 import kbnCoreSavedObjectsBaseServerInternalObj from './kbn_core_saved_objects_base_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
index 752b9f56fea37..8a1b41554edc3 100644
--- a/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_base_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-base-server-mocks
 title: "@kbn/core-saved-objects-base-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-base-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-base-server-mocks']
 ---
 import kbnCoreSavedObjectsBaseServerMocksObj from './kbn_core_saved_objects_base_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser.mdx b/api_docs/kbn_core_saved_objects_browser.mdx
index b9b665a3f0c41..168d96ec1f10c 100644
--- a/api_docs/kbn_core_saved_objects_browser.mdx
+++ b/api_docs/kbn_core_saved_objects_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser
 title: "@kbn/core-saved-objects-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser']
 ---
 import kbnCoreSavedObjectsBrowserObj from './kbn_core_saved_objects_browser.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_internal.mdx b/api_docs/kbn_core_saved_objects_browser_internal.mdx
index d20be59eacc14..bc7163705ce0f 100644
--- a/api_docs/kbn_core_saved_objects_browser_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-internal
 title: "@kbn/core-saved-objects-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-internal']
 ---
 import kbnCoreSavedObjectsBrowserInternalObj from './kbn_core_saved_objects_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_browser_mocks.mdx b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
index 0395ba563b8f9..2663aabf63307 100644
--- a/api_docs/kbn_core_saved_objects_browser_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-browser-mocks
 title: "@kbn/core-saved-objects-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-browser-mocks']
 ---
 import kbnCoreSavedObjectsBrowserMocksObj from './kbn_core_saved_objects_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_common.mdx b/api_docs/kbn_core_saved_objects_common.mdx
index 106011e4167f0..14d437efbbeaa 100644
--- a/api_docs/kbn_core_saved_objects_common.mdx
+++ b/api_docs/kbn_core_saved_objects_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-common
 title: "@kbn/core-saved-objects-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-common']
 ---
 import kbnCoreSavedObjectsCommonObj from './kbn_core_saved_objects_common.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
index 454b5140dfec3..8b33b1b5b0c49 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-internal
 title: "@kbn/core-saved-objects-import-export-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-internal']
 ---
 import kbnCoreSavedObjectsImportExportServerInternalObj from './kbn_core_saved_objects_import_export_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
index 3ac43e85365c4..4c80ed2214e6a 100644
--- a/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_import_export_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-import-export-server-mocks
 title: "@kbn/core-saved-objects-import-export-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-import-export-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-import-export-server-mocks']
 ---
 import kbnCoreSavedObjectsImportExportServerMocksObj from './kbn_core_saved_objects_import_export_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
index 77267d3eace43..1d540f8f98d2b 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-internal
 title: "@kbn/core-saved-objects-migration-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-internal']
 ---
 import kbnCoreSavedObjectsMigrationServerInternalObj from './kbn_core_saved_objects_migration_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
index 438cf754e4bc2..fd6aec4a47d93 100644
--- a/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_migration_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-migration-server-mocks
 title: "@kbn/core-saved-objects-migration-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-migration-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-migration-server-mocks']
 ---
 import kbnCoreSavedObjectsMigrationServerMocksObj from './kbn_core_saved_objects_migration_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server.devdocs.json b/api_docs/kbn_core_saved_objects_server.devdocs.json
index 6fbd41c6e266b..91b0d314d07fb 100644
--- a/api_docs/kbn_core_saved_objects_server.devdocs.json
+++ b/api_docs/kbn_core_saved_objects_server.devdocs.json
@@ -13819,6 +13819,18 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-saved-objects-server",
+        "id": "def-common.USAGE_COUNTERS_SAVED_OBJECT_INDEX",
+        "type": "string",
+        "tags": [],
+        "label": "USAGE_COUNTERS_SAVED_OBJECT_INDEX",
+        "description": [],
+        "path": "packages/core/saved-objects/core-saved-objects-server/src/saved_objects_index_pattern.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": []
diff --git a/api_docs/kbn_core_saved_objects_server.mdx b/api_docs/kbn_core_saved_objects_server.mdx
index 72465203160cb..666a471ecf3f7 100644
--- a/api_docs/kbn_core_saved_objects_server.mdx
+++ b/api_docs/kbn_core_saved_objects_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server
 title: "@kbn/core-saved-objects-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server']
 ---
 import kbnCoreSavedObjectsServerObj from './kbn_core_saved_objects_server.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 561 | 1 | 133 | 4 |
+| 562 | 1 | 134 | 4 |
 
 ## Common
 
diff --git a/api_docs/kbn_core_saved_objects_server_internal.mdx b/api_docs/kbn_core_saved_objects_server_internal.mdx
index f157123514920..0c9a42112fec9 100644
--- a/api_docs/kbn_core_saved_objects_server_internal.mdx
+++ b/api_docs/kbn_core_saved_objects_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-internal
 title: "@kbn/core-saved-objects-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-internal']
 ---
 import kbnCoreSavedObjectsServerInternalObj from './kbn_core_saved_objects_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_server_mocks.mdx b/api_docs/kbn_core_saved_objects_server_mocks.mdx
index 6618e3fe4f038..f3e5286b53133 100644
--- a/api_docs/kbn_core_saved_objects_server_mocks.mdx
+++ b/api_docs/kbn_core_saved_objects_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-server-mocks
 title: "@kbn/core-saved-objects-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-server-mocks']
 ---
 import kbnCoreSavedObjectsServerMocksObj from './kbn_core_saved_objects_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_saved_objects_utils_server.mdx b/api_docs/kbn_core_saved_objects_utils_server.mdx
index b5acf243006f4..8156b79846db7 100644
--- a/api_docs/kbn_core_saved_objects_utils_server.mdx
+++ b/api_docs/kbn_core_saved_objects_utils_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-saved-objects-utils-server
 title: "@kbn/core-saved-objects-utils-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-saved-objects-utils-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-saved-objects-utils-server']
 ---
 import kbnCoreSavedObjectsUtilsServerObj from './kbn_core_saved_objects_utils_server.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser.mdx b/api_docs/kbn_core_security_browser.mdx
index b69eaa7701e9b..f6ff7e00daefa 100644
--- a/api_docs/kbn_core_security_browser.mdx
+++ b/api_docs/kbn_core_security_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser
 title: "@kbn/core-security-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser']
 ---
 import kbnCoreSecurityBrowserObj from './kbn_core_security_browser.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_internal.mdx b/api_docs/kbn_core_security_browser_internal.mdx
index b45fb35f46230..f13915cbc1a81 100644
--- a/api_docs/kbn_core_security_browser_internal.mdx
+++ b/api_docs/kbn_core_security_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-internal
 title: "@kbn/core-security-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-internal']
 ---
 import kbnCoreSecurityBrowserInternalObj from './kbn_core_security_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_browser_mocks.mdx b/api_docs/kbn_core_security_browser_mocks.mdx
index 3edd53cc76d76..2372dd9eb3f88 100644
--- a/api_docs/kbn_core_security_browser_mocks.mdx
+++ b/api_docs/kbn_core_security_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-browser-mocks
 title: "@kbn/core-security-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-browser-mocks']
 ---
 import kbnCoreSecurityBrowserMocksObj from './kbn_core_security_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_security_common.mdx b/api_docs/kbn_core_security_common.mdx
index 8039694a533d9..4678c148eae5b 100644
--- a/api_docs/kbn_core_security_common.mdx
+++ b/api_docs/kbn_core_security_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-common
 title: "@kbn/core-security-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-common']
 ---
 import kbnCoreSecurityCommonObj from './kbn_core_security_common.devdocs.json';
diff --git a/api_docs/kbn_core_security_server.devdocs.json b/api_docs/kbn_core_security_server.devdocs.json
index fb144f1f8e2d8..ca536ef16c482 100644
--- a/api_docs/kbn_core_security_server.devdocs.json
+++ b/api_docs/kbn_core_security_server.devdocs.json
@@ -18,94 +18,1708 @@
   },
   "common": {
     "classes": [],
-    "functions": [],
+    "functions": [
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.isCreateRestAPIKeyParams",
+        "type": "Function",
+        "tags": [],
+        "label": "isCreateRestAPIKeyParams",
+        "description": [],
+        "signature": [
+          "(params: any) => boolean"
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.isCreateRestAPIKeyParams.$1",
+            "type": "Any",
+            "tags": [],
+            "label": "params",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
     "interfaces": [
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditEvent",
+        "id": "def-common.APIKeys",
+        "type": "Interface",
+        "tags": [],
+        "label": "APIKeys",
+        "description": [
+          "\nInterface for managing API keys in Elasticsearch, including creation,\nvalidation, and invalidation of API keys,\nas well as checking the status of API key features."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.areAPIKeysEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "areAPIKeysEnabled",
+            "description": [
+              "\nDetermines if API Keys are enabled in Elasticsearch."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.areCrossClusterAPIKeysEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "areCrossClusterAPIKeysEnabled",
+            "description": [
+              "\nDetermines if Cross-Cluster API Keys are enabled in Elasticsearch."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [
+              "\nTries to create an API key for the current user.\n\nReturns newly created API key or `null` if API keys are disabled.\n\nUser needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, createParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
+                "text": "CreateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityCreateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.create.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.create.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "createParams",
+                "description": [
+                  "The params to create an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
+                    "text": "CreateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.update",
+            "type": "Function",
+            "tags": [],
+            "label": "update",
+            "description": [
+              "\nAttempts update an API key with the provided 'role_descriptors' and 'metadata'\n\nReturns `updated`, `true` if the update was successful, `false` if there was nothing to update\n\nUser needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, updateParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
+                "text": "UpdateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityUpdateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.update.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.update.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "updateParams",
+                "description": [
+                  "The params to edit an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
+                    "text": "UpdateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.grantAsInternalUser",
+            "type": "Function",
+            "tags": [],
+            "label": "grantAsInternalUser",
+            "description": [
+              "\nTries to grant an API key for the current user."
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, createParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyParams",
+                "text": "CreateRestAPIKeyParams"
+              },
+              " | ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.GrantAPIKeyResult",
+                "text": "GrantAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.grantAsInternalUser.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.grantAsInternalUser.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "createParams",
+                "description": [
+                  "Create operation parameters."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyParams",
+                    "text": "CreateRestAPIKeyParams"
+                  },
+                  " | ",
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                    "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.validate",
+            "type": "Function",
+            "tags": [],
+            "label": "validate",
+            "description": [
+              "\nTries to validate an API key."
+            ],
+            "signature": [
+              "(apiKeyPrams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ValidateAPIKeyParams",
+                "text": "ValidateAPIKeyParams"
+              },
+              ") => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.validate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "apiKeyPrams",
+                "description": [
+                  "ValidateAPIKeyParams."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.ValidateAPIKeyParams",
+                    "text": "ValidateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.invalidate",
+            "type": "Function",
+            "tags": [],
+            "label": "invalidate",
+            "description": [
+              "\nTries to invalidate an API keys."
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, params: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.invalidate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.invalidate.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [
+                  "The params to invalidate an API keys."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
+                    "text": "InvalidateAPIKeysParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeys.invalidateAsInternalUser",
+            "type": "Function",
+            "tags": [],
+            "label": "invalidateAsInternalUser",
+            "description": [
+              "\nTries to invalidate the API keys by using the internal user."
+            ],
+            "signature": [
+              "(params: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeys.invalidateAsInternalUser.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [
+                  "The params to invalidate the API keys."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
+                    "text": "InvalidateAPIKeysParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.APIKeysServiceWithContext",
+        "type": "Interface",
+        "tags": [],
+        "label": "APIKeysServiceWithContext",
+        "description": [
+          "\nPublic API Keys service exposed through core context to manage\nAPI keys in Elasticsearch, including creation,\nvalidation, and invalidation of API keys,\nas well as checking the status of API key features."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeysServiceWithContext.areAPIKeysEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "areAPIKeysEnabled",
+            "description": [
+              "\nDetermines if API Keys are enabled in Elasticsearch."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeysServiceWithContext.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [
+              "\nTries to create an API key for the current user.\n\nReturns newly created API key or `null` if API keys are disabled.\n\nUser needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.\n"
+            ],
+            "signature": [
+              "(createParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
+                "text": "CreateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityCreateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeysServiceWithContext.create.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "createParams",
+                "description": [
+                  "The params to create an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
+                    "text": "CreateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeysServiceWithContext.update",
+            "type": "Function",
+            "tags": [],
+            "label": "update",
+            "description": [
+              "\nAttempts update an API key with the provided 'role_descriptors' and 'metadata'\n\nReturns `updated`, `true` if the update was successful, `false` if there was nothing to update\n\nUser needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.\n"
+            ],
+            "signature": [
+              "(updateParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
+                "text": "UpdateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityUpdateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeysServiceWithContext.update.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "updateParams",
+                "description": [
+                  "The params to edit an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
+                    "text": "UpdateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeysServiceWithContext.validate",
+            "type": "Function",
+            "tags": [],
+            "label": "validate",
+            "description": [
+              "\nTries to validate an API key."
+            ],
+            "signature": [
+              "(apiKeyPrams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ValidateAPIKeyParams",
+                "text": "ValidateAPIKeyParams"
+              },
+              ") => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeysServiceWithContext.validate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "apiKeyPrams",
+                "description": [
+                  "ValidateAPIKeyParams."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.ValidateAPIKeyParams",
+                    "text": "ValidateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.APIKeysServiceWithContext.invalidate",
+            "type": "Function",
+            "tags": [],
+            "label": "invalidate",
+            "description": [
+              "\nTries to invalidate an API keys."
+            ],
+            "signature": [
+              "(params: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.APIKeysServiceWithContext.invalidate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [
+                  "The params to invalidate an API keys."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
+                    "text": "InvalidateAPIKeysParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditEvent",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditEvent",
+        "description": [
+          "\nAudit event schema using ECS format: https://www.elastic.co/guide/en/ecs/1.12/index.html\n\nIf you add additional fields to the schema ensure you update the Kibana Filebeat module:\nhttps://github.com/elastic/beats/tree/master/filebeat/module/kibana\n"
+        ],
+        "signature": [
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.AuditEvent",
+            "text": "AuditEvent"
+          },
+          " extends ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMeta",
+            "text": "LogMeta"
+          }
+        ],
+        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditEvent.message",
+            "type": "string",
+            "tags": [],
+            "label": "message",
+            "description": [
+              "\nLog message"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditEvent.kibana",
+            "type": "Object",
+            "tags": [],
+            "label": "kibana",
+            "description": [
+              "\nKibana specific fields"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditKibana",
+                "text": "AuditKibana"
+              },
+              " | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditEvent.http",
+            "type": "Object",
+            "tags": [],
+            "label": "http",
+            "description": [
+              "\nFields describing an HTTP request"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditHttp",
+                "text": "AuditHttp"
+              },
+              " | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditHttp",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditHttp",
+        "description": [
+          "\nAudit http schema using ECS format"
+        ],
+        "signature": [
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.AuditHttp",
+            "text": "AuditHttp"
+          },
+          " extends ",
+          "EcsHttp"
+        ],
+        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditHttp.request",
+            "type": "Object",
+            "tags": [],
+            "label": "request",
+            "description": [
+              "\nHTTP request details"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditRequest",
+                "text": "AuditRequest"
+              },
+              " | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditKibana",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditKibana",
+        "description": [
+          "\nAudit kibana schema using ECS format"
+        ],
+        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.space_id",
+            "type": "string",
+            "tags": [],
+            "label": "space_id",
+            "description": [
+              "\nThe ID of the space associated with this event."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.session_id",
+            "type": "string",
+            "tags": [],
+            "label": "session_id",
+            "description": [
+              "\nThe ID of the user session associated with this event. Each login attempt\nresults in a unique session id."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.saved_object",
+            "type": "Object",
+            "tags": [],
+            "label": "saved_object",
+            "description": [
+              "\nSaved object that was created, changed, deleted or accessed as part of this event."
+            ],
+            "signature": [
+              "{ type: string; id: string; name?: string | undefined; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.authentication_provider",
+            "type": "string",
+            "tags": [],
+            "label": "authentication_provider",
+            "description": [
+              "\nName of authentication provider associated with a login event."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.authentication_type",
+            "type": "string",
+            "tags": [],
+            "label": "authentication_type",
+            "description": [
+              "\nType of authentication provider associated with a login event."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.authentication_realm",
+            "type": "string",
+            "tags": [],
+            "label": "authentication_realm",
+            "description": [
+              "\nName of Elasticsearch realm that has authenticated the user."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.lookup_realm",
+            "type": "string",
+            "tags": [],
+            "label": "lookup_realm",
+            "description": [
+              "\nName of Elasticsearch realm where the user details were retrieved from."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.add_to_spaces",
+            "type": "Object",
+            "tags": [],
+            "label": "add_to_spaces",
+            "description": [
+              "\nSet of space IDs that a saved object was shared to."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.delete_from_spaces",
+            "type": "Object",
+            "tags": [],
+            "label": "delete_from_spaces",
+            "description": [
+              "\nSet of space IDs that a saved object was removed from."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.unauthorized_spaces",
+            "type": "Object",
+            "tags": [],
+            "label": "unauthorized_spaces",
+            "description": [
+              "\nSet of space IDs that are not authorized for an action."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditKibana.unauthorized_types",
+            "type": "Object",
+            "tags": [],
+            "label": "unauthorized_types",
+            "description": [
+              "\nSet of types that are not authorized for an action."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditLogger",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditLogger",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditLogger.log",
+            "type": "Function",
+            "tags": [],
+            "label": "log",
+            "description": [
+              "\nLogs an {@link AuditEvent} and automatically adds meta data about the\ncurrent user, space and correlation id.\n\nGuidelines around what events should be logged and how they should be\nstructured can be found in: `/x-pack/plugins/security/README.md`\n"
+            ],
+            "signature": [
+              "(event: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditEvent",
+                "text": "AuditEvent"
+              },
+              " | undefined) => void"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.AuditLogger.log.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "event",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.AuditEvent",
+                    "text": "AuditEvent"
+                  },
+                  " | undefined"
+                ],
+                "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditLogger.enabled",
+            "type": "boolean",
+            "tags": [],
+            "label": "enabled",
+            "description": [
+              "\nIndicates whether audit logging is enabled or not.\n\nUseful for skipping resource-intense operations that don't need to be performed when audit\nlogging is disabled."
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditRequest",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditRequest",
+        "description": [
+          "\nAudit request schema using ECS format"
+        ],
+        "signature": [
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.AuditRequest",
+            "text": "AuditRequest"
+          },
+          " extends { body?: { bytes?: number | undefined; content?: string | undefined; } | undefined; bytes?: number | undefined; id?: string | undefined; method?: string | undefined; mime_type?: string | undefined; referrer?: string | undefined; }"
+        ],
+        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditRequest.headers",
+            "type": "Object",
+            "tags": [],
+            "label": "headers",
+            "description": [
+              "\nHTTP request headers"
+            ],
+            "signature": [
+              "{ 'x-forwarded-for'?: string | undefined; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuditRequestHandlerContext",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditRequestHandlerContext",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuditRequestHandlerContext.logger",
+            "type": "Object",
+            "tags": [],
+            "label": "logger",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditLogger",
+                "text": "AuditLogger"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.AuthcRequestHandlerContext",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuthcRequestHandlerContext",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuthcRequestHandlerContext.getCurrentUser",
+            "type": "Function",
+            "tags": [],
+            "label": "getCurrentUser",
+            "description": [],
+            "signature": [
+              "() => ",
+              {
+                "pluginId": "@kbn/core-security-common",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityCommonPluginApi",
+                "section": "def-common.AuthenticatedUser",
+                "text": "AuthenticatedUser"
+              },
+              " | null"
+            ],
+            "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.AuthcRequestHandlerContext.apiKeys",
+            "type": "Object",
+            "tags": [],
+            "label": "apiKeys",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.APIKeysServiceWithContext",
+                "text": "APIKeysServiceWithContext"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CoreAuditService",
+        "type": "Interface",
+        "tags": [],
+        "label": "CoreAuditService",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/audit.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreAuditService.asScoped",
+            "type": "Function",
+            "tags": [],
+            "label": "asScoped",
+            "description": [
+              "\nCreates an {@link AuditLogger} scoped to the current request.\n\nThis audit logger logs events with all required user and session info and should be used for\nall user-initiated actions.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>) => ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditLogger",
+                "text": "AuditLogger"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/audit.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.CoreAuditService.asScoped.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/audit.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreAuditService.withoutRequest",
+            "type": "Object",
+            "tags": [],
+            "label": "withoutRequest",
+            "description": [
+              "\n{@link AuditLogger} for background tasks only.\n\nThis audit logger logs events without any user or session info and should never be used to log\nuser-initiated actions.\n"
+            ],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditLogger",
+                "text": "AuditLogger"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/audit.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CoreAuthenticationService",
+        "type": "Interface",
+        "tags": [],
+        "label": "CoreAuthenticationService",
+        "description": [
+          "\nCore's authentication service\n"
+        ],
+        "path": "packages/core/security/core-security-server/src/authc.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreAuthenticationService.getCurrentUser",
+            "type": "Function",
+            "tags": [],
+            "label": "getCurrentUser",
+            "description": [
+              "\nRetrieve the user bound to the provided request, or null if\nno user is authenticated.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>) => ",
+              {
+                "pluginId": "@kbn/core-security-common",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityCommonPluginApi",
+                "section": "def-common.AuthenticatedUser",
+                "text": "AuthenticatedUser"
+              },
+              " | null"
+            ],
+            "path": "packages/core/security/core-security-server/src/authc.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/core-security-server",
+                "id": "def-common.CoreAuthenticationService.getCurrentUser.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "The request to retrieve the authenticated user for."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authc.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreAuthenticationService.apiKeys",
+            "type": "Object",
+            "tags": [],
+            "label": "apiKeys",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.APIKeys",
+                "text": "APIKeys"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/authc.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CoreFipsService",
+        "type": "Interface",
+        "tags": [],
+        "label": "CoreFipsService",
+        "description": [
+          "\nCore's FIPS service\n"
+        ],
+        "path": "packages/core/security/core-security-server/src/fips.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreFipsService.isEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "isEnabled",
+            "description": [
+              "\nCheck if Kibana is configured to run in FIPS mode"
+            ],
+            "signature": [
+              "() => boolean"
+            ],
+            "path": "packages/core/security/core-security-server/src/fips.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CoreSecurityDelegateContract",
         "type": "Interface",
         "tags": [],
-        "label": "AuditEvent",
+        "label": "CoreSecurityDelegateContract",
         "description": [
-          "\nAudit event schema using ECS format: https://www.elastic.co/guide/en/ecs/1.12/index.html\n\nIf you add additional fields to the schema ensure you update the Kibana Filebeat module:\nhttps://github.com/elastic/beats/tree/master/filebeat/module/kibana\n"
+          "\nThe contract exposed by the security provider for Core to\nconsume and re-expose via its security service.\n"
         ],
-        "signature": [
+        "path": "packages/core/security/core-security-server/src/api_provider.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
-            "pluginId": "@kbn/core-security-server",
-            "scope": "common",
-            "docId": "kibKbnCoreSecurityServerPluginApi",
-            "section": "def-common.AuditEvent",
-            "text": "AuditEvent"
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreSecurityDelegateContract.authc",
+            "type": "Object",
+            "tags": [],
+            "label": "authc",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CoreAuthenticationService",
+                "text": "CoreAuthenticationService"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/api_provider.ts",
+            "deprecated": false,
+            "trackAdoption": false
           },
-          " extends ",
           {
-            "pluginId": "@kbn/logging",
-            "scope": "common",
-            "docId": "kibKbnLoggingPluginApi",
-            "section": "def-common.LogMeta",
-            "text": "LogMeta"
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CoreSecurityDelegateContract.audit",
+            "type": "Object",
+            "tags": [],
+            "label": "audit",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CoreAuditService",
+                "text": "CoreAuditService"
+              }
+            ],
+            "path": "packages/core/security/core-security-server/src/api_provider.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
-        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CreateCrossClusterAPIKeyParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "CreateCrossClusterAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditEvent.message",
+            "id": "def-common.CreateCrossClusterAPIKeyParams.type",
             "type": "string",
             "tags": [],
-            "label": "message",
-            "description": [
-              "\nLog message"
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"cross_cluster\""
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditEvent.kibana",
-            "type": "Object",
+            "id": "def-common.CreateCrossClusterAPIKeyParams.expiration",
+            "type": "string",
             "tags": [],
-            "label": "kibana",
-            "description": [
-              "\nKibana specific fields"
-            ],
+            "label": "expiration",
+            "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditKibana",
-                "text": "AuditKibana"
-              },
-              " | undefined"
+              "string | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditEvent.http",
+            "id": "def-common.CreateCrossClusterAPIKeyParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateCrossClusterAPIKeyParams.metadata",
             "type": "Object",
             "tags": [],
-            "label": "http",
-            "description": [
-              "\nFields describing an HTTP request"
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
             ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateCrossClusterAPIKeyParams.access",
+            "type": "Object",
+            "tags": [],
+            "label": "access",
+            "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditHttp",
-                "text": "AuditHttp"
-              },
-              " | undefined"
+              "{ search?: { names: string[]; query?: unknown; field_security?: unknown; allow_restricted_indices?: boolean | undefined; }[] | undefined; replication?: { names: string[]; }[] | undefined; }"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -114,48 +1728,176 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditHttp",
+        "id": "def-common.CreateRestAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "AuditHttp",
-        "description": [
-          "\nAudit http schema using ECS format"
-        ],
-        "signature": [
+        "label": "CreateRestAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
-            "pluginId": "@kbn/core-security-server",
-            "scope": "common",
-            "docId": "kibKbnCoreSecurityServerPluginApi",
-            "section": "def-common.AuditHttp",
-            "text": "AuditHttp"
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
           },
-          " extends ",
-          "EcsHttp"
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyParams.role_descriptors",
+            "type": "Object",
+            "tags": [],
+            "label": "role_descriptors",
+            "description": [],
+            "signature": [
+              "{ [x: string]: { [key: string]: any; }; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
         ],
-        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "CreateRestAPIKeyWithKibanaPrivilegesParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditHttp.request",
+            "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams.metadata",
             "type": "Object",
             "tags": [],
-            "label": "request",
-            "description": [
-              "\nHTTP request details"
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
             ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams.kibana_role_descriptors",
+            "type": "Object",
+            "tags": [],
+            "label": "kibana_role_descriptors",
+            "description": [],
             "signature": [
+              "{ [x: string]: { elasticsearch: ",
               {
                 "pluginId": "@kbn/core-security-server",
                 "scope": "common",
                 "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditRequest",
-                "text": "AuditRequest"
+                "section": "def-common.ElasticsearchPrivilegesType",
+                "text": "ElasticsearchPrivilegesType"
               },
-              " | undefined"
+              " & { [key: string]: unknown; }; kibana: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.KibanaPrivilegesType",
+                "text": "KibanaPrivilegesType"
+              },
+              "; }; }"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -164,266 +1906,214 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditKibana",
+        "id": "def-common.ElasticsearchPrivilegesType",
         "type": "Interface",
         "tags": [],
-        "label": "AuditKibana",
+        "label": "ElasticsearchPrivilegesType",
         "description": [
-          "\nAudit kibana schema using ECS format"
+          "\nType representing Elasticsearch specific portion of the role definition."
         ],
-        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.space_id",
-            "type": "string",
+            "id": "def-common.ElasticsearchPrivilegesType.cluster",
+            "type": "Array",
             "tags": [],
-            "label": "space_id",
-            "description": [
-              "\nThe ID of the space associated with this event."
-            ],
+            "label": "cluster",
+            "description": [],
             "signature": [
-              "string | undefined"
+              "string[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.session_id",
-            "type": "string",
+            "id": "def-common.ElasticsearchPrivilegesType.remote_cluster",
+            "type": "Array",
             "tags": [],
-            "label": "session_id",
-            "description": [
-              "\nThe ID of the user session associated with this event. Each login attempt\nresults in a unique session id."
-            ],
+            "label": "remote_cluster",
+            "description": [],
             "signature": [
-              "string | undefined"
+              "{ privileges: string[]; clusters: string[]; }[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.saved_object",
-            "type": "Object",
+            "id": "def-common.ElasticsearchPrivilegesType.indices",
+            "type": "Array",
             "tags": [],
-            "label": "saved_object",
-            "description": [
-              "\nSaved object that was created, changed, deleted or accessed as part of this event."
-            ],
+            "label": "indices",
+            "description": [],
             "signature": [
-              "{ type: string; id: string; name?: string | undefined; } | undefined"
+              "{ names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.authentication_provider",
-            "type": "string",
+            "id": "def-common.ElasticsearchPrivilegesType.remote_indices",
+            "type": "Array",
             "tags": [],
-            "label": "authentication_provider",
-            "description": [
-              "\nName of authentication provider associated with a login event."
-            ],
+            "label": "remote_indices",
+            "description": [],
             "signature": [
-              "string | undefined"
+              "{ clusters: string[]; names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.authentication_type",
-            "type": "string",
+            "id": "def-common.ElasticsearchPrivilegesType.run_as",
+            "type": "Array",
             "tags": [],
-            "label": "authentication_type",
-            "description": [
-              "\nType of authentication provider associated with a login event."
-            ],
+            "label": "run_as",
+            "description": [],
             "signature": [
-              "string | undefined"
+              "string[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.GrantAPIKeyResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "GrantAPIKeyResult",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.authentication_realm",
+            "id": "def-common.GrantAPIKeyResult.id",
             "type": "string",
             "tags": [],
-            "label": "authentication_realm",
+            "label": "id",
             "description": [
-              "\nName of Elasticsearch realm that has authenticated the user."
-            ],
-            "signature": [
-              "string | undefined"
+              "\nUnique id for this API key"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.lookup_realm",
+            "id": "def-common.GrantAPIKeyResult.name",
             "type": "string",
             "tags": [],
-            "label": "lookup_realm",
+            "label": "name",
             "description": [
-              "\nName of Elasticsearch realm where the user details were retrieved from."
-            ],
-            "signature": [
-              "string | undefined"
+              "\nName for this API key"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.add_to_spaces",
-            "type": "Object",
+            "id": "def-common.GrantAPIKeyResult.api_key",
+            "type": "string",
             "tags": [],
-            "label": "add_to_spaces",
+            "label": "api_key",
             "description": [
-              "\nSet of space IDs that a saved object was shared to."
-            ],
-            "signature": [
-              "readonly string[] | undefined"
+              "\nGenerated API key"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
-          },
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.InvalidateAPIKeyResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "InvalidateAPIKeyResult",
+        "description": [
+          "\nThe return value when invalidating an API key in Elasticsearch."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.delete_from_spaces",
-            "type": "Object",
+            "id": "def-common.InvalidateAPIKeyResult.invalidated_api_keys",
+            "type": "Array",
             "tags": [],
-            "label": "delete_from_spaces",
+            "label": "invalidated_api_keys",
             "description": [
-              "\nSet of space IDs that a saved object was removed from."
+              "\nThe IDs of the API keys that were invalidated as part of the request."
             ],
             "signature": [
-              "readonly string[] | undefined"
+              "string[]"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.unauthorized_spaces",
-            "type": "Object",
+            "id": "def-common.InvalidateAPIKeyResult.previously_invalidated_api_keys",
+            "type": "Array",
             "tags": [],
-            "label": "unauthorized_spaces",
+            "label": "previously_invalidated_api_keys",
             "description": [
-              "\nSet of space IDs that are not authorized for an action."
+              "\nThe IDs of the API keys that were already invalidated."
             ],
             "signature": [
-              "readonly string[] | undefined"
+              "string[]"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditKibana.unauthorized_types",
-            "type": "Object",
+            "id": "def-common.InvalidateAPIKeyResult.error_count",
+            "type": "number",
             "tags": [],
-            "label": "unauthorized_types",
+            "label": "error_count",
             "description": [
-              "\nSet of types that are not authorized for an action."
+              "\nThe number of errors that were encountered when invalidating the API keys."
             ],
-            "signature": [
-              "readonly string[] | undefined"
-            ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditLogger",
-        "type": "Interface",
-        "tags": [],
-        "label": "AuditLogger",
-        "description": [],
-        "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditLogger.log",
-            "type": "Function",
+            "id": "def-common.InvalidateAPIKeyResult.error_details",
+            "type": "Array",
             "tags": [],
-            "label": "log",
+            "label": "error_details",
             "description": [
-              "\nLogs an {@link AuditEvent} and automatically adds meta data about the\ncurrent user, space and correlation id.\n\nGuidelines around what events should be logged and how they should be\nstructured can be found in: `/x-pack/plugins/security/README.md`\n"
+              "\nDetails about these errors. This field is not present in the response when error_count is 0."
             ],
             "signature": [
-              "(event: ",
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditEvent",
-                "text": "AuditEvent"
-              },
-              " | undefined) => void"
-            ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/core-security-server",
-                "id": "def-common.AuditLogger.log.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "event",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-security-server",
-                    "scope": "common",
-                    "docId": "kibKbnCoreSecurityServerPluginApi",
-                    "section": "def-common.AuditEvent",
-                    "text": "AuditEvent"
-                  },
-                  " | undefined"
-                ],
-                "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditLogger.enabled",
-            "type": "boolean",
-            "tags": [],
-            "label": "enabled",
-            "description": [
-              "\nIndicates whether audit logging is enabled or not.\n\nUseful for skipping resource-intense operations that don't need to be performed when audit\nlogging is disabled."
+              "{ type?: string | undefined; reason?: string | undefined; caused_by?: { type?: string | undefined; reason?: string | undefined; } | undefined; }[] | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_logger.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -432,40 +2122,30 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditRequest",
+        "id": "def-common.InvalidateAPIKeysParams",
         "type": "Interface",
         "tags": [],
-        "label": "AuditRequest",
+        "label": "InvalidateAPIKeysParams",
         "description": [
-          "\nAudit request schema using ECS format"
-        ],
-        "signature": [
-          {
-            "pluginId": "@kbn/core-security-server",
-            "scope": "common",
-            "docId": "kibKbnCoreSecurityServerPluginApi",
-            "section": "def-common.AuditRequest",
-            "text": "AuditRequest"
-          },
-          " extends { body?: { bytes?: number | undefined; content?: string | undefined; } | undefined; bytes?: number | undefined; id?: string | undefined; method?: string | undefined; mime_type?: string | undefined; referrer?: string | undefined; }"
+          "\nRepresents the params for invalidating multiple API keys"
         ],
-        "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditRequest.headers",
-            "type": "Object",
+            "id": "def-common.InvalidateAPIKeysParams.ids",
+            "type": "Array",
             "tags": [],
-            "label": "headers",
+            "label": "ids",
             "description": [
-              "\nHTTP request headers"
+              "\nList of unique API key IDs"
             ],
             "signature": [
-              "{ 'x-forwarded-for'?: string | undefined; } | undefined"
+              "string[]"
             ],
-            "path": "packages/core/security/core-security-server/src/audit_logging/audit_events.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -474,10 +2154,10 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuditRequestHandlerContext",
+        "id": "def-common.SecurityRequestHandlerContext",
         "type": "Interface",
         "tags": [],
-        "label": "AuditRequestHandlerContext",
+        "label": "SecurityRequestHandlerContext",
         "description": [],
         "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
         "deprecated": false,
@@ -485,125 +2165,101 @@
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuditRequestHandlerContext.logger",
+            "id": "def-common.SecurityRequestHandlerContext.authc",
             "type": "Object",
             "tags": [],
-            "label": "logger",
+            "label": "authc",
             "description": [],
             "signature": [
               {
                 "pluginId": "@kbn/core-security-server",
                 "scope": "common",
                 "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditLogger",
-                "text": "AuditLogger"
+                "section": "def-common.AuthcRequestHandlerContext",
+                "text": "AuthcRequestHandlerContext"
               }
             ],
             "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.AuthcRequestHandlerContext",
-        "type": "Interface",
-        "tags": [],
-        "label": "AuthcRequestHandlerContext",
-        "description": [],
-        "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.AuthcRequestHandlerContext.getCurrentUser",
-            "type": "Function",
+            "id": "def-common.SecurityRequestHandlerContext.audit",
+            "type": "Object",
             "tags": [],
-            "label": "getCurrentUser",
+            "label": "audit",
             "description": [],
             "signature": [
-              "() => ",
               {
-                "pluginId": "@kbn/core-security-common",
+                "pluginId": "@kbn/core-security-server",
                 "scope": "common",
-                "docId": "kibKbnCoreSecurityCommonPluginApi",
-                "section": "def-common.AuthenticatedUser",
-                "text": "AuthenticatedUser"
-              },
-              " | null"
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.AuditRequestHandlerContext",
+                "text": "AuditRequestHandlerContext"
+              }
             ],
             "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.CoreAuditService",
+        "id": "def-common.SecurityServiceSetup",
         "type": "Interface",
         "tags": [],
-        "label": "CoreAuditService",
-        "description": [],
-        "path": "packages/core/security/core-security-server/src/audit.ts",
+        "label": "SecurityServiceSetup",
+        "description": [
+          "\nSetup contract for Core's security service.\n"
+        ],
+        "path": "packages/core/security/core-security-server/src/contracts.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreAuditService.asScoped",
+            "id": "def-common.SecurityServiceSetup.registerSecurityDelegate",
             "type": "Function",
             "tags": [],
-            "label": "asScoped",
+            "label": "registerSecurityDelegate",
             "description": [
-              "\nCreates an {@link AuditLogger} scoped to the current request.\n\nThis audit logger logs events with all required user and session info and should be used for\nall user-initiated actions.\n"
+              "\nRegister the security implementation that then will be used and re-exposed by Core.\n"
             ],
             "signature": [
-              "(request: ",
-              {
-                "pluginId": "@kbn/core-http-server",
-                "scope": "common",
-                "docId": "kibKbnCoreHttpServerPluginApi",
-                "section": "def-common.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => ",
+              "(api: ",
               {
                 "pluginId": "@kbn/core-security-server",
                 "scope": "common",
                 "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditLogger",
-                "text": "AuditLogger"
-              }
+                "section": "def-common.CoreSecurityDelegateContract",
+                "text": "CoreSecurityDelegateContract"
+              },
+              ") => void"
             ],
-            "path": "packages/core/security/core-security-server/src/audit.ts",
+            "path": "packages/core/security/core-security-server/src/contracts.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
               {
                 "parentPluginId": "@kbn/core-security-server",
-                "id": "def-common.CoreAuditService.asScoped.$1",
+                "id": "def-common.SecurityServiceSetup.registerSecurityDelegate.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "request",
+                "label": "api",
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "@kbn/core-http-server",
+                    "pluginId": "@kbn/core-security-server",
                     "scope": "common",
-                    "docId": "kibKbnCoreHttpServerPluginApi",
-                    "section": "def-common.KibanaRequest",
-                    "text": "KibanaRequest"
-                  },
-                  "<unknown, unknown, unknown, any>"
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CoreSecurityDelegateContract",
+                    "text": "CoreSecurityDelegateContract"
+                  }
                 ],
-                "path": "packages/core/security/core-security-server/src/audit.ts",
+                "path": "packages/core/security/core-security-server/src/contracts.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -613,23 +2269,23 @@
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreAuditService.withoutRequest",
+            "id": "def-common.SecurityServiceSetup.fips",
             "type": "Object",
             "tags": [],
-            "label": "withoutRequest",
+            "label": "fips",
             "description": [
-              "\n{@link AuditLogger} for background tasks only.\n\nThis audit logger logs events without any user or session info and should never be used to log\nuser-initiated actions.\n"
+              "\nThe {@link CoreFipsService | FIPS service}"
             ],
             "signature": [
               {
                 "pluginId": "@kbn/core-security-server",
                 "scope": "common",
                 "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditLogger",
-                "text": "AuditLogger"
+                "section": "def-common.CoreFipsService",
+                "text": "CoreFipsService"
               }
             ],
-            "path": "packages/core/security/core-security-server/src/audit.ts",
+            "path": "packages/core/security/core-security-server/src/contracts.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -638,163 +2294,220 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.CoreAuthenticationService",
+        "id": "def-common.SecurityServiceStart",
         "type": "Interface",
         "tags": [],
-        "label": "CoreAuthenticationService",
+        "label": "SecurityServiceStart",
         "description": [
-          "\nCore's authentication service\n"
+          "\nStart contract for Core's security service.\n"
         ],
-        "path": "packages/core/security/core-security-server/src/authc.ts",
+        "path": "packages/core/security/core-security-server/src/contracts.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreAuthenticationService.getCurrentUser",
-            "type": "Function",
+            "id": "def-common.SecurityServiceStart.authc",
+            "type": "Object",
             "tags": [],
-            "label": "getCurrentUser",
+            "label": "authc",
             "description": [
-              "\nRetrieve the user bound to the provided request, or null if\nno user is authenticated.\n"
+              "\nThe {@link CoreAuthenticationService | authentication service}"
             ],
             "signature": [
-              "(request: ",
-              {
-                "pluginId": "@kbn/core-http-server",
-                "scope": "common",
-                "docId": "kibKbnCoreHttpServerPluginApi",
-                "section": "def-common.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => ",
               {
-                "pluginId": "@kbn/core-security-common",
+                "pluginId": "@kbn/core-security-server",
                 "scope": "common",
-                "docId": "kibKbnCoreSecurityCommonPluginApi",
-                "section": "def-common.AuthenticatedUser",
-                "text": "AuthenticatedUser"
-              },
-              " | null"
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CoreAuthenticationService",
+                "text": "CoreAuthenticationService"
+              }
             ],
-            "path": "packages/core/security/core-security-server/src/authc.ts",
+            "path": "packages/core/security/core-security-server/src/contracts.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.SecurityServiceStart.audit",
+            "type": "Object",
+            "tags": [],
+            "label": "audit",
+            "description": [
+              "\nThe {@link CoreAuditService | audit service}"
+            ],
+            "signature": [
               {
-                "parentPluginId": "@kbn/core-security-server",
-                "id": "def-common.CoreAuthenticationService.getCurrentUser.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "request",
-                "description": [
-                  "The request to retrieve the authenticated user for."
-                ],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-http-server",
-                    "scope": "common",
-                    "docId": "kibKbnCoreHttpServerPluginApi",
-                    "section": "def-common.KibanaRequest",
-                    "text": "KibanaRequest"
-                  },
-                  "<unknown, unknown, unknown, any>"
-                ],
-                "path": "packages/core/security/core-security-server/src/authc.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CoreAuditService",
+                "text": "CoreAuditService"
               }
             ],
-            "returnComment": []
+            "path": "packages/core/security/core-security-server/src/contracts.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.CoreFipsService",
+        "id": "def-common.UpdateCrossClusterAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "CoreFipsService",
-        "description": [
-          "\nCore's FIPS service\n"
-        ],
-        "path": "packages/core/security/core-security-server/src/fips.ts",
+        "label": "UpdateCrossClusterAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreFipsService.isEnabled",
-            "type": "Function",
+            "id": "def-common.UpdateCrossClusterAPIKeyParams.id",
+            "type": "string",
             "tags": [],
-            "label": "isEnabled",
-            "description": [
-              "\nCheck if Kibana is configured to run in FIPS mode"
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateCrossClusterAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"cross_cluster\""
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateCrossClusterAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
             ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateCrossClusterAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
             "signature": [
-              "() => boolean"
+              "{ [key: string]: any; } | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/fips.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateCrossClusterAPIKeyParams.access",
+            "type": "Object",
+            "tags": [],
+            "label": "access",
+            "description": [],
+            "signature": [
+              "{ search?: { names: string[]; query?: unknown; field_security?: unknown; allow_restricted_indices?: boolean | undefined; }[] | undefined; replication?: { names: string[]; }[] | undefined; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.CoreSecurityDelegateContract",
+        "id": "def-common.UpdateRestAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "CoreSecurityDelegateContract",
-        "description": [
-          "\nThe contract exposed by the security provider for Core to\nconsume and re-expose via its security service.\n"
-        ],
-        "path": "packages/core/security/core-security-server/src/api_provider.ts",
+        "label": "UpdateRestAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreSecurityDelegateContract.authc",
+            "id": "def-common.UpdateRestAPIKeyParams.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateRestAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateRestAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateRestAPIKeyParams.role_descriptors",
             "type": "Object",
             "tags": [],
-            "label": "authc",
+            "label": "role_descriptors",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreAuthenticationService",
-                "text": "CoreAuthenticationService"
-              }
+              "{ [x: string]: { [key: string]: unknown; }; }"
             ],
-            "path": "packages/core/security/core-security-server/src/api_provider.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.CoreSecurityDelegateContract.audit",
+            "id": "def-common.UpdateRestAPIKeyParams.metadata",
             "type": "Object",
             "tags": [],
-            "label": "audit",
+            "label": "metadata",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreAuditService",
-                "text": "CoreAuditService"
-              }
+              "{ [key: string]: any; } | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/api_provider.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -803,138 +2516,95 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.SecurityRequestHandlerContext",
+        "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams",
         "type": "Interface",
         "tags": [],
-        "label": "SecurityRequestHandlerContext",
+        "label": "UpdateRestAPIKeyWithKibanaPrivilegesParams",
         "description": [],
-        "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityRequestHandlerContext.authc",
-            "type": "Object",
+            "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams.id",
+            "type": "string",
             "tags": [],
-            "label": "authc",
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/core-security-server",
+            "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuthcRequestHandlerContext",
-                "text": "AuthcRequestHandlerContext"
-              }
+              "\"rest\" | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityRequestHandlerContext.audit",
-            "type": "Object",
+            "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams.expiration",
+            "type": "string",
             "tags": [],
-            "label": "audit",
+            "label": "expiration",
             "description": [],
             "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.AuditRequestHandlerContext",
-                "text": "AuditRequestHandlerContext"
-              }
+              "string | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/request_handler_context.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.SecurityServiceSetup",
-        "type": "Interface",
-        "tags": [],
-        "label": "SecurityServiceSetup",
-        "description": [
-          "\nSetup contract for Core's security service.\n"
-        ],
-        "path": "packages/core/security/core-security-server/src/contracts.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityServiceSetup.registerSecurityDelegate",
-            "type": "Function",
+            "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams.metadata",
+            "type": "Object",
             "tags": [],
-            "label": "registerSecurityDelegate",
-            "description": [
-              "\nRegister the security implementation that then will be used and re-exposed by Core.\n"
-            ],
+            "label": "metadata",
+            "description": [],
             "signature": [
-              "(api: ",
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreSecurityDelegateContract",
-                "text": "CoreSecurityDelegateContract"
-              },
-              ") => void"
+              "{ [key: string]: any; } | undefined"
             ],
-            "path": "packages/core/security/core-security-server/src/contracts.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/core-security-server",
-                "id": "def-common.SecurityServiceSetup.registerSecurityDelegate.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "api",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/core-security-server",
-                    "scope": "common",
-                    "docId": "kibKbnCoreSecurityServerPluginApi",
-                    "section": "def-common.CoreSecurityDelegateContract",
-                    "text": "CoreSecurityDelegateContract"
-                  }
-                ],
-                "path": "packages/core/security/core-security-server/src/contracts.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityServiceSetup.fips",
+            "id": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams.kibana_role_descriptors",
             "type": "Object",
             "tags": [],
-            "label": "fips",
-            "description": [
-              "\nThe {@link CoreFipsService | FIPS service}"
-            ],
+            "label": "kibana_role_descriptors",
+            "description": [],
             "signature": [
+              "{ [x: string]: { elasticsearch: ",
               {
                 "pluginId": "@kbn/core-security-server",
                 "scope": "common",
                 "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreFipsService",
-                "text": "CoreFipsService"
-              }
+                "section": "def-common.ElasticsearchPrivilegesType",
+                "text": "ElasticsearchPrivilegesType"
+              },
+              " & { [key: string]: unknown; }; kibana: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.KibanaPrivilegesType",
+                "text": "KibanaPrivilegesType"
+              },
+              "; }; }"
             ],
-            "path": "packages/core/security/core-security-server/src/contracts.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -943,58 +2613,40 @@
       },
       {
         "parentPluginId": "@kbn/core-security-server",
-        "id": "def-common.SecurityServiceStart",
+        "id": "def-common.ValidateAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "SecurityServiceStart",
+        "label": "ValidateAPIKeyParams",
         "description": [
-          "\nStart contract for Core's security service.\n"
+          "\nRepresents the parameters for validating API Key credentials."
         ],
-        "path": "packages/core/security/core-security-server/src/contracts.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityServiceStart.authc",
-            "type": "Object",
+            "id": "def-common.ValidateAPIKeyParams.id",
+            "type": "string",
             "tags": [],
-            "label": "authc",
+            "label": "id",
             "description": [
-              "\nThe {@link CoreAuthenticationService | authentication service}"
-            ],
-            "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreAuthenticationService",
-                "text": "CoreAuthenticationService"
-              }
+              "\nUnique id for this API key"
             ],
-            "path": "packages/core/security/core-security-server/src/contracts.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/core-security-server",
-            "id": "def-common.SecurityServiceStart.audit",
-            "type": "Object",
+            "id": "def-common.ValidateAPIKeyParams.api_key",
+            "type": "string",
             "tags": [],
-            "label": "audit",
+            "label": "api_key",
             "description": [
-              "\nThe {@link CoreAuditService | audit service}"
-            ],
-            "signature": [
-              {
-                "pluginId": "@kbn/core-security-server",
-                "scope": "common",
-                "docId": "kibKbnCoreSecurityServerPluginApi",
-                "section": "def-common.CoreAuditService",
-                "text": "CoreAuditService"
-              }
+              "\nGenerated API Key (secret)"
             ],
-            "path": "packages/core/security/core-security-server/src/contracts.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -1045,6 +2697,133 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CreateAPIKeyParams",
+        "type": "Type",
+        "tags": [],
+        "label": "CreateAPIKeyParams",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyParams",
+            "text": "CreateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateCrossClusterAPIKeyParams",
+            "text": "CreateCrossClusterAPIKeyParams"
+          }
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.CreateAPIKeyResult",
+        "type": "Type",
+        "tags": [],
+        "label": "CreateAPIKeyResult",
+        "description": [
+          "\nResponse of Kibana Create API key endpoint."
+        ],
+        "signature": [
+          "SecurityCreateApiKeyResponse"
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.KibanaPrivilegesType",
+        "type": "Type",
+        "tags": [],
+        "label": "KibanaPrivilegesType",
+        "description": [
+          "\nType representing Kibana specific portion of the role definition."
+        ],
+        "signature": [
+          "{ spaces: string[]; base?: string[] | undefined; feature?: Record<string, string[]> | undefined; }[]"
+        ],
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.UpdateAPIKeyParams",
+        "type": "Type",
+        "tags": [],
+        "label": "UpdateAPIKeyParams",
+        "description": [
+          "\nRequest body of Kibana Update API key endpoint."
+        ],
+        "signature": [
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyParams",
+            "text": "UpdateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateCrossClusterAPIKeyParams",
+            "text": "UpdateCrossClusterAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "UpdateRestAPIKeyWithKibanaPrivilegesParams"
+          }
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/core-security-server",
+        "id": "def-common.UpdateAPIKeyResult",
+        "type": "Type",
+        "tags": [],
+        "label": "UpdateAPIKeyResult",
+        "description": [
+          "\nResponse of Kibana Update API key endpoint."
+        ],
+        "signature": [
+          "SecurityUpdateApiKeyResponse"
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": []
diff --git a/api_docs/kbn_core_security_server.mdx b/api_docs/kbn_core_security_server.mdx
index e729f9f52e314..4139bf1eae324 100644
--- a/api_docs/kbn_core_security_server.mdx
+++ b/api_docs/kbn_core_security_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server
 title: "@kbn/core-security-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server']
 ---
 import kbnCoreSecurityServerObj from './kbn_core_security_server.devdocs.json';
@@ -21,10 +21,13 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 52 | 0 | 16 | 0 |
+| 146 | 1 | 63 | 0 |
 
 ## Common
 
+### Functions
+<DocDefinitionList data={kbnCoreSecurityServerObj.common.functions}/>
+
 ### Interfaces
 <DocDefinitionList data={kbnCoreSecurityServerObj.common.interfaces}/>
 
diff --git a/api_docs/kbn_core_security_server_internal.mdx b/api_docs/kbn_core_security_server_internal.mdx
index f7eb563902da3..9c7ad2035ccb2 100644
--- a/api_docs/kbn_core_security_server_internal.mdx
+++ b/api_docs/kbn_core_security_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-internal
 title: "@kbn/core-security-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-internal']
 ---
 import kbnCoreSecurityServerInternalObj from './kbn_core_security_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_security_server_mocks.devdocs.json b/api_docs/kbn_core_security_server_mocks.devdocs.json
index b9910d935968b..686b62e5af8fc 100644
--- a/api_docs/kbn_core_security_server_mocks.devdocs.json
+++ b/api_docs/kbn_core_security_server_mocks.devdocs.json
@@ -90,6 +90,44 @@
       }
     ],
     "objects": [
+      {
+        "parentPluginId": "@kbn/core-security-server-mocks",
+        "id": "def-common.apiKeysMock",
+        "type": "Object",
+        "tags": [],
+        "label": "apiKeysMock",
+        "description": [],
+        "path": "packages/core/security/core-security-server-mocks/src/api_keys.mock.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/core-security-server-mocks",
+            "id": "def-common.apiKeysMock.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [],
+            "signature": [
+              "() => jest.MockedObjectDeep<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.APIKeys",
+                "text": "APIKeys"
+              },
+              ">"
+            ],
+            "path": "packages/core/security/core-security-server-mocks/src/api_keys.mock.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/core-security-server-mocks",
         "id": "def-common.auditLoggerMock",
diff --git a/api_docs/kbn_core_security_server_mocks.mdx b/api_docs/kbn_core_security_server_mocks.mdx
index 7c4e8bdaf6a34..209c495677293 100644
--- a/api_docs/kbn_core_security_server_mocks.mdx
+++ b/api_docs/kbn_core_security_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-security-server-mocks
 title: "@kbn/core-security-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-security-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-security-server-mocks']
 ---
 import kbnCoreSecurityServerMocksObj from './kbn_core_security_server_mocks.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 13 | 0 | 13 | 2 |
+| 15 | 0 | 15 | 2 |
 
 ## Common
 
diff --git a/api_docs/kbn_core_status_common.mdx b/api_docs/kbn_core_status_common.mdx
index 94d811e90ba74..fb31caf120bb0 100644
--- a/api_docs/kbn_core_status_common.mdx
+++ b/api_docs/kbn_core_status_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common
 title: "@kbn/core-status-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common']
 ---
 import kbnCoreStatusCommonObj from './kbn_core_status_common.devdocs.json';
diff --git a/api_docs/kbn_core_status_common_internal.mdx b/api_docs/kbn_core_status_common_internal.mdx
index 7c24950586dcc..3565faa7654ca 100644
--- a/api_docs/kbn_core_status_common_internal.mdx
+++ b/api_docs/kbn_core_status_common_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-common-internal
 title: "@kbn/core-status-common-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-common-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-common-internal']
 ---
 import kbnCoreStatusCommonInternalObj from './kbn_core_status_common_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server.mdx b/api_docs/kbn_core_status_server.mdx
index 1f0093e2561d4..39250a7ba184f 100644
--- a/api_docs/kbn_core_status_server.mdx
+++ b/api_docs/kbn_core_status_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server
 title: "@kbn/core-status-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server']
 ---
 import kbnCoreStatusServerObj from './kbn_core_status_server.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_internal.mdx b/api_docs/kbn_core_status_server_internal.mdx
index 41c0c5279bf9c..ae5a55848a0ae 100644
--- a/api_docs/kbn_core_status_server_internal.mdx
+++ b/api_docs/kbn_core_status_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-internal
 title: "@kbn/core-status-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-internal']
 ---
 import kbnCoreStatusServerInternalObj from './kbn_core_status_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_status_server_mocks.mdx b/api_docs/kbn_core_status_server_mocks.mdx
index 4777ddfe711eb..063abbf6f8ce1 100644
--- a/api_docs/kbn_core_status_server_mocks.mdx
+++ b/api_docs/kbn_core_status_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-status-server-mocks
 title: "@kbn/core-status-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-status-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-status-server-mocks']
 ---
 import kbnCoreStatusServerMocksObj from './kbn_core_status_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
index 591980e5254c4..2a96726373e10 100644
--- a/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
+++ b/api_docs/kbn_core_test_helpers_deprecations_getters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-deprecations-getters
 title: "@kbn/core-test-helpers-deprecations-getters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-deprecations-getters plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-deprecations-getters']
 ---
 import kbnCoreTestHelpersDeprecationsGettersObj from './kbn_core_test_helpers_deprecations_getters.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
index 84122a889e229..359518c3074b2 100644
--- a/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
+++ b/api_docs/kbn_core_test_helpers_http_setup_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-http-setup-browser
 title: "@kbn/core-test-helpers-http-setup-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-http-setup-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-http-setup-browser']
 ---
 import kbnCoreTestHelpersHttpSetupBrowserObj from './kbn_core_test_helpers_http_setup_browser.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_kbn_server.mdx b/api_docs/kbn_core_test_helpers_kbn_server.mdx
index a5cad061f959e..e6fbc69fc4b33 100644
--- a/api_docs/kbn_core_test_helpers_kbn_server.mdx
+++ b/api_docs/kbn_core_test_helpers_kbn_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-kbn-server
 title: "@kbn/core-test-helpers-kbn-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-kbn-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-kbn-server']
 ---
 import kbnCoreTestHelpersKbnServerObj from './kbn_core_test_helpers_kbn_server.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_model_versions.mdx b/api_docs/kbn_core_test_helpers_model_versions.mdx
index bc29ce7ffecbe..f99f8627deeca 100644
--- a/api_docs/kbn_core_test_helpers_model_versions.mdx
+++ b/api_docs/kbn_core_test_helpers_model_versions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-model-versions
 title: "@kbn/core-test-helpers-model-versions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-model-versions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-model-versions']
 ---
 import kbnCoreTestHelpersModelVersionsObj from './kbn_core_test_helpers_model_versions.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
index 4dceb5861ab49..c34d787a163f2 100644
--- a/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
+++ b/api_docs/kbn_core_test_helpers_so_type_serializer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-so-type-serializer
 title: "@kbn/core-test-helpers-so-type-serializer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-so-type-serializer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-so-type-serializer']
 ---
 import kbnCoreTestHelpersSoTypeSerializerObj from './kbn_core_test_helpers_so_type_serializer.devdocs.json';
diff --git a/api_docs/kbn_core_test_helpers_test_utils.mdx b/api_docs/kbn_core_test_helpers_test_utils.mdx
index 13b07110dbe4b..65001a51b1d16 100644
--- a/api_docs/kbn_core_test_helpers_test_utils.mdx
+++ b/api_docs/kbn_core_test_helpers_test_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-test-helpers-test-utils
 title: "@kbn/core-test-helpers-test-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-test-helpers-test-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-test-helpers-test-utils']
 ---
 import kbnCoreTestHelpersTestUtilsObj from './kbn_core_test_helpers_test_utils.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser.mdx b/api_docs/kbn_core_theme_browser.mdx
index 01ebb462ca4ab..4142b15b2d9db 100644
--- a/api_docs/kbn_core_theme_browser.mdx
+++ b/api_docs/kbn_core_theme_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser
 title: "@kbn/core-theme-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser']
 ---
 import kbnCoreThemeBrowserObj from './kbn_core_theme_browser.devdocs.json';
diff --git a/api_docs/kbn_core_theme_browser_mocks.mdx b/api_docs/kbn_core_theme_browser_mocks.mdx
index 15466105466b1..b0e6352eb09e9 100644
--- a/api_docs/kbn_core_theme_browser_mocks.mdx
+++ b/api_docs/kbn_core_theme_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-theme-browser-mocks
 title: "@kbn/core-theme-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-theme-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-theme-browser-mocks']
 ---
 import kbnCoreThemeBrowserMocksObj from './kbn_core_theme_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser.mdx b/api_docs/kbn_core_ui_settings_browser.mdx
index 9884cab812daa..07976f5268389 100644
--- a/api_docs/kbn_core_ui_settings_browser.mdx
+++ b/api_docs/kbn_core_ui_settings_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser
 title: "@kbn/core-ui-settings-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser']
 ---
 import kbnCoreUiSettingsBrowserObj from './kbn_core_ui_settings_browser.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_internal.mdx b/api_docs/kbn_core_ui_settings_browser_internal.mdx
index e1ec8f4e2d892..8403f8135adca 100644
--- a/api_docs/kbn_core_ui_settings_browser_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-internal
 title: "@kbn/core-ui-settings-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-internal']
 ---
 import kbnCoreUiSettingsBrowserInternalObj from './kbn_core_ui_settings_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_browser_mocks.mdx b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
index 2603428a344ce..dcd06080ded9f 100644
--- a/api_docs/kbn_core_ui_settings_browser_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-browser-mocks
 title: "@kbn/core-ui-settings-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-browser-mocks']
 ---
 import kbnCoreUiSettingsBrowserMocksObj from './kbn_core_ui_settings_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_common.mdx b/api_docs/kbn_core_ui_settings_common.mdx
index b37d365a0b718..383884d29aa2e 100644
--- a/api_docs/kbn_core_ui_settings_common.mdx
+++ b/api_docs/kbn_core_ui_settings_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-common
 title: "@kbn/core-ui-settings-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-common']
 ---
 import kbnCoreUiSettingsCommonObj from './kbn_core_ui_settings_common.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server.mdx b/api_docs/kbn_core_ui_settings_server.mdx
index e2e2c0eec22a8..c0a1d101ad8c1 100644
--- a/api_docs/kbn_core_ui_settings_server.mdx
+++ b/api_docs/kbn_core_ui_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server
 title: "@kbn/core-ui-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server']
 ---
 import kbnCoreUiSettingsServerObj from './kbn_core_ui_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_internal.mdx b/api_docs/kbn_core_ui_settings_server_internal.mdx
index 5c6790d3f8644..f4d7730da2efb 100644
--- a/api_docs/kbn_core_ui_settings_server_internal.mdx
+++ b/api_docs/kbn_core_ui_settings_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-internal
 title: "@kbn/core-ui-settings-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-internal']
 ---
 import kbnCoreUiSettingsServerInternalObj from './kbn_core_ui_settings_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_ui_settings_server_mocks.mdx b/api_docs/kbn_core_ui_settings_server_mocks.mdx
index 7cb2b5817e90b..b6445e6ef9a56 100644
--- a/api_docs/kbn_core_ui_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_ui_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-ui-settings-server-mocks
 title: "@kbn/core-ui-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-ui-settings-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-ui-settings-server-mocks']
 ---
 import kbnCoreUiSettingsServerMocksObj from './kbn_core_ui_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server.mdx b/api_docs/kbn_core_usage_data_server.mdx
index 9beb50d12fc73..158a04ff11bc2 100644
--- a/api_docs/kbn_core_usage_data_server.mdx
+++ b/api_docs/kbn_core_usage_data_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server
 title: "@kbn/core-usage-data-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server']
 ---
 import kbnCoreUsageDataServerObj from './kbn_core_usage_data_server.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_internal.mdx b/api_docs/kbn_core_usage_data_server_internal.mdx
index 6d02ecd973803..a6833cfb987d6 100644
--- a/api_docs/kbn_core_usage_data_server_internal.mdx
+++ b/api_docs/kbn_core_usage_data_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-internal
 title: "@kbn/core-usage-data-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-internal']
 ---
 import kbnCoreUsageDataServerInternalObj from './kbn_core_usage_data_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_usage_data_server_mocks.mdx b/api_docs/kbn_core_usage_data_server_mocks.mdx
index 52d469b7344a7..f878721b6fe12 100644
--- a/api_docs/kbn_core_usage_data_server_mocks.mdx
+++ b/api_docs/kbn_core_usage_data_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-usage-data-server-mocks
 title: "@kbn/core-usage-data-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-usage-data-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-usage-data-server-mocks']
 ---
 import kbnCoreUsageDataServerMocksObj from './kbn_core_usage_data_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser.mdx b/api_docs/kbn_core_user_profile_browser.mdx
index 13fc386f8b20d..f2e6bc1e5f05d 100644
--- a/api_docs/kbn_core_user_profile_browser.mdx
+++ b/api_docs/kbn_core_user_profile_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser
 title: "@kbn/core-user-profile-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser']
 ---
 import kbnCoreUserProfileBrowserObj from './kbn_core_user_profile_browser.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser_internal.mdx b/api_docs/kbn_core_user_profile_browser_internal.mdx
index 8e69c6a18e447..fe9361ab89076 100644
--- a/api_docs/kbn_core_user_profile_browser_internal.mdx
+++ b/api_docs/kbn_core_user_profile_browser_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser-internal
 title: "@kbn/core-user-profile-browser-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser-internal']
 ---
 import kbnCoreUserProfileBrowserInternalObj from './kbn_core_user_profile_browser_internal.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_browser_mocks.mdx b/api_docs/kbn_core_user_profile_browser_mocks.mdx
index 4cb7228e7ba3c..3231c90c05c5d 100644
--- a/api_docs/kbn_core_user_profile_browser_mocks.mdx
+++ b/api_docs/kbn_core_user_profile_browser_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-browser-mocks
 title: "@kbn/core-user-profile-browser-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-browser-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-browser-mocks']
 ---
 import kbnCoreUserProfileBrowserMocksObj from './kbn_core_user_profile_browser_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_common.mdx b/api_docs/kbn_core_user_profile_common.mdx
index 36895083829a3..322cae4dfa77c 100644
--- a/api_docs/kbn_core_user_profile_common.mdx
+++ b/api_docs/kbn_core_user_profile_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-common
 title: "@kbn/core-user-profile-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-common']
 ---
 import kbnCoreUserProfileCommonObj from './kbn_core_user_profile_common.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server.mdx b/api_docs/kbn_core_user_profile_server.mdx
index 31efa53412ecf..efe307180e83a 100644
--- a/api_docs/kbn_core_user_profile_server.mdx
+++ b/api_docs/kbn_core_user_profile_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server
 title: "@kbn/core-user-profile-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server']
 ---
 import kbnCoreUserProfileServerObj from './kbn_core_user_profile_server.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server_internal.mdx b/api_docs/kbn_core_user_profile_server_internal.mdx
index a4af1347dcbdf..e55bf0b83222d 100644
--- a/api_docs/kbn_core_user_profile_server_internal.mdx
+++ b/api_docs/kbn_core_user_profile_server_internal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server-internal
 title: "@kbn/core-user-profile-server-internal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server-internal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server-internal']
 ---
 import kbnCoreUserProfileServerInternalObj from './kbn_core_user_profile_server_internal.devdocs.json';
diff --git a/api_docs/kbn_core_user_profile_server_mocks.mdx b/api_docs/kbn_core_user_profile_server_mocks.mdx
index c580396871c78..ad5a069dc7c95 100644
--- a/api_docs/kbn_core_user_profile_server_mocks.mdx
+++ b/api_docs/kbn_core_user_profile_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-profile-server-mocks
 title: "@kbn/core-user-profile-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-profile-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-profile-server-mocks']
 ---
 import kbnCoreUserProfileServerMocksObj from './kbn_core_user_profile_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server.mdx b/api_docs/kbn_core_user_settings_server.mdx
index e6520a108e061..bf9468e73fcf9 100644
--- a/api_docs/kbn_core_user_settings_server.mdx
+++ b/api_docs/kbn_core_user_settings_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server
 title: "@kbn/core-user-settings-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server']
 ---
 import kbnCoreUserSettingsServerObj from './kbn_core_user_settings_server.devdocs.json';
diff --git a/api_docs/kbn_core_user_settings_server_mocks.mdx b/api_docs/kbn_core_user_settings_server_mocks.mdx
index 2590924c0c29d..ff3adf35317d2 100644
--- a/api_docs/kbn_core_user_settings_server_mocks.mdx
+++ b/api_docs/kbn_core_user_settings_server_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-core-user-settings-server-mocks
 title: "@kbn/core-user-settings-server-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/core-user-settings-server-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/core-user-settings-server-mocks']
 ---
 import kbnCoreUserSettingsServerMocksObj from './kbn_core_user_settings_server_mocks.devdocs.json';
diff --git a/api_docs/kbn_crypto.mdx b/api_docs/kbn_crypto.mdx
index c9207cad137a2..b4d26872b24e0 100644
--- a/api_docs/kbn_crypto.mdx
+++ b/api_docs/kbn_crypto.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto
 title: "@kbn/crypto"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto']
 ---
 import kbnCryptoObj from './kbn_crypto.devdocs.json';
diff --git a/api_docs/kbn_crypto_browser.mdx b/api_docs/kbn_crypto_browser.mdx
index 58ddbdb08f508..9a8c74e3bd723 100644
--- a/api_docs/kbn_crypto_browser.mdx
+++ b/api_docs/kbn_crypto_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-crypto-browser
 title: "@kbn/crypto-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/crypto-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/crypto-browser']
 ---
 import kbnCryptoBrowserObj from './kbn_crypto_browser.devdocs.json';
diff --git a/api_docs/kbn_custom_icons.mdx b/api_docs/kbn_custom_icons.mdx
index 6494698dbc112..2b03ad087184f 100644
--- a/api_docs/kbn_custom_icons.mdx
+++ b/api_docs/kbn_custom_icons.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-icons
 title: "@kbn/custom-icons"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-icons plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-icons']
 ---
 import kbnCustomIconsObj from './kbn_custom_icons.devdocs.json';
diff --git a/api_docs/kbn_custom_integrations.mdx b/api_docs/kbn_custom_integrations.mdx
index b3e0d7ea63ed7..d01d7fe32e132 100644
--- a/api_docs/kbn_custom_integrations.mdx
+++ b/api_docs/kbn_custom_integrations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-custom-integrations
 title: "@kbn/custom-integrations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/custom-integrations plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/custom-integrations']
 ---
 import kbnCustomIntegrationsObj from './kbn_custom_integrations.devdocs.json';
diff --git a/api_docs/kbn_cypress_config.mdx b/api_docs/kbn_cypress_config.mdx
index 08b84e310d557..4daf1d3c445ff 100644
--- a/api_docs/kbn_cypress_config.mdx
+++ b/api_docs/kbn_cypress_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-cypress-config
 title: "@kbn/cypress-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/cypress-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/cypress-config']
 ---
 import kbnCypressConfigObj from './kbn_cypress_config.devdocs.json';
diff --git a/api_docs/kbn_data_forge.mdx b/api_docs/kbn_data_forge.mdx
index f5e689706d2f9..cf52fa6c3a80e 100644
--- a/api_docs/kbn_data_forge.mdx
+++ b/api_docs/kbn_data_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-forge
 title: "@kbn/data-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-forge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-forge']
 ---
 import kbnDataForgeObj from './kbn_data_forge.devdocs.json';
diff --git a/api_docs/kbn_data_service.mdx b/api_docs/kbn_data_service.mdx
index 450d1e27aadc2..b55dbe1104ec4 100644
--- a/api_docs/kbn_data_service.mdx
+++ b/api_docs/kbn_data_service.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-service
 title: "@kbn/data-service"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-service plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-service']
 ---
 import kbnDataServiceObj from './kbn_data_service.devdocs.json';
diff --git a/api_docs/kbn_data_stream_adapter.mdx b/api_docs/kbn_data_stream_adapter.mdx
index 4ba2da1295d7c..8776bd84a8a67 100644
--- a/api_docs/kbn_data_stream_adapter.mdx
+++ b/api_docs/kbn_data_stream_adapter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-stream-adapter
 title: "@kbn/data-stream-adapter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-stream-adapter plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-stream-adapter']
 ---
 import kbnDataStreamAdapterObj from './kbn_data_stream_adapter.devdocs.json';
diff --git a/api_docs/kbn_data_view_utils.devdocs.json b/api_docs/kbn_data_view_utils.devdocs.json
index bbef9faf79cd5..c1b48a5d1f3b4 100644
--- a/api_docs/kbn_data_view_utils.devdocs.json
+++ b/api_docs/kbn_data_view_utils.devdocs.json
@@ -19,6 +19,62 @@
   "common": {
     "classes": [],
     "functions": [
+      {
+        "parentPluginId": "@kbn/data-view-utils",
+        "id": "def-common.convertDatatableColumnToDataViewFieldSpec",
+        "type": "Function",
+        "tags": [],
+        "label": "convertDatatableColumnToDataViewFieldSpec",
+        "description": [
+          "\nConvert a datatable column to a DataViewFieldSpec"
+        ],
+        "signature": [
+          "(column: ",
+          {
+            "pluginId": "expressions",
+            "scope": "common",
+            "docId": "kibExpressionsPluginApi",
+            "section": "def-common.DatatableColumn",
+            "text": "DatatableColumn"
+          },
+          ") => ",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.FieldSpec",
+            "text": "FieldSpec"
+          }
+        ],
+        "path": "packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/data-view-utils",
+            "id": "def-common.convertDatatableColumnToDataViewFieldSpec.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "column",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "expressions",
+                "scope": "common",
+                "docId": "kibExpressionsPluginApi",
+                "section": "def-common.DatatableColumn",
+                "text": "DatatableColumn"
+              }
+            ],
+            "path": "packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/data-view-utils",
         "id": "def-common.createRegExpPatternFrom",
diff --git a/api_docs/kbn_data_view_utils.mdx b/api_docs/kbn_data_view_utils.mdx
index abff26dd8777e..37a08519c657c 100644
--- a/api_docs/kbn_data_view_utils.mdx
+++ b/api_docs/kbn_data_view_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-data-view-utils
 title: "@kbn/data-view-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/data-view-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/data-view-utils']
 ---
 import kbnDataViewUtilsObj from './kbn_data_view_utils.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 5 | 0 | 4 | 0 |
+| 7 | 0 | 5 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_datemath.devdocs.json b/api_docs/kbn_datemath.devdocs.json
index 71d5b783708c0..dd5303cfd095e 100644
--- a/api_docs/kbn_datemath.devdocs.json
+++ b/api_docs/kbn_datemath.devdocs.json
@@ -200,7 +200,7 @@
         "label": "UnitsMap",
         "description": [],
         "signature": [
-          "{ m: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; y: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; M: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; w: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; d: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; h: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; s: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; ms: { weight: number; type: \"fixed\" | \"calendar\" | \"mixed\"; base: number; }; }"
+          "{ m: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; y: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; M: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; w: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; d: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; h: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; s: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; ms: { weight: number; type: \"fixed\" | \"mixed\" | \"calendar\"; base: number; }; }"
         ],
         "path": "packages/kbn-datemath/index.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_datemath.mdx b/api_docs/kbn_datemath.mdx
index 3b3347cf1c0dd..7f94ca1b6c62f 100644
--- a/api_docs/kbn_datemath.mdx
+++ b/api_docs/kbn_datemath.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-datemath
 title: "@kbn/datemath"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/datemath plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/datemath']
 ---
 import kbnDatemathObj from './kbn_datemath.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_analytics.mdx b/api_docs/kbn_deeplinks_analytics.mdx
index 07eb21343d8b7..690ee52302f83 100644
--- a/api_docs/kbn_deeplinks_analytics.mdx
+++ b/api_docs/kbn_deeplinks_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-analytics
 title: "@kbn/deeplinks-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-analytics plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-analytics']
 ---
 import kbnDeeplinksAnalyticsObj from './kbn_deeplinks_analytics.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_devtools.mdx b/api_docs/kbn_deeplinks_devtools.mdx
index 7421cd3c8553e..d9ff350331076 100644
--- a/api_docs/kbn_deeplinks_devtools.mdx
+++ b/api_docs/kbn_deeplinks_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-devtools
 title: "@kbn/deeplinks-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-devtools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-devtools']
 ---
 import kbnDeeplinksDevtoolsObj from './kbn_deeplinks_devtools.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_fleet.mdx b/api_docs/kbn_deeplinks_fleet.mdx
index 8302e2e922c34..01616f8aa7939 100644
--- a/api_docs/kbn_deeplinks_fleet.mdx
+++ b/api_docs/kbn_deeplinks_fleet.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-fleet
 title: "@kbn/deeplinks-fleet"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-fleet plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-fleet']
 ---
 import kbnDeeplinksFleetObj from './kbn_deeplinks_fleet.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_management.devdocs.json b/api_docs/kbn_deeplinks_management.devdocs.json
index c4b7d9dd33259..4a7d7e3992fd5 100644
--- a/api_docs/kbn_deeplinks_management.devdocs.json
+++ b/api_docs/kbn_deeplinks_management.devdocs.json
@@ -45,7 +45,7 @@
         "label": "DeepLinkId",
         "description": [],
         "signature": [
-          "\"fleet\" | \"monitoring\" | \"management\" | \"integrations\" | \"osquery\" | \"management:transform\" | \"management:watcher\" | \"management:cases\" | \"management:tags\" | \"management:maintenanceWindows\" | \"management:settings\" | \"management:dataViews\" | \"management:spaces\" | \"management:users\" | \"management:migrate_data\" | \"management:search_sessions\" | \"management:data_quality\" | \"management:filesManagement\" | \"management:roles\" | \"management:reporting\" | \"management:aiAssistantManagementSelection\" | \"management:securityAiAssistantManagement\" | \"management:observabilityAiAssistantManagement\" | \"management:api_keys\" | \"management:cross_cluster_replication\" | \"management:license_management\" | \"management:index_lifecycle_management\" | \"management:index_management\" | \"management:ingest_pipelines\" | \"management:jobsListLink\" | \"management:objects\" | \"management:pipelines\" | \"management:remote_clusters\" | \"management:role_mappings\" | \"management:rollup_jobs\" | \"management:snapshot_restore\" | \"management:triggersActions\" | \"management:triggersActionsConnectors\" | \"management:upgrade_assistant\""
+          "\"fleet\" | \"monitoring\" | \"management\" | \"integrations\" | \"osquery\" | \"management:transform\" | \"management:watcher\" | \"management:cases\" | \"management:tags\" | \"management:maintenanceWindows\" | \"management:dataViews\" | \"management:spaces\" | \"management:settings\" | \"management:users\" | \"management:migrate_data\" | \"management:search_sessions\" | \"management:data_quality\" | \"management:filesManagement\" | \"management:roles\" | \"management:reporting\" | \"management:aiAssistantManagementSelection\" | \"management:securityAiAssistantManagement\" | \"management:observabilityAiAssistantManagement\" | \"management:api_keys\" | \"management:cross_cluster_replication\" | \"management:license_management\" | \"management:index_lifecycle_management\" | \"management:index_management\" | \"management:ingest_pipelines\" | \"management:jobsListLink\" | \"management:objects\" | \"management:pipelines\" | \"management:remote_clusters\" | \"management:role_mappings\" | \"management:rollup_jobs\" | \"management:snapshot_restore\" | \"management:triggersActions\" | \"management:triggersActionsConnectors\" | \"management:upgrade_assistant\""
         ],
         "path": "packages/deeplinks/management/deep_links.ts",
         "deprecated": false,
@@ -60,7 +60,7 @@
         "label": "LinkId",
         "description": [],
         "signature": [
-          "\"transform\" | \"watcher\" | \"cases\" | \"tags\" | \"maintenanceWindows\" | \"settings\" | \"dataViews\" | \"spaces\" | \"users\" | \"migrate_data\" | \"search_sessions\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"aiAssistantManagementSelection\" | \"securityAiAssistantManagement\" | \"observabilityAiAssistantManagement\" | \"api_keys\" | \"cross_cluster_replication\" | \"license_management\" | \"index_lifecycle_management\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"remote_clusters\" | \"role_mappings\" | \"rollup_jobs\" | \"snapshot_restore\" | \"triggersActions\" | \"triggersActionsConnectors\" | \"upgrade_assistant\""
+          "\"transform\" | \"watcher\" | \"cases\" | \"tags\" | \"maintenanceWindows\" | \"dataViews\" | \"spaces\" | \"settings\" | \"users\" | \"migrate_data\" | \"search_sessions\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"aiAssistantManagementSelection\" | \"securityAiAssistantManagement\" | \"observabilityAiAssistantManagement\" | \"api_keys\" | \"cross_cluster_replication\" | \"license_management\" | \"index_lifecycle_management\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"remote_clusters\" | \"role_mappings\" | \"rollup_jobs\" | \"snapshot_restore\" | \"triggersActions\" | \"triggersActionsConnectors\" | \"upgrade_assistant\""
         ],
         "path": "packages/deeplinks/management/deep_links.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_deeplinks_management.mdx b/api_docs/kbn_deeplinks_management.mdx
index 131331d7a6f52..9f109f9ac8e27 100644
--- a/api_docs/kbn_deeplinks_management.mdx
+++ b/api_docs/kbn_deeplinks_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-management
 title: "@kbn/deeplinks-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-management plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-management']
 ---
 import kbnDeeplinksManagementObj from './kbn_deeplinks_management.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_ml.mdx b/api_docs/kbn_deeplinks_ml.mdx
index 09181dd34288a..c7b45bac65b78 100644
--- a/api_docs/kbn_deeplinks_ml.mdx
+++ b/api_docs/kbn_deeplinks_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-ml
 title: "@kbn/deeplinks-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-ml plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-ml']
 ---
 import kbnDeeplinksMlObj from './kbn_deeplinks_ml.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_observability.devdocs.json b/api_docs/kbn_deeplinks_observability.devdocs.json
index b69b1bdad957c..3b151a497e3c5 100644
--- a/api_docs/kbn_deeplinks_observability.devdocs.json
+++ b/api_docs/kbn_deeplinks_observability.devdocs.json
@@ -22,18 +22,18 @@
     "interfaces": [
       {
         "parentPluginId": "@kbn/deeplinks-observability",
-        "id": "def-common.DatasetQualityLocatorParams",
+        "id": "def-common.DataQualityLocatorParams",
         "type": "Interface",
         "tags": [],
-        "label": "DatasetQualityLocatorParams",
+        "label": "DataQualityLocatorParams",
         "description": [],
         "signature": [
           {
             "pluginId": "@kbn/deeplinks-observability",
             "scope": "common",
             "docId": "kibKbnDeeplinksObservabilityPluginApi",
-            "section": "def-common.DatasetQualityLocatorParams",
-            "text": "DatasetQualityLocatorParams"
+            "section": "def-common.DataQualityLocatorParams",
+            "text": "DataQualityLocatorParams"
           },
           " extends ",
           {
@@ -50,7 +50,7 @@
         "children": [
           {
             "parentPluginId": "@kbn/deeplinks-observability",
-            "id": "def-common.DatasetQualityLocatorParams.filters",
+            "id": "def-common.DataQualityLocatorParams.filters",
             "type": "Object",
             "tags": [],
             "label": "filters",
@@ -61,6 +61,20 @@
             "path": "packages/deeplinks/observability/locators/dataset_quality.ts",
             "deprecated": false,
             "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.DataQualityLocatorParams.flyout",
+            "type": "Object",
+            "tags": [],
+            "label": "flyout",
+            "description": [],
+            "signature": [
+              "{ dataset: DatasetConfig; } | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/dataset_quality.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -514,6 +528,166 @@
           }
         ],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/deeplinks-observability",
+        "id": "def-common.UptimeOverviewLocatorInfraParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "UptimeOverviewLocatorInfraParams",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/deeplinks-observability",
+            "scope": "common",
+            "docId": "kibKbnDeeplinksObservabilityPluginApi",
+            "section": "def-common.UptimeOverviewLocatorInfraParams",
+            "text": "UptimeOverviewLocatorInfraParams"
+          },
+          " extends ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.SerializableRecord",
+            "text": "SerializableRecord"
+          }
+        ],
+        "path": "packages/deeplinks/observability/locators/uptime.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorInfraParams.ip",
+            "type": "string",
+            "tags": [],
+            "label": "ip",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorInfraParams.host",
+            "type": "string",
+            "tags": [],
+            "label": "host",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorInfraParams.container",
+            "type": "string",
+            "tags": [],
+            "label": "container",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorInfraParams.pod",
+            "type": "string",
+            "tags": [],
+            "label": "pod",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/deeplinks-observability",
+        "id": "def-common.UptimeOverviewLocatorParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "UptimeOverviewLocatorParams",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/deeplinks-observability",
+            "scope": "common",
+            "docId": "kibKbnDeeplinksObservabilityPluginApi",
+            "section": "def-common.UptimeOverviewLocatorParams",
+            "text": "UptimeOverviewLocatorParams"
+          },
+          " extends ",
+          {
+            "pluginId": "@kbn/utility-types",
+            "scope": "common",
+            "docId": "kibKbnUtilityTypesPluginApi",
+            "section": "def-common.SerializableRecord",
+            "text": "SerializableRecord"
+          }
+        ],
+        "path": "packages/deeplinks/observability/locators/uptime.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorParams.dateRangeStart",
+            "type": "string",
+            "tags": [],
+            "label": "dateRangeStart",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorParams.dateRangeEnd",
+            "type": "string",
+            "tags": [],
+            "label": "dateRangeEnd",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/deeplinks-observability",
+            "id": "def-common.UptimeOverviewLocatorParams.search",
+            "type": "string",
+            "tags": [],
+            "label": "search",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/deeplinks/observability/locators/uptime.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
       }
     ],
     "enums": [],
@@ -594,13 +768,13 @@
       },
       {
         "parentPluginId": "@kbn/deeplinks-observability",
-        "id": "def-common.DATASET_QUALITY_LOCATOR_ID",
+        "id": "def-common.DATA_QUALITY_LOCATOR_ID",
         "type": "string",
         "tags": [],
-        "label": "DATASET_QUALITY_LOCATOR_ID",
+        "label": "DATA_QUALITY_LOCATOR_ID",
         "description": [],
         "signature": [
-          "\"DATASET_QUALITY_LOCATOR\""
+          "\"DATA_QUALITY_LOCATOR\""
         ],
         "path": "packages/deeplinks/observability/locators/dataset_quality.ts",
         "deprecated": false,
@@ -919,6 +1093,21 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/deeplinks-observability",
+        "id": "def-common.uptimeOverviewLocatorID",
+        "type": "string",
+        "tags": [],
+        "label": "uptimeOverviewLocatorID",
+        "description": [],
+        "signature": [
+          "\"UPTIME_OVERVIEW_LOCATOR\""
+        ],
+        "path": "packages/deeplinks/observability/locators/uptime.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ],
     "objects": []
diff --git a/api_docs/kbn_deeplinks_observability.mdx b/api_docs/kbn_deeplinks_observability.mdx
index ac984b80fe854..a9b981ef63b99 100644
--- a/api_docs/kbn_deeplinks_observability.mdx
+++ b/api_docs/kbn_deeplinks_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-observability
 title: "@kbn/deeplinks-observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-observability plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-observability']
 ---
 import kbnDeeplinksObservabilityObj from './kbn_deeplinks_observability.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 45 | 0 | 33 | 0 |
+| 56 | 0 | 44 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_deeplinks_search.devdocs.json b/api_docs/kbn_deeplinks_search.devdocs.json
index 312aad5a35d80..d3659c3bf083c 100644
--- a/api_docs/kbn_deeplinks_search.devdocs.json
+++ b/api_docs/kbn_deeplinks_search.devdocs.json
@@ -30,7 +30,7 @@
         "label": "DeepLinkId",
         "description": [],
         "signature": [
-          "\"appSearch\" | \"enterpriseSearch\" | \"enterpriseSearchContent\" | \"enterpriseSearchApplications\" | \"enterpriseSearchAnalytics\" | \"workplaceSearch\" | \"serverlessElasticsearch\" | \"serverlessConnectors\" | \"searchPlayground\" | \"searchInferenceEndpoints\" | \"searchHomepage\" | \"enterpriseSearchContent:connectors\" | \"enterpriseSearchContent:searchIndices\" | \"enterpriseSearchContent:webCrawlers\" | \"enterpriseSearchApplications:searchApplications\" | \"enterpriseSearchApplications:playground\" | \"appSearch:engines\""
+          "\"appSearch\" | \"enterpriseSearch\" | \"enterpriseSearchContent\" | \"enterpriseSearchApplications\" | \"enterpriseSearchRelevance\" | \"enterpriseSearchAnalytics\" | \"workplaceSearch\" | \"serverlessElasticsearch\" | \"serverlessConnectors\" | \"searchPlayground\" | \"searchInferenceEndpoints\" | \"searchHomepage\" | \"enterpriseSearchContent:connectors\" | \"enterpriseSearchContent:searchIndices\" | \"enterpriseSearchContent:webCrawlers\" | \"enterpriseSearchApplications:searchApplications\" | \"enterpriseSearchApplications:playground\" | \"appSearch:engines\" | \"enterpriseSearchRelevance:inferenceEndpoints\""
         ],
         "path": "packages/deeplinks/search/deep_links.ts",
         "deprecated": false,
@@ -114,13 +114,13 @@
       },
       {
         "parentPluginId": "@kbn/deeplinks-search",
-        "id": "def-common.ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID",
+        "id": "def-common.ENTERPRISE_SEARCH_RELEVANCE_APP_ID",
         "type": "string",
         "tags": [],
-        "label": "ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID",
+        "label": "ENTERPRISE_SEARCH_RELEVANCE_APP_ID",
         "description": [],
         "signature": [
-          "\"enterpriseSearchInferenceEndpoints\""
+          "\"enterpriseSearchRelevance\""
         ],
         "path": "packages/deeplinks/search/constants.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_deeplinks_search.mdx b/api_docs/kbn_deeplinks_search.mdx
index 036266ce738e8..7632d8c3d8574 100644
--- a/api_docs/kbn_deeplinks_search.mdx
+++ b/api_docs/kbn_deeplinks_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-search
 title: "@kbn/deeplinks-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-search plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-search']
 ---
 import kbnDeeplinksSearchObj from './kbn_deeplinks_search.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_security.mdx b/api_docs/kbn_deeplinks_security.mdx
index 3ed04e94438f6..53f462a5820e4 100644
--- a/api_docs/kbn_deeplinks_security.mdx
+++ b/api_docs/kbn_deeplinks_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-security
 title: "@kbn/deeplinks-security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-security plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-security']
 ---
 import kbnDeeplinksSecurityObj from './kbn_deeplinks_security.devdocs.json';
diff --git a/api_docs/kbn_deeplinks_shared.mdx b/api_docs/kbn_deeplinks_shared.mdx
index 2a7a079e70947..45f26f34c0bc8 100644
--- a/api_docs/kbn_deeplinks_shared.mdx
+++ b/api_docs/kbn_deeplinks_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-deeplinks-shared
 title: "@kbn/deeplinks-shared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/deeplinks-shared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/deeplinks-shared']
 ---
 import kbnDeeplinksSharedObj from './kbn_deeplinks_shared.devdocs.json';
diff --git a/api_docs/kbn_default_nav_analytics.mdx b/api_docs/kbn_default_nav_analytics.mdx
index 2a955bdd9590d..077cf495c42a0 100644
--- a/api_docs/kbn_default_nav_analytics.mdx
+++ b/api_docs/kbn_default_nav_analytics.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-analytics
 title: "@kbn/default-nav-analytics"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-analytics plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-analytics']
 ---
 import kbnDefaultNavAnalyticsObj from './kbn_default_nav_analytics.devdocs.json';
diff --git a/api_docs/kbn_default_nav_devtools.mdx b/api_docs/kbn_default_nav_devtools.mdx
index 8c52d0973c5d2..9b9c2ec67217a 100644
--- a/api_docs/kbn_default_nav_devtools.mdx
+++ b/api_docs/kbn_default_nav_devtools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-devtools
 title: "@kbn/default-nav-devtools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-devtools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-devtools']
 ---
 import kbnDefaultNavDevtoolsObj from './kbn_default_nav_devtools.devdocs.json';
diff --git a/api_docs/kbn_default_nav_management.mdx b/api_docs/kbn_default_nav_management.mdx
index 35869c2d6c35e..01e11369c69c6 100644
--- a/api_docs/kbn_default_nav_management.mdx
+++ b/api_docs/kbn_default_nav_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-management
 title: "@kbn/default-nav-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-management plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-management']
 ---
 import kbnDefaultNavManagementObj from './kbn_default_nav_management.devdocs.json';
diff --git a/api_docs/kbn_default_nav_ml.mdx b/api_docs/kbn_default_nav_ml.mdx
index c6081004286e8..314ad13865b67 100644
--- a/api_docs/kbn_default_nav_ml.mdx
+++ b/api_docs/kbn_default_nav_ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-default-nav-ml
 title: "@kbn/default-nav-ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/default-nav-ml plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/default-nav-ml']
 ---
 import kbnDefaultNavMlObj from './kbn_default_nav_ml.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_errors.mdx b/api_docs/kbn_dev_cli_errors.mdx
index 767159ccf2e5f..53fd62dbd5207 100644
--- a/api_docs/kbn_dev_cli_errors.mdx
+++ b/api_docs/kbn_dev_cli_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-errors
 title: "@kbn/dev-cli-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-errors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-errors']
 ---
 import kbnDevCliErrorsObj from './kbn_dev_cli_errors.devdocs.json';
diff --git a/api_docs/kbn_dev_cli_runner.mdx b/api_docs/kbn_dev_cli_runner.mdx
index 71374e71863aa..adc46e7bed4bf 100644
--- a/api_docs/kbn_dev_cli_runner.mdx
+++ b/api_docs/kbn_dev_cli_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-cli-runner
 title: "@kbn/dev-cli-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-cli-runner plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-cli-runner']
 ---
 import kbnDevCliRunnerObj from './kbn_dev_cli_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_proc_runner.mdx b/api_docs/kbn_dev_proc_runner.mdx
index 29fb9a8bdaf0a..80dc1d84a3bcb 100644
--- a/api_docs/kbn_dev_proc_runner.mdx
+++ b/api_docs/kbn_dev_proc_runner.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-proc-runner
 title: "@kbn/dev-proc-runner"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-proc-runner plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-proc-runner']
 ---
 import kbnDevProcRunnerObj from './kbn_dev_proc_runner.devdocs.json';
diff --git a/api_docs/kbn_dev_utils.mdx b/api_docs/kbn_dev_utils.mdx
index 5c9b58e39fb80..6f8c66c500644 100644
--- a/api_docs/kbn_dev_utils.mdx
+++ b/api_docs/kbn_dev_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dev-utils
 title: "@kbn/dev-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dev-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dev-utils']
 ---
 import kbnDevUtilsObj from './kbn_dev_utils.devdocs.json';
diff --git a/api_docs/kbn_discover_utils.mdx b/api_docs/kbn_discover_utils.mdx
index df15394ec10cf..1013d41512685 100644
--- a/api_docs/kbn_discover_utils.mdx
+++ b/api_docs/kbn_discover_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-discover-utils
 title: "@kbn/discover-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/discover-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/discover-utils']
 ---
 import kbnDiscoverUtilsObj from './kbn_discover_utils.devdocs.json';
diff --git a/api_docs/kbn_doc_links.devdocs.json b/api_docs/kbn_doc_links.devdocs.json
index ab331022baa0b..f852d7ecbf732 100644
--- a/api_docs/kbn_doc_links.devdocs.json
+++ b/api_docs/kbn_doc_links.devdocs.json
@@ -546,7 +546,7 @@
             "label": "securitySolution",
             "description": [],
             "signature": [
-              "{ readonly artifactControl: string; readonly trustedApps: string; readonly eventFilters: string; readonly blocklist: string; readonly endpointArtifacts: string; readonly policyResponseTroubleshooting: { full_disk_access: string; macos_system_ext: string; linux_deadlock: string; }; readonly packageActionTroubleshooting: { es_connection: string; }; readonly threatIntelInt: string; readonly responseActions: string; readonly configureEndpointIntegrationPolicy: string; readonly exceptions: { value_lists: string; }; readonly privileges: string; readonly manageDetectionRules: string; readonly createDetectionRules: string; readonly createEsqlRuleType: string; readonly ruleUiAdvancedParams: string; readonly entityAnalytics: { readonly riskScorePrerequisites: string; readonly hostRiskScore: string; readonly userRiskScore: string; readonly entityRiskScoring: string; readonly assetCriticality: string; }; readonly detectionEngineOverview: string; }"
+              "{ readonly artifactControl: string; readonly avcResults: string; readonly trustedApps: string; readonly eventFilters: string; readonly blocklist: string; readonly endpointArtifacts: string; readonly policyResponseTroubleshooting: { full_disk_access: string; macos_system_ext: string; linux_deadlock: string; }; readonly packageActionTroubleshooting: { es_connection: string; }; readonly threatIntelInt: string; readonly responseActions: string; readonly configureEndpointIntegrationPolicy: string; readonly exceptions: { value_lists: string; }; readonly privileges: string; readonly manageDetectionRules: string; readonly createDetectionRules: string; readonly createEsqlRuleType: string; readonly ruleUiAdvancedParams: string; readonly entityAnalytics: { readonly riskScorePrerequisites: string; readonly hostRiskScore: string; readonly userRiskScore: string; readonly entityRiskScoring: string; readonly assetCriticality: string; }; readonly detectionEngineOverview: string; }"
             ],
             "path": "packages/kbn-doc-links/src/types.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_doc_links.mdx b/api_docs/kbn_doc_links.mdx
index 590eb9d6ce74b..817bd3ade599a 100644
--- a/api_docs/kbn_doc_links.mdx
+++ b/api_docs/kbn_doc_links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-doc-links
 title: "@kbn/doc-links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/doc-links plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/doc-links']
 ---
 import kbnDocLinksObj from './kbn_doc_links.devdocs.json';
diff --git a/api_docs/kbn_docs_utils.mdx b/api_docs/kbn_docs_utils.mdx
index c276d865b1fd1..a6e7f866d5c2a 100644
--- a/api_docs/kbn_docs_utils.mdx
+++ b/api_docs/kbn_docs_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-docs-utils
 title: "@kbn/docs-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/docs-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/docs-utils']
 ---
 import kbnDocsUtilsObj from './kbn_docs_utils.devdocs.json';
diff --git a/api_docs/kbn_dom_drag_drop.mdx b/api_docs/kbn_dom_drag_drop.mdx
index e62932c513072..992cd44203b59 100644
--- a/api_docs/kbn_dom_drag_drop.mdx
+++ b/api_docs/kbn_dom_drag_drop.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-dom-drag-drop
 title: "@kbn/dom-drag-drop"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/dom-drag-drop plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/dom-drag-drop']
 ---
 import kbnDomDragDropObj from './kbn_dom_drag_drop.devdocs.json';
diff --git a/api_docs/kbn_ebt.devdocs.json b/api_docs/kbn_ebt.devdocs.json
index 1c5899d553ac4..018b79baf453f 100644
--- a/api_docs/kbn_ebt.devdocs.json
+++ b/api_docs/kbn_ebt.devdocs.json
@@ -2418,6 +2418,10 @@
                 "plugin": "actions",
                 "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
               },
+              {
+                "plugin": "actions",
+                "path": "x-pack/plugins/actions/server/lib/action_executor.test.ts"
+              },
               {
                 "plugin": "@kbn/core-analytics-browser-internal",
                 "path": "packages/core/analytics/core-analytics-browser-internal/src/analytics_service.test.mocks.ts"
diff --git a/api_docs/kbn_ebt.mdx b/api_docs/kbn_ebt.mdx
index 36baf746095d1..e3cc19e3f4e11 100644
--- a/api_docs/kbn_ebt.mdx
+++ b/api_docs/kbn_ebt.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt
 title: "@kbn/ebt"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt']
 ---
 import kbnEbtObj from './kbn_ebt.devdocs.json';
diff --git a/api_docs/kbn_ebt_tools.mdx b/api_docs/kbn_ebt_tools.mdx
index 3e18cfac2dc22..3e947e8b7de85 100644
--- a/api_docs/kbn_ebt_tools.mdx
+++ b/api_docs/kbn_ebt_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ebt-tools
 title: "@kbn/ebt-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ebt-tools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ebt-tools']
 ---
 import kbnEbtToolsObj from './kbn_ebt_tools.devdocs.json';
diff --git a/api_docs/kbn_ecs_data_quality_dashboard.mdx b/api_docs/kbn_ecs_data_quality_dashboard.mdx
index adb48638d82d9..422beff42fcd3 100644
--- a/api_docs/kbn_ecs_data_quality_dashboard.mdx
+++ b/api_docs/kbn_ecs_data_quality_dashboard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ecs-data-quality-dashboard
 title: "@kbn/ecs-data-quality-dashboard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ecs-data-quality-dashboard plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ecs-data-quality-dashboard']
 ---
 import kbnEcsDataQualityDashboardObj from './kbn_ecs_data_quality_dashboard.devdocs.json';
diff --git a/api_docs/kbn_elastic_agent_utils.mdx b/api_docs/kbn_elastic_agent_utils.mdx
index 0d14951c4cc0e..2f88ec0fca74b 100644
--- a/api_docs/kbn_elastic_agent_utils.mdx
+++ b/api_docs/kbn_elastic_agent_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-agent-utils
 title: "@kbn/elastic-agent-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-agent-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-agent-utils']
 ---
 import kbnElasticAgentUtilsObj from './kbn_elastic_agent_utils.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant.mdx b/api_docs/kbn_elastic_assistant.mdx
index 31c67756716f5..036f02873ccbf 100644
--- a/api_docs/kbn_elastic_assistant.mdx
+++ b/api_docs/kbn_elastic_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant
 title: "@kbn/elastic-assistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant']
 ---
 import kbnElasticAssistantObj from './kbn_elastic_assistant.devdocs.json';
diff --git a/api_docs/kbn_elastic_assistant_common.mdx b/api_docs/kbn_elastic_assistant_common.mdx
index 3d5fa3e461285..283289cb1b986 100644
--- a/api_docs/kbn_elastic_assistant_common.mdx
+++ b/api_docs/kbn_elastic_assistant_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-elastic-assistant-common
 title: "@kbn/elastic-assistant-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/elastic-assistant-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/elastic-assistant-common']
 ---
 import kbnElasticAssistantCommonObj from './kbn_elastic_assistant_common.devdocs.json';
diff --git a/api_docs/kbn_entities_schema.devdocs.json b/api_docs/kbn_entities_schema.devdocs.json
index 8df1c3650456f..bcb6b2ff87c2b 100644
--- a/api_docs/kbn_entities_schema.devdocs.json
+++ b/api_docs/kbn_entities_schema.devdocs.json
@@ -43,7 +43,7 @@
         "label": "EntityDefinition",
         "description": [],
         "signature": [
-          "{ id: string; type: string; name: string; history: { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; managed: boolean; indexPatterns: string[]; identityFields: ({ field: string; optional: boolean; } | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: ({ source: string; destination?: string | undefined; limit?: number | undefined; } | { source: string; destination: string; limit: number; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
+          "{ id: string; type: string; version: string; name: string; history: { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; managed: boolean; indexPatterns: string[]; identityFields: ({ field: string; optional: boolean; } | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: ({ source: string; destination?: string | undefined; limit?: number | undefined; } | { source: string; destination: string; limit: number; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
           {
             "pluginId": "@kbn/entities-schema",
             "scope": "common",
@@ -221,7 +221,7 @@
         "label": "entityDefinitionSchema",
         "description": [],
         "signature": [
-          "Zod.ZodObject<{ id: Zod.ZodString; name: Zod.ZodString; description: Zod.ZodOptional<Zod.ZodString>; type: Zod.ZodString; filter: Zod.ZodOptional<Zod.ZodString>; indexPatterns: Zod.ZodArray<Zod.ZodString, \"many\">; identityFields: Zod.ZodArray<Zod.ZodUnion<[Zod.ZodObject<{ field: Zod.ZodString; optional: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { field: string; optional: boolean; }, { field: string; optional: boolean; }>, Zod.ZodEffects<Zod.ZodString, { field: string; optional: boolean; }, string>]>, \"many\">; displayNameTemplate: Zod.ZodString; metadata: Zod.ZodOptional<Zod.ZodArray<Zod.ZodUnion<[Zod.ZodObject<{ source: Zod.ZodString; destination: Zod.ZodOptional<Zod.ZodString>; limit: Zod.ZodOptional<Zod.ZodDefault<Zod.ZodNumber>>; }, \"strip\", Zod.ZodTypeAny, { source: string; destination?: string | undefined; limit?: number | undefined; }, { source: string; destination?: string | undefined; limit?: number | undefined; }>, Zod.ZodEffects<Zod.ZodString, { source: string; destination: string; limit: number; }, string>]>, \"many\">>; metrics: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ name: Zod.ZodString; metrics: Zod.ZodArray<Zod.ZodDiscriminatedUnion<\"aggregation\", [Zod.ZodObject<{ name: Zod.ZodString; aggregation: Zod.ZodNativeEnum<typeof ",
+          "Zod.ZodObject<{ id: Zod.ZodString; version: Zod.ZodEffects<Zod.ZodString, string, string>; name: Zod.ZodString; description: Zod.ZodOptional<Zod.ZodString>; type: Zod.ZodString; filter: Zod.ZodOptional<Zod.ZodString>; indexPatterns: Zod.ZodArray<Zod.ZodString, \"many\">; identityFields: Zod.ZodArray<Zod.ZodUnion<[Zod.ZodObject<{ field: Zod.ZodString; optional: Zod.ZodBoolean; }, \"strip\", Zod.ZodTypeAny, { field: string; optional: boolean; }, { field: string; optional: boolean; }>, Zod.ZodEffects<Zod.ZodString, { field: string; optional: boolean; }, string>]>, \"many\">; displayNameTemplate: Zod.ZodString; metadata: Zod.ZodOptional<Zod.ZodArray<Zod.ZodUnion<[Zod.ZodObject<{ source: Zod.ZodString; destination: Zod.ZodOptional<Zod.ZodString>; limit: Zod.ZodOptional<Zod.ZodDefault<Zod.ZodNumber>>; }, \"strip\", Zod.ZodTypeAny, { source: string; destination?: string | undefined; limit?: number | undefined; }, { source: string; destination?: string | undefined; limit?: number | undefined; }>, Zod.ZodEffects<Zod.ZodString, { source: string; destination: string; limit: number; }, string>]>, \"many\">>; metrics: Zod.ZodOptional<Zod.ZodArray<Zod.ZodObject<{ name: Zod.ZodString; metrics: Zod.ZodArray<Zod.ZodDiscriminatedUnion<\"aggregation\", [Zod.ZodObject<{ name: Zod.ZodString; aggregation: Zod.ZodNativeEnum<typeof ",
           {
             "pluginId": "@kbn/entities-schema",
             "scope": "common",
@@ -261,7 +261,7 @@
             "section": "def-common.BasicAggregations",
             "text": "BasicAggregations"
           },
-          "; filter?: string | undefined; } | { name: string; aggregation: \"doc_count\"; filter?: string | undefined; } | { name: string; field: string; percentile: number; aggregation: \"percentile\"; filter?: string | undefined; })[]; equation: string; }>, \"many\">>; staticFields: Zod.ZodOptional<Zod.ZodRecord<Zod.ZodString, Zod.ZodString>>; managed: Zod.ZodDefault<Zod.ZodOptional<Zod.ZodBoolean>>; history: Zod.ZodObject<{ timestampField: Zod.ZodString; interval: Zod.ZodEffects<Zod.ZodEffects<Zod.ZodString, moment.Duration, string>, moment.Duration, string>; lookbackPeriod: Zod.ZodOptional<Zod.ZodEffects<Zod.ZodString, moment.Duration, string>>; settings: Zod.ZodOptional<Zod.ZodObject<{ syncField: Zod.ZodOptional<Zod.ZodString>; syncDelay: Zod.ZodOptional<Zod.ZodString>; frequency: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }, { interval: string; timestampField: string; lookbackPeriod?: string | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }>; latest: Zod.ZodOptional<Zod.ZodObject<{ settings: Zod.ZodOptional<Zod.ZodObject<{ syncField: Zod.ZodOptional<Zod.ZodString>; syncDelay: Zod.ZodOptional<Zod.ZodString>; frequency: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }, { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { id: string; type: string; name: string; history: { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; managed: boolean; indexPatterns: string[]; identityFields: ({ field: string; optional: boolean; } | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: ({ source: string; destination?: string | undefined; limit?: number | undefined; } | { source: string; destination: string; limit: number; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
+          "; filter?: string | undefined; } | { name: string; aggregation: \"doc_count\"; filter?: string | undefined; } | { name: string; field: string; percentile: number; aggregation: \"percentile\"; filter?: string | undefined; })[]; equation: string; }>, \"many\">>; staticFields: Zod.ZodOptional<Zod.ZodRecord<Zod.ZodString, Zod.ZodString>>; managed: Zod.ZodDefault<Zod.ZodOptional<Zod.ZodBoolean>>; history: Zod.ZodObject<{ timestampField: Zod.ZodString; interval: Zod.ZodEffects<Zod.ZodEffects<Zod.ZodString, moment.Duration, string>, moment.Duration, string>; lookbackPeriod: Zod.ZodOptional<Zod.ZodEffects<Zod.ZodString, moment.Duration, string>>; settings: Zod.ZodOptional<Zod.ZodObject<{ syncField: Zod.ZodOptional<Zod.ZodString>; syncDelay: Zod.ZodOptional<Zod.ZodString>; frequency: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }, { interval: string; timestampField: string; lookbackPeriod?: string | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }>; latest: Zod.ZodOptional<Zod.ZodObject<{ settings: Zod.ZodOptional<Zod.ZodObject<{ syncField: Zod.ZodOptional<Zod.ZodString>; syncDelay: Zod.ZodOptional<Zod.ZodString>; frequency: Zod.ZodOptional<Zod.ZodString>; }, \"strip\", Zod.ZodTypeAny, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }, { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }, { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }>>; }, \"strip\", Zod.ZodTypeAny, { id: string; type: string; version: string; name: string; history: { interval: moment.Duration; timestampField: string; lookbackPeriod?: moment.Duration | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; managed: boolean; indexPatterns: string[]; identityFields: ({ field: string; optional: boolean; } | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: ({ source: string; destination?: string | undefined; limit?: number | undefined; } | { source: string; destination: string; limit: number; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
           {
             "pluginId": "@kbn/entities-schema",
             "scope": "common",
@@ -269,7 +269,7 @@
             "section": "def-common.BasicAggregations",
             "text": "BasicAggregations"
           },
-          "; filter?: string | undefined; } | { name: string; aggregation: \"doc_count\"; filter?: string | undefined; } | { name: string; field: string; percentile: number; aggregation: \"percentile\"; filter?: string | undefined; })[]; equation: string; }[] | undefined; staticFields?: Record<string, string> | undefined; latest?: { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; } | undefined; }, { id: string; type: string; name: string; history: { interval: string; timestampField: string; lookbackPeriod?: string | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; indexPatterns: string[]; identityFields: (string | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: (string | { source: string; destination?: string | undefined; limit?: number | undefined; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
+          "; filter?: string | undefined; } | { name: string; aggregation: \"doc_count\"; filter?: string | undefined; } | { name: string; field: string; percentile: number; aggregation: \"percentile\"; filter?: string | undefined; })[]; equation: string; }[] | undefined; staticFields?: Record<string, string> | undefined; latest?: { settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; } | undefined; }, { id: string; type: string; version: string; name: string; history: { interval: string; timestampField: string; lookbackPeriod?: string | undefined; settings?: { syncField?: string | undefined; syncDelay?: string | undefined; frequency?: string | undefined; } | undefined; }; indexPatterns: string[]; identityFields: (string | { field: string; optional: boolean; })[]; displayNameTemplate: string; description?: string | undefined; filter?: string | undefined; metadata?: (string | { source: string; destination?: string | undefined; limit?: number | undefined; })[] | undefined; metrics?: { name: string; metrics: ({ name: string; field: string; aggregation: ",
           {
             "pluginId": "@kbn/entities-schema",
             "scope": "common",
@@ -292,7 +292,7 @@
         "label": "entityHistorySchema",
         "description": [],
         "signature": [
-          "Zod.ZodIntersection<Zod.ZodObject<{ entity: Zod.ZodObject<{ id: Zod.ZodString; identityFields: Zod.ZodArray<Zod.ZodString, \"many\">; displayName: Zod.ZodString; spaceId: Zod.ZodString; metrics: Zod.ZodRecord<Zod.ZodString, Zod.ZodNumber>; }, \"strip\", Zod.ZodTypeAny, { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }, { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }>; \"@timestamp\": Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { \"@timestamp\": string; entity: { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; }, { \"@timestamp\": string; entity: { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; }>, Zod.ZodRecord<Zod.ZodString, Zod.ZodUnion<[Zod.ZodString, Zod.ZodNumber]>>>"
+          "Zod.ZodIntersection<Zod.ZodObject<{ entity: Zod.ZodObject<{ id: Zod.ZodString; identityFields: Zod.ZodArray<Zod.ZodString, \"many\">; displayName: Zod.ZodString; metrics: Zod.ZodRecord<Zod.ZodString, Zod.ZodNumber>; }, \"strip\", Zod.ZodTypeAny, { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }, { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }>; \"@timestamp\": Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { \"@timestamp\": string; entity: { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; }, { \"@timestamp\": string; entity: { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; }>, Zod.ZodRecord<Zod.ZodString, Zod.ZodUnion<[Zod.ZodString, Zod.ZodNumber]>>>"
         ],
         "path": "x-pack/packages/kbn-entities-schema/src/schema/entity.ts",
         "deprecated": false,
@@ -307,7 +307,7 @@
         "label": "entitySummarySchema",
         "description": [],
         "signature": [
-          "Zod.ZodIntersection<Zod.ZodObject<{ entity: Zod.ZodObject<{ id: Zod.ZodString; identityFields: Zod.ZodArray<Zod.ZodString, \"many\">; displayName: Zod.ZodString; spaceId: Zod.ZodString; metrics: Zod.ZodRecord<Zod.ZodString, Zod.ZodNumber>; }, \"strip\", Zod.ZodTypeAny, { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }, { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }>; lastSeenTimestamp: Zod.ZodString; firstSeenTimestamp: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { entity: { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; lastSeenTimestamp: string; firstSeenTimestamp: string; }, { entity: { id: string; spaceId: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; lastSeenTimestamp: string; firstSeenTimestamp: string; }>, Zod.ZodRecord<Zod.ZodString, Zod.ZodUnion<[Zod.ZodString, Zod.ZodNumber]>>>"
+          "Zod.ZodIntersection<Zod.ZodObject<{ entity: Zod.ZodObject<{ id: Zod.ZodString; identityFields: Zod.ZodArray<Zod.ZodString, \"many\">; displayName: Zod.ZodString; metrics: Zod.ZodRecord<Zod.ZodString, Zod.ZodNumber>; }, \"strip\", Zod.ZodTypeAny, { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }, { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }>; lastSeenTimestamp: Zod.ZodString; firstSeenTimestamp: Zod.ZodString; }, \"strip\", Zod.ZodTypeAny, { entity: { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; lastSeenTimestamp: string; firstSeenTimestamp: string; }, { entity: { id: string; metrics: Record<string, number>; displayName: string; identityFields: string[]; }; lastSeenTimestamp: string; firstSeenTimestamp: string; }>, Zod.ZodRecord<Zod.ZodString, Zod.ZodUnion<[Zod.ZodString, Zod.ZodNumber]>>>"
         ],
         "path": "x-pack/packages/kbn-entities-schema/src/schema/entity.ts",
         "deprecated": false,
@@ -467,6 +467,21 @@
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/entities-schema",
+        "id": "def-common.semVerSchema",
+        "type": "Object",
+        "tags": [],
+        "label": "semVerSchema",
+        "description": [],
+        "signature": [
+          "Zod.ZodEffects<Zod.ZodString, string, string>"
+        ],
+        "path": "x-pack/packages/kbn-entities-schema/src/schema/common.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
       }
     ]
   }
diff --git a/api_docs/kbn_entities_schema.mdx b/api_docs/kbn_entities_schema.mdx
index 20e0f042937f7..36eb8b77f0736 100644
--- a/api_docs/kbn_entities_schema.mdx
+++ b/api_docs/kbn_entities_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-entities-schema
 title: "@kbn/entities-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/entities-schema plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/entities-schema']
 ---
 import kbnEntitiesSchemaObj from './kbn_entities_schema.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 18 | 0 | 18 | 0 |
+| 19 | 0 | 19 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_es.mdx b/api_docs/kbn_es.mdx
index 1486693030f77..ac0a3e9ec363e 100644
--- a/api_docs/kbn_es.mdx
+++ b/api_docs/kbn_es.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es
 title: "@kbn/es"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es']
 ---
 import kbnEsObj from './kbn_es.devdocs.json';
diff --git a/api_docs/kbn_es_archiver.mdx b/api_docs/kbn_es_archiver.mdx
index 6c66e97b0b2f2..d5998673d4ca5 100644
--- a/api_docs/kbn_es_archiver.mdx
+++ b/api_docs/kbn_es_archiver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-archiver
 title: "@kbn/es-archiver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-archiver plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-archiver']
 ---
 import kbnEsArchiverObj from './kbn_es_archiver.devdocs.json';
diff --git a/api_docs/kbn_es_errors.mdx b/api_docs/kbn_es_errors.mdx
index 1dcbb7c11436e..e6942f63addd1 100644
--- a/api_docs/kbn_es_errors.mdx
+++ b/api_docs/kbn_es_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-errors
 title: "@kbn/es-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-errors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-errors']
 ---
 import kbnEsErrorsObj from './kbn_es_errors.devdocs.json';
diff --git a/api_docs/kbn_es_query.mdx b/api_docs/kbn_es_query.mdx
index 986b33fa6491e..126af776fe859 100644
--- a/api_docs/kbn_es_query.mdx
+++ b/api_docs/kbn_es_query.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-query
 title: "@kbn/es-query"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-query plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-query']
 ---
 import kbnEsQueryObj from './kbn_es_query.devdocs.json';
diff --git a/api_docs/kbn_es_types.mdx b/api_docs/kbn_es_types.mdx
index 14471f6c9514b..e7a83316f6d4a 100644
--- a/api_docs/kbn_es_types.mdx
+++ b/api_docs/kbn_es_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-es-types
 title: "@kbn/es-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/es-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/es-types']
 ---
 import kbnEsTypesObj from './kbn_es_types.devdocs.json';
diff --git a/api_docs/kbn_eslint_plugin_imports.mdx b/api_docs/kbn_eslint_plugin_imports.mdx
index c0edb00b1f375..adfe573c8adcc 100644
--- a/api_docs/kbn_eslint_plugin_imports.mdx
+++ b/api_docs/kbn_eslint_plugin_imports.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-eslint-plugin-imports
 title: "@kbn/eslint-plugin-imports"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/eslint-plugin-imports plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/eslint-plugin-imports']
 ---
 import kbnEslintPluginImportsObj from './kbn_eslint_plugin_imports.devdocs.json';
diff --git a/api_docs/kbn_esql_ast.devdocs.json b/api_docs/kbn_esql_ast.devdocs.json
index ba60e35d615c3..9811a14a8fa62 100644
--- a/api_docs/kbn_esql_ast.devdocs.json
+++ b/api_docs/kbn_esql_ast.devdocs.json
@@ -341,7 +341,13 @@
                 "text": "ESQLAstNode"
               },
               "[]) => ",
-              "ESQLParamLiteral",
+              {
+                "pluginId": "@kbn/esql-ast",
+                "scope": "common",
+                "docId": "kibKbnEsqlAstPluginApi",
+                "section": "def-common.ESQLParamLiteral",
+                "text": "ESQLParamLiteral"
+              },
               "<string>[]"
             ],
             "path": "packages/kbn-esql-ast/src/walker/walker.ts",
@@ -1508,6 +1514,88 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/esql-ast",
+        "id": "def-common.ESQLParamLiteral",
+        "type": "Interface",
+        "tags": [],
+        "label": "ESQLParamLiteral",
+        "description": [],
+        "signature": [
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
+          "<ParamType> extends ",
+          "ESQLAstBaseItem",
+          "<string>"
+        ],
+        "path": "packages/kbn-esql-ast/src/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/esql-ast",
+            "id": "def-common.ESQLParamLiteral.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"literal\""
+            ],
+            "path": "packages/kbn-esql-ast/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/esql-ast",
+            "id": "def-common.ESQLParamLiteral.literalType",
+            "type": "string",
+            "tags": [],
+            "label": "literalType",
+            "description": [],
+            "signature": [
+              "\"param\""
+            ],
+            "path": "packages/kbn-esql-ast/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/esql-ast",
+            "id": "def-common.ESQLParamLiteral.paramType",
+            "type": "Uncategorized",
+            "tags": [],
+            "label": "paramType",
+            "description": [],
+            "signature": [
+              "ParamType"
+            ],
+            "path": "packages/kbn-esql-ast/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/esql-ast",
+            "id": "def-common.ESQLParamLiteral.value",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "value",
+            "description": [],
+            "signature": [
+              "string | number"
+            ],
+            "path": "packages/kbn-esql-ast/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/esql-ast",
         "id": "def-common.ESQLSource",
@@ -2015,7 +2103,13 @@
           " | ",
           "ESQLStringLiteral",
           " | ",
-          "ESQLParamLiteral",
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
           "<string>"
         ],
         "path": "packages/kbn-esql-ast/src/types.ts",
diff --git a/api_docs/kbn_esql_ast.mdx b/api_docs/kbn_esql_ast.mdx
index f5add9c43c982..6bf2b5c4ea9d9 100644
--- a/api_docs/kbn_esql_ast.mdx
+++ b/api_docs/kbn_esql_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-ast
 title: "@kbn/esql-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-ast plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-ast']
 ---
 import kbnEsqlAstObj from './kbn_esql_ast.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 99 | 1 | 96 | 11 |
+| 104 | 1 | 101 | 10 |
 
 ## Common
 
diff --git a/api_docs/kbn_esql_utils.mdx b/api_docs/kbn_esql_utils.mdx
index 9bd6881bc449d..13ea5e35682d5 100644
--- a/api_docs/kbn_esql_utils.mdx
+++ b/api_docs/kbn_esql_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-utils
 title: "@kbn/esql-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-utils']
 ---
 import kbnEsqlUtilsObj from './kbn_esql_utils.devdocs.json';
diff --git a/api_docs/kbn_esql_validation_autocomplete.devdocs.json b/api_docs/kbn_esql_validation_autocomplete.devdocs.json
index 79100a05ac285..56830eaa4f756 100644
--- a/api_docs/kbn_esql_validation_autocomplete.devdocs.json
+++ b/api_docs/kbn_esql_validation_autocomplete.devdocs.json
@@ -628,7 +628,13 @@
           " | ",
           "ESQLStringLiteral",
           " | ",
-          "ESQLParamLiteral",
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
           "<string> | ",
           {
             "pluginId": "@kbn/esql-ast",
@@ -740,7 +746,13 @@
           " | ",
           "ESQLStringLiteral",
           " | ",
-          "ESQLParamLiteral",
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
           "<string> | ",
           {
             "pluginId": "@kbn/esql-ast",
@@ -836,7 +848,13 @@
           " | ",
           "ESQLStringLiteral",
           " | ",
-          "ESQLParamLiteral",
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
           "<string> | ",
           {
             "pluginId": "@kbn/esql-ast",
@@ -940,7 +958,13 @@
           " | ",
           "ESQLStringLiteral",
           " | ",
-          "ESQLParamLiteral",
+          {
+            "pluginId": "@kbn/esql-ast",
+            "scope": "common",
+            "docId": "kibKbnEsqlAstPluginApi",
+            "section": "def-common.ESQLParamLiteral",
+            "text": "ESQLParamLiteral"
+          },
           "<string> | ",
           {
             "pluginId": "@kbn/esql-ast",
diff --git a/api_docs/kbn_esql_validation_autocomplete.mdx b/api_docs/kbn_esql_validation_autocomplete.mdx
index 691acdff1c9b1..d255b890eab4f 100644
--- a/api_docs/kbn_esql_validation_autocomplete.mdx
+++ b/api_docs/kbn_esql_validation_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-esql-validation-autocomplete
 title: "@kbn/esql-validation-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/esql-validation-autocomplete plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/esql-validation-autocomplete']
 ---
 import kbnEsqlValidationAutocompleteObj from './kbn_esql_validation_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_common.mdx b/api_docs/kbn_event_annotation_common.mdx
index 8424f280baab8..27926b3fe96e7 100644
--- a/api_docs/kbn_event_annotation_common.mdx
+++ b/api_docs/kbn_event_annotation_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-common
 title: "@kbn/event-annotation-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-common']
 ---
 import kbnEventAnnotationCommonObj from './kbn_event_annotation_common.devdocs.json';
diff --git a/api_docs/kbn_event_annotation_components.mdx b/api_docs/kbn_event_annotation_components.mdx
index 656c01770fd86..55b7e6c390d51 100644
--- a/api_docs/kbn_event_annotation_components.mdx
+++ b/api_docs/kbn_event_annotation_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-event-annotation-components
 title: "@kbn/event-annotation-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/event-annotation-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/event-annotation-components']
 ---
 import kbnEventAnnotationComponentsObj from './kbn_event_annotation_components.devdocs.json';
diff --git a/api_docs/kbn_expandable_flyout.mdx b/api_docs/kbn_expandable_flyout.mdx
index baf9db952ef9c..5e2858640bb2b 100644
--- a/api_docs/kbn_expandable_flyout.mdx
+++ b/api_docs/kbn_expandable_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-expandable-flyout
 title: "@kbn/expandable-flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/expandable-flyout plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/expandable-flyout']
 ---
 import kbnExpandableFlyoutObj from './kbn_expandable_flyout.devdocs.json';
diff --git a/api_docs/kbn_field_types.mdx b/api_docs/kbn_field_types.mdx
index e31ceb0e0f10a..e0ddef62ed19a 100644
--- a/api_docs/kbn_field_types.mdx
+++ b/api_docs/kbn_field_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-types
 title: "@kbn/field-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-types']
 ---
 import kbnFieldTypesObj from './kbn_field_types.devdocs.json';
diff --git a/api_docs/kbn_field_utils.mdx b/api_docs/kbn_field_utils.mdx
index 4c75aa026214e..4d1d0c518eb9e 100644
--- a/api_docs/kbn_field_utils.mdx
+++ b/api_docs/kbn_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-field-utils
 title: "@kbn/field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/field-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/field-utils']
 ---
 import kbnFieldUtilsObj from './kbn_field_utils.devdocs.json';
diff --git a/api_docs/kbn_find_used_node_modules.mdx b/api_docs/kbn_find_used_node_modules.mdx
index ef1d6d89ee8a2..cffc605081fb0 100644
--- a/api_docs/kbn_find_used_node_modules.mdx
+++ b/api_docs/kbn_find_used_node_modules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-find-used-node-modules
 title: "@kbn/find-used-node-modules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/find-used-node-modules plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/find-used-node-modules']
 ---
 import kbnFindUsedNodeModulesObj from './kbn_find_used_node_modules.devdocs.json';
diff --git a/api_docs/kbn_formatters.mdx b/api_docs/kbn_formatters.mdx
index a44c4afb10795..75cc32464a9f7 100644
--- a/api_docs/kbn_formatters.mdx
+++ b/api_docs/kbn_formatters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-formatters
 title: "@kbn/formatters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/formatters plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/formatters']
 ---
 import kbnFormattersObj from './kbn_formatters.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_services.mdx b/api_docs/kbn_ftr_common_functional_services.mdx
index c17ce93d4e155..31550c0a7938a 100644
--- a/api_docs/kbn_ftr_common_functional_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-services
 title: "@kbn/ftr-common-functional-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-services plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-services']
 ---
 import kbnFtrCommonFunctionalServicesObj from './kbn_ftr_common_functional_services.devdocs.json';
diff --git a/api_docs/kbn_ftr_common_functional_ui_services.mdx b/api_docs/kbn_ftr_common_functional_ui_services.mdx
index 43d1c80c3497b..47ea9dbbba60d 100644
--- a/api_docs/kbn_ftr_common_functional_ui_services.mdx
+++ b/api_docs/kbn_ftr_common_functional_ui_services.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ftr-common-functional-ui-services
 title: "@kbn/ftr-common-functional-ui-services"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ftr-common-functional-ui-services plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ftr-common-functional-ui-services']
 ---
 import kbnFtrCommonFunctionalUiServicesObj from './kbn_ftr_common_functional_ui_services.devdocs.json';
diff --git a/api_docs/kbn_generate.mdx b/api_docs/kbn_generate.mdx
index 83cea2ae8cbe9..f8e68b2de7323 100644
--- a/api_docs/kbn_generate.mdx
+++ b/api_docs/kbn_generate.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate
 title: "@kbn/generate"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate']
 ---
 import kbnGenerateObj from './kbn_generate.devdocs.json';
diff --git a/api_docs/kbn_generate_console_definitions.mdx b/api_docs/kbn_generate_console_definitions.mdx
index be09e0f47604d..3ae9dc5c41a5f 100644
--- a/api_docs/kbn_generate_console_definitions.mdx
+++ b/api_docs/kbn_generate_console_definitions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-console-definitions
 title: "@kbn/generate-console-definitions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-console-definitions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-console-definitions']
 ---
 import kbnGenerateConsoleDefinitionsObj from './kbn_generate_console_definitions.devdocs.json';
diff --git a/api_docs/kbn_generate_csv.mdx b/api_docs/kbn_generate_csv.mdx
index 4a7bcbf08705a..52db674e1c1e2 100644
--- a/api_docs/kbn_generate_csv.mdx
+++ b/api_docs/kbn_generate_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-generate-csv
 title: "@kbn/generate-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/generate-csv plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/generate-csv']
 ---
 import kbnGenerateCsvObj from './kbn_generate_csv.devdocs.json';
diff --git a/api_docs/kbn_grouping.devdocs.json b/api_docs/kbn_grouping.devdocs.json
index f699ea6ae6857..be6c1495f9a0b 100644
--- a/api_docs/kbn_grouping.devdocs.json
+++ b/api_docs/kbn_grouping.devdocs.json
@@ -175,10 +175,10 @@
       },
       {
         "parentPluginId": "@kbn/grouping",
-        "id": "def-common.StatRenderer",
+        "id": "def-common.GroupStatsItem",
         "type": "Interface",
         "tags": [],
-        "label": "StatRenderer",
+        "label": "GroupStatsItem",
         "description": [],
         "path": "packages/kbn-grouping/src/components/types.ts",
         "deprecated": false,
@@ -186,7 +186,7 @@
         "children": [
           {
             "parentPluginId": "@kbn/grouping",
-            "id": "def-common.StatRenderer.title",
+            "id": "def-common.GroupStatsItem.title",
             "type": "string",
             "tags": [],
             "label": "title",
@@ -197,10 +197,10 @@
           },
           {
             "parentPluginId": "@kbn/grouping",
-            "id": "def-common.StatRenderer.renderer",
+            "id": "def-common.GroupStatsItem.component",
             "type": "Object",
             "tags": [],
-            "label": "renderer",
+            "label": "component",
             "description": [],
             "signature": [
               "JSX.Element | undefined"
@@ -211,7 +211,7 @@
           },
           {
             "parentPluginId": "@kbn/grouping",
-            "id": "def-common.StatRenderer.badge",
+            "id": "def-common.GroupStatsItem.badge",
             "type": "Object",
             "tags": [],
             "label": "badge",
@@ -244,7 +244,7 @@
         "signature": [
           "{ isLoading: boolean; data?: ",
           "ParsedGroupingAggregation",
-          "<T> | undefined; activePage: number; groupingLevel?: number | undefined; inspectButton?: JSX.Element | undefined; itemsPerPage: number; onChangeGroupsItemsPerPage?: ((size: number) => void) | undefined; onChangeGroupsPage?: ((index: number) => void) | undefined; renderChildComponent: (groupFilter: ",
+          "<T> | undefined; activePage: number; selectedGroup: string; takeActionItems?: ((groupFilters: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -252,7 +252,7 @@
             "section": "def-common.Filter",
             "text": "Filter"
           },
-          "[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>; onGroupClose: () => void; selectedGroup: string; takeActionItems: (groupFilters: ",
+          "[], groupNumber: number) => JSX.Element[]) | undefined; groupingLevel?: number | undefined; inspectButton?: JSX.Element | undefined; itemsPerPage: number; onChangeGroupsItemsPerPage?: ((size: number) => void) | undefined; onChangeGroupsPage?: ((index: number) => void) | undefined; renderChildComponent: (groupFilter: ",
           {
             "pluginId": "@kbn/es-query",
             "scope": "common",
@@ -260,7 +260,7 @@
             "section": "def-common.Filter",
             "text": "Filter"
           },
-          "[], groupNumber: number) => JSX.Element[]; }"
+          "[]) => React.ReactElement<any, string | React.JSXElementConstructor<any>>; onGroupClose: () => void; }"
         ],
         "path": "packages/kbn-grouping/src/hooks/use_grouping.tsx",
         "deprecated": false,
diff --git a/api_docs/kbn_grouping.mdx b/api_docs/kbn_grouping.mdx
index 93f4cf0e68e92..3bcd5481373e6 100644
--- a/api_docs/kbn_grouping.mdx
+++ b/api_docs/kbn_grouping.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-grouping
 title: "@kbn/grouping"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/grouping plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/grouping']
 ---
 import kbnGroupingObj from './kbn_grouping.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 17 | 0 | 12 | 8 |
+| 17 | 0 | 12 | 10 |
 
 ## Common
 
diff --git a/api_docs/kbn_guided_onboarding.mdx b/api_docs/kbn_guided_onboarding.mdx
index c2d0c0877fc8d..978f32edffee7 100644
--- a/api_docs/kbn_guided_onboarding.mdx
+++ b/api_docs/kbn_guided_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-guided-onboarding
 title: "@kbn/guided-onboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/guided-onboarding plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/guided-onboarding']
 ---
 import kbnGuidedOnboardingObj from './kbn_guided_onboarding.devdocs.json';
diff --git a/api_docs/kbn_handlebars.mdx b/api_docs/kbn_handlebars.mdx
index d687a2034bd27..5f8a30051949f 100644
--- a/api_docs/kbn_handlebars.mdx
+++ b/api_docs/kbn_handlebars.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-handlebars
 title: "@kbn/handlebars"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/handlebars plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/handlebars']
 ---
 import kbnHandlebarsObj from './kbn_handlebars.devdocs.json';
diff --git a/api_docs/kbn_hapi_mocks.mdx b/api_docs/kbn_hapi_mocks.mdx
index 6f8e5d72854be..07b644cf29279 100644
--- a/api_docs/kbn_hapi_mocks.mdx
+++ b/api_docs/kbn_hapi_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-hapi-mocks
 title: "@kbn/hapi-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/hapi-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/hapi-mocks']
 ---
 import kbnHapiMocksObj from './kbn_hapi_mocks.devdocs.json';
diff --git a/api_docs/kbn_health_gateway_server.mdx b/api_docs/kbn_health_gateway_server.mdx
index 642fae2eda79d..4ddb5f39a167c 100644
--- a/api_docs/kbn_health_gateway_server.mdx
+++ b/api_docs/kbn_health_gateway_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-health-gateway-server
 title: "@kbn/health-gateway-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/health-gateway-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/health-gateway-server']
 ---
 import kbnHealthGatewayServerObj from './kbn_health_gateway_server.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_card.mdx b/api_docs/kbn_home_sample_data_card.mdx
index 7ca305798ab27..59c0fa084bb94 100644
--- a/api_docs/kbn_home_sample_data_card.mdx
+++ b/api_docs/kbn_home_sample_data_card.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-card
 title: "@kbn/home-sample-data-card"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-card plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-card']
 ---
 import kbnHomeSampleDataCardObj from './kbn_home_sample_data_card.devdocs.json';
diff --git a/api_docs/kbn_home_sample_data_tab.mdx b/api_docs/kbn_home_sample_data_tab.mdx
index 4a1b189dc7e06..983940f971052 100644
--- a/api_docs/kbn_home_sample_data_tab.mdx
+++ b/api_docs/kbn_home_sample_data_tab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-home-sample-data-tab
 title: "@kbn/home-sample-data-tab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/home-sample-data-tab plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/home-sample-data-tab']
 ---
 import kbnHomeSampleDataTabObj from './kbn_home_sample_data_tab.devdocs.json';
diff --git a/api_docs/kbn_i18n.mdx b/api_docs/kbn_i18n.mdx
index a031d7533418b..0b0634528213b 100644
--- a/api_docs/kbn_i18n.mdx
+++ b/api_docs/kbn_i18n.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n
 title: "@kbn/i18n"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n']
 ---
 import kbnI18nObj from './kbn_i18n.devdocs.json';
diff --git a/api_docs/kbn_i18n_react.mdx b/api_docs/kbn_i18n_react.mdx
index 657cd13ebde6f..db2d1f018e895 100644
--- a/api_docs/kbn_i18n_react.mdx
+++ b/api_docs/kbn_i18n_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-i18n-react
 title: "@kbn/i18n-react"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/i18n-react plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/i18n-react']
 ---
 import kbnI18nReactObj from './kbn_i18n_react.devdocs.json';
diff --git a/api_docs/kbn_import_resolver.mdx b/api_docs/kbn_import_resolver.mdx
index 284c1c2d06b9c..79d23033a0261 100644
--- a/api_docs/kbn_import_resolver.mdx
+++ b/api_docs/kbn_import_resolver.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-import-resolver
 title: "@kbn/import-resolver"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/import-resolver plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/import-resolver']
 ---
 import kbnImportResolverObj from './kbn_import_resolver.devdocs.json';
diff --git a/api_docs/kbn_index_management.mdx b/api_docs/kbn_index_management.mdx
index 525c62831ae8e..5d986a50981ee 100644
--- a/api_docs/kbn_index_management.mdx
+++ b/api_docs/kbn_index_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-index-management
 title: "@kbn/index-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/index-management plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/index-management']
 ---
 import kbnIndexManagementObj from './kbn_index_management.devdocs.json';
diff --git a/api_docs/kbn_inference_integration_flyout.mdx b/api_docs/kbn_inference_integration_flyout.mdx
index 7ebff19cd7753..b32bb5f046cb7 100644
--- a/api_docs/kbn_inference_integration_flyout.mdx
+++ b/api_docs/kbn_inference_integration_flyout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-inference_integration_flyout
 title: "@kbn/inference_integration_flyout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/inference_integration_flyout plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/inference_integration_flyout']
 ---
 import kbnInferenceIntegrationFlyoutObj from './kbn_inference_integration_flyout.devdocs.json';
diff --git a/api_docs/kbn_infra_forge.mdx b/api_docs/kbn_infra_forge.mdx
index 746628f6111f3..94160bdf5b5ec 100644
--- a/api_docs/kbn_infra_forge.mdx
+++ b/api_docs/kbn_infra_forge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-infra-forge
 title: "@kbn/infra-forge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/infra-forge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/infra-forge']
 ---
 import kbnInfraForgeObj from './kbn_infra_forge.devdocs.json';
diff --git a/api_docs/kbn_interpreter.mdx b/api_docs/kbn_interpreter.mdx
index 03caecb2e0ee2..bcb7b29b795dc 100644
--- a/api_docs/kbn_interpreter.mdx
+++ b/api_docs/kbn_interpreter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-interpreter
 title: "@kbn/interpreter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/interpreter plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/interpreter']
 ---
 import kbnInterpreterObj from './kbn_interpreter.devdocs.json';
diff --git a/api_docs/kbn_io_ts_utils.mdx b/api_docs/kbn_io_ts_utils.mdx
index c2b3fa851c4a3..08950ff96575b 100644
--- a/api_docs/kbn_io_ts_utils.mdx
+++ b/api_docs/kbn_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-io-ts-utils
 title: "@kbn/io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/io-ts-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/io-ts-utils']
 ---
 import kbnIoTsUtilsObj from './kbn_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_ipynb.mdx b/api_docs/kbn_ipynb.mdx
index 090d71c7d3a63..c2c9775d6e5ec 100644
--- a/api_docs/kbn_ipynb.mdx
+++ b/api_docs/kbn_ipynb.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ipynb
 title: "@kbn/ipynb"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ipynb plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ipynb']
 ---
 import kbnIpynbObj from './kbn_ipynb.devdocs.json';
diff --git a/api_docs/kbn_jest_serializers.mdx b/api_docs/kbn_jest_serializers.mdx
index 7ebe91d1affa1..fd83386622f4d 100644
--- a/api_docs/kbn_jest_serializers.mdx
+++ b/api_docs/kbn_jest_serializers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-jest-serializers
 title: "@kbn/jest-serializers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/jest-serializers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/jest-serializers']
 ---
 import kbnJestSerializersObj from './kbn_jest_serializers.devdocs.json';
diff --git a/api_docs/kbn_journeys.mdx b/api_docs/kbn_journeys.mdx
index c72865248ee79..d4e627ee9dd44 100644
--- a/api_docs/kbn_journeys.mdx
+++ b/api_docs/kbn_journeys.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-journeys
 title: "@kbn/journeys"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/journeys plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/journeys']
 ---
 import kbnJourneysObj from './kbn_journeys.devdocs.json';
diff --git a/api_docs/kbn_json_ast.mdx b/api_docs/kbn_json_ast.mdx
index 801f62bd15911..af2d71e1aee9a 100644
--- a/api_docs/kbn_json_ast.mdx
+++ b/api_docs/kbn_json_ast.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-ast
 title: "@kbn/json-ast"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-ast plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-ast']
 ---
 import kbnJsonAstObj from './kbn_json_ast.devdocs.json';
diff --git a/api_docs/kbn_json_schemas.mdx b/api_docs/kbn_json_schemas.mdx
index 8fa30ba33fe13..7bcfb8ea1bbe4 100644
--- a/api_docs/kbn_json_schemas.mdx
+++ b/api_docs/kbn_json_schemas.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-json-schemas
 title: "@kbn/json-schemas"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/json-schemas plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/json-schemas']
 ---
 import kbnJsonSchemasObj from './kbn_json_schemas.devdocs.json';
diff --git a/api_docs/kbn_kibana_manifest_schema.mdx b/api_docs/kbn_kibana_manifest_schema.mdx
index c11aa7b62a531..7909130f970f4 100644
--- a/api_docs/kbn_kibana_manifest_schema.mdx
+++ b/api_docs/kbn_kibana_manifest_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-kibana-manifest-schema
 title: "@kbn/kibana-manifest-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/kibana-manifest-schema plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/kibana-manifest-schema']
 ---
 import kbnKibanaManifestSchemaObj from './kbn_kibana_manifest_schema.devdocs.json';
diff --git a/api_docs/kbn_language_documentation_popover.mdx b/api_docs/kbn_language_documentation_popover.mdx
index b53279e8b82df..0b955032e9fbf 100644
--- a/api_docs/kbn_language_documentation_popover.mdx
+++ b/api_docs/kbn_language_documentation_popover.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-language-documentation-popover
 title: "@kbn/language-documentation-popover"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/language-documentation-popover plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/language-documentation-popover']
 ---
 import kbnLanguageDocumentationPopoverObj from './kbn_language_documentation_popover.devdocs.json';
diff --git a/api_docs/kbn_lens_embeddable_utils.mdx b/api_docs/kbn_lens_embeddable_utils.mdx
index e98e15c4292e2..1eb0fcf84a30b 100644
--- a/api_docs/kbn_lens_embeddable_utils.mdx
+++ b/api_docs/kbn_lens_embeddable_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-embeddable-utils
 title: "@kbn/lens-embeddable-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-embeddable-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-embeddable-utils']
 ---
 import kbnLensEmbeddableUtilsObj from './kbn_lens_embeddable_utils.devdocs.json';
diff --git a/api_docs/kbn_lens_formula_docs.mdx b/api_docs/kbn_lens_formula_docs.mdx
index bd77300b74d03..3e173b1648910 100644
--- a/api_docs/kbn_lens_formula_docs.mdx
+++ b/api_docs/kbn_lens_formula_docs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-lens-formula-docs
 title: "@kbn/lens-formula-docs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/lens-formula-docs plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/lens-formula-docs']
 ---
 import kbnLensFormulaDocsObj from './kbn_lens_formula_docs.devdocs.json';
diff --git a/api_docs/kbn_logging.devdocs.json b/api_docs/kbn_logging.devdocs.json
index a343c50940b40..c4e148c61e8e5 100644
--- a/api_docs/kbn_logging.devdocs.json
+++ b/api_docs/kbn_logging.devdocs.json
@@ -59,7 +59,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(message: string, meta?: Meta | undefined) => void"
+              ">(message: ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -68,14 +76,20 @@
               {
                 "parentPluginId": "@kbn/logging",
                 "id": "def-common.Logger.trace.$1",
-                "type": "string",
+                "type": "CompoundType",
                 "tags": [],
                 "label": "message",
                 "description": [
-                  "- The log message"
+                  "- The log message, or a function returning the log message"
                 ],
                 "signature": [
-                  "string"
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -89,7 +103,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -109,7 +123,7 @@
             "tags": [],
             "label": "debug",
             "description": [
-              "\nLog messages useful for debugging and interactive investigation"
+              "\nLog messages useful for debugging and interactive investigation\n"
             ],
             "signature": [
               "<Meta extends ",
@@ -128,7 +142,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(message: string, meta?: Meta | undefined) => void"
+              ">(message: ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -137,14 +159,20 @@
               {
                 "parentPluginId": "@kbn/logging",
                 "id": "def-common.Logger.debug.$1",
-                "type": "string",
+                "type": "CompoundType",
                 "tags": [],
                 "label": "message",
                 "description": [
-                  "- The log message"
+                  "- The log message, or a function returning the log message"
                 ],
                 "signature": [
-                  "string"
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -158,7 +186,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -178,7 +206,7 @@
             "tags": [],
             "label": "info",
             "description": [
-              "\nLogs messages related to general application flow"
+              "\nLogs messages related to general application flow\n"
             ],
             "signature": [
               "<Meta extends ",
@@ -197,7 +225,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(message: string, meta?: Meta | undefined) => void"
+              ">(message: ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -206,14 +242,20 @@
               {
                 "parentPluginId": "@kbn/logging",
                 "id": "def-common.Logger.info.$1",
-                "type": "string",
+                "type": "CompoundType",
                 "tags": [],
                 "label": "message",
                 "description": [
-                  "- The log message"
+                  "- The log message, or a function returning the log message"
                 ],
                 "signature": [
-                  "string"
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -227,7 +269,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -247,7 +289,7 @@
             "tags": [],
             "label": "warn",
             "description": [
-              "\nLogs abnormal or unexpected errors or messages"
+              "\nLogs abnormal or unexpected errors or messages\n"
             ],
             "signature": [
               "<Meta extends ",
@@ -266,7 +308,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(errorOrMessage: string | Error, meta?: Meta | undefined) => void"
+              ">(errorOrMessage: Error | ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -279,10 +329,17 @@
                 "tags": [],
                 "label": "errorOrMessage",
                 "description": [
-                  "- An Error object or message string to log"
+                  "- An Error object, message string, or function returning the log message"
                 ],
                 "signature": [
-                  "string | Error"
+                  "Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -296,7 +353,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -335,7 +392,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(errorOrMessage: string | Error, meta?: Meta | undefined) => void"
+              ">(errorOrMessage: Error | ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -348,10 +413,17 @@
                 "tags": [],
                 "label": "errorOrMessage",
                 "description": [
-                  "- An Error object or message string to log"
+                  "- An Error object, message string, or function returning the log message"
                 ],
                 "signature": [
-                  "string | Error"
+                  "Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -365,7 +437,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -404,7 +476,15 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              ">(errorOrMessage: string | Error, meta?: Meta | undefined) => void"
+              ">(errorOrMessage: Error | ",
+              {
+                "pluginId": "@kbn/logging",
+                "scope": "common",
+                "docId": "kibKbnLoggingPluginApi",
+                "section": "def-common.LogMessageSource",
+                "text": "LogMessageSource"
+              },
+              ", meta?: Meta | undefined) => void"
             ],
             "path": "packages/kbn-logging/src/logger.ts",
             "deprecated": false,
@@ -417,10 +497,17 @@
                 "tags": [],
                 "label": "errorOrMessage",
                 "description": [
-                  "- An Error object or message string to log"
+                  "- An Error object, message string, or function returning the log message"
                 ],
                 "signature": [
-                  "string | Error"
+                  "Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  }
                 ],
                 "path": "packages/kbn-logging/src/logger.ts",
                 "deprecated": false,
@@ -434,7 +521,7 @@
                 "tags": [],
                 "label": "meta",
                 "description": [
-                  "-"
+                  "- The ECS meta to attach to the log entry"
                 ],
                 "signature": [
                   "Meta | undefined"
@@ -591,6 +678,21 @@
     ],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "@kbn/logging",
+        "id": "def-common.LogMessageSource",
+        "type": "Type",
+        "tags": [],
+        "label": "LogMessageSource",
+        "description": [],
+        "signature": [
+          "string | (() => string)"
+        ],
+        "path": "packages/kbn-logging/src/logger.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/logging",
         "id": "def-common.LogMeta",
diff --git a/api_docs/kbn_logging.mdx b/api_docs/kbn_logging.mdx
index 0d333bb0bc5b0..9b37a6f3f3321 100644
--- a/api_docs/kbn_logging.mdx
+++ b/api_docs/kbn_logging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging
 title: "@kbn/logging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging']
 ---
 import kbnLoggingObj from './kbn_logging.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 27 | 0 | 1 | 2 |
+| 28 | 0 | 2 | 2 |
 
 ## Common
 
diff --git a/api_docs/kbn_logging_mocks.devdocs.json b/api_docs/kbn_logging_mocks.devdocs.json
index 39e3725849b91..d6ea4b3f63b00 100644
--- a/api_docs/kbn_logging_mocks.devdocs.json
+++ b/api_docs/kbn_logging_mocks.devdocs.json
@@ -30,7 +30,15 @@
         "label": "MockedLogger",
         "description": [],
         "signature": [
-          "{ trace: jest.MockInstance<void, [message: string, meta?: ",
+          "{ trace: jest.MockInstance<void, [message: ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -38,7 +46,15 @@
             "section": "def-common.LogMeta",
             "text": "LogMeta"
           },
-          " | undefined], unknown>; debug: jest.MockInstance<void, [message: string, meta?: ",
+          " | undefined], unknown>; debug: jest.MockInstance<void, [message: ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -46,7 +62,15 @@
             "section": "def-common.LogMeta",
             "text": "LogMeta"
           },
-          " | undefined], unknown>; info: jest.MockInstance<void, [message: string, meta?: ",
+          " | undefined], unknown>; info: jest.MockInstance<void, [message: ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -54,7 +78,15 @@
             "section": "def-common.LogMeta",
             "text": "LogMeta"
           },
-          " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+          " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: Error | ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -62,7 +94,15 @@
             "section": "def-common.LogMeta",
             "text": "LogMeta"
           },
-          " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+          " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: Error | ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -70,7 +110,15 @@
             "section": "def-common.LogMeta",
             "text": "LogMeta"
           },
-          " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+          " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: Error | ",
+          {
+            "pluginId": "@kbn/logging",
+            "scope": "common",
+            "docId": "kibKbnLoggingPluginApi",
+            "section": "def-common.LogMessageSource",
+            "text": "LogMessageSource"
+          },
+          ", meta?: ",
           {
             "pluginId": "@kbn/logging",
             "scope": "common",
@@ -187,7 +235,15 @@
                 "label": "logger",
                 "description": [],
                 "signature": [
-                  "{ trace: jest.MockInstance<void, [message: string, meta?: ",
+                  "{ trace: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -195,7 +251,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; debug: jest.MockInstance<void, [message: string, meta?: ",
+                  " | undefined], unknown>; debug: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -203,7 +267,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; info: jest.MockInstance<void, [message: string, meta?: ",
+                  " | undefined], unknown>; info: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -211,7 +283,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -219,7 +299,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -227,7 +315,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -279,7 +375,7 @@
                 "section": "def-common.MockedLogger",
                 "text": "MockedLogger"
               },
-              ") => { debug: [message: string, meta?: ",
+              ") => { debug: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -287,7 +383,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; error: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; error: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -295,7 +391,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; fatal: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; fatal: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -303,7 +399,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; info: [message: string, meta?: ",
+              " | undefined])[]; info: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -311,9 +407,9 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; log: [record: ",
+              " | undefined])[]; log: [record: ",
               "LogRecord",
-              "][]; trace: [message: string, meta?: ",
+              "][]; trace: ([string] | [string, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -321,7 +417,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; warn: [errorOrMessage: string | Error, meta?: ",
+              " | undefined])[]; warn: ([string | Error] | [string | Error, ",
               {
                 "pluginId": "@kbn/logging",
                 "scope": "common",
@@ -329,7 +425,7 @@
                 "section": "def-common.LogMeta",
                 "text": "LogMeta"
               },
-              " | undefined][]; }"
+              " | undefined])[]; }"
             ],
             "path": "packages/kbn-logging-mocks/src/logger.mock.ts",
             "deprecated": false,
@@ -344,7 +440,15 @@
                 "label": "logger",
                 "description": [],
                 "signature": [
-                  "{ trace: jest.MockInstance<void, [message: string, meta?: ",
+                  "{ trace: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -352,7 +456,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; debug: jest.MockInstance<void, [message: string, meta?: ",
+                  " | undefined], unknown>; debug: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -360,7 +472,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; info: jest.MockInstance<void, [message: string, meta?: ",
+                  " | undefined], unknown>; info: jest.MockInstance<void, [message: ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -368,7 +488,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; warn: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -376,7 +504,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; error: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
@@ -384,7 +520,15 @@
                     "section": "def-common.LogMeta",
                     "text": "LogMeta"
                   },
-                  " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: string | Error, meta?: ",
+                  " | undefined], unknown>; fatal: jest.MockInstance<void, [errorOrMessage: Error | ",
+                  {
+                    "pluginId": "@kbn/logging",
+                    "scope": "common",
+                    "docId": "kibKbnLoggingPluginApi",
+                    "section": "def-common.LogMessageSource",
+                    "text": "LogMessageSource"
+                  },
+                  ", meta?: ",
                   {
                     "pluginId": "@kbn/logging",
                     "scope": "common",
diff --git a/api_docs/kbn_logging_mocks.mdx b/api_docs/kbn_logging_mocks.mdx
index c34cac43ecb92..aa4f4e7e18a6f 100644
--- a/api_docs/kbn_logging_mocks.mdx
+++ b/api_docs/kbn_logging_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-logging-mocks
 title: "@kbn/logging-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/logging-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/logging-mocks']
 ---
 import kbnLoggingMocksObj from './kbn_logging_mocks.devdocs.json';
diff --git a/api_docs/kbn_managed_content_badge.mdx b/api_docs/kbn_managed_content_badge.mdx
index 8a275002f77cb..c6a4aad1d15b5 100644
--- a/api_docs/kbn_managed_content_badge.mdx
+++ b/api_docs/kbn_managed_content_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-content-badge
 title: "@kbn/managed-content-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-content-badge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-content-badge']
 ---
 import kbnManagedContentBadgeObj from './kbn_managed_content_badge.devdocs.json';
diff --git a/api_docs/kbn_managed_vscode_config.mdx b/api_docs/kbn_managed_vscode_config.mdx
index b1cc770eb0a44..904ea66bf2050 100644
--- a/api_docs/kbn_managed_vscode_config.mdx
+++ b/api_docs/kbn_managed_vscode_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-managed-vscode-config
 title: "@kbn/managed-vscode-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/managed-vscode-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/managed-vscode-config']
 ---
 import kbnManagedVscodeConfigObj from './kbn_managed_vscode_config.devdocs.json';
diff --git a/api_docs/kbn_management_cards_navigation.devdocs.json b/api_docs/kbn_management_cards_navigation.devdocs.json
index 7d589a0a00560..328c9ff782cc3 100644
--- a/api_docs/kbn_management_cards_navigation.devdocs.json
+++ b/api_docs/kbn_management_cards_navigation.devdocs.json
@@ -145,7 +145,7 @@
             "label": "hideLinksTo",
             "description": [],
             "signature": [
-              "(\"transform\" | \"tags\" | \"maintenanceWindows\" | \"settings\" | \"dataViews\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"api_keys\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"triggersActions\" | \"triggersActionsConnectors\")[] | undefined"
+              "(\"transform\" | \"tags\" | \"maintenanceWindows\" | \"dataViews\" | \"settings\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"api_keys\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"triggersActions\" | \"triggersActionsConnectors\")[] | undefined"
             ],
             "path": "packages/kbn-management/cards_navigation/src/types.ts",
             "deprecated": false,
@@ -202,7 +202,7 @@
         "label": "AppId",
         "description": [],
         "signature": [
-          "\"transform\" | \"tags\" | \"maintenanceWindows\" | \"settings\" | \"dataViews\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"api_keys\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"triggersActions\" | \"triggersActionsConnectors\""
+          "\"transform\" | \"tags\" | \"maintenanceWindows\" | \"dataViews\" | \"settings\" | \"data_quality\" | \"filesManagement\" | \"roles\" | \"reporting\" | \"api_keys\" | \"index_management\" | \"ingest_pipelines\" | \"jobsListLink\" | \"objects\" | \"pipelines\" | \"triggersActions\" | \"triggersActionsConnectors\""
         ],
         "path": "packages/kbn-management/cards_navigation/src/types.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_management_cards_navigation.mdx b/api_docs/kbn_management_cards_navigation.mdx
index c7331c526dcf5..f8a1f81958bca 100644
--- a/api_docs/kbn_management_cards_navigation.mdx
+++ b/api_docs/kbn_management_cards_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-cards-navigation
 title: "@kbn/management-cards-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-cards-navigation plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-cards-navigation']
 ---
 import kbnManagementCardsNavigationObj from './kbn_management_cards_navigation.devdocs.json';
diff --git a/api_docs/kbn_management_settings_application.mdx b/api_docs/kbn_management_settings_application.mdx
index 93d0d9733e106..25d4b9eb75a3e 100644
--- a/api_docs/kbn_management_settings_application.mdx
+++ b/api_docs/kbn_management_settings_application.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-application
 title: "@kbn/management-settings-application"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-application plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-application']
 ---
 import kbnManagementSettingsApplicationObj from './kbn_management_settings_application.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_category.mdx b/api_docs/kbn_management_settings_components_field_category.mdx
index d61d33f61857c..7c5cd5e5013d2 100644
--- a/api_docs/kbn_management_settings_components_field_category.mdx
+++ b/api_docs/kbn_management_settings_components_field_category.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-category
 title: "@kbn/management-settings-components-field-category"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-category plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-category']
 ---
 import kbnManagementSettingsComponentsFieldCategoryObj from './kbn_management_settings_components_field_category.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_input.mdx b/api_docs/kbn_management_settings_components_field_input.mdx
index ff72a4457891b..407cd6aafef3c 100644
--- a/api_docs/kbn_management_settings_components_field_input.mdx
+++ b/api_docs/kbn_management_settings_components_field_input.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-input
 title: "@kbn/management-settings-components-field-input"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-input plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-input']
 ---
 import kbnManagementSettingsComponentsFieldInputObj from './kbn_management_settings_components_field_input.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_field_row.mdx b/api_docs/kbn_management_settings_components_field_row.mdx
index 3635b926cc371..3e8320b04b23a 100644
--- a/api_docs/kbn_management_settings_components_field_row.mdx
+++ b/api_docs/kbn_management_settings_components_field_row.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-field-row
 title: "@kbn/management-settings-components-field-row"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-field-row plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-field-row']
 ---
 import kbnManagementSettingsComponentsFieldRowObj from './kbn_management_settings_components_field_row.devdocs.json';
diff --git a/api_docs/kbn_management_settings_components_form.mdx b/api_docs/kbn_management_settings_components_form.mdx
index 65b4a55c1d99b..215fbb0415161 100644
--- a/api_docs/kbn_management_settings_components_form.mdx
+++ b/api_docs/kbn_management_settings_components_form.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-components-form
 title: "@kbn/management-settings-components-form"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-components-form plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-components-form']
 ---
 import kbnManagementSettingsComponentsFormObj from './kbn_management_settings_components_form.devdocs.json';
diff --git a/api_docs/kbn_management_settings_field_definition.mdx b/api_docs/kbn_management_settings_field_definition.mdx
index f3a66c51dc52c..5b1b2807ab339 100644
--- a/api_docs/kbn_management_settings_field_definition.mdx
+++ b/api_docs/kbn_management_settings_field_definition.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-field-definition
 title: "@kbn/management-settings-field-definition"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-field-definition plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-field-definition']
 ---
 import kbnManagementSettingsFieldDefinitionObj from './kbn_management_settings_field_definition.devdocs.json';
diff --git a/api_docs/kbn_management_settings_ids.mdx b/api_docs/kbn_management_settings_ids.mdx
index 261348381e3ea..b9bf6cf2a7005 100644
--- a/api_docs/kbn_management_settings_ids.mdx
+++ b/api_docs/kbn_management_settings_ids.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-ids
 title: "@kbn/management-settings-ids"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-ids plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-ids']
 ---
 import kbnManagementSettingsIdsObj from './kbn_management_settings_ids.devdocs.json';
diff --git a/api_docs/kbn_management_settings_section_registry.mdx b/api_docs/kbn_management_settings_section_registry.mdx
index f608338450673..0819d0bfbb7c8 100644
--- a/api_docs/kbn_management_settings_section_registry.mdx
+++ b/api_docs/kbn_management_settings_section_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-section-registry
 title: "@kbn/management-settings-section-registry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-section-registry plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-section-registry']
 ---
 import kbnManagementSettingsSectionRegistryObj from './kbn_management_settings_section_registry.devdocs.json';
diff --git a/api_docs/kbn_management_settings_types.mdx b/api_docs/kbn_management_settings_types.mdx
index 7eba08c9e7d84..d7c65c76d482d 100644
--- a/api_docs/kbn_management_settings_types.mdx
+++ b/api_docs/kbn_management_settings_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-types
 title: "@kbn/management-settings-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-types']
 ---
 import kbnManagementSettingsTypesObj from './kbn_management_settings_types.devdocs.json';
diff --git a/api_docs/kbn_management_settings_utilities.mdx b/api_docs/kbn_management_settings_utilities.mdx
index 804fe91a09ddd..cdf448aa90e66 100644
--- a/api_docs/kbn_management_settings_utilities.mdx
+++ b/api_docs/kbn_management_settings_utilities.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-settings-utilities
 title: "@kbn/management-settings-utilities"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-settings-utilities plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-settings-utilities']
 ---
 import kbnManagementSettingsUtilitiesObj from './kbn_management_settings_utilities.devdocs.json';
diff --git a/api_docs/kbn_management_storybook_config.mdx b/api_docs/kbn_management_storybook_config.mdx
index ba63f756f4de7..cd588c4f68580 100644
--- a/api_docs/kbn_management_storybook_config.mdx
+++ b/api_docs/kbn_management_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-management-storybook-config
 title: "@kbn/management-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/management-storybook-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/management-storybook-config']
 ---
 import kbnManagementStorybookConfigObj from './kbn_management_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_mapbox_gl.mdx b/api_docs/kbn_mapbox_gl.mdx
index c557c3a2b8c7b..ca2e7179f046a 100644
--- a/api_docs/kbn_mapbox_gl.mdx
+++ b/api_docs/kbn_mapbox_gl.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mapbox-gl
 title: "@kbn/mapbox-gl"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mapbox-gl plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mapbox-gl']
 ---
 import kbnMapboxGlObj from './kbn_mapbox_gl.devdocs.json';
diff --git a/api_docs/kbn_maps_vector_tile_utils.mdx b/api_docs/kbn_maps_vector_tile_utils.mdx
index a99960aab7b78..a3ad4176a8a81 100644
--- a/api_docs/kbn_maps_vector_tile_utils.mdx
+++ b/api_docs/kbn_maps_vector_tile_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-maps-vector-tile-utils
 title: "@kbn/maps-vector-tile-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/maps-vector-tile-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/maps-vector-tile-utils']
 ---
 import kbnMapsVectorTileUtilsObj from './kbn_maps_vector_tile_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_agg_utils.devdocs.json b/api_docs/kbn_ml_agg_utils.devdocs.json
index e3ff567359018..f36963ad8bd0c 100644
--- a/api_docs/kbn_ml_agg_utils.devdocs.json
+++ b/api_docs/kbn_ml_agg_utils.devdocs.json
@@ -84,30 +84,18 @@
         "tags": [],
         "label": "fetchAggIntervals",
         "description": [
-          "\nReturns aggregation intervals for the supplied document fields.\n"
+          "\nAsynchronously fetches aggregation intervals from an Elasticsearch client.\n"
         ],
         "signature": [
-          "(client: ",
-          {
-            "pluginId": "@kbn/core-elasticsearch-server",
-            "scope": "common",
-            "docId": "kibKbnCoreElasticsearchServerPluginApi",
-            "section": "def-common.ElasticsearchClient",
-            "text": "ElasticsearchClient"
-          },
-          ", indexPattern: string, query: ",
-          "QueryDslQueryContainer",
-          ", fields: ",
+          "(params: ",
           {
             "pluginId": "@kbn/ml-agg-utils",
             "scope": "common",
             "docId": "kibKbnMlAggUtilsPluginApi",
-            "section": "def-common.HistogramField",
-            "text": "HistogramField"
+            "section": "def-common.FetchAggIntervalsParams",
+            "text": "FetchAggIntervalsParams"
           },
-          "[], samplerShardSize: number, runtimeMappings?: ",
-          "MappingRuntimeFields",
-          " | undefined, abortSignal?: AbortSignal | undefined, randomSamplerProbability?: number | undefined, randomSamplerSeed?: number | undefined) => Promise<",
+          ") => Promise<",
           {
             "pluginId": "@kbn/ml-agg-utils",
             "scope": "common",
@@ -126,171 +114,27 @@
             "id": "def-common.fetchAggIntervals.$1",
             "type": "Object",
             "tags": [],
-            "label": "client",
+            "label": "params",
             "description": [
-              "- The Elasticsearch client."
-            ],
-            "signature": [
-              {
-                "pluginId": "@kbn/core-elasticsearch-server",
-                "scope": "common",
-                "docId": "kibKbnCoreElasticsearchServerPluginApi",
-                "section": "def-common.ElasticsearchClient",
-                "text": "ElasticsearchClient"
-              }
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$2",
-            "type": "string",
-            "tags": [],
-            "label": "indexPattern",
-            "description": [
-              "- The index pattern to search."
-            ],
-            "signature": [
-              "string"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$3",
-            "type": "Object",
-            "tags": [],
-            "label": "query",
-            "description": [
-              "- The query to filter documents."
-            ],
-            "signature": [
-              "QueryDslQueryContainer"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$4",
-            "type": "Array",
-            "tags": [],
-            "label": "fields",
-            "description": [
-              "- An array of field definitions for which aggregation intervals are requested."
+              "- The parameters for fetching aggregation intervals."
             ],
             "signature": [
               {
                 "pluginId": "@kbn/ml-agg-utils",
                 "scope": "common",
                 "docId": "kibKbnMlAggUtilsPluginApi",
-                "section": "def-common.HistogramField",
-                "text": "HistogramField"
-              },
-              "[]"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$5",
-            "type": "number",
-            "tags": [],
-            "label": "samplerShardSize",
-            "description": [
-              "- The shard size parameter for sampling aggregations. A value less than 1 indicates no sampling."
-            ],
-            "signature": [
-              "number"
+                "section": "def-common.FetchAggIntervalsParams",
+                "text": "FetchAggIntervalsParams"
+              }
             ],
             "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
             "deprecated": false,
             "trackAdoption": false,
             "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$6",
-            "type": "Object",
-            "tags": [],
-            "label": "runtimeMappings",
-            "description": [
-              "- Optional runtime mappings to apply."
-            ],
-            "signature": [
-              "MappingRuntimeFields",
-              " | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$7",
-            "type": "Object",
-            "tags": [],
-            "label": "abortSignal",
-            "description": [
-              "- Optional AbortSignal for canceling the request."
-            ],
-            "signature": [
-              "AbortSignal | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$8",
-            "type": "number",
-            "tags": [],
-            "label": "randomSamplerProbability",
-            "description": [
-              "- Optional probability value for random sampling."
-            ],
-            "signature": [
-              "number | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchAggIntervals.$9",
-            "type": "number",
-            "tags": [],
-            "label": "randomSamplerSeed",
-            "description": [
-              "- Optional seed value for random sampling."
-            ],
-            "signature": [
-              "number | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
           }
         ],
         "returnComment": [
-          "A promise that resolves to a map of aggregation intervals for the specified fields."
+          "A promise that resolves to a map of numeric column statistics."
         ],
         "initialIsOpen": false
       },
@@ -301,28 +145,10 @@
         "tags": [],
         "label": "fetchHistogramsForFields",
         "description": [
-          "\nFetches data to be used in mini histogram charts. Supports auto-identifying\nthe histogram interval and min/max values.\n"
+          "\nAsynchronously fetches histograms for specified fields from an Elasticsearch client.\n"
         ],
         "signature": [
-          "(client: ",
-          {
-            "pluginId": "@kbn/core-elasticsearch-server",
-            "scope": "common",
-            "docId": "kibKbnCoreElasticsearchServerPluginApi",
-            "section": "def-common.ElasticsearchClient",
-            "text": "ElasticsearchClient"
-          },
-          ", indexPattern: string, query: any, fields: ",
-          {
-            "pluginId": "@kbn/ml-agg-utils",
-            "scope": "common",
-            "docId": "kibKbnMlAggUtilsPluginApi",
-            "section": "def-common.FieldsForHistograms",
-            "text": "FieldsForHistograms"
-          },
-          ", samplerShardSize: number, runtimeMappings?: ",
-          "MappingRuntimeFields",
-          " | undefined, abortSignal?: AbortSignal | undefined, randomSamplerProbability?: number | undefined, randomSamplerSeed?: number | undefined) => Promise<(",
+          "(params: FetchHistogramsForFieldsParams) => Promise<(",
           {
             "pluginId": "@kbn/ml-agg-utils",
             "scope": "common",
@@ -341,170 +167,21 @@
             "id": "def-common.fetchHistogramsForFields.$1",
             "type": "Object",
             "tags": [],
-            "label": "client",
+            "label": "params",
             "description": [
-              "Elasticsearch Client"
+              "The parameters for fetching histograms."
             ],
             "signature": [
-              {
-                "pluginId": "@kbn/core-elasticsearch-server",
-                "scope": "common",
-                "docId": "kibKbnCoreElasticsearchServerPluginApi",
-                "section": "def-common.ElasticsearchClient",
-                "text": "ElasticsearchClient"
-              }
+              "FetchHistogramsForFieldsParams"
             ],
             "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
             "deprecated": false,
             "trackAdoption": false,
             "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$2",
-            "type": "string",
-            "tags": [],
-            "label": "indexPattern",
-            "description": [
-              "index pattern to be queried"
-            ],
-            "signature": [
-              "string"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$3",
-            "type": "Any",
-            "tags": [],
-            "label": "query",
-            "description": [
-              "Elasticsearch query"
-            ],
-            "signature": [
-              "any"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$4",
-            "type": "Array",
-            "tags": [],
-            "label": "fields",
-            "description": [
-              "the fields the histograms should be generated for"
-            ],
-            "signature": [
-              {
-                "pluginId": "@kbn/ml-agg-utils",
-                "scope": "common",
-                "docId": "kibKbnMlAggUtilsPluginApi",
-                "section": "def-common.FieldsForHistograms",
-                "text": "FieldsForHistograms"
-              }
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$5",
-            "type": "number",
-            "tags": [],
-            "label": "samplerShardSize",
-            "description": [
-              "shard_size parameter of the sampler aggregation"
-            ],
-            "signature": [
-              "number"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$6",
-            "type": "Object",
-            "tags": [],
-            "label": "runtimeMappings",
-            "description": [
-              "optional runtime mappings"
-            ],
-            "signature": [
-              "MappingRuntimeFields",
-              " | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$7",
-            "type": "Object",
-            "tags": [],
-            "label": "abortSignal",
-            "description": [
-              "optional abort signal"
-            ],
-            "signature": [
-              "AbortSignal | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$8",
-            "type": "number",
-            "tags": [],
-            "label": "randomSamplerProbability",
-            "description": [
-              "optional random sampler probability"
-            ],
-            "signature": [
-              "number | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
-          },
-          {
-            "parentPluginId": "@kbn/ml-agg-utils",
-            "id": "def-common.fetchHistogramsForFields.$9",
-            "type": "number",
-            "tags": [],
-            "label": "randomSamplerSeed",
-            "description": [
-              "optional random sampler seed"
-            ],
-            "signature": [
-              "number | undefined"
-            ],
-            "path": "x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "isRequired": false
           }
         ],
         "returnComment": [
-          "an array of histogram data for each supplied field"
+          "A promise that resolves with the fetched histograms."
         ],
         "initialIsOpen": false
       },
@@ -821,6 +498,1304 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/ml-agg-utils",
+        "id": "def-common.FetchAggIntervalsParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "FetchAggIntervalsParams",
+        "description": [
+          "\nInterface for the parameters required to fetch aggregation intervals."
+        ],
+        "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/ml-agg-utils",
+            "id": "def-common.FetchAggIntervalsParams.esClient",
+            "type": "Object",
+            "tags": [],
+            "label": "esClient",
+            "description": [
+              "The Elasticsearch client to use for the query."
+            ],
+            "signature": [
+              "{ create: { <TDocument = unknown>(this: That, params: ",
+              "CreateRequest",
+              "<TDocument> | ",
+              "CreateRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; <TDocument = unknown>(this: That, params: ",
+              "CreateRequest",
+              "<TDocument> | ",
+              "CreateRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "WriteResponseBase",
+              ", unknown>>; <TDocument = unknown>(this: That, params: ",
+              "CreateRequest",
+              "<TDocument> | ",
+              "CreateRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; }; update: { <TDocument = unknown, TPartialDocument = unknown, TDocumentR = unknown>(this: That, params: ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument> | ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "UpdateResponse",
+              "<TDocumentR>>; <TDocument = unknown, TPartialDocument = unknown, TDocumentR = unknown>(this: That, params: ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument> | ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "UpdateResponse",
+              "<TDocumentR>, unknown>>; <TDocument = unknown, TPartialDocument = unknown, TDocumentR = unknown>(this: That, params: ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument> | ",
+              "UpdateRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "UpdateResponse",
+              "<TDocumentR>>; }; get: { <TDocument = unknown>(this: That, params: ",
+              "GetRequest",
+              " | ",
+              "GetRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "GetResponse",
+              "<TDocument>>; <TDocument = unknown>(this: That, params: ",
+              "GetRequest",
+              " | ",
+              "GetRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "GetResponse",
+              "<TDocument>, unknown>>; <TDocument = unknown>(this: That, params: ",
+              "GetRequest",
+              " | ",
+              "GetRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "GetResponse",
+              "<TDocument>>; }; delete: { (this: That, params: ",
+              "DeleteRequest",
+              " | ",
+              "DeleteRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; (this: That, params: ",
+              "DeleteRequest",
+              " | ",
+              "DeleteRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "WriteResponseBase",
+              ", unknown>>; (this: That, params: ",
+              "DeleteRequest",
+              " | ",
+              "DeleteRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; }; helpers: ",
+              "default",
+              "; search: { <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params?: ",
+              "SearchRequest",
+              " | ",
+              "SearchRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "SearchResponse",
+              "<TDocument, TAggregations>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params?: ",
+              "SearchRequest",
+              " | ",
+              "SearchRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "SearchResponse",
+              "<TDocument, TAggregations>, unknown>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params?: ",
+              "SearchRequest",
+              " | ",
+              "SearchRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "SearchResponse",
+              "<TDocument, TAggregations>>; }; name: string | symbol; [kAsyncSearch]: symbol | null; [kAutoscaling]: symbol | null; [kCat]: symbol | null; [kCcr]: symbol | null; [kCluster]: symbol | null; [kDanglingIndices]: symbol | null; [kEnrich]: symbol | null; [kEql]: symbol | null; [kEsql]: symbol | null; [kFeatures]: symbol | null; [kFleet]: symbol | null; [kGraph]: symbol | null; [kIlm]: symbol | null; [kIndices]: symbol | null; [kInference]: symbol | null; [kIngest]: symbol | null; [kLicense]: symbol | null; [kLogstash]: symbol | null; [kMigration]: symbol | null; [kMl]: symbol | null; [kMonitoring]: symbol | null; [kNodes]: symbol | null; [kQueryRuleset]: symbol | null; [kRollup]: symbol | null; [kSearchApplication]: symbol | null; [kSearchableSnapshots]: symbol | null; [kSecurity]: symbol | null; [kShutdown]: symbol | null; [kSlm]: symbol | null; [kSnapshot]: symbol | null; [kSql]: symbol | null; [kSsl]: symbol | null; [kSynonyms]: symbol | null; [kTasks]: symbol | null; [kTextStructure]: symbol | null; [kTransform]: symbol | null; [kWatcher]: symbol | null; [kXpack]: symbol | null; transport: ",
+              "default",
+              "; child: (opts: ",
+              "ClientOptions",
+              ") => ",
+              "default",
+              "; asyncSearch: ",
+              "default",
+              "; autoscaling: ",
+              "default",
+              "; bulk: { <TDocument = unknown, TPartialDocument = unknown>(this: That, params: ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument> | ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "BulkResponse",
+              ">; <TDocument = unknown, TPartialDocument = unknown>(this: That, params: ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument> | ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "BulkResponse",
+              ", unknown>>; <TDocument = unknown, TPartialDocument = unknown>(this: That, params: ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument> | ",
+              "BulkRequest",
+              "<TDocument, TPartialDocument>, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "BulkResponse",
+              ">; }; cat: ",
+              "default",
+              "; ccr: ",
+              "default",
+              "; clearScroll: { (this: That, params?: ",
+              "ClearScrollRequest",
+              " | ",
+              "ClearScrollRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ClearScrollResponse",
+              ">; (this: That, params?: ",
+              "ClearScrollRequest",
+              " | ",
+              "ClearScrollRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ClearScrollResponse",
+              ", unknown>>; (this: That, params?: ",
+              "ClearScrollRequest",
+              " | ",
+              "ClearScrollRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ClearScrollResponse",
+              ">; }; closePointInTime: { (this: That, params: ",
+              "ClosePointInTimeRequest",
+              " | ",
+              "ClosePointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ClosePointInTimeResponse",
+              ">; (this: That, params: ",
+              "ClosePointInTimeRequest",
+              " | ",
+              "ClosePointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ClosePointInTimeResponse",
+              ", unknown>>; (this: That, params: ",
+              "ClosePointInTimeRequest",
+              " | ",
+              "ClosePointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ClosePointInTimeResponse",
+              ">; }; cluster: ",
+              "default",
+              "; count: { (this: That, params?: ",
+              "CountRequest",
+              " | ",
+              "CountRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "CountResponse",
+              ">; (this: That, params?: ",
+              "CountRequest",
+              " | ",
+              "CountRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "CountResponse",
+              ", unknown>>; (this: That, params?: ",
+              "CountRequest",
+              " | ",
+              "CountRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "CountResponse",
+              ">; }; danglingIndices: ",
+              "default",
+              "; deleteByQuery: { (this: That, params: ",
+              "DeleteByQueryRequest",
+              " | ",
+              "DeleteByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "DeleteByQueryResponse",
+              ">; (this: That, params: ",
+              "DeleteByQueryRequest",
+              " | ",
+              "DeleteByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "DeleteByQueryResponse",
+              ", unknown>>; (this: That, params: ",
+              "DeleteByQueryRequest",
+              " | ",
+              "DeleteByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "DeleteByQueryResponse",
+              ">; }; deleteByQueryRethrottle: { (this: That, params: ",
+              "DeleteByQueryRethrottleRequest",
+              " | ",
+              "DeleteByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "TasksTaskListResponseBase",
+              ">; (this: That, params: ",
+              "DeleteByQueryRethrottleRequest",
+              " | ",
+              "DeleteByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "TasksTaskListResponseBase",
+              ", unknown>>; (this: That, params: ",
+              "DeleteByQueryRethrottleRequest",
+              " | ",
+              "DeleteByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "TasksTaskListResponseBase",
+              ">; }; deleteScript: { (this: That, params: ",
+              "DeleteScriptRequest",
+              " | ",
+              "DeleteScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "AcknowledgedResponseBase",
+              ">; (this: That, params: ",
+              "DeleteScriptRequest",
+              " | ",
+              "DeleteScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "AcknowledgedResponseBase",
+              ", unknown>>; (this: That, params: ",
+              "DeleteScriptRequest",
+              " | ",
+              "DeleteScriptRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "AcknowledgedResponseBase",
+              ">; }; enrich: ",
+              "default",
+              "; eql: ",
+              "default",
+              "; esql: ",
+              "default",
+              "; exists: { (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsRequest",
+              " | ",
+              "ExistsRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; existsSource: { (this: That, params: ",
+              "ExistsSourceRequest",
+              " | ",
+              "ExistsSourceRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params: ",
+              "ExistsSourceRequest",
+              " | ",
+              "ExistsSourceRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params: ",
+              "ExistsSourceRequest",
+              " | ",
+              "ExistsSourceRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; explain: { <TDocument = unknown>(this: That, params: ",
+              "ExplainRequest",
+              " | ",
+              "ExplainRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ExplainResponse",
+              "<TDocument>>; <TDocument = unknown>(this: That, params: ",
+              "ExplainRequest",
+              " | ",
+              "ExplainRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ExplainResponse",
+              "<TDocument>, unknown>>; <TDocument = unknown>(this: That, params: ",
+              "ExplainRequest",
+              " | ",
+              "ExplainRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ExplainResponse",
+              "<TDocument>>; }; features: ",
+              "default",
+              "; fieldCaps: { (this: That, params?: ",
+              "FieldCapsRequest",
+              " | ",
+              "FieldCapsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "FieldCapsResponse",
+              ">; (this: That, params?: ",
+              "FieldCapsRequest",
+              " | ",
+              "FieldCapsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "FieldCapsResponse",
+              ", unknown>>; (this: That, params?: ",
+              "FieldCapsRequest",
+              " | ",
+              "FieldCapsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "FieldCapsResponse",
+              ">; }; fleet: ",
+              "default",
+              "; getScript: { (this: That, params: ",
+              "GetScriptRequest",
+              " | ",
+              "GetScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "GetScriptResponse",
+              ">; (this: That, params: ",
+              "GetScriptRequest",
+              " | ",
+              "GetScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "GetScriptResponse",
+              ", unknown>>; (this: That, params: ",
+              "GetScriptRequest",
+              " | ",
+              "GetScriptRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "GetScriptResponse",
+              ">; }; getScriptContext: { (this: That, params?: ",
+              "GetScriptContextRequest",
+              " | ",
+              "GetScriptContextRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "GetScriptContextResponse",
+              ">; (this: That, params?: ",
+              "GetScriptContextRequest",
+              " | ",
+              "GetScriptContextRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "GetScriptContextResponse",
+              ", unknown>>; (this: That, params?: ",
+              "GetScriptContextRequest",
+              " | ",
+              "GetScriptContextRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "GetScriptContextResponse",
+              ">; }; getScriptLanguages: { (this: That, params?: ",
+              "GetScriptLanguagesRequest",
+              " | ",
+              "GetScriptLanguagesRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "GetScriptLanguagesResponse",
+              ">; (this: That, params?: ",
+              "GetScriptLanguagesRequest",
+              " | ",
+              "GetScriptLanguagesRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "GetScriptLanguagesResponse",
+              ", unknown>>; (this: That, params?: ",
+              "GetScriptLanguagesRequest",
+              " | ",
+              "GetScriptLanguagesRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "GetScriptLanguagesResponse",
+              ">; }; getSource: { <TDocument = unknown>(this: That, params: ",
+              "GetSourceRequest",
+              " | ",
+              "GetSourceRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<TDocument>; <TDocument = unknown>(this: That, params: ",
+              "GetSourceRequest",
+              " | ",
+              "GetSourceRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<TDocument, unknown>>; <TDocument = unknown>(this: That, params: ",
+              "GetSourceRequest",
+              " | ",
+              "GetSourceRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<TDocument>; }; graph: ",
+              "default",
+              "; healthReport: { (this: That, params?: ",
+              "HealthReportRequest",
+              " | ",
+              "HealthReportRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "HealthReportResponse",
+              ">; (this: That, params?: ",
+              "HealthReportRequest",
+              " | ",
+              "HealthReportRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "HealthReportResponse",
+              ", unknown>>; (this: That, params?: ",
+              "HealthReportRequest",
+              " | ",
+              "HealthReportRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "HealthReportResponse",
+              ">; }; ilm: ",
+              "default",
+              "; index: { <TDocument = unknown>(this: That, params: ",
+              "IndexRequest",
+              "<TDocument> | ",
+              "IndexRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; <TDocument = unknown>(this: That, params: ",
+              "IndexRequest",
+              "<TDocument> | ",
+              "IndexRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "WriteResponseBase",
+              ", unknown>>; <TDocument = unknown>(this: That, params: ",
+              "IndexRequest",
+              "<TDocument> | ",
+              "IndexRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "WriteResponseBase",
+              ">; }; indices: ",
+              "default",
+              "; inference: ",
+              "default",
+              "; info: { (this: That, params?: ",
+              "InfoRequest",
+              " | ",
+              "InfoRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "InfoResponse",
+              ">; (this: That, params?: ",
+              "InfoRequest",
+              " | ",
+              "InfoRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "InfoResponse",
+              ", unknown>>; (this: That, params?: ",
+              "InfoRequest",
+              " | ",
+              "InfoRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "InfoResponse",
+              ">; }; ingest: ",
+              "default",
+              "; knnSearch: { <TDocument = unknown>(this: That, params: ",
+              "KnnSearchRequest",
+              " | ",
+              "KnnSearchRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "KnnSearchResponse",
+              "<TDocument>>; <TDocument = unknown>(this: That, params: ",
+              "KnnSearchRequest",
+              " | ",
+              "KnnSearchRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "KnnSearchResponse",
+              "<TDocument>, unknown>>; <TDocument = unknown>(this: That, params: ",
+              "KnnSearchRequest",
+              " | ",
+              "KnnSearchRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "KnnSearchResponse",
+              "<TDocument>>; }; license: ",
+              "default",
+              "; logstash: ",
+              "default",
+              "; mget: { <TDocument = unknown>(this: That, params?: ",
+              "MgetRequest",
+              " | ",
+              "MgetRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "MgetResponse",
+              "<TDocument>>; <TDocument = unknown>(this: That, params?: ",
+              "MgetRequest",
+              " | ",
+              "MgetRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "MgetResponse",
+              "<TDocument>, unknown>>; <TDocument = unknown>(this: That, params?: ",
+              "MgetRequest",
+              " | ",
+              "MgetRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "MgetResponse",
+              "<TDocument>>; }; migration: ",
+              "default",
+              "; ml: ",
+              "default",
+              "; monitoring: ",
+              "default",
+              "; msearch: { <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchRequest",
+              " | ",
+              "MsearchRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "MsearchResponse",
+              "<TDocument, TAggregations>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchRequest",
+              " | ",
+              "MsearchRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "MsearchResponse",
+              "<TDocument, TAggregations>, unknown>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchRequest",
+              " | ",
+              "MsearchRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "MsearchResponse",
+              "<TDocument, TAggregations>>; }; msearchTemplate: { <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchTemplateRequest",
+              " | ",
+              "MsearchTemplateRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "MsearchTemplateResponse",
+              "<TDocument, TAggregations>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchTemplateRequest",
+              " | ",
+              "MsearchTemplateRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "MsearchTemplateResponse",
+              "<TDocument, TAggregations>, unknown>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "MsearchTemplateRequest",
+              " | ",
+              "MsearchTemplateRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "MsearchTemplateResponse",
+              "<TDocument, TAggregations>>; }; mtermvectors: { (this: That, params?: ",
+              "MtermvectorsRequest",
+              " | ",
+              "MtermvectorsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "MtermvectorsResponse",
+              ">; (this: That, params?: ",
+              "MtermvectorsRequest",
+              " | ",
+              "MtermvectorsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "MtermvectorsResponse",
+              ", unknown>>; (this: That, params?: ",
+              "MtermvectorsRequest",
+              " | ",
+              "MtermvectorsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "MtermvectorsResponse",
+              ">; }; nodes: ",
+              "default",
+              "; openPointInTime: { (this: That, params: ",
+              "OpenPointInTimeRequest",
+              " | ",
+              "OpenPointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "OpenPointInTimeResponse",
+              ">; (this: That, params: ",
+              "OpenPointInTimeRequest",
+              " | ",
+              "OpenPointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "OpenPointInTimeResponse",
+              ", unknown>>; (this: That, params: ",
+              "OpenPointInTimeRequest",
+              " | ",
+              "OpenPointInTimeRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "OpenPointInTimeResponse",
+              ">; }; ping: { (this: That, params?: ",
+              "PingRequest",
+              " | ",
+              "PingRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<boolean>; (this: That, params?: ",
+              "PingRequest",
+              " | ",
+              "PingRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<boolean, unknown>>; (this: That, params?: ",
+              "PingRequest",
+              " | ",
+              "PingRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<boolean>; }; putScript: { (this: That, params: ",
+              "PutScriptRequest",
+              " | ",
+              "PutScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "AcknowledgedResponseBase",
+              ">; (this: That, params: ",
+              "PutScriptRequest",
+              " | ",
+              "PutScriptRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "AcknowledgedResponseBase",
+              ", unknown>>; (this: That, params: ",
+              "PutScriptRequest",
+              " | ",
+              "PutScriptRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "AcknowledgedResponseBase",
+              ">; }; queryRuleset: ",
+              "default",
+              "; rankEval: { (this: That, params: ",
+              "RankEvalRequest",
+              " | ",
+              "RankEvalRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "RankEvalResponse",
+              ">; (this: That, params: ",
+              "RankEvalRequest",
+              " | ",
+              "RankEvalRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "RankEvalResponse",
+              ", unknown>>; (this: That, params: ",
+              "RankEvalRequest",
+              " | ",
+              "RankEvalRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "RankEvalResponse",
+              ">; }; reindex: { (this: That, params: ",
+              "ReindexRequest",
+              " | ",
+              "ReindexRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ReindexResponse",
+              ">; (this: That, params: ",
+              "ReindexRequest",
+              " | ",
+              "ReindexRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ReindexResponse",
+              ", unknown>>; (this: That, params: ",
+              "ReindexRequest",
+              " | ",
+              "ReindexRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ReindexResponse",
+              ">; }; reindexRethrottle: { (this: That, params: ",
+              "ReindexRethrottleRequest",
+              " | ",
+              "ReindexRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ReindexRethrottleResponse",
+              ">; (this: That, params: ",
+              "ReindexRethrottleRequest",
+              " | ",
+              "ReindexRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ReindexRethrottleResponse",
+              ", unknown>>; (this: That, params: ",
+              "ReindexRethrottleRequest",
+              " | ",
+              "ReindexRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ReindexRethrottleResponse",
+              ">; }; renderSearchTemplate: { (this: That, params?: ",
+              "RenderSearchTemplateRequest",
+              " | ",
+              "RenderSearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "RenderSearchTemplateResponse",
+              ">; (this: That, params?: ",
+              "RenderSearchTemplateRequest",
+              " | ",
+              "RenderSearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "RenderSearchTemplateResponse",
+              ", unknown>>; (this: That, params?: ",
+              "RenderSearchTemplateRequest",
+              " | ",
+              "RenderSearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "RenderSearchTemplateResponse",
+              ">; }; rollup: ",
+              "default",
+              "; scriptsPainlessExecute: { <TResult = unknown>(this: That, params?: ",
+              "ScriptsPainlessExecuteRequest",
+              " | ",
+              "ScriptsPainlessExecuteRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ScriptsPainlessExecuteResponse",
+              "<TResult>>; <TResult = unknown>(this: That, params?: ",
+              "ScriptsPainlessExecuteRequest",
+              " | ",
+              "ScriptsPainlessExecuteRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ScriptsPainlessExecuteResponse",
+              "<TResult>, unknown>>; <TResult = unknown>(this: That, params?: ",
+              "ScriptsPainlessExecuteRequest",
+              " | ",
+              "ScriptsPainlessExecuteRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ScriptsPainlessExecuteResponse",
+              "<TResult>>; }; scroll: { <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "ScrollRequest",
+              " | ",
+              "ScrollRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "ScrollResponse",
+              "<TDocument, TAggregations>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "ScrollRequest",
+              " | ",
+              "ScrollRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "ScrollResponse",
+              "<TDocument, TAggregations>, unknown>>; <TDocument = unknown, TAggregations = Record<string, ",
+              "AggregationsAggregate",
+              ">>(this: That, params: ",
+              "ScrollRequest",
+              " | ",
+              "ScrollRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "ScrollResponse",
+              "<TDocument, TAggregations>>; }; searchApplication: ",
+              "default",
+              "; searchMvt: { (this: That, params: ",
+              "SearchMvtRequest",
+              " | ",
+              "SearchMvtRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<ArrayBuffer>; (this: That, params: ",
+              "SearchMvtRequest",
+              " | ",
+              "SearchMvtRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<ArrayBuffer, unknown>>; (this: That, params: ",
+              "SearchMvtRequest",
+              " | ",
+              "SearchMvtRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<ArrayBuffer>; }; searchShards: { (this: That, params?: ",
+              "SearchShardsRequest",
+              " | ",
+              "SearchShardsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "SearchShardsResponse",
+              ">; (this: That, params?: ",
+              "SearchShardsRequest",
+              " | ",
+              "SearchShardsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "SearchShardsResponse",
+              ", unknown>>; (this: That, params?: ",
+              "SearchShardsRequest",
+              " | ",
+              "SearchShardsRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "SearchShardsResponse",
+              ">; }; searchTemplate: { <TDocument = unknown>(this: That, params?: ",
+              "SearchTemplateRequest",
+              " | ",
+              "SearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "SearchTemplateResponse",
+              "<TDocument>>; <TDocument = unknown>(this: That, params?: ",
+              "SearchTemplateRequest",
+              " | ",
+              "SearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "SearchTemplateResponse",
+              "<TDocument>, unknown>>; <TDocument = unknown>(this: That, params?: ",
+              "SearchTemplateRequest",
+              " | ",
+              "SearchTemplateRequest",
+              " | undefined, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "SearchTemplateResponse",
+              "<TDocument>>; }; searchableSnapshots: ",
+              "default",
+              "; security: ",
+              "default",
+              "; shutdown: ",
+              "default",
+              "; slm: ",
+              "default",
+              "; snapshot: ",
+              "default",
+              "; sql: ",
+              "default",
+              "; ssl: ",
+              "default",
+              "; synonyms: ",
+              "default",
+              "; tasks: ",
+              "default",
+              "; termsEnum: { (this: That, params: ",
+              "TermsEnumRequest",
+              " | ",
+              "TermsEnumRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "TermsEnumResponse",
+              ">; (this: That, params: ",
+              "TermsEnumRequest",
+              " | ",
+              "TermsEnumRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "TermsEnumResponse",
+              ", unknown>>; (this: That, params: ",
+              "TermsEnumRequest",
+              " | ",
+              "TermsEnumRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "TermsEnumResponse",
+              ">; }; termvectors: { <TDocument = unknown>(this: That, params: ",
+              "TermvectorsRequest",
+              "<TDocument> | ",
+              "TermvectorsRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "TermvectorsResponse",
+              ">; <TDocument = unknown>(this: That, params: ",
+              "TermvectorsRequest",
+              "<TDocument> | ",
+              "TermvectorsRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "TermvectorsResponse",
+              ", unknown>>; <TDocument = unknown>(this: That, params: ",
+              "TermvectorsRequest",
+              "<TDocument> | ",
+              "TermvectorsRequest",
+              "<TDocument>, options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "TermvectorsResponse",
+              ">; }; textStructure: ",
+              "default",
+              "; transform: ",
+              "default",
+              "; updateByQuery: { (this: That, params: ",
+              "UpdateByQueryRequest",
+              " | ",
+              "UpdateByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "UpdateByQueryResponse",
+              ">; (this: That, params: ",
+              "UpdateByQueryRequest",
+              " | ",
+              "UpdateByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "UpdateByQueryResponse",
+              ", unknown>>; (this: That, params: ",
+              "UpdateByQueryRequest",
+              " | ",
+              "UpdateByQueryRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "UpdateByQueryResponse",
+              ">; }; updateByQueryRethrottle: { (this: That, params: ",
+              "UpdateByQueryRethrottleRequest",
+              " | ",
+              "UpdateByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithOutMeta",
+              " | undefined): Promise<",
+              "UpdateByQueryRethrottleResponse",
+              ">; (this: That, params: ",
+              "UpdateByQueryRethrottleRequest",
+              " | ",
+              "UpdateByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptionsWithMeta",
+              " | undefined): Promise<",
+              "TransportResult",
+              "<",
+              "UpdateByQueryRethrottleResponse",
+              ", unknown>>; (this: That, params: ",
+              "UpdateByQueryRethrottleRequest",
+              " | ",
+              "UpdateByQueryRethrottleRequest",
+              ", options?: ",
+              "TransportRequestOptions",
+              " | undefined): Promise<",
+              "UpdateByQueryRethrottleResponse",
+              ">; }; watcher: ",
+              "default",
+              "; xpack: ",
+              "default",
+              "; }"
+            ],
+            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/ml-agg-utils",
+            "id": "def-common.FetchAggIntervalsParams.abortSignal",
+            "type": "Object",
+            "tags": [],
+            "label": "abortSignal",
+            "description": [
+              "An optional abort signal to cancel the request."
+            ],
+            "signature": [
+              "AbortSignal | undefined"
+            ],
+            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/ml-agg-utils",
+            "id": "def-common.FetchAggIntervalsParams.arguments",
+            "type": "Object",
+            "tags": [],
+            "label": "arguments",
+            "description": [
+              "The arguments for the aggregation query."
+            ],
+            "signature": [
+              "{ indexPattern: string; query: ",
+              "QueryDslQueryContainer",
+              "; fields: ",
+              {
+                "pluginId": "@kbn/ml-agg-utils",
+                "scope": "common",
+                "docId": "kibKbnMlAggUtilsPluginApi",
+                "section": "def-common.HistogramField",
+                "text": "HistogramField"
+              },
+              "[]; samplerShardSize: number; runtimeMappings?: ",
+              "MappingRuntimeFields",
+              " | undefined; randomSamplerProbability?: number | undefined; randomSamplerSeed?: number | undefined; }"
+            ],
+            "path": "x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/ml-agg-utils",
         "id": "def-common.FieldValuePair",
diff --git a/api_docs/kbn_ml_agg_utils.mdx b/api_docs/kbn_ml_agg_utils.mdx
index d2c9848d3c251..8ee3938cb02c0 100644
--- a/api_docs/kbn_ml_agg_utils.mdx
+++ b/api_docs/kbn_ml_agg_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-agg-utils
 title: "@kbn/ml-agg-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-agg-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-agg-utils']
 ---
 import kbnMlAggUtilsObj from './kbn_ml_agg_utils.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) for questi
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 102 | 2 | 0 | 0 |
+| 90 | 1 | 0 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_ml_anomaly_utils.mdx b/api_docs/kbn_ml_anomaly_utils.mdx
index de5e88c806647..d07f30cc90659 100644
--- a/api_docs/kbn_ml_anomaly_utils.mdx
+++ b/api_docs/kbn_ml_anomaly_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-anomaly-utils
 title: "@kbn/ml-anomaly-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-anomaly-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-anomaly-utils']
 ---
 import kbnMlAnomalyUtilsObj from './kbn_ml_anomaly_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_cancellable_search.mdx b/api_docs/kbn_ml_cancellable_search.mdx
index 04fdfd3fbe85c..2c2828919b7b8 100644
--- a/api_docs/kbn_ml_cancellable_search.mdx
+++ b/api_docs/kbn_ml_cancellable_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-cancellable-search
 title: "@kbn/ml-cancellable-search"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-cancellable-search plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-cancellable-search']
 ---
 import kbnMlCancellableSearchObj from './kbn_ml_cancellable_search.devdocs.json';
diff --git a/api_docs/kbn_ml_category_validator.mdx b/api_docs/kbn_ml_category_validator.mdx
index b0d491a2e0c20..8b302035202b3 100644
--- a/api_docs/kbn_ml_category_validator.mdx
+++ b/api_docs/kbn_ml_category_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-category-validator
 title: "@kbn/ml-category-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-category-validator plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-category-validator']
 ---
 import kbnMlCategoryValidatorObj from './kbn_ml_category_validator.devdocs.json';
diff --git a/api_docs/kbn_ml_chi2test.mdx b/api_docs/kbn_ml_chi2test.mdx
index e0244c98f484d..e4d590eed7f62 100644
--- a/api_docs/kbn_ml_chi2test.mdx
+++ b/api_docs/kbn_ml_chi2test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-chi2test
 title: "@kbn/ml-chi2test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-chi2test plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-chi2test']
 ---
 import kbnMlChi2testObj from './kbn_ml_chi2test.devdocs.json';
diff --git a/api_docs/kbn_ml_data_frame_analytics_utils.mdx b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
index 5b22e9a8077b6..093530d03119f 100644
--- a/api_docs/kbn_ml_data_frame_analytics_utils.mdx
+++ b/api_docs/kbn_ml_data_frame_analytics_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-frame-analytics-utils
 title: "@kbn/ml-data-frame-analytics-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-frame-analytics-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-frame-analytics-utils']
 ---
 import kbnMlDataFrameAnalyticsUtilsObj from './kbn_ml_data_frame_analytics_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_data_grid.mdx b/api_docs/kbn_ml_data_grid.mdx
index 6597e2a1a88bc..a3d030058419c 100644
--- a/api_docs/kbn_ml_data_grid.mdx
+++ b/api_docs/kbn_ml_data_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-data-grid
 title: "@kbn/ml-data-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-data-grid plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-data-grid']
 ---
 import kbnMlDataGridObj from './kbn_ml_data_grid.devdocs.json';
diff --git a/api_docs/kbn_ml_date_picker.mdx b/api_docs/kbn_ml_date_picker.mdx
index 88e5c19c868a7..9cac3bf2ef225 100644
--- a/api_docs/kbn_ml_date_picker.mdx
+++ b/api_docs/kbn_ml_date_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-picker
 title: "@kbn/ml-date-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-picker plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-picker']
 ---
 import kbnMlDatePickerObj from './kbn_ml_date_picker.devdocs.json';
diff --git a/api_docs/kbn_ml_date_utils.mdx b/api_docs/kbn_ml_date_utils.mdx
index ba97c53c9c921..436156f2347f8 100644
--- a/api_docs/kbn_ml_date_utils.mdx
+++ b/api_docs/kbn_ml_date_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-date-utils
 title: "@kbn/ml-date-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-date-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-date-utils']
 ---
 import kbnMlDateUtilsObj from './kbn_ml_date_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_error_utils.mdx b/api_docs/kbn_ml_error_utils.mdx
index 9aa6d4c55e3c0..3db201316a013 100644
--- a/api_docs/kbn_ml_error_utils.mdx
+++ b/api_docs/kbn_ml_error_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-error-utils
 title: "@kbn/ml-error-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-error-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-error-utils']
 ---
 import kbnMlErrorUtilsObj from './kbn_ml_error_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_in_memory_table.mdx b/api_docs/kbn_ml_in_memory_table.mdx
index b4b44ee8d41b5..9b4b68d42407c 100644
--- a/api_docs/kbn_ml_in_memory_table.mdx
+++ b/api_docs/kbn_ml_in_memory_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-in-memory-table
 title: "@kbn/ml-in-memory-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-in-memory-table plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-in-memory-table']
 ---
 import kbnMlInMemoryTableObj from './kbn_ml_in_memory_table.devdocs.json';
diff --git a/api_docs/kbn_ml_is_defined.mdx b/api_docs/kbn_ml_is_defined.mdx
index e4ebc025c2157..cd216d15d16f0 100644
--- a/api_docs/kbn_ml_is_defined.mdx
+++ b/api_docs/kbn_ml_is_defined.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-defined
 title: "@kbn/ml-is-defined"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-defined plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-defined']
 ---
 import kbnMlIsDefinedObj from './kbn_ml_is_defined.devdocs.json';
diff --git a/api_docs/kbn_ml_is_populated_object.mdx b/api_docs/kbn_ml_is_populated_object.mdx
index 2600c1a9d8d23..ea033faa0200f 100644
--- a/api_docs/kbn_ml_is_populated_object.mdx
+++ b/api_docs/kbn_ml_is_populated_object.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-is-populated-object
 title: "@kbn/ml-is-populated-object"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-is-populated-object plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-is-populated-object']
 ---
 import kbnMlIsPopulatedObjectObj from './kbn_ml_is_populated_object.devdocs.json';
diff --git a/api_docs/kbn_ml_kibana_theme.mdx b/api_docs/kbn_ml_kibana_theme.mdx
index dc096bc4ad965..80762c216bf6c 100644
--- a/api_docs/kbn_ml_kibana_theme.mdx
+++ b/api_docs/kbn_ml_kibana_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-kibana-theme
 title: "@kbn/ml-kibana-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-kibana-theme plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-kibana-theme']
 ---
 import kbnMlKibanaThemeObj from './kbn_ml_kibana_theme.devdocs.json';
diff --git a/api_docs/kbn_ml_local_storage.mdx b/api_docs/kbn_ml_local_storage.mdx
index de89382bcf1f1..bd8d0d600928d 100644
--- a/api_docs/kbn_ml_local_storage.mdx
+++ b/api_docs/kbn_ml_local_storage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-local-storage
 title: "@kbn/ml-local-storage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-local-storage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-local-storage']
 ---
 import kbnMlLocalStorageObj from './kbn_ml_local_storage.devdocs.json';
diff --git a/api_docs/kbn_ml_nested_property.mdx b/api_docs/kbn_ml_nested_property.mdx
index 71ee9c742da1b..1082fde885fc4 100644
--- a/api_docs/kbn_ml_nested_property.mdx
+++ b/api_docs/kbn_ml_nested_property.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-nested-property
 title: "@kbn/ml-nested-property"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-nested-property plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-nested-property']
 ---
 import kbnMlNestedPropertyObj from './kbn_ml_nested_property.devdocs.json';
diff --git a/api_docs/kbn_ml_number_utils.mdx b/api_docs/kbn_ml_number_utils.mdx
index 812432087622f..ed61af11d2d1a 100644
--- a/api_docs/kbn_ml_number_utils.mdx
+++ b/api_docs/kbn_ml_number_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-number-utils
 title: "@kbn/ml-number-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-number-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-number-utils']
 ---
 import kbnMlNumberUtilsObj from './kbn_ml_number_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_query_utils.mdx b/api_docs/kbn_ml_query_utils.mdx
index 113ef4815c075..18a95ece0efc5 100644
--- a/api_docs/kbn_ml_query_utils.mdx
+++ b/api_docs/kbn_ml_query_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-query-utils
 title: "@kbn/ml-query-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-query-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-query-utils']
 ---
 import kbnMlQueryUtilsObj from './kbn_ml_query_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_random_sampler_utils.mdx b/api_docs/kbn_ml_random_sampler_utils.mdx
index c202080d43d53..4df647011e94d 100644
--- a/api_docs/kbn_ml_random_sampler_utils.mdx
+++ b/api_docs/kbn_ml_random_sampler_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-random-sampler-utils
 title: "@kbn/ml-random-sampler-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-random-sampler-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-random-sampler-utils']
 ---
 import kbnMlRandomSamplerUtilsObj from './kbn_ml_random_sampler_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_route_utils.mdx b/api_docs/kbn_ml_route_utils.mdx
index 573fc92042f40..e96069e4faf31 100644
--- a/api_docs/kbn_ml_route_utils.mdx
+++ b/api_docs/kbn_ml_route_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-route-utils
 title: "@kbn/ml-route-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-route-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-route-utils']
 ---
 import kbnMlRouteUtilsObj from './kbn_ml_route_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_runtime_field_utils.mdx b/api_docs/kbn_ml_runtime_field_utils.mdx
index c482e6d34d392..9d726ccce7d64 100644
--- a/api_docs/kbn_ml_runtime_field_utils.mdx
+++ b/api_docs/kbn_ml_runtime_field_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-runtime-field-utils
 title: "@kbn/ml-runtime-field-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-runtime-field-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-runtime-field-utils']
 ---
 import kbnMlRuntimeFieldUtilsObj from './kbn_ml_runtime_field_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_string_hash.mdx b/api_docs/kbn_ml_string_hash.mdx
index b24d0ebec9a40..b4cea76738fd9 100644
--- a/api_docs/kbn_ml_string_hash.mdx
+++ b/api_docs/kbn_ml_string_hash.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-string-hash
 title: "@kbn/ml-string-hash"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-string-hash plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-string-hash']
 ---
 import kbnMlStringHashObj from './kbn_ml_string_hash.devdocs.json';
diff --git a/api_docs/kbn_ml_time_buckets.mdx b/api_docs/kbn_ml_time_buckets.mdx
index df48e410183f0..994f6b4aae2eb 100644
--- a/api_docs/kbn_ml_time_buckets.mdx
+++ b/api_docs/kbn_ml_time_buckets.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-time-buckets
 title: "@kbn/ml-time-buckets"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-time-buckets plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-time-buckets']
 ---
 import kbnMlTimeBucketsObj from './kbn_ml_time_buckets.devdocs.json';
diff --git a/api_docs/kbn_ml_trained_models_utils.mdx b/api_docs/kbn_ml_trained_models_utils.mdx
index 4a65edb43c46f..672547666a301 100644
--- a/api_docs/kbn_ml_trained_models_utils.mdx
+++ b/api_docs/kbn_ml_trained_models_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-trained-models-utils
 title: "@kbn/ml-trained-models-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-trained-models-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-trained-models-utils']
 ---
 import kbnMlTrainedModelsUtilsObj from './kbn_ml_trained_models_utils.devdocs.json';
diff --git a/api_docs/kbn_ml_ui_actions.mdx b/api_docs/kbn_ml_ui_actions.mdx
index b9528b3fd9f87..88278dbc812c8 100644
--- a/api_docs/kbn_ml_ui_actions.mdx
+++ b/api_docs/kbn_ml_ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-ui-actions
 title: "@kbn/ml-ui-actions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-ui-actions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-ui-actions']
 ---
 import kbnMlUiActionsObj from './kbn_ml_ui_actions.devdocs.json';
diff --git a/api_docs/kbn_ml_url_state.mdx b/api_docs/kbn_ml_url_state.mdx
index 29826c0bc7ffc..07ae4c27e45aa 100644
--- a/api_docs/kbn_ml_url_state.mdx
+++ b/api_docs/kbn_ml_url_state.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ml-url-state
 title: "@kbn/ml-url-state"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ml-url-state plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ml-url-state']
 ---
 import kbnMlUrlStateObj from './kbn_ml_url_state.devdocs.json';
diff --git a/api_docs/kbn_mock_idp_utils.mdx b/api_docs/kbn_mock_idp_utils.mdx
index faa009fc58089..638c50fdb137f 100644
--- a/api_docs/kbn_mock_idp_utils.mdx
+++ b/api_docs/kbn_mock_idp_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-mock-idp-utils
 title: "@kbn/mock-idp-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/mock-idp-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/mock-idp-utils']
 ---
 import kbnMockIdpUtilsObj from './kbn_mock_idp_utils.devdocs.json';
diff --git a/api_docs/kbn_monaco.mdx b/api_docs/kbn_monaco.mdx
index 44de1094cccff..85062f7b2a077 100644
--- a/api_docs/kbn_monaco.mdx
+++ b/api_docs/kbn_monaco.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-monaco
 title: "@kbn/monaco"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/monaco plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/monaco']
 ---
 import kbnMonacoObj from './kbn_monaco.devdocs.json';
diff --git a/api_docs/kbn_object_versioning.mdx b/api_docs/kbn_object_versioning.mdx
index 0cdd112d2586f..bc6e8573c93e8 100644
--- a/api_docs/kbn_object_versioning.mdx
+++ b/api_docs/kbn_object_versioning.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-object-versioning
 title: "@kbn/object-versioning"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/object-versioning plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/object-versioning']
 ---
 import kbnObjectVersioningObj from './kbn_object_versioning.devdocs.json';
diff --git a/api_docs/kbn_observability_alert_details.mdx b/api_docs/kbn_observability_alert_details.mdx
index 48088869aac6d..01805fd74a6ff 100644
--- a/api_docs/kbn_observability_alert_details.mdx
+++ b/api_docs/kbn_observability_alert_details.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alert-details
 title: "@kbn/observability-alert-details"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alert-details plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alert-details']
 ---
 import kbnObservabilityAlertDetailsObj from './kbn_observability_alert_details.devdocs.json';
diff --git a/api_docs/kbn_observability_alerting_test_data.mdx b/api_docs/kbn_observability_alerting_test_data.mdx
index ae29534c8abf7..4af6c43f357c5 100644
--- a/api_docs/kbn_observability_alerting_test_data.mdx
+++ b/api_docs/kbn_observability_alerting_test_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-alerting-test-data
 title: "@kbn/observability-alerting-test-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-alerting-test-data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-alerting-test-data']
 ---
 import kbnObservabilityAlertingTestDataObj from './kbn_observability_alerting_test_data.devdocs.json';
diff --git a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
index 3aeb8ede66d8e..0516477727aba 100644
--- a/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
+++ b/api_docs/kbn_observability_get_padded_alert_time_range_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-observability-get-padded-alert-time-range-util
 title: "@kbn/observability-get-padded-alert-time-range-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/observability-get-padded-alert-time-range-util plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/observability-get-padded-alert-time-range-util']
 ---
 import kbnObservabilityGetPaddedAlertTimeRangeUtilObj from './kbn_observability_get_padded_alert_time_range_util.devdocs.json';
diff --git a/api_docs/kbn_openapi_bundler.mdx b/api_docs/kbn_openapi_bundler.mdx
index 19f7bc2af5e57..84247ae5afaff 100644
--- a/api_docs/kbn_openapi_bundler.mdx
+++ b/api_docs/kbn_openapi_bundler.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-bundler
 title: "@kbn/openapi-bundler"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-bundler plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-bundler']
 ---
 import kbnOpenapiBundlerObj from './kbn_openapi_bundler.devdocs.json';
diff --git a/api_docs/kbn_openapi_generator.mdx b/api_docs/kbn_openapi_generator.mdx
index eebae8cde4d4e..0d2ac208b7e6f 100644
--- a/api_docs/kbn_openapi_generator.mdx
+++ b/api_docs/kbn_openapi_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-openapi-generator
 title: "@kbn/openapi-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/openapi-generator plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/openapi-generator']
 ---
 import kbnOpenapiGeneratorObj from './kbn_openapi_generator.devdocs.json';
diff --git a/api_docs/kbn_optimizer.mdx b/api_docs/kbn_optimizer.mdx
index 2b36ba70c0145..545592c9554b1 100644
--- a/api_docs/kbn_optimizer.mdx
+++ b/api_docs/kbn_optimizer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer
 title: "@kbn/optimizer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer']
 ---
 import kbnOptimizerObj from './kbn_optimizer.devdocs.json';
diff --git a/api_docs/kbn_optimizer_webpack_helpers.mdx b/api_docs/kbn_optimizer_webpack_helpers.mdx
index c79c2416e4445..c5fefaebc736f 100644
--- a/api_docs/kbn_optimizer_webpack_helpers.mdx
+++ b/api_docs/kbn_optimizer_webpack_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-optimizer-webpack-helpers
 title: "@kbn/optimizer-webpack-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/optimizer-webpack-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/optimizer-webpack-helpers']
 ---
 import kbnOptimizerWebpackHelpersObj from './kbn_optimizer_webpack_helpers.devdocs.json';
diff --git a/api_docs/kbn_osquery_io_ts_types.mdx b/api_docs/kbn_osquery_io_ts_types.mdx
index 1dd1cba3f776f..c60dba038b7cd 100644
--- a/api_docs/kbn_osquery_io_ts_types.mdx
+++ b/api_docs/kbn_osquery_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-osquery-io-ts-types
 title: "@kbn/osquery-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/osquery-io-ts-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/osquery-io-ts-types']
 ---
 import kbnOsqueryIoTsTypesObj from './kbn_osquery_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_panel_loader.mdx b/api_docs/kbn_panel_loader.mdx
index c99b483ad6c49..f133e2beda4cc 100644
--- a/api_docs/kbn_panel_loader.mdx
+++ b/api_docs/kbn_panel_loader.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-panel-loader
 title: "@kbn/panel-loader"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/panel-loader plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/panel-loader']
 ---
 import kbnPanelLoaderObj from './kbn_panel_loader.devdocs.json';
diff --git a/api_docs/kbn_performance_testing_dataset_extractor.mdx b/api_docs/kbn_performance_testing_dataset_extractor.mdx
index 35817380bf090..ca1145ef455dc 100644
--- a/api_docs/kbn_performance_testing_dataset_extractor.mdx
+++ b/api_docs/kbn_performance_testing_dataset_extractor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-performance-testing-dataset-extractor
 title: "@kbn/performance-testing-dataset-extractor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/performance-testing-dataset-extractor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/performance-testing-dataset-extractor']
 ---
 import kbnPerformanceTestingDatasetExtractorObj from './kbn_performance_testing_dataset_extractor.devdocs.json';
diff --git a/api_docs/kbn_plugin_check.mdx b/api_docs/kbn_plugin_check.mdx
index f8dbbd0aa5d35..6c54037c12a98 100644
--- a/api_docs/kbn_plugin_check.mdx
+++ b/api_docs/kbn_plugin_check.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-check
 title: "@kbn/plugin-check"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-check plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-check']
 ---
 import kbnPluginCheckObj from './kbn_plugin_check.devdocs.json';
diff --git a/api_docs/kbn_plugin_generator.mdx b/api_docs/kbn_plugin_generator.mdx
index 585de235d00c9..99c83018e5239 100644
--- a/api_docs/kbn_plugin_generator.mdx
+++ b/api_docs/kbn_plugin_generator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-generator
 title: "@kbn/plugin-generator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-generator plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-generator']
 ---
 import kbnPluginGeneratorObj from './kbn_plugin_generator.devdocs.json';
diff --git a/api_docs/kbn_plugin_helpers.mdx b/api_docs/kbn_plugin_helpers.mdx
index a45ccc921f441..de815490846ac 100644
--- a/api_docs/kbn_plugin_helpers.mdx
+++ b/api_docs/kbn_plugin_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-plugin-helpers
 title: "@kbn/plugin-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/plugin-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/plugin-helpers']
 ---
 import kbnPluginHelpersObj from './kbn_plugin_helpers.devdocs.json';
diff --git a/api_docs/kbn_presentation_containers.mdx b/api_docs/kbn_presentation_containers.mdx
index 328c9ee94ba80..c1391988264a9 100644
--- a/api_docs/kbn_presentation_containers.mdx
+++ b/api_docs/kbn_presentation_containers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-containers
 title: "@kbn/presentation-containers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-containers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-containers']
 ---
 import kbnPresentationContainersObj from './kbn_presentation_containers.devdocs.json';
diff --git a/api_docs/kbn_presentation_publishing.devdocs.json b/api_docs/kbn_presentation_publishing.devdocs.json
index e77aadbe13c1c..f4d2eb257223f 100644
--- a/api_docs/kbn_presentation_publishing.devdocs.json
+++ b/api_docs/kbn_presentation_publishing.devdocs.json
@@ -1696,6 +1696,39 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/presentation-publishing",
+        "id": "def-common.hasBlockingError",
+        "type": "Function",
+        "tags": [],
+        "label": "hasBlockingError",
+        "description": [],
+        "signature": [
+          "(api: unknown) => boolean"
+        ],
+        "path": "packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/presentation-publishing",
+            "id": "def-common.hasBlockingError.$1",
+            "type": "Unknown",
+            "tags": [],
+            "label": "api",
+            "description": [],
+            "signature": [
+              "unknown"
+            ],
+            "path": "packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/presentation-publishing",
         "id": "def-common.hasEditCapabilities",
diff --git a/api_docs/kbn_presentation_publishing.mdx b/api_docs/kbn_presentation_publishing.mdx
index fe6817612b298..9a6a8ae21d312 100644
--- a/api_docs/kbn_presentation_publishing.mdx
+++ b/api_docs/kbn_presentation_publishing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-presentation-publishing
 title: "@kbn/presentation-publishing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/presentation-publishing plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/presentation-publishing']
 ---
 import kbnPresentationPublishingObj from './kbn_presentation_publishing.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 214 | 0 | 179 | 5 |
+| 216 | 0 | 181 | 5 |
 
 ## Common
 
diff --git a/api_docs/kbn_profiling_utils.mdx b/api_docs/kbn_profiling_utils.mdx
index c0c8c05b4a2c4..09e6baea4b78c 100644
--- a/api_docs/kbn_profiling_utils.mdx
+++ b/api_docs/kbn_profiling_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-profiling-utils
 title: "@kbn/profiling-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/profiling-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/profiling-utils']
 ---
 import kbnProfilingUtilsObj from './kbn_profiling_utils.devdocs.json';
diff --git a/api_docs/kbn_random_sampling.mdx b/api_docs/kbn_random_sampling.mdx
index 8a19557b81cb3..07d27c59202c7 100644
--- a/api_docs/kbn_random_sampling.mdx
+++ b/api_docs/kbn_random_sampling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-random-sampling
 title: "@kbn/random-sampling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/random-sampling plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/random-sampling']
 ---
 import kbnRandomSamplingObj from './kbn_random_sampling.devdocs.json';
diff --git a/api_docs/kbn_react_field.mdx b/api_docs/kbn_react_field.mdx
index a814aece8c0a6..7b49a30a3d724 100644
--- a/api_docs/kbn_react_field.mdx
+++ b/api_docs/kbn_react_field.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-field
 title: "@kbn/react-field"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-field plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-field']
 ---
 import kbnReactFieldObj from './kbn_react_field.devdocs.json';
diff --git a/api_docs/kbn_react_hooks.mdx b/api_docs/kbn_react_hooks.mdx
index 9bffc52ba86d1..46c0819bf7568 100644
--- a/api_docs/kbn_react_hooks.mdx
+++ b/api_docs/kbn_react_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-hooks
 title: "@kbn/react-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-hooks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-hooks']
 ---
 import kbnReactHooksObj from './kbn_react_hooks.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_common.mdx b/api_docs/kbn_react_kibana_context_common.mdx
index 66dfa11b94e8d..739a94c2e424a 100644
--- a/api_docs/kbn_react_kibana_context_common.mdx
+++ b/api_docs/kbn_react_kibana_context_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-common
 title: "@kbn/react-kibana-context-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-common']
 ---
 import kbnReactKibanaContextCommonObj from './kbn_react_kibana_context_common.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_render.mdx b/api_docs/kbn_react_kibana_context_render.mdx
index 951f6c6ea4bf9..3326520edc59e 100644
--- a/api_docs/kbn_react_kibana_context_render.mdx
+++ b/api_docs/kbn_react_kibana_context_render.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-render
 title: "@kbn/react-kibana-context-render"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-render plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-render']
 ---
 import kbnReactKibanaContextRenderObj from './kbn_react_kibana_context_render.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_root.mdx b/api_docs/kbn_react_kibana_context_root.mdx
index 44535e9c7e45d..31606dac7f3c0 100644
--- a/api_docs/kbn_react_kibana_context_root.mdx
+++ b/api_docs/kbn_react_kibana_context_root.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-root
 title: "@kbn/react-kibana-context-root"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-root plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-root']
 ---
 import kbnReactKibanaContextRootObj from './kbn_react_kibana_context_root.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_styled.mdx b/api_docs/kbn_react_kibana_context_styled.mdx
index feab9cefca614..7113b40106640 100644
--- a/api_docs/kbn_react_kibana_context_styled.mdx
+++ b/api_docs/kbn_react_kibana_context_styled.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-styled
 title: "@kbn/react-kibana-context-styled"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-styled plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-styled']
 ---
 import kbnReactKibanaContextStyledObj from './kbn_react_kibana_context_styled.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_context_theme.mdx b/api_docs/kbn_react_kibana_context_theme.mdx
index d83fd0970cdfb..868356cefda9e 100644
--- a/api_docs/kbn_react_kibana_context_theme.mdx
+++ b/api_docs/kbn_react_kibana_context_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-context-theme
 title: "@kbn/react-kibana-context-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-context-theme plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-context-theme']
 ---
 import kbnReactKibanaContextThemeObj from './kbn_react_kibana_context_theme.devdocs.json';
diff --git a/api_docs/kbn_react_kibana_mount.mdx b/api_docs/kbn_react_kibana_mount.mdx
index b87d6b150a421..0c1a70db3e0bd 100644
--- a/api_docs/kbn_react_kibana_mount.mdx
+++ b/api_docs/kbn_react_kibana_mount.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-react-kibana-mount
 title: "@kbn/react-kibana-mount"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/react-kibana-mount plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/react-kibana-mount']
 ---
 import kbnReactKibanaMountObj from './kbn_react_kibana_mount.devdocs.json';
diff --git a/api_docs/kbn_recently_accessed.devdocs.json b/api_docs/kbn_recently_accessed.devdocs.json
new file mode 100644
index 0000000000000..972588291edf7
--- /dev/null
+++ b/api_docs/kbn_recently_accessed.devdocs.json
@@ -0,0 +1,269 @@
+{
+  "id": "@kbn/recently-accessed",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [
+      {
+        "parentPluginId": "@kbn/recently-accessed",
+        "id": "def-common.RecentlyAccessedService",
+        "type": "Class",
+        "tags": [],
+        "label": "RecentlyAccessedService",
+        "description": [],
+        "path": "packages/kbn-recently-accessed/src/recently_accessed_service.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessedService.start",
+            "type": "Function",
+            "tags": [],
+            "label": "start",
+            "description": [],
+            "signature": [
+              "({ http, key }: StartDeps) => ",
+              {
+                "pluginId": "@kbn/recently-accessed",
+                "scope": "common",
+                "docId": "kibKbnRecentlyAccessedPluginApi",
+                "section": "def-common.RecentlyAccessed",
+                "text": "RecentlyAccessed"
+              }
+            ],
+            "path": "packages/kbn-recently-accessed/src/recently_accessed_service.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/recently-accessed",
+                "id": "def-common.RecentlyAccessedService.start.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "{ http, key }",
+                "description": [],
+                "signature": [
+                  "StartDeps"
+                ],
+                "path": "packages/kbn-recently-accessed/src/recently_accessed_service.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "functions": [],
+    "interfaces": [
+      {
+        "parentPluginId": "@kbn/recently-accessed",
+        "id": "def-common.RecentlyAccessed",
+        "type": "Interface",
+        "tags": [],
+        "label": "RecentlyAccessed",
+        "description": [
+          "\n{@link RecentlyAccessed | APIs} for recently accessed history."
+        ],
+        "path": "packages/kbn-recently-accessed/src/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessed.add",
+            "type": "Function",
+            "tags": [],
+            "label": "add",
+            "description": [
+              "\nAdds a new item to the recently accessed history.\n"
+            ],
+            "signature": [
+              "(link: string, label: string, id: string) => void"
+            ],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/recently-accessed",
+                "id": "def-common.RecentlyAccessed.add.$1",
+                "type": "string",
+                "tags": [],
+                "label": "link",
+                "description": [
+                  "a relative URL to the resource (not including the {@link HttpStart.basePath | `http.basePath`})"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-recently-accessed/src/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/recently-accessed",
+                "id": "def-common.RecentlyAccessed.add.$2",
+                "type": "string",
+                "tags": [],
+                "label": "label",
+                "description": [
+                  "the label to display in the UI"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-recently-accessed/src/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/recently-accessed",
+                "id": "def-common.RecentlyAccessed.add.$3",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [
+                  "a unique string used to de-duplicate the recently accessed list."
+                ],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-recently-accessed/src/types.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessed.get",
+            "type": "Function",
+            "tags": [],
+            "label": "get",
+            "description": [
+              "\nGets an Array of the current recently accessed history.\n"
+            ],
+            "signature": [
+              "() => ",
+              {
+                "pluginId": "@kbn/recently-accessed",
+                "scope": "common",
+                "docId": "kibKbnRecentlyAccessedPluginApi",
+                "section": "def-common.RecentlyAccessedHistoryItem",
+                "text": "RecentlyAccessedHistoryItem"
+              },
+              "[]"
+            ],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessed.get$",
+            "type": "Function",
+            "tags": [],
+            "label": "get$",
+            "description": [
+              "\nGets an Observable of the array of recently accessed history.\n"
+            ],
+            "signature": [
+              "() => ",
+              "Observable",
+              "<",
+              {
+                "pluginId": "@kbn/recently-accessed",
+                "scope": "common",
+                "docId": "kibKbnRecentlyAccessedPluginApi",
+                "section": "def-common.RecentlyAccessedHistoryItem",
+                "text": "RecentlyAccessedHistoryItem"
+              },
+              "[]>"
+            ],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/recently-accessed",
+        "id": "def-common.RecentlyAccessedHistoryItem",
+        "type": "Interface",
+        "tags": [],
+        "label": "RecentlyAccessedHistoryItem",
+        "description": [],
+        "path": "packages/kbn-recently-accessed/src/types.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessedHistoryItem.link",
+            "type": "string",
+            "tags": [],
+            "label": "link",
+            "description": [],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessedHistoryItem.label",
+            "type": "string",
+            "tags": [],
+            "label": "label",
+            "description": [],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/recently-accessed",
+            "id": "def-common.RecentlyAccessedHistoryItem.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "packages/kbn-recently-accessed/src/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  }
+}
\ No newline at end of file
diff --git a/api_docs/kbn_recently_accessed.mdx b/api_docs/kbn_recently_accessed.mdx
new file mode 100644
index 0000000000000..21964aa57344b
--- /dev/null
+++ b/api_docs/kbn_recently_accessed.mdx
@@ -0,0 +1,33 @@
+---
+####
+#### This document is auto-generated and is meant to be viewed inside our experimental, new docs system.
+#### Reach out in #docs-engineering for more info.
+####
+id: kibKbnRecentlyAccessedPluginApi
+slug: /kibana-dev-docs/api/kbn-recently-accessed
+title: "@kbn/recently-accessed"
+image: https://source.unsplash.com/400x175/?github
+description: API docs for the @kbn/recently-accessed plugin
+date: 2024-07-11
+tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/recently-accessed']
+---
+import kbnRecentlyAccessedObj from './kbn_recently_accessed.devdocs.json';
+
+
+
+Contact [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) for questions regarding this plugin.
+
+**Code health stats**
+
+| Public API count  | Any count | Items lacking comments | Missing exports |
+|-------------------|-----------|------------------------|-----------------|
+| 14 | 0 | 7 | 0 |
+
+## Common
+
+### Classes
+<DocDefinitionList data={kbnRecentlyAccessedObj.common.classes}/>
+
+### Interfaces
+<DocDefinitionList data={kbnRecentlyAccessedObj.common.interfaces}/>
+
diff --git a/api_docs/kbn_repo_file_maps.mdx b/api_docs/kbn_repo_file_maps.mdx
index f9760eda4bb12..eb7ab9f741927 100644
--- a/api_docs/kbn_repo_file_maps.mdx
+++ b/api_docs/kbn_repo_file_maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-file-maps
 title: "@kbn/repo-file-maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-file-maps plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-file-maps']
 ---
 import kbnRepoFileMapsObj from './kbn_repo_file_maps.devdocs.json';
diff --git a/api_docs/kbn_repo_linter.mdx b/api_docs/kbn_repo_linter.mdx
index ba87d94c375ec..d1085688553ef 100644
--- a/api_docs/kbn_repo_linter.mdx
+++ b/api_docs/kbn_repo_linter.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-linter
 title: "@kbn/repo-linter"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-linter plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-linter']
 ---
 import kbnRepoLinterObj from './kbn_repo_linter.devdocs.json';
diff --git a/api_docs/kbn_repo_path.mdx b/api_docs/kbn_repo_path.mdx
index 740573d536a43..1a0d8707d891f 100644
--- a/api_docs/kbn_repo_path.mdx
+++ b/api_docs/kbn_repo_path.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-path
 title: "@kbn/repo-path"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-path plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-path']
 ---
 import kbnRepoPathObj from './kbn_repo_path.devdocs.json';
diff --git a/api_docs/kbn_repo_source_classifier.mdx b/api_docs/kbn_repo_source_classifier.mdx
index 0808dddf4a15b..0c17e23fa2c11 100644
--- a/api_docs/kbn_repo_source_classifier.mdx
+++ b/api_docs/kbn_repo_source_classifier.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-repo-source-classifier
 title: "@kbn/repo-source-classifier"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/repo-source-classifier plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/repo-source-classifier']
 ---
 import kbnRepoSourceClassifierObj from './kbn_repo_source_classifier.devdocs.json';
diff --git a/api_docs/kbn_reporting_common.mdx b/api_docs/kbn_reporting_common.mdx
index 0320e13262a19..da8a398b36802 100644
--- a/api_docs/kbn_reporting_common.mdx
+++ b/api_docs/kbn_reporting_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-common
 title: "@kbn/reporting-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-common']
 ---
 import kbnReportingCommonObj from './kbn_reporting_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_csv_share_panel.mdx b/api_docs/kbn_reporting_csv_share_panel.mdx
index 07c987083c0e3..1480f6658b029 100644
--- a/api_docs/kbn_reporting_csv_share_panel.mdx
+++ b/api_docs/kbn_reporting_csv_share_panel.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-csv-share-panel
 title: "@kbn/reporting-csv-share-panel"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-csv-share-panel plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-csv-share-panel']
 ---
 import kbnReportingCsvSharePanelObj from './kbn_reporting_csv_share_panel.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_csv.mdx b/api_docs/kbn_reporting_export_types_csv.mdx
index 6eac15588bcb5..5b1446f671584 100644
--- a/api_docs/kbn_reporting_export_types_csv.mdx
+++ b/api_docs/kbn_reporting_export_types_csv.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv
 title: "@kbn/reporting-export-types-csv"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv']
 ---
 import kbnReportingExportTypesCsvObj from './kbn_reporting_export_types_csv.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_csv_common.mdx b/api_docs/kbn_reporting_export_types_csv_common.mdx
index ed2b73db07b16..164f7409fdf07 100644
--- a/api_docs/kbn_reporting_export_types_csv_common.mdx
+++ b/api_docs/kbn_reporting_export_types_csv_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-csv-common
 title: "@kbn/reporting-export-types-csv-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-csv-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-csv-common']
 ---
 import kbnReportingExportTypesCsvCommonObj from './kbn_reporting_export_types_csv_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_pdf.mdx b/api_docs/kbn_reporting_export_types_pdf.mdx
index fa1ce3b66e1b1..9ec8ece7caf4a 100644
--- a/api_docs/kbn_reporting_export_types_pdf.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf
 title: "@kbn/reporting-export-types-pdf"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf']
 ---
 import kbnReportingExportTypesPdfObj from './kbn_reporting_export_types_pdf.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_pdf_common.mdx b/api_docs/kbn_reporting_export_types_pdf_common.mdx
index 07068f24bbcdb..6661bc6008aaa 100644
--- a/api_docs/kbn_reporting_export_types_pdf_common.mdx
+++ b/api_docs/kbn_reporting_export_types_pdf_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-pdf-common
 title: "@kbn/reporting-export-types-pdf-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-pdf-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-pdf-common']
 ---
 import kbnReportingExportTypesPdfCommonObj from './kbn_reporting_export_types_pdf_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png.mdx b/api_docs/kbn_reporting_export_types_png.mdx
index 490c7ba18a64b..3a0ec5768f52b 100644
--- a/api_docs/kbn_reporting_export_types_png.mdx
+++ b/api_docs/kbn_reporting_export_types_png.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png
 title: "@kbn/reporting-export-types-png"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png']
 ---
 import kbnReportingExportTypesPngObj from './kbn_reporting_export_types_png.devdocs.json';
diff --git a/api_docs/kbn_reporting_export_types_png_common.mdx b/api_docs/kbn_reporting_export_types_png_common.mdx
index 03d0eb8a26608..0af88df1fc84b 100644
--- a/api_docs/kbn_reporting_export_types_png_common.mdx
+++ b/api_docs/kbn_reporting_export_types_png_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-export-types-png-common
 title: "@kbn/reporting-export-types-png-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-export-types-png-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-export-types-png-common']
 ---
 import kbnReportingExportTypesPngCommonObj from './kbn_reporting_export_types_png_common.devdocs.json';
diff --git a/api_docs/kbn_reporting_mocks_server.mdx b/api_docs/kbn_reporting_mocks_server.mdx
index 02f300ecf625f..d49952a3ec283 100644
--- a/api_docs/kbn_reporting_mocks_server.mdx
+++ b/api_docs/kbn_reporting_mocks_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-mocks-server
 title: "@kbn/reporting-mocks-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-mocks-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-mocks-server']
 ---
 import kbnReportingMocksServerObj from './kbn_reporting_mocks_server.devdocs.json';
diff --git a/api_docs/kbn_reporting_public.mdx b/api_docs/kbn_reporting_public.mdx
index 35b72c18a923f..7e1216c8367c6 100644
--- a/api_docs/kbn_reporting_public.mdx
+++ b/api_docs/kbn_reporting_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-public
 title: "@kbn/reporting-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-public plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-public']
 ---
 import kbnReportingPublicObj from './kbn_reporting_public.devdocs.json';
diff --git a/api_docs/kbn_reporting_server.mdx b/api_docs/kbn_reporting_server.mdx
index 5496a590082a4..dca1b1a9269cc 100644
--- a/api_docs/kbn_reporting_server.mdx
+++ b/api_docs/kbn_reporting_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-reporting-server
 title: "@kbn/reporting-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/reporting-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/reporting-server']
 ---
 import kbnReportingServerObj from './kbn_reporting_server.devdocs.json';
diff --git a/api_docs/kbn_resizable_layout.mdx b/api_docs/kbn_resizable_layout.mdx
index 2ab0ccdc67e2d..fec364f156d12 100644
--- a/api_docs/kbn_resizable_layout.mdx
+++ b/api_docs/kbn_resizable_layout.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-resizable-layout
 title: "@kbn/resizable-layout"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/resizable-layout plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/resizable-layout']
 ---
 import kbnResizableLayoutObj from './kbn_resizable_layout.devdocs.json';
diff --git a/api_docs/kbn_response_ops_feature_flag_service.mdx b/api_docs/kbn_response_ops_feature_flag_service.mdx
index ea36ed4b94f47..3ee0b47d3fe68 100644
--- a/api_docs/kbn_response_ops_feature_flag_service.mdx
+++ b/api_docs/kbn_response_ops_feature_flag_service.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-response-ops-feature-flag-service
 title: "@kbn/response-ops-feature-flag-service"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/response-ops-feature-flag-service plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/response-ops-feature-flag-service']
 ---
 import kbnResponseOpsFeatureFlagServiceObj from './kbn_response_ops_feature_flag_service.devdocs.json';
diff --git a/api_docs/kbn_rison.mdx b/api_docs/kbn_rison.mdx
index 21ee3dc3a1979..d659bb58baa7e 100644
--- a/api_docs/kbn_rison.mdx
+++ b/api_docs/kbn_rison.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rison
 title: "@kbn/rison"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rison plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rison']
 ---
 import kbnRisonObj from './kbn_rison.devdocs.json';
diff --git a/api_docs/kbn_rollup.mdx b/api_docs/kbn_rollup.mdx
index 565701c8b58be..988491b2a2274 100644
--- a/api_docs/kbn_rollup.mdx
+++ b/api_docs/kbn_rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rollup
 title: "@kbn/rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rollup plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rollup']
 ---
 import kbnRollupObj from './kbn_rollup.devdocs.json';
diff --git a/api_docs/kbn_router_to_openapispec.mdx b/api_docs/kbn_router_to_openapispec.mdx
index 34e132bb97bca..94444ebbcb5d2 100644
--- a/api_docs/kbn_router_to_openapispec.mdx
+++ b/api_docs/kbn_router_to_openapispec.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-router-to-openapispec
 title: "@kbn/router-to-openapispec"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/router-to-openapispec plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/router-to-openapispec']
 ---
 import kbnRouterToOpenapispecObj from './kbn_router_to_openapispec.devdocs.json';
diff --git a/api_docs/kbn_router_utils.mdx b/api_docs/kbn_router_utils.mdx
index bda7681dee2d8..9ccba988fe0bc 100644
--- a/api_docs/kbn_router_utils.mdx
+++ b/api_docs/kbn_router_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-router-utils
 title: "@kbn/router-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/router-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/router-utils']
 ---
 import kbnRouterUtilsObj from './kbn_router_utils.devdocs.json';
diff --git a/api_docs/kbn_rrule.mdx b/api_docs/kbn_rrule.mdx
index 30b91fc5f14fc..6a5734a591024 100644
--- a/api_docs/kbn_rrule.mdx
+++ b/api_docs/kbn_rrule.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rrule
 title: "@kbn/rrule"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rrule plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rrule']
 ---
 import kbnRruleObj from './kbn_rrule.devdocs.json';
diff --git a/api_docs/kbn_rule_data_utils.mdx b/api_docs/kbn_rule_data_utils.mdx
index c53f4d15510b2..4d54c20885721 100644
--- a/api_docs/kbn_rule_data_utils.mdx
+++ b/api_docs/kbn_rule_data_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-rule-data-utils
 title: "@kbn/rule-data-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/rule-data-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/rule-data-utils']
 ---
 import kbnRuleDataUtilsObj from './kbn_rule_data_utils.devdocs.json';
diff --git a/api_docs/kbn_saved_objects_settings.mdx b/api_docs/kbn_saved_objects_settings.mdx
index 609b9777a0d06..07fb03fc1dfb5 100644
--- a/api_docs/kbn_saved_objects_settings.mdx
+++ b/api_docs/kbn_saved_objects_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-saved-objects-settings
 title: "@kbn/saved-objects-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/saved-objects-settings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/saved-objects-settings']
 ---
 import kbnSavedObjectsSettingsObj from './kbn_saved_objects_settings.devdocs.json';
diff --git a/api_docs/kbn_search_api_panels.mdx b/api_docs/kbn_search_api_panels.mdx
index 4e02bf7f2a890..741c6454818d0 100644
--- a/api_docs/kbn_search_api_panels.mdx
+++ b/api_docs/kbn_search_api_panels.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-api-panels
 title: "@kbn/search-api-panels"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-api-panels plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-api-panels']
 ---
 import kbnSearchApiPanelsObj from './kbn_search_api_panels.devdocs.json';
diff --git a/api_docs/kbn_search_connectors.devdocs.json b/api_docs/kbn_search_connectors.devdocs.json
index 5ef0ca703940d..d99fdba6e9359 100644
--- a/api_docs/kbn_search_connectors.devdocs.json
+++ b/api_docs/kbn_search_connectors.devdocs.json
@@ -5250,7 +5250,7 @@
             "label": "rule",
             "description": [],
             "signature": [
-              "\"<\" | \">\" | \"contains\" | \"equals\" | \"regex\" | \"ends_with\" | \"starts_with\""
+              "\"contains\" | \"<\" | \">\" | \"equals\" | \"regex\" | \"ends_with\" | \"starts_with\""
             ],
             "path": "packages/kbn-search-connectors/types/connectors.ts",
             "deprecated": false,
@@ -6850,7 +6850,7 @@
         "label": "FilteringRuleRule",
         "description": [],
         "signature": [
-          "\"<\" | \">\" | \"contains\" | \"equals\" | \"regex\" | \"ends_with\" | \"starts_with\""
+          "\"contains\" | \"<\" | \">\" | \"equals\" | \"regex\" | \"ends_with\" | \"starts_with\""
         ],
         "path": "packages/kbn-search-connectors/types/connectors.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_search_connectors.mdx b/api_docs/kbn_search_connectors.mdx
index b778bdf1db172..7c330dfcd2ecb 100644
--- a/api_docs/kbn_search_connectors.mdx
+++ b/api_docs/kbn_search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-connectors
 title: "@kbn/search-connectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-connectors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-connectors']
 ---
 import kbnSearchConnectorsObj from './kbn_search_connectors.devdocs.json';
diff --git a/api_docs/kbn_search_errors.mdx b/api_docs/kbn_search_errors.mdx
index 4ea96f2ca5241..9f80b84162264 100644
--- a/api_docs/kbn_search_errors.mdx
+++ b/api_docs/kbn_search_errors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-errors
 title: "@kbn/search-errors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-errors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-errors']
 ---
 import kbnSearchErrorsObj from './kbn_search_errors.devdocs.json';
diff --git a/api_docs/kbn_search_index_documents.mdx b/api_docs/kbn_search_index_documents.mdx
index 7c2c709daab80..31a11cc8b570d 100644
--- a/api_docs/kbn_search_index_documents.mdx
+++ b/api_docs/kbn_search_index_documents.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-index-documents
 title: "@kbn/search-index-documents"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-index-documents plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-index-documents']
 ---
 import kbnSearchIndexDocumentsObj from './kbn_search_index_documents.devdocs.json';
diff --git a/api_docs/kbn_search_response_warnings.mdx b/api_docs/kbn_search_response_warnings.mdx
index d9ac4cacf89d9..c4fe5de6f8813 100644
--- a/api_docs/kbn_search_response_warnings.mdx
+++ b/api_docs/kbn_search_response_warnings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-response-warnings
 title: "@kbn/search-response-warnings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-response-warnings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-response-warnings']
 ---
 import kbnSearchResponseWarningsObj from './kbn_search_response_warnings.devdocs.json';
diff --git a/api_docs/kbn_search_types.mdx b/api_docs/kbn_search_types.mdx
index 07ea5fad9bca2..507efef4c33fc 100644
--- a/api_docs/kbn_search_types.mdx
+++ b/api_docs/kbn_search_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-search-types
 title: "@kbn/search-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/search-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/search-types']
 ---
 import kbnSearchTypesObj from './kbn_search_types.devdocs.json';
diff --git a/api_docs/kbn_security_api_key_management.devdocs.json b/api_docs/kbn_security_api_key_management.devdocs.json
index 5fd86dcf3f8c8..661a3acf9b5c9 100644
--- a/api_docs/kbn_security_api_key_management.devdocs.json
+++ b/api_docs/kbn_security_api_key_management.devdocs.json
@@ -186,10 +186,10 @@
             "signature": [
               "(apiKey: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CreateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
                 "text": "CreateAPIKeyParams"
               },
               ") => Promise<",
@@ -209,10 +209,10 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CreateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
                     "text": "CreateAPIKeyParams"
                   }
                 ],
@@ -234,10 +234,10 @@
             "signature": [
               "(apiKey: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.UpdateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
                 "text": "UpdateAPIKeyParams"
               },
               ") => Promise<",
@@ -257,10 +257,10 @@
                 "description": [],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.UpdateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
                     "text": "UpdateAPIKeyParams"
                   }
                 ],
@@ -532,10 +532,10 @@
           },
           ") => ",
           {
-            "pluginId": "@kbn/security-plugin-types-server",
-            "scope": "server",
-            "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-            "section": "def-server.CreateAPIKeyParams",
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateAPIKeyParams",
             "text": "CreateAPIKeyParams"
           }
         ],
@@ -586,10 +586,10 @@
           },
           ") => ",
           {
-            "pluginId": "@kbn/security-plugin-types-server",
-            "scope": "server",
-            "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-            "section": "def-server.UpdateAPIKeyParams",
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateAPIKeyParams",
             "text": "UpdateAPIKeyParams"
           }
         ],
@@ -976,7 +976,7 @@
             "label": "sort",
             "description": [],
             "signature": [
-              "{ field: \"id\" | \"type\" | \"name\" | \"username\" | \"profile_uid\" | \"metadata\" | \"expired\" | \"creation\" | \"expiration\" | \"role_descriptors\" | \"realm\" | \"invalidated\" | \"realm_type\" | \"limited_by\" | \"_sort\"; direction: \"asc\" | \"desc\"; }"
+              "{ field: \"id\" | \"type\" | \"name\" | \"username\" | \"profile_uid\" | \"metadata\" | \"expired\" | \"creation\" | \"realm\" | \"role_descriptors\" | \"expiration\" | \"invalidated\" | \"realm_type\" | \"limited_by\" | \"_sort\"; direction: \"asc\" | \"desc\"; }"
             ],
             "path": "x-pack/packages/security/api_key_management/src/components/api_keys_api_client.ts",
             "deprecated": false,
@@ -1131,9 +1131,31 @@
         "label": "CreateAPIKeyParams",
         "description": [],
         "signature": [
-          "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }> | Readonly<{ metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { type: \"cross_cluster\"; name: string; access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }>"
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyParams",
+            "text": "CreateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateCrossClusterAPIKeyParams",
+            "text": "CreateCrossClusterAPIKeyParams"
+          }
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -1150,7 +1172,7 @@
         "signature": [
           "SecurityCreateApiKeyResponse"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -1163,7 +1185,7 @@
         "label": "QueryApiKeySortOptions",
         "description": [],
         "signature": [
-          "{ field: \"id\" | \"type\" | \"name\" | \"username\" | \"profile_uid\" | \"metadata\" | \"expired\" | \"creation\" | \"expiration\" | \"role_descriptors\" | \"realm\" | \"invalidated\" | \"realm_type\" | \"limited_by\" | \"_sort\"; direction: \"asc\" | \"desc\"; }"
+          "{ field: \"id\" | \"type\" | \"name\" | \"username\" | \"profile_uid\" | \"metadata\" | \"expired\" | \"creation\" | \"realm\" | \"role_descriptors\" | \"expiration\" | \"invalidated\" | \"realm_type\" | \"limited_by\" | \"_sort\"; direction: \"asc\" | \"desc\"; }"
         ],
         "path": "x-pack/packages/security/api_key_management/src/components/api_keys_api_client.ts",
         "deprecated": false,
@@ -1180,9 +1202,31 @@
           "\nRequest body of Kibana Update API key endpoint."
         ],
         "signature": [
-          "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; type: \"cross_cluster\"; access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>"
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyParams",
+            "text": "UpdateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateCrossClusterAPIKeyParams",
+            "text": "UpdateCrossClusterAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "UpdateRestAPIKeyWithKibanaPrivilegesParams"
+          }
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -1199,7 +1243,7 @@
         "signature": [
           "SecurityUpdateApiKeyResponse"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
diff --git a/api_docs/kbn_security_api_key_management.mdx b/api_docs/kbn_security_api_key_management.mdx
index 8afb71115e250..9de2544ada759 100644
--- a/api_docs/kbn_security_api_key_management.mdx
+++ b/api_docs/kbn_security_api_key_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-api-key-management
 title: "@kbn/security-api-key-management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-api-key-management plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-api-key-management']
 ---
 import kbnSecurityApiKeyManagementObj from './kbn_security_api_key_management.devdocs.json';
diff --git a/api_docs/kbn_security_form_components.mdx b/api_docs/kbn_security_form_components.mdx
index 50267cc4264db..3c1d11c315a2f 100644
--- a/api_docs/kbn_security_form_components.mdx
+++ b/api_docs/kbn_security_form_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-form-components
 title: "@kbn/security-form-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-form-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-form-components']
 ---
 import kbnSecurityFormComponentsObj from './kbn_security_form_components.devdocs.json';
diff --git a/api_docs/kbn_security_hardening.mdx b/api_docs/kbn_security_hardening.mdx
index 1a63e35c11b14..9f2daaf952d3b 100644
--- a/api_docs/kbn_security_hardening.mdx
+++ b/api_docs/kbn_security_hardening.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-hardening
 title: "@kbn/security-hardening"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-hardening plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-hardening']
 ---
 import kbnSecurityHardeningObj from './kbn_security_hardening.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_common.mdx b/api_docs/kbn_security_plugin_types_common.mdx
index f13241dcbb463..6698483b04855 100644
--- a/api_docs/kbn_security_plugin_types_common.mdx
+++ b/api_docs/kbn_security_plugin_types_common.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-common
 title: "@kbn/security-plugin-types-common"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-common plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-common']
 ---
 import kbnSecurityPluginTypesCommonObj from './kbn_security_plugin_types_common.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_public.mdx b/api_docs/kbn_security_plugin_types_public.mdx
index 46e64f9385298..2d1b1c4829cdf 100644
--- a/api_docs/kbn_security_plugin_types_public.mdx
+++ b/api_docs/kbn_security_plugin_types_public.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-public
 title: "@kbn/security-plugin-types-public"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-public plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-public']
 ---
 import kbnSecurityPluginTypesPublicObj from './kbn_security_plugin_types_public.devdocs.json';
diff --git a/api_docs/kbn_security_plugin_types_server.devdocs.json b/api_docs/kbn_security_plugin_types_server.devdocs.json
index dbd001d28def1..7650af308a8fd 100644
--- a/api_docs/kbn_security_plugin_types_server.devdocs.json
+++ b/api_docs/kbn_security_plugin_types_server.devdocs.json
@@ -62,15 +62,15 @@
         "label": "getRestApiKeyWithKibanaPrivilegesSchema",
         "description": [],
         "signature": [
-          "(getBasePrivilegeNames: () => { global: string[]; space: string[]; }) => ExtendedObjectType<{ type: ",
+          "(getBasePrivilegeNames: () => { global: string[]; space: string[]; }) => ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
             "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
           },
-          "<\"rest\" | undefined>; name: ",
+          "<{ type: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -78,7 +78,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string>; expiration: ",
+          "<\"rest\" | undefined>; name: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -86,7 +86,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string | undefined>; role_descriptors: ",
+          "<string>; expiration: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -94,7 +94,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Record<string, Readonly<{} & {}>>>; metadata: ",
+          "<string | undefined>; metadata: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -102,7 +102,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & {}> | undefined>; }, { role_descriptors: null; kibana_role_descriptors: ",
+          "<Readonly<{} & {}> | undefined>; kibana_role_descriptors: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -143,23 +143,15 @@
         "label": "getUpdateRestApiKeyWithKibanaPrivilegesSchema",
         "description": [],
         "signature": [
-          "(getBasePrivilegeNames: () => { global: string[]; space: string[]; }) => ExtendedObjectType<{ type: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<\"rest\" | undefined>; name: ",
+          "(getBasePrivilegeNames: () => { global: string[]; space: string[]; }) => ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
             "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
+            "section": "def-common.ObjectType",
+            "text": "ObjectType"
           },
-          "<string>; expiration: ",
+          "<{ type: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -167,7 +159,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string | undefined>; role_descriptors: ",
+          "<\"rest\" | undefined>; expiration: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -175,7 +167,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Record<string, Readonly<{} & {}>>>; metadata: ",
+          "<string | undefined>; metadata: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -183,7 +175,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & {}> | undefined>; }, { role_descriptors: null; name: null; id: ",
+          "<Readonly<{} & {}> | undefined>; id: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -223,6 +215,39 @@
         ],
         "returnComment": [],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.isCreateRestAPIKeyParams",
+        "type": "Function",
+        "tags": [],
+        "label": "isCreateRestAPIKeyParams",
+        "description": [],
+        "signature": [
+          "(params: any) => boolean"
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.isCreateRestAPIKeyParams.$1",
+            "type": "Any",
+            "tags": [],
+            "label": "params",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
       }
     ],
     "interfaces": [
@@ -536,8 +561,10 @@
         "type": "Interface",
         "tags": [],
         "label": "APIKeys",
-        "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "description": [
+          "\nInterface for managing API keys in Elasticsearch, including creation,\nvalidation, and invalidation of API keys,\nas well as checking the status of API key features."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -553,7 +580,7 @@
             "signature": [
               "() => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -571,7 +598,7 @@
             "signature": [
               "() => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -597,17 +624,17 @@
               },
               "<unknown, unknown, unknown, any>, createParams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CreateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
                 "text": "CreateAPIKeyParams"
               },
               ") => Promise<",
               "SecurityCreateApiKeyResponse",
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -630,7 +657,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -646,14 +673,98 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CreateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
                     "text": "CreateAPIKeyParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.update",
+            "type": "Function",
+            "tags": [],
+            "label": "update",
+            "description": [
+              "\nAttempts update an API key with the provided 'role_descriptors' and 'metadata'\n\nReturns `updated`, `true` if the update was successful, `false` if there was nothing to update\n\nUser needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, updateParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
+                "text": "UpdateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityUpdateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.update.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.update.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "updateParams",
+                "description": [
+                  "The params to edit an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
+                    "text": "UpdateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -679,17 +790,33 @@
                 "section": "def-common.KibanaRequest",
                 "text": "KibanaRequest"
               },
-              "<unknown, unknown, unknown, any>, createParams: Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>) => Promise<",
+              "<unknown, unknown, unknown, any>, createParams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.GrantAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyParams",
+                "text": "CreateRestAPIKeyParams"
+              },
+              " | ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.GrantAPIKeyResult",
                 "text": "GrantAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -712,7 +839,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -727,9 +854,23 @@
                   "Create operation parameters."
                 ],
                 "signature": [
-                  "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>"
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyParams",
+                    "text": "CreateRestAPIKeyParams"
+                  },
+                  " | ",
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                    "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+                  }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -749,15 +890,15 @@
             "signature": [
               "(apiKeyPrams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.ValidateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ValidateAPIKeyParams",
                 "text": "ValidateAPIKeyParams"
               },
               ") => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -772,14 +913,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.ValidateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.ValidateAPIKeyParams",
                     "text": "ValidateAPIKeyParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -807,23 +948,23 @@
               },
               "<unknown, unknown, unknown, any>, params: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeysParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
                 "text": "InvalidateAPIKeysParams"
               },
               ") => Promise<",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
                 "text": "InvalidateAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -846,7 +987,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -862,14 +1003,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.InvalidateAPIKeysParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
                     "text": "InvalidateAPIKeysParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -889,23 +1030,23 @@
             "signature": [
               "(params: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeysParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
                 "text": "InvalidateAPIKeysParams"
               },
               ") => Promise<",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
                 "text": "InvalidateAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -920,14 +1061,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.InvalidateAPIKeysParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
                     "text": "InvalidateAPIKeysParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -940,45 +1081,569 @@
       },
       {
         "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.AppActions",
+        "id": "def-server.APIKeys",
         "type": "Interface",
         "tags": [],
-        "label": "AppActions",
-        "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
+        "label": "APIKeys",
+        "description": [
+          "\nInterface for managing API keys in Elasticsearch, including creation,\nvalidation, and invalidation of API keys,\nas well as checking the status of API key features."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.AppActions.get",
+            "id": "def-server.APIKeys.areAPIKeysEnabled",
             "type": "Function",
             "tags": [],
-            "label": "get",
-            "description": [],
+            "label": "areAPIKeysEnabled",
+            "description": [
+              "\nDetermines if API Keys are enabled in Elasticsearch."
+            ],
             "signature": [
-              "(operation: string) => string"
+              "() => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.AppActions.get.$1",
-                "type": "string",
-                "tags": [],
-                "label": "operation",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.areCrossClusterAPIKeysEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "areCrossClusterAPIKeysEnabled",
+            "description": [
+              "\nDetermines if Cross-Cluster API Keys are enabled in Elasticsearch."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.create",
+            "type": "Function",
+            "tags": [],
+            "label": "create",
+            "description": [
+              "\nTries to create an API key for the current user.\n\nReturns newly created API key or `null` if API keys are disabled.\n\nUser needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, createParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
+                "text": "CreateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityCreateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.create.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.create.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "createParams",
+                "description": [
+                  "The params to create an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
+                    "text": "CreateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.update",
+            "type": "Function",
+            "tags": [],
+            "label": "update",
+            "description": [
+              "\nAttempts update an API key with the provided 'role_descriptors' and 'metadata'\n\nReturns `updated`, `true` if the update was successful, `false` if there was nothing to update\n\nUser needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, updateParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
+                "text": "UpdateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityUpdateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.update.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.update.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "updateParams",
+                "description": [
+                  "The params to edit an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
+                    "text": "UpdateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.grantAsInternalUser",
+            "type": "Function",
+            "tags": [],
+            "label": "grantAsInternalUser",
+            "description": [
+              "\nTries to grant an API key for the current user."
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, createParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyParams",
+                "text": "CreateRestAPIKeyParams"
+              },
+              " | ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.GrantAPIKeyResult",
+                "text": "GrantAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.grantAsInternalUser.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.grantAsInternalUser.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "createParams",
+                "description": [
+                  "Create operation parameters."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyParams",
+                    "text": "CreateRestAPIKeyParams"
+                  },
+                  " | ",
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                    "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.validate",
+            "type": "Function",
+            "tags": [],
+            "label": "validate",
+            "description": [
+              "\nTries to validate an API key."
+            ],
+            "signature": [
+              "(apiKeyPrams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ValidateAPIKeyParams",
+                "text": "ValidateAPIKeyParams"
+              },
+              ") => Promise<boolean>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.validate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "apiKeyPrams",
+                "description": [
+                  "ValidateAPIKeyParams."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.ValidateAPIKeyParams",
+                    "text": "ValidateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.invalidate",
+            "type": "Function",
+            "tags": [],
+            "label": "invalidate",
+            "description": [
+              "\nTries to invalidate an API keys."
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, params: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.invalidate.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.invalidate.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [
+                  "The params to invalidate an API keys."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
+                    "text": "InvalidateAPIKeysParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.APIKeys.invalidateAsInternalUser",
+            "type": "Function",
+            "tags": [],
+            "label": "invalidateAsInternalUser",
+            "description": [
+              "\nTries to invalidate the API keys by using the internal user."
+            ],
+            "signature": [
+              "(params: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.APIKeys.invalidateAsInternalUser.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "params",
+                "description": [
+                  "The params to invalidate the API keys."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
+                    "text": "InvalidateAPIKeysParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.AppActions",
+        "type": "Interface",
+        "tags": [],
+        "label": "AppActions",
+        "description": [],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.AppActions.get",
+            "type": "Function",
+            "tags": [],
+            "label": "get",
+            "description": [],
+            "signature": [
+              "(operation: string) => string"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.AppActions.get.$1",
+                "type": "string",
+                "tags": [],
+                "label": "operation",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/app.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
             "returnComment": []
           }
         ],
@@ -1550,10 +2215,10 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.APIKeys",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.APIKeys",
                 "text": "APIKeys"
               }
             ],
@@ -2169,35 +2834,257 @@
           },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivileges.globally",
+            "id": "def-server.CheckPrivileges.globally",
+            "type": "Function",
+            "tags": [],
+            "label": "globally",
+            "description": [],
+            "signature": [
+              "(privileges: ",
+              {
+                "pluginId": "@kbn/security-plugin-types-server",
+                "scope": "server",
+                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
+                "section": "def-server.CheckPrivilegesPayload",
+                "text": "CheckPrivilegesPayload"
+              },
+              ", options?: ",
+              {
+                "pluginId": "@kbn/security-plugin-types-server",
+                "scope": "server",
+                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
+                "section": "def-server.CheckPrivilegesOptions",
+                "text": "CheckPrivilegesOptions"
+              },
+              " | undefined) => Promise<",
+              {
+                "pluginId": "@kbn/security-plugin-types-server",
+                "scope": "server",
+                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
+                "section": "def-server.CheckPrivilegesResponse",
+                "text": "CheckPrivilegesResponse"
+              },
+              ">"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.CheckPrivileges.globally.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "privileges",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/security-plugin-types-server",
+                    "scope": "server",
+                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
+                    "section": "def-server.CheckPrivilegesPayload",
+                    "text": "CheckPrivilegesPayload"
+                  }
+                ],
+                "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.CheckPrivileges.globally.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "options",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/security-plugin-types-server",
+                    "scope": "server",
+                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
+                    "section": "def-server.CheckPrivilegesOptions",
+                    "text": "CheckPrivilegesOptions"
+                  },
+                  " | undefined"
+                ],
+                "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CheckPrivilegesOptions",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckPrivilegesOptions",
+        "description": [
+          "\nOptions to influce the privilege checks."
+        ],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesOptions.requireLoginAction",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "requireLoginAction",
+            "description": [
+              "\nWhether or not the `login` action should be required (default: true).\nSetting this to false is not advised except for special circumstances, when you do not require\nthe request to belong to a user capable of logging into Kibana."
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CheckPrivilegesPayload",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckPrivilegesPayload",
+        "description": [
+          "\nPrivileges that can be checked for the Kibana users."
+        ],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesPayload.kibana",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "kibana",
+            "description": [
+              "\nA list of the Kibana specific privileges (usually generated with `security.authz.actions.*.get(...)`)."
+            ],
+            "signature": [
+              "string | string[] | undefined"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesPayload.elasticsearch",
+            "type": "Object",
+            "tags": [],
+            "label": "elasticsearch",
+            "description": [
+              "\nA set of the Elasticsearch cluster and index privileges."
+            ],
+            "signature": [
+              "{ cluster: string[]; index: Record<string, string[]>; } | undefined"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CheckPrivilegesResponse",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckPrivilegesResponse",
+        "description": [],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesResponse.hasAllRequested",
+            "type": "boolean",
+            "tags": [],
+            "label": "hasAllRequested",
+            "description": [],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesResponse.username",
+            "type": "string",
+            "tags": [],
+            "label": "username",
+            "description": [],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckPrivilegesResponse.privileges",
+            "type": "Object",
+            "tags": [],
+            "label": "privileges",
+            "description": [],
+            "signature": [
+              "{ kibana: { resource?: string | undefined; privilege: string; authorized: boolean; }[]; elasticsearch: { cluster: { privilege: string; authorized: boolean; }[]; index: { [indexName: string]: { privilege: string; authorized: boolean; }[]; }; }; }"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CheckUserProfilesPrivileges",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckUserProfilesPrivileges",
+        "description": [
+          "\nAn interface to check users profiles privileges in a specific context (only a single-space context is supported at\nthe moment)."
+        ],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckUserProfilesPrivileges.atSpace",
             "type": "Function",
             "tags": [],
-            "label": "globally",
+            "label": "atSpace",
             "description": [],
             "signature": [
-              "(privileges: ",
-              {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CheckPrivilegesPayload",
-                "text": "CheckPrivilegesPayload"
-              },
-              ", options?: ",
+              "(spaceId: string, privileges: ",
               {
                 "pluginId": "@kbn/security-plugin-types-server",
                 "scope": "server",
                 "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CheckPrivilegesOptions",
-                "text": "CheckPrivilegesOptions"
+                "section": "def-server.CheckUserProfilesPrivilegesPayload",
+                "text": "CheckUserProfilesPrivilegesPayload"
               },
-              " | undefined) => Promise<",
+              ") => Promise<",
               {
                 "pluginId": "@kbn/security-plugin-types-server",
                 "scope": "server",
                 "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CheckPrivilegesResponse",
-                "text": "CheckPrivilegesResponse"
+                "section": "def-server.CheckUserProfilesPrivilegesResponse",
+                "text": "CheckUserProfilesPrivilegesResponse"
               },
               ">"
             ],
@@ -2207,19 +3094,13 @@
             "children": [
               {
                 "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.CheckPrivileges.globally.$1",
-                "type": "Object",
+                "id": "def-server.CheckUserProfilesPrivileges.atSpace.$1",
+                "type": "string",
                 "tags": [],
-                "label": "privileges",
+                "label": "spaceId",
                 "description": [],
                 "signature": [
-                  {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CheckPrivilegesPayload",
-                    "text": "CheckPrivilegesPayload"
-                  }
+                  "string"
                 ],
                 "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
                 "deprecated": false,
@@ -2228,25 +3109,24 @@
               },
               {
                 "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.CheckPrivileges.globally.$2",
+                "id": "def-server.CheckUserProfilesPrivileges.atSpace.$2",
                 "type": "Object",
                 "tags": [],
-                "label": "options",
+                "label": "privileges",
                 "description": [],
                 "signature": [
                   {
                     "pluginId": "@kbn/security-plugin-types-server",
                     "scope": "server",
                     "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CheckPrivilegesOptions",
-                    "text": "CheckPrivilegesOptions"
-                  },
-                  " | undefined"
+                    "section": "def-server.CheckUserProfilesPrivilegesPayload",
+                    "text": "CheckUserProfilesPrivilegesPayload"
+                  }
                 ],
                 "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
                 "deprecated": false,
                 "trackAdoption": false,
-                "isRequired": false
+                "isRequired": true
               }
             ],
             "returnComment": []
@@ -2256,12 +3136,12 @@
       },
       {
         "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckPrivilegesOptions",
+        "id": "def-server.CheckUserProfilesPrivilegesPayload",
         "type": "Interface",
         "tags": [],
-        "label": "CheckPrivilegesOptions",
+        "label": "CheckUserProfilesPrivilegesPayload",
         "description": [
-          "\nOptions to influce the privilege checks."
+          "\nPrivileges that can be checked for the users profiles (only Kibana specific privileges are supported at the moment)."
         ],
         "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
         "deprecated": false,
@@ -2269,65 +3149,227 @@
         "children": [
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesOptions.requireLoginAction",
-            "type": "CompoundType",
+            "id": "def-server.CheckUserProfilesPrivilegesPayload.kibana",
+            "type": "Array",
             "tags": [],
-            "label": "requireLoginAction",
+            "label": "kibana",
             "description": [
-              "\nWhether or not the `login` action should be required (default: true).\nSetting this to false is not advised except for special circumstances, when you do not require\nthe request to belong to a user capable of logging into Kibana."
+              "\nA list of the Kibana specific privileges (usually generated with `security.authz.actions.*.get(...)`)."
             ],
             "signature": [
-              "boolean | undefined"
+              "string[]"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CheckUserProfilesPrivilegesResponse",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckUserProfilesPrivilegesResponse",
+        "description": [
+          "\nResponse of the check privileges operation for the users profiles."
+        ],
+        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckUserProfilesPrivilegesResponse.hasPrivilegeUids",
+            "type": "Array",
+            "tags": [],
+            "label": "hasPrivilegeUids",
+            "description": [
+              "\nThe subset of the requested profile IDs of the users that have all the requested privileges."
+            ],
+            "signature": [
+              "string[]"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CheckUserProfilesPrivilegesResponse.errors",
+            "type": "Object",
+            "tags": [],
+            "label": "errors",
+            "description": [
+              "\nAn errors object that may be returned from ES that contains a `count` of UIDs that have errors in the `details` property.\n\nEach entry in `details` will contain an error `type`, e.g 'resource_not_found_exception', and a `reason` message, e.g. 'profile document not found'"
+            ],
+            "signature": [
+              "{ count: number; details: Record<string, { type: string; reason: string; }>; } | undefined"
             ],
             "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckPrivilegesPayload",
-        "type": "Interface",
-        "tags": [],
-        "label": "CheckPrivilegesPayload",
-        "description": [
-          "\nPrivileges that can be checked for the Kibana users."
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CreateCrossClusterAPIKeyParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "CreateCrossClusterAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"cross_cluster\""
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.access",
+            "type": "Object",
+            "tags": [],
+            "label": "access",
+            "description": [],
+            "signature": [
+              "{ search?: { names: string[]; query?: unknown; field_security?: unknown; allow_restricted_indices?: boolean | undefined; }[] | undefined; replication?: { names: string[]; }[] | undefined; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.CreateRestAPIKeyParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "CreateRestAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateRestAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateRestAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateRestAPIKeyParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesPayload.kibana",
-            "type": "CompoundType",
+            "id": "def-server.CreateRestAPIKeyParams.role_descriptors",
+            "type": "Object",
             "tags": [],
-            "label": "kibana",
-            "description": [
-              "\nA list of the Kibana specific privileges (usually generated with `security.authz.actions.*.get(...)`)."
-            ],
+            "label": "role_descriptors",
+            "description": [],
             "signature": [
-              "string | string[] | undefined"
+              "{ [x: string]: { [key: string]: any; }; }"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesPayload.elasticsearch",
+            "id": "def-server.CreateRestAPIKeyParams.metadata",
             "type": "Object",
             "tags": [],
-            "label": "elasticsearch",
-            "description": [
-              "\nA set of the Elasticsearch cluster and index privileges."
-            ],
+            "label": "metadata",
+            "description": [],
             "signature": [
-              "{ cluster: string[]; index: Record<string, string[]>; } | undefined"
+              "{ [key: string]: any; } | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -2336,213 +3378,181 @@
       },
       {
         "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckPrivilegesResponse",
+        "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams",
         "type": "Interface",
         "tags": [],
-        "label": "CheckPrivilegesResponse",
+        "label": "CreateRestAPIKeyWithKibanaPrivilegesParams",
         "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesResponse.hasAllRequested",
-            "type": "boolean",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.type",
+            "type": "string",
             "tags": [],
-            "label": "hasAllRequested",
+            "label": "type",
             "description": [],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesResponse.username",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.expiration",
             "type": "string",
             "tags": [],
-            "label": "username",
+            "label": "expiration",
             "description": [],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckPrivilegesResponse.privileges",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.metadata",
             "type": "Object",
             "tags": [],
-            "label": "privileges",
+            "label": "metadata",
             "description": [],
             "signature": [
-              "{ kibana: { resource?: string | undefined; privilege: string; authorized: boolean; }[]; elasticsearch: { cluster: { privilege: string; authorized: boolean; }[]; index: { [indexName: string]: { privilege: string; authorized: boolean; }[]; }; }; }"
+              "{ [key: string]: any; } | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckUserProfilesPrivileges",
-        "type": "Interface",
-        "tags": [],
-        "label": "CheckUserProfilesPrivileges",
-        "description": [
-          "\nAn interface to check users profiles privileges in a specific context (only a single-space context is supported at\nthe moment)."
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckUserProfilesPrivileges.atSpace",
-            "type": "Function",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.kibana_role_descriptors",
+            "type": "Object",
             "tags": [],
-            "label": "atSpace",
+            "label": "kibana_role_descriptors",
             "description": [],
             "signature": [
-              "(spaceId: string, privileges: ",
+              "{ [x: string]: { elasticsearch: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CheckUserProfilesPrivilegesPayload",
-                "text": "CheckUserProfilesPrivilegesPayload"
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ElasticsearchPrivilegesType",
+                "text": "ElasticsearchPrivilegesType"
               },
-              ") => Promise<",
+              " & { [key: string]: unknown; }; kibana: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CheckUserProfilesPrivilegesResponse",
-                "text": "CheckUserProfilesPrivilegesResponse"
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.KibanaPrivilegesType",
+                "text": "KibanaPrivilegesType"
               },
-              ">"
+              "; }; }"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.CheckUserProfilesPrivileges.atSpace.$1",
-                "type": "string",
-                "tags": [],
-                "label": "spaceId",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.CheckUserProfilesPrivileges.atSpace.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "privileges",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CheckUserProfilesPrivilegesPayload",
-                    "text": "CheckUserProfilesPrivilegesPayload"
-                  }
-                ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
       },
       {
         "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckUserProfilesPrivilegesPayload",
+        "id": "def-server.ElasticsearchPrivilegesType",
         "type": "Interface",
         "tags": [],
-        "label": "CheckUserProfilesPrivilegesPayload",
+        "label": "ElasticsearchPrivilegesType",
         "description": [
-          "\nPrivileges that can be checked for the users profiles (only Kibana specific privileges are supported at the moment)."
+          "\nType representing Elasticsearch specific portion of the role definition."
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckUserProfilesPrivilegesPayload.kibana",
+            "id": "def-server.ElasticsearchPrivilegesType.cluster",
             "type": "Array",
             "tags": [],
-            "label": "kibana",
-            "description": [
-              "\nA list of the Kibana specific privileges (usually generated with `security.authz.actions.*.get(...)`)."
-            ],
+            "label": "cluster",
+            "description": [],
             "signature": [
-              "string[]"
+              "string[] | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CheckUserProfilesPrivilegesResponse",
-        "type": "Interface",
-        "tags": [],
-        "label": "CheckUserProfilesPrivilegesResponse",
-        "description": [
-          "\nResponse of the check privileges operation for the users profiles."
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
+          },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckUserProfilesPrivilegesResponse.hasPrivilegeUids",
+            "id": "def-server.ElasticsearchPrivilegesType.remote_cluster",
             "type": "Array",
             "tags": [],
-            "label": "hasPrivilegeUids",
-            "description": [
-              "\nThe subset of the requested profile IDs of the users that have all the requested privileges."
+            "label": "remote_cluster",
+            "description": [],
+            "signature": [
+              "{ privileges: string[]; clusters: string[]; }[] | undefined"
             ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.ElasticsearchPrivilegesType.indices",
+            "type": "Array",
+            "tags": [],
+            "label": "indices",
+            "description": [],
             "signature": [
-              "string[]"
+              "{ names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.CheckUserProfilesPrivilegesResponse.errors",
-            "type": "Object",
+            "id": "def-server.ElasticsearchPrivilegesType.remote_indices",
+            "type": "Array",
             "tags": [],
-            "label": "errors",
-            "description": [
-              "\nAn errors object that may be returned from ES that contains a `count` of UIDs that have errors in the `details` property.\n\nEach entry in `details` will contain an error `type`, e.g 'resource_not_found_exception', and a `reason` message, e.g. 'profile document not found'"
+            "label": "remote_indices",
+            "description": [],
+            "signature": [
+              "{ clusters: string[]; names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
             ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.ElasticsearchPrivilegesType.run_as",
+            "type": "Array",
+            "tags": [],
+            "label": "run_as",
+            "description": [],
             "signature": [
-              "{ count: number; details: Record<string, { type: string; reason: string; }>; } | undefined"
+              "string[] | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/check_privileges.ts",
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -2556,7 +3566,7 @@
         "tags": [],
         "label": "GrantAPIKeyResult",
         "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -2569,7 +3579,7 @@
             "description": [
               "\nUnique id for this API key"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2582,7 +3592,7 @@
             "description": [
               "\nName for this API key"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2595,7 +3605,7 @@
             "description": [
               "\nGenerated API key"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -2725,7 +3735,7 @@
         "description": [
           "\nThe return value when invalidating an API key in Elasticsearch."
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -2741,7 +3751,7 @@
             "signature": [
               "string[]"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2757,7 +3767,7 @@
             "signature": [
               "string[]"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2770,7 +3780,7 @@
             "description": [
               "\nThe number of errors that were encountered when invalidating the API keys."
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -2786,7 +3796,7 @@
             "signature": [
               "{ type?: string | undefined; reason?: string | undefined; caused_by?: { type?: string | undefined; reason?: string | undefined; } | undefined; }[] | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -2802,7 +3812,7 @@
         "description": [
           "\nRepresents the params for invalidating multiple API keys"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -2812,11 +3822,13 @@
             "type": "Array",
             "tags": [],
             "label": "ids",
-            "description": [],
+            "description": [
+              "\nList of unique API key IDs"
+            ],
             "signature": [
               "string[]"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -3277,32 +4289,8 @@
                 "path": "x-pack/plugins/enterprise_search/server/lib/indices/create_api_key.ts"
               },
               {
-                "plugin": "enterpriseSearch",
-                "path": "x-pack/plugins/enterprise_search/server/routes/enterprise_search/api_keys.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts"
+                "plugin": "enterpriseSearch",
+                "path": "x-pack/plugins/enterprise_search/server/routes/enterprise_search/api_keys.ts"
               },
               {
                 "plugin": "serverlessSearch",
@@ -3403,30 +4391,6 @@
               {
                 "plugin": "fleet",
                 "path": "x-pack/plugins/fleet/server/routes/setup/handlers.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/list.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/state.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/endpoint/routes/suggestions/index.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts"
-              },
-              {
-                "plugin": "securitySolution",
-                "path": "x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts"
               }
             ]
           },
@@ -3543,65 +4507,324 @@
         "children": [
           {
             "parentPluginId": "@kbn/security-plugin-types-server",
-            "id": "def-server.UIActions.get",
-            "type": "Function",
+            "id": "def-server.UIActions.get",
+            "type": "Function",
+            "tags": [],
+            "label": "get",
+            "description": [],
+            "signature": [
+              "(featureId: keyof ",
+              {
+                "pluginId": "@kbn/core-capabilities-common",
+                "scope": "common",
+                "docId": "kibKbnCoreCapabilitiesCommonPluginApi",
+                "section": "def-common.Capabilities",
+                "text": "Capabilities"
+              },
+              ", ...uiCapabilityParts: string[]) => string"
+            ],
+            "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.UIActions.get.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "featureId",
+                "description": [],
+                "signature": [
+                  "keyof ",
+                  {
+                    "pluginId": "@kbn/core-capabilities-common",
+                    "scope": "common",
+                    "docId": "kibKbnCoreCapabilitiesCommonPluginApi",
+                    "section": "def-common.Capabilities",
+                    "text": "Capabilities"
+                  }
+                ],
+                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "@kbn/security-plugin-types-server",
+                "id": "def-server.UIActions.get.$2",
+                "type": "Array",
+                "tags": [],
+                "label": "uiCapabilityParts",
+                "description": [],
+                "signature": [
+                  "string[]"
+                ],
+                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.UpdateCrossClusterAPIKeyParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "UpdateCrossClusterAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateCrossClusterAPIKeyParams.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateCrossClusterAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"cross_cluster\""
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateCrossClusterAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateCrossClusterAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateCrossClusterAPIKeyParams.access",
+            "type": "Object",
+            "tags": [],
+            "label": "access",
+            "description": [],
+            "signature": [
+              "{ search?: { names: string[]; query?: unknown; field_security?: unknown; allow_restricted_indices?: boolean | undefined; }[] | undefined; replication?: { names: string[]; }[] | undefined; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.UpdateRestAPIKeyParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "UpdateRestAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyParams.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyParams.role_descriptors",
+            "type": "Object",
+            "tags": [],
+            "label": "role_descriptors",
+            "description": [],
+            "signature": [
+              "{ [x: string]: { [key: string]: unknown; }; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/security-plugin-types-server",
+        "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "UpdateRestAPIKeyWithKibanaPrivilegesParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/security-plugin-types-server",
+            "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams.kibana_role_descriptors",
+            "type": "Object",
             "tags": [],
-            "label": "get",
+            "label": "kibana_role_descriptors",
             "description": [],
             "signature": [
-              "(featureId: keyof ",
+              "{ [x: string]: { elasticsearch: ",
               {
-                "pluginId": "@kbn/core-capabilities-common",
+                "pluginId": "@kbn/core-security-server",
                 "scope": "common",
-                "docId": "kibKbnCoreCapabilitiesCommonPluginApi",
-                "section": "def-common.Capabilities",
-                "text": "Capabilities"
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ElasticsearchPrivilegesType",
+                "text": "ElasticsearchPrivilegesType"
               },
-              ", ...uiCapabilityParts: string[]) => string"
-            ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
+              " & { [key: string]: unknown; }; kibana: ",
               {
-                "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.UIActions.get.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "featureId",
-                "description": [],
-                "signature": [
-                  "keyof ",
-                  {
-                    "pluginId": "@kbn/core-capabilities-common",
-                    "scope": "common",
-                    "docId": "kibKbnCoreCapabilitiesCommonPluginApi",
-                    "section": "def-common.Capabilities",
-                    "text": "Capabilities"
-                  }
-                ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.KibanaPrivilegesType",
+                "text": "KibanaPrivilegesType"
               },
-              {
-                "parentPluginId": "@kbn/security-plugin-types-server",
-                "id": "def-server.UIActions.get.$2",
-                "type": "Array",
-                "tags": [],
-                "label": "uiCapabilityParts",
-                "description": [],
-                "signature": [
-                  "string[]"
-                ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authorization/actions/ui.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
+              "; }; }"
             ],
-            "returnComment": []
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
           }
         ],
         "initialIsOpen": false
@@ -3866,7 +5089,7 @@
         "description": [
           "\nRepresents the parameters for validating API Key credentials."
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -3879,7 +5102,7 @@
             "description": [
               "\nUnique id for this API key"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -3892,7 +5115,7 @@
             "description": [
               "\nGenerated API Key (secret)"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4209,9 +5432,31 @@
         "label": "CreateAPIKeyParams",
         "description": [],
         "signature": [
-          "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }> | Readonly<{ metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { type: \"cross_cluster\"; name: string; access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }>"
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyParams",
+            "text": "CreateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateCrossClusterAPIKeyParams",
+            "text": "CreateCrossClusterAPIKeyParams"
+          }
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4228,67 +5473,7 @@
         "signature": [
           "SecurityCreateApiKeyResponse"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CreateCrossClusterAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateCrossClusterAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly type: \"cross_cluster\"; readonly name: string; readonly access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CreateRestAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateRestAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly name: string; readonly role_descriptors: Record<string, Readonly<{} & {}>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateRestAPIKeyWithKibanaPrivilegesParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly name: string; readonly kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.ElasticsearchPrivilegesType",
-        "type": "Type",
-        "tags": [],
-        "label": "ElasticsearchPrivilegesType",
-        "description": [],
-        "signature": [
-          "{ readonly cluster?: string[] | undefined; readonly indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; readonly remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; readonly remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; readonly run_as?: string[] | undefined; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/role_schema.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4314,11 +5499,13 @@
         "type": "Type",
         "tags": [],
         "label": "KibanaPrivilegesType",
-        "description": [],
+        "description": [
+          "\nType representing Kibana specific portion of the role definition."
+        ],
         "signature": [
-          "Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]"
+          "{ spaces: string[]; base?: string[] | undefined; feature?: Record<string, string[]> | undefined; }[]"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/role_schema.ts",
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4333,9 +5520,31 @@
           "\nRequest body of Kibana Update API key endpoint."
         ],
         "signature": [
-          "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; type: \"cross_cluster\"; access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { id: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>"
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyParams",
+            "text": "UpdateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateCrossClusterAPIKeyParams",
+            "text": "UpdateCrossClusterAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.UpdateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "UpdateRestAPIKeyWithKibanaPrivilegesParams"
+          }
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4352,52 +5561,7 @@
         "signature": [
           "SecurityUpdateApiKeyResponse"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.UpdateCrossClusterAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "UpdateCrossClusterAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly id: string; readonly type: \"cross_cluster\"; readonly access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.UpdateRestAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "UpdateRestAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly id: string; readonly role_descriptors: Record<string, Readonly<{} & {}>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "@kbn/security-plugin-types-server",
-        "id": "def-server.UpdateRestAPIKeyWithKibanaPrivilegesParams",
-        "type": "Type",
-        "tags": [],
-        "label": "UpdateRestAPIKeyWithKibanaPrivilegesParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly id: string; readonly kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -4442,7 +5606,7 @@
             "section": "def-common.ObjectType",
             "text": "ObjectType"
           },
-          "<ExtendedProps<{ type: ",
+          "<{ type: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4450,7 +5614,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<\"rest\" | undefined>; name: ",
+          "<\"cross_cluster\">; name: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4466,23 +5630,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string | undefined>; role_descriptors: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<Record<string, Readonly<{} & {}>>>; metadata: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<Readonly<{} & {}> | undefined>; }, { type: ",
+          "<string | undefined>; metadata: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4490,7 +5638,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<\"cross_cluster\">; role_descriptors: null; access: ",
+          "<Readonly<{} & {}> | undefined>; access: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4514,7 +5662,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & { names: string[]; }>[] | undefined>; }>; }>>"
+          "<Readonly<{} & { names: string[]; }>[] | undefined>; }>; }>"
         ],
         "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
@@ -4662,23 +5810,7 @@
             "section": "def-common.ObjectType",
             "text": "ObjectType"
           },
-          "<ExtendedProps<ExtendedProps<{ type: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<\"rest\" | undefined>; name: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<string>; expiration: ",
+          "<{ id: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4686,7 +5818,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string | undefined>; role_descriptors: ",
+          "<string>; type: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4694,7 +5826,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Record<string, Readonly<{} & {}>>>; metadata: ",
+          "<\"cross_cluster\">; expiration: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4702,7 +5834,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & {}> | undefined>; }, { type: ",
+          "<string | undefined>; metadata: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4710,7 +5842,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<\"cross_cluster\">; role_descriptors: null; access: ",
+          "<Readonly<{} & {}> | undefined>; access: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4734,15 +5866,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & { names: string[]; }>[] | undefined>; }>; }>, { name: null; id: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<string>; }>>"
+          "<Readonly<{} & { names: string[]; }>[] | undefined>; }>; }>"
         ],
         "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
@@ -4764,7 +5888,7 @@
             "section": "def-common.ObjectType",
             "text": "ObjectType"
           },
-          "<ExtendedProps<{ type: ",
+          "<{ id: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4772,7 +5896,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<\"rest\" | undefined>; name: ",
+          "<string>; type: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4780,7 +5904,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<string>; expiration: ",
+          "<\"rest\" | undefined>; expiration: ",
           {
             "pluginId": "@kbn/config-schema",
             "scope": "common",
@@ -4804,15 +5928,7 @@
             "section": "def-common.Type",
             "text": "Type"
           },
-          "<Readonly<{} & {}> | undefined>; }, { name: null; id: ",
-          {
-            "pluginId": "@kbn/config-schema",
-            "scope": "common",
-            "docId": "kibKbnConfigSchemaPluginApi",
-            "section": "def-common.Type",
-            "text": "Type"
-          },
-          "<string>; }>>"
+          "<Readonly<{} & {}> | undefined>; }>"
         ],
         "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
diff --git a/api_docs/kbn_security_plugin_types_server.mdx b/api_docs/kbn_security_plugin_types_server.mdx
index 8ff72147e8d3a..3e7061f677932 100644
--- a/api_docs/kbn_security_plugin_types_server.mdx
+++ b/api_docs/kbn_security_plugin_types_server.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-plugin-types-server
 title: "@kbn/security-plugin-types-server"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-plugin-types-server plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-plugin-types-server']
 ---
 import kbnSecurityPluginTypesServerObj from './kbn_security_plugin_types_server.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 216 | 0 | 121 | 0 |
+| 275 | 1 | 154 | 0 |
 
 ## Server
 
diff --git a/api_docs/kbn_security_solution_features.mdx b/api_docs/kbn_security_solution_features.mdx
index 152d223011906..dfbe39ed26008 100644
--- a/api_docs/kbn_security_solution_features.mdx
+++ b/api_docs/kbn_security_solution_features.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-features
 title: "@kbn/security-solution-features"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-features plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-features']
 ---
 import kbnSecuritySolutionFeaturesObj from './kbn_security_solution_features.devdocs.json';
diff --git a/api_docs/kbn_security_solution_navigation.mdx b/api_docs/kbn_security_solution_navigation.mdx
index 6e31397905d62..1c82c1fb5fab6 100644
--- a/api_docs/kbn_security_solution_navigation.mdx
+++ b/api_docs/kbn_security_solution_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-navigation
 title: "@kbn/security-solution-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-navigation plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-navigation']
 ---
 import kbnSecuritySolutionNavigationObj from './kbn_security_solution_navigation.devdocs.json';
diff --git a/api_docs/kbn_security_solution_side_nav.mdx b/api_docs/kbn_security_solution_side_nav.mdx
index 47d138031a171..96abbad087170 100644
--- a/api_docs/kbn_security_solution_side_nav.mdx
+++ b/api_docs/kbn_security_solution_side_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-side-nav
 title: "@kbn/security-solution-side-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-side-nav plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-side-nav']
 ---
 import kbnSecuritySolutionSideNavObj from './kbn_security_solution_side_nav.devdocs.json';
diff --git a/api_docs/kbn_security_solution_storybook_config.mdx b/api_docs/kbn_security_solution_storybook_config.mdx
index 479ada4dffb16..7e64d4df30fde 100644
--- a/api_docs/kbn_security_solution_storybook_config.mdx
+++ b/api_docs/kbn_security_solution_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-security-solution-storybook-config
 title: "@kbn/security-solution-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/security-solution-storybook-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/security-solution-storybook-config']
 ---
 import kbnSecuritySolutionStorybookConfigObj from './kbn_security_solution_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_autocomplete.mdx b/api_docs/kbn_securitysolution_autocomplete.mdx
index d337ec8da2f90..2cc69fe03cf35 100644
--- a/api_docs/kbn_securitysolution_autocomplete.mdx
+++ b/api_docs/kbn_securitysolution_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-autocomplete
 title: "@kbn/securitysolution-autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-autocomplete plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-autocomplete']
 ---
 import kbnSecuritysolutionAutocompleteObj from './kbn_securitysolution_autocomplete.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_data_table.mdx b/api_docs/kbn_securitysolution_data_table.mdx
index 3b5a0950ac1b7..f5ddcbbdec00f 100644
--- a/api_docs/kbn_securitysolution_data_table.mdx
+++ b/api_docs/kbn_securitysolution_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-data-table
 title: "@kbn/securitysolution-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-data-table plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-data-table']
 ---
 import kbnSecuritysolutionDataTableObj from './kbn_securitysolution_data_table.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_ecs.mdx b/api_docs/kbn_securitysolution_ecs.mdx
index a0d3c010a7838..0d015da9e8c91 100644
--- a/api_docs/kbn_securitysolution_ecs.mdx
+++ b/api_docs/kbn_securitysolution_ecs.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-ecs
 title: "@kbn/securitysolution-ecs"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-ecs plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-ecs']
 ---
 import kbnSecuritysolutionEcsObj from './kbn_securitysolution_ecs.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_es_utils.mdx b/api_docs/kbn_securitysolution_es_utils.mdx
index 1aef92127570f..c4d3ed200cb01 100644
--- a/api_docs/kbn_securitysolution_es_utils.mdx
+++ b/api_docs/kbn_securitysolution_es_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-es-utils
 title: "@kbn/securitysolution-es-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-es-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-es-utils']
 ---
 import kbnSecuritysolutionEsUtilsObj from './kbn_securitysolution_es_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_exception_list_components.devdocs.json b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
index 40dc8909e03ed..7d1c51ca40ea9 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
+++ b/api_docs/kbn_securitysolution_exception_list_components.devdocs.json
@@ -851,7 +851,7 @@
             "label": "formattedDateComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
+              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"html\" | \"stop\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/index.tsx",
             "deprecated": false,
@@ -865,7 +865,7 @@
             "label": "securityLinkAnchorComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
+              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"html\" | \"stop\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/meta/index.tsx",
             "deprecated": false,
@@ -1004,7 +1004,7 @@
             "label": "securityLinkAnchorComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
+              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"html\" | \"stop\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx",
             "deprecated": false,
@@ -1018,7 +1018,7 @@
             "label": "formattedDateComponent",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
+              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"html\" | \"stop\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx",
             "deprecated": false,
@@ -1144,7 +1144,7 @@
             "label": "showValueListModal",
             "description": [],
             "signature": [
-              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"stop\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"html\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
+              "\"symbol\" | \"object\" | \"source\" | \"meta\" | \"desc\" | \"filter\" | \"big\" | \"link\" | \"small\" | \"sub\" | \"sup\" | \"text\" | \"map\" | \"head\" | \"slot\" | \"style\" | \"title\" | \"data\" | \"pattern\" | \"summary\" | \"template\" | \"span\" | \"main\" | \"path\" | \"form\" | \"body\" | \"html\" | \"stop\" | \"q\" | \"label\" | \"progress\" | \"article\" | \"image\" | \"menu\" | \"base\" | React.ComponentType<any> | \"s\" | \"legend\" | \"canvas\" | \"svg\" | \"h1\" | \"h2\" | \"h3\" | \"h4\" | \"h5\" | \"h6\" | \"p\" | \"select\" | \"output\" | \"script\" | \"time\" | \"mask\" | \"input\" | \"table\" | \"a\" | \"abbr\" | \"address\" | \"area\" | \"aside\" | \"audio\" | \"b\" | \"bdi\" | \"bdo\" | \"blockquote\" | \"br\" | \"button\" | \"caption\" | \"cite\" | \"code\" | \"col\" | \"colgroup\" | \"datalist\" | \"dd\" | \"del\" | \"details\" | \"dfn\" | \"dialog\" | \"div\" | \"dl\" | \"dt\" | \"em\" | \"embed\" | \"fieldset\" | \"figcaption\" | \"figure\" | \"footer\" | \"header\" | \"hgroup\" | \"hr\" | \"i\" | \"iframe\" | \"img\" | \"ins\" | \"kbd\" | \"keygen\" | \"li\" | \"mark\" | \"menuitem\" | \"meter\" | \"nav\" | \"noindex\" | \"noscript\" | \"ol\" | \"optgroup\" | \"option\" | \"param\" | \"picture\" | \"pre\" | \"rp\" | \"rt\" | \"ruby\" | \"samp\" | \"section\" | \"strong\" | \"tbody\" | \"td\" | \"textarea\" | \"tfoot\" | \"th\" | \"thead\" | \"tr\" | \"track\" | \"u\" | \"ul\" | \"var\" | \"video\" | \"wbr\" | \"webview\" | \"animate\" | \"animateMotion\" | \"animateTransform\" | \"circle\" | \"clipPath\" | \"defs\" | \"ellipse\" | \"feBlend\" | \"feColorMatrix\" | \"feComponentTransfer\" | \"feComposite\" | \"feConvolveMatrix\" | \"feDiffuseLighting\" | \"feDisplacementMap\" | \"feDistantLight\" | \"feDropShadow\" | \"feFlood\" | \"feFuncA\" | \"feFuncB\" | \"feFuncG\" | \"feFuncR\" | \"feGaussianBlur\" | \"feImage\" | \"feMerge\" | \"feMergeNode\" | \"feMorphology\" | \"feOffset\" | \"fePointLight\" | \"feSpecularLighting\" | \"feSpotLight\" | \"feTile\" | \"feTurbulence\" | \"foreignObject\" | \"g\" | \"line\" | \"linearGradient\" | \"marker\" | \"metadata\" | \"mpath\" | \"polygon\" | \"polyline\" | \"radialGradient\" | \"rect\" | \"switch\" | \"textPath\" | \"tspan\" | \"use\" | \"view\""
             ],
             "path": "packages/kbn-securitysolution-exception-list-components/src/exception_item_card/exception_item_card.tsx",
             "deprecated": false,
diff --git a/api_docs/kbn_securitysolution_exception_list_components.mdx b/api_docs/kbn_securitysolution_exception_list_components.mdx
index 53846ba0e3823..523d9999543fa 100644
--- a/api_docs/kbn_securitysolution_exception_list_components.mdx
+++ b/api_docs/kbn_securitysolution_exception_list_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-exception-list-components
 title: "@kbn/securitysolution-exception-list-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-exception-list-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-exception-list-components']
 ---
 import kbnSecuritysolutionExceptionListComponentsObj from './kbn_securitysolution_exception_list_components.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_hook_utils.mdx b/api_docs/kbn_securitysolution_hook_utils.mdx
index 0ed014cb136bb..75effaccc574a 100644
--- a/api_docs/kbn_securitysolution_hook_utils.mdx
+++ b/api_docs/kbn_securitysolution_hook_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-hook-utils
 title: "@kbn/securitysolution-hook-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-hook-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-hook-utils']
 ---
 import kbnSecuritysolutionHookUtilsObj from './kbn_securitysolution_hook_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
index 33cdd4715ac06..1e6a0aabed154 100644
--- a/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_alerting_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-alerting-types
 title: "@kbn/securitysolution-io-ts-alerting-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-alerting-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-alerting-types']
 ---
 import kbnSecuritysolutionIoTsAlertingTypesObj from './kbn_securitysolution_io_ts_alerting_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_list_types.mdx b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
index a367a1629a9e0..4c8aae94e6133 100644
--- a/api_docs/kbn_securitysolution_io_ts_list_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_list_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-list-types
 title: "@kbn/securitysolution-io-ts-list-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-list-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-list-types']
 ---
 import kbnSecuritysolutionIoTsListTypesObj from './kbn_securitysolution_io_ts_list_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_types.mdx b/api_docs/kbn_securitysolution_io_ts_types.mdx
index 11a27ebeb19cf..490c848990154 100644
--- a/api_docs/kbn_securitysolution_io_ts_types.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-types
 title: "@kbn/securitysolution-io-ts-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-types']
 ---
 import kbnSecuritysolutionIoTsTypesObj from './kbn_securitysolution_io_ts_types.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_io_ts_utils.mdx b/api_docs/kbn_securitysolution_io_ts_utils.mdx
index 230f10e9ff23f..ae97799bc3aba 100644
--- a/api_docs/kbn_securitysolution_io_ts_utils.mdx
+++ b/api_docs/kbn_securitysolution_io_ts_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-io-ts-utils
 title: "@kbn/securitysolution-io-ts-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-io-ts-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-io-ts-utils']
 ---
 import kbnSecuritysolutionIoTsUtilsObj from './kbn_securitysolution_io_ts_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_api.mdx b/api_docs/kbn_securitysolution_list_api.mdx
index 07a3718c94ec9..faf11f193c183 100644
--- a/api_docs/kbn_securitysolution_list_api.mdx
+++ b/api_docs/kbn_securitysolution_list_api.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-api
 title: "@kbn/securitysolution-list-api"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-api plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-api']
 ---
 import kbnSecuritysolutionListApiObj from './kbn_securitysolution_list_api.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_constants.mdx b/api_docs/kbn_securitysolution_list_constants.mdx
index cfd156223a6a4..342491854dedd 100644
--- a/api_docs/kbn_securitysolution_list_constants.mdx
+++ b/api_docs/kbn_securitysolution_list_constants.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-constants
 title: "@kbn/securitysolution-list-constants"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-constants plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-constants']
 ---
 import kbnSecuritysolutionListConstantsObj from './kbn_securitysolution_list_constants.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_hooks.mdx b/api_docs/kbn_securitysolution_list_hooks.mdx
index 224320b967554..55361e2a7237b 100644
--- a/api_docs/kbn_securitysolution_list_hooks.mdx
+++ b/api_docs/kbn_securitysolution_list_hooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-hooks
 title: "@kbn/securitysolution-list-hooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-hooks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-hooks']
 ---
 import kbnSecuritysolutionListHooksObj from './kbn_securitysolution_list_hooks.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_list_utils.mdx b/api_docs/kbn_securitysolution_list_utils.mdx
index 7b2f62b6b05c2..1080ee46832bc 100644
--- a/api_docs/kbn_securitysolution_list_utils.mdx
+++ b/api_docs/kbn_securitysolution_list_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-list-utils
 title: "@kbn/securitysolution-list-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-list-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-list-utils']
 ---
 import kbnSecuritysolutionListUtilsObj from './kbn_securitysolution_list_utils.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_rules.mdx b/api_docs/kbn_securitysolution_rules.mdx
index 6a00d13fb3b5e..bcb12e8d0cfa7 100644
--- a/api_docs/kbn_securitysolution_rules.mdx
+++ b/api_docs/kbn_securitysolution_rules.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-rules
 title: "@kbn/securitysolution-rules"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-rules plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-rules']
 ---
 import kbnSecuritysolutionRulesObj from './kbn_securitysolution_rules.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_t_grid.mdx b/api_docs/kbn_securitysolution_t_grid.mdx
index 424f784abadf5..3cc6dfa8ac1e9 100644
--- a/api_docs/kbn_securitysolution_t_grid.mdx
+++ b/api_docs/kbn_securitysolution_t_grid.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-t-grid
 title: "@kbn/securitysolution-t-grid"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-t-grid plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-t-grid']
 ---
 import kbnSecuritysolutionTGridObj from './kbn_securitysolution_t_grid.devdocs.json';
diff --git a/api_docs/kbn_securitysolution_utils.mdx b/api_docs/kbn_securitysolution_utils.mdx
index d0c5d655632b1..6070497ba89f5 100644
--- a/api_docs/kbn_securitysolution_utils.mdx
+++ b/api_docs/kbn_securitysolution_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-securitysolution-utils
 title: "@kbn/securitysolution-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/securitysolution-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/securitysolution-utils']
 ---
 import kbnSecuritysolutionUtilsObj from './kbn_securitysolution_utils.devdocs.json';
diff --git a/api_docs/kbn_server_http_tools.mdx b/api_docs/kbn_server_http_tools.mdx
index d26e7f2837e49..bfed07e3aee98 100644
--- a/api_docs/kbn_server_http_tools.mdx
+++ b/api_docs/kbn_server_http_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-http-tools
 title: "@kbn/server-http-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-http-tools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-http-tools']
 ---
 import kbnServerHttpToolsObj from './kbn_server_http_tools.devdocs.json';
diff --git a/api_docs/kbn_server_route_repository.mdx b/api_docs/kbn_server_route_repository.mdx
index 1a225d92b53aa..5fb1689a44c0e 100644
--- a/api_docs/kbn_server_route_repository.mdx
+++ b/api_docs/kbn_server_route_repository.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-server-route-repository
 title: "@kbn/server-route-repository"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/server-route-repository plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/server-route-repository']
 ---
 import kbnServerRouteRepositoryObj from './kbn_server_route_repository.devdocs.json';
diff --git a/api_docs/kbn_serverless_common_settings.mdx b/api_docs/kbn_serverless_common_settings.mdx
index 7fe380e0bf54b..37268e7c5d084 100644
--- a/api_docs/kbn_serverless_common_settings.mdx
+++ b/api_docs/kbn_serverless_common_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-common-settings
 title: "@kbn/serverless-common-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-common-settings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-common-settings']
 ---
 import kbnServerlessCommonSettingsObj from './kbn_serverless_common_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_observability_settings.mdx b/api_docs/kbn_serverless_observability_settings.mdx
index 023e2b19d8624..dcf3b3e7304fa 100644
--- a/api_docs/kbn_serverless_observability_settings.mdx
+++ b/api_docs/kbn_serverless_observability_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-observability-settings
 title: "@kbn/serverless-observability-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-observability-settings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-observability-settings']
 ---
 import kbnServerlessObservabilitySettingsObj from './kbn_serverless_observability_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_project_switcher.mdx b/api_docs/kbn_serverless_project_switcher.mdx
index 3fa7c46d002e0..573c06ab10754 100644
--- a/api_docs/kbn_serverless_project_switcher.mdx
+++ b/api_docs/kbn_serverless_project_switcher.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-project-switcher
 title: "@kbn/serverless-project-switcher"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-project-switcher plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-project-switcher']
 ---
 import kbnServerlessProjectSwitcherObj from './kbn_serverless_project_switcher.devdocs.json';
diff --git a/api_docs/kbn_serverless_search_settings.mdx b/api_docs/kbn_serverless_search_settings.mdx
index 5c9df1a51fd74..8da691192d30c 100644
--- a/api_docs/kbn_serverless_search_settings.mdx
+++ b/api_docs/kbn_serverless_search_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-search-settings
 title: "@kbn/serverless-search-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-search-settings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-search-settings']
 ---
 import kbnServerlessSearchSettingsObj from './kbn_serverless_search_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_security_settings.mdx b/api_docs/kbn_serverless_security_settings.mdx
index 90764c414c671..32592b9530781 100644
--- a/api_docs/kbn_serverless_security_settings.mdx
+++ b/api_docs/kbn_serverless_security_settings.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-security-settings
 title: "@kbn/serverless-security-settings"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-security-settings plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-security-settings']
 ---
 import kbnServerlessSecuritySettingsObj from './kbn_serverless_security_settings.devdocs.json';
diff --git a/api_docs/kbn_serverless_storybook_config.mdx b/api_docs/kbn_serverless_storybook_config.mdx
index ee14bf49416db..4b103166e9861 100644
--- a/api_docs/kbn_serverless_storybook_config.mdx
+++ b/api_docs/kbn_serverless_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-serverless-storybook-config
 title: "@kbn/serverless-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/serverless-storybook-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/serverless-storybook-config']
 ---
 import kbnServerlessStorybookConfigObj from './kbn_serverless_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_svg.devdocs.json b/api_docs/kbn_shared_svg.devdocs.json
index 588b106773268..cf0d7002279b3 100644
--- a/api_docs/kbn_shared_svg.devdocs.json
+++ b/api_docs/kbn_shared_svg.devdocs.json
@@ -58,6 +58,18 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/shared-svg",
+        "id": "def-common.content",
+        "type": "string",
+        "tags": [],
+        "label": "content",
+        "description": [],
+        "path": "packages/kbn-ambient-ui-types/index.d.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/shared-svg",
         "id": "def-common.content",
diff --git a/api_docs/kbn_shared_svg.mdx b/api_docs/kbn_shared_svg.mdx
index 3ca354d31f59f..0ae891156019a 100644
--- a/api_docs/kbn_shared_svg.mdx
+++ b/api_docs/kbn_shared_svg.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-svg
 title: "@kbn/shared-svg"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-svg plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-svg']
 ---
 import kbnSharedSvgObj from './kbn_shared_svg.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/te
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 4 | 0 | 4 | 0 |
+| 5 | 0 | 5 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_shared_ux_avatar_solution.mdx b/api_docs/kbn_shared_ux_avatar_solution.mdx
index 0c028e69275fe..400fabf3a166e 100644
--- a/api_docs/kbn_shared_ux_avatar_solution.mdx
+++ b/api_docs/kbn_shared_ux_avatar_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-avatar-solution
 title: "@kbn/shared-ux-avatar-solution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-avatar-solution plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-avatar-solution']
 ---
 import kbnSharedUxAvatarSolutionObj from './kbn_shared_ux_avatar_solution.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
index adf957ecf75c7..997ed2a4ff707 100644
--- a/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
+++ b/api_docs/kbn_shared_ux_button_exit_full_screen.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-exit-full-screen
 title: "@kbn/shared-ux-button-exit-full-screen"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-exit-full-screen plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-exit-full-screen']
 ---
 import kbnSharedUxButtonExitFullScreenObj from './kbn_shared_ux_button_exit_full_screen.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_button_toolbar.mdx b/api_docs/kbn_shared_ux_button_toolbar.mdx
index ec994d4e18b71..a658f1ba95d35 100644
--- a/api_docs/kbn_shared_ux_button_toolbar.mdx
+++ b/api_docs/kbn_shared_ux_button_toolbar.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-button-toolbar
 title: "@kbn/shared-ux-button-toolbar"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-button-toolbar plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-button-toolbar']
 ---
 import kbnSharedUxButtonToolbarObj from './kbn_shared_ux_button_toolbar.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data.mdx b/api_docs/kbn_shared_ux_card_no_data.mdx
index 4724a4a6e4657..bd4c4f5703aa1 100644
--- a/api_docs/kbn_shared_ux_card_no_data.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data
 title: "@kbn/shared-ux-card-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data']
 ---
 import kbnSharedUxCardNoDataObj from './kbn_shared_ux_card_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
index 2a59b198fc4a8..43361f2463328 100644
--- a/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_card_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-card-no-data-mocks
 title: "@kbn/shared-ux-card-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-card-no-data-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-card-no-data-mocks']
 ---
 import kbnSharedUxCardNoDataMocksObj from './kbn_shared_ux_card_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_chrome_navigation.mdx b/api_docs/kbn_shared_ux_chrome_navigation.mdx
index 7adfd40f09b5c..6ce92b6cf411a 100644
--- a/api_docs/kbn_shared_ux_chrome_navigation.mdx
+++ b/api_docs/kbn_shared_ux_chrome_navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-chrome-navigation
 title: "@kbn/shared-ux-chrome-navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-chrome-navigation plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-chrome-navigation']
 ---
 import kbnSharedUxChromeNavigationObj from './kbn_shared_ux_chrome_navigation.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_error_boundary.mdx b/api_docs/kbn_shared_ux_error_boundary.mdx
index 4420335334892..058ca848fa53a 100644
--- a/api_docs/kbn_shared_ux_error_boundary.mdx
+++ b/api_docs/kbn_shared_ux_error_boundary.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-error-boundary
 title: "@kbn/shared-ux-error-boundary"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-error-boundary plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-error-boundary']
 ---
 import kbnSharedUxErrorBoundaryObj from './kbn_shared_ux_error_boundary.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_context.mdx b/api_docs/kbn_shared_ux_file_context.mdx
index a25cff2f66b5f..afabf5111ee83 100644
--- a/api_docs/kbn_shared_ux_file_context.mdx
+++ b/api_docs/kbn_shared_ux_file_context.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-context
 title: "@kbn/shared-ux-file-context"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-context plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-context']
 ---
 import kbnSharedUxFileContextObj from './kbn_shared_ux_file_context.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image.mdx b/api_docs/kbn_shared_ux_file_image.mdx
index 7276b3a6cb970..5e76afeaeafac 100644
--- a/api_docs/kbn_shared_ux_file_image.mdx
+++ b/api_docs/kbn_shared_ux_file_image.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image
 title: "@kbn/shared-ux-file-image"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image']
 ---
 import kbnSharedUxFileImageObj from './kbn_shared_ux_file_image.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_image_mocks.mdx b/api_docs/kbn_shared_ux_file_image_mocks.mdx
index 576b46f0a128a..bb3b7effbf9c8 100644
--- a/api_docs/kbn_shared_ux_file_image_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_image_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-image-mocks
 title: "@kbn/shared-ux-file-image-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-image-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-image-mocks']
 ---
 import kbnSharedUxFileImageMocksObj from './kbn_shared_ux_file_image_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_mocks.mdx b/api_docs/kbn_shared_ux_file_mocks.mdx
index affcb80b62baf..1b00907123e87 100644
--- a/api_docs/kbn_shared_ux_file_mocks.mdx
+++ b/api_docs/kbn_shared_ux_file_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-mocks
 title: "@kbn/shared-ux-file-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-mocks']
 ---
 import kbnSharedUxFileMocksObj from './kbn_shared_ux_file_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_picker.mdx b/api_docs/kbn_shared_ux_file_picker.mdx
index c8d74eac32e1e..aaa49e0082044 100644
--- a/api_docs/kbn_shared_ux_file_picker.mdx
+++ b/api_docs/kbn_shared_ux_file_picker.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-picker
 title: "@kbn/shared-ux-file-picker"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-picker plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-picker']
 ---
 import kbnSharedUxFilePickerObj from './kbn_shared_ux_file_picker.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_types.mdx b/api_docs/kbn_shared_ux_file_types.mdx
index 609605213abe4..4cae17904f628 100644
--- a/api_docs/kbn_shared_ux_file_types.mdx
+++ b/api_docs/kbn_shared_ux_file_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-types
 title: "@kbn/shared-ux-file-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-types']
 ---
 import kbnSharedUxFileTypesObj from './kbn_shared_ux_file_types.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_upload.mdx b/api_docs/kbn_shared_ux_file_upload.mdx
index cdc4cc148af48..d0f5305b3a0e3 100644
--- a/api_docs/kbn_shared_ux_file_upload.mdx
+++ b/api_docs/kbn_shared_ux_file_upload.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-upload
 title: "@kbn/shared-ux-file-upload"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-upload plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-upload']
 ---
 import kbnSharedUxFileUploadObj from './kbn_shared_ux_file_upload.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_file_util.mdx b/api_docs/kbn_shared_ux_file_util.mdx
index c238beb9f0876..2d7045010a304 100644
--- a/api_docs/kbn_shared_ux_file_util.mdx
+++ b/api_docs/kbn_shared_ux_file_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-file-util
 title: "@kbn/shared-ux-file-util"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-file-util plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-file-util']
 ---
 import kbnSharedUxFileUtilObj from './kbn_shared_ux_file_util.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app.mdx b/api_docs/kbn_shared_ux_link_redirect_app.mdx
index e3b0fef1518b1..0ca47d74e2d82 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app
 title: "@kbn/shared-ux-link-redirect-app"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app']
 ---
 import kbnSharedUxLinkRedirectAppObj from './kbn_shared_ux_link_redirect_app.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
index 79fe7bfe77225..3c3351144621d 100644
--- a/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
+++ b/api_docs/kbn_shared_ux_link_redirect_app_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-link-redirect-app-mocks
 title: "@kbn/shared-ux-link-redirect-app-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-link-redirect-app-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-link-redirect-app-mocks']
 ---
 import kbnSharedUxLinkRedirectAppMocksObj from './kbn_shared_ux_link_redirect_app_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown.mdx b/api_docs/kbn_shared_ux_markdown.mdx
index 9d13ad8c7dc44..f309286b16a73 100644
--- a/api_docs/kbn_shared_ux_markdown.mdx
+++ b/api_docs/kbn_shared_ux_markdown.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown
 title: "@kbn/shared-ux-markdown"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown']
 ---
 import kbnSharedUxMarkdownObj from './kbn_shared_ux_markdown.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_markdown_mocks.mdx b/api_docs/kbn_shared_ux_markdown_mocks.mdx
index e5ef32d881ae3..4bb82443adc55 100644
--- a/api_docs/kbn_shared_ux_markdown_mocks.mdx
+++ b/api_docs/kbn_shared_ux_markdown_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-markdown-mocks
 title: "@kbn/shared-ux-markdown-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-markdown-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-markdown-mocks']
 ---
 import kbnSharedUxMarkdownMocksObj from './kbn_shared_ux_markdown_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
index 87bbd83be92f3..e5ff02b811d69 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data
 title: "@kbn/shared-ux-page-analytics-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data']
 ---
 import kbnSharedUxPageAnalyticsNoDataObj from './kbn_shared_ux_page_analytics_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
index d5b24608c8165..38badc96b8e15 100644
--- a/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_analytics_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-analytics-no-data-mocks
 title: "@kbn/shared-ux-page-analytics-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-analytics-no-data-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-analytics-no-data-mocks']
 ---
 import kbnSharedUxPageAnalyticsNoDataMocksObj from './kbn_shared_ux_page_analytics_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
index 01f745c3f7158..e7642c35ca433 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data
 title: "@kbn/shared-ux-page-kibana-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data']
 ---
 import kbnSharedUxPageKibanaNoDataObj from './kbn_shared_ux_page_kibana_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
index 76c3d9c634b65..914449bc2a88a 100644
--- a/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-no-data-mocks
 title: "@kbn/shared-ux-page-kibana-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-no-data-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-no-data-mocks']
 ---
 import kbnSharedUxPageKibanaNoDataMocksObj from './kbn_shared_ux_page_kibana_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template.mdx b/api_docs/kbn_shared_ux_page_kibana_template.mdx
index e9fe2259bfab0..52ef3c3592ba5 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template
 title: "@kbn/shared-ux-page-kibana-template"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template']
 ---
 import kbnSharedUxPageKibanaTemplateObj from './kbn_shared_ux_page_kibana_template.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
index 6f08c619612fb..0474b58e8bf76 100644
--- a/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_kibana_template_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-kibana-template-mocks
 title: "@kbn/shared-ux-page-kibana-template-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-kibana-template-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-kibana-template-mocks']
 ---
 import kbnSharedUxPageKibanaTemplateMocksObj from './kbn_shared_ux_page_kibana_template_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data.mdx b/api_docs/kbn_shared_ux_page_no_data.mdx
index 5e9e46ad65c71..40eef9e7e6769 100644
--- a/api_docs/kbn_shared_ux_page_no_data.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data
 title: "@kbn/shared-ux-page-no-data"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data']
 ---
 import kbnSharedUxPageNoDataObj from './kbn_shared_ux_page_no_data.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config.mdx b/api_docs/kbn_shared_ux_page_no_data_config.mdx
index 62798a05c5105..fddc72556aa1d 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config
 title: "@kbn/shared-ux-page-no-data-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config']
 ---
 import kbnSharedUxPageNoDataConfigObj from './kbn_shared_ux_page_no_data_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
index 0fb02e8559a2a..d6a56bb022bb8 100644
--- a/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_config_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-config-mocks
 title: "@kbn/shared-ux-page-no-data-config-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-config-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-config-mocks']
 ---
 import kbnSharedUxPageNoDataConfigMocksObj from './kbn_shared_ux_page_no_data_config_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
index 62b4761142156..d223d7704040f 100644
--- a/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
+++ b/api_docs/kbn_shared_ux_page_no_data_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-no-data-mocks
 title: "@kbn/shared-ux-page-no-data-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-no-data-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-no-data-mocks']
 ---
 import kbnSharedUxPageNoDataMocksObj from './kbn_shared_ux_page_no_data_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_page_solution_nav.mdx b/api_docs/kbn_shared_ux_page_solution_nav.mdx
index 5f353f432c6d7..34a962b8ecb3a 100644
--- a/api_docs/kbn_shared_ux_page_solution_nav.mdx
+++ b/api_docs/kbn_shared_ux_page_solution_nav.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-page-solution-nav
 title: "@kbn/shared-ux-page-solution-nav"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-page-solution-nav plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-page-solution-nav']
 ---
 import kbnSharedUxPageSolutionNavObj from './kbn_shared_ux_page_solution_nav.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.devdocs.json b/api_docs/kbn_shared_ux_prompt_no_data_views.devdocs.json
index 3a87ab5b316a9..335a8ce3c4eff 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.devdocs.json
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.devdocs.json
@@ -259,7 +259,7 @@
               "The background color of the prompt; defaults to `plain`."
             ],
             "signature": [
-              "\"warning\" | \"success\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"plain\" | \"transparent\" | undefined"
+              "\"warning\" | \"success\" | \"plain\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"transparent\" | undefined"
             ],
             "path": "packages/shared-ux/prompt/no_data_views/types/index.d.ts",
             "deprecated": false,
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
index a9250e7f475ab..f1dc1b7bdca18 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views
 title: "@kbn/shared-ux-prompt-no-data-views"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views']
 ---
 import kbnSharedUxPromptNoDataViewsObj from './kbn_shared_ux_prompt_no_data_views.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
index 677ce30369836..713cb9f1bc23d 100644
--- a/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
+++ b/api_docs/kbn_shared_ux_prompt_no_data_views_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-no-data-views-mocks
 title: "@kbn/shared-ux-prompt-no-data-views-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-no-data-views-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-no-data-views-mocks']
 ---
 import kbnSharedUxPromptNoDataViewsMocksObj from './kbn_shared_ux_prompt_no_data_views_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_prompt_not_found.mdx b/api_docs/kbn_shared_ux_prompt_not_found.mdx
index fe7fdd18c8f3e..2e7305429d011 100644
--- a/api_docs/kbn_shared_ux_prompt_not_found.mdx
+++ b/api_docs/kbn_shared_ux_prompt_not_found.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-prompt-not-found
 title: "@kbn/shared-ux-prompt-not-found"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-prompt-not-found plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-prompt-not-found']
 ---
 import kbnSharedUxPromptNotFoundObj from './kbn_shared_ux_prompt_not_found.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router.mdx b/api_docs/kbn_shared_ux_router.mdx
index a918fd6567914..f17a5d8e7f7d4 100644
--- a/api_docs/kbn_shared_ux_router.mdx
+++ b/api_docs/kbn_shared_ux_router.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router
 title: "@kbn/shared-ux-router"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router']
 ---
 import kbnSharedUxRouterObj from './kbn_shared_ux_router.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_router_mocks.mdx b/api_docs/kbn_shared_ux_router_mocks.mdx
index 3f433e8353bd5..909854dc37fb6 100644
--- a/api_docs/kbn_shared_ux_router_mocks.mdx
+++ b/api_docs/kbn_shared_ux_router_mocks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-router-mocks
 title: "@kbn/shared-ux-router-mocks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-router-mocks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-router-mocks']
 ---
 import kbnSharedUxRouterMocksObj from './kbn_shared_ux_router_mocks.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_config.mdx b/api_docs/kbn_shared_ux_storybook_config.mdx
index e1d49975125a1..9c97e78796c88 100644
--- a/api_docs/kbn_shared_ux_storybook_config.mdx
+++ b/api_docs/kbn_shared_ux_storybook_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-config
 title: "@kbn/shared-ux-storybook-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-config']
 ---
 import kbnSharedUxStorybookConfigObj from './kbn_shared_ux_storybook_config.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_storybook_mock.mdx b/api_docs/kbn_shared_ux_storybook_mock.mdx
index b5362b262c525..516e98c6ed266 100644
--- a/api_docs/kbn_shared_ux_storybook_mock.mdx
+++ b/api_docs/kbn_shared_ux_storybook_mock.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-storybook-mock
 title: "@kbn/shared-ux-storybook-mock"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-storybook-mock plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-storybook-mock']
 ---
 import kbnSharedUxStorybookMockObj from './kbn_shared_ux_storybook_mock.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_tabbed_modal.mdx b/api_docs/kbn_shared_ux_tabbed_modal.mdx
index cc8522ad022f6..d723cb532045d 100644
--- a/api_docs/kbn_shared_ux_tabbed_modal.mdx
+++ b/api_docs/kbn_shared_ux_tabbed_modal.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-tabbed-modal
 title: "@kbn/shared-ux-tabbed-modal"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-tabbed-modal plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-tabbed-modal']
 ---
 import kbnSharedUxTabbedModalObj from './kbn_shared_ux_tabbed_modal.devdocs.json';
diff --git a/api_docs/kbn_shared_ux_utility.mdx b/api_docs/kbn_shared_ux_utility.mdx
index 0abe79d90ca55..4af82c552186c 100644
--- a/api_docs/kbn_shared_ux_utility.mdx
+++ b/api_docs/kbn_shared_ux_utility.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-shared-ux-utility
 title: "@kbn/shared-ux-utility"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/shared-ux-utility plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/shared-ux-utility']
 ---
 import kbnSharedUxUtilityObj from './kbn_shared_ux_utility.devdocs.json';
diff --git a/api_docs/kbn_slo_schema.mdx b/api_docs/kbn_slo_schema.mdx
index ebd938fd31b27..2a496ddbfa6d9 100644
--- a/api_docs/kbn_slo_schema.mdx
+++ b/api_docs/kbn_slo_schema.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-slo-schema
 title: "@kbn/slo-schema"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/slo-schema plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/slo-schema']
 ---
 import kbnSloSchemaObj from './kbn_slo_schema.devdocs.json';
diff --git a/api_docs/kbn_some_dev_log.mdx b/api_docs/kbn_some_dev_log.mdx
index 375566d760261..f64585581fb59 100644
--- a/api_docs/kbn_some_dev_log.mdx
+++ b/api_docs/kbn_some_dev_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-some-dev-log
 title: "@kbn/some-dev-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/some-dev-log plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/some-dev-log']
 ---
 import kbnSomeDevLogObj from './kbn_some_dev_log.devdocs.json';
diff --git a/api_docs/kbn_sort_predicates.mdx b/api_docs/kbn_sort_predicates.mdx
index 21265792e07e7..572f4d38cd2b1 100644
--- a/api_docs/kbn_sort_predicates.mdx
+++ b/api_docs/kbn_sort_predicates.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-sort-predicates
 title: "@kbn/sort-predicates"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/sort-predicates plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/sort-predicates']
 ---
 import kbnSortPredicatesObj from './kbn_sort_predicates.devdocs.json';
diff --git a/api_docs/kbn_std.mdx b/api_docs/kbn_std.mdx
index b35afc4b8a8d5..531a7d9f3f299 100644
--- a/api_docs/kbn_std.mdx
+++ b/api_docs/kbn_std.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-std
 title: "@kbn/std"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/std plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/std']
 ---
 import kbnStdObj from './kbn_std.devdocs.json';
diff --git a/api_docs/kbn_stdio_dev_helpers.mdx b/api_docs/kbn_stdio_dev_helpers.mdx
index b5afd2e18e900..9d0d9644a0539 100644
--- a/api_docs/kbn_stdio_dev_helpers.mdx
+++ b/api_docs/kbn_stdio_dev_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-stdio-dev-helpers
 title: "@kbn/stdio-dev-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/stdio-dev-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/stdio-dev-helpers']
 ---
 import kbnStdioDevHelpersObj from './kbn_stdio_dev_helpers.devdocs.json';
diff --git a/api_docs/kbn_storybook.mdx b/api_docs/kbn_storybook.mdx
index 28645f2265682..7e01852d0d379 100644
--- a/api_docs/kbn_storybook.mdx
+++ b/api_docs/kbn_storybook.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-storybook
 title: "@kbn/storybook"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/storybook plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/storybook']
 ---
 import kbnStorybookObj from './kbn_storybook.devdocs.json';
diff --git a/api_docs/kbn_telemetry_tools.mdx b/api_docs/kbn_telemetry_tools.mdx
index 07b7aaa0e835f..153170ae15de1 100644
--- a/api_docs/kbn_telemetry_tools.mdx
+++ b/api_docs/kbn_telemetry_tools.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-telemetry-tools
 title: "@kbn/telemetry-tools"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/telemetry-tools plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/telemetry-tools']
 ---
 import kbnTelemetryToolsObj from './kbn_telemetry_tools.devdocs.json';
diff --git a/api_docs/kbn_test.mdx b/api_docs/kbn_test.mdx
index 448de6ac1349a..b8cbca02207f7 100644
--- a/api_docs/kbn_test.mdx
+++ b/api_docs/kbn_test.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test
 title: "@kbn/test"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test']
 ---
 import kbnTestObj from './kbn_test.devdocs.json';
diff --git a/api_docs/kbn_test_eui_helpers.devdocs.json b/api_docs/kbn_test_eui_helpers.devdocs.json
index aab4d099fcc9a..d3276c2634aba 100644
--- a/api_docs/kbn_test_eui_helpers.devdocs.json
+++ b/api_docs/kbn_test_eui_helpers.devdocs.json
@@ -140,7 +140,7 @@
             "tags": [],
             "label": "selected",
             "description": [
-              "\nReturns selected value of button group"
+              "\nReturns selected option of button group"
             ],
             "signature": [
               "HTMLElement"
@@ -186,6 +186,171 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "@kbn/test-eui-helpers",
+        "id": "def-common.EuiSelectTestHarness",
+        "type": "Class",
+        "tags": [],
+        "label": "EuiSelectTestHarness",
+        "description": [],
+        "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.testId",
+            "type": "string",
+            "tags": [],
+            "label": "#testId",
+            "description": [],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.selectEl",
+            "type": "Object",
+            "tags": [],
+            "label": "#selectEl",
+            "description": [
+              "\nReturns select or throws"
+            ],
+            "signature": [
+              "HTMLElement"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/test-eui-helpers",
+                "id": "def-common.EuiSelectTestHarness.Unnamed.$1",
+                "type": "string",
+                "tags": [],
+                "label": "testId",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.testId",
+            "type": "string",
+            "tags": [],
+            "label": "testId",
+            "description": [
+              "\nReturns `data-test-subj` of select"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.self",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "self",
+            "description": [
+              "\nReturns button select if found, otherwise `null`"
+            ],
+            "signature": [
+              "HTMLElement | null"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.options",
+            "type": "Array",
+            "tags": [],
+            "label": "options",
+            "description": [
+              "\nReturns all options of select"
+            ],
+            "signature": [
+              "HTMLOptionElement[]"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.selected",
+            "type": "string",
+            "tags": [],
+            "label": "selected",
+            "description": [
+              "\nReturns selected option"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "@kbn/test-eui-helpers",
+            "id": "def-common.EuiSelectTestHarness.select",
+            "type": "Function",
+            "tags": [],
+            "label": "select",
+            "description": [
+              "\nSelect option by value"
+            ],
+            "signature": [
+              "(optionName: string | RegExp) => void"
+            ],
+            "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/test-eui-helpers",
+                "id": "def-common.EuiSelectTestHarness.select.$1",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "optionName",
+                "description": [],
+                "signature": [
+                  "string | RegExp"
+                ],
+                "path": "packages/kbn-test-eui-helpers/src/rtl_helpers.tsx",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "@kbn/test-eui-helpers",
         "id": "def-common.EuiSuperDatePickerTestHarness",
diff --git a/api_docs/kbn_test_eui_helpers.mdx b/api_docs/kbn_test_eui_helpers.mdx
index d0a18a49c5589..6c562a0c1b9a3 100644
--- a/api_docs/kbn_test_eui_helpers.mdx
+++ b/api_docs/kbn_test_eui_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-eui-helpers
 title: "@kbn/test-eui-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-eui-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-eui-helpers']
 ---
 import kbnTestEuiHelpersObj from './kbn_test_eui_helpers.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 25 | 0 | 13 | 0 |
+| 36 | 0 | 18 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_test_jest_helpers.mdx b/api_docs/kbn_test_jest_helpers.mdx
index 4a6a82ed89657..b973f23ecc14e 100644
--- a/api_docs/kbn_test_jest_helpers.mdx
+++ b/api_docs/kbn_test_jest_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-jest-helpers
 title: "@kbn/test-jest-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-jest-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-jest-helpers']
 ---
 import kbnTestJestHelpersObj from './kbn_test_jest_helpers.devdocs.json';
diff --git a/api_docs/kbn_test_subj_selector.mdx b/api_docs/kbn_test_subj_selector.mdx
index 12e87ff060996..282504963c042 100644
--- a/api_docs/kbn_test_subj_selector.mdx
+++ b/api_docs/kbn_test_subj_selector.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-test-subj-selector
 title: "@kbn/test-subj-selector"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/test-subj-selector plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/test-subj-selector']
 ---
 import kbnTestSubjSelectorObj from './kbn_test_subj_selector.devdocs.json';
diff --git a/api_docs/kbn_text_based_editor.mdx b/api_docs/kbn_text_based_editor.mdx
index 334d43dd475a4..a658d88790f29 100644
--- a/api_docs/kbn_text_based_editor.mdx
+++ b/api_docs/kbn_text_based_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-text-based-editor
 title: "@kbn/text-based-editor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/text-based-editor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/text-based-editor']
 ---
 import kbnTextBasedEditorObj from './kbn_text_based_editor.devdocs.json';
diff --git a/api_docs/kbn_timerange.mdx b/api_docs/kbn_timerange.mdx
index 9b6b25878d5cf..95919e349f2e8 100644
--- a/api_docs/kbn_timerange.mdx
+++ b/api_docs/kbn_timerange.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-timerange
 title: "@kbn/timerange"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/timerange plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/timerange']
 ---
 import kbnTimerangeObj from './kbn_timerange.devdocs.json';
diff --git a/api_docs/kbn_tooling_log.mdx b/api_docs/kbn_tooling_log.mdx
index 0240ee8f36502..5100c90c43a4d 100644
--- a/api_docs/kbn_tooling_log.mdx
+++ b/api_docs/kbn_tooling_log.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-tooling-log
 title: "@kbn/tooling-log"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/tooling-log plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/tooling-log']
 ---
 import kbnToolingLogObj from './kbn_tooling_log.devdocs.json';
diff --git a/api_docs/kbn_triggers_actions_ui_types.mdx b/api_docs/kbn_triggers_actions_ui_types.mdx
index c595a5de6729c..74dd99c686fe5 100644
--- a/api_docs/kbn_triggers_actions_ui_types.mdx
+++ b/api_docs/kbn_triggers_actions_ui_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-triggers-actions-ui-types
 title: "@kbn/triggers-actions-ui-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/triggers-actions-ui-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/triggers-actions-ui-types']
 ---
 import kbnTriggersActionsUiTypesObj from './kbn_triggers_actions_ui_types.devdocs.json';
diff --git a/api_docs/kbn_try_in_console.mdx b/api_docs/kbn_try_in_console.mdx
index baeb628c7b421..86cbfe71989d6 100644
--- a/api_docs/kbn_try_in_console.mdx
+++ b/api_docs/kbn_try_in_console.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-try-in-console
 title: "@kbn/try-in-console"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/try-in-console plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/try-in-console']
 ---
 import kbnTryInConsoleObj from './kbn_try_in_console.devdocs.json';
diff --git a/api_docs/kbn_ts_projects.mdx b/api_docs/kbn_ts_projects.mdx
index f2f8984b6423d..48c59ca0bc025 100644
--- a/api_docs/kbn_ts_projects.mdx
+++ b/api_docs/kbn_ts_projects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ts-projects
 title: "@kbn/ts-projects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ts-projects plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ts-projects']
 ---
 import kbnTsProjectsObj from './kbn_ts_projects.devdocs.json';
diff --git a/api_docs/kbn_typed_react_router_config.mdx b/api_docs/kbn_typed_react_router_config.mdx
index 97cf3f5bfed89..bb1e9dd0ff611 100644
--- a/api_docs/kbn_typed_react_router_config.mdx
+++ b/api_docs/kbn_typed_react_router_config.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-typed-react-router-config
 title: "@kbn/typed-react-router-config"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/typed-react-router-config plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/typed-react-router-config']
 ---
 import kbnTypedReactRouterConfigObj from './kbn_typed_react_router_config.devdocs.json';
diff --git a/api_docs/kbn_ui_actions_browser.mdx b/api_docs/kbn_ui_actions_browser.mdx
index 506836ede7fd2..a6f1a9ca28495 100644
--- a/api_docs/kbn_ui_actions_browser.mdx
+++ b/api_docs/kbn_ui_actions_browser.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-actions-browser
 title: "@kbn/ui-actions-browser"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-actions-browser plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-actions-browser']
 ---
 import kbnUiActionsBrowserObj from './kbn_ui_actions_browser.devdocs.json';
diff --git a/api_docs/kbn_ui_shared_deps_src.devdocs.json b/api_docs/kbn_ui_shared_deps_src.devdocs.json
index 5a4f7663f18a0..d80ea1cd158c8 100644
--- a/api_docs/kbn_ui_shared_deps_src.devdocs.json
+++ b/api_docs/kbn_ui_shared_deps_src.devdocs.json
@@ -342,6 +342,17 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/ui-shared-deps-src",
+            "id": "def-common.externals.fastestlevenshtein",
+            "type": "string",
+            "tags": [],
+            "label": "'fastest-levenshtein'",
+            "description": [],
+            "path": "packages/kbn-ui-shared-deps-src/src/definitions.js",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/ui-shared-deps-src",
             "id": "def-common.externals.rxjs",
@@ -524,6 +535,17 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "@kbn/ui-shared-deps-src",
+            "id": "def-common.externals.kbncryptobrowser",
+            "type": "string",
+            "tags": [],
+            "label": "'@kbn/crypto-browser'",
+            "description": [],
+            "path": "packages/kbn-ui-shared-deps-src/src/definitions.js",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "@kbn/ui-shared-deps-src",
             "id": "def-common.externals.kbnesquery",
diff --git a/api_docs/kbn_ui_shared_deps_src.mdx b/api_docs/kbn_ui_shared_deps_src.mdx
index f9b114d5775e6..d35d8cab4a032 100644
--- a/api_docs/kbn_ui_shared_deps_src.mdx
+++ b/api_docs/kbn_ui_shared_deps_src.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-shared-deps-src
 title: "@kbn/ui-shared-deps-src"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-shared-deps-src plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-shared-deps-src']
 ---
 import kbnUiSharedDepsSrcObj from './kbn_ui_shared_deps_src.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kiban
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 55 | 0 | 46 | 0 |
+| 57 | 0 | 48 | 0 |
 
 ## Common
 
diff --git a/api_docs/kbn_ui_theme.mdx b/api_docs/kbn_ui_theme.mdx
index c305850a1d839..f110f52a44591 100644
--- a/api_docs/kbn_ui_theme.mdx
+++ b/api_docs/kbn_ui_theme.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-ui-theme
 title: "@kbn/ui-theme"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/ui-theme plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/ui-theme']
 ---
 import kbnUiThemeObj from './kbn_ui_theme.devdocs.json';
diff --git a/api_docs/kbn_unified_data_table.mdx b/api_docs/kbn_unified_data_table.mdx
index 3668c93f7f02b..0ba9e177c6af7 100644
--- a/api_docs/kbn_unified_data_table.mdx
+++ b/api_docs/kbn_unified_data_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-data-table
 title: "@kbn/unified-data-table"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-data-table plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-data-table']
 ---
 import kbnUnifiedDataTableObj from './kbn_unified_data_table.devdocs.json';
diff --git a/api_docs/kbn_unified_doc_viewer.mdx b/api_docs/kbn_unified_doc_viewer.mdx
index d368739b28ec2..d285fd99e8b66 100644
--- a/api_docs/kbn_unified_doc_viewer.mdx
+++ b/api_docs/kbn_unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-doc-viewer
 title: "@kbn/unified-doc-viewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-doc-viewer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-doc-viewer']
 ---
 import kbnUnifiedDocViewerObj from './kbn_unified_doc_viewer.devdocs.json';
diff --git a/api_docs/kbn_unified_field_list.devdocs.json b/api_docs/kbn_unified_field_list.devdocs.json
index c9bc5510c86c2..66ee3fbfb7d49 100644
--- a/api_docs/kbn_unified_field_list.devdocs.json
+++ b/api_docs/kbn_unified_field_list.devdocs.json
@@ -2211,7 +2211,7 @@
                 "section": "def-common.CoreStart",
                 "text": "CoreStart"
               },
-              ", \"analytics\" | \"uiSettings\">; data: ",
+              ", \"uiSettings\" | \"analytics\">; data: ",
               {
                 "pluginId": "data",
                 "scope": "public",
@@ -4585,7 +4585,7 @@
             "label": "type",
             "description": [],
             "signature": [
-              "\"other\" | \"normal\" | undefined"
+              "\"normal\" | \"other\" | undefined"
             ],
             "path": "packages/kbn-unified-field-list/src/components/field_stats/field_top_values_bucket.tsx",
             "deprecated": false,
diff --git a/api_docs/kbn_unified_field_list.mdx b/api_docs/kbn_unified_field_list.mdx
index 8905189feec0b..1c7b53d1945d5 100644
--- a/api_docs/kbn_unified_field_list.mdx
+++ b/api_docs/kbn_unified_field_list.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unified-field-list
 title: "@kbn/unified-field-list"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unified-field-list plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unified-field-list']
 ---
 import kbnUnifiedFieldListObj from './kbn_unified_field_list.devdocs.json';
diff --git a/api_docs/kbn_unsaved_changes_badge.mdx b/api_docs/kbn_unsaved_changes_badge.mdx
index b903bb956cd22..a4afc63d92d45 100644
--- a/api_docs/kbn_unsaved_changes_badge.mdx
+++ b/api_docs/kbn_unsaved_changes_badge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unsaved-changes-badge
 title: "@kbn/unsaved-changes-badge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unsaved-changes-badge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unsaved-changes-badge']
 ---
 import kbnUnsavedChangesBadgeObj from './kbn_unsaved_changes_badge.devdocs.json';
diff --git a/api_docs/kbn_unsaved_changes_prompt.mdx b/api_docs/kbn_unsaved_changes_prompt.mdx
index 7e5698023d2f5..ec0570e3e2d31 100644
--- a/api_docs/kbn_unsaved_changes_prompt.mdx
+++ b/api_docs/kbn_unsaved_changes_prompt.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-unsaved-changes-prompt
 title: "@kbn/unsaved-changes-prompt"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/unsaved-changes-prompt plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/unsaved-changes-prompt']
 ---
 import kbnUnsavedChangesPromptObj from './kbn_unsaved_changes_prompt.devdocs.json';
diff --git a/api_docs/kbn_use_tracked_promise.mdx b/api_docs/kbn_use_tracked_promise.mdx
index a571febf22373..e19ce298d1d99 100644
--- a/api_docs/kbn_use_tracked_promise.mdx
+++ b/api_docs/kbn_use_tracked_promise.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-use-tracked-promise
 title: "@kbn/use-tracked-promise"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/use-tracked-promise plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/use-tracked-promise']
 ---
 import kbnUseTrackedPromiseObj from './kbn_use_tracked_promise.devdocs.json';
diff --git a/api_docs/kbn_user_profile_components.mdx b/api_docs/kbn_user_profile_components.mdx
index 6a17df36f5658..6a2ef5267d5d6 100644
--- a/api_docs/kbn_user_profile_components.mdx
+++ b/api_docs/kbn_user_profile_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-user-profile-components
 title: "@kbn/user-profile-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/user-profile-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/user-profile-components']
 ---
 import kbnUserProfileComponentsObj from './kbn_user_profile_components.devdocs.json';
diff --git a/api_docs/kbn_utility_types.mdx b/api_docs/kbn_utility_types.mdx
index 5ffdec9cf0bb6..2be5b84d99b5d 100644
--- a/api_docs/kbn_utility_types.mdx
+++ b/api_docs/kbn_utility_types.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types
 title: "@kbn/utility-types"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types']
 ---
 import kbnUtilityTypesObj from './kbn_utility_types.devdocs.json';
diff --git a/api_docs/kbn_utility_types_jest.mdx b/api_docs/kbn_utility_types_jest.mdx
index 1854302ae52f4..e21d08b1df36e 100644
--- a/api_docs/kbn_utility_types_jest.mdx
+++ b/api_docs/kbn_utility_types_jest.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utility-types-jest
 title: "@kbn/utility-types-jest"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utility-types-jest plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utility-types-jest']
 ---
 import kbnUtilityTypesJestObj from './kbn_utility_types_jest.devdocs.json';
diff --git a/api_docs/kbn_utils.mdx b/api_docs/kbn_utils.mdx
index 08a86a63ee2ea..610b0552aaec8 100644
--- a/api_docs/kbn_utils.mdx
+++ b/api_docs/kbn_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-utils
 title: "@kbn/utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/utils']
 ---
 import kbnUtilsObj from './kbn_utils.devdocs.json';
diff --git a/api_docs/kbn_visualization_ui_components.devdocs.json b/api_docs/kbn_visualization_ui_components.devdocs.json
index 80f0cff7f6a2d..92f8f1ee2a02b 100644
--- a/api_docs/kbn_visualization_ui_components.devdocs.json
+++ b/api_docs/kbn_visualization_ui_components.devdocs.json
@@ -441,7 +441,7 @@
         "label": "DragDropBuckets",
         "description": [],
         "signature": [
-          "({\n  items,\n  onDragStart,\n  onDragEnd,\n  droppableId,\n  children,\n  bgColor,\n}: { items: T[]; droppableId: string; children: React.ReactElement<any, string | React.JSXElementConstructor<any>>[]; onDragStart?: (() => void) | undefined; onDragEnd?: ((items: T[]) => void) | undefined; bgColor?: \"warning\" | \"success\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"plain\" | \"transparent\" | undefined; }) => JSX.Element"
+          "({\n  items,\n  onDragStart,\n  onDragEnd,\n  droppableId,\n  children,\n  bgColor,\n}: { items: T[]; droppableId: string; children: React.ReactElement<any, string | React.JSXElementConstructor<any>>[]; onDragStart?: (() => void) | undefined; onDragEnd?: ((items: T[]) => void) | undefined; bgColor?: \"warning\" | \"success\" | \"plain\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"transparent\" | undefined; }) => JSX.Element"
         ],
         "path": "packages/kbn-visualization-ui-components/components/drag_drop_bucket/buckets.tsx",
         "deprecated": false,
@@ -553,7 +553,7 @@
                 "label": "bgColor",
                 "description": [],
                 "signature": [
-                  "\"warning\" | \"success\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"plain\" | \"transparent\" | undefined"
+                  "\"warning\" | \"success\" | \"plain\" | \"subdued\" | \"primary\" | \"accent\" | \"danger\" | \"transparent\" | undefined"
                 ],
                 "path": "packages/kbn-visualization-ui-components/components/drag_drop_bucket/buckets.tsx",
                 "deprecated": false,
@@ -1980,126 +1980,6 @@
         "returnComment": [],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "@kbn/visualization-ui-components",
-        "id": "def-public.useDebouncedValue",
-        "type": "Function",
-        "tags": [],
-        "label": "useDebouncedValue",
-        "description": [
-          "\nDebounces value changes and updates inputValue on root state changes if no debounced changes\nare in flight because the user is currently modifying the value.\n\n* allowFalsyValue: update upstream with all falsy values but null or undefined\n\nWhen testing this function mock the \"debounce\" function in lodash (see this module test for an example)"
-        ],
-        "signature": [
-          "<T>({ onChange, value, defaultValue, }: { onChange: (val: T) => void; value: T; defaultValue?: T | undefined; }, { allowFalsyValue }?: { allowFalsyValue?: boolean | undefined; }) => { inputValue: T; handleInputChange: (val: T) => void; initialValue: T; }"
-        ],
-        "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "@kbn/visualization-ui-components",
-            "id": "def-public.useDebouncedValue.$1",
-            "type": "Object",
-            "tags": [],
-            "label": "{\n    onChange,\n    value,\n    defaultValue,\n  }",
-            "description": [],
-            "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/visualization-ui-components",
-                "id": "def-public.useDebouncedValue.$1.onChange",
-                "type": "Function",
-                "tags": [],
-                "label": "onChange",
-                "description": [],
-                "signature": [
-                  "(val: T) => void"
-                ],
-                "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "children": [
-                  {
-                    "parentPluginId": "@kbn/visualization-ui-components",
-                    "id": "def-public.useDebouncedValue.$1.onChange.$1",
-                    "type": "Uncategorized",
-                    "tags": [],
-                    "label": "val",
-                    "description": [],
-                    "signature": [
-                      "T"
-                    ],
-                    "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-                    "deprecated": false,
-                    "trackAdoption": false,
-                    "isRequired": true
-                  }
-                ],
-                "returnComment": []
-              },
-              {
-                "parentPluginId": "@kbn/visualization-ui-components",
-                "id": "def-public.useDebouncedValue.$1.value",
-                "type": "Uncategorized",
-                "tags": [],
-                "label": "value",
-                "description": [],
-                "signature": [
-                  "T"
-                ],
-                "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "@kbn/visualization-ui-components",
-                "id": "def-public.useDebouncedValue.$1.defaultValue",
-                "type": "Uncategorized",
-                "tags": [],
-                "label": "defaultValue",
-                "description": [],
-                "signature": [
-                  "T | undefined"
-                ],
-                "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          },
-          {
-            "parentPluginId": "@kbn/visualization-ui-components",
-            "id": "def-public.useDebouncedValue.$2",
-            "type": "Object",
-            "tags": [],
-            "label": "{ allowFalsyValue }",
-            "description": [],
-            "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "@kbn/visualization-ui-components",
-                "id": "def-public.useDebouncedValue.$2.allowFalsyValue",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "allowFalsyValue",
-                "description": [],
-                "signature": [
-                  "boolean | undefined"
-                ],
-                "path": "packages/kbn-visualization-ui-components/components/debounced_value.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              }
-            ]
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "@kbn/visualization-ui-components",
         "id": "def-public.validateQuery",
diff --git a/api_docs/kbn_visualization_ui_components.mdx b/api_docs/kbn_visualization_ui_components.mdx
index 91dd35a796e22..fdb610951ae99 100644
--- a/api_docs/kbn_visualization_ui_components.mdx
+++ b/api_docs/kbn_visualization_ui_components.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-ui-components
 title: "@kbn/visualization-ui-components"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-ui-components plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-ui-components']
 ---
 import kbnVisualizationUiComponentsObj from './kbn_visualization_ui_components.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 154 | 0 | 150 | 3 |
+| 146 | 0 | 143 | 3 |
 
 ## Client
 
diff --git a/api_docs/kbn_visualization_utils.devdocs.json b/api_docs/kbn_visualization_utils.devdocs.json
index e20561e6cecba..cfab1eba9dc94 100644
--- a/api_docs/kbn_visualization_utils.devdocs.json
+++ b/api_docs/kbn_visualization_utils.devdocs.json
@@ -274,6 +274,140 @@
         ],
         "returnComment": [],
         "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "@kbn/visualization-utils",
+        "id": "def-common.useDebouncedValue",
+        "type": "Function",
+        "tags": [],
+        "label": "useDebouncedValue",
+        "description": [
+          "\nDebounces value changes and updates inputValue on root state changes if no debounced changes\nare in flight because the user is currently modifying the value.\n\n* allowFalsyValue: update upstream with all falsy values but null or undefined\n* wait: debounce timeout"
+        ],
+        "signature": [
+          "<T>({ onChange, value, defaultValue, }: { onChange: (val: T) => void; value: T; defaultValue?: T | undefined; }, { allowFalsyValue, wait }?: { allowFalsyValue?: boolean | undefined; wait?: number | undefined; }) => { inputValue: T; handleInputChange: (val: T) => void; initialValue: T; }"
+        ],
+        "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "@kbn/visualization-utils",
+            "id": "def-common.useDebouncedValue.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n    onChange,\n    value,\n    defaultValue,\n  }",
+            "description": [],
+            "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/visualization-utils",
+                "id": "def-common.useDebouncedValue.$1.onChange",
+                "type": "Function",
+                "tags": [],
+                "label": "onChange",
+                "description": [],
+                "signature": [
+                  "(val: T) => void"
+                ],
+                "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "@kbn/visualization-utils",
+                    "id": "def-common.useDebouncedValue.$1.onChange.$1",
+                    "type": "Uncategorized",
+                    "tags": [],
+                    "label": "val",
+                    "description": [],
+                    "signature": [
+                      "T"
+                    ],
+                    "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                    "deprecated": false,
+                    "trackAdoption": false,
+                    "isRequired": true
+                  }
+                ],
+                "returnComment": []
+              },
+              {
+                "parentPluginId": "@kbn/visualization-utils",
+                "id": "def-common.useDebouncedValue.$1.value",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "value",
+                "description": [],
+                "signature": [
+                  "T"
+                ],
+                "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "@kbn/visualization-utils",
+                "id": "def-common.useDebouncedValue.$1.defaultValue",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "defaultValue",
+                "description": [],
+                "signature": [
+                  "T | undefined"
+                ],
+                "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "@kbn/visualization-utils",
+            "id": "def-common.useDebouncedValue.$2",
+            "type": "Object",
+            "tags": [],
+            "label": "{ allowFalsyValue, wait = DEFAULT_TIMEOUT }",
+            "description": [],
+            "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "@kbn/visualization-utils",
+                "id": "def-common.useDebouncedValue.$2.allowFalsyValue",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "allowFalsyValue",
+                "description": [],
+                "signature": [
+                  "boolean | undefined"
+                ],
+                "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              },
+              {
+                "parentPluginId": "@kbn/visualization-utils",
+                "id": "def-common.useDebouncedValue.$2.wait",
+                "type": "number",
+                "tags": [],
+                "label": "wait",
+                "description": [],
+                "signature": [
+                  "number | undefined"
+                ],
+                "path": "packages/kbn-visualization-utils/src/debounced_value.ts",
+                "deprecated": false,
+                "trackAdoption": false
+              }
+            ]
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
       }
     ],
     "interfaces": [],
diff --git a/api_docs/kbn_visualization_utils.mdx b/api_docs/kbn_visualization_utils.mdx
index dbb54a80b7f87..f15b60025e25c 100644
--- a/api_docs/kbn_visualization_utils.mdx
+++ b/api_docs/kbn_visualization_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-visualization-utils
 title: "@kbn/visualization-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/visualization-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/visualization-utils']
 ---
 import kbnVisualizationUtilsObj from './kbn_visualization_utils.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 10 | 0 | 9 | 1 |
+| 19 | 0 | 17 | 1 |
 
 ## Common
 
diff --git a/api_docs/kbn_xstate_utils.mdx b/api_docs/kbn_xstate_utils.mdx
index 979805b0144ec..7d775c092d435 100644
--- a/api_docs/kbn_xstate_utils.mdx
+++ b/api_docs/kbn_xstate_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-xstate-utils
 title: "@kbn/xstate-utils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/xstate-utils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/xstate-utils']
 ---
 import kbnXstateUtilsObj from './kbn_xstate_utils.devdocs.json';
diff --git a/api_docs/kbn_yarn_lock_validator.mdx b/api_docs/kbn_yarn_lock_validator.mdx
index b1c3b0539048f..f7c3bbfd7710d 100644
--- a/api_docs/kbn_yarn_lock_validator.mdx
+++ b/api_docs/kbn_yarn_lock_validator.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-yarn-lock-validator
 title: "@kbn/yarn-lock-validator"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/yarn-lock-validator plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/yarn-lock-validator']
 ---
 import kbnYarnLockValidatorObj from './kbn_yarn_lock_validator.devdocs.json';
diff --git a/api_docs/kbn_zod_helpers.mdx b/api_docs/kbn_zod_helpers.mdx
index f6be23d9593de..d1ab58512efea 100644
--- a/api_docs/kbn_zod_helpers.mdx
+++ b/api_docs/kbn_zod_helpers.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kbn-zod-helpers
 title: "@kbn/zod-helpers"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the @kbn/zod-helpers plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', '@kbn/zod-helpers']
 ---
 import kbnZodHelpersObj from './kbn_zod_helpers.devdocs.json';
diff --git a/api_docs/kibana_overview.mdx b/api_docs/kibana_overview.mdx
index 799026a521b55..9d52f95b68f65 100644
--- a/api_docs/kibana_overview.mdx
+++ b/api_docs/kibana_overview.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaOverview
 title: "kibanaOverview"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaOverview plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaOverview']
 ---
 import kibanaOverviewObj from './kibana_overview.devdocs.json';
diff --git a/api_docs/kibana_react.mdx b/api_docs/kibana_react.mdx
index d86b9b3631791..2edf16ed37065 100644
--- a/api_docs/kibana_react.mdx
+++ b/api_docs/kibana_react.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaReact
 title: "kibanaReact"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaReact plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaReact']
 ---
 import kibanaReactObj from './kibana_react.devdocs.json';
diff --git a/api_docs/kibana_utils.mdx b/api_docs/kibana_utils.mdx
index 103779c04280f..05bcd7119c127 100644
--- a/api_docs/kibana_utils.mdx
+++ b/api_docs/kibana_utils.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kibanaUtils
 title: "kibanaUtils"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kibanaUtils plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kibanaUtils']
 ---
 import kibanaUtilsObj from './kibana_utils.devdocs.json';
diff --git a/api_docs/kubernetes_security.mdx b/api_docs/kubernetes_security.mdx
index ad0727f0e3d79..87a253ec3a36c 100644
--- a/api_docs/kubernetes_security.mdx
+++ b/api_docs/kubernetes_security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/kubernetesSecurity
 title: "kubernetesSecurity"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the kubernetesSecurity plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'kubernetesSecurity']
 ---
 import kubernetesSecurityObj from './kubernetes_security.devdocs.json';
diff --git a/api_docs/lens.devdocs.json b/api_docs/lens.devdocs.json
index efd0ff8b1c20c..0534b92e8b64c 100644
--- a/api_docs/lens.devdocs.json
+++ b/api_docs/lens.devdocs.json
@@ -1297,7 +1297,7 @@
             "label": "mode",
             "description": [],
             "signature": [
-              "\"full\" | \"custom\" | \"dataBounds\""
+              "\"custom\" | \"full\" | \"dataBounds\""
             ],
             "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
             "deprecated": false,
@@ -4455,6 +4455,63 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.MetricVisualizationState.titlesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "titlesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\" | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/visualizations/metric/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.MetricVisualizationState.valuesTextAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valuesTextAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | \"center\" | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/visualizations/metric/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.MetricVisualizationState.iconAlign",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "iconAlign",
+            "description": [],
+            "signature": [
+              "\"right\" | \"left\" | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/visualizations/metric/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.MetricVisualizationState.valueFontMode",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valueFontMode",
+            "description": [],
+            "signature": [
+              "ValueFontMode",
+              " | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/visualizations/metric/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "lens",
             "id": "def-public.MetricVisualizationState.color",
@@ -4469,6 +4526,20 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.MetricVisualizationState.icon",
+            "type": "string",
+            "tags": [],
+            "label": "icon",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "x-pack/plugins/lens/public/visualizations/metric/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "lens",
             "id": "def-public.MetricVisualizationState.palette",
@@ -5545,7 +5616,7 @@
             "label": "changeType",
             "description": [],
             "signature": [
-              "\"layers\" | \"initial\" | \"unchanged\" | \"reduced\" | \"extended\" | \"reorder\""
+              "\"extended\" | \"layers\" | \"initial\" | \"unchanged\" | \"reduced\" | \"reorder\""
             ],
             "path": "x-pack/plugins/lens/public/types.ts",
             "deprecated": false,
@@ -5836,7 +5907,7 @@
               "\nThe change type indicates what was changed in this table compared to the currently active table of this layer."
             ],
             "signature": [
-              "\"layers\" | \"initial\" | \"unchanged\" | \"reduced\" | \"extended\" | \"reorder\""
+              "\"extended\" | \"layers\" | \"initial\" | \"unchanged\" | \"reduced\" | \"reorder\""
             ],
             "path": "x-pack/plugins/lens/public/types.ts",
             "deprecated": false,
@@ -10687,7 +10758,7 @@
         "label": "AxisExtentMode",
         "description": [],
         "signature": [
-          "\"full\" | \"custom\" | \"dataBounds\""
+          "\"custom\" | \"full\" | \"dataBounds\""
         ],
         "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
         "deprecated": false,
@@ -11091,7 +11162,15 @@
           },
           " | undefined>; canViewUnderlyingData: () => Promise<boolean>; getViewUnderlyingDataArgs: () => ",
           "ViewUnderlyingDataArgs",
-          "; } & ",
+          "; getFullAttributes: () => ",
+          {
+            "pluginId": "lens",
+            "scope": "public",
+            "docId": "kibLensPluginApi",
+            "section": "def-public.LensSavedObjectAttributes",
+            "text": "LensSavedObjectAttributes"
+          },
+          " | undefined; } & ",
           {
             "pluginId": "@kbn/presentation-publishing",
             "scope": "common",
@@ -11147,7 +11226,15 @@
             "section": "def-common.HasParentApi",
             "text": "HasParentApi"
           },
-          "<unknown>>"
+          "<Partial<",
+          {
+            "pluginId": "@kbn/presentation-publishing",
+            "scope": "common",
+            "docId": "kibKbnPresentationPublishingPluginApi",
+            "section": "def-common.PublishesUnifiedSearch",
+            "text": "PublishesUnifiedSearch"
+          },
+          ">>>"
         ],
         "path": "x-pack/plugins/lens/public/embeddable/interfaces/lens_api.ts",
         "deprecated": false,
@@ -12000,7 +12087,7 @@
         "label": "YScaleType",
         "description": [],
         "signature": [
-          "\"log\" | \"time\" | \"linear\" | \"sqrt\""
+          "\"log\" | \"sqrt\" | \"time\" | \"linear\""
         ],
         "path": "src/plugins/chart_expressions/expression_xy/common/types/expression_functions.ts",
         "deprecated": false,
diff --git a/api_docs/lens.mdx b/api_docs/lens.mdx
index a60ddd7a5b0b4..dfed4b921904a 100644
--- a/api_docs/lens.mdx
+++ b/api_docs/lens.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lens
 title: "lens"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lens plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lens']
 ---
 import lensObj from './lens.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/k
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 672 | 0 | 570 | 62 |
+| 677 | 0 | 575 | 63 |
 
 ## Client
 
diff --git a/api_docs/license_api_guard.mdx b/api_docs/license_api_guard.mdx
index 71e7f45ad5a21..5287fcc22423c 100644
--- a/api_docs/license_api_guard.mdx
+++ b/api_docs/license_api_guard.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseApiGuard
 title: "licenseApiGuard"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseApiGuard plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseApiGuard']
 ---
 import licenseApiGuardObj from './license_api_guard.devdocs.json';
diff --git a/api_docs/license_management.mdx b/api_docs/license_management.mdx
index 932ec13479be7..c63e0fec1868a 100644
--- a/api_docs/license_management.mdx
+++ b/api_docs/license_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licenseManagement
 title: "licenseManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licenseManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licenseManagement']
 ---
 import licenseManagementObj from './license_management.devdocs.json';
diff --git a/api_docs/licensing.mdx b/api_docs/licensing.mdx
index 53b85119a88b4..805961d08f569 100644
--- a/api_docs/licensing.mdx
+++ b/api_docs/licensing.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/licensing
 title: "licensing"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the licensing plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'licensing']
 ---
 import licensingObj from './licensing.devdocs.json';
diff --git a/api_docs/links.devdocs.json b/api_docs/links.devdocs.json
index e242c392dcd42..1ab91b751ab1f 100644
--- a/api_docs/links.devdocs.json
+++ b/api_docs/links.devdocs.json
@@ -1,1184 +1,11 @@
 {
   "id": "links",
   "client": {
-    "classes": [
-      {
-        "parentPluginId": "links",
-        "id": "def-public.LinksEmbeddable",
-        "type": "Class",
-        "tags": [],
-        "label": "LinksEmbeddable",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "links",
-            "scope": "public",
-            "docId": "kibLinksPluginApi",
-            "section": "def-public.LinksEmbeddable",
-            "text": "LinksEmbeddable"
-          },
-          " extends ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.Embeddable",
-            "text": "Embeddable"
-          },
-          "<",
-          "LinksInput",
-          ", ",
-          "LinksOutput",
-          ", any> implements ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.ReferenceOrValueEmbeddable",
-            "text": "ReferenceOrValueEmbeddable"
-          },
-          "<",
-          "LinksByValueInput",
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.SavedObjectEmbeddableInput",
-            "text": "SavedObjectEmbeddableInput"
-          },
-          ">"
-        ],
-        "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "signature": [
-              "\"links\""
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.deferEmbeddableLoad",
-            "type": "boolean",
-            "tags": [],
-            "label": "deferEmbeddableLoad",
-            "description": [],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.attributes",
-            "type": "Object",
-            "tags": [],
-            "label": "attributes",
-            "description": [],
-            "signature": [
-              "LinksAttributes",
-              " | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.attributes$",
-            "type": "Object",
-            "tags": [],
-            "label": "attributes$",
-            "description": [],
-            "signature": [
-              "Subject",
-              "<",
-              "LinksAttributes",
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.grouping",
-            "type": "Array",
-            "tags": [],
-            "label": "grouping",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "@kbn/ui-actions-browser",
-                "scope": "common",
-                "docId": "kibKbnUiActionsBrowserPluginApi",
-                "section": "def-common.PresentableGroup",
-                "text": "PresentableGroup"
-              },
-              "<unknown>[]"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.Unnamed",
-            "type": "Function",
-            "tags": [],
-            "label": "Constructor",
-            "description": [],
-            "signature": [
-              "any"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.Unnamed.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "config",
-                "description": [],
-                "signature": [
-                  "LinksConfig"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.Unnamed.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "initialInput",
-                "description": [],
-                "signature": [
-                  "LinksInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.Unnamed.$3",
-                "type": "Object",
-                "tags": [],
-                "label": "attributeService",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "public",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-public.AttributeService",
-                    "text": "AttributeService"
-                  },
-                  "<",
-                  "LinksAttributes",
-                  ", ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.EmbeddableInput",
-                    "text": "EmbeddableInput"
-                  },
-                  " & { attributes: ",
-                  "LinksAttributes",
-                  "; }, ",
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.SavedObjectEmbeddableInput",
-                    "text": "SavedObjectEmbeddableInput"
-                  },
-                  ", unknown>"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.Unnamed.$4",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  "DashboardContainer",
-                  " | undefined"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.onRender",
-            "type": "Function",
-            "tags": [],
-            "label": "onRender",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.onLoading",
-            "type": "Function",
-            "tags": [],
-            "label": "onLoading",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.inputIsRefType",
-            "type": "Function",
-            "tags": [],
-            "label": "inputIsRefType",
-            "description": [],
-            "signature": [
-              "(input: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.SavedObjectEmbeddableInput",
-                "text": "SavedObjectEmbeddableInput"
-              },
-              " | ",
-              "LinksByValueInput",
-              ") => input is ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.SavedObjectEmbeddableInput",
-                "text": "SavedObjectEmbeddableInput"
-              }
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.inputIsRefType.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "input",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "embeddable",
-                    "scope": "common",
-                    "docId": "kibEmbeddablePluginApi",
-                    "section": "def-common.SavedObjectEmbeddableInput",
-                    "text": "SavedObjectEmbeddableInput"
-                  },
-                  " | ",
-                  "LinksByValueInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.getInputAsRefType",
-            "type": "Function",
-            "tags": [],
-            "label": "getInputAsRefType",
-            "description": [],
-            "signature": [
-              "() => Promise<",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.SavedObjectEmbeddableInput",
-                "text": "SavedObjectEmbeddableInput"
-              },
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.getInputAsValueType",
-            "type": "Function",
-            "tags": [],
-            "label": "getInputAsValueType",
-            "description": [],
-            "signature": [
-              "() => Promise<",
-              "LinksByValueInput",
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.reload",
-            "type": "Function",
-            "tags": [],
-            "label": "reload",
-            "description": [],
-            "signature": [
-              "() => Promise<void>"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.destroy",
-            "type": "Function",
-            "tags": [],
-            "label": "destroy",
-            "description": [],
-            "signature": [
-              "() => void"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksEmbeddable.render",
-            "type": "Function",
-            "tags": [],
-            "label": "render",
-            "description": [],
-            "signature": [
-              "(domNode: HTMLElement) => JSX.Element | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksEmbeddable.render.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "domNode",
-                "description": [],
-                "signature": [
-                  "HTMLElement"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable.tsx",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "links",
-        "id": "def-public.LinksFactoryDefinition",
-        "type": "Class",
-        "tags": [],
-        "label": "LinksFactoryDefinition",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "links",
-            "scope": "public",
-            "docId": "kibLinksPluginApi",
-            "section": "def-public.LinksFactoryDefinition",
-            "text": "LinksFactoryDefinition"
-          },
-          " implements ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableFactoryDefinition",
-            "text": "EmbeddableFactoryDefinition"
-          },
-          "<",
-          "LinksInput",
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.IEmbeddable",
-            "text": "IEmbeddable"
-          },
-          "<",
-          "LinksInput",
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", any>, ",
-          {
-            "pluginId": "savedObjectsFinder",
-            "scope": "common",
-            "docId": "kibSavedObjectsFinderPluginApi",
-            "section": "def-common.FinderAttributes",
-            "text": "FinderAttributes"
-          },
-          ">,",
-          {
-            "pluginId": "dashboard",
-            "scope": "public",
-            "docId": "kibDashboardPluginApi",
-            "section": "def-public.IProvidesLegacyPanelPlacementSettings",
-            "text": "IProvidesLegacyPanelPlacementSettings"
-          },
-          "<",
-          "LinksInput",
-          ", unknown>"
-        ],
-        "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "children": [
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.latestVersion",
-            "type": "string",
-            "tags": [],
-            "label": "latestVersion",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.telemetry",
-            "type": "Function",
-            "tags": [],
-            "label": "telemetry",
-            "description": [],
-            "signature": [
-              "((state: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableStateWithType",
-                "text": "EmbeddableStateWithType"
-              },
-              ", stats: Record<string, any>) => Record<string, any>) | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.migrations",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "migrations",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "kibanaUtils",
-                "scope": "common",
-                "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.MigrateFunctionsObject",
-                "text": "MigrateFunctionsObject"
-              },
-              " | ",
-              {
-                "pluginId": "kibanaUtils",
-                "scope": "common",
-                "docId": "kibKibanaUtilsPluginApi",
-                "section": "def-common.GetMigrationFunctionObjectFn",
-                "text": "GetMigrationFunctionObjectFn"
-              },
-              " | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.grouping",
-            "type": "Array",
-            "tags": [],
-            "label": "grouping",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "@kbn/ui-actions-browser",
-                "scope": "common",
-                "docId": "kibKbnUiActionsBrowserPluginApi",
-                "section": "def-common.PresentableGroup",
-                "text": "PresentableGroup"
-              },
-              "<unknown>[]"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "signature": [
-              "\"links\""
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.isContainerType",
-            "type": "boolean",
-            "tags": [],
-            "label": "isContainerType",
-            "description": [],
-            "signature": [
-              "false"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.savedObjectMetaData",
-            "type": "Object",
-            "tags": [],
-            "label": "savedObjectMetaData",
-            "description": [],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.savedObjectMetaData.name",
-                "type": "string",
-                "tags": [],
-                "label": "name",
-                "description": [],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.savedObjectMetaData.type",
-                "type": "string",
-                "tags": [],
-                "label": "type",
-                "description": [],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.savedObjectMetaData.getIconForSavedObject",
-                "type": "Function",
-                "tags": [],
-                "label": "getIconForSavedObject",
-                "description": [],
-                "signature": [
-                  "() => string"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "children": [],
-                "returnComment": []
-              }
-            ]
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getLegacyPanelPlacementSettings",
-            "type": "Function",
-            "tags": [],
-            "label": "getLegacyPanelPlacementSettings",
-            "description": [],
-            "signature": [
-              "(input: ",
-              "LinksInput",
-              ", attributes: unknown) => { width?: undefined; height?: undefined; strategy?: undefined; } | { width: number; height: number; strategy: ",
-              {
-                "pluginId": "dashboard",
-                "scope": "public",
-                "docId": "kibDashboardPluginApi",
-                "section": "def-public.PanelPlacementStrategy",
-                "text": "PanelPlacementStrategy"
-              },
-              ".placeAtTop; }"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.getLegacyPanelPlacementSettings.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "input",
-                "description": [],
-                "signature": [
-                  "LinksInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.getLegacyPanelPlacementSettings.$2",
-                "type": "Unknown",
-                "tags": [],
-                "label": "attributes",
-                "description": [],
-                "signature": [
-                  "unknown"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.isEditable",
-            "type": "Function",
-            "tags": [],
-            "label": "isEditable",
-            "description": [],
-            "signature": [
-              "() => Promise<boolean>"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.canCreateNew",
-            "type": "Function",
-            "tags": [],
-            "label": "canCreateNew",
-            "description": [],
-            "signature": [
-              "() => boolean"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getDefaultInput",
-            "type": "Function",
-            "tags": [],
-            "label": "getDefaultInput",
-            "description": [],
-            "signature": [
-              "() => Partial<",
-              "LinksInput",
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.createFromSavedObject",
-            "type": "Function",
-            "tags": [],
-            "label": "createFromSavedObject",
-            "description": [],
-            "signature": [
-              "(savedObjectId: string, input: ",
-              "LinksInput",
-              ", parent: ",
-              "DashboardContainer",
-              ") => Promise<",
-              {
-                "pluginId": "embeddable",
-                "scope": "public",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-public.ErrorEmbeddable",
-                "text": "ErrorEmbeddable"
-              },
-              " | ",
-              {
-                "pluginId": "links",
-                "scope": "public",
-                "docId": "kibLinksPluginApi",
-                "section": "def-public.LinksEmbeddable",
-                "text": "LinksEmbeddable"
-              },
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.createFromSavedObject.$1",
-                "type": "string",
-                "tags": [],
-                "label": "savedObjectId",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.createFromSavedObject.$2",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "input",
-                "description": [],
-                "signature": [
-                  "LinksInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.createFromSavedObject.$3",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  "DashboardContainer"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.create",
-            "type": "Function",
-            "tags": [],
-            "label": "create",
-            "description": [],
-            "signature": [
-              "(initialInput: ",
-              "LinksInput",
-              ", parent: ",
-              "DashboardContainer",
-              ") => Promise<",
-              {
-                "pluginId": "links",
-                "scope": "public",
-                "docId": "kibLinksPluginApi",
-                "section": "def-public.LinksEmbeddable",
-                "text": "LinksEmbeddable"
-              },
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.create.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "initialInput",
-                "description": [],
-                "signature": [
-                  "LinksInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.create.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  "DashboardContainer"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getExplicitInput",
-            "type": "Function",
-            "tags": [],
-            "label": "getExplicitInput",
-            "description": [],
-            "signature": [
-              "(initialInput: ",
-              "LinksInput",
-              ", parent?: ",
-              "DashboardContainer",
-              " | undefined) => Promise<",
-              "LinksEditorFlyoutReturn",
-              ">"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.getExplicitInput.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "initialInput",
-                "description": [],
-                "signature": [
-                  "LinksInput"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": true
-              },
-              {
-                "parentPluginId": "links",
-                "id": "def-public.LinksFactoryDefinition.getExplicitInput.$2",
-                "type": "Object",
-                "tags": [],
-                "label": "parent",
-                "description": [],
-                "signature": [
-                  "DashboardContainer",
-                  " | undefined"
-                ],
-                "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-                "deprecated": false,
-                "trackAdoption": false,
-                "isRequired": false
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getDisplayName",
-            "type": "Function",
-            "tags": [],
-            "label": "getDisplayName",
-            "description": [],
-            "signature": [
-              "() => string"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getIconType",
-            "type": "Function",
-            "tags": [],
-            "label": "getIconType",
-            "description": [],
-            "signature": [
-              "() => string"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.getDescription",
-            "type": "Function",
-            "tags": [],
-            "label": "getDescription",
-            "description": [],
-            "signature": [
-              "() => string"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false,
-            "children": [],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.inject",
-            "type": "Function",
-            "tags": [],
-            "label": "inject",
-            "description": [],
-            "signature": [
-              "((state: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableStateWithType",
-                "text": "EmbeddableStateWithType"
-              },
-              ", references: ",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObjectReference",
-                "text": "SavedObjectReference"
-              },
-              "[]) => ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableStateWithType",
-                "text": "EmbeddableStateWithType"
-              },
-              ") | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "links",
-            "id": "def-public.LinksFactoryDefinition.extract",
-            "type": "Function",
-            "tags": [],
-            "label": "extract",
-            "description": [],
-            "signature": [
-              "((state: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableStateWithType",
-                "text": "EmbeddableStateWithType"
-              },
-              ") => { state: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.EmbeddableStateWithType",
-                "text": "EmbeddableStateWithType"
-              },
-              "; references: ",
-              {
-                "pluginId": "@kbn/core-saved-objects-common",
-                "scope": "common",
-                "docId": "kibKbnCoreSavedObjectsCommonPluginApi",
-                "section": "def-common.SavedObjectReference",
-                "text": "SavedObjectReference"
-              },
-              "[]; }) | undefined"
-            ],
-            "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
+    "classes": [],
     "functions": [],
     "interfaces": [],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "links",
-        "id": "def-public.LinksFactory",
-        "type": "Type",
-        "tags": [],
-        "label": "LinksFactory",
-        "description": [],
-        "signature": [
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableFactory",
-            "text": "EmbeddableFactory"
-          },
-          "<",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.EmbeddableInput",
-            "text": "EmbeddableInput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.IEmbeddable",
-            "text": "IEmbeddable"
-          },
-          "<",
-          {
-            "pluginId": "embeddable",
-            "scope": "common",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-common.EmbeddableInput",
-            "text": "EmbeddableInput"
-          },
-          ", ",
-          {
-            "pluginId": "embeddable",
-            "scope": "public",
-            "docId": "kibEmbeddablePluginApi",
-            "section": "def-public.EmbeddableOutput",
-            "text": "EmbeddableOutput"
-          },
-          ", any>, ",
-          {
-            "pluginId": "savedObjectsFinder",
-            "scope": "common",
-            "docId": "kibSavedObjectsFinderPluginApi",
-            "section": "def-common.FinderAttributes",
-            "text": "FinderAttributes"
-          },
-          ">"
-        ],
-        "path": "src/plugins/links/public/embeddable/links_embeddable_factory.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      }
-    ],
+    "misc": [],
     "objects": []
   },
   "server": {
@@ -1237,6 +64,18 @@
         "trackAdoption": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "links",
+        "id": "def-common.DISPLAY_NAME",
+        "type": "string",
+        "tags": [],
+        "label": "DISPLAY_NAME",
+        "description": [],
+        "path": "src/plugins/links/common/constants.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "links",
         "id": "def-common.LATEST_VERSION",
diff --git a/api_docs/links.mdx b/api_docs/links.mdx
index dd9983cca1f55..ef7ea92166ec3 100644
--- a/api_docs/links.mdx
+++ b/api_docs/links.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/links
 title: "links"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the links plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'links']
 ---
 import linksObj from './links.devdocs.json';
@@ -21,15 +21,7 @@ Contact [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kib
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 58 | 0 | 58 | 6 |
-
-## Client
-
-### Classes
-<DocDefinitionList data={linksObj.client.classes}/>
-
-### Consts, variables and types
-<DocDefinitionList data={linksObj.client.misc}/>
+| 5 | 0 | 5 | 0 |
 
 ## Common
 
diff --git a/api_docs/lists.mdx b/api_docs/lists.mdx
index 1fe215e6756d3..2ffa82c931dd4 100644
--- a/api_docs/lists.mdx
+++ b/api_docs/lists.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/lists
 title: "lists"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the lists plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'lists']
 ---
 import listsObj from './lists.devdocs.json';
diff --git a/api_docs/logs_data_access.devdocs.json b/api_docs/logs_data_access.devdocs.json
index c4f3b466d53a4..31566796c9ade 100644
--- a/api_docs/logs_data_access.devdocs.json
+++ b/api_docs/logs_data_access.devdocs.json
@@ -124,6 +124,14 @@
           "section": "def-server.LogsRatesServiceReturnType",
           "text": "LogsRatesServiceReturnType"
         },
+        ">; getLogsRateTimeseries: ({ esClient, identifyingMetadata, serviceNames, timeFrom, timeTo, kuery, serviceEnvironmentQuery, }: ",
+        "LogsRateTimeseries",
+        ") => Promise<",
+        "LogsRateTimeseriesReturnType",
+        ">; getLogsErrorRateTimeseries: ({ esClient, identifyingMetadata, serviceNames, timeFrom, timeTo, kuery, serviceEnvironmentQuery, }: ",
+        "LogsErrorRateTimeseries",
+        ") => Promise<",
+        "LogsErrorRateTimeseriesReturnType",
         ">; getLogSourcesService: (request: ",
         {
           "pluginId": "@kbn/core-http-server",
diff --git a/api_docs/logs_data_access.mdx b/api_docs/logs_data_access.mdx
index 76dc5414b4d91..b9cdbfba6e59b 100644
--- a/api_docs/logs_data_access.mdx
+++ b/api_docs/logs_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsDataAccess
 title: "logsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsDataAccess plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsDataAccess']
 ---
 import logsDataAccessObj from './logs_data_access.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 7 | 0 | 7 | 2 |
+| 7 | 0 | 7 | 6 |
 
 ## Server
 
diff --git a/api_docs/logs_explorer.mdx b/api_docs/logs_explorer.mdx
index a49adadcbbcdf..a1f93ab35aae0 100644
--- a/api_docs/logs_explorer.mdx
+++ b/api_docs/logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsExplorer
 title: "logsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsExplorer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsExplorer']
 ---
 import logsExplorerObj from './logs_explorer.devdocs.json';
diff --git a/api_docs/logs_shared.devdocs.json b/api_docs/logs_shared.devdocs.json
index c5092240bfaea..37a481c7d4075 100644
--- a/api_docs/logs_shared.devdocs.json
+++ b/api_docs/logs_shared.devdocs.json
@@ -2926,6 +2926,46 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "logsShared",
+            "id": "def-public.LogsSharedClientStartDeps.share",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "share",
+            "description": [],
+            "signature": [
+              "{ toggleShareContextMenu: (options: ",
+              {
+                "pluginId": "share",
+                "scope": "public",
+                "docId": "kibSharePluginApi",
+                "section": "def-public.ShowShareMenuOptions",
+                "text": "ShowShareMenuOptions"
+              },
+              ") => void; } & { url: ",
+              {
+                "pluginId": "share",
+                "scope": "public",
+                "docId": "kibSharePluginApi",
+                "section": "def-public.BrowserUrlService",
+                "text": "BrowserUrlService"
+              },
+              "; navigate(options: ",
+              "RedirectOptions",
+              "<",
+              {
+                "pluginId": "@kbn/utility-types",
+                "scope": "common",
+                "docId": "kibKbnUtilityTypesPluginApi",
+                "section": "def-common.SerializableRecord",
+                "text": "SerializableRecord"
+              },
+              ">): void; }"
+            ],
+            "path": "x-pack/plugins/observability_solution/logs_shared/public/types.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "logsShared",
             "id": "def-public.LogsSharedClientStartDeps.uiActions",
@@ -5902,7 +5942,7 @@
         "label": "LogEntryAfterCursor",
         "description": [],
         "signature": [
-          "{ after: { time: string; tiebreaker: number; } | \"first\"; }"
+          "{ after: \"first\" | { time: string; tiebreaker: number; }; }"
         ],
         "path": "x-pack/plugins/observability_solution/logs_shared/common/log_entry/log_entry_cursor.ts",
         "deprecated": false,
diff --git a/api_docs/logs_shared.mdx b/api_docs/logs_shared.mdx
index 653a49f95abf9..d753ec97f3141 100644
--- a/api_docs/logs_shared.mdx
+++ b/api_docs/logs_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/logsShared
 title: "logsShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the logsShared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'logsShared']
 ---
 import logsSharedObj from './logs_shared.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 296 | 0 | 268 | 32 |
+| 297 | 0 | 269 | 32 |
 
 ## Client
 
diff --git a/api_docs/management.mdx b/api_docs/management.mdx
index d7a37b9b78075..88e95befdc61e 100644
--- a/api_docs/management.mdx
+++ b/api_docs/management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/management
 title: "management"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the management plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'management']
 ---
 import managementObj from './management.devdocs.json';
diff --git a/api_docs/maps.mdx b/api_docs/maps.mdx
index 02a6ccf22b599..46d7c7405c2a7 100644
--- a/api_docs/maps.mdx
+++ b/api_docs/maps.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/maps
 title: "maps"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the maps plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'maps']
 ---
 import mapsObj from './maps.devdocs.json';
diff --git a/api_docs/maps_ems.mdx b/api_docs/maps_ems.mdx
index 88577ac6485fd..cea152f5e2b51 100644
--- a/api_docs/maps_ems.mdx
+++ b/api_docs/maps_ems.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mapsEms
 title: "mapsEms"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mapsEms plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mapsEms']
 ---
 import mapsEmsObj from './maps_ems.devdocs.json';
diff --git a/api_docs/metrics_data_access.devdocs.json b/api_docs/metrics_data_access.devdocs.json
index 13625c031de7f..f23875b86c871 100644
--- a/api_docs/metrics_data_access.devdocs.json
+++ b/api_docs/metrics_data_access.devdocs.json
@@ -1507,7 +1507,7 @@
         "label": "SnapshotMetricType",
         "description": [],
         "signature": [
-          "\"count\" | \"custom\" | \"memory\" | \"rx\" | \"normalizedLoad1m\" | \"memoryFree\" | \"tx\" | \"logRate\" | \"cpu\" | \"s3BucketSize\" | \"s3NumberOfObjects\" | \"s3TotalRequests\" | \"s3UploadBytes\" | \"s3DownloadBytes\" | \"diskLatency\" | \"diskSpaceUsage\" | \"load\" | \"memoryTotal\" | \"diskIOReadBytes\" | \"diskIOWriteBytes\" | \"rdsLatency\" | \"rdsConnections\" | \"rdsQueriesExecuted\" | \"rdsActiveTransactions\" | \"sqsMessagesVisible\" | \"sqsMessagesDelayed\" | \"sqsMessagesEmpty\" | \"sqsMessagesSent\" | \"sqsOldestMessage\""
+          "\"count\" | \"memory\" | \"custom\" | \"rx\" | \"normalizedLoad1m\" | \"memoryFree\" | \"tx\" | \"logRate\" | \"cpu\" | \"s3BucketSize\" | \"s3NumberOfObjects\" | \"s3TotalRequests\" | \"s3UploadBytes\" | \"s3DownloadBytes\" | \"diskLatency\" | \"diskSpaceUsage\" | \"load\" | \"memoryTotal\" | \"diskIOReadBytes\" | \"diskIOWriteBytes\" | \"rdsLatency\" | \"rdsConnections\" | \"rdsQueriesExecuted\" | \"rdsActiveTransactions\" | \"sqsMessagesVisible\" | \"sqsMessagesDelayed\" | \"sqsMessagesEmpty\" | \"sqsMessagesSent\" | \"sqsOldestMessage\""
         ],
         "path": "x-pack/plugins/observability_solution/metrics_data_access/common/inventory_models/types.ts",
         "deprecated": false,
diff --git a/api_docs/metrics_data_access.mdx b/api_docs/metrics_data_access.mdx
index 54350b0924c4a..0b09dfea10e80 100644
--- a/api_docs/metrics_data_access.mdx
+++ b/api_docs/metrics_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/metricsDataAccess
 title: "metricsDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the metricsDataAccess plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'metricsDataAccess']
 ---
 import metricsDataAccessObj from './metrics_data_access.devdocs.json';
diff --git a/api_docs/ml.mdx b/api_docs/ml.mdx
index f493e07f7e0bb..b2807f2a051a2 100644
--- a/api_docs/ml.mdx
+++ b/api_docs/ml.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ml
 title: "ml"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ml plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ml']
 ---
 import mlObj from './ml.devdocs.json';
diff --git a/api_docs/mock_idp_plugin.mdx b/api_docs/mock_idp_plugin.mdx
index 15be7829533ad..4909a1e634bc6 100644
--- a/api_docs/mock_idp_plugin.mdx
+++ b/api_docs/mock_idp_plugin.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/mockIdpPlugin
 title: "mockIdpPlugin"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the mockIdpPlugin plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'mockIdpPlugin']
 ---
 import mockIdpPluginObj from './mock_idp_plugin.devdocs.json';
diff --git a/api_docs/monitoring.mdx b/api_docs/monitoring.mdx
index 4bc6d153851b1..fcba5a7a72a94 100644
--- a/api_docs/monitoring.mdx
+++ b/api_docs/monitoring.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoring
 title: "monitoring"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoring plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoring']
 ---
 import monitoringObj from './monitoring.devdocs.json';
diff --git a/api_docs/monitoring_collection.mdx b/api_docs/monitoring_collection.mdx
index 34d264e634bee..cb0a3d4ca3335 100644
--- a/api_docs/monitoring_collection.mdx
+++ b/api_docs/monitoring_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/monitoringCollection
 title: "monitoringCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the monitoringCollection plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'monitoringCollection']
 ---
 import monitoringCollectionObj from './monitoring_collection.devdocs.json';
diff --git a/api_docs/navigation.mdx b/api_docs/navigation.mdx
index 0f1e7a6bb27bc..ef2ba553deac4 100644
--- a/api_docs/navigation.mdx
+++ b/api_docs/navigation.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/navigation
 title: "navigation"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the navigation plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'navigation']
 ---
 import navigationObj from './navigation.devdocs.json';
diff --git a/api_docs/newsfeed.mdx b/api_docs/newsfeed.mdx
index 4c67fab6d9f3f..c0696a43adf04 100644
--- a/api_docs/newsfeed.mdx
+++ b/api_docs/newsfeed.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/newsfeed
 title: "newsfeed"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the newsfeed plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'newsfeed']
 ---
 import newsfeedObj from './newsfeed.devdocs.json';
diff --git a/api_docs/no_data_page.mdx b/api_docs/no_data_page.mdx
index 924393777eaf6..2dd0b5b8da8e3 100644
--- a/api_docs/no_data_page.mdx
+++ b/api_docs/no_data_page.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/noDataPage
 title: "noDataPage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the noDataPage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'noDataPage']
 ---
 import noDataPageObj from './no_data_page.devdocs.json';
diff --git a/api_docs/notifications.mdx b/api_docs/notifications.mdx
index 97b8a7c60b91a..c8b506954ee61 100644
--- a/api_docs/notifications.mdx
+++ b/api_docs/notifications.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/notifications
 title: "notifications"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the notifications plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'notifications']
 ---
 import notificationsObj from './notifications.devdocs.json';
diff --git a/api_docs/observability.devdocs.json b/api_docs/observability.devdocs.json
index b3ed45a5dc0af..4b00709103738 100644
--- a/api_docs/observability.devdocs.json
+++ b/api_docs/observability.devdocs.json
@@ -4881,7 +4881,7 @@
         "signature": [
           "\"UPTIME_OVERVIEW_LOCATOR\""
         ],
-        "path": "x-pack/plugins/observability_solution/observability/common/index.ts",
+        "path": "packages/deeplinks/observability/locators/uptime.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -14633,7 +14633,7 @@
         "signature": [
           "\"UPTIME_OVERVIEW_LOCATOR\""
         ],
-        "path": "x-pack/plugins/observability_solution/observability/common/index.ts",
+        "path": "packages/deeplinks/observability/locators/uptime.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
diff --git a/api_docs/observability.mdx b/api_docs/observability.mdx
index 83173879a2af4..18ae21442cfea 100644
--- a/api_docs/observability.mdx
+++ b/api_docs/observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observability
 title: "observability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observability plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observability']
 ---
 import observabilityObj from './observability.devdocs.json';
diff --git a/api_docs/observability_a_i_assistant.mdx b/api_docs/observability_a_i_assistant.mdx
index ad9735161e5dd..94f0747e06a39 100644
--- a/api_docs/observability_a_i_assistant.mdx
+++ b/api_docs/observability_a_i_assistant.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistant
 title: "observabilityAIAssistant"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistant plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistant']
 ---
 import observabilityAIAssistantObj from './observability_a_i_assistant.devdocs.json';
diff --git a/api_docs/observability_a_i_assistant_app.mdx b/api_docs/observability_a_i_assistant_app.mdx
index 267f19dc38a03..a5734f975170e 100644
--- a/api_docs/observability_a_i_assistant_app.mdx
+++ b/api_docs/observability_a_i_assistant_app.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAIAssistantApp
 title: "observabilityAIAssistantApp"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAIAssistantApp plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAIAssistantApp']
 ---
 import observabilityAIAssistantAppObj from './observability_a_i_assistant_app.devdocs.json';
diff --git a/api_docs/observability_ai_assistant_management.mdx b/api_docs/observability_ai_assistant_management.mdx
index cf3f45bb07ec8..80f7c77827d38 100644
--- a/api_docs/observability_ai_assistant_management.mdx
+++ b/api_docs/observability_ai_assistant_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityAiAssistantManagement
 title: "observabilityAiAssistantManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityAiAssistantManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityAiAssistantManagement']
 ---
 import observabilityAiAssistantManagementObj from './observability_ai_assistant_management.devdocs.json';
diff --git a/api_docs/observability_logs_explorer.mdx b/api_docs/observability_logs_explorer.mdx
index 54c07b3d1221a..6c61de8b5b015 100644
--- a/api_docs/observability_logs_explorer.mdx
+++ b/api_docs/observability_logs_explorer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityLogsExplorer
 title: "observabilityLogsExplorer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityLogsExplorer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityLogsExplorer']
 ---
 import observabilityLogsExplorerObj from './observability_logs_explorer.devdocs.json';
diff --git a/api_docs/observability_onboarding.mdx b/api_docs/observability_onboarding.mdx
index 70021f1b7a283..7492afaa416fd 100644
--- a/api_docs/observability_onboarding.mdx
+++ b/api_docs/observability_onboarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityOnboarding
 title: "observabilityOnboarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityOnboarding plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityOnboarding']
 ---
 import observabilityOnboardingObj from './observability_onboarding.devdocs.json';
diff --git a/api_docs/observability_shared.mdx b/api_docs/observability_shared.mdx
index 4400441e6f619..6d3111a0ac489 100644
--- a/api_docs/observability_shared.mdx
+++ b/api_docs/observability_shared.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/observabilityShared
 title: "observabilityShared"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the observabilityShared plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'observabilityShared']
 ---
 import observabilitySharedObj from './observability_shared.devdocs.json';
diff --git a/api_docs/osquery.mdx b/api_docs/osquery.mdx
index 92462fdb2d85f..a566d206689c1 100644
--- a/api_docs/osquery.mdx
+++ b/api_docs/osquery.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/osquery
 title: "osquery"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the osquery plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'osquery']
 ---
 import osqueryObj from './osquery.devdocs.json';
diff --git a/api_docs/painless_lab.mdx b/api_docs/painless_lab.mdx
index 40fd96e82ee66..1617fdc10a4c9 100644
--- a/api_docs/painless_lab.mdx
+++ b/api_docs/painless_lab.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/painlessLab
 title: "painlessLab"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the painlessLab plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'painlessLab']
 ---
 import painlessLabObj from './painless_lab.devdocs.json';
diff --git a/api_docs/plugin_directory.mdx b/api_docs/plugin_directory.mdx
index fa1509d163ab0..37f80c7e739e9 100644
--- a/api_docs/plugin_directory.mdx
+++ b/api_docs/plugin_directory.mdx
@@ -7,7 +7,7 @@ id: kibDevDocsPluginDirectory
 slug: /kibana-dev-docs/api-meta/plugin-api-directory
 title: Directory
 description: Directory of public APIs available through plugins or packages.
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana']
 ---
 
@@ -15,13 +15,13 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 
 | Count | Plugins or Packages with a <br /> public API | Number of teams |
 |--------------|----------|------------------------|
-| 810 | 694 | 42 |
+| 812 | 696 | 42 |
 
 ### Public API health stats
 
 | API Count | Any Count | Missing comments | Missing exports |
 |--------------|----------|-----------------|--------|
-| 49662 | 238 | 37887 | 1890 |
+| 49923 | 239 | 38040 | 1897 |
 
 ## Plugin Directory
 
@@ -57,7 +57,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibDashboardPluginApi" text="dashboard"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds the Dashboard app to Kibana | 129 | 0 | 123 | 12 |
 | <DocLink id="kibDashboardEnhancedPluginApi" text="dashboardEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 54 | 0 | 51 | 0 |
 | <DocLink id="kibDataPluginApi" text="data"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Data services are useful for searching and querying data from Elasticsearch. Helpful utilities include: a re-usable react query bar, KQL autocomplete, async search, Data Views (Index Patterns) and field formatters. | 3199 | 31 | 2590 | 24 |
-| <DocLink id="kibDataQualityPluginApi" text="dataQuality"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 8 | 0 | 8 | 0 |
+| <DocLink id="kibDataQualityPluginApi" text="dataQuality"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 5 | 0 | 5 | 0 |
 | <DocLink id="kibDataViewEditorPluginApi" text="dataViewEditor"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | This plugin provides the ability to create data views via a modal flyout inside Kibana apps | 35 | 0 | 25 | 5 |
 | <DocLink id="kibDataViewFieldEditorPluginApi" text="dataViewFieldEditor"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Reusable data view field editor across Kibana | 72 | 0 | 33 | 1 |
 | <DocLink id="kibDataViewManagementPluginApi" text="dataViewManagement"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Data view management app | 2 | 0 | 2 | 0 |
@@ -74,20 +74,21 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibEmbeddableEnhancedPluginApi" text="embeddableEnhanced"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Extends embeddable plugin with more functionality | 19 | 0 | 19 | 2 |
 | <DocLink id="kibEncryptedSavedObjectsPluginApi" text="encryptedSavedObjects"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides encryption and decryption utilities for saved objects containing sensitive information. | 53 | 0 | 46 | 1 |
 | <DocLink id="kibEnterpriseSearchPluginApi" text="enterpriseSearch"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | Adds dashboards for discovering and managing Enterprise Search products. | 5 | 0 | 5 | 0 |
-| <DocLink id="kibEntityManagerPluginApi" text="entityManager"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | Entity manager plugin for entity assets (inventory, topology, etc) | 8 | 0 | 8 | 1 |
+| <DocLink id="kibEntityManagerPluginApi" text="entityManager"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | Entity manager plugin for entity assets (inventory, topology, etc) | 14 | 0 | 14 | 1 |
 | <DocLink id="kibEsUiSharedPluginApi" text="esUiShared"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 99 | 3 | 97 | 3 |
+| <DocLink id="kibEsqlPluginApi" text="esql"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 29 | 0 | 10 | 0 |
 | <DocLink id="kibEsqlDataGridPluginApi" text="esqlDataGrid"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibEventAnnotationPluginApi" text="eventAnnotation"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | The Event Annotation service contains expressions for event annotations | 201 | 0 | 201 | 6 |
 | <DocLink id="kibEventAnnotationListingPluginApi" text="eventAnnotationListing"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | The listing page for event annotations. | 15 | 0 | 15 | 0 |
 | <DocLink id="kibEventLogPluginApi" text="eventLog"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 112 | 0 | 112 | 11 |
-| <DocLink id="kibExploratoryViewPluginApi" text="exploratoryView"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 126 | 0 | 126 | 12 |
+| <DocLink id="kibExploratoryViewPluginApi" text="exploratoryView"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 126 | 0 | 126 | 12 |
 | <DocLink id="kibExpressionErrorPluginApi" text="expressionError"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'error' renderer to expressions | 17 | 0 | 15 | 2 |
 | <DocLink id="kibExpressionGaugePluginApi" text="expressionGauge"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Expression Gauge plugin adds a `gauge` renderer and function to the expression plugin. The renderer will display the `gauge` chart. | 59 | 0 | 58 | 2 |
 | <DocLink id="kibExpressionHeatmapPluginApi" text="expressionHeatmap"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Expression Heatmap plugin adds a `heatmap` renderer and function to the expression plugin. The renderer will display the `heatmap` chart. | 112 | 0 | 108 | 2 |
 | <DocLink id="kibExpressionImagePluginApi" text="expressionImage"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'image' function and renderer to expressions | 26 | 0 | 26 | 0 |
 | <DocLink id="kibExpressionLegacyMetricVisPluginApi" text="expressionLegacyMetricVis"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Adds a `metric` renderer and function to the expression plugin. The renderer will display the `legacy metric` chart. | 51 | 0 | 51 | 2 |
 | <DocLink id="kibExpressionMetricPluginApi" text="expressionMetric"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'metric' function and renderer to expressions | 32 | 0 | 27 | 0 |
-| <DocLink id="kibExpressionMetricVisPluginApi" text="expressionMetricVis"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Adds a `metric` renderer and function to the expression plugin. The renderer will display the `metric` chart. | 67 | 0 | 67 | 2 |
+| <DocLink id="kibExpressionMetricVisPluginApi" text="expressionMetricVis"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Adds a `metric` renderer and function to the expression plugin. The renderer will display the `metric` chart. | 75 | 0 | 75 | 2 |
 | <DocLink id="kibExpressionPartitionVisPluginApi" text="expressionPartitionVis"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Expression Partition Visualization plugin adds a `partitionVis` renderer and `pieVis`, `mosaicVis`, `treemapVis`, `waffleVis` functions to the expression plugin. The renderer will display the `pie`, `waffle`, `treemap` and `mosaic` charts. | 73 | 0 | 73 | 2 |
 | <DocLink id="kibExpressionRepeatImagePluginApi" text="expressionRepeatImage"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'repeatImage' function and renderer to expressions | 32 | 0 | 32 | 0 |
 | <DocLink id="kibExpressionRevealImagePluginApi" text="expressionRevealImage"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | Adds 'revealImage' function and renderer to expressions | 14 | 0 | 14 | 3 |
@@ -101,7 +102,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibFileUploadPluginApi" text="fileUpload"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | The file upload plugin contains components and services for uploading a file, analyzing its data, and then importing the data into an Elasticsearch index. Supported file types include CSV, TSV, newline-delimited JSON and GeoJSON. | 84 | 0 | 84 | 8 |
 | <DocLink id="kibFilesPluginApi" text="files"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | File upload, download, sharing, and serving over HTTP implementation in Kibana. | 240 | 0 | 24 | 9 |
 | <DocLink id="kibFilesManagementPluginApi" text="filesManagement"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Simple UI for managing files in Kibana | 3 | 0 | 3 | 0 |
-| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1348 | 5 | 1226 | 72 |
+| <DocLink id="kibFleetPluginApi" text="fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 1349 | 5 | 1227 | 72 |
 | ftrApis | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibGlobalSearchPluginApi" text="globalSearch"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 72 | 0 | 14 | 5 |
 | globalSearchBar | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 0 | 0 | 0 | 0 |
@@ -119,21 +120,21 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibInspectorPluginApi" text="inspector"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 127 | 2 | 100 | 4 |
 | <DocLink id="kibIntegrationAssistantPluginApi" text="integrationAssistant"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | Plugin implementing the Integration Assistant API and UI | 47 | 0 | 40 | 3 |
 | <DocLink id="kibInteractiveSetupPluginApi" text="interactiveSetup"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides UI and APIs for the interactive setup mode. | 28 | 0 | 18 | 0 |
-| <DocLink id="kibInvestigatePluginApi" text="investigate"/> | [@elastic/obs-ai-assistant](https://github.com/orgs/elastic/teams/obs-ai-assistant) | - | 95 | 0 | 95 | 4 |
+| <DocLink id="kibInvestigatePluginApi" text="investigate"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 95 | 0 | 95 | 4 |
 | <DocLink id="kibKibanaOverviewPluginApi" text="kibanaOverview"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 6 | 0 | 6 | 0 |
 | <DocLink id="kibKibanaReactPluginApi" text="kibanaReact"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 153 | 0 | 121 | 3 |
 | kibanaUsageCollection | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibKibanaUtilsPluginApi" text="kibanaUtils"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 610 | 3 | 417 | 9 |
 | <DocLink id="kibKubernetesSecurityPluginApi" text="kubernetesSecurity"/> | [@elastic/kibana-cloud-security-posture](https://github.com/orgs/elastic/teams/kibana-cloud-security-posture) | - | 5 | 0 | 5 | 1 |
-| <DocLink id="kibLensPluginApi" text="lens"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 672 | 0 | 570 | 62 |
+| <DocLink id="kibLensPluginApi" text="lens"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Visualization editor allowing to quickly and easily configure compelling visualizations to use on dashboards and canvas workpads. Exposes components to embed visualizations and link into the Lens editor from within other apps in Kibana. | 677 | 0 | 575 | 63 |
 | <DocLink id="kibLicenseApiGuardPluginApi" text="licenseApiGuard"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibLicenseManagementPluginApi" text="licenseManagement"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 4 | 0 | 4 | 1 |
 | <DocLink id="kibLicensingPluginApi" text="licensing"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 117 | 0 | 42 | 10 |
-| <DocLink id="kibLinksPluginApi" text="links"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | A dashboard panel for creating links to dashboards or external links. | 58 | 0 | 58 | 6 |
+| <DocLink id="kibLinksPluginApi" text="links"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | A dashboard panel for creating links to dashboards or external links. | 5 | 0 | 5 | 0 |
 | <DocLink id="kibListsPluginApi" text="lists"/> | [@elastic/security-detection-engine](https://github.com/orgs/elastic/teams/security-detection-engine) | - | 226 | 0 | 97 | 52 |
-| <DocLink id="kibLogsDataAccessPluginApi" text="logsDataAccess"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 7 | 0 | 7 | 2 |
+| <DocLink id="kibLogsDataAccessPluginApi" text="logsDataAccess"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 7 | 0 | 7 | 6 |
 | <DocLink id="kibLogsExplorerPluginApi" text="logsExplorer"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | This plugin provides a LogsExplorer component using the Discover customization framework, offering several affordances specifically designed for log consumption. | 117 | 4 | 117 | 22 |
-| <DocLink id="kibLogsSharedPluginApi" text="logsShared"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | Exposes the shared components and APIs to access and visualize logs. | 296 | 0 | 268 | 32 |
+| <DocLink id="kibLogsSharedPluginApi" text="logsShared"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | Exposes the shared components and APIs to access and visualize logs. | 297 | 0 | 269 | 32 |
 | logstash | [@elastic/logstash](https://github.com/orgs/elastic/teams/logstash) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibManagementPluginApi" text="management"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 44 | 0 | 44 | 7 |
 | <DocLink id="kibMapsPluginApi" text="maps"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | - | 209 | 0 | 205 | 28 |
@@ -163,7 +164,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibRemoteClustersPluginApi" text="remoteClusters"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 23 | 0 | 23 | 0 |
 | <DocLink id="kibReportingPluginApi" text="reporting"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Reporting Services enables applications to feature reports that the user can automate with Watcher and download later. | 9 | 0 | 2 | 0 |
 | <DocLink id="kibRollupPluginApi" text="rollup"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 21 | 0 | 21 | 0 |
-| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 276 | 0 | 247 | 14 |
+| <DocLink id="kibRuleRegistryPluginApi" text="ruleRegistry"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 286 | 0 | 249 | 14 |
 | <DocLink id="kibRuntimeFieldsPluginApi" text="runtimeFields"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 24 | 0 | 19 | 2 |
 | <DocLink id="kibSavedObjectsPluginApi" text="savedObjects"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 132 | 2 | 121 | 5 |
 | <DocLink id="kibSavedObjectsFinderPluginApi" text="savedObjectsFinder"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 25 | 0 | 25 | 0 |
@@ -177,9 +178,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibSearchHomepagePluginApi" text="searchHomepage"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 18 | 0 | 10 | 0 |
 | <DocLink id="kibSearchInferenceEndpointsPluginApi" text="searchInferenceEndpoints"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 10 | 0 | 6 | 1 |
 | <DocLink id="kibSearchNotebooksPluginApi" text="searchNotebooks"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | Plugin to provide access to and rendering of python notebooks for use in the persistent developer console. | 8 | 0 | 8 | 1 |
-| <DocLink id="kibSearchPlaygroundPluginApi" text="searchPlayground"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 18 | 0 | 10 | 1 |
+| <DocLink id="kibSearchPlaygroundPluginApi" text="searchPlayground"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 15 | 0 | 9 | 1 |
 | searchprofiler | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 415 | 0 | 206 | 1 |
+| <DocLink id="kibSecurityPluginApi" text="security"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides authentication and authorization features, and exposes functionality to understand the capabilities of the currently authenticated user. | 438 | 0 | 222 | 1 |
 | <DocLink id="kibSecuritySolutionPluginApi" text="securitySolution"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 191 | 0 | 121 | 37 |
 | <DocLink id="kibSecuritySolutionEssPluginApi" text="securitySolutionEss"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | ESS customizations for Security Solution. | 6 | 0 | 6 | 0 |
 | <DocLink id="kibSecuritySolutionServerlessPluginApi" text="securitySolutionServerless"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | Serverless customizations for security. | 7 | 0 | 7 | 0 |
@@ -193,15 +194,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibSpacesPluginApi" text="spaces"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | This plugin provides the Spaces feature, which allows saved objects to be organized into meaningful categories. | 260 | 0 | 66 | 0 |
 | <DocLink id="kibStackAlertsPluginApi" text="stackAlerts"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 25 | 0 | 25 | 3 |
 | <DocLink id="kibStackConnectorsPluginApi" text="stackConnectors"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 10 | 0 | 10 | 0 |
-| synthetics | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | This plugin visualizes data from Synthetics and Heartbeat, and integrates with other Observability solutions. | 0 | 0 | 0 | 0 |
+| synthetics | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | This plugin visualizes data from Synthetics and Heartbeat, and integrates with other Observability solutions. | 0 | 0 | 0 | 0 |
 | <DocLink id="kibTaskManagerPluginApi" text="taskManager"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 102 | 0 | 59 | 5 |
 | <DocLink id="kibTelemetryPluginApi" text="telemetry"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 45 | 0 | 1 | 0 |
 | <DocLink id="kibTelemetryCollectionManagerPluginApi" text="telemetryCollectionManager"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 31 | 0 | 26 | 6 |
 | <DocLink id="kibTelemetryCollectionXpackPluginApi" text="telemetryCollectionXpack"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibTelemetryManagementSectionPluginApi" text="telemetryManagementSection"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 6 | 0 | 0 | 0 |
-| <DocLink id="kibTextBasedLanguagesPluginApi" text="textBasedLanguages"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 29 | 0 | 10 | 0 |
 | <DocLink id="kibThreatIntelligencePluginApi" text="threatIntelligence"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | Elastic threat intelligence helps you see if you are open to or have been subject to current or historical known threats | 30 | 0 | 14 | 4 |
-| <DocLink id="kibTimelinesPluginApi" text="timelines"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | - | 238 | 1 | 194 | 18 |
+| <DocLink id="kibTimelinesPluginApi" text="timelines"/> | [@elastic/security-threat-hunting-investigations](https://github.com/orgs/elastic/teams/security-threat-hunting-investigations) | - | 228 | 1 | 184 | 18 |
 | <DocLink id="kibTransformPluginApi" text="transform"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | This plugin provides access to the transforms features provided by Elastic. Transforms enable you to convert existing Elasticsearch indices into summarized indices, which provide opportunities for new insights and analytics. | 4 | 0 | 4 | 1 |
 | translations | [@elastic/kibana-localization](https://github.com/orgs/elastic/teams/kibana-localization) | - | 0 | 0 | 0 | 0 |
 | <DocLink id="kibTriggersActionsUiPluginApi" text="triggersActionsUi"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 588 | 1 | 562 | 52 |
@@ -211,10 +211,10 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibUnifiedHistogramPluginApi" text="unifiedHistogram"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | The `unifiedHistogram` plugin provides UI components to create a layout including a resizable histogram and a main display. | 71 | 0 | 36 | 6 |
 | <DocLink id="kibUnifiedSearchPluginApi" text="unifiedSearch"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains all the key functionality of Kibana's unified search experience.Contains all the key functionality of Kibana's unified search experience. | 152 | 2 | 113 | 23 |
 | upgradeAssistant | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 0 | 0 | 0 | 0 |
-| <DocLink id="kibUptimePluginApi" text="uptime"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | This plugin visualizes data from Heartbeat, and integrates with other Observability solutions. | 1 | 0 | 1 | 0 |
+| <DocLink id="kibUptimePluginApi" text="uptime"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | This plugin visualizes data from Heartbeat, and integrates with other Observability solutions. | 1 | 0 | 1 | 0 |
 | urlDrilldown | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | Adds drilldown implementations to Kibana | 0 | 0 | 0 | 0 |
 | <DocLink id="kibUrlForwardingPluginApi" text="urlForwarding"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 12 | 0 | 12 | 0 |
-| <DocLink id="kibUsageCollectionPluginApi" text="usageCollection"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 55 | 0 | 16 | 2 |
+| <DocLink id="kibUsageCollectionPluginApi" text="usageCollection"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 56 | 0 | 16 | 2 |
 | <DocLink id="kibUxPluginApi" text="ux"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibVisDefaultEditorPluginApi" text="visDefaultEditor"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | The default editor used in most aggregation-based visualizations. | 56 | 0 | 49 | 4 |
 | <DocLink id="kibVisTypeGaugePluginApi" text="visTypeGauge"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | Contains the gauge chart implementation using the elastic-charts library. The goal is to eventually deprecate the old implementation and keep only this. Until then, the library used is defined by the Legacy charts library advanced setting. | 7 | 0 | 7 | 2 |
@@ -246,7 +246,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnAlertingStateTypesPluginApi" text="@kbn/alerting-state-types"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 23 | 0 | 22 | 0 |
 | <DocLink id="kibKbnAlertingTypesPluginApi" text="@kbn/alerting-types"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 194 | 0 | 191 | 0 |
 | <DocLink id="kibKbnAlertsAsDataUtilsPluginApi" text="@kbn/alerts-as-data-utils"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 33 | 0 | 33 | 0 |
-| <DocLink id="kibKbnAlertsUiSharedPluginApi" text="@kbn/alerts-ui-shared"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 245 | 0 | 231 | 2 |
+| <DocLink id="kibKbnAlertsGroupingPluginApi" text="@kbn/alerts-grouping"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 22 | 0 | 5 | 1 |
+| <DocLink id="kibKbnAlertsUiSharedPluginApi" text="@kbn/alerts-ui-shared"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 299 | 0 | 283 | 8 |
 | <DocLink id="kibKbnAnalyticsPluginApi" text="@kbn/analytics"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 73 | 0 | 73 | 2 |
 | <DocLink id="kibKbnAnalyticsCollectionUtilsPluginApi" text="@kbn/analytics-collection-utils"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 1 | 0 | 0 | 0 |
 | <DocLink id="kibKbnApmConfigLoaderPluginApi" text="@kbn/apm-config-loader"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 18 | 0 | 18 | 0 |
@@ -277,7 +278,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnContentManagementTabbedTableListViewPluginApi" text="@kbn/content-management-tabbed-table-list-view"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibKbnContentManagementTableListViewPluginApi" text="@kbn/content-management-table-list-view"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 3 | 0 | 3 | 0 |
 | <DocLink id="kibKbnContentManagementTableListViewCommonPluginApi" text="@kbn/content-management-table-list-view-common"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 10 | 0 | 10 | 0 |
-| <DocLink id="kibKbnContentManagementTableListViewTablePluginApi" text="@kbn/content-management-table-list-view-table"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 48 | 0 | 32 | 3 |
+| <DocLink id="kibKbnContentManagementTableListViewTablePluginApi" text="@kbn/content-management-table-list-view-table"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 49 | 0 | 33 | 3 |
 | <DocLink id="kibKbnContentManagementUserProfilesPluginApi" text="@kbn/content-management-user-profiles"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 30 | 0 | 30 | 0 |
 | <DocLink id="kibKbnContentManagementUtilsPluginApi" text="@kbn/content-management-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 195 | 1 | 128 | 0 |
 | <DocLink id="kibKbnCoreAnalyticsBrowserPluginApi" text="@kbn/core-analytics-browser"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 101 | 0 | 0 | 0 |
@@ -350,7 +351,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreHttpRouterServerInternalPluginApi" text="@kbn/core-http-router-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 54 | 7 | 54 | 6 |
 | <DocLink id="kibKbnCoreHttpRouterServerMocksPluginApi" text="@kbn/core-http-router-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 13 | 0 | 13 | 1 |
 | <DocLink id="kibKbnCoreHttpServerPluginApi" text="@kbn/core-http-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 495 | 2 | 193 | 0 |
-| <DocLink id="kibKbnCoreHttpServerInternalPluginApi" text="@kbn/core-http-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 92 | 0 | 79 | 10 |
+| <DocLink id="kibKbnCoreHttpServerInternalPluginApi" text="@kbn/core-http-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 95 | 0 | 82 | 10 |
 | <DocLink id="kibKbnCoreHttpServerMocksPluginApi" text="@kbn/core-http-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 44 | 0 | 43 | 0 |
 | <DocLink id="kibKbnCoreI18nBrowserPluginApi" text="@kbn/core-i18n-browser"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 2 | 0 |
 | <DocLink id="kibKbnCoreI18nBrowserMocksPluginApi" text="@kbn/core-i18n-browser-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 3 | 0 | 3 | 0 |
@@ -409,7 +410,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSavedObjectsImportExportServerMocksPluginApi" text="@kbn/core-saved-objects-import-export-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsMigrationServerInternalPluginApi" text="@kbn/core-saved-objects-migration-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 128 | 0 | 94 | 44 |
 | <DocLink id="kibKbnCoreSavedObjectsMigrationServerMocksPluginApi" text="@kbn/core-saved-objects-migration-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 12 | 0 | 12 | 0 |
-| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" text="@kbn/core-saved-objects-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 561 | 1 | 133 | 4 |
+| <DocLink id="kibKbnCoreSavedObjectsServerPluginApi" text="@kbn/core-saved-objects-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 562 | 1 | 134 | 4 |
 | <DocLink id="kibKbnCoreSavedObjectsServerInternalPluginApi" text="@kbn/core-saved-objects-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 71 | 0 | 70 | 5 |
 | <DocLink id="kibKbnCoreSavedObjectsServerMocksPluginApi" text="@kbn/core-saved-objects-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 14 | 0 | 14 | 0 |
 | <DocLink id="kibKbnCoreSavedObjectsUtilsServerPluginApi" text="@kbn/core-saved-objects-utils-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 36 | 0 | 6 | 0 |
@@ -417,9 +418,9 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnCoreSecurityBrowserInternalPluginApi" text="@kbn/core-security-browser-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibKbnCoreSecurityBrowserMocksPluginApi" text="@kbn/core-security-browser-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibKbnCoreSecurityCommonPluginApi" text="@kbn/core-security-common"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 20 | 0 | 6 | 0 |
-| <DocLink id="kibKbnCoreSecurityServerPluginApi" text="@kbn/core-security-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 52 | 0 | 16 | 0 |
+| <DocLink id="kibKbnCoreSecurityServerPluginApi" text="@kbn/core-security-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 146 | 1 | 63 | 0 |
 | <DocLink id="kibKbnCoreSecurityServerInternalPluginApi" text="@kbn/core-security-server-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 16 | 0 | 16 | 0 |
-| <DocLink id="kibKbnCoreSecurityServerMocksPluginApi" text="@kbn/core-security-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 13 | 0 | 13 | 2 |
+| <DocLink id="kibKbnCoreSecurityServerMocksPluginApi" text="@kbn/core-security-server-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 15 | 0 | 15 | 2 |
 | <DocLink id="kibKbnCoreStatusCommonPluginApi" text="@kbn/core-status-common"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 12 | 0 | 2 | 0 |
 | <DocLink id="kibKbnCoreStatusCommonInternalPluginApi" text="@kbn/core-status-common-internal"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 21 | 0 | 20 | 0 |
 | <DocLink id="kibKbnCoreStatusServerPluginApi" text="@kbn/core-status-server"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 20 | 0 | 3 | 0 |
@@ -460,14 +461,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnDataForgePluginApi" text="@kbn/data-forge"/> | [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) | - | 51 | 0 | 51 | 1 |
 | <DocLink id="kibKbnDataServicePluginApi" text="@kbn/data-service"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 14 | 0 | 9 | 0 |
 | <DocLink id="kibKbnDataStreamAdapterPluginApi" text="@kbn/data-stream-adapter"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 80 | 0 | 80 | 1 |
-| <DocLink id="kibKbnDataViewUtilsPluginApi" text="@kbn/data-view-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 5 | 0 | 4 | 0 |
+| <DocLink id="kibKbnDataViewUtilsPluginApi" text="@kbn/data-view-utils"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 7 | 0 | 5 | 0 |
 | <DocLink id="kibKbnDatemathPluginApi" text="@kbn/datemath"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 44 | 0 | 43 | 0 |
 | <DocLink id="kibKbnDeeplinksAnalyticsPluginApi" text="@kbn/deeplinks-analytics"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 7 | 0 | 7 | 0 |
 | <DocLink id="kibKbnDeeplinksDevtoolsPluginApi" text="@kbn/deeplinks-devtools"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 5 | 0 | 5 | 0 |
 | <DocLink id="kibKbnDeeplinksFleetPluginApi" text="@kbn/deeplinks-fleet"/> | [@elastic/fleet](https://github.com/orgs/elastic/teams/fleet) | - | 3 | 0 | 3 | 0 |
 | <DocLink id="kibKbnDeeplinksManagementPluginApi" text="@kbn/deeplinks-management"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 4 | 0 | 4 | 0 |
 | <DocLink id="kibKbnDeeplinksMlPluginApi" text="@kbn/deeplinks-ml"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 3 | 0 | 3 | 0 |
-| <DocLink id="kibKbnDeeplinksObservabilityPluginApi" text="@kbn/deeplinks-observability"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 45 | 0 | 33 | 0 |
+| <DocLink id="kibKbnDeeplinksObservabilityPluginApi" text="@kbn/deeplinks-observability"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 56 | 0 | 44 | 0 |
 | <DocLink id="kibKbnDeeplinksSearchPluginApi" text="@kbn/deeplinks-search"/> | [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-kibana) | - | 17 | 0 | 17 | 0 |
 | <DocLink id="kibKbnDeeplinksSecurityPluginApi" text="@kbn/deeplinks-security"/> | [@elastic/security-solution](https://github.com/orgs/elastic/teams/security-solution) | - | 5 | 0 | 5 | 0 |
 | <DocLink id="kibKbnDeeplinksSharedPluginApi" text="@kbn/deeplinks-shared"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 2 | 0 |
@@ -489,14 +490,14 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnElasticAgentUtilsPluginApi" text="@kbn/elastic-agent-utils"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 35 | 0 | 34 | 0 |
 | <DocLink id="kibKbnElasticAssistantPluginApi" text="@kbn/elastic-assistant"/> | [@elastic/security-generative-ai](https://github.com/orgs/elastic/teams/security-generative-ai) | - | 160 | 0 | 134 | 9 |
 | <DocLink id="kibKbnElasticAssistantCommonPluginApi" text="@kbn/elastic-assistant-common"/> | [@elastic/security-generative-ai](https://github.com/orgs/elastic/teams/security-generative-ai) | - | 362 | 0 | 336 | 0 |
-| <DocLink id="kibKbnEntitiesSchemaPluginApi" text="@kbn/entities-schema"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 18 | 0 | 18 | 0 |
+| <DocLink id="kibKbnEntitiesSchemaPluginApi" text="@kbn/entities-schema"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 19 | 0 | 19 | 0 |
 | <DocLink id="kibKbnEsPluginApi" text="@kbn/es"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 52 | 0 | 37 | 7 |
 | <DocLink id="kibKbnEsArchiverPluginApi" text="@kbn/es-archiver"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 32 | 0 | 19 | 1 |
 | <DocLink id="kibKbnEsErrorsPluginApi" text="@kbn/es-errors"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 11 | 0 | 6 | 0 |
 | <DocLink id="kibKbnEsQueryPluginApi" text="@kbn/es-query"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 269 | 1 | 209 | 15 |
 | <DocLink id="kibKbnEsTypesPluginApi" text="@kbn/es-types"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 26 | 0 | 26 | 1 |
 | <DocLink id="kibKbnEslintPluginImportsPluginApi" text="@kbn/eslint-plugin-imports"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 2 | 0 | 1 | 0 |
-| <DocLink id="kibKbnEsqlAstPluginApi" text="@kbn/esql-ast"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 99 | 1 | 96 | 11 |
+| <DocLink id="kibKbnEsqlAstPluginApi" text="@kbn/esql-ast"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 104 | 1 | 101 | 10 |
 | <DocLink id="kibKbnEsqlUtilsPluginApi" text="@kbn/esql-utils"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 53 | 0 | 51 | 0 |
 | <DocLink id="kibKbnEsqlValidationAutocompletePluginApi" text="@kbn/esql-validation-autocomplete"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 193 | 0 | 182 | 10 |
 | <DocLink id="kibKbnEventAnnotationCommonPluginApi" text="@kbn/event-annotation-common"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 39 | 0 | 39 | 0 |
@@ -511,7 +512,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnGeneratePluginApi" text="@kbn/generate"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 0 | 0 |
 | <DocLink id="kibKbnGenerateConsoleDefinitionsPluginApi" text="@kbn/generate-console-definitions"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnGenerateCsvPluginApi" text="@kbn/generate-csv"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 26 | 0 | 26 | 1 |
-| <DocLink id="kibKbnGroupingPluginApi" text="@kbn/grouping"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 17 | 0 | 12 | 8 |
+| <DocLink id="kibKbnGroupingPluginApi" text="@kbn/grouping"/> | [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-ops) | - | 17 | 0 | 12 | 10 |
 | <DocLink id="kibKbnGuidedOnboardingPluginApi" text="@kbn/guided-onboarding"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 49 | 0 | 47 | 0 |
 | <DocLink id="kibKbnHandlebarsPluginApi" text="@kbn/handlebars"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 33 | 3 | 24 | 6 |
 | <DocLink id="kibKbnHapiMocksPluginApi" text="@kbn/hapi-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 3 | 0 | 3 | 0 |
@@ -535,7 +536,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnLanguageDocumentationPopoverPluginApi" text="@kbn/language-documentation-popover"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 7 | 0 | 5 | 0 |
 | <DocLink id="kibKbnLensEmbeddableUtilsPluginApi" text="@kbn/lens-embeddable-utils"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 193 | 0 | 190 | 6 |
 | <DocLink id="kibKbnLensFormulaDocsPluginApi" text="@kbn/lens-formula-docs"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 172 | 0 | 172 | 1 |
-| <DocLink id="kibKbnLoggingPluginApi" text="@kbn/logging"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 27 | 0 | 1 | 2 |
+| <DocLink id="kibKbnLoggingPluginApi" text="@kbn/logging"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 28 | 0 | 2 | 2 |
 | <DocLink id="kibKbnLoggingMocksPluginApi" text="@kbn/logging-mocks"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibKbnManagedContentBadgePluginApi" text="@kbn/managed-content-badge"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibKbnManagedVscodeConfigPluginApi" text="@kbn/managed-vscode-config"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 6 | 0 | 1 | 1 |
@@ -553,7 +554,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnManagementStorybookConfigPluginApi" text="@kbn/management-storybook-config"/> | [@elastic/kibana-management](https://github.com/orgs/elastic/teams/kibana-management) | - | 2 | 0 | 0 | 0 |
 | <DocLink id="kibKbnMapboxGlPluginApi" text="@kbn/mapbox-gl"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | - | 592 | 1 | 1 | 0 |
 | <DocLink id="kibKbnMapsVectorTileUtilsPluginApi" text="@kbn/maps-vector-tile-utils"/> | [@elastic/kibana-gis](https://github.com/orgs/elastic/teams/kibana-gis) | - | 2 | 0 | 2 | 0 |
-| <DocLink id="kibKbnMlAggUtilsPluginApi" text="@kbn/ml-agg-utils"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 102 | 2 | 0 | 0 |
+| <DocLink id="kibKbnMlAggUtilsPluginApi" text="@kbn/ml-agg-utils"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 90 | 1 | 0 | 0 |
 | <DocLink id="kibKbnMlAnomalyUtilsPluginApi" text="@kbn/ml-anomaly-utils"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 207 | 3 | 1 | 0 |
 | <DocLink id="kibKbnMlCancellableSearchPluginApi" text="@kbn/ml-cancellable-search"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 8 | 0 | 8 | 0 |
 | <DocLink id="kibKbnMlCategoryValidatorPluginApi" text="@kbn/ml-category-validator"/> | [@elastic/ml-ui](https://github.com/orgs/elastic/teams/ml-ui) | - | 37 | 0 | 0 | 0 |
@@ -596,7 +597,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnPluginGeneratorPluginApi" text="@kbn/plugin-generator"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnPluginHelpersPluginApi" text="@kbn/plugin-helpers"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnPresentationContainersPluginApi" text="@kbn/presentation-containers"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 82 | 0 | 71 | 0 |
-| <DocLink id="kibKbnPresentationPublishingPluginApi" text="@kbn/presentation-publishing"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 214 | 0 | 179 | 5 |
+| <DocLink id="kibKbnPresentationPublishingPluginApi" text="@kbn/presentation-publishing"/> | [@elastic/kibana-presentation](https://github.com/orgs/elastic/teams/kibana-presentation) | - | 216 | 0 | 181 | 5 |
 | <DocLink id="kibKbnProfilingUtilsPluginApi" text="@kbn/profiling-utils"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 168 | 0 | 55 | 0 |
 | <DocLink id="kibKbnRandomSamplingPluginApi" text="@kbn/random-sampling"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 13 | 0 | 7 | 0 |
 | <DocLink id="kibKbnReactFieldPluginApi" text="@kbn/react-field"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 22 | 0 | 9 | 0 |
@@ -607,6 +608,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnReactKibanaContextStyledPluginApi" text="@kbn/react-kibana-context-styled"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 18 | 0 | 3 | 0 |
 | <DocLink id="kibKbnReactKibanaContextThemePluginApi" text="@kbn/react-kibana-context-theme"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 11 | 0 | 2 | 0 |
 | <DocLink id="kibKbnReactKibanaMountPluginApi" text="@kbn/react-kibana-mount"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 11 | 0 | 8 | 0 |
+| <DocLink id="kibKbnRecentlyAccessedPluginApi" text="@kbn/recently-accessed"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 14 | 0 | 7 | 0 |
 | <DocLink id="kibKbnRepoFileMapsPluginApi" text="@kbn/repo-file-maps"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 18 | 0 | 18 | 0 |
 | <DocLink id="kibKbnRepoLinterPluginApi" text="@kbn/repo-linter"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 40 | 0 | 38 | 5 |
 | <DocLink id="kibKbnRepoPathPluginApi" text="@kbn/repo-path"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 13 | 0 | 9 | 0 |
@@ -642,7 +644,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnSecurityHardeningPluginApi" text="@kbn/security-hardening"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 7 | 0 | 7 | 0 |
 | <DocLink id="kibKbnSecurityPluginTypesCommonPluginApi" text="@kbn/security-plugin-types-common"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 118 | 0 | 59 | 0 |
 | <DocLink id="kibKbnSecurityPluginTypesPublicPluginApi" text="@kbn/security-plugin-types-public"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 51 | 0 | 25 | 0 |
-| <DocLink id="kibKbnSecurityPluginTypesServerPluginApi" text="@kbn/security-plugin-types-server"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 216 | 0 | 121 | 0 |
+| <DocLink id="kibKbnSecurityPluginTypesServerPluginApi" text="@kbn/security-plugin-types-server"/> | [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-security) | - | 275 | 1 | 154 | 0 |
 | <DocLink id="kibKbnSecuritySolutionFeaturesPluginApi" text="@kbn/security-solution-features"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 14 | 0 | 14 | 6 |
 | <DocLink id="kibKbnSecuritySolutionNavigationPluginApi" text="@kbn/security-solution-navigation"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 54 | 0 | 49 | 0 |
 | <DocLink id="kibKbnSecuritySolutionSideNavPluginApi" text="@kbn/security-solution-side-nav"/> | [@elastic/security-threat-hunting-explore](https://github.com/orgs/elastic/teams/security-threat-hunting-explore) | - | 30 | 0 | 24 | 0 |
@@ -672,7 +674,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnServerlessSearchSettingsPluginApi" text="@kbn/serverless-search-settings"/> | [@elastic/search-kibana @elastic/kibana-management](https://github.com/orgs/elastic/teams/search-kibana ) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnServerlessSecuritySettingsPluginApi" text="@kbn/serverless-security-settings"/> | [@elastic/security-solution @elastic/kibana-management](https://github.com/orgs/elastic/teams/security-solution ) | - | 1 | 0 | 1 | 0 |
 | <DocLink id="kibKbnServerlessStorybookConfigPluginApi" text="@kbn/serverless-storybook-config"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 2 | 0 | 0 | 0 |
-| <DocLink id="kibKbnSharedSvgPluginApi" text="@kbn/shared-svg"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 4 | 0 | 4 | 0 |
+| <DocLink id="kibKbnSharedSvgPluginApi" text="@kbn/shared-svg"/> | [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) | - | 5 | 0 | 5 | 0 |
 | <DocLink id="kibKbnSharedUxAvatarSolutionPluginApi" text="@kbn/shared-ux-avatar-solution"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 3 | 0 | 2 | 2 |
 | <DocLink id="kibKbnSharedUxButtonExitFullScreenPluginApi" text="@kbn/shared-ux-button-exit-full-screen"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 8 | 0 | 2 | 1 |
 | <DocLink id="kibKbnSharedUxButtonToolbarPluginApi" text="@kbn/shared-ux-button-toolbar"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 30 | 0 | 8 | 0 |
@@ -720,7 +722,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnStorybookPluginApi" text="@kbn/storybook"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 41 | 2 | 21 | 0 |
 | <DocLink id="kibKbnTelemetryToolsPluginApi" text="@kbn/telemetry-tools"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 7 | 0 | 5 | 1 |
 | <DocLink id="kibKbnTestPluginApi" text="@kbn/test"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 315 | 4 | 267 | 13 |
-| <DocLink id="kibKbnTestEuiHelpersPluginApi" text="@kbn/test-eui-helpers"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 25 | 0 | 13 | 0 |
+| <DocLink id="kibKbnTestEuiHelpersPluginApi" text="@kbn/test-eui-helpers"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 36 | 0 | 18 | 0 |
 | <DocLink id="kibKbnTestJestHelpersPluginApi" text="@kbn/test-jest-helpers"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 131 | 3 | 98 | 2 |
 | <DocLink id="kibKbnTestSubjSelectorPluginApi" text="@kbn/test-subj-selector"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 2 | 0 | 1 | 0 |
 | <DocLink id="kibKbnTextBasedEditorPluginApi" text="@kbn/text-based-editor"/> | [@elastic/kibana-esql](https://github.com/orgs/elastic/teams/kibana-esql) | - | 33 | 0 | 13 | 0 |
@@ -731,7 +733,7 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnTsProjectsPluginApi" text="@kbn/ts-projects"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 39 | 0 | 25 | 1 |
 | <DocLink id="kibKbnTypedReactRouterConfigPluginApi" text="@kbn/typed-react-router-config"/> | [@elastic/obs-knowledge-team](https://github.com/orgs/elastic/teams/obs-knowledge-team) | - | 86 | 0 | 86 | 1 |
 | <DocLink id="kibKbnUiActionsBrowserPluginApi" text="@kbn/ui-actions-browser"/> | [@elastic/appex-sharedux](https://github.com/orgs/elastic/teams/appex-sharedux) | - | 42 | 0 | 28 | 0 |
-| <DocLink id="kibKbnUiSharedDepsSrcPluginApi" text="@kbn/ui-shared-deps-src"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 55 | 0 | 46 | 0 |
+| <DocLink id="kibKbnUiSharedDepsSrcPluginApi" text="@kbn/ui-shared-deps-src"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 57 | 0 | 48 | 0 |
 | <DocLink id="kibKbnUiThemePluginApi" text="@kbn/ui-theme"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 9 | 0 | 8 | 0 |
 | <DocLink id="kibKbnUnifiedDataTablePluginApi" text="@kbn/unified-data-table"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | Contains functionality for the unified data table which can be integrated into apps | 153 | 0 | 81 | 1 |
 | <DocLink id="kibKbnUnifiedDocViewerPluginApi" text="@kbn/unified-doc-viewer"/> | [@elastic/kibana-data-discovery](https://github.com/orgs/elastic/teams/kibana-data-discovery) | - | 18 | 0 | 17 | 5 |
@@ -743,8 +745,8 @@ tags: ['contributor', 'dev', 'apidocs', 'kibana']
 | <DocLink id="kibKbnUtilityTypesPluginApi" text="@kbn/utility-types"/> | [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core) | - | 37 | 0 | 16 | 1 |
 | <DocLink id="kibKbnUtilityTypesJestPluginApi" text="@kbn/utility-types-jest"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 2 | 0 | 2 | 0 |
 | <DocLink id="kibKbnUtilsPluginApi" text="@kbn/utils"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 26 | 0 | 15 | 0 |
-| <DocLink id="kibKbnVisualizationUiComponentsPluginApi" text="@kbn/visualization-ui-components"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 154 | 0 | 150 | 3 |
-| <DocLink id="kibKbnVisualizationUtilsPluginApi" text="@kbn/visualization-utils"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 10 | 0 | 9 | 1 |
+| <DocLink id="kibKbnVisualizationUiComponentsPluginApi" text="@kbn/visualization-ui-components"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 146 | 0 | 143 | 3 |
+| <DocLink id="kibKbnVisualizationUtilsPluginApi" text="@kbn/visualization-utils"/> | [@elastic/kibana-visualizations](https://github.com/orgs/elastic/teams/kibana-visualizations) | - | 19 | 0 | 17 | 1 |
 | <DocLink id="kibKbnXstateUtilsPluginApi" text="@kbn/xstate-utils"/> | [@elastic/obs-ux-logs-team](https://github.com/orgs/elastic/teams/obs-ux-logs-team) | - | 13 | 0 | 13 | 0 |
 | <DocLink id="kibKbnYarnLockValidatorPluginApi" text="@kbn/yarn-lock-validator"/> | [@elastic/kibana-operations](https://github.com/orgs/elastic/teams/kibana-operations) | - | 6 | 0 | 2 | 0 |
 | <DocLink id="kibKbnZodHelpersPluginApi" text="@kbn/zod-helpers"/> | [@elastic/security-detection-rule-management](https://github.com/orgs/elastic/teams/security-detection-rule-management) | - | 20 | 0 | 10 | 0 |
diff --git a/api_docs/presentation_panel.mdx b/api_docs/presentation_panel.mdx
index 5a7792bf3ac76..6020b7134ac6b 100644
--- a/api_docs/presentation_panel.mdx
+++ b/api_docs/presentation_panel.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationPanel
 title: "presentationPanel"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationPanel plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationPanel']
 ---
 import presentationPanelObj from './presentation_panel.devdocs.json';
diff --git a/api_docs/presentation_util.mdx b/api_docs/presentation_util.mdx
index 6dc693ba98a6a..b44845d2bccf5 100644
--- a/api_docs/presentation_util.mdx
+++ b/api_docs/presentation_util.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/presentationUtil
 title: "presentationUtil"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the presentationUtil plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'presentationUtil']
 ---
 import presentationUtilObj from './presentation_util.devdocs.json';
diff --git a/api_docs/profiling.mdx b/api_docs/profiling.mdx
index 3ba6679b7c977..af1b22b1f5a80 100644
--- a/api_docs/profiling.mdx
+++ b/api_docs/profiling.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profiling
 title: "profiling"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profiling plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profiling']
 ---
 import profilingObj from './profiling.devdocs.json';
diff --git a/api_docs/profiling_data_access.mdx b/api_docs/profiling_data_access.mdx
index 352489dde1763..bc8b55f94b14b 100644
--- a/api_docs/profiling_data_access.mdx
+++ b/api_docs/profiling_data_access.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/profilingDataAccess
 title: "profilingDataAccess"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the profilingDataAccess plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'profilingDataAccess']
 ---
 import profilingDataAccessObj from './profiling_data_access.devdocs.json';
diff --git a/api_docs/remote_clusters.mdx b/api_docs/remote_clusters.mdx
index 32f26431579f2..4c345e18a0347 100644
--- a/api_docs/remote_clusters.mdx
+++ b/api_docs/remote_clusters.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/remoteClusters
 title: "remoteClusters"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the remoteClusters plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'remoteClusters']
 ---
 import remoteClustersObj from './remote_clusters.devdocs.json';
diff --git a/api_docs/reporting.mdx b/api_docs/reporting.mdx
index d5c47f3f3ed21..fc5f161857818 100644
--- a/api_docs/reporting.mdx
+++ b/api_docs/reporting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/reporting
 title: "reporting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the reporting plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'reporting']
 ---
 import reportingObj from './reporting.devdocs.json';
diff --git a/api_docs/rollup.mdx b/api_docs/rollup.mdx
index 840ca64f21b2d..a5cab8c2c7904 100644
--- a/api_docs/rollup.mdx
+++ b/api_docs/rollup.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/rollup
 title: "rollup"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the rollup plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'rollup']
 ---
 import rollupObj from './rollup.devdocs.json';
diff --git a/api_docs/rule_registry.devdocs.json b/api_docs/rule_registry.devdocs.json
index fd79ee3f09e9a..a08293333c27a 100644
--- a/api_docs/rule_registry.devdocs.json
+++ b/api_docs/rule_registry.devdocs.json
@@ -399,9 +399,11 @@
                 "section": "def-common.RuleTypeParams",
                 "text": "RuleTypeParams"
               },
-              " = never>({ aggs, featureIds, index, query, search_after: searchAfter, size, sort, track_total_hits: trackTotalHits, _source, }: { aggs?: object | undefined; featureIds?: string[] | undefined; index?: string | undefined; query?: object | undefined; search_after?: (string | number)[] | undefined; size?: number | undefined; sort?: ",
+              " = never>({ aggs, featureIds, index, query, search_after: searchAfter, size, sort, track_total_hits: trackTotalHits, _source, runtimeMappings, }: { aggs?: object | undefined; featureIds?: string[] | undefined; index?: string | undefined; query?: object | undefined; search_after?: (string | number)[] | undefined; size?: number | undefined; sort?: ",
               "SortOptions",
-              "[] | undefined; track_total_hits?: number | boolean | undefined; _source?: string[] | undefined; }) => Promise<",
+              "[] | undefined; track_total_hits?: number | boolean | undefined; _source?: false | string[] | undefined; runtimeMappings?: ",
+              "MappingRuntimeFields",
+              " | undefined; }) => Promise<",
               "SearchResponse",
               "<OutputOf<SetOptional<{ readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_status_updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.consecutive_matches\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.previous_action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; readonly multi_fields: ",
               {
@@ -424,7 +426,7 @@
                 "id": "def-server.AlertsClient.find.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "{\n    aggs,\n    featureIds,\n    index,\n    query,\n    search_after: searchAfter,\n    size,\n    sort,\n    track_total_hits: trackTotalHits,\n    _source,\n  }",
+                "label": "{\n    aggs,\n    featureIds,\n    index,\n    query,\n    search_after: searchAfter,\n    size,\n    sort,\n    track_total_hits: trackTotalHits,\n    _source,\n    runtimeMappings,\n  }",
                 "description": [],
                 "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
                 "deprecated": false,
@@ -546,12 +548,180 @@
                   {
                     "parentPluginId": "ruleRegistry",
                     "id": "def-server.AlertsClient.find.$1._source",
-                    "type": "Array",
+                    "type": "CompoundType",
                     "tags": [],
                     "label": "_source",
                     "description": [],
                     "signature": [
-                      "string[] | undefined"
+                      "false | string[] | undefined"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.find.$1.runtimeMappings",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "runtimeMappings",
+                    "description": [],
+                    "signature": [
+                      "MappingRuntimeFields",
+                      " | undefined"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  }
+                ]
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "ruleRegistry",
+            "id": "def-server.AlertsClient.getGroupAggregations",
+            "type": "Function",
+            "tags": [],
+            "label": "getGroupAggregations",
+            "description": [
+              "\nPerforms a `find` query to extract aggregations on alert groups"
+            ],
+            "signature": [
+              "({ featureIds, groupByField, aggregations, filters, pageIndex, pageSize, sort, }: { featureIds: string[]; groupByField: string; aggregations?: { [x: string]: { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; } & BucketAggsSchemas & { aggs?: { [x: string]: BucketAggsSchemas & { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; }; } | undefined; aggregations?: { [x: string]: BucketAggsSchemas & { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; }; } | undefined; }; } | undefined; filters?: ",
+              "QueryDslQueryContainer",
+              "[] | undefined; sort?: ",
+              "SortCombinations",
+              "[] | undefined; pageIndex: number; pageSize: number; }) => Promise<",
+              "SearchResponse",
+              "<OutputOf<SetOptional<{ readonly \"ecs.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.risk_score\": { readonly type: \"float\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.author\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.created_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.description\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.enabled\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.from\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.interval\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.license\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.note\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.references\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.rule_name_override\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.to\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.type\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.updated_by\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.version\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.severity\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.docs_count\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.suppression.terms.field\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.suppression.terms.value\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.system_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_status_updated_at\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_user\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"@timestamp\": { readonly type: \"date\"; readonly required: true; readonly array: false; }; readonly \"event.action\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.rule.rule_type_id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.consumer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.execution.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.instance.id\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.category\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.name\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.producer\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.revision\": { readonly type: \"long\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.rule.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.status\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.alert.uuid\": { readonly type: \"keyword\"; readonly array: false; readonly required: true; }; readonly \"kibana.space_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: true; }; readonly \"event.kind\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.case_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.consecutive_matches\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.duration.us\": { readonly type: \"long\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.end\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.flapping_history\": { readonly type: \"boolean\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.last_detected\": { readonly type: \"date\"; readonly required: false; readonly array: false; }; readonly \"kibana.alert.maintenance_window_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.previous_action_group\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.reason\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; readonly multi_fields: ",
+              {
+                "pluginId": "@kbn/alerts-as-data-utils",
+                "scope": "common",
+                "docId": "kibKbnAlertsAsDataUtilsPluginApi",
+                "section": "def-common.MultiField",
+                "text": "MultiField"
+              },
+              "[]; }; readonly \"kibana.alert.rule.execution.timestamp\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.rule.parameters\": { readonly array: false; readonly type: \"flattened\"; readonly ignore_above: 4096; readonly required: false; }; readonly \"kibana.alert.rule.tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.severity_improving\": { readonly type: \"boolean\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.start\": { readonly type: \"date\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.time_range\": { readonly type: \"date_range\"; readonly format: \"epoch_millis||strict_date_optional_time\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.url\": { readonly type: \"keyword\"; readonly array: false; readonly index: false; readonly required: false; readonly ignore_above: 2048; }; readonly \"kibana.alert.workflow_assignee_ids\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.alert.workflow_status\": { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly \"kibana.alert.workflow_tags\": { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly \"kibana.version\": { readonly type: \"version\"; readonly array: false; readonly required: false; }; }>>, Record<string, ",
+              "AggregationsAggregate",
+              ">>>"
+            ],
+            "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "ruleRegistry",
+                "id": "def-server.AlertsClient.getGroupAggregations.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "{\n    featureIds,\n    groupByField,\n    aggregations,\n    filters,\n    pageIndex,\n    pageSize,\n    sort = [{ unitsCount: { order: 'desc' } }],\n  }",
+                "description": [],
+                "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "children": [
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.featureIds",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "featureIds",
+                    "description": [
+                      "\nThe feature ids the alerts belong to, used for authorization"
+                    ],
+                    "signature": [
+                      "string[]"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.groupByField",
+                    "type": "string",
+                    "tags": [],
+                    "label": "groupByField",
+                    "description": [
+                      "\nThe field to group by"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.aggregations",
+                    "type": "Object",
+                    "tags": [],
+                    "label": "aggregations",
+                    "description": [
+                      "\nThe aggregations to perform on the groupByField buckets"
+                    ],
+                    "signature": [
+                      "{ [x: string]: { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; } & BucketAggsSchemas & { aggs?: { [x: string]: BucketAggsSchemas & { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; }; } | undefined; aggregations?: { [x: string]: BucketAggsSchemas & { avg?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; cardinality?: { field?: string | undefined; precision_threshold?: number | undefined; rehash?: boolean | undefined; missing?: string | number | boolean | undefined; } | undefined; min?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; max?: { field?: string | undefined; missing?: string | number | boolean | undefined; format?: string | undefined; } | undefined; sum?: { field?: string | undefined; missing?: string | number | boolean | undefined; } | undefined; top_hits?: { explain?: boolean | undefined; docvalue_fields?: string | string[] | undefined; stored_fields?: string | string[] | undefined; from?: number | undefined; size?: number | undefined; sort?: string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; } | (string | { [x: string]: \"asc\" | \"desc\" | \"_doc\" | { missing?: string | number | boolean | undefined; mode?: \"min\" | \"max\" | \"sum\" | \"avg\" | \"median\" | undefined; order?: \"asc\" | \"desc\" | \"_doc\" | undefined; }; })[] | undefined; seq_no_primary_term?: boolean | undefined; version?: boolean | undefined; track_scores?: boolean | undefined; highlight?: any; _source?: string | boolean | string[] | undefined; } | undefined; weighted_avg?: { format?: string | undefined; value_type?: string | undefined; value?: { field?: string | undefined; missing?: number | undefined; } | undefined; weight?: { field?: string | undefined; missing?: number | undefined; } | undefined; } | undefined; }; } | undefined; }; } | undefined"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.filters",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "filters",
+                    "description": [
+                      "\nThe filters to apply to the query"
+                    ],
+                    "signature": [
+                      "QueryDslQueryContainer",
+                      "[] | undefined"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.sort",
+                    "type": "Array",
+                    "tags": [],
+                    "label": "sort",
+                    "description": [
+                      "\nAny sort options to apply to the groupByField aggregations"
+                    ],
+                    "signature": [
+                      "SortCombinations",
+                      "[] | undefined"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.pageIndex",
+                    "type": "number",
+                    "tags": [],
+                    "label": "pageIndex",
+                    "description": [
+                      "\nThe page index to start from"
+                    ],
+                    "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
+                    "deprecated": false,
+                    "trackAdoption": false
+                  },
+                  {
+                    "parentPluginId": "ruleRegistry",
+                    "id": "def-server.AlertsClient.getGroupAggregations.$1.pageSize",
+                    "type": "number",
+                    "tags": [],
+                    "label": "pageSize",
+                    "description": [
+                      "\nThe page size"
                     ],
                     "path": "x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts",
                     "deprecated": false,
diff --git a/api_docs/rule_registry.mdx b/api_docs/rule_registry.mdx
index d3415c598dfaf..d0778caa91448 100644
--- a/api_docs/rule_registry.mdx
+++ b/api_docs/rule_registry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ruleRegistry
 title: "ruleRegistry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ruleRegistry plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ruleRegistry']
 ---
 import ruleRegistryObj from './rule_registry.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/response-ops](https://github.com/orgs/elastic/teams/response-o
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 276 | 0 | 247 | 14 |
+| 286 | 0 | 249 | 14 |
 
 ## Server
 
diff --git a/api_docs/runtime_fields.mdx b/api_docs/runtime_fields.mdx
index 463344a297adb..fc469b1bdf9f4 100644
--- a/api_docs/runtime_fields.mdx
+++ b/api_docs/runtime_fields.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/runtimeFields
 title: "runtimeFields"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the runtimeFields plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'runtimeFields']
 ---
 import runtimeFieldsObj from './runtime_fields.devdocs.json';
diff --git a/api_docs/saved_objects.mdx b/api_docs/saved_objects.mdx
index 8dd068cfc5421..b4fcaecdbef71 100644
--- a/api_docs/saved_objects.mdx
+++ b/api_docs/saved_objects.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjects
 title: "savedObjects"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjects plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjects']
 ---
 import savedObjectsObj from './saved_objects.devdocs.json';
diff --git a/api_docs/saved_objects_finder.mdx b/api_docs/saved_objects_finder.mdx
index 2761967fe271d..6ab7e6becdfb1 100644
--- a/api_docs/saved_objects_finder.mdx
+++ b/api_docs/saved_objects_finder.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsFinder
 title: "savedObjectsFinder"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsFinder plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsFinder']
 ---
 import savedObjectsFinderObj from './saved_objects_finder.devdocs.json';
diff --git a/api_docs/saved_objects_management.mdx b/api_docs/saved_objects_management.mdx
index 137f7993547af..04f035cbea41b 100644
--- a/api_docs/saved_objects_management.mdx
+++ b/api_docs/saved_objects_management.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsManagement
 title: "savedObjectsManagement"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsManagement plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsManagement']
 ---
 import savedObjectsManagementObj from './saved_objects_management.devdocs.json';
diff --git a/api_docs/saved_objects_tagging.mdx b/api_docs/saved_objects_tagging.mdx
index 6b2a13c1dafdb..c4aba5bd77306 100644
--- a/api_docs/saved_objects_tagging.mdx
+++ b/api_docs/saved_objects_tagging.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTagging
 title: "savedObjectsTagging"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTagging plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTagging']
 ---
 import savedObjectsTaggingObj from './saved_objects_tagging.devdocs.json';
diff --git a/api_docs/saved_objects_tagging_oss.mdx b/api_docs/saved_objects_tagging_oss.mdx
index d6996d0e63804..492ce4fcb5e10 100644
--- a/api_docs/saved_objects_tagging_oss.mdx
+++ b/api_docs/saved_objects_tagging_oss.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedObjectsTaggingOss
 title: "savedObjectsTaggingOss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedObjectsTaggingOss plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedObjectsTaggingOss']
 ---
 import savedObjectsTaggingOssObj from './saved_objects_tagging_oss.devdocs.json';
diff --git a/api_docs/saved_search.mdx b/api_docs/saved_search.mdx
index 0c11fb18b62af..ee3b581ca164c 100644
--- a/api_docs/saved_search.mdx
+++ b/api_docs/saved_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/savedSearch
 title: "savedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the savedSearch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'savedSearch']
 ---
 import savedSearchObj from './saved_search.devdocs.json';
diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx
index fdcdd5fdee9ef..2b108c8375985 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotMode
 title: "screenshotMode"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotMode plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotMode']
 ---
 import screenshotModeObj from './screenshot_mode.devdocs.json';
diff --git a/api_docs/screenshotting.mdx b/api_docs/screenshotting.mdx
index e076dcbda5834..e5be4f65b96d0 100644
--- a/api_docs/screenshotting.mdx
+++ b/api_docs/screenshotting.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/screenshotting
 title: "screenshotting"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the screenshotting plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'screenshotting']
 ---
 import screenshottingObj from './screenshotting.devdocs.json';
diff --git a/api_docs/search_connectors.mdx b/api_docs/search_connectors.mdx
index 976df014fa7e3..0f622d71afe27 100644
--- a/api_docs/search_connectors.mdx
+++ b/api_docs/search_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchConnectors
 title: "searchConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchConnectors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchConnectors']
 ---
 import searchConnectorsObj from './search_connectors.devdocs.json';
diff --git a/api_docs/search_homepage.mdx b/api_docs/search_homepage.mdx
index 33c77dc2c2239..7fe0ca94d99a0 100644
--- a/api_docs/search_homepage.mdx
+++ b/api_docs/search_homepage.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchHomepage
 title: "searchHomepage"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchHomepage plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchHomepage']
 ---
 import searchHomepageObj from './search_homepage.devdocs.json';
diff --git a/api_docs/search_inference_endpoints.mdx b/api_docs/search_inference_endpoints.mdx
index b44e1cc4185aa..80170001eb1ad 100644
--- a/api_docs/search_inference_endpoints.mdx
+++ b/api_docs/search_inference_endpoints.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchInferenceEndpoints
 title: "searchInferenceEndpoints"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchInferenceEndpoints plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchInferenceEndpoints']
 ---
 import searchInferenceEndpointsObj from './search_inference_endpoints.devdocs.json';
diff --git a/api_docs/search_notebooks.mdx b/api_docs/search_notebooks.mdx
index 8098462573f37..67d86174c1e37 100644
--- a/api_docs/search_notebooks.mdx
+++ b/api_docs/search_notebooks.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchNotebooks
 title: "searchNotebooks"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchNotebooks plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchNotebooks']
 ---
 import searchNotebooksObj from './search_notebooks.devdocs.json';
diff --git a/api_docs/search_playground.devdocs.json b/api_docs/search_playground.devdocs.json
index 0306aa3c5780a..9acc1abcd944f 100644
--- a/api_docs/search_playground.devdocs.json
+++ b/api_docs/search_playground.devdocs.json
@@ -40,9 +40,7 @@
           "label": "PlaygroundProvider",
           "description": [],
           "signature": [
-            "React.FunctionComponent<",
-            "PlaygroundProviderProps",
-            " & { children?: React.ReactNode; }>"
+            "React.FunctionComponent<{ children?: React.ReactNode; }>"
           ],
           "path": "x-pack/plugins/search_playground/public/types.ts",
           "deprecated": false,
@@ -79,51 +77,6 @@
             }
           ]
         },
-        {
-          "parentPluginId": "searchPlayground",
-          "id": "def-public.SearchPlaygroundPluginStart.PlaygroundToolbar",
-          "type": "Function",
-          "tags": [],
-          "label": "PlaygroundToolbar",
-          "description": [],
-          "signature": [
-            "React.FunctionComponent<{ children?: React.ReactNode; }>"
-          ],
-          "path": "x-pack/plugins/search_playground/public/types.ts",
-          "deprecated": false,
-          "trackAdoption": false,
-          "returnComment": [],
-          "children": [
-            {
-              "parentPluginId": "searchPlayground",
-              "id": "def-public.SearchPlaygroundPluginStart.PlaygroundToolbar.$1",
-              "type": "CompoundType",
-              "tags": [],
-              "label": "props",
-              "description": [],
-              "signature": [
-                "P & { children?: React.ReactNode; }"
-              ],
-              "path": "node_modules/@types/react/index.d.ts",
-              "deprecated": false,
-              "trackAdoption": false
-            },
-            {
-              "parentPluginId": "searchPlayground",
-              "id": "def-public.SearchPlaygroundPluginStart.PlaygroundToolbar.$2",
-              "type": "Any",
-              "tags": [],
-              "label": "context",
-              "description": [],
-              "signature": [
-                "any"
-              ],
-              "path": "node_modules/@types/react/index.d.ts",
-              "deprecated": false,
-              "trackAdoption": false
-            }
-          ]
-        },
         {
           "parentPluginId": "searchPlayground",
           "id": "def-public.SearchPlaygroundPluginStart.Playground",
@@ -132,7 +85,9 @@
           "label": "Playground",
           "description": [],
           "signature": [
-            "React.FunctionComponent<{ children?: React.ReactNode; }>"
+            "React.FunctionComponent<",
+            "AppProps",
+            " & { children?: React.ReactNode; }>"
           ],
           "path": "x-pack/plugins/search_playground/public/types.ts",
           "deprecated": false,
diff --git a/api_docs/search_playground.mdx b/api_docs/search_playground.mdx
index e2128ff790770..193273e6d614e 100644
--- a/api_docs/search_playground.mdx
+++ b/api_docs/search_playground.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/searchPlayground
 title: "searchPlayground"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the searchPlayground plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'searchPlayground']
 ---
 import searchPlaygroundObj from './search_playground.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/search-kibana](https://github.com/orgs/elastic/teams/search-ki
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 18 | 0 | 10 | 1 |
+| 15 | 0 | 9 | 1 |
 
 ## Client
 
diff --git a/api_docs/security.devdocs.json b/api_docs/security.devdocs.json
index 65b7d3c7c4827..5d7daa39f0360 100644
--- a/api_docs/security.devdocs.json
+++ b/api_docs/security.devdocs.json
@@ -1829,8 +1829,10 @@
         "type": "Interface",
         "tags": [],
         "label": "APIKeys",
-        "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "description": [
+          "\nInterface for managing API keys in Elasticsearch, including creation,\nvalidation, and invalidation of API keys,\nas well as checking the status of API key features."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -1846,7 +1848,7 @@
             "signature": [
               "() => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -1864,7 +1866,7 @@
             "signature": [
               "() => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [],
@@ -1890,17 +1892,17 @@
               },
               "<unknown, unknown, unknown, any>, createParams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.CreateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateAPIKeyParams",
                 "text": "CreateAPIKeyParams"
               },
               ") => Promise<",
               "SecurityCreateApiKeyResponse",
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -1923,7 +1925,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -1939,14 +1941,98 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.CreateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateAPIKeyParams",
                     "text": "CreateAPIKeyParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.APIKeys.update",
+            "type": "Function",
+            "tags": [],
+            "label": "update",
+            "description": [
+              "\nAttempts update an API key with the provided 'role_descriptors' and 'metadata'\n\nReturns `updated`, `true` if the update was successful, `false` if there was nothing to update\n\nUser needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.\n"
+            ],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "@kbn/core-http-server",
+                "scope": "common",
+                "docId": "kibKbnCoreHttpServerPluginApi",
+                "section": "def-common.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, updateParams: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.UpdateAPIKeyParams",
+                "text": "UpdateAPIKeyParams"
+              },
+              ") => Promise<",
+              "SecurityUpdateApiKeyResponse",
+              " | null>"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false,
+            "children": [
+              {
+                "parentPluginId": "security",
+                "id": "def-server.APIKeys.update.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [
+                  "Request instance."
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-http-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreHttpServerPluginApi",
+                    "section": "def-common.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+                "deprecated": false,
+                "trackAdoption": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "security",
+                "id": "def-server.APIKeys.update.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "updateParams",
+                "description": [
+                  "The params to edit an API key"
+                ],
+                "signature": [
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.UpdateAPIKeyParams",
+                    "text": "UpdateAPIKeyParams"
+                  }
+                ],
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -1972,17 +2058,33 @@
                 "section": "def-common.KibanaRequest",
                 "text": "KibanaRequest"
               },
-              "<unknown, unknown, unknown, any>, createParams: Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>) => Promise<",
+              "<unknown, unknown, unknown, any>, createParams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.GrantAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyParams",
+                "text": "CreateRestAPIKeyParams"
+              },
+              " | ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.GrantAPIKeyResult",
                 "text": "GrantAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -2005,7 +2107,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2020,9 +2122,23 @@
                   "Create operation parameters."
                 ],
                 "signature": [
-                  "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }>"
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyParams",
+                    "text": "CreateRestAPIKeyParams"
+                  },
+                  " | ",
+                  {
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+                    "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+                  }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2042,15 +2158,15 @@
             "signature": [
               "(apiKeyPrams: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.ValidateAPIKeyParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ValidateAPIKeyParams",
                 "text": "ValidateAPIKeyParams"
               },
               ") => Promise<boolean>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -2065,14 +2181,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.ValidateAPIKeyParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.ValidateAPIKeyParams",
                     "text": "ValidateAPIKeyParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2100,23 +2216,23 @@
               },
               "<unknown, unknown, unknown, any>, params: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeysParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
                 "text": "InvalidateAPIKeysParams"
               },
               ") => Promise<",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
                 "text": "InvalidateAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -2139,7 +2255,7 @@
                   },
                   "<unknown, unknown, unknown, any>"
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2155,14 +2271,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.InvalidateAPIKeysParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
                     "text": "InvalidateAPIKeysParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2182,23 +2298,23 @@
             "signature": [
               "(params: ",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeysParams",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeysParams",
                 "text": "InvalidateAPIKeysParams"
               },
               ") => Promise<",
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.InvalidateAPIKeyResult",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.InvalidateAPIKeyResult",
                 "text": "InvalidateAPIKeyResult"
               },
               " | null>"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false,
             "children": [
@@ -2213,14 +2329,14 @@
                 ],
                 "signature": [
                   {
-                    "pluginId": "@kbn/security-plugin-types-server",
-                    "scope": "server",
-                    "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                    "section": "def-server.InvalidateAPIKeysParams",
+                    "pluginId": "@kbn/core-security-server",
+                    "scope": "common",
+                    "docId": "kibKbnCoreSecurityServerPluginApi",
+                    "section": "def-common.InvalidateAPIKeysParams",
                     "text": "InvalidateAPIKeysParams"
                   }
                 ],
-                "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+                "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
                 "deprecated": false,
                 "trackAdoption": false,
                 "isRequired": true
@@ -2984,10 +3100,10 @@
             "description": [],
             "signature": [
               {
-                "pluginId": "@kbn/security-plugin-types-server",
-                "scope": "server",
-                "docId": "kibKbnSecurityPluginTypesServerPluginApi",
-                "section": "def-server.APIKeys",
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.APIKeys",
                 "text": "APIKeys"
               }
             ],
@@ -3985,51 +4101,79 @@
       },
       {
         "parentPluginId": "security",
-        "id": "def-server.GrantAPIKeyResult",
+        "id": "def-server.CreateCrossClusterAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "GrantAPIKeyResult",
+        "label": "CreateCrossClusterAPIKeyParams",
         "description": [],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "security",
-            "id": "def-server.GrantAPIKeyResult.id",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.type",
             "type": "string",
             "tags": [],
-            "label": "id",
-            "description": [
-              "\nUnique id for this API key"
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"cross_cluster\""
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.GrantAPIKeyResult.name",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.expiration",
             "type": "string",
             "tags": [],
-            "label": "name",
-            "description": [
-              "\nName for this API key"
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.GrantAPIKeyResult.api_key",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.name",
             "type": "string",
             "tags": [],
-            "label": "api_key",
-            "description": [
-              "\nGenerated API key"
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateCrossClusterAPIKeyParams.access",
+            "type": "Object",
+            "tags": [],
+            "label": "access",
+            "description": [],
+            "signature": [
+              "{ search?: { names: string[]; query?: unknown; field_security?: unknown; allow_restricted_indices?: boolean | undefined; }[] | undefined; replication?: { names: string[]; }[] | undefined; }"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4038,78 +4182,395 @@
       },
       {
         "parentPluginId": "security",
-        "id": "def-server.InvalidateAPIKeyResult",
+        "id": "def-server.CreateRestAPIKeyParams",
         "type": "Interface",
         "tags": [],
-        "label": "InvalidateAPIKeyResult",
-        "description": [
-          "\nThe return value when invalidating an API key in Elasticsearch."
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "label": "CreateRestAPIKeyParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
           {
             "parentPluginId": "security",
-            "id": "def-server.InvalidateAPIKeyResult.invalidated_api_keys",
-            "type": "Array",
+            "id": "def-server.CreateRestAPIKeyParams.type",
+            "type": "string",
             "tags": [],
-            "label": "invalidated_api_keys",
-            "description": [
-              "\nThe IDs of the API keys that were invalidated as part of the request."
-            ],
+            "label": "type",
+            "description": [],
             "signature": [
-              "string[]"
+              "\"rest\" | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.InvalidateAPIKeyResult.previously_invalidated_api_keys",
-            "type": "Array",
+            "id": "def-server.CreateRestAPIKeyParams.expiration",
+            "type": "string",
             "tags": [],
-            "label": "previously_invalidated_api_keys",
-            "description": [
-              "\nThe IDs of the API keys that were already invalidated."
-            ],
+            "label": "expiration",
+            "description": [],
             "signature": [
-              "string[]"
+              "string | undefined"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.InvalidateAPIKeyResult.error_count",
-            "type": "number",
+            "id": "def-server.CreateRestAPIKeyParams.name",
+            "type": "string",
             "tags": [],
-            "label": "error_count",
-            "description": [
-              "\nThe number of errors that were encountered when invalidating the API keys."
-            ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.InvalidateAPIKeyResult.error_details",
-            "type": "Array",
+            "id": "def-server.CreateRestAPIKeyParams.role_descriptors",
+            "type": "Object",
             "tags": [],
-            "label": "error_details",
-            "description": [
-              "\nDetails about these errors. This field is not present in the response when error_count is 0."
-            ],
+            "label": "role_descriptors",
+            "description": [],
             "signature": [
-              "{ type?: string | undefined; reason?: string | undefined; caused_by?: { type?: string | undefined; reason?: string | undefined; } | undefined; }[] | undefined"
+              "{ [x: string]: { [key: string]: any; }; }"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
-          }
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams",
+        "type": "Interface",
+        "tags": [],
+        "label": "CreateRestAPIKeyWithKibanaPrivilegesParams",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "signature": [
+              "\"rest\" | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.expiration",
+            "type": "string",
+            "tags": [],
+            "label": "expiration",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.metadata",
+            "type": "Object",
+            "tags": [],
+            "label": "metadata",
+            "description": [],
+            "signature": [
+              "{ [key: string]: any; } | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams.kibana_role_descriptors",
+            "type": "Object",
+            "tags": [],
+            "label": "kibana_role_descriptors",
+            "description": [],
+            "signature": [
+              "{ [x: string]: { elasticsearch: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.ElasticsearchPrivilegesType",
+                "text": "ElasticsearchPrivilegesType"
+              },
+              " & { [key: string]: unknown; }; kibana: ",
+              {
+                "pluginId": "@kbn/core-security-server",
+                "scope": "common",
+                "docId": "kibKbnCoreSecurityServerPluginApi",
+                "section": "def-common.KibanaPrivilegesType",
+                "text": "KibanaPrivilegesType"
+              },
+              "; }; }"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.ElasticsearchPrivilegesType",
+        "type": "Interface",
+        "tags": [],
+        "label": "ElasticsearchPrivilegesType",
+        "description": [
+          "\nType representing Elasticsearch specific portion of the role definition."
+        ],
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.ElasticsearchPrivilegesType.cluster",
+            "type": "Array",
+            "tags": [],
+            "label": "cluster",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.ElasticsearchPrivilegesType.remote_cluster",
+            "type": "Array",
+            "tags": [],
+            "label": "remote_cluster",
+            "description": [],
+            "signature": [
+              "{ privileges: string[]; clusters: string[]; }[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.ElasticsearchPrivilegesType.indices",
+            "type": "Array",
+            "tags": [],
+            "label": "indices",
+            "description": [],
+            "signature": [
+              "{ names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.ElasticsearchPrivilegesType.remote_indices",
+            "type": "Array",
+            "tags": [],
+            "label": "remote_indices",
+            "description": [],
+            "signature": [
+              "{ clusters: string[]; names: string[]; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; privileges: string[]; query?: string | undefined; allow_restricted_indices?: boolean | undefined; }[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.ElasticsearchPrivilegesType.run_as",
+            "type": "Array",
+            "tags": [],
+            "label": "run_as",
+            "description": [],
+            "signature": [
+              "string[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/roles/schema.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.GrantAPIKeyResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "GrantAPIKeyResult",
+        "description": [],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.GrantAPIKeyResult.id",
+            "type": "string",
+            "tags": [],
+            "label": "id",
+            "description": [
+              "\nUnique id for this API key"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.GrantAPIKeyResult.name",
+            "type": "string",
+            "tags": [],
+            "label": "name",
+            "description": [
+              "\nName for this API key"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.GrantAPIKeyResult.api_key",
+            "type": "string",
+            "tags": [],
+            "label": "api_key",
+            "description": [
+              "\nGenerated API key"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.InvalidateAPIKeyResult",
+        "type": "Interface",
+        "tags": [],
+        "label": "InvalidateAPIKeyResult",
+        "description": [
+          "\nThe return value when invalidating an API key in Elasticsearch."
+        ],
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+        "deprecated": false,
+        "trackAdoption": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.InvalidateAPIKeyResult.invalidated_api_keys",
+            "type": "Array",
+            "tags": [],
+            "label": "invalidated_api_keys",
+            "description": [
+              "\nThe IDs of the API keys that were invalidated as part of the request."
+            ],
+            "signature": [
+              "string[]"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.InvalidateAPIKeyResult.previously_invalidated_api_keys",
+            "type": "Array",
+            "tags": [],
+            "label": "previously_invalidated_api_keys",
+            "description": [
+              "\nThe IDs of the API keys that were already invalidated."
+            ],
+            "signature": [
+              "string[]"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.InvalidateAPIKeyResult.error_count",
+            "type": "number",
+            "tags": [],
+            "label": "error_count",
+            "description": [
+              "\nThe number of errors that were encountered when invalidating the API keys."
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.InvalidateAPIKeyResult.error_details",
+            "type": "Array",
+            "tags": [],
+            "label": "error_details",
+            "description": [
+              "\nDetails about these errors. This field is not present in the response when error_count is 0."
+            ],
+            "signature": [
+              "{ type?: string | undefined; reason?: string | undefined; caused_by?: { type?: string | undefined; reason?: string | undefined; } | undefined; }[] | undefined"
+            ],
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          }
         ],
         "initialIsOpen": false
       },
@@ -4122,7 +4583,7 @@
         "description": [
           "\nRepresents the params for invalidating multiple API keys"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -4132,11 +4593,13 @@
             "type": "Array",
             "tags": [],
             "label": "ids",
-            "description": [],
+            "description": [
+              "\nList of unique API key IDs"
+            ],
             "signature": [
               "string[]"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -4734,7 +5197,7 @@
         "description": [
           "\nRepresents the parameters for validating API Key credentials."
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "children": [
@@ -4747,7 +5210,7 @@
             "description": [
               "\nUnique id for this API key"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           },
@@ -4760,7 +5223,7 @@
             "description": [
               "\nGenerated API Key (secret)"
             ],
-            "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+            "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
             "deprecated": false,
             "trackAdoption": false
           }
@@ -5092,9 +5555,31 @@
         "label": "CreateAPIKeyParams",
         "description": [],
         "signature": [
-          "Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; role_descriptors: Record<string, Readonly<{} & {}>>; }> | Readonly<{ type?: \"rest\" | undefined; metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { name: string; kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }> | Readonly<{ metadata?: Readonly<{} & {}> | undefined; expiration?: string | undefined; } & { type: \"cross_cluster\"; name: string; access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }>"
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyParams",
+            "text": "CreateRestAPIKeyParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateRestAPIKeyWithKibanaPrivilegesParams",
+            "text": "CreateRestAPIKeyWithKibanaPrivilegesParams"
+          },
+          " | ",
+          {
+            "pluginId": "@kbn/core-security-server",
+            "scope": "common",
+            "docId": "kibKbnCoreSecurityServerPluginApi",
+            "section": "def-common.CreateCrossClusterAPIKeyParams",
+            "text": "CreateCrossClusterAPIKeyParams"
+          }
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -5111,67 +5596,7 @@
         "signature": [
           "SecurityCreateApiKeyResponse"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "security",
-        "id": "def-server.CreateCrossClusterAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateCrossClusterAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly type: \"cross_cluster\"; readonly name: string; readonly access: Readonly<{ search?: Readonly<{ query?: any; field_security?: any; allow_restricted_indices?: boolean | undefined; } & { names: string[]; }>[] | undefined; replication?: Readonly<{} & { names: string[]; }>[] | undefined; } & {}>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "security",
-        "id": "def-server.CreateRestAPIKeyParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateRestAPIKeyParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly name: string; readonly role_descriptors: Record<string, Readonly<{} & {}>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "security",
-        "id": "def-server.CreateRestAPIKeyWithKibanaPrivilegesParams",
-        "type": "Type",
-        "tags": [],
-        "label": "CreateRestAPIKeyWithKibanaPrivilegesParams",
-        "description": [],
-        "signature": [
-          "{ readonly type?: \"rest\" | undefined; readonly metadata?: Readonly<{} & {}> | undefined; readonly expiration?: string | undefined; readonly name: string; readonly kibana_role_descriptors: Record<string, Readonly<{} & { kibana: Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]; elasticsearch: Readonly<{ cluster?: string[] | undefined; indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; run_as?: string[] | undefined; } & {}>; }>>; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts",
-        "deprecated": false,
-        "trackAdoption": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "security",
-        "id": "def-server.ElasticsearchPrivilegesType",
-        "type": "Type",
-        "tags": [],
-        "label": "ElasticsearchPrivilegesType",
-        "description": [],
-        "signature": [
-          "{ readonly cluster?: string[] | undefined; readonly indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; }>[] | undefined; readonly remote_cluster?: Readonly<{} & { privileges: string[]; clusters: string[]; }>[] | undefined; readonly remote_indices?: Readonly<{ query?: string | undefined; field_security?: Record<\"except\" | \"grant\", string[]> | undefined; allow_restricted_indices?: boolean | undefined; } & { names: string[]; privileges: string[]; clusters: string[]; }>[] | undefined; readonly run_as?: string[] | undefined; }"
-        ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/role_schema.ts",
+        "path": "packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -5182,11 +5607,13 @@
         "type": "Type",
         "tags": [],
         "label": "KibanaPrivilegesType",
-        "description": [],
+        "description": [
+          "\nType representing Kibana specific portion of the role definition."
+        ],
         "signature": [
-          "Readonly<{ base?: string[] | undefined; feature?: Record<string, string[]> | undefined; } & { spaces: string[] | \"*\"[]; }>[]"
+          "{ spaces: string[]; base?: string[] | undefined; feature?: Record<string, string[]> | undefined; }[]"
         ],
-        "path": "x-pack/packages/security/plugin_types_server/src/authorization/role_schema.ts",
+        "path": "packages/core/security/core-security-server/src/roles/schema.ts",
         "deprecated": false,
         "trackAdoption": false,
         "initialIsOpen": false
@@ -5312,41 +5739,13 @@
           "deprecated": true,
           "trackAdoption": false,
           "references": [
-            {
-              "plugin": "encryptedSavedObjects",
-              "path": "x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts"
-            },
-            {
-              "plugin": "encryptedSavedObjects",
-              "path": "x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts"
-            },
             {
               "plugin": "ml",
               "path": "x-pack/plugins/ml/server/routes/annotations.ts"
             },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/request_context_factory.ts"
-            },
             {
               "plugin": "securitySolution",
               "path": "x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts"
             }
           ]
         },
@@ -5499,30 +5898,6 @@
               "plugin": "enterpriseSearch",
               "path": "x-pack/plugins/enterprise_search/server/routes/enterprise_search/api_keys.ts"
             },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts"
-            },
             {
               "plugin": "serverlessSearch",
               "path": "x-pack/plugins/serverless_search/server/routes/api_key_routes.ts"
@@ -5622,30 +5997,6 @@
             {
               "plugin": "fleet",
               "path": "x-pack/plugins/fleet/server/routes/setup/handlers.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/list.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/actions/state.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/endpoint/routes/suggestions/index.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lists_integration/endpoint/validators/base_validator.test.ts"
-            },
-            {
-              "plugin": "securitySolution",
-              "path": "x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts"
             }
           ]
         },
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index 43bd8e5f9cf77..ee72de420f716 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/security
 title: "security"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the security plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'security']
 ---
 import securityObj from './security.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-security](https://github.com/orgs/elastic/teams/kibana-
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 415 | 0 | 206 | 1 |
+| 438 | 0 | 222 | 1 |
 
 ## Client
 
diff --git a/api_docs/security_solution.devdocs.json b/api_docs/security_solution.devdocs.json
index e07a045ba7722..b5d8334c5d5b0 100644
--- a/api_docs/security_solution.devdocs.json
+++ b/api_docs/security_solution.devdocs.json
@@ -485,7 +485,7 @@
               "\nExperimental flag needed to enable the link"
             ],
             "signature": [
-              "\"assistantKnowledgeBaseByDefault\" | \"assistantModelEvaluation\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"responseActionsSentinelOneGetFileEnabled\" | \"responseActionsCrowdstrikeManualHostIsolationEnabled\" | \"responseActionScanEnabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutDisabled\" | \"securitySolutionNotesEnabled\" | \"entityAlertPreviewEnabled\" | \"newUserDetailsFlyoutManagedUser\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"AIAssistantOnRuleCreationFormEnabled\" | \"disableTimelineSaveTour\" | \"alertSuppressionForEsqlRuleEnabled\" | \"riskEnginePrivilegesRouteEnabled\" | \"alertSuppressionForMachineLearningRuleEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jamfDataInAnalyzerEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"prebuiltRulesCustomizationEnabled\" | \"malwareOnWriteScanOptionAvailable\" | \"unifiedManifestEnabled\" | \"aiAssistantFlyoutMode\" | \"valueListItemsModalEnabled\" | \"bulkCustomHighlightedFieldsEnabled\" | \"manualRuleRunEnabled\" | \"filterProcessDescendantsForEventFiltersEnabled\" | undefined"
+              "\"assistantKnowledgeBaseByDefault\" | \"assistantModelEvaluation\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"responseActionsSentinelOneGetFileEnabled\" | \"responseActionsSentinelOneKillProcessEnabled\" | \"responseActionsCrowdstrikeManualHostIsolationEnabled\" | \"responseActionScanEnabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutDisabled\" | \"securitySolutionNotesEnabled\" | \"entityAlertPreviewEnabled\" | \"newUserDetailsFlyoutManagedUser\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"AIAssistantOnRuleCreationFormEnabled\" | \"disableTimelineSaveTour\" | \"alertSuppressionForEsqlRuleEnabled\" | \"riskEnginePrivilegesRouteEnabled\" | \"alertSuppressionForMachineLearningRuleEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jamfDataInAnalyzerEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"prebuiltRulesCustomizationEnabled\" | \"malwareOnWriteScanOptionAvailable\" | \"unifiedManifestEnabled\" | \"valueListItemsModalEnabled\" | \"bulkCustomHighlightedFieldsEnabled\" | \"manualRuleRunEnabled\" | \"filterProcessDescendantsForEventFiltersEnabled\" | undefined"
             ],
             "path": "x-pack/plugins/security_solution/public/common/links/types.ts",
             "deprecated": false,
@@ -565,7 +565,7 @@
               "\nExperimental flag needed to disable the link. Opposite of experimentalKey"
             ],
             "signature": [
-              "\"assistantKnowledgeBaseByDefault\" | \"assistantModelEvaluation\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"responseActionsSentinelOneGetFileEnabled\" | \"responseActionsCrowdstrikeManualHostIsolationEnabled\" | \"responseActionScanEnabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutDisabled\" | \"securitySolutionNotesEnabled\" | \"entityAlertPreviewEnabled\" | \"newUserDetailsFlyoutManagedUser\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"AIAssistantOnRuleCreationFormEnabled\" | \"disableTimelineSaveTour\" | \"alertSuppressionForEsqlRuleEnabled\" | \"riskEnginePrivilegesRouteEnabled\" | \"alertSuppressionForMachineLearningRuleEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jamfDataInAnalyzerEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"prebuiltRulesCustomizationEnabled\" | \"malwareOnWriteScanOptionAvailable\" | \"unifiedManifestEnabled\" | \"aiAssistantFlyoutMode\" | \"valueListItemsModalEnabled\" | \"bulkCustomHighlightedFieldsEnabled\" | \"manualRuleRunEnabled\" | \"filterProcessDescendantsForEventFiltersEnabled\" | undefined"
+              "\"assistantKnowledgeBaseByDefault\" | \"assistantModelEvaluation\" | \"excludePoliciesInFilterEnabled\" | \"kubernetesEnabled\" | \"donutChartEmbeddablesEnabled\" | \"previewTelemetryUrlEnabled\" | \"extendedRuleExecutionLoggingEnabled\" | \"socTrendsEnabled\" | \"responseActionsEnabled\" | \"endpointResponseActionsEnabled\" | \"responseActionUploadEnabled\" | \"automatedProcessActionsEnabled\" | \"responseActionsSentinelOneV1Enabled\" | \"responseActionsSentinelOneV2Enabled\" | \"responseActionsSentinelOneGetFileEnabled\" | \"responseActionsSentinelOneKillProcessEnabled\" | \"responseActionsCrowdstrikeManualHostIsolationEnabled\" | \"responseActionScanEnabled\" | \"alertsPageChartsEnabled\" | \"alertTypeEnabled\" | \"expandableFlyoutDisabled\" | \"securitySolutionNotesEnabled\" | \"entityAlertPreviewEnabled\" | \"newUserDetailsFlyoutManagedUser\" | \"riskScoringPersistence\" | \"riskScoringRoutesEnabled\" | \"esqlRulesDisabled\" | \"protectionUpdatesEnabled\" | \"AIAssistantOnRuleCreationFormEnabled\" | \"disableTimelineSaveTour\" | \"alertSuppressionForEsqlRuleEnabled\" | \"riskEnginePrivilegesRouteEnabled\" | \"alertSuppressionForMachineLearningRuleEnabled\" | \"sentinelOneDataInAnalyzerEnabled\" | \"sentinelOneManualHostActionsEnabled\" | \"crowdstrikeDataInAnalyzerEnabled\" | \"jamfDataInAnalyzerEnabled\" | \"timelineEsqlTabDisabled\" | \"unifiedComponentsInTimelineEnabled\" | \"analyzerDatePickersAndSourcererDisabled\" | \"prebuiltRulesCustomizationEnabled\" | \"malwareOnWriteScanOptionAvailable\" | \"unifiedManifestEnabled\" | \"valueListItemsModalEnabled\" | \"bulkCustomHighlightedFieldsEnabled\" | \"manualRuleRunEnabled\" | \"filterProcessDescendantsForEventFiltersEnabled\" | undefined"
             ],
             "path": "x-pack/plugins/security_solution/public/common/links/types.ts",
             "deprecated": false,
@@ -1964,7 +1964,7 @@
           "label": "experimentalFeatures",
           "description": [],
           "signature": [
-            "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly aiAssistantFlyoutMode: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
+            "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsSentinelOneKillProcessEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
           ],
           "path": "x-pack/plugins/security_solution/public/types.ts",
           "deprecated": false,
@@ -3071,7 +3071,7 @@
             "\nThe security solution generic experimental features"
           ],
           "signature": [
-            "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly aiAssistantFlyoutMode: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
+            "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsSentinelOneKillProcessEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
           ],
           "path": "x-pack/plugins/security_solution/server/plugin_contract.ts",
           "deprecated": false,
@@ -3247,7 +3247,7 @@
         "label": "ExperimentalFeatures",
         "description": [],
         "signature": [
-          "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly aiAssistantFlyoutMode: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
+          "{ readonly excludePoliciesInFilterEnabled: boolean; readonly kubernetesEnabled: boolean; readonly donutChartEmbeddablesEnabled: boolean; readonly previewTelemetryUrlEnabled: boolean; readonly extendedRuleExecutionLoggingEnabled: boolean; readonly socTrendsEnabled: boolean; readonly responseActionsEnabled: boolean; readonly endpointResponseActionsEnabled: boolean; readonly responseActionUploadEnabled: boolean; readonly automatedProcessActionsEnabled: boolean; readonly responseActionsSentinelOneV1Enabled: boolean; readonly responseActionsSentinelOneV2Enabled: boolean; readonly responseActionsSentinelOneGetFileEnabled: boolean; readonly responseActionsSentinelOneKillProcessEnabled: boolean; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: boolean; readonly responseActionScanEnabled: boolean; readonly alertsPageChartsEnabled: boolean; readonly alertTypeEnabled: boolean; readonly expandableFlyoutDisabled: boolean; readonly securitySolutionNotesEnabled: boolean; readonly entityAlertPreviewEnabled: boolean; readonly assistantModelEvaluation: boolean; readonly assistantKnowledgeBaseByDefault: boolean; readonly newUserDetailsFlyoutManagedUser: boolean; readonly riskScoringPersistence: boolean; readonly riskScoringRoutesEnabled: boolean; readonly esqlRulesDisabled: boolean; readonly protectionUpdatesEnabled: boolean; readonly AIAssistantOnRuleCreationFormEnabled: boolean; readonly disableTimelineSaveTour: boolean; readonly alertSuppressionForEsqlRuleEnabled: boolean; readonly riskEnginePrivilegesRouteEnabled: boolean; readonly alertSuppressionForMachineLearningRuleEnabled: boolean; readonly sentinelOneDataInAnalyzerEnabled: boolean; readonly sentinelOneManualHostActionsEnabled: boolean; readonly crowdstrikeDataInAnalyzerEnabled: boolean; readonly jamfDataInAnalyzerEnabled: boolean; readonly timelineEsqlTabDisabled: boolean; readonly unifiedComponentsInTimelineEnabled: boolean; readonly analyzerDatePickersAndSourcererDisabled: boolean; readonly prebuiltRulesCustomizationEnabled: boolean; readonly malwareOnWriteScanOptionAvailable: boolean; readonly unifiedManifestEnabled: boolean; readonly valueListItemsModalEnabled: boolean; readonly bulkCustomHighlightedFieldsEnabled: boolean; readonly manualRuleRunEnabled: boolean; readonly filterProcessDescendantsForEventFiltersEnabled: boolean; }"
         ],
         "path": "x-pack/plugins/security_solution/common/experimental_features.ts",
         "deprecated": false,
@@ -3313,7 +3313,7 @@
           "\nA list of allowed values that can be used in `xpack.securitySolution.enableExperimental`.\nThis object is then used to validate and parse the value entered."
         ],
         "signature": [
-          "{ readonly excludePoliciesInFilterEnabled: false; readonly kubernetesEnabled: true; readonly donutChartEmbeddablesEnabled: false; readonly previewTelemetryUrlEnabled: false; readonly extendedRuleExecutionLoggingEnabled: false; readonly socTrendsEnabled: false; readonly responseActionsEnabled: true; readonly endpointResponseActionsEnabled: true; readonly responseActionUploadEnabled: true; readonly automatedProcessActionsEnabled: true; readonly responseActionsSentinelOneV1Enabled: true; readonly responseActionsSentinelOneV2Enabled: true; readonly responseActionsSentinelOneGetFileEnabled: true; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: true; readonly responseActionScanEnabled: false; readonly alertsPageChartsEnabled: true; readonly alertTypeEnabled: false; readonly expandableFlyoutDisabled: false; readonly securitySolutionNotesEnabled: false; readonly entityAlertPreviewEnabled: false; readonly assistantModelEvaluation: false; readonly assistantKnowledgeBaseByDefault: false; readonly newUserDetailsFlyoutManagedUser: false; readonly riskScoringPersistence: true; readonly riskScoringRoutesEnabled: true; readonly esqlRulesDisabled: false; readonly protectionUpdatesEnabled: true; readonly AIAssistantOnRuleCreationFormEnabled: false; readonly disableTimelineSaveTour: false; readonly alertSuppressionForEsqlRuleEnabled: false; readonly riskEnginePrivilegesRouteEnabled: true; readonly alertSuppressionForMachineLearningRuleEnabled: false; readonly sentinelOneDataInAnalyzerEnabled: true; readonly sentinelOneManualHostActionsEnabled: true; readonly crowdstrikeDataInAnalyzerEnabled: true; readonly jamfDataInAnalyzerEnabled: false; readonly timelineEsqlTabDisabled: false; readonly unifiedComponentsInTimelineEnabled: false; readonly analyzerDatePickersAndSourcererDisabled: false; readonly prebuiltRulesCustomizationEnabled: false; readonly malwareOnWriteScanOptionAvailable: true; readonly unifiedManifestEnabled: true; readonly aiAssistantFlyoutMode: true; readonly valueListItemsModalEnabled: true; readonly bulkCustomHighlightedFieldsEnabled: false; readonly manualRuleRunEnabled: false; readonly filterProcessDescendantsForEventFiltersEnabled: false; }"
+          "{ readonly excludePoliciesInFilterEnabled: false; readonly kubernetesEnabled: true; readonly donutChartEmbeddablesEnabled: false; readonly previewTelemetryUrlEnabled: false; readonly extendedRuleExecutionLoggingEnabled: false; readonly socTrendsEnabled: false; readonly responseActionsEnabled: true; readonly endpointResponseActionsEnabled: true; readonly responseActionUploadEnabled: true; readonly automatedProcessActionsEnabled: true; readonly responseActionsSentinelOneV1Enabled: true; readonly responseActionsSentinelOneV2Enabled: true; readonly responseActionsSentinelOneGetFileEnabled: true; readonly responseActionsSentinelOneKillProcessEnabled: false; readonly responseActionsCrowdstrikeManualHostIsolationEnabled: true; readonly responseActionScanEnabled: false; readonly alertsPageChartsEnabled: true; readonly alertTypeEnabled: false; readonly expandableFlyoutDisabled: false; readonly securitySolutionNotesEnabled: false; readonly entityAlertPreviewEnabled: false; readonly assistantModelEvaluation: false; readonly assistantKnowledgeBaseByDefault: false; readonly newUserDetailsFlyoutManagedUser: false; readonly riskScoringPersistence: true; readonly riskScoringRoutesEnabled: true; readonly esqlRulesDisabled: false; readonly protectionUpdatesEnabled: true; readonly AIAssistantOnRuleCreationFormEnabled: false; readonly disableTimelineSaveTour: false; readonly alertSuppressionForEsqlRuleEnabled: false; readonly riskEnginePrivilegesRouteEnabled: true; readonly alertSuppressionForMachineLearningRuleEnabled: false; readonly sentinelOneDataInAnalyzerEnabled: true; readonly sentinelOneManualHostActionsEnabled: true; readonly crowdstrikeDataInAnalyzerEnabled: true; readonly jamfDataInAnalyzerEnabled: false; readonly timelineEsqlTabDisabled: false; readonly unifiedComponentsInTimelineEnabled: false; readonly analyzerDatePickersAndSourcererDisabled: false; readonly prebuiltRulesCustomizationEnabled: false; readonly malwareOnWriteScanOptionAvailable: true; readonly unifiedManifestEnabled: true; readonly valueListItemsModalEnabled: true; readonly bulkCustomHighlightedFieldsEnabled: false; readonly manualRuleRunEnabled: false; readonly filterProcessDescendantsForEventFiltersEnabled: false; }"
         ],
         "path": "x-pack/plugins/security_solution/common/experimental_features.ts",
         "deprecated": false,
diff --git a/api_docs/security_solution.mdx b/api_docs/security_solution.mdx
index fe91f2f4d81f4..b83ae20ff02b2 100644
--- a/api_docs/security_solution.mdx
+++ b/api_docs/security_solution.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolution
 title: "securitySolution"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolution plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolution']
 ---
 import securitySolutionObj from './security_solution.devdocs.json';
diff --git a/api_docs/security_solution_ess.mdx b/api_docs/security_solution_ess.mdx
index 62590f6edbb05..de3bb64f52ced 100644
--- a/api_docs/security_solution_ess.mdx
+++ b/api_docs/security_solution_ess.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionEss
 title: "securitySolutionEss"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionEss plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionEss']
 ---
 import securitySolutionEssObj from './security_solution_ess.devdocs.json';
diff --git a/api_docs/security_solution_serverless.mdx b/api_docs/security_solution_serverless.mdx
index 92590b2dd088c..3242828d62e87 100644
--- a/api_docs/security_solution_serverless.mdx
+++ b/api_docs/security_solution_serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/securitySolutionServerless
 title: "securitySolutionServerless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the securitySolutionServerless plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'securitySolutionServerless']
 ---
 import securitySolutionServerlessObj from './security_solution_serverless.devdocs.json';
diff --git a/api_docs/serverless.mdx b/api_docs/serverless.mdx
index dae6ab27d0f52..a0de5bcc4cf91 100644
--- a/api_docs/serverless.mdx
+++ b/api_docs/serverless.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverless
 title: "serverless"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverless plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverless']
 ---
 import serverlessObj from './serverless.devdocs.json';
diff --git a/api_docs/serverless_observability.mdx b/api_docs/serverless_observability.mdx
index 7452b0349dca7..e64f97973a9dc 100644
--- a/api_docs/serverless_observability.mdx
+++ b/api_docs/serverless_observability.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessObservability
 title: "serverlessObservability"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessObservability plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessObservability']
 ---
 import serverlessObservabilityObj from './serverless_observability.devdocs.json';
diff --git a/api_docs/serverless_search.mdx b/api_docs/serverless_search.mdx
index f65f7938a0ea9..09f2c7edcf5da 100644
--- a/api_docs/serverless_search.mdx
+++ b/api_docs/serverless_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/serverlessSearch
 title: "serverlessSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the serverlessSearch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'serverlessSearch']
 ---
 import serverlessSearchObj from './serverless_search.devdocs.json';
diff --git a/api_docs/session_view.mdx b/api_docs/session_view.mdx
index 886ce136a936e..f7b44f92491a4 100644
--- a/api_docs/session_view.mdx
+++ b/api_docs/session_view.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/sessionView
 title: "sessionView"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the sessionView plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'sessionView']
 ---
 import sessionViewObj from './session_view.devdocs.json';
diff --git a/api_docs/share.mdx b/api_docs/share.mdx
index 99d016576c26a..264403c94db1f 100644
--- a/api_docs/share.mdx
+++ b/api_docs/share.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/share
 title: "share"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the share plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'share']
 ---
 import shareObj from './share.devdocs.json';
diff --git a/api_docs/slo.mdx b/api_docs/slo.mdx
index bcdff116e9e0c..f2cb7a913790a 100644
--- a/api_docs/slo.mdx
+++ b/api_docs/slo.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/slo
 title: "slo"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the slo plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'slo']
 ---
 import sloObj from './slo.devdocs.json';
diff --git a/api_docs/snapshot_restore.mdx b/api_docs/snapshot_restore.mdx
index 1e66ffb9619c9..530b22186bb50 100644
--- a/api_docs/snapshot_restore.mdx
+++ b/api_docs/snapshot_restore.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/snapshotRestore
 title: "snapshotRestore"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the snapshotRestore plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'snapshotRestore']
 ---
 import snapshotRestoreObj from './snapshot_restore.devdocs.json';
diff --git a/api_docs/spaces.mdx b/api_docs/spaces.mdx
index 3a4797b07f393..a475fdea0ff3c 100644
--- a/api_docs/spaces.mdx
+++ b/api_docs/spaces.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/spaces
 title: "spaces"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the spaces plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'spaces']
 ---
 import spacesObj from './spaces.devdocs.json';
diff --git a/api_docs/stack_alerts.mdx b/api_docs/stack_alerts.mdx
index 8b24bcddc2ecb..49ee40840fb95 100644
--- a/api_docs/stack_alerts.mdx
+++ b/api_docs/stack_alerts.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackAlerts
 title: "stackAlerts"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackAlerts plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackAlerts']
 ---
 import stackAlertsObj from './stack_alerts.devdocs.json';
diff --git a/api_docs/stack_connectors.mdx b/api_docs/stack_connectors.mdx
index fba2360abee83..9ef3fb6e5248e 100644
--- a/api_docs/stack_connectors.mdx
+++ b/api_docs/stack_connectors.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/stackConnectors
 title: "stackConnectors"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the stackConnectors plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'stackConnectors']
 ---
 import stackConnectorsObj from './stack_connectors.devdocs.json';
diff --git a/api_docs/task_manager.mdx b/api_docs/task_manager.mdx
index 4227742b695bf..bcf328cc6ca79 100644
--- a/api_docs/task_manager.mdx
+++ b/api_docs/task_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/taskManager
 title: "taskManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the taskManager plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'taskManager']
 ---
 import taskManagerObj from './task_manager.devdocs.json';
diff --git a/api_docs/telemetry.mdx b/api_docs/telemetry.mdx
index 89da3bb82a6f6..af4a57ecedc3b 100644
--- a/api_docs/telemetry.mdx
+++ b/api_docs/telemetry.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetry
 title: "telemetry"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetry plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetry']
 ---
 import telemetryObj from './telemetry.devdocs.json';
diff --git a/api_docs/telemetry_collection_manager.mdx b/api_docs/telemetry_collection_manager.mdx
index d8103e454c54d..4b678c60a7a40 100644
--- a/api_docs/telemetry_collection_manager.mdx
+++ b/api_docs/telemetry_collection_manager.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionManager
 title: "telemetryCollectionManager"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionManager plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionManager']
 ---
 import telemetryCollectionManagerObj from './telemetry_collection_manager.devdocs.json';
diff --git a/api_docs/telemetry_collection_xpack.mdx b/api_docs/telemetry_collection_xpack.mdx
index 04a3769d55164..38b3f69b9ca09 100644
--- a/api_docs/telemetry_collection_xpack.mdx
+++ b/api_docs/telemetry_collection_xpack.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryCollectionXpack
 title: "telemetryCollectionXpack"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryCollectionXpack plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryCollectionXpack']
 ---
 import telemetryCollectionXpackObj from './telemetry_collection_xpack.devdocs.json';
diff --git a/api_docs/telemetry_management_section.mdx b/api_docs/telemetry_management_section.mdx
index 8f1b0edcb7d74..cfbad9700d4d9 100644
--- a/api_docs/telemetry_management_section.mdx
+++ b/api_docs/telemetry_management_section.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/telemetryManagementSection
 title: "telemetryManagementSection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the telemetryManagementSection plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'telemetryManagementSection']
 ---
 import telemetryManagementSectionObj from './telemetry_management_section.devdocs.json';
diff --git a/api_docs/text_based_languages.mdx b/api_docs/text_based_languages.mdx
index 6cbe9d47406aa..5813f0438d52a 100644
--- a/api_docs/text_based_languages.mdx
+++ b/api_docs/text_based_languages.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/textBasedLanguages
 title: "textBasedLanguages"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the textBasedLanguages plugin
-date: 2024-07-04
+date: 2024-07-09
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'textBasedLanguages']
 ---
 import textBasedLanguagesObj from './text_based_languages.devdocs.json';
diff --git a/api_docs/threat_intelligence.mdx b/api_docs/threat_intelligence.mdx
index deedae402bb38..5d3ce3746744c 100644
--- a/api_docs/threat_intelligence.mdx
+++ b/api_docs/threat_intelligence.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/threatIntelligence
 title: "threatIntelligence"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the threatIntelligence plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'threatIntelligence']
 ---
 import threatIntelligenceObj from './threat_intelligence.devdocs.json';
diff --git a/api_docs/timelines.devdocs.json b/api_docs/timelines.devdocs.json
index 4758654017103..53bf4c3913ee6 100644
--- a/api_docs/timelines.devdocs.json
+++ b/api_docs/timelines.devdocs.json
@@ -1467,340 +1467,6 @@
     "classes": [],
     "functions": [],
     "interfaces": [
-      {
-        "parentPluginId": "timelines",
-        "id": "def-common.BrowserField",
-        "type": "Interface",
-        "tags": [
-          "deprecated"
-        ],
-        "label": "BrowserField",
-        "description": [],
-        "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-        "deprecated": true,
-        "trackAdoption": false,
-        "references": [
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "@kbn/securitysolution-data-table",
-            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
-          },
-          {
-            "plugin": "securitySolution",
-            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
-          }
-        ],
-        "children": [
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.aggregatable",
-            "type": "boolean",
-            "tags": [],
-            "label": "aggregatable",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.format",
-            "type": "string",
-            "tags": [],
-            "label": "format",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.indexes",
-            "type": "Array",
-            "tags": [],
-            "label": "indexes",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.name",
-            "type": "string",
-            "tags": [],
-            "label": "name",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.searchable",
-            "type": "boolean",
-            "tags": [],
-            "label": "searchable",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.esTypes",
-            "type": "Array",
-            "tags": [],
-            "label": "esTypes",
-            "description": [],
-            "signature": [
-              "string[] | undefined"
-            ],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.subType",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "subType",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "@kbn/es-query",
-                "scope": "common",
-                "docId": "kibKbnEsQueryPluginApi",
-                "section": "def-common.IFieldSubType",
-                "text": "IFieldSubType"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.readFromDocValues",
-            "type": "boolean",
-            "tags": [],
-            "label": "readFromDocValues",
-            "description": [],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          },
-          {
-            "parentPluginId": "timelines",
-            "id": "def-common.BrowserField.runtimeField",
-            "type": "Object",
-            "tags": [],
-            "label": "runtimeField",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "dataViews",
-                "scope": "common",
-                "docId": "kibDataViewsPluginApi",
-                "section": "def-common.RuntimeField",
-                "text": "RuntimeField"
-              },
-              " | undefined"
-            ],
-            "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
-            "deprecated": false,
-            "trackAdoption": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "timelines",
         "id": "def-common.CursorType",
@@ -3877,6 +3543,213 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "timelines",
+        "id": "def-common.BrowserField",
+        "type": "Type",
+        "tags": [
+          "deprecated"
+        ],
+        "label": "BrowserField",
+        "description": [],
+        "signature": [
+          "Omit<",
+          {
+            "pluginId": "dataViews",
+            "scope": "common",
+            "docId": "kibDataViewsPluginApi",
+            "section": "def-common.FieldSpec",
+            "text": "FieldSpec"
+          },
+          ", \"format\"> & { format?: string | undefined; }"
+        ],
+        "path": "x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts",
+        "deprecated": true,
+        "trackAdoption": false,
+        "references": [
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "@kbn/securitysolution-data-table",
+            "path": "x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/drag_and_drop/helpers.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/columns.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/use_data_view.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/containers/source/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/types.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/formatted_field.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/event_details/table/use_action_cell_data_provider.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/utils.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/common/components/ml/hooks/use_ml_rule_config.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detection_engine/rule_creation_ui/components/step_define_rule/index.tsx"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
+          },
+          {
+            "plugin": "securitySolution",
+            "path": "x-pack/plugins/security_solution/public/detections/components/alerts_kpis/common/hooks.ts"
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "timelines",
         "id": "def-common.BrowserFields",
diff --git a/api_docs/timelines.mdx b/api_docs/timelines.mdx
index c825115a04469..638e5226e0a35 100644
--- a/api_docs/timelines.mdx
+++ b/api_docs/timelines.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/timelines
 title: "timelines"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the timelines plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'timelines']
 ---
 import timelinesObj from './timelines.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/security-threat-hunting-investigations](https://github.com/org
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 238 | 1 | 194 | 18 |
+| 228 | 1 | 184 | 18 |
 
 ## Client
 
diff --git a/api_docs/transform.mdx b/api_docs/transform.mdx
index ef145aff8fa51..16ce978528dd6 100644
--- a/api_docs/transform.mdx
+++ b/api_docs/transform.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/transform
 title: "transform"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the transform plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'transform']
 ---
 import transformObj from './transform.devdocs.json';
diff --git a/api_docs/triggers_actions_ui.devdocs.json b/api_docs/triggers_actions_ui.devdocs.json
index ad45f50762eb1..23ad7592bc323 100644
--- a/api_docs/triggers_actions_ui.devdocs.json
+++ b/api_docs/triggers_actions_ui.devdocs.json
@@ -177,7 +177,7 @@
             "label": "start",
             "description": [],
             "signature": [
-              "(_: ",
+              "(core: ",
               {
                 "pluginId": "@kbn/core-lifecycle-browser",
                 "scope": "common",
@@ -203,7 +203,7 @@
                 "id": "def-public.Plugin.start.$1",
                 "type": "Object",
                 "tags": [],
-                "label": "_",
+                "label": "core",
                 "description": [],
                 "signature": [
                   {
diff --git a/api_docs/triggers_actions_ui.mdx b/api_docs/triggers_actions_ui.mdx
index d5d9c27ec210b..e041317a6070c 100644
--- a/api_docs/triggers_actions_ui.mdx
+++ b/api_docs/triggers_actions_ui.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/triggersActionsUi
 title: "triggersActionsUi"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the triggersActionsUi plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'triggersActionsUi']
 ---
 import triggersActionsUiObj from './triggers_actions_ui.devdocs.json';
diff --git a/api_docs/ui_actions.mdx b/api_docs/ui_actions.mdx
index 49df36a5eb091..c090c5755ab42 100644
--- a/api_docs/ui_actions.mdx
+++ b/api_docs/ui_actions.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActions
 title: "uiActions"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActions plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActions']
 ---
 import uiActionsObj from './ui_actions.devdocs.json';
diff --git a/api_docs/ui_actions_enhanced.mdx b/api_docs/ui_actions_enhanced.mdx
index 7f6ce8da09f7b..c68df9b322654 100644
--- a/api_docs/ui_actions_enhanced.mdx
+++ b/api_docs/ui_actions_enhanced.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/uiActionsEnhanced
 title: "uiActionsEnhanced"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uiActionsEnhanced plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uiActionsEnhanced']
 ---
 import uiActionsEnhancedObj from './ui_actions_enhanced.devdocs.json';
diff --git a/api_docs/unified_doc_viewer.mdx b/api_docs/unified_doc_viewer.mdx
index 055a63e701ac3..95c4364f43a22 100644
--- a/api_docs/unified_doc_viewer.mdx
+++ b/api_docs/unified_doc_viewer.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedDocViewer
 title: "unifiedDocViewer"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedDocViewer plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedDocViewer']
 ---
 import unifiedDocViewerObj from './unified_doc_viewer.devdocs.json';
diff --git a/api_docs/unified_histogram.devdocs.json b/api_docs/unified_histogram.devdocs.json
index 0518cdf17da56..17cc0d1a80cb9 100644
--- a/api_docs/unified_histogram.devdocs.json
+++ b/api_docs/unified_histogram.devdocs.json
@@ -614,7 +614,7 @@
           },
           ") => void) | undefined; } & Pick<",
           "UnifiedHistogramLayoutProps",
-          ", \"className\" | \"children\" | \"query\" | \"filters\" | \"columns\" | \"container\" | \"onBrushEnd\" | \"disabledActions\" | \"timeRange\" | \"dataView\" | \"table\" | \"services\" | \"relativeTimeRange\" | \"renderCustomChartToggleActions\" | \"onFilter\" | \"externalVisContext\" | \"withDefaultActions\" | \"abortController\"> & ",
+          ", \"className\" | \"children\" | \"query\" | \"filters\" | \"services\" | \"columns\" | \"container\" | \"onBrushEnd\" | \"disabledActions\" | \"timeRange\" | \"dataView\" | \"table\" | \"relativeTimeRange\" | \"renderCustomChartToggleActions\" | \"onFilter\" | \"externalVisContext\" | \"withDefaultActions\" | \"abortController\"> & ",
           {
             "pluginId": "@kbn/shared-ux-utility",
             "scope": "common",
@@ -1615,7 +1615,7 @@
           },
           ") => void) | undefined; } & Pick<",
           "UnifiedHistogramLayoutProps",
-          ", \"className\" | \"children\" | \"query\" | \"filters\" | \"columns\" | \"container\" | \"onBrushEnd\" | \"disabledActions\" | \"timeRange\" | \"dataView\" | \"table\" | \"services\" | \"relativeTimeRange\" | \"renderCustomChartToggleActions\" | \"onFilter\" | \"externalVisContext\" | \"withDefaultActions\" | \"abortController\">"
+          ", \"className\" | \"children\" | \"query\" | \"filters\" | \"services\" | \"columns\" | \"container\" | \"onBrushEnd\" | \"disabledActions\" | \"timeRange\" | \"dataView\" | \"table\" | \"relativeTimeRange\" | \"renderCustomChartToggleActions\" | \"onFilter\" | \"externalVisContext\" | \"withDefaultActions\" | \"abortController\">"
         ],
         "path": "src/plugins/unified_histogram/public/container/container.tsx",
         "deprecated": false,
diff --git a/api_docs/unified_histogram.mdx b/api_docs/unified_histogram.mdx
index 49022db07ed33..4f4a60ac31a60 100644
--- a/api_docs/unified_histogram.mdx
+++ b/api_docs/unified_histogram.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedHistogram
 title: "unifiedHistogram"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedHistogram plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedHistogram']
 ---
 import unifiedHistogramObj from './unified_histogram.devdocs.json';
diff --git a/api_docs/unified_search.mdx b/api_docs/unified_search.mdx
index 4b831a83772ee..47438fb7a9b30 100644
--- a/api_docs/unified_search.mdx
+++ b/api_docs/unified_search.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch
 title: "unifiedSearch"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch']
 ---
 import unifiedSearchObj from './unified_search.devdocs.json';
diff --git a/api_docs/unified_search_autocomplete.mdx b/api_docs/unified_search_autocomplete.mdx
index adb9e989ae7fd..c0d5599e462e5 100644
--- a/api_docs/unified_search_autocomplete.mdx
+++ b/api_docs/unified_search_autocomplete.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/unifiedSearch-autocomplete
 title: "unifiedSearch.autocomplete"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the unifiedSearch.autocomplete plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'unifiedSearch.autocomplete']
 ---
 import unifiedSearchAutocompleteObj from './unified_search_autocomplete.devdocs.json';
diff --git a/api_docs/uptime.mdx b/api_docs/uptime.mdx
index 83988e94008c4..d7c9168a273e7 100644
--- a/api_docs/uptime.mdx
+++ b/api_docs/uptime.mdx
@@ -8,14 +8,14 @@ slug: /kibana-dev-docs/api/uptime
 title: "uptime"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the uptime plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'uptime']
 ---
 import uptimeObj from './uptime.devdocs.json';
 
 This plugin visualizes data from Heartbeat, and integrates with other Observability solutions.
 
-Contact [@elastic/obs-ux-infra_services-team](https://github.com/orgs/elastic/teams/obs-ux-infra_services-team) for questions regarding this plugin.
+Contact [@elastic/obs-ux-management-team](https://github.com/orgs/elastic/teams/obs-ux-management-team) for questions regarding this plugin.
 
 **Code health stats**
 
diff --git a/api_docs/url_forwarding.mdx b/api_docs/url_forwarding.mdx
index 3fd6abfac031a..e36131ead0d63 100644
--- a/api_docs/url_forwarding.mdx
+++ b/api_docs/url_forwarding.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/urlForwarding
 title: "urlForwarding"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the urlForwarding plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'urlForwarding']
 ---
 import urlForwardingObj from './url_forwarding.devdocs.json';
diff --git a/api_docs/usage_collection.devdocs.json b/api_docs/usage_collection.devdocs.json
index 609cbc0a5a633..aff0a34416810 100644
--- a/api_docs/usage_collection.devdocs.json
+++ b/api_docs/usage_collection.devdocs.json
@@ -1838,6 +1838,19 @@
             "deprecated": false,
             "trackAdoption": false
           },
+          {
+            "parentPluginId": "usageCollection",
+            "id": "def-server.UsageCountersSavedObjectAttributes.source",
+            "type": "string",
+            "tags": [],
+            "label": "source",
+            "description": [
+              "The source of the event that is being counted: 'server' | 'ui'"
+            ],
+            "path": "src/plugins/usage_collection/server/usage_counters/saved_objects.ts",
+            "deprecated": false,
+            "trackAdoption": false
+          },
           {
             "parentPluginId": "usageCollection",
             "id": "def-server.UsageCountersSavedObjectAttributes.count",
@@ -2006,7 +2019,7 @@
           "The Saved Objects type for Usage Counters"
         ],
         "signature": [
-          "\"usage-counters\""
+          "\"usage-counter\""
         ],
         "path": "src/plugins/usage_collection/server/usage_counters/saved_objects.ts",
         "deprecated": false,
@@ -2152,10 +2165,10 @@
         },
         {
           "parentPluginId": "usageCollection",
-          "id": "def-server.UsageCollectionSetup.getUsageCounterByType",
+          "id": "def-server.UsageCollectionSetup.getUsageCounterByDomainId",
           "type": "Function",
           "tags": [],
-          "label": "getUsageCounterByType",
+          "label": "getUsageCounterByDomainId",
           "description": [
             "\nReturns a usage counter by type"
           ],
@@ -2176,7 +2189,7 @@
           "children": [
             {
               "parentPluginId": "usageCollection",
-              "id": "def-server.UsageCollectionSetup.getUsageCounterByType.$1",
+              "id": "def-server.UsageCollectionSetup.getUsageCounterByDomainId.$1",
               "type": "string",
               "tags": [],
               "label": "type",
diff --git a/api_docs/usage_collection.mdx b/api_docs/usage_collection.mdx
index 38be51dc80a42..5a83dde70882d 100644
--- a/api_docs/usage_collection.mdx
+++ b/api_docs/usage_collection.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/usageCollection
 title: "usageCollection"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the usageCollection plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'usageCollection']
 ---
 import usageCollectionObj from './usage_collection.devdocs.json';
@@ -21,7 +21,7 @@ Contact [@elastic/kibana-core](https://github.com/orgs/elastic/teams/kibana-core
 
 | Public API count  | Any count | Items lacking comments | Missing exports |
 |-------------------|-----------|------------------------|-----------------|
-| 55 | 0 | 16 | 2 |
+| 56 | 0 | 16 | 2 |
 
 ## Client
 
diff --git a/api_docs/ux.mdx b/api_docs/ux.mdx
index 8195e0e09fefc..c1a224812e6f9 100644
--- a/api_docs/ux.mdx
+++ b/api_docs/ux.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/ux
 title: "ux"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the ux plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'ux']
 ---
 import uxObj from './ux.devdocs.json';
diff --git a/api_docs/vis_default_editor.mdx b/api_docs/vis_default_editor.mdx
index d62810e3d1ea1..e66d2e7f0cf1b 100644
--- a/api_docs/vis_default_editor.mdx
+++ b/api_docs/vis_default_editor.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visDefaultEditor
 title: "visDefaultEditor"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visDefaultEditor plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visDefaultEditor']
 ---
 import visDefaultEditorObj from './vis_default_editor.devdocs.json';
diff --git a/api_docs/vis_type_gauge.mdx b/api_docs/vis_type_gauge.mdx
index fe5ece28da251..ba1bfdeb89f5e 100644
--- a/api_docs/vis_type_gauge.mdx
+++ b/api_docs/vis_type_gauge.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeGauge
 title: "visTypeGauge"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeGauge plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeGauge']
 ---
 import visTypeGaugeObj from './vis_type_gauge.devdocs.json';
diff --git a/api_docs/vis_type_heatmap.mdx b/api_docs/vis_type_heatmap.mdx
index eddbcbce54a59..cec157b72cc1d 100644
--- a/api_docs/vis_type_heatmap.mdx
+++ b/api_docs/vis_type_heatmap.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeHeatmap
 title: "visTypeHeatmap"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeHeatmap plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeHeatmap']
 ---
 import visTypeHeatmapObj from './vis_type_heatmap.devdocs.json';
diff --git a/api_docs/vis_type_pie.mdx b/api_docs/vis_type_pie.mdx
index c99cbfa2402ad..9478bfc37db41 100644
--- a/api_docs/vis_type_pie.mdx
+++ b/api_docs/vis_type_pie.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypePie
 title: "visTypePie"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypePie plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypePie']
 ---
 import visTypePieObj from './vis_type_pie.devdocs.json';
diff --git a/api_docs/vis_type_table.mdx b/api_docs/vis_type_table.mdx
index 49170451c94b7..8d3505f45293d 100644
--- a/api_docs/vis_type_table.mdx
+++ b/api_docs/vis_type_table.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTable
 title: "visTypeTable"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTable plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTable']
 ---
 import visTypeTableObj from './vis_type_table.devdocs.json';
diff --git a/api_docs/vis_type_timelion.mdx b/api_docs/vis_type_timelion.mdx
index 88d15e1669816..5fcdd9938c1be 100644
--- a/api_docs/vis_type_timelion.mdx
+++ b/api_docs/vis_type_timelion.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimelion
 title: "visTypeTimelion"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimelion plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimelion']
 ---
 import visTypeTimelionObj from './vis_type_timelion.devdocs.json';
diff --git a/api_docs/vis_type_timeseries.mdx b/api_docs/vis_type_timeseries.mdx
index 4bd4a29b1bd80..bc6b238b14e3d 100644
--- a/api_docs/vis_type_timeseries.mdx
+++ b/api_docs/vis_type_timeseries.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeTimeseries
 title: "visTypeTimeseries"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeTimeseries plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeTimeseries']
 ---
 import visTypeTimeseriesObj from './vis_type_timeseries.devdocs.json';
diff --git a/api_docs/vis_type_vega.mdx b/api_docs/vis_type_vega.mdx
index fbc1e6b50794c..617429675c83a 100644
--- a/api_docs/vis_type_vega.mdx
+++ b/api_docs/vis_type_vega.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVega
 title: "visTypeVega"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVega plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVega']
 ---
 import visTypeVegaObj from './vis_type_vega.devdocs.json';
diff --git a/api_docs/vis_type_vislib.mdx b/api_docs/vis_type_vislib.mdx
index e7a413a6b90ab..aff385709f8b3 100644
--- a/api_docs/vis_type_vislib.mdx
+++ b/api_docs/vis_type_vislib.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeVislib
 title: "visTypeVislib"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeVislib plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeVislib']
 ---
 import visTypeVislibObj from './vis_type_vislib.devdocs.json';
diff --git a/api_docs/vis_type_xy.mdx b/api_docs/vis_type_xy.mdx
index 6217e915e8663..8165741192e1c 100644
--- a/api_docs/vis_type_xy.mdx
+++ b/api_docs/vis_type_xy.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visTypeXy
 title: "visTypeXy"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visTypeXy plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visTypeXy']
 ---
 import visTypeXyObj from './vis_type_xy.devdocs.json';
diff --git a/api_docs/visualizations.devdocs.json b/api_docs/visualizations.devdocs.json
index bfea478cf29ce..46fb8a61a8352 100644
--- a/api_docs/visualizations.devdocs.json
+++ b/api_docs/visualizations.devdocs.json
@@ -9691,7 +9691,7 @@
             "label": "mode",
             "description": [],
             "signature": [
-              "\"full\" | \"custom\" | \"dataBounds\""
+              "\"custom\" | \"full\" | \"dataBounds\""
             ],
             "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts",
             "deprecated": false,
@@ -14067,7 +14067,7 @@
             "label": "yLeftScale",
             "description": [],
             "signature": [
-              "\"log\" | \"time\" | \"linear\" | \"sqrt\" | undefined"
+              "\"log\" | \"sqrt\" | \"time\" | \"linear\" | undefined"
             ],
             "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts",
             "deprecated": false,
@@ -14081,7 +14081,7 @@
             "label": "yRightScale",
             "description": [],
             "signature": [
-              "\"log\" | \"time\" | \"linear\" | \"sqrt\" | undefined"
+              "\"log\" | \"sqrt\" | \"time\" | \"linear\" | undefined"
             ],
             "path": "src/plugins/visualizations/common/convert_to_lens/types/configurations.ts",
             "deprecated": false,
diff --git a/api_docs/visualizations.mdx b/api_docs/visualizations.mdx
index 81c0a563a3818..d7212a6bd8a8f 100644
--- a/api_docs/visualizations.mdx
+++ b/api_docs/visualizations.mdx
@@ -8,7 +8,7 @@ slug: /kibana-dev-docs/api/visualizations
 title: "visualizations"
 image: https://source.unsplash.com/400x175/?github
 description: API docs for the visualizations plugin
-date: 2024-07-04
+date: 2024-07-11
 tags: ['contributor', 'dev', 'apidocs', 'kibana', 'visualizations']
 ---
 import visualizationsObj from './visualizations.devdocs.json';
diff --git a/catalog-info.yaml b/catalog-info.yaml
index 95d625355d4db..4af2698ca6cca 100644
--- a/catalog-info.yaml
+++ b/catalog-info.yaml
@@ -39,41 +39,6 @@ spec:
   type: url
   target: https://github.com/elastic/kibana/blob/main/.buildkite/pipeline-resource-definitions/locations.yml
 
----
-
-apiVersion: backstage.io/v1alpha1
-kind: Resource
-metadata:
-  name: kibana-tests-pipeline
-  description: Definition of the kibana pipeline
-  links:
-    - title: Pipeline
-      url: https://buildkite.com/elastic/kibana-tests
-spec:
-  type: buildkite-pipeline
-  owner: group:kibana-tech-leads
-  system: buildkite
-  implementation:
-    apiVersion: buildkite.elastic.dev/v1
-    kind: Pipeline
-    metadata:
-      name: kibana-tests
-      description: Pipeline that tests the service integration in various environments
-    spec:
-      repository: elastic/kibana
-      pipeline_file: ./.buildkite/pipelines/quality-gates/pipeline.kibana-tests.yaml
-      provider_settings:
-        trigger_mode: none
-      teams:
-        kibana-operations:
-          access_level: MANAGE_BUILD_AND_READ
-        kibana-release-operators:
-          access_level: BUILD_AND_READ
-        cloud-tooling:
-          access_level: BUILD_AND_READ
-        everyone:
-          access_level: READ_ONLY
-
 ---
 apiVersion: backstage.io/v1alpha1
 kind: Component
@@ -132,34 +97,6 @@ spec:
 # yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
 apiVersion: backstage.io/v1alpha1
 kind: Resource
-metadata:
-  name: buildkite-pipeline-kibana-kme-test
-spec:
-  implementation:
-    apiVersion: buildkite.elastic.dev/v1
-    kind: Pipeline
-    metadata:
-      description: Temporary pipeline for testing Kibana KME work
-      name: kibana-kme-test
-    spec:
-      pipeline_file: .buildkite/scripts/pipelines/pull_request/pipeline.sh
-      provider_settings:
-        build_branches: false
-        build_pull_requests: true
-        publish_commit_status: false
-        trigger_mode: none
-      repository: elastic/kibana
-      teams:
-        kibana-operations:
-          access_level: MANAGE_BUILD_AND_READ
-        everyone:
-          access_level: READ_ONLY
-  owner: group:kibana-operations
-  type: buildkite-pipeline
----
-# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
-apiVersion: backstage.io/v1alpha1
-kind: Resource
 metadata:
   name: buildkite-pipeline-kibana-sonarqube
   description: Run a SonarQube scan
@@ -189,37 +126,6 @@ spec:
          access_level: MANAGE_BUILD_AND_READ
         everyone:
           access_level: READ_ONLY
----
-# yaml-language-server: $schema=https://gist.githubusercontent.com/elasticmachine/988b80dae436cafea07d9a4a460a011d/raw/rre.schema.json
-apiVersion: backstage.io/v1alpha1
-kind: Resource
-metadata:
-  name: buildkite-pipeline-kibana-emergency-release
-  description: Emergency release
-  links:
-    - title: Pipeline
-      url: https://buildkite.com/elastic/kibana-emergency-release
-spec:
-  type: buildkite-pipeline
-  owner: group:kibana-operations
-  system: buildkite
-  implementation:
-    apiVersion: buildkite.elastic.dev/v1
-    kind: Pipeline
-    metadata:
-      name: kibana / emergency release
-    spec:
-      repository: elastic/kibana
-      provider_settings:
-        trigger_mode: none
-      pipeline_file: ".buildkite/pipelines/emergency_release.yml"
-      teams:
-        kibana-operations:
-          access_level: MANAGE_BUILD_AND_READ
-        kibana-release-operators:
-          access_level: BUILD_AND_READ
-        everyone:
-          access_level: READ_ONLY
 
 # Please avoid creating new kibana pipelines in this file to avoid bloating.
 # Instead, create a new file in the pipeline-resource-definitions directory, and wire it in through the locations.yml file.
diff --git a/dev_docs/tutorials/generating_oas_for_http_apis.mdx b/dev_docs/tutorials/generating_oas_for_http_apis.mdx
new file mode 100644
index 0000000000000..f47031887db80
--- /dev/null
+++ b/dev_docs/tutorials/generating_oas_for_http_apis.mdx
@@ -0,0 +1,182 @@
+---
+id: kibDevTutorialGeneratingOASForHTTPAPIs
+slug: /kibana-dev-docs/genereating-oas-for-http-apis
+title: Generating OAS for HTTP APIs
+description: This tutorial demonstrates how to generate OpenAPI specification for HTTP APIs.
+date: 2024-07-04
+tags: ['kibana', 'onboarding', 'dev', 'architecture', 'http', 'rest', 'api']
+---
+
+<DocCallOut title="OAS is required for all public routes">
+  If your route declares `access: 'public'` you **must** provide up-to-date OpenAPI specification for it. Docs for these routes get hosted on [on our docs site](https://www.elastic.co/docs/api/doc/serverless) and are used for client integrations. For example: our [Elastic stack terraform provider](https://github.com/elastic/terraform-provider-elasticstack).
+</DocCallOut>
+
+### Important components
+
+To get OAS generated for HTTP APIs you must use the following components:
+
+1. Core's `router` or `router.versioned` for defining HTTP APIs provided via the `core.http` service to all plugins
+2. `@kbn/config-schema` request and response schemas, skip to <a href="#what-about-runtime-validation-libary-x">this</a> FAQ for more information
+
+<DocCallOut title="Beyond runtime validation">
+  Kibana's core platform supports `@kbn/config-schema` as a first-class citizen for various schema purposes: configuration, saved objects, and HTTP API request/response bodies.
+
+  Developers can leverage `@kbn/config-schema` as a single-source of truth for runtime validation, TypeScript interfaces, and OpenAPI specification.
+</DocCallOut>
+
+### How do I see my HTTP API's OAS?
+
+In `kibana.dev.yml` add the following configuration:
+
+```yaml
+server.oas.enabled: true
+```
+
+Launch Kibana and send the following request:
+
+```bash
+curl -s -uelastic:changeme http://localhost:5601/api/oas\?pathStartsWith\=/api/foo
+```
+
+The value returned should contain the OpenAPI specification for your route and any other path's start with `/api/foo`.
+
+Other useful query parameters for filtering are:
+ * `pluginId` - get the OAS for a specific plugin, for example: `@kbn/data-views-plugin`
+ * `access` - filter for specific access levels: `public` or `internal` are supported
+
+<DocCallOut>
+  For assistance with the writing docs or any other questions about the docs impact, check out https://docs.elastic.dev/content-architecture/oas or chat with writers on **#docs** or **#next-api-reference**
+</DocCallOut>
+
+### Some good practices to consider
+
+#### 1. Runtime schema definitions
+
+```typescript
+// In server/schemas/v1.ts
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const fooResource = schema.object({
+  name: schema.string()
+  // ...and any other fields you may need
+});
+
+export type FooResource = TypeOf<typeof fooResource>;
+
+// In common/foo/v1.ts
+export type { FooResource } from '../server/schemas/v1';
+
+// In common/index.ts expose this as the "latest" schema shape
+export type { FooResource } from './latest';
+
+export * as fooResourceV1 from '../foo/v1';
+```
+
+This example demonstrates how you can organize runtime schemas to prepare for:
+
+1. Being versioned
+2. Have TypeScript references available to client and server code in your plugin
+
+See <DocLink id="kibDevTutorialVersioningInterfaces" text="strategies for versioning your schemas" /> for more information on this organizational pattern.
+
+#### 2. Route definitions
+
+```typescript
+// Somewhere in your plugin's server/routes folder
+import { schema, TypeOf } from '@kbn/config-schema';
+import type { FooResource } from '../../../common';
+import { fooResource } from '../../schemas/v1';
+
+// Note: this response schema is instantiated lazily to avoid creating schemas that are not needed in most cases!
+const fooResourceResponse = () => {
+  return schema.object({
+    id: schema.string({ maxLength: 20 }),
+    name: schema.string(),
+    createdAt: schema.string(),
+  })
+}
+
+// Note: TypeOf can extract types for lazily instantiated schemas
+type FooResourceResponse = TypeOf<typeof fooResourceResponse>
+
+function registerFooRoute(router: IRouter, docLinks: DoclinksStart) {
+  router.versioned
+    .post({
+      path: '/api/foo',
+      access: 'public',
+      summary: 'Create a foo resource'
+      description: `A foo resource enables baz. See the following [documentation](${docLinks.links.fooResource}).`,
+    })
+    .addVersion({
+      version: '2023-10-31',
+      validate: {
+        request: {
+          body: ,
+        },
+        response: {
+          200: {
+            body: fooResourceResponse,
+          },
+        },
+      },
+    },
+    async (ctx, req, res) => {
+      const core = await ctx.core;
+      const savedObjectsClient = core.savedObjects.client;
+      const body = req.body;
+      const foo = await createFoo({ name: body.name });
+      // This is our HTTP translation layer to ensure only the necessary fields included
+      const responseBody: FooResourceResponse = {
+        id: foo.id,
+        name: foo.name,
+        createdAt: foo.createdAt,
+      };
+      return res.ok({ body: responseBody });
+    }
+  );
+}
+```
+
+#### 3. Generating OAS
+
+See <a href="#how-do-i-see-my-http-apis-oas">this section</a> about viewing your HTTP APIs OAS.
+
+#### 4. Iterating on OAS
+
+From here, you can develop your route and schema definitions iteratively. After each change the Kibana server will
+automatically reload and the latest OAS should reflect the current state of your code!
+
+For example, let's add a few descriptions to our schema members:
+
+```typescript
+const fooResourceResponse = () => {
+  return schema.object({
+    id: schema.string({ maxLength: 20, meta: { description: 'An unique ID for a foo resource.'} }),
+    name: schema.string({ meta: { description: 'A human friendly name for a foo resource.'} }),
+    createdAt: schema.string({ meta: { description: 'The ISO date a foo resource was created.'} }),
+  })
+}
+```
+
+This descriptions should now be reflected in the OAS generated for your route.
+
+#### 5. Publishing OAS
+
+OAS for public routes are written to the Kibana repo as a snapshot that will ultimately be published.
+
+<DocCallOut title="Under construction" color="warning">
+  At the time of writing we only capture OAS for a subset of Kibana's HTTP APIs to give teams time to check and improve the quality of generated OAS.
+
+  If you would like OAS for your endpoints to be included in the snapshot, **please reach out to #kibana-core**.
+</DocCallOut>
+
+
+### FAQs
+
+#### What about runtime validation libary X?
+Teams have adopted different runtime validation libraries for their HTTP APIs. Kibana core does not intend to support all runtime validation libraries.
+
+Reach out to **#kibana-core** with questions, concerns or issues you may be facing with `@kbn/config-schema` and we will help you find a solution.
+
+#### What about internal HTTP APIs?
+It's possible to generate OpenAPI specification for `access: 'internal'` routes but it is not required. The benefit will largely be for your team's internal reference and for other teams to discover your APIs. If you follow the practices outlined in this tutorial it should be simple to generate OAS for internal routes as well.
diff --git a/dev_docs/tutorials/versioning_http_apis.mdx b/dev_docs/tutorials/versioning_http_apis.mdx
index b0a4bf899158c..25361ba2ae792 100644
--- a/dev_docs/tutorials/versioning_http_apis.mdx
+++ b/dev_docs/tutorials/versioning_http_apis.mdx
@@ -3,7 +3,7 @@ id: kibDevTutorialVersioningHTTPAPIs
 slug: /kibana-dev-docs/versioning-http-apis
 title: Versioning HTTP APIs
 description: This tutorial demonstrates how to create or migrate to versionable HTTP APIs.
-date: 2023-02-09
+date: 2024-07-04
 tags: ['kibana', 'onboarding', 'dev', 'architecture']
 ---
 
diff --git a/docs/CHANGELOG.asciidoc b/docs/CHANGELOG.asciidoc
index 6d42b25d4bce4..c5a1dd2798fbb 100644
--- a/docs/CHANGELOG.asciidoc
+++ b/docs/CHANGELOG.asciidoc
@@ -10,6 +10,7 @@
 
 Review important information about the {kib} 8.x releases.
 
+* <<release-notes-8.14.3>>
 * <<release-notes-8.14.2>>
 * <<release-notes-8.14.1>>
 * <<release-notes-8.14.0>>
@@ -69,6 +70,21 @@ Review important information about the {kib} 8.x releases.
 
 --
 
+[[release-notes-8.14.3]]
+== {kib} 8.14.3
+
+The 8.14.3 release includes the following bug fixes.
+
+[float]
+[[fixes-v8.14.3]]
+=== Bug Fixes
+Dashboard::
+* Fixes controls getting overwritten on navigation ({kibana-pull}187509[#187509]).
+Elastic Security::
+For the Elastic Security 8.14.3 release information, refer to {security-guide}/release-notes.html[_Elastic Security Solution Release Notes_].
+Logs::
+* Fixes log entry fly-out when response is slow ({kibana-pull}187303[#187303]).
+
 [[release-notes-8.14.2]]
 == {kib} 8.14.2
 
diff --git a/docs/api/data-views/create.asciidoc b/docs/api/data-views/create.asciidoc
index 2164983db11ea..32372639d2dbf 100644
--- a/docs/api/data-views/create.asciidoc
+++ b/docs/api/data-views/create.asciidoc
@@ -231,10 +231,13 @@ The API returns the {data-source} object:
 .Properties of the fieldAttrs[fieldName] objects:
 [%collapsible%open]
 =====
-`customLabel`:::
+`customLabel`::
 (Optional, string) Custom label for the field.
 
-`count`:::
+`customDescription`::
+(Optional, string) Custom description for the field. Max length is 300 characters.
+
+`count`::
 (Optional, number) Popularity count for the field.
 =====
 
diff --git a/docs/api/data-views/update-fields.asciidoc b/docs/api/data-views/update-fields.asciidoc
index 9b0b044238f36..0feacccb81863 100644
--- a/docs/api/data-views/update-fields.asciidoc
+++ b/docs/api/data-views/update-fields.asciidoc
@@ -5,7 +5,7 @@
 ++++
 
 experimental[] Update fields presentation metadata, such as `count`,
-`customLabel`, and `format`. You can update multiple fields in one request. Updates
+`customLabel`, `customDescription`, and `format`. You can update multiple fields in one request. Updates
 are merged with persisted metadata. To remove existing metadata, specify `null` as the value.
 
 
@@ -119,7 +119,8 @@ $ curl -X POST api/data_views/data_view/my-view/fields
             "customLabel": "Foo"
         },
         "bar": {
-            "customLabel": "Bar"
+            "customLabel": "Bar",
+            "customDescription": "Bar Custom description"
         }
     }
 }
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index e4f161ac8f4e5..0f20d331118cc 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -102,6 +102,10 @@ This API doesn't support angular, for registering angular dev tools, bootstrap a
 |Embeddables are React components that manage their own state, can be serialized and deserialized, and return an API that can be used to interact with them imperatively.
 
 
+|{kib-repo}blob/{branch}/src/plugins/esql/README.md[esql]
+|The editor accepts the following properties:
+
+
 |{kib-repo}blob/{branch}/src/plugins/esql_datagrid/README.md[esqlDataGrid]
 |Contains a Discover-like table specifically for ES|QL queries:
 
@@ -328,10 +332,6 @@ generating deep links to other apps using locators, and creating short URLs.
 |This plugin adds the Advanced Settings section for the Usage and Security Data collection (aka Telemetry).
 
 
-|{kib-repo}blob/{branch}/src/plugins/text_based_languages/README.md[textBasedLanguages]
-|The editor accepts the following properties:
-
-
 |<<uiactions-plugin>>
 |UI Actions plugins provides API to manage *triggers* and *actions*.
 
diff --git a/docs/discover/images/esql-full-query.png b/docs/discover/images/esql-full-query.png
index 1d4a37af23a60..e4f5faeef3cf7 100644
Binary files a/docs/discover/images/esql-full-query.png and b/docs/discover/images/esql-full-query.png differ
diff --git a/docs/discover/images/esql-limit.png b/docs/discover/images/esql-limit.png
index dbc9edc3cdc13..b03ecdcc091e6 100644
Binary files a/docs/discover/images/esql-limit.png and b/docs/discover/images/esql-limit.png differ
diff --git a/docs/discover/images/esql-machine-os-ram.png b/docs/discover/images/esql-machine-os-ram.png
index 2c936cecb9498..ad46d88b219ff 100644
Binary files a/docs/discover/images/esql-machine-os-ram.png and b/docs/discover/images/esql-machine-os-ram.png differ
diff --git a/docs/discover/try-esql.asciidoc b/docs/discover/try-esql.asciidoc
index 32718d87c955a..53862be75f010 100644
--- a/docs/discover/try-esql.asciidoc
+++ b/docs/discover/try-esql.asciidoc
@@ -78,7 +78,7 @@ FROM kibana_sample_data_logs
 . Click **▶Run**.
 +
 [role="screenshot"]
-image:images/esql-full-query.png[]
+image:images/esql-full-query.png[An image of the full query result]
 +
 . Click **Save** to save the query and visualization to a dashboard. 
 
diff --git a/docs/management/advanced-options.asciidoc b/docs/management/advanced-options.asciidoc
index 98886aedd5535..73789c750e015 100644
--- a/docs/management/advanced-options.asciidoc
+++ b/docs/management/advanced-options.asciidoc
@@ -43,8 +43,11 @@ Change the settings that apply only to {kib} spaces.
 [[auto-complete-use-time-tange]]`autocomplete:useTimeRange`::
 When disabled, autocompletes the suggestions from your data set instead of the time range.
 
+[[bfetch-disable]]`bfetch:disable`::
+deprecated:[8.15.0] When disabled, search requests from Kibana will be made in individual HTTP requests rather than bundled together.  
+
 [[bfetch-disable-compression]]`bfetch:disableCompression`::
-When disabled, allows you to debug individual requests, but increases the response size.
+deprecated:[8.15.0] When disabled, allows you to debug individual requests, but increases the response size.
 
 [[csv-quotevalues]]`csv:quoteValues`::
 Set this property to `true` to quote exported values.
diff --git a/docs/management/connectors/action-types/gemini.asciidoc b/docs/management/connectors/action-types/gemini.asciidoc
index 6ba03f247461a..3c835d981465c 100644
--- a/docs/management/connectors/action-types/gemini.asciidoc
+++ b/docs/management/connectors/action-types/gemini.asciidoc
@@ -29,7 +29,7 @@ image::management/connectors/images/gemini-connector.png[{gemini} connector]
 
 Name::      The name of the connector.
 API URL::   The {gemini} request URL.
-PROJECT ID:: The project which has Vertex AI endpoint enabled.
+Project ID:: The project which has Vertex AI endpoint enabled.
 Region:: The GCP region where the Vertex AI endpoint enabled.
 Default model:: The GAI model for {gemini} to use. Current support is for the Google Gemini models, defaulting to gemini-1.5-pro-001. The model can be set on a per request basis by including a "model" parameter alongside the request body.
 Credentials JSON:: The GCP service account JSON file for authentication.
@@ -47,7 +47,7 @@ image::management/connectors/images/gemini-params.png[{gemini} params test]
 
 The {gemini} actions have the following configuration properties.
 
-Body::      A stringified JSON payload sent to the {gemini} Invoke Model API URL. For example:
+Body::      A stringified JSON payload sent to the {gemini} invoke model API. For example:
 +
 [source,text]
 --
@@ -65,7 +65,7 @@ Body::      A stringified JSON payload sent to the {gemini} Invoke Model API URL
   })
 }
 --
-Model::      An optional string that will overwrite the connector's default model. For 
+Model::      An optional string that overwrites the connector's default model.
 
 [float]
 [[gemini-connector-networking-configuration]]
diff --git a/docs/management/connectors/action-types/openai.asciidoc b/docs/management/connectors/action-types/openai.asciidoc
index 49033b92cd740..968f5a1e30f3a 100644
--- a/docs/management/connectors/action-types/openai.asciidoc
+++ b/docs/management/connectors/action-types/openai.asciidoc
@@ -4,8 +4,8 @@
 <titleabbrev>OpenAI</titleabbrev>
 ++++
 :frontmatter-description: Add a connector that can send requests to an OpenAI provider.
-:frontmatter-tags-products: [kibana] 
-:frontmatter-tags-content-type: [how-to] 
+:frontmatter-tags-products: [kibana]
+:frontmatter-tags-content-type: [how-to]
 :frontmatter-tags-user-goals: [configure]
 
 
@@ -21,6 +21,17 @@ You can create connectors in *{stack-manage-app} > {connectors-ui}*.  For exampl
 image::management/connectors/images/gen-ai-connector.png[OpenAI connector]
 // NOTE: This is an autogenerated screenshot. Do not edit it directly.
 
+[IMPORTANT]
+====
+Elastic provides no official support for connecting to the Azure OpenAI service through a proxy.
+However if you must use a proxy,
+ensure that the proxy supports streaming and is SSE-compatible.
+Elastic will only parse streamed responses.
+
+To validate that your connectivity problems are caused by using a proxy,
+you can attempt to set up the connector and access the Azure OpenAI service without using a proxy.
+====
+
 [float]
 [[openai-connector-configuration]]
 ==== Connector configuration
@@ -46,7 +57,7 @@ image::management/connectors/images/gen-ai-params-test.png[OpenAI params test]
 
 The OpenAI actions have the following configuration properties.
 
-Body::      A JSON payload sent to the OpenAI API URL. For example: 
+Body::      A JSON payload sent to the OpenAI API URL. For example:
 +
 [source,text]
 --
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index cb096ec127154..6df6c8f3c95ee 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -85,6 +85,9 @@ enforce even rudimentary CSP rules, though {kib} is still accessible. This
 configuration is effectively ignored when <<csp-strict, `csp.strict`>> is enabled.
 *Default: `true`*
 
+`permissionsPolicy.report_to:`::
+Add sources for the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy[Permissions Policy `report-to` directive].
+
 [[elasticsearch-maxSockets]] `elasticsearch.maxSockets`::
 The maximum number of sockets that can be used for communications with {es}.
 *Default: `Infinity`*
@@ -424,6 +427,12 @@ Refer to the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissio
 directives, values, and text format. To disable, set to `null`.
 *Default:* `camera=(), display-capture=(), fullscreen=(self), geolocation=(), microphone=(), web-share=()`
 
+[[server-securityResponseHeaders-permissionsPolicyReportOnly]] `server.securityResponseHeaders.permissionsPolicyReportOnly`::
+experimental[] Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy[`Permissions-Policy-Report-Only`] header
+is used in all responses to the client from the {kib} server, and specifies what value is used. Allowed values are any text value or `null`.
+Refer to the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Permissions-Policy[`Permissions-Policy` documentation] for defined
+directives, values, and text format.
+
 [[server-securityResponseHeaders-disableEmbedding]]`server.securityResponseHeaders.disableEmbedding`::
 Controls whether the https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy[`Content-Security-Policy`] and
 https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/X-Frame-Options[`X-Frame-Options`] headers are configured to disable embedding
diff --git a/examples/controls_example/public/react_controls/control_group/serialization_utils.ts b/examples/controls_example/public/react_controls/control_group/serialization_utils.ts
index 0488e3f46a572..4d0f2eb0f749a 100644
--- a/examples/controls_example/public/react_controls/control_group/serialization_utils.ts
+++ b/examples/controls_example/public/react_controls/control_group/serialization_utils.ts
@@ -10,7 +10,7 @@ import { Reference } from '@kbn/content-management-utils';
 import { DEFAULT_CONTROL_GROW, DEFAULT_CONTROL_WIDTH } from '@kbn/controls-plugin/common';
 import { SerializedPanelState } from '@kbn/presentation-containers';
 import { omit } from 'lodash';
-import { DefaultControlApi, DefaultControlState } from '../types';
+import { DefaultControlApi } from '../types';
 import { ControlGroupRuntimeState, ControlGroupSerializedState } from './types';
 
 export const deserializeControlGroup = (
@@ -75,7 +75,7 @@ export const serializeControlGroup = (
     const {
       rawState: { grow, width, ...rest },
       references: childReferences,
-    } = (child.serializeState as () => SerializedPanelState<DefaultControlState>)();
+    } = child.serializeState();
 
     if (childReferences && childReferences.length > 0) {
       references = [...references, ...childReferences];
diff --git a/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.test.tsx b/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.test.tsx
index 98ce7619dda99..0dcaeece09873 100644
--- a/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.test.tsx
+++ b/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.test.tsx
@@ -19,6 +19,7 @@ import { dataViewPluginMocks } from '@kbn/data-views-plugin/public/mocks';
 import { ControlApiRegistration } from '../../types';
 import { RangesliderControlApi, RangesliderControlState } from './types';
 import { StateComparators } from '@kbn/presentation-publishing';
+import { SerializedPanelState } from '@kbn/presentation-containers';
 
 const DEFAULT_TOTAL_RESULTS = 20;
 const DEFAULT_MIN = 0;
@@ -207,4 +208,35 @@ describe('RangesliderControlApi', () => {
       });
     });
   });
+
+  describe('step state', () => {
+    test('default value provided when state.step is undefined', () => {
+      const { api } = factory.buildControl(
+        {
+          dataViewId: 'myDataViewId',
+          fieldName: 'myFieldName',
+        },
+        buildApiMock,
+        uuid,
+        controlGroupApi
+      );
+      const serializedState = api.serializeState() as SerializedPanelState<RangesliderControlState>;
+      expect(serializedState.rawState.step).toBe(1);
+    });
+
+    test('retains value from initial state', () => {
+      const { api } = factory.buildControl(
+        {
+          dataViewId: 'myDataViewId',
+          fieldName: 'myFieldName',
+          step: 1024,
+        },
+        buildApiMock,
+        uuid,
+        controlGroupApi
+      );
+      const serializedState = api.serializeState() as SerializedPanelState<RangesliderControlState>;
+      expect(serializedState.rawState.step).toBe(1024);
+    });
+  });
 });
diff --git a/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.tsx b/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.tsx
index 79670226c6666..6f477bbc4159a 100644
--- a/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.tsx
+++ b/examples/controls_example/public/react_controls/data_controls/range_slider/get_range_slider_control_factory.tsx
@@ -64,7 +64,7 @@ export const getRangesliderControlFactory = (
       const loadingMinMax$ = new BehaviorSubject<boolean>(false);
       const loadingHasNoResults$ = new BehaviorSubject<boolean>(false);
       const dataLoading$ = new BehaviorSubject<boolean | undefined>(undefined);
-      const step$ = new BehaviorSubject<number | undefined>(initialState.step);
+      const step$ = new BehaviorSubject<number | undefined>(initialState.step ?? 1);
       const value$ = new BehaviorSubject<RangeValue | undefined>(initialState.value);
       function setValue(nextValue: RangeValue | undefined) {
         value$.next(nextValue);
diff --git a/examples/controls_example/public/react_controls/types.ts b/examples/controls_example/public/react_controls/types.ts
index ec4299e717631..bbbd7584e2049 100644
--- a/examples/controls_example/public/react_controls/types.ts
+++ b/examples/controls_example/public/react_controls/types.ts
@@ -9,7 +9,7 @@
 import { BehaviorSubject } from 'rxjs';
 
 import { CanClearSelections, ControlWidth } from '@kbn/controls-plugin/public/types';
-import { HasSerializableState } from '@kbn/presentation-containers';
+import { SerializedPanelState } from '@kbn/presentation-containers';
 import { PanelCompatibleComponent } from '@kbn/presentation-panel-plugin/public/panel_component/types';
 import {
   HasParentApi,
@@ -43,8 +43,11 @@ export type DefaultControlApi = PublishesDataLoading &
   CanClearSelections &
   HasType &
   HasUniqueId &
-  HasSerializableState &
   HasParentApi<ControlGroupApi> & {
+    // Can not use HasSerializableState interface
+    // HasSerializableState types serializeState as function returning 'MaybePromise'
+    // Controls serializeState is sync
+    serializeState: () => SerializedPanelState<DefaultControlState>;
     /** TODO: Make these non-public as part of https://github.com/elastic/kibana/issues/174961 */
     setDataLoading: (loading: boolean) => void;
     setBlockingError: (error: Error | undefined) => void;
diff --git a/nav-kibana-dev.docnav.json b/nav-kibana-dev.docnav.json
index 60dcb5d054393..60d0494de9c71 100644
--- a/nav-kibana-dev.docnav.json
+++ b/nav-kibana-dev.docnav.json
@@ -80,6 +80,10 @@
           "id": "kibDevDocsSavedObjectsIntro",
           "label": "Saved objects"
         },
+        {
+          "id": "kibDevDocsEncryptedSavedObjectsIntro",
+          "label": "Encrypted Saved objects"
+        },
         {
           "id": "kibDevDocsPersistableStateIntro"
         },
@@ -135,6 +139,9 @@
           "id": "kibDevTutorialVersioningInterfaces",
           "label": "Versioning interfaces"
         },
+        {
+          "id": "kibDevTutorialGeneratingOASForHTTPAPIs"
+        },
         {
           "id": "kibDevTutorialSubmitPullRequest"
         },
@@ -611,4 +618,4 @@
       ]
     }
   ]
-}
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index e4e89ddceb856..624c0820ce4e6 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "dashboarding"
   ],
   "private": true,
-  "version": "8.15.0",
+  "version": "8.16.0",
   "branch": "main",
   "types": "./kibana.d.ts",
   "tsdocMetadata": "./build/tsdoc-metadata.json",
@@ -108,7 +108,7 @@
     "@elastic/datemath": "5.0.3",
     "@elastic/ecs": "^8.11.1",
     "@elastic/elasticsearch": "^8.14.0",
-    "@elastic/ems-client": "8.5.1",
+    "@elastic/ems-client": "8.5.3",
     "@elastic/eui": "95.2.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
@@ -163,6 +163,7 @@
     "@kbn/alerting-state-types": "link:x-pack/packages/kbn-alerting-state-types",
     "@kbn/alerting-types": "link:packages/kbn-alerting-types",
     "@kbn/alerts-as-data-utils": "link:packages/kbn-alerts-as-data-utils",
+    "@kbn/alerts-grouping": "link:packages/kbn-alerts-grouping",
     "@kbn/alerts-restricted-fixtures-plugin": "link:x-pack/test/alerting_api_integration/common/plugins/alerts_restricted",
     "@kbn/alerts-ui-shared": "link:packages/kbn-alerts-ui-shared",
     "@kbn/analytics": "link:packages/kbn-analytics",
@@ -453,6 +454,7 @@
     "@kbn/es-ui-shared-plugin": "link:src/plugins/es_ui_shared",
     "@kbn/eso-model-version-example": "link:examples/eso_model_version_example",
     "@kbn/eso-plugin": "link:x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin",
+    "@kbn/esql": "link:src/plugins/esql",
     "@kbn/esql-ast": "link:packages/kbn-esql-ast",
     "@kbn/esql-ast-inspector-plugin": "link:examples/esql_ast_inspector",
     "@kbn/esql-datagrid": "link:src/plugins/esql_datagrid",
@@ -673,6 +675,7 @@
     "@kbn/react-kibana-context-styled": "link:packages/react/kibana_context/styled",
     "@kbn/react-kibana-context-theme": "link:packages/react/kibana_context/theme",
     "@kbn/react-kibana-mount": "link:packages/react/kibana_mount",
+    "@kbn/recently-accessed": "link:packages/kbn-recently-accessed",
     "@kbn/remote-clusters-plugin": "link:x-pack/plugins/remote_clusters",
     "@kbn/rendering-plugin": "link:test/plugin_functional/plugins/rendering_plugin",
     "@kbn/repo-info": "link:packages/kbn-repo-info",
@@ -863,7 +866,6 @@
     "@kbn/test-feature-usage-plugin": "link:x-pack/test/licensing_plugin/plugins/test_feature_usage",
     "@kbn/testing-embedded-lens-plugin": "link:x-pack/examples/testing_embedded_lens",
     "@kbn/text-based-editor": "link:packages/kbn-text-based-editor",
-    "@kbn/text-based-languages": "link:src/plugins/text_based_languages",
     "@kbn/third-party-lens-navigation-prompt-plugin": "link:x-pack/examples/third_party_lens_navigation_prompt",
     "@kbn/third-party-vis-lens-example-plugin": "link:x-pack/examples/third_party_vis_lens_example",
     "@kbn/threat-intelligence-plugin": "link:x-pack/plugins/threat_intelligence",
@@ -937,7 +939,7 @@
     "@langchain/langgraph": "^0.0.23",
     "@langchain/openai": "^0.0.34",
     "@langtrase/trace-attributes": "^3.0.8",
-    "@launchdarkly/node-server-sdk": "^9.4.6",
+    "@launchdarkly/node-server-sdk": "^9.4.7",
     "@loaders.gl/core": "^3.4.7",
     "@loaders.gl/json": "^3.4.7",
     "@loaders.gl/shapefile": "^3.4.7",
@@ -946,6 +948,7 @@
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
     "@mapbox/mapbox-gl-supported": "2.0.1",
     "@mapbox/vector-tile": "1.3.1",
+    "@mswjs/http-middleware": "^0.10.1",
     "@opentelemetry/api": "^1.1.0",
     "@opentelemetry/api-metrics": "^0.31.0",
     "@opentelemetry/exporter-metrics-otlp-grpc": "^0.34.0",
@@ -1032,6 +1035,7 @@
     "extract-zip": "^2.0.1",
     "fast-deep-equal": "^3.1.1",
     "fast-glob": "^3.3.2",
+    "fastest-levenshtein": "^1.0.12",
     "fflate": "^0.6.9",
     "file-saver": "^1.3.8",
     "flat": "5",
@@ -1061,7 +1065,6 @@
     "joi": "^17.13.3",
     "joi-to-json": "^4.3.0",
     "jquery": "^3.5.0",
-    "js-levenshtein": "^1.1.6",
     "js-search": "^1.4.3",
     "js-sha256": "^0.9.0",
     "js-yaml": "^3.14.1",
@@ -1400,7 +1403,7 @@
     "@mapbox/vector-tile": "1.3.1",
     "@octokit/rest": "^17.11.2",
     "@parcel/watcher": "^2.1.0",
-    "@redocly/cli": "^1.16.0",
+    "@redocly/cli": "^1.17.1",
     "@statoscope/webpack-plugin": "^5.28.2",
     "@storybook/addon-a11y": "^6.5.16",
     "@storybook/addon-actions": "^6.5.16",
@@ -1481,7 +1484,6 @@
     "@types/inquirer": "^7.3.1",
     "@types/jest": "^29.5.3",
     "@types/jquery": "^3.3.31",
-    "@types/js-levenshtein": "^1.1.0",
     "@types/js-search": "^1.4.0",
     "@types/js-yaml": "^3.11.1",
     "@types/jsdom": "^20.0.1",
diff --git a/packages/analytics/ebt/shippers/fullstory/src/fullstory_shipper.ts b/packages/analytics/ebt/shippers/fullstory/src/fullstory_shipper.ts
index a091076236a80..23ce46a560ca3 100644
--- a/packages/analytics/ebt/shippers/fullstory/src/fullstory_shipper.ts
+++ b/packages/analytics/ebt/shippers/fullstory/src/fullstory_shipper.ts
@@ -130,7 +130,7 @@ export class FullStoryShipper implements IShipper {
         )
         .subscribe((pageVars) => {
           this.initContext.logger.debug(
-            `Calling FS.setVars with context ${JSON.stringify(pageVars)}`
+            () => `Calling FS.setVars with context ${JSON.stringify(pageVars)}`
           );
           this.fullStoryApi.setVars('page', {
             ...formatPayload(pageVars),
@@ -145,7 +145,7 @@ export class FullStoryShipper implements IShipper {
    * @param newContext The full new context to set {@link EventContext}
    */
   public extendContext(newContext: EventContext): void {
-    this.initContext.logger.debug(`Received context ${JSON.stringify(newContext)}`);
+    this.initContext.logger.debug(() => `Received context ${JSON.stringify(newContext)}`);
 
     // FullStory requires different APIs for different type of contexts:
     // User-level context.
@@ -226,7 +226,9 @@ export class FullStoryShipper implements IShipper {
         cloudIsElasticStaffOwned,
         cloudTrialEndDate,
       };
-      this.initContext.logger.debug(`Calling FS.setUserVars with ${JSON.stringify(userVars)}`);
+      this.initContext.logger.debug(
+        () => `Calling FS.setUserVars with ${JSON.stringify(userVars)}`
+      );
       this.fullStoryApi.setUserVars(formatPayload(userVars));
     }
   }
diff --git a/packages/content-management/table_list_view/src/table_list_view.tsx b/packages/content-management/table_list_view/src/table_list_view.tsx
index a5150c959e4f5..06c2566936d5a 100644
--- a/packages/content-management/table_list_view/src/table_list_view.tsx
+++ b/packages/content-management/table_list_view/src/table_list_view.tsx
@@ -38,6 +38,7 @@ export type TableListViewProps<T extends UserContentCommonSchema = UserContentCo
   | 'titleColumnName'
   | 'withoutPageTemplateWrapper'
   | 'createdByEnabled'
+  | 'recentlyAccessed'
 > & {
   title: string;
   description?: string;
@@ -75,6 +76,7 @@ export const TableListView = <T extends UserContentCommonSchema>({
   additionalRightSideActions,
   withoutPageTemplateWrapper,
   createdByEnabled,
+  recentlyAccessed,
 }: TableListViewProps<T>) => {
   const PageTemplate = withoutPageTemplateWrapper
     ? (React.Fragment as unknown as typeof KibanaPageTemplate)
@@ -124,6 +126,7 @@ export const TableListView = <T extends UserContentCommonSchema>({
           onFetchSuccess={onFetchSuccess}
           setPageDataTestSubject={setPageDataTestSubject}
           createdByEnabled={createdByEnabled}
+          recentlyAccessed={recentlyAccessed}
         />
       </KibanaPageTemplate.Section>
     </PageTemplate>
diff --git a/packages/content-management/table_list_view_table/src/components/table.tsx b/packages/content-management/table_list_view_table/src/components/table.tsx
index dc3061e1e4802..058c12eba5bf3 100644
--- a/packages/content-management/table_list_view_table/src/components/table.tsx
+++ b/packages/content-management/table_list_view_table/src/components/table.tsx
@@ -13,7 +13,6 @@ import {
   EuiButton,
   EuiInMemoryTable,
   CriteriaWithPagination,
-  PropertySort,
   SearchFilterConfig,
   Direction,
   Query,
@@ -59,6 +58,7 @@ interface Props<T extends UserContentCommonSchema> extends State<T>, TagManageme
   tableCaption: string;
   tableColumns: Array<EuiBasicTableColumn<T>>;
   hasUpdatedAtMetadata: boolean;
+  hasRecentlyAccessedMetadata: boolean;
   deleteItems: TableListViewTableProps<T>['deleteItems'];
   tableItemsRowActions: TableItemsRowActions;
   renderCreateButton: () => React.ReactElement | undefined;
@@ -81,6 +81,7 @@ export function Table<T extends UserContentCommonSchema>({
   tableSort,
   tableFilter,
   hasUpdatedAtMetadata,
+  hasRecentlyAccessedMetadata,
   entityName,
   entityNamePlural,
   tagsToTableItemMap,
@@ -174,12 +175,13 @@ export function Table<T extends UserContentCommonSchema>({
           <TableSortSelect
             tableSort={tableSort}
             hasUpdatedAtMetadata={hasUpdatedAtMetadata}
+            hasRecentlyAccessedMetadata={hasRecentlyAccessedMetadata}
             onChange={onSortChange}
           />
         );
       },
     };
-  }, [hasUpdatedAtMetadata, onSortChange, tableSort]);
+  }, [hasUpdatedAtMetadata, onSortChange, tableSort, hasRecentlyAccessedMetadata]);
 
   const tagFilterPanel = useMemo<SearchFilterConfig | null>(() => {
     if (!isTaggingEnabled()) return null;
@@ -278,6 +280,11 @@ export function Table<T extends UserContentCommonSchema>({
     return { allUsers: Array.from(users), showNoUserOption: _showNoUserOption };
   }, [createdByEnabled, items]);
 
+  const sorting =
+    tableSort.field === 'accessedAt' // "accessedAt" is a special case with a custom sorting
+      ? true // by passing "true" we disable the EuiInMemoryTable sorting and handle it ourselves, but sorting is still enabled
+      : { sort: tableSort };
+
   return (
     <UserFilterContextProvider
       enabled={createdByEnabled}
@@ -298,7 +305,7 @@ export function Table<T extends UserContentCommonSchema>({
         selection={selection}
         search={search}
         executeQueryOptions={{ enabled: false }}
-        sorting={tableSort ? { sort: tableSort as PropertySort } : undefined}
+        sorting={sorting}
         onChange={onTableChange}
         data-test-subj="itemsInMemTable"
         rowHeader="attributes.title"
diff --git a/packages/content-management/table_list_view_table/src/components/table_sort_select.test.tsx b/packages/content-management/table_list_view_table/src/components/table_sort_select.test.tsx
new file mode 100644
index 0000000000000..e2c62a46c0e71
--- /dev/null
+++ b/packages/content-management/table_list_view_table/src/components/table_sort_select.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { sortByRecentlyAccessed } from './table_sort_select';
+import { UserContentCommonSchema } from '@kbn/content-management-table-list-view-common';
+
+describe('sortByRecentlyAccessed', () => {
+  const items: UserContentCommonSchema[] = [
+    {
+      id: 'item-1',
+      type: 'dashboard',
+      updatedAt: '2020-01-01T00:00:00Z',
+      attributes: {
+        title: 'Item 1',
+      },
+      references: [],
+    },
+    {
+      id: 'item-2',
+      type: 'dashboard',
+      updatedAt: '2020-01-02T00:00:00Z',
+      attributes: {
+        title: 'Item 2',
+      },
+      createdBy: 'u_1',
+      references: [],
+    },
+    {
+      id: 'item-3',
+      type: 'dashboard',
+      updatedAt: '2020-01-03T00:00:00Z',
+      attributes: {
+        title: 'Item 3',
+      },
+      createdBy: 'u_2',
+      references: [],
+    },
+    {
+      id: 'item-4',
+      type: 'dashboard',
+      updatedAt: '2020-01-04T00:00:00Z',
+      attributes: {
+        title: 'Item 4',
+      },
+      references: [],
+      managed: true,
+    },
+  ];
+
+  test('sort by last updated', () => {
+    const sortedItems = sortByRecentlyAccessed(items, []);
+    expect(sortedItems.map((item) => item.id)).toEqual(['item-4', 'item-3', 'item-2', 'item-1']);
+  });
+
+  test('pulls recently accessed to the top', () => {
+    const sortedItems = sortByRecentlyAccessed(items, [{ id: 'item-1' }, { id: 'item-2' }]);
+    expect(sortedItems.map((item) => item.id)).toEqual(['item-1', 'item-2', 'item-4', 'item-3']);
+  });
+});
diff --git a/packages/content-management/table_list_view_table/src/components/table_sort_select.tsx b/packages/content-management/table_list_view_table/src/components/table_sort_select.tsx
index c9e06a29e9c8c..1b5d9080f8205 100644
--- a/packages/content-management/table_list_view_table/src/components/table_sort_select.tsx
+++ b/packages/content-management/table_list_view_table/src/components/table_sort_select.tsx
@@ -16,8 +16,10 @@ import {
   Direction,
   EuiText,
   useEuiTheme,
+  EuiIconTip,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
+import { UserContentCommonSchema } from '@kbn/content-management-table-list-view-common';
 
 import { State } from '../table_list_view_table';
 
@@ -26,9 +28,15 @@ type SortItem = EuiSelectableOption & {
   direction: Direction;
 };
 
-export type SortColumnField = 'updatedAt' | 'attributes.title';
+export type SortColumnField = 'updatedAt' | 'attributes.title' | 'accessedAt';
 
 const i18nText = {
+  accessedDescSort: i18n.translate(
+    'contentManagement.tableList.listing.tableSortSelect.recentlyAccessedLabel',
+    {
+      defaultMessage: 'Recently viewed',
+    }
+  ),
   nameAscSort: i18n.translate('contentManagement.tableList.listing.tableSortSelect.nameAscLabel', {
     defaultMessage: 'Name A-Z',
   }),
@@ -57,11 +65,17 @@ const i18nText = {
 
 interface Props {
   hasUpdatedAtMetadata: boolean;
+  hasRecentlyAccessedMetadata: boolean;
   tableSort: State['tableSort'];
   onChange?: (column: SortColumnField, direction: Direction) => void;
 }
 
-export function TableSortSelect({ tableSort, hasUpdatedAtMetadata, onChange }: Props) {
+export function TableSortSelect({
+  tableSort,
+  hasUpdatedAtMetadata,
+  hasRecentlyAccessedMetadata,
+  onChange,
+}: Props) {
   const { euiTheme } = useEuiTheme();
 
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
@@ -81,6 +95,40 @@ export function TableSortSelect({ tableSort, hasUpdatedAtMetadata, onChange }: P
       },
     ];
 
+    if (hasRecentlyAccessedMetadata) {
+      opts = [
+        {
+          label: i18nText.accessedDescSort,
+          column:
+            'accessedAt' /* nonexistent field, used to identify this custom type of sorting */,
+          direction: 'desc',
+          append: (
+            <EuiIconTip
+              aria-label={i18n.translate(
+                'contentManagement.tableList.listing.tableSortSelect.recentlyAccessedTipAriaLabel',
+                {
+                  defaultMessage: 'Additional information',
+                }
+              )}
+              position="right"
+              color="inherit"
+              iconProps={{ style: { verticalAlign: 'text-bottom', marginLeft: 2 } }}
+              css={{ textWrap: 'balance' }}
+              type={'questionInCircle'}
+              content={i18n.translate(
+                'contentManagement.tableList.listing.tableSortSelect.recentlyAccessedTip',
+                {
+                  defaultMessage:
+                    'Recently viewed info is stored locally in your browser and is only visible to you.',
+                }
+              )}
+            />
+          ),
+        },
+        ...opts,
+      ];
+    }
+
     if (hasUpdatedAtMetadata) {
       opts = opts.concat([
         {
@@ -100,6 +148,7 @@ export function TableSortSelect({ tableSort, hasUpdatedAtMetadata, onChange }: P
 
     return opts;
   });
+
   const selectedOptionLabel = options.find(({ checked }) => checked === 'on')?.label ?? '';
 
   const panelHeaderCSS = css`
@@ -165,8 +214,11 @@ export function TableSortSelect({ tableSort, hasUpdatedAtMetadata, onChange }: P
       <>
         <EuiText css={panelHeaderCSS}>{i18nText.headerSort}</EuiText>
         <EuiSelectable<SortItem>
-          singleSelection
-          aria-label="some aria label"
+          singleSelection={'always'}
+          aria-label={i18n.translate(
+            'contentManagement.tableList.listing.tableSortSelect.sortingOptionsAriaLabel',
+            { defaultMessage: 'Sorting options' }
+          )}
           options={options}
           onChange={onSelectChange}
           data-test-subj="sortSelect"
@@ -214,3 +266,25 @@ export function saveSorting(
     /* empty */
   }
 }
+
+/**
+ * Default custom sorting for the table when recently accessed info is available
+ * Sorts by recently accessed list first and the by lastUpdatedAt
+ */
+export function sortByRecentlyAccessed<T extends UserContentCommonSchema>(
+  items: T[],
+  recentlyAccessed: Array<{ id: string }>
+) {
+  const recentlyAccessedMap = new Map(recentlyAccessed.map((item, index) => [item.id, index]));
+  return [...items].sort((a, b) => {
+    if (recentlyAccessedMap.has(a.id) && recentlyAccessedMap.has(b.id)) {
+      return recentlyAccessedMap.get(a.id)! - recentlyAccessedMap.get(b.id)!;
+    } else if (recentlyAccessedMap.has(a.id)) {
+      return -1;
+    } else if (recentlyAccessedMap.has(b.id)) {
+      return 1;
+    } else {
+      return a.updatedAt > b.updatedAt ? -1 : 1;
+    }
+  });
+}
diff --git a/packages/content-management/table_list_view_table/src/reducer.tsx b/packages/content-management/table_list_view_table/src/reducer.tsx
index b4cf3691f9d75..d239fad38c724 100644
--- a/packages/content-management/table_list_view_table/src/reducer.tsx
+++ b/packages/content-management/table_list_view_table/src/reducer.tsx
@@ -33,11 +33,18 @@ export function getReducer<T extends UserContentCommonSchema>() {
 
           // Only change the table sort if it hasn't been changed already.
           // For example if its state comes from the URL, we don't want to override it here.
-          if (hasUpdatedAtMetadata && !state.sortColumnChanged) {
-            tableSort = {
-              field: 'updatedAt' as const,
-              direction: 'desc' as const,
-            };
+          if (!state.sortColumnChanged) {
+            if (state.hasRecentlyAccessedMetadata) {
+              tableSort = {
+                field: 'accessedAt' as const,
+                direction: 'desc' as const,
+              };
+            } else if (hasUpdatedAtMetadata) {
+              tableSort = {
+                field: 'updatedAt' as const,
+                direction: 'desc' as const,
+              };
+            }
           }
         }
 
diff --git a/packages/content-management/table_list_view_table/src/table_list_view.test.tsx b/packages/content-management/table_list_view_table/src/table_list_view.test.tsx
index c874747799480..e56322099d5ff 100644
--- a/packages/content-management/table_list_view_table/src/table_list_view.test.tsx
+++ b/packages/content-management/table_list_view_table/src/table_list_view.test.tsx
@@ -653,6 +653,91 @@ describe('TableListView', () => {
     });
   });
 
+  describe('column sorting with recently accessed', () => {
+    const setupColumnSorting = registerTestBed<string, TableListViewTableProps>(
+      WithServices<TableListViewTableProps>(TableListViewTable, {
+        TagList: getTagList({ references: [] }),
+      }),
+      {
+        defaultProps: {
+          ...requiredProps,
+          recentlyAccessed: { get: () => [{ id: '123', link: '', label: '' }] },
+        },
+        memoryRouter: { wrapComponent: true },
+      }
+    );
+
+    const hits: UserContentCommonSchema[] = [
+      {
+        id: '123',
+        updatedAt: twoDaysAgo.toISOString(), // first asc, last desc
+        type: 'dashboard',
+        attributes: {
+          title: 'z-foo', // first desc, last asc
+        },
+        references: [{ id: 'id-tag-1', name: 'tag-1', type: 'tag' }],
+      },
+      {
+        id: '456',
+        updatedAt: yesterday.toISOString(), // first desc, last asc
+        type: 'dashboard',
+        attributes: {
+          title: 'a-foo', // first asc, last desc
+        },
+        references: [],
+      },
+    ];
+
+    test('should initially sort by "Recently Accessed"', async () => {
+      let testBed: TestBed;
+
+      await act(async () => {
+        testBed = await setupColumnSorting({
+          findItems: jest.fn().mockResolvedValue({ total: hits.length, hits }),
+        });
+      });
+
+      const { component, table } = testBed!;
+      component.update();
+
+      const { tableCellsValues } = table.getMetaData('itemsInMemTable');
+
+      expect(tableCellsValues).toEqual([
+        ['z-foo', twoDaysAgoToString],
+        ['a-foo', yesterdayToString],
+      ]);
+    });
+
+    test('filter select should have 5 options', async () => {
+      let testBed: TestBed;
+
+      await act(async () => {
+        testBed = await setupColumnSorting({
+          findItems: jest.fn().mockResolvedValue({ total: hits.length, hits }),
+        });
+      });
+      const { openSortSelect } = getActions(testBed!);
+      const { component, find } = testBed!;
+      component.update();
+
+      act(() => {
+        openSortSelect();
+      });
+      component.update();
+
+      const filterOptions = find('sortSelect').find('li');
+
+      expect(filterOptions.length).toBe(5);
+      expect(filterOptions.map((wrapper) => wrapper.text())).toEqual([
+        'Recently viewed. Checked option.Additional information ',
+        'Name A-Z ',
+        'Name Z-A ',
+        'Recently updated ',
+        'Least recently updated ',
+      ]);
+    });
+  });
+
   describe('content editor', () => {
     const setupInspector = registerTestBed<string, TableListViewTableProps>(
       WithServices<TableListViewTableProps>(TableListViewTable),
diff --git a/packages/content-management/table_list_view_table/src/table_list_view_table.tsx b/packages/content-management/table_list_view_table/src/table_list_view_table.tsx
index 9e69c4e0f4434..888e0a312d049 100644
--- a/packages/content-management/table_list_view_table/src/table_list_view_table.tsx
+++ b/packages/content-management/table_list_view_table/src/table_list_view_table.tsx
@@ -37,6 +37,7 @@ import type {
   SavedObjectsReference,
 } from '@kbn/content-management-content-editor';
 import type { UserContentCommonSchema } from '@kbn/content-management-table-list-view-common';
+import type { RecentlyAccessed } from '@kbn/recently-accessed';
 
 import {
   Table,
@@ -52,6 +53,7 @@ import { type SortColumnField, getInitialSorting, saveSorting } from './componen
 import { useTags } from './use_tags';
 import { useInRouterContext, useUrlState } from './use_url_state';
 import { RowActions, TableItemsRowActions } from './types';
+import { sortByRecentlyAccessed } from './components/table_sort_select';
 
 interface ContentEditorConfig
   extends Pick<
@@ -116,6 +118,7 @@ export interface TableListViewTableProps<
    */
   withoutPageTemplateWrapper?: boolean;
   contentEditor?: ContentEditorConfig;
+  recentlyAccessed?: Pick<RecentlyAccessed, 'get'>;
 
   tableCaption: string;
   /** Flag to force a new fetch of the table items. Whenever it changes, the `findItems()` will be called. */
@@ -145,6 +148,7 @@ export interface State<T extends UserContentCommonSchema = UserContentCommonSche
   totalItems: number;
   hasUpdatedAtMetadata: boolean;
   hasCreatedByMetadata: boolean;
+  hasRecentlyAccessedMetadata: boolean;
   pagination: Pagination;
   tableSort: {
     field: SortColumnField;
@@ -203,10 +207,19 @@ const urlStateDeserializer = (params: URLQueryParams): URLState => {
   // in the query params. We might want to stop supporting both in a future release (v9.0?)
   stateFromURL.s = sanitizedParams.s ?? sanitizedParams.title;
 
-  if (sanitizedParams.sort === 'title' || sanitizedParams.sort === 'updatedAt') {
-    const field = sanitizedParams.sort === 'title' ? 'attributes.title' : 'updatedAt';
+  if (
+    sanitizedParams.sort === 'title' ||
+    sanitizedParams.sort === 'updatedAt' ||
+    sanitizedParams.sort === 'accessedAt'
+  ) {
+    const field =
+      sanitizedParams.sort === 'title'
+        ? 'attributes.title'
+        : sanitizedParams.sort === 'accessedAt'
+        ? 'accessedAt'
+        : 'updatedAt';
 
-    stateFromURL.sort = { field, direction: 'asc' };
+    stateFromURL.sort = { field, direction: field === 'attributes.title' ? 'asc' : 'desc' };
 
     if (sanitizedParams.sortdir === 'desc' || sanitizedParams.sortdir === 'asc') {
       stateFromURL.sort.direction = sanitizedParams.sortdir;
@@ -302,6 +315,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
   refreshListBouncer,
   setPageDataTestSubject,
   createdByEnabled = false,
+  recentlyAccessed,
 }: TableListViewTableProps<T>) {
   useEffect(() => {
     setPageDataTestSubject(`${entityName}LandingPage`);
@@ -373,6 +387,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
       showDeleteModal: false,
       hasUpdatedAtMetadata: false,
       hasCreatedByMetadata: false,
+      hasRecentlyAccessedMetadata: recentlyAccessed ? recentlyAccessed.get().length > 0 : false,
       selectedIds: [],
       searchQuery: { text: '', query: new Query(Ast.create([]), undefined, '') },
       pagination: {
@@ -387,7 +402,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
         createdBy: [],
       },
     };
-  }, [initialPageSize, entityName]);
+  }, [initialPageSize, entityName, recentlyAccessed]);
 
   const [state, dispatch] = useReducer(reducer, initialState);
 
@@ -404,6 +419,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
     totalItems,
     hasUpdatedAtMetadata,
     hasCreatedByMetadata,
+    hasRecentlyAccessedMetadata,
     pagination,
     tableSort,
     tableFilter,
@@ -433,6 +449,12 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
       }
 
       if (idx === fetchIdx.current) {
+        // when recentlyAccessed is available, we sort the items by the recently accessed items
+        // then this sort will be used as the default sort for the table
+        if (recentlyAccessed && recentlyAccessed.get().length > 0) {
+          response.hits = sortByRecentlyAccessed(response.hits, recentlyAccessed.get());
+        }
+
         dispatch({
           type: 'onFetchItemsSuccess',
           data: {
@@ -448,7 +470,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
         data: err,
       });
     }
-  }, [searchQueryParser, searchQuery.text, findItems, onFetchSuccess]);
+  }, [searchQueryParser, searchQuery.text, findItems, onFetchSuccess, recentlyAccessed]);
 
   const updateQuery = useCallback(
     (query: Query) => {
@@ -1109,6 +1131,7 @@ function TableListViewTableComp<T extends UserContentCommonSchema>({
           searchQuery={searchQuery}
           tableColumns={tableColumns}
           hasUpdatedAtMetadata={hasUpdatedAtMetadata}
+          hasRecentlyAccessedMetadata={hasRecentlyAccessedMetadata}
           tableSort={tableSort}
           tableFilter={tableFilter}
           tableItemsRowActions={tableItemsRowActions}
diff --git a/packages/content-management/table_list_view_table/tsconfig.json b/packages/content-management/table_list_view_table/tsconfig.json
index 09bf8256764d1..b8add47c2bfb9 100644
--- a/packages/content-management/table_list_view_table/tsconfig.json
+++ b/packages/content-management/table_list_view_table/tsconfig.json
@@ -34,7 +34,8 @@
     "@kbn/user-profile-components",
     "@kbn/core-user-profile-browser",
     "@kbn/react-kibana-mount",
-    "@kbn/content-management-user-profiles"
+    "@kbn/content-management-user-profiles",
+    "@kbn/recently-accessed"
   ],
   "exclude": [
     "target/**/*"
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
index d2922b9a96611..380314554dedd 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
+++ b/packages/core/chrome/core-chrome-browser-internal/src/chrome_service.tsx
@@ -39,13 +39,13 @@ import type {
   SideNavComponent as ISideNavComponent,
   ChromeHelpMenuLink,
 } from '@kbn/core-chrome-browser';
+import { RecentlyAccessedService } from '@kbn/recently-accessed';
 
 import { Logger } from '@kbn/logging';
 import { DocTitleService } from './doc_title';
 import { NavControlsService } from './nav_controls';
 import { NavLinksService } from './nav_links';
 import { ProjectNavigationService } from './project_navigation';
-import { RecentlyAccessedService } from './recently_accessed';
 import { Header, LoadingIndicator, ProjectHeader } from './ui';
 import { registerAnalyticsContextProvider } from './register_analytics_context_provider';
 import type { InternalChromeStart } from './types';
@@ -252,7 +252,7 @@ export class ChromeService {
       chromeBreadcrumbs$: breadcrumbs$,
       logger: this.logger,
     });
-    const recentlyAccessed = await this.recentlyAccessed.start({ http });
+    const recentlyAccessed = this.recentlyAccessed.start({ http, key: 'recentlyAccessed' });
     const docTitle = this.docTitle.start();
     const { customBranding$ } = customBranding;
     const helpMenuLinks$ = navControls.getHelpMenuLinks$();
diff --git a/packages/core/chrome/core-chrome-browser-internal/tsconfig.json b/packages/core/chrome/core-chrome-browser-internal/tsconfig.json
index 5d81526f2c970..d4512b515f640 100644
--- a/packages/core/chrome/core-chrome-browser-internal/tsconfig.json
+++ b/packages/core/chrome/core-chrome-browser-internal/tsconfig.json
@@ -16,7 +16,6 @@
     "**/*.tsx",
   ],
   "kbn_references": [
-    "@kbn/crypto-browser",
     "@kbn/i18n",
     "@kbn/i18n-react",
     "@kbn/core-injected-metadata-browser-internal",
@@ -55,6 +54,7 @@
     "@kbn/core-i18n-browser-mocks",
     "@kbn/core-theme-browser-mocks",
     "@kbn/react-kibana-context-render",
+    "@kbn/recently-accessed",
   ],
   "exclude": [
     "target/**/*",
diff --git a/packages/core/http/core-http-server-internal/index.ts b/packages/core/http/core-http-server-internal/index.ts
index b9d4edd8a8628..cf9fe65afdb18 100644
--- a/packages/core/http/core-http-server-internal/index.ts
+++ b/packages/core/http/core-http-server-internal/index.ts
@@ -27,4 +27,8 @@ export {
   type ExternalUrlConfigType,
 } from './src/external_url';
 
+export type { PermissionsPolicyConfigType } from './src/permissions_policy';
+
+export { permissionsPolicyConfig } from './src/permissions_policy';
+
 export { createCookieSessionStorageFactory } from './src/cookie_session_storage';
diff --git a/packages/core/http/core-http-server-internal/src/http_config.test.ts b/packages/core/http/core-http-server-internal/src/http_config.test.ts
index 97da37fe703b0..45efca0b3376b 100644
--- a/packages/core/http/core-http-server-internal/src/http_config.test.ts
+++ b/packages/core/http/core-http-server-internal/src/http_config.test.ts
@@ -9,6 +9,7 @@
 import { v4 as uuidv4 } from 'uuid';
 import { config, HttpConfig } from './http_config';
 import { cspConfig } from './csp';
+import { permissionsPolicyConfig } from './permissions_policy';
 import { ExternalUrlConfig } from './external_url';
 
 const validHostnames = ['www.example.com', '8.8.8.8', '::1', 'localhost', '0.0.0.0'];
@@ -654,7 +655,13 @@ describe('HttpConfig', () => {
       },
     });
     const rawCspConfig = cspConfig.schema.validate({});
-    const httpConfig = new HttpConfig(rawConfig, rawCspConfig, ExternalUrlConfig.DEFAULT);
+    const rawPermissionsPolicyConfig = permissionsPolicyConfig.schema.validate({});
+    const httpConfig = new HttpConfig(
+      rawConfig,
+      rawCspConfig,
+      ExternalUrlConfig.DEFAULT,
+      rawPermissionsPolicyConfig
+    );
 
     expect(httpConfig.customResponseHeaders).toEqual({
       string: 'string',
@@ -668,7 +675,13 @@ describe('HttpConfig', () => {
   it('defaults restrictInternalApis to false', () => {
     const rawConfig = config.schema.validate({}, {});
     const rawCspConfig = cspConfig.schema.validate({});
-    const httpConfig = new HttpConfig(rawConfig, rawCspConfig, ExternalUrlConfig.DEFAULT);
+    const rawPermissionsPolicyConfig = permissionsPolicyConfig.schema.validate({});
+    const httpConfig = new HttpConfig(
+      rawConfig,
+      rawCspConfig,
+      ExternalUrlConfig.DEFAULT,
+      rawPermissionsPolicyConfig
+    );
     expect(httpConfig.restrictInternalApis).toBe(false);
   });
 });
diff --git a/packages/core/http/core-http-server-internal/src/http_config.ts b/packages/core/http/core-http-server-internal/src/http_config.ts
index 746420fad810a..30fee577b9e1f 100644
--- a/packages/core/http/core-http-server-internal/src/http_config.ts
+++ b/packages/core/http/core-http-server-internal/src/http_config.ts
@@ -23,6 +23,7 @@ import {
   securityResponseHeadersSchema,
 } from './security_response_headers_config';
 import { CdnConfig } from './cdn_config';
+import { PermissionsPolicyConfigType } from './permissions_policy';
 
 const SECOND = 1000;
 
@@ -343,14 +344,16 @@ export class HttpConfig implements IHttpConfig {
   constructor(
     rawHttpConfig: HttpConfigType,
     rawCspConfig: CspConfigType,
-    rawExternalUrlConfig: ExternalUrlConfig
+    rawExternalUrlConfig: ExternalUrlConfig,
+    rawPermissionsPolicyConfig: PermissionsPolicyConfigType
   ) {
     this.autoListen = rawHttpConfig.autoListen;
     this.host = rawHttpConfig.host;
     this.port = rawHttpConfig.port;
     this.cors = rawHttpConfig.cors;
     const { securityResponseHeaders, disableEmbedding } = parseRawSecurityResponseHeadersConfig(
-      rawHttpConfig.securityResponseHeaders
+      rawHttpConfig.securityResponseHeaders,
+      rawPermissionsPolicyConfig
     );
     this.securityResponseHeaders = securityResponseHeaders;
     this.customResponseHeaders = Object.entries(rawHttpConfig.customResponseHeaders ?? {}).reduce(
diff --git a/packages/core/http/core-http-server-internal/src/http_service.test.ts b/packages/core/http/core-http-server-internal/src/http_service.test.ts
index e5ef15594b836..9867e97e0dfd5 100644
--- a/packages/core/http/core-http-server-internal/src/http_service.test.ts
+++ b/packages/core/http/core-http-server-internal/src/http_service.test.ts
@@ -23,6 +23,7 @@ import { HttpService } from './http_service';
 import { HttpConfigType, config } from './http_config';
 import { cspConfig } from './csp';
 import { externalUrlConfig, ExternalUrlConfig } from './external_url';
+import { permissionsPolicyConfig } from './permissions_policy';
 
 const logger = loggingSystemMock.create();
 const env = Env.createDefault(REPO_ROOT, getEnvOptions());
@@ -42,6 +43,7 @@ const createConfigService = (value: Partial<HttpConfigType> = {}) => {
   configService.setSchema(config.path, config.schema);
   configService.setSchema(cspConfig.path, cspConfig.schema);
   configService.setSchema(externalUrlConfig.path, externalUrlConfig.schema);
+  configService.setSchema(permissionsPolicyConfig.path, permissionsPolicyConfig.schema);
   return configService;
 };
 const contextPreboot = contextServiceMock.createPrebootContract();
diff --git a/packages/core/http/core-http-server-internal/src/http_service.ts b/packages/core/http/core-http-server-internal/src/http_service.ts
index 7e2168d397fee..05e5f48e5666d 100644
--- a/packages/core/http/core-http-server-internal/src/http_service.ts
+++ b/packages/core/http/core-http-server-internal/src/http_service.ts
@@ -29,6 +29,7 @@ import type {
 import { Router, RouterOptions } from '@kbn/core-http-router-server-internal';
 
 import { CspConfigType, cspConfig } from './csp';
+import { PermissionsPolicyConfigType, permissionsPolicyConfig } from './permissions_policy';
 import { HttpConfig, HttpConfigType, config as httpConfig } from './http_config';
 import { HttpServer } from './http_server';
 import { HttpsRedirectServer } from './https_redirect_server';
@@ -76,7 +77,13 @@ export class HttpService
       configService.atPath<HttpConfigType>(httpConfig.path, { ignoreUnchanged: false }),
       configService.atPath<CspConfigType>(cspConfig.path),
       configService.atPath<ExternalUrlConfigType>(externalUrlConfig.path),
-    ]).pipe(map(([http, csp, externalUrl]) => new HttpConfig(http, csp, externalUrl)));
+      configService.atPath<PermissionsPolicyConfigType>(permissionsPolicyConfig.path),
+    ]).pipe(
+      map(
+        ([http, csp, externalUrl, permissionsPolicy]) =>
+          new HttpConfig(http, csp, externalUrl, permissionsPolicy)
+      )
+    );
     const shutdownTimeout$ = this.config$.pipe(map(({ shutdownTimeout }) => shutdownTimeout));
     this.prebootServer = new HttpServer(coreContext, 'Preboot', shutdownTimeout$);
     this.httpServer = new HttpServer(coreContext, 'Kibana', shutdownTimeout$);
diff --git a/packages/core/http/core-http-server-internal/src/permissions_policy/config.ts b/packages/core/http/core-http-server-internal/src/permissions_policy/config.ts
new file mode 100644
index 0000000000000..f9bfe44807be3
--- /dev/null
+++ b/packages/core/http/core-http-server-internal/src/permissions_policy/config.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { TypeOf, schema } from '@kbn/config-schema';
+import type { ServiceConfigDescriptor } from '@kbn/core-base-server-internal';
+
+const configSchema = schema.object({
+  report_to: schema.arrayOf(schema.string(), {
+    defaultValue: [],
+  }),
+});
+
+/**
+ * @internal
+ */
+export type PermissionsPolicyConfigType = TypeOf<typeof configSchema>;
+
+export const permissionsPolicyConfig: ServiceConfigDescriptor<PermissionsPolicyConfigType> = {
+  path: 'permissionsPolicy',
+  schema: configSchema,
+};
diff --git a/packages/core/http/core-http-server-internal/src/permissions_policy/index.ts b/packages/core/http/core-http-server-internal/src/permissions_policy/index.ts
new file mode 100644
index 0000000000000..a7e4a0057c88c
--- /dev/null
+++ b/packages/core/http/core-http-server-internal/src/permissions_policy/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+export { permissionsPolicyConfig } from './config';
+export type { PermissionsPolicyConfigType } from './config';
diff --git a/packages/core/http/core-http-server-internal/src/security_response_headers_config.test.ts b/packages/core/http/core-http-server-internal/src/security_response_headers_config.test.ts
index d4a0e1e384efc..4eea3469688cd 100644
--- a/packages/core/http/core-http-server-internal/src/security_response_headers_config.test.ts
+++ b/packages/core/http/core-http-server-internal/src/security_response_headers_config.test.ts
@@ -14,7 +14,7 @@ import {
 describe('parseRawSecurityResponseHeadersConfig', () => {
   it('returns default values', () => {
     const config = schema.validate({});
-    const result = parse(config);
+    const result = parse(config, { report_to: [] });
     expect(result.disableEmbedding).toBe(false);
     expect(result.securityResponseHeaders).toMatchInlineSnapshot(`
       Object {
@@ -30,7 +30,7 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
     it('a custom value results in the expected Strict-Transport-Security header', () => {
       const strictTransportSecurity = 'max-age=31536000; includeSubDomains';
       const config = schema.validate({ strictTransportSecurity });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Strict-Transport-Security']).toEqual(
         strictTransportSecurity
       );
@@ -38,7 +38,7 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
 
     it('a null value removes the Strict-Transport-Security header', () => {
       const config = schema.validate({ strictTransportSecurity: null });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Strict-Transport-Security']).toBeUndefined();
     });
   });
@@ -47,13 +47,13 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
     it('a custom value results in the expected X-Content-Type-Options header', () => {
       const xContentTypeOptions = 'nosniff'; // there is no other valid value to test with
       const config = schema.validate({ xContentTypeOptions });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['X-Content-Type-Options']).toEqual(xContentTypeOptions);
     });
 
     it('a null value removes the X-Content-Type-Options header', () => {
       const config = schema.validate({ xContentTypeOptions: null });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['X-Content-Type-Options']).toBeUndefined();
     });
   });
@@ -62,13 +62,13 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
     it('a custom value results in the expected Referrer-Policy header', () => {
       const referrerPolicy = 'strict-origin-when-cross-origin';
       const config = schema.validate({ referrerPolicy });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Referrer-Policy']).toEqual(referrerPolicy);
     });
 
     it('a null value removes the Referrer-Policy header', () => {
       const config = schema.validate({ referrerPolicy: null });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Referrer-Policy']).toBeUndefined();
     });
   });
@@ -77,21 +77,45 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
     it('a custom value results in the expected Permissions-Policy header', () => {
       const permissionsPolicy = 'display-capture=(self)';
       const config = schema.validate({ permissionsPolicy });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Permissions-Policy']).toEqual(permissionsPolicy);
     });
 
     it('a null value removes the Permissions-Policy header', () => {
       const config = schema.validate({ permissionsPolicy: null });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Permissions-Policy']).toBeUndefined();
     });
+
+    it('includes report-to directive if it is provided', () => {
+      const config = schema.validate({ permissionsPolicy: 'display-capture=(self)' });
+      const result = parse(config, { report_to: ['violations-endpoint'] });
+      expect(result.securityResponseHeaders['Permissions-Policy']).toEqual(
+        'display-capture=(self);report-to=violations-endpoint'
+      );
+    });
+  });
+
+  describe('permissionsPolicyReportOnly', () => {
+    it('a custom value results in the expected Permissions-Policy-Report-Only header', () => {
+      const config = schema.validate({ permissionsPolicyReportOnly: 'display-capture=(self)' });
+      const result = parse(config, { report_to: ['violations-endpoint'] });
+      expect(result.securityResponseHeaders['Permissions-Policy-Report-Only']).toEqual(
+        'display-capture=(self);report-to=violations-endpoint'
+      );
+    });
+
+    it('includes Permissions-Policy-Report-Only only if report-to directive is set', () => {
+      const config = schema.validate({ permissionsPolicy: 'display-capture=(self)' });
+      const result = parse(config, { report_to: [] });
+      expect(result.securityResponseHeaders['Permissions-Policy-Report-Only']).toBeUndefined();
+    });
   });
 
   describe('disableEmbedding', () => {
     it('a true value results in the expected X-Frame-Options header and expected disableEmbedding result value', () => {
       const config = schema.validate({ disableEmbedding: true });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['X-Frame-Options']).toMatchInlineSnapshot(
         `"SAMEORIGIN"`
       );
@@ -103,7 +127,7 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
     it('a custom value results in the expected Cross-Origin-Opener-Policy header', () => {
       const crossOriginOpenerPolicy = 'same-origin-allow-popups';
       const config = schema.validate({ crossOriginOpenerPolicy });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Cross-Origin-Opener-Policy']).toEqual(
         crossOriginOpenerPolicy
       );
@@ -111,7 +135,7 @@ describe('parseRawSecurityResponseHeadersConfig', () => {
 
     it('a null value removes the Cross-Origin-Opener-Policy header', () => {
       const config = schema.validate({ crossOriginOpenerPolicy: null });
-      const result = parse(config);
+      const result = parse(config, { report_to: [] });
       expect(result.securityResponseHeaders['Cross-Origin-Opener-Policy']).toBeUndefined();
     });
   });
diff --git a/packages/core/http/core-http-server-internal/src/security_response_headers_config.ts b/packages/core/http/core-http-server-internal/src/security_response_headers_config.ts
index 7eb6f6e31d574..b62c8aa1ee5d1 100644
--- a/packages/core/http/core-http-server-internal/src/security_response_headers_config.ts
+++ b/packages/core/http/core-http-server-internal/src/security_response_headers_config.ts
@@ -7,6 +7,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
+import { PermissionsPolicyConfigType } from './permissions_policy';
 
 export const securityResponseHeadersSchema = schema.object({
   strictTransportSecurity: schema.oneOf([schema.string(), schema.literal(null)], {
@@ -38,6 +39,7 @@ export const securityResponseHeadersSchema = schema.object({
     defaultValue:
       'camera=(), display-capture=(), fullscreen=(self), geolocation=(), microphone=(), web-share=()',
   }),
+  permissionsPolicyReportOnly: schema.maybe(schema.oneOf([schema.string(), schema.literal(null)])),
   disableEmbedding: schema.boolean({ defaultValue: false }), // is used to control X-Frame-Options and CSP headers
   crossOriginOpenerPolicy: schema.oneOf(
     // See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Cross-Origin-Opener-Policy
@@ -58,7 +60,8 @@ export const securityResponseHeadersSchema = schema.object({
  * @internal
  */
 export function parseRawSecurityResponseHeadersConfig(
-  raw: TypeOf<typeof securityResponseHeadersSchema>
+  raw: TypeOf<typeof securityResponseHeadersSchema>,
+  rawPermissionsPolicyConfig: PermissionsPolicyConfigType
 ) {
   const securityResponseHeaders: Record<string, string | string[]> = {};
   const { disableEmbedding } = raw;
@@ -72,9 +75,21 @@ export function parseRawSecurityResponseHeadersConfig(
   if (raw.referrerPolicy) {
     securityResponseHeaders['Referrer-Policy'] = raw.referrerPolicy;
   }
+
+  const reportTo = rawPermissionsPolicyConfig.report_to.length
+    ? `;report-to=${rawPermissionsPolicyConfig.report_to}`
+    : '';
+
   if (raw.permissionsPolicy) {
-    securityResponseHeaders['Permissions-Policy'] = raw.permissionsPolicy;
+    securityResponseHeaders['Permissions-Policy'] = `${raw.permissionsPolicy}${reportTo}`;
   }
+
+  if (raw.permissionsPolicyReportOnly && reportTo) {
+    securityResponseHeaders[
+      'Permissions-Policy-Report-Only'
+    ] = `${raw.permissionsPolicyReportOnly}${reportTo}`;
+  }
+
   if (raw.crossOriginOpenerPolicy) {
     securityResponseHeaders['Cross-Origin-Opener-Policy'] = raw.crossOriginOpenerPolicy;
   }
diff --git a/packages/core/http/core-http-server-mocks/src/test_utils.ts b/packages/core/http/core-http-server-mocks/src/test_utils.ts
index 552306cefbab3..e82fc41170999 100644
--- a/packages/core/http/core-http-server-mocks/src/test_utils.ts
+++ b/packages/core/http/core-http-server-mocks/src/test_utils.ts
@@ -91,6 +91,11 @@ export const createConfigService = ({
         ...csp,
       });
     }
+    if (path === 'permissionsPolicy') {
+      return new BehaviorSubject({
+        report_to: [],
+      });
+    }
     throw new Error(`Unexpected config path: ${path}`);
   });
   return configService;
diff --git a/packages/core/logging/core-logging-common-internal/src/logger.test.ts b/packages/core/logging/core-logging-common-internal/src/logger.test.ts
index 613c0cbde93da..2f256c257d94d 100644
--- a/packages/core/logging/core-logging-common-internal/src/logger.test.ts
+++ b/packages/core/logging/core-logging-common-internal/src/logger.test.ts
@@ -186,7 +186,7 @@ describe('AbstractLogger', () => {
   });
 
   describe('log level', () => {
-    it('does not calls appenders for records with unsupported levels', () => {
+    it('does not call appender for records with unsupported levels', () => {
       logger = new TestLogger(context, LogLevel.Warn, appenderMocks, factory);
 
       logger.trace('some trace message');
@@ -215,19 +215,49 @@ describe('AbstractLogger', () => {
         );
       }
     });
+
+    it('does not call appender for records with unsupported levels for closure syntax', () => {
+      logger = new TestLogger(context, LogLevel.Warn, appenderMocks, factory);
+
+      logger.trace(() => 'some trace message');
+      logger.debug(() => 'some debug message');
+      logger.info(() => 'some info message');
+      logger.warn(() => 'some warn message');
+      logger.error(() => 'some error message');
+      logger.fatal(() => 'some fatal message');
+
+      for (const appenderMock of appenderMocks) {
+        expect(appenderMock.append).toHaveBeenCalledTimes(3);
+        expect(appenderMock.append).toHaveBeenCalledWith(
+          expect.objectContaining({
+            level: LogLevel.Warn,
+          })
+        );
+        expect(appenderMock.append).toHaveBeenCalledWith(
+          expect.objectContaining({
+            level: LogLevel.Error,
+          })
+        );
+        expect(appenderMock.append).toHaveBeenCalledWith(
+          expect.objectContaining({
+            level: LogLevel.Fatal,
+          })
+        );
+      }
+    });
   });
 
-  describe('isLevelEnabled', () => {
-    const orderedLogLevels = [
-      LogLevel.Fatal,
-      LogLevel.Error,
-      LogLevel.Warn,
-      LogLevel.Info,
-      LogLevel.Debug,
-      LogLevel.Trace,
-      LogLevel.All,
-    ];
+  const orderedLogLevels = [
+    LogLevel.Fatal,
+    LogLevel.Error,
+    LogLevel.Warn,
+    LogLevel.Info,
+    LogLevel.Debug,
+    LogLevel.Trace,
+    LogLevel.All,
+  ];
 
+  describe('isLevelEnabled', () => {
     for (const logLevel of orderedLogLevels) {
       it(`returns the correct value for a '${logLevel.id}' level logger`, () => {
         const levelLogger = new TestLogger(context, logLevel, appenderMocks, factory);
@@ -238,4 +268,22 @@ describe('AbstractLogger', () => {
       });
     }
   });
+
+  describe('closure syntax', () => {
+    for (const logLevel of orderedLogLevels) {
+      it(`evaluates the log function for '${logLevel.id}' level if enabled`, () => {
+        logger = new TestLogger(context, LogLevel.All, appenderMocks, factory);
+        const logFn = jest.fn(() => 'some message');
+        logger.trace(logFn);
+        expect(logFn).toHaveBeenCalledTimes(1);
+      });
+
+      it(`does not evaluate the log function for '${logLevel.id}' level if not enabled`, () => {
+        logger = new TestLogger(context, LogLevel.Off, appenderMocks, factory);
+        const logFn = jest.fn(() => 'some message');
+        logger.trace(logFn);
+        expect(logFn).not.toHaveBeenCalled();
+      });
+    }
+  });
 });
diff --git a/packages/core/logging/core-logging-common-internal/src/logger.ts b/packages/core/logging/core-logging-common-internal/src/logger.ts
index 69d00ed57f39f..df1b991b44042 100644
--- a/packages/core/logging/core-logging-common-internal/src/logger.ts
+++ b/packages/core/logging/core-logging-common-internal/src/logger.ts
@@ -13,6 +13,7 @@ import {
   LoggerFactory,
   LogMeta,
   Logger,
+  LogMessageSource,
   LogLevelId,
 } from '@kbn/logging';
 
@@ -43,28 +44,73 @@ export abstract class AbstractLogger implements Logger {
     meta?: Meta
   ): LogRecord;
 
-  public trace<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Trace, message, meta));
+  public trace<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void {
+    if (!this.level.supports(LogLevel.Trace)) {
+      return;
+    }
+    if (typeof message === 'function') {
+      message = message();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Trace, message, meta));
   }
 
-  public debug<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Debug, message, meta));
+  public debug<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void {
+    if (!this.level.supports(LogLevel.Debug)) {
+      return;
+    }
+    if (typeof message === 'function') {
+      message = message();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Debug, message, meta));
   }
 
-  public info<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Info, message, meta));
+  public info<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void {
+    if (!this.level.supports(LogLevel.Info)) {
+      return;
+    }
+    if (typeof message === 'function') {
+      message = message();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Info, message, meta));
   }
 
-  public warn<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Warn, errorOrMessage, meta));
+  public warn<Meta extends LogMeta = LogMeta>(
+    errorOrMessage: LogMessageSource | Error,
+    meta?: Meta
+  ): void {
+    if (!this.level.supports(LogLevel.Warn)) {
+      return;
+    }
+    if (typeof errorOrMessage === 'function') {
+      errorOrMessage = errorOrMessage();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Warn, errorOrMessage, meta));
   }
 
-  public error<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Error, errorOrMessage, meta));
+  public error<Meta extends LogMeta = LogMeta>(
+    errorOrMessage: LogMessageSource | Error,
+    meta?: Meta
+  ): void {
+    if (!this.level.supports(LogLevel.Error)) {
+      return;
+    }
+    if (typeof errorOrMessage === 'function') {
+      errorOrMessage = errorOrMessage();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Error, errorOrMessage, meta));
   }
 
-  public fatal<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void {
-    this.log(this.createLogRecord<Meta>(LogLevel.Fatal, errorOrMessage, meta));
+  public fatal<Meta extends LogMeta = LogMeta>(
+    errorOrMessage: LogMessageSource | Error,
+    meta?: Meta
+  ): void {
+    if (!this.level.supports(LogLevel.Fatal)) {
+      return;
+    }
+    if (typeof errorOrMessage === 'function') {
+      errorOrMessage = errorOrMessage();
+    }
+    this.performLog(this.createLogRecord<Meta>(LogLevel.Fatal, errorOrMessage, meta));
   }
 
   public isLevelEnabled(levelId: LogLevelId): boolean {
@@ -75,12 +121,16 @@ export abstract class AbstractLogger implements Logger {
     if (!this.level.supports(record.level)) {
       return;
     }
-    for (const appender of this.appenders) {
-      appender.append(record);
-    }
+    this.performLog(record);
   }
 
   public get(...childContextPaths: string[]): Logger {
     return this.factory.get(...[this.context, ...childContextPaths]);
   }
+
+  private performLog(record: LogRecord) {
+    for (const appender of this.appenders) {
+      appender.append(record);
+    }
+  }
 }
diff --git a/packages/core/metrics/core-metrics-collectors-server-internal/index.ts b/packages/core/metrics/core-metrics-collectors-server-internal/index.ts
index 351129cdc8ba3..d726b0339a0bf 100644
--- a/packages/core/metrics/core-metrics-collectors-server-internal/index.ts
+++ b/packages/core/metrics/core-metrics-collectors-server-internal/index.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-export { OsMetricsCollector } from './src/os';
-export type { OpsMetricsCollectorOptions } from './src/os';
+export { OsMetricsCollector, type OsMetricsCollectorOptions } from './src/os';
 export { ProcessMetricsCollector } from './src/process';
 export { ServerMetricsCollector } from './src/server';
 export { EventLoopDelaysMonitor } from './src/event_loop_delays_monitor';
diff --git a/packages/core/metrics/core-metrics-collectors-server-internal/src/os.ts b/packages/core/metrics/core-metrics-collectors-server-internal/src/os.ts
index 350b01a8100eb..049597cfa1f12 100644
--- a/packages/core/metrics/core-metrics-collectors-server-internal/src/os.ts
+++ b/packages/core/metrics/core-metrics-collectors-server-internal/src/os.ts
@@ -15,7 +15,7 @@ import { OsCgroupMetricsCollector } from './cgroup';
 
 const getos = promisify(getosAsync);
 
-export interface OpsMetricsCollectorOptions {
+export interface OsMetricsCollectorOptions {
   logger: Logger;
   cpuPath?: string;
   cpuAcctPath?: string;
@@ -24,7 +24,7 @@ export interface OpsMetricsCollectorOptions {
 export class OsMetricsCollector implements MetricsCollector<OpsOsMetrics> {
   private readonly cgroupCollector: OsCgroupMetricsCollector;
 
-  constructor(options: OpsMetricsCollectorOptions) {
+  constructor(options: OsMetricsCollectorOptions) {
     this.cgroupCollector = new OsCgroupMetricsCollector({
       ...options,
       logger: options.logger.get('cgroup'),
diff --git a/packages/core/metrics/core-metrics-server-internal/src/ops_metrics_collector.ts b/packages/core/metrics/core-metrics-server-internal/src/ops_metrics_collector.ts
index 2e358fc121bce..f35213a0e0480 100644
--- a/packages/core/metrics/core-metrics-server-internal/src/ops_metrics_collector.ts
+++ b/packages/core/metrics/core-metrics-server-internal/src/ops_metrics_collector.ts
@@ -7,16 +7,22 @@
  */
 
 import { Server as HapiServer } from '@hapi/hapi';
+import type { Logger } from '@kbn/logging';
 import type { OpsMetrics, MetricsCollector } from '@kbn/core-metrics-server';
 import type { AgentStatsProvider } from '@kbn/core-elasticsearch-client-server-internal';
 import {
   ProcessMetricsCollector,
   OsMetricsCollector,
-  type OpsMetricsCollectorOptions,
   ServerMetricsCollector,
   ElasticsearchClientsMetricsCollector,
 } from '@kbn/core-metrics-collectors-server-internal';
 
+export interface OpsMetricsCollectorOptions {
+  logger: Logger;
+  cpuPath?: string;
+  cpuAcctPath?: string;
+}
+
 export class OpsMetricsCollector implements MetricsCollector<OpsMetrics> {
   private readonly processCollector: ProcessMetricsCollector;
   private readonly osCollector: OsMetricsCollector;
diff --git a/packages/core/rendering/core-rendering-server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap b/packages/core/rendering/core-rendering-server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap
index af1808d9a2019..c1754bce247a9 100644
--- a/packages/core/rendering/core-rendering-server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap
+++ b/packages/core/rendering/core-rendering-server-internal/src/bootstrap/__snapshots__/render_template.test.ts.snap
@@ -64,10 +64,12 @@ if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
       var errorTitleEl = document.createElement('h1');
       errorTitleEl.innerText = errorTitle;
       errorTitleEl.style.margin = '20px';
+      errorTitleEl.style.color = '#1a1c21';
 
       var errorTextEl = document.createElement('p');
       errorTextEl.innerText = errorText;
       errorTextEl.style.margin = '20px';
+      errorTextEl.style.color = '#343741';
 
       var errorReloadEl = document.createElement('button');
       errorReloadEl.innerText = errorReload;
diff --git a/packages/core/rendering/core-rendering-server-internal/src/bootstrap/render_template.ts b/packages/core/rendering/core-rendering-server-internal/src/bootstrap/render_template.ts
index fbb7a4290bf14..7644841ddead0 100644
--- a/packages/core/rendering/core-rendering-server-internal/src/bootstrap/render_template.ts
+++ b/packages/core/rendering/core-rendering-server-internal/src/bootstrap/render_template.ts
@@ -80,10 +80,12 @@ if (window.__kbnStrictCsp__ && window.__kbnCspNotEnforced__) {
       var errorTitleEl = document.createElement('h1');
       errorTitleEl.innerText = errorTitle;
       errorTitleEl.style.margin = '20px';
+      errorTitleEl.style.color = '#1a1c21';
 
       var errorTextEl = document.createElement('p');
       errorTextEl.innerText = errorText;
       errorTextEl.style.margin = '20px';
+      errorTextEl.style.color = '#343741';
 
       var errorReloadEl = document.createElement('button');
       errorReloadEl.innerText = errorReload;
diff --git a/packages/core/root/core-root-server-internal/src/register_service_config.ts b/packages/core/root/core-root-server-internal/src/register_service_config.ts
index be67627720b34..3398c8e7b506e 100644
--- a/packages/core/root/core-root-server-internal/src/register_service_config.ts
+++ b/packages/core/root/core-root-server-internal/src/register_service_config.ts
@@ -14,7 +14,12 @@ import { coreDeprecationProvider } from '@kbn/core-config-server-internal';
 import { nodeConfig } from '@kbn/core-node-server-internal';
 import { pidConfig } from '@kbn/core-environment-server-internal';
 import { executionContextConfig } from '@kbn/core-execution-context-server-internal';
-import { config as httpConfig, cspConfig, externalUrlConfig } from '@kbn/core-http-server-internal';
+import {
+  config as httpConfig,
+  cspConfig,
+  externalUrlConfig,
+  permissionsPolicyConfig,
+} from '@kbn/core-http-server-internal';
 import { config as elasticsearchConfig } from '@kbn/core-elasticsearch-server-internal';
 import { config as coreAppConfig } from '@kbn/core-apps-server-internal';
 import { opsConfig } from '@kbn/core-metrics-server-internal';
@@ -56,6 +61,7 @@ export function registerServiceConfig(configService: ConfigService) {
     serverlessConfig,
     statusConfig,
     uiSettingsConfig,
+    permissionsPolicyConfig,
   ];
 
   configService.addDeprecationProvider(rootConfigPath, coreDeprecationProvider);
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
index 117a36d3960cf..a812c1686b060 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/apis/update.test.ts
@@ -149,7 +149,7 @@ describe('#update', () => {
       it(`should use the ES get action then index action when type is not multi-namespace for existing objects`, async () => {
         const type = 'index-pattern';
         const id = 'logstash-*';
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(client, repository, registry, type, id, attributes, { namespace });
         expect(client.get).toHaveBeenCalledTimes(1);
         expect(mockPreflightCheckForCreate).not.toHaveBeenCalled();
@@ -157,7 +157,7 @@ describe('#update', () => {
       });
 
       it(`should use the ES get action then index action when type is multi-namespace for existing objects`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(
           client,
           repository,
@@ -172,7 +172,7 @@ describe('#update', () => {
       });
 
       it(`should use the ES get action then index action when type is namespace agnostic for existing objects`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(client, repository, registry, NAMESPACE_AGNOSTIC_TYPE, id, attributes);
         expect(client.get).toHaveBeenCalledTimes(1);
         expect(mockPreflightCheckForCreate).not.toHaveBeenCalled();
@@ -180,7 +180,7 @@ describe('#update', () => {
       });
 
       it(`should use the ES index action with the merged attributes when mergeAttributes is not false`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
 
         await updateSuccess(client, repository, registry, NAMESPACE_AGNOSTIC_TYPE, id, {
           foo: 'bar',
@@ -201,7 +201,7 @@ describe('#update', () => {
       });
 
       it(`should use the ES index action only with the provided attributes when mergeAttributes is false`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
 
         await updateSuccess(
           client,
@@ -229,7 +229,7 @@ describe('#update', () => {
       });
 
       it(`should check for alias conflicts if a new multi-namespace object before create action would be created then create action to create the object`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(
           client,
           repository,
@@ -246,7 +246,7 @@ describe('#update', () => {
       });
 
       it(`defaults to empty array with no input references`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(client, repository, registry, type, id, attributes);
         expect(
           (client.index.mock.calls[0][0] as estypes.CreateRequest<SavedObjectsRawDocSource>).body!
@@ -256,7 +256,7 @@ describe('#update', () => {
 
       it(`accepts custom references array 1`, async () => {
         const test = async (references: SavedObjectReference[]) => {
-          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
           await updateSuccess(client, repository, registry, type, id, attributes, {
             references,
           });
@@ -271,7 +271,7 @@ describe('#update', () => {
 
       it(`accepts custom references array 2`, async () => {
         const test = async (references: SavedObjectReference[]) => {
-          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
           await updateSuccess(client, repository, registry, type, id, attributes, {
             references,
           });
@@ -286,7 +286,7 @@ describe('#update', () => {
 
       it(`accepts custom references array 3`, async () => {
         const test = async (references: SavedObjectReference[]) => {
-          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+          migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
           await updateSuccess(client, repository, registry, type, id, attributes, {
             references,
           });
@@ -300,7 +300,7 @@ describe('#update', () => {
       });
 
       it(`uses the 'upsertAttributes' option when specified for a single-namespace type that does not exist`, async () => {
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(
           client,
           repository,
@@ -329,7 +329,7 @@ describe('#update', () => {
 
       it(`uses the 'upsertAttributes' option when specified for a multi-namespace type that does not exist`, async () => {
         const options = { upsert: { title: 'foo', description: 'bar' } };
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(
           client,
           repository,
@@ -363,7 +363,7 @@ describe('#update', () => {
       it(`ignores the 'upsertAttributes' option when specified for a multi-namespace type that already exists`, async () => {
         // attributes don't change
         const options = { upsert: { title: 'foo', description: 'bar' } };
-        migrator.migrateDocument.mockImplementation((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementation((doc) => ({ ...doc }));
         await updateSuccess(
           client,
           repository,
@@ -700,7 +700,7 @@ describe('#update', () => {
       it('migrates the fetched document from get', async () => {
         const type = 'index-pattern';
         const id = 'logstash-*';
-        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc, migrated: true }));
+        migrator.migrateDocument.mockImplementationOnce((doc) => ({ ...doc }));
         await updateSuccess(client, repository, registry, type, id, attributes);
         expect(migrator.migrateDocument).toHaveBeenCalledTimes(2);
         expectMigrationArgs({
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.encryption_extension.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.encryption_extension.test.ts
index ecaefe05d65e0..1e2232de0a2e5 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.encryption_extension.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.encryption_extension.test.ts
@@ -116,6 +116,7 @@ describe('SavedObjectsRepository Encryption Extension', () => {
 
     // create a mock saved objects encryption extension
     mockEncryptionExt = savedObjectsExtensionsMock.createEncryptionExtension();
+    mockEncryptionExt.encryptAttributes.mockImplementation((desc, attrs) => Promise.resolve(attrs));
 
     mockGetCurrentTime.mockReturnValue(mockTimestamp);
     mockGetSearchDsl.mockClear();
@@ -247,7 +248,6 @@ describe('SavedObjectsRepository Encryption Extension', () => {
         expect.objectContaining({
           ...encryptedSO,
           id: expect.objectContaining(/index-pattern:[0-9a-f]{8}-([0-9a-f]{4}-){3}[0-9a-f]{12}/),
-          attributes: undefined,
         }),
         encryptedSO.attributes // original attributes
       );
diff --git a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts
index 9db7049e39c77..ed1f967d224a7 100644
--- a/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-api-server-internal/src/lib/repository.spaces_extension.test.ts
@@ -1259,6 +1259,9 @@ describe('SavedObjectsRepository Spaces Extension', () => {
       serializer = createSpySerializer(registry);
       mockSpacesExt = savedObjectsExtensionsMock.createSpacesExtension();
       mockEncryptionExt = savedObjectsExtensionsMock.createEncryptionExtension();
+      mockEncryptionExt.encryptAttributes.mockImplementation((desc, attributes) =>
+        Promise.resolve(attributes)
+      );
       mockGetCurrentTime.mockReturnValue(mockTimestamp);
       mockGetSearchDsl.mockClear();
       repository = instantiateRepository();
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.test.ts
index 42d33c67587ad..65169082c4f74 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.test.ts
@@ -42,6 +42,15 @@ describe('Saved Objects type validation schema', () => {
     );
   });
 
+  it('should fail if invalid id is provided', () => {
+    const objectSchema = createSavedObjectSanitizedDocSchema(validationMap['1.0.0']);
+    const data = createMockObject({ foo: 'bar' });
+    data.id = '';
+    expect(() => objectSchema.validate(data)).toThrowErrorMatchingInlineSnapshot(
+      `"[id]: value has length [0] but it must have a minimum length of [1]."`
+    );
+  });
+
   it('should validate top-level properties', () => {
     const objectSchema = createSavedObjectSanitizedDocSchema(validationMap['1.0.0']);
     const data = createMockObject({ foo: 'heya' });
@@ -78,4 +87,31 @@ describe('Saved Objects type validation schema', () => {
       `"[id]: expected value of type [string] but got [boolean]"`
     );
   });
+
+  describe('default schema', () => {
+    it('validates a record of attributes', () => {
+      const objectSchema = createSavedObjectSanitizedDocSchema(undefined);
+      const data = createMockObject({ foo: 'heya' });
+
+      expect(() => objectSchema.validate(data)).not.toThrowError();
+    });
+
+    it('fails validation on undefined attributes', () => {
+      const objectSchema = createSavedObjectSanitizedDocSchema(undefined);
+      const data = createMockObject(undefined);
+
+      expect(() => objectSchema.validate(data)).toThrowErrorMatchingInlineSnapshot(
+        `"[attributes]: expected value of type [object] but got [undefined]"`
+      );
+    });
+
+    it('fails validation on primitive attributes', () => {
+      const objectSchema = createSavedObjectSanitizedDocSchema(undefined);
+      const data = createMockObject(42);
+
+      expect(() => objectSchema.validate(data)).toThrowErrorMatchingInlineSnapshot(
+        `"[attributes]: expected value of type [object] but got [number]"`
+      );
+    });
+  });
 });
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.ts
index 952aff1d221ce..9673267e510bc 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/schema.ts
@@ -20,7 +20,7 @@ type SavedObjectSanitizedDocSchema = {
 };
 
 const baseSchema = schema.object<SavedObjectSanitizedDocSchema>({
-  id: schema.string(),
+  id: schema.string({ minLength: 1 }),
   type: schema.string(),
   references: schema.arrayOf(
     schema.object({
@@ -42,7 +42,7 @@ const baseSchema = schema.object<SavedObjectSanitizedDocSchema>({
   version: schema.maybe(schema.string()),
   originId: schema.maybe(schema.string()),
   managed: schema.maybe(schema.boolean()),
-  attributes: schema.maybe(schema.any()),
+  attributes: schema.recordOf(schema.string(), schema.maybe(schema.any())),
 });
 
 /**
@@ -52,9 +52,13 @@ const baseSchema = schema.object<SavedObjectSanitizedDocSchema>({
  * @internal
  */
 export const createSavedObjectSanitizedDocSchema = (
-  attributesSchema: SavedObjectsValidationSpec
+  attributesSchema: SavedObjectsValidationSpec | undefined
 ) => {
-  return baseSchema.extends({
-    attributes: attributesSchema,
-  });
+  if (attributesSchema) {
+    return baseSchema.extends({
+      attributes: attributesSchema,
+    });
+  } else {
+    return baseSchema;
+  }
 };
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.test.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.test.ts
index 37ced142364da..bccfc641e96d5 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.test.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.test.ts
@@ -88,6 +88,34 @@ describe('Saved Objects type validator', () => {
       const data = createMockObject({ attributes: { foo: 'hi' } });
       expect(() => validator.validate(data)).not.toThrowError();
     });
+
+    it('validates attributes for types without defined schemas', () => {
+      validator = new SavedObjectsTypeValidator({
+        logger,
+        type,
+        validationMap: {},
+        defaultVersion,
+      });
+      const data = createMockObject({ attributes: undefined });
+      expect(() => validator.validate(data)).toThrowErrorMatchingInlineSnapshot(
+        `"[attributes]: expected value of type [object] but got [undefined]"`
+      );
+    });
+
+    it('validates top level properties for types without defined schemas', () => {
+      validator = new SavedObjectsTypeValidator({
+        logger,
+        type,
+        validationMap: {},
+        defaultVersion,
+      });
+      const data = createMockObject({ attributes: { foo: 'bar' } });
+      // @ts-expect-error Intentionally malformed object
+      data.updated_at = false;
+      expect(() => validator.validate(data)).toThrowErrorMatchingInlineSnapshot(
+        `"[updated_at]: expected value of type [string] but got [boolean]"`
+      );
+    });
   });
 
   describe('schema selection', () => {
diff --git a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.ts b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.ts
index e8344de7bc2f0..011c8240de030 100644
--- a/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.ts
+++ b/packages/core/saved-objects/core-saved-objects-base-server-internal/src/validation/validator.ts
@@ -9,6 +9,7 @@
 import Semver from 'semver';
 import type { Logger } from '@kbn/logging';
 import type {
+  SavedObjectsValidationSpec,
   SavedObjectsValidationMap,
   SavedObjectSanitizedDoc,
 } from '@kbn/core-saved-objects-server';
@@ -56,10 +57,10 @@ export class SavedObjectsTypeValidator {
     }
     const schemaVersion = previousVersionWithSchema(this.orderedVersions, usedVersion);
 
-    if (!schemaVersion || !this.validationMap[schemaVersion]) {
-      return;
+    let validationRule: SavedObjectsValidationSpec | undefined;
+    if (schemaVersion && this.validationMap[schemaVersion]) {
+      validationRule = this.validationMap[schemaVersion];
     }
-    const validationRule = this.validationMap[schemaVersion];
 
     try {
       const validationSchema = createSavedObjectSanitizedDocSchema(validationRule);
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_create.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_create.ts
index 62b253e64f2e3..35c8fc305d062 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_create.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_create.ts
@@ -34,8 +34,9 @@ export const registerBulkCreateRoute = (
     {
       path: '/_bulk_create',
       options: {
+        summary: `Create saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Create saved objects`,
       },
       validate: {
         query: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_delete.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_delete.ts
index ad8a087f5cfdd..0f7219386a07b 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_delete.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_delete.ts
@@ -34,8 +34,9 @@ export const registerBulkDeleteRoute = (
     {
       path: '/_bulk_delete',
       options: {
+        summary: `Delete saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Remove saved objects`,
       },
       validate: {
         body: schema.arrayOf(
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_get.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_get.ts
index 2e9798d56f3b1..c54069c0aae5c 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_get.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_get.ts
@@ -34,8 +34,9 @@ export const registerBulkGetRoute = (
     {
       path: '/_bulk_get',
       options: {
+        summary: `Get saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Get saved objects`,
       },
       validate: {
         body: schema.arrayOf(
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_resolve.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_resolve.ts
index 786af996dc628..d59c5e096aa2e 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_resolve.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_resolve.ts
@@ -34,8 +34,9 @@ export const registerBulkResolveRoute = (
     {
       path: '/_bulk_resolve',
       options: {
+        summary: `Resolve saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Resolve saved objects`,
       },
       validate: {
         body: schema.arrayOf(
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_update.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_update.ts
index ef6609358a782..cd401ba4f2061 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_update.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/bulk_update.ts
@@ -34,8 +34,9 @@ export const registerBulkUpdateRoute = (
     {
       path: '/_bulk_update',
       options: {
+        summary: `Update saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Update saved objects`,
       },
       validate: {
         body: schema.arrayOf(
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/create.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/create.ts
index 54db933dea814..5fb3a2964c701 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/create.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/create.ts
@@ -34,8 +34,9 @@ export const registerCreateRoute = (
     {
       path: '/{type}/{id?}',
       options: {
+        summary: `Create a saved object`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Create a saved object`,
       },
       validate: {
         params: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/delete.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/delete.ts
index 5d18aa5763663..eb01f092ba585 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/delete.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/delete.ts
@@ -34,8 +34,9 @@ export const registerDeleteRoute = (
     {
       path: '/{type}/{id}',
       options: {
+        summary: `Delete a saved object`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Delete a saved object`,
       },
       validate: {
         params: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/export.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/export.ts
index e6ec6f7caa5be..ea2adb976d07f 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/export.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/export.ts
@@ -144,8 +144,9 @@ export const registerExportRoute = (
     {
       path: '/_export',
       options: {
+        summary: `Export saved objects`,
+        tags: ['oas-tag:saved objects'],
         access: 'public',
-        description: `Export saved objects`,
       },
       validate: {
         body: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/find.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/find.ts
index 8efc647573d69..525e80e7637b6 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/find.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/find.ts
@@ -38,8 +38,9 @@ export const registerFindRoute = (
     {
       path: '/_find',
       options: {
+        summary: `Search for saved objects`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Search for saved objects`,
       },
       validate: {
         query: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/get.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/get.ts
index caaae77da9568..5d0ffb9a11964 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/get.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/get.ts
@@ -34,8 +34,9 @@ export const registerGetRoute = (
     {
       path: '/{type}/{id}',
       options: {
+        summary: `Get a saved object`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Get a saved object`,
       },
       validate: {
         params: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/import.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/import.ts
index 7b4181a76507e..69042c7ce6a31 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/import.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/import.ts
@@ -36,8 +36,9 @@ export const registerImportRoute = (
     {
       path: '/_import',
       options: {
+        summary: `Import saved objects`,
+        tags: ['oas-tag:saved objects'],
         access: 'public',
-        description: `Import saved objects`,
         body: {
           maxBytes: maxImportPayloadBytes,
           output: 'stream',
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve.ts
index 866e6d47e8390..2139deda867dc 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve.ts
@@ -30,8 +30,9 @@ export const registerResolveRoute = (
     {
       path: '/resolve/{type}/{id}',
       options: {
+        summary: `Resolve a saved object`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Resolve a saved object`,
       },
       validate: {
         params: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve_import_errors.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve_import_errors.ts
index 770b3af978f1e..e9020b200b048 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve_import_errors.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/resolve_import_errors.ts
@@ -37,8 +37,9 @@ export const registerResolveImportErrorsRoute = (
     {
       path: '/_resolve_import_errors',
       options: {
+        summary: `Resolve import errors`,
+        tags: ['oas-tag:saved objects'],
         access: 'public',
-        description: `Resolve import errors`,
         body: {
           maxBytes: maxImportPayloadBytes,
           output: 'stream',
diff --git a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/update.ts b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/update.ts
index cda03f99c4ad1..c0b5b9ae26d3b 100644
--- a/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/update.ts
+++ b/packages/core/saved-objects/core-saved-objects-server-internal/src/routes/update.ts
@@ -35,8 +35,9 @@ export const registerUpdateRoute = (
     {
       path: '/{type}/{id}',
       options: {
+        summary: `Update a saved object`,
+        tags: ['oas-tag:saved objects'],
         access,
-        description: `Update a saved object`,
       },
       validate: {
         params: schema.object({
diff --git a/packages/core/saved-objects/core-saved-objects-server/index.ts b/packages/core/saved-objects/core-saved-objects-server/index.ts
index 1ff74905b0b0f..189f28bf2c803 100644
--- a/packages/core/saved-objects/core-saved-objects-server/index.ts
+++ b/packages/core/saved-objects/core-saved-objects-server/index.ts
@@ -61,6 +61,7 @@ export {
   ALERTING_CASES_SAVED_OBJECT_INDEX,
   SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
   ANALYTICS_SAVED_OBJECT_INDEX,
+  USAGE_COUNTERS_SAVED_OBJECT_INDEX,
   ALL_SAVED_OBJECT_INDICES,
 } from './src/saved_objects_index_pattern';
 export type {
diff --git a/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_index_pattern.ts b/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_index_pattern.ts
index 93160c6b9bd45..e84403e29ca12 100644
--- a/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_index_pattern.ts
+++ b/packages/core/saved-objects/core-saved-objects-server/src/saved_objects_index_pattern.ts
@@ -19,6 +19,8 @@ export const INGEST_SAVED_OBJECT_INDEX = `${MAIN_SAVED_OBJECT_INDEX}_ingest`;
 export const ALERTING_CASES_SAVED_OBJECT_INDEX = `${MAIN_SAVED_OBJECT_INDEX}_alerting_cases`;
 export const SECURITY_SOLUTION_SAVED_OBJECT_INDEX = `${MAIN_SAVED_OBJECT_INDEX}_security_solution`;
 export const ANALYTICS_SAVED_OBJECT_INDEX = `${MAIN_SAVED_OBJECT_INDEX}_analytics`;
+export const USAGE_COUNTERS_SAVED_OBJECT_INDEX = `${MAIN_SAVED_OBJECT_INDEX}_usage_counters`;
+
 export const ALL_SAVED_OBJECT_INDICES = [
   MAIN_SAVED_OBJECT_INDEX,
   TASK_MANAGER_SAVED_OBJECT_INDEX,
@@ -26,4 +28,5 @@ export const ALL_SAVED_OBJECT_INDICES = [
   INGEST_SAVED_OBJECT_INDEX,
   SECURITY_SOLUTION_SAVED_OBJECT_INDEX,
   ANALYTICS_SAVED_OBJECT_INDEX,
+  USAGE_COUNTERS_SAVED_OBJECT_INDEX,
 ];
diff --git a/packages/core/security/core-security-server-internal/src/security_route_handler_context.ts b/packages/core/security/core-security-server-internal/src/security_route_handler_context.ts
index 4fa328782dd0e..bae1c11d152a4 100644
--- a/packages/core/security/core-security-server-internal/src/security_route_handler_context.ts
+++ b/packages/core/security/core-security-server-internal/src/security_route_handler_context.ts
@@ -26,6 +26,16 @@ export class CoreSecurityRouteHandlerContext implements SecurityRequestHandlerCo
     if (this.#authc == null) {
       this.#authc = {
         getCurrentUser: () => this.securityStart.authc.getCurrentUser(this.request),
+        apiKeys: {
+          areAPIKeysEnabled: () => this.securityStart.authc.apiKeys.areAPIKeysEnabled(),
+          create: (createParams) =>
+            this.securityStart.authc.apiKeys.create(this.request, createParams),
+          update: (updateParams) =>
+            this.securityStart.authc.apiKeys.update(this.request, updateParams),
+          validate: (apiKeyParams) => this.securityStart.authc.apiKeys.validate(apiKeyParams),
+          invalidate: (apiKeyParams) =>
+            this.securityStart.authc.apiKeys.invalidate(this.request, apiKeyParams),
+        },
       };
     }
     return this.#authc;
diff --git a/packages/core/security/core-security-server-internal/src/utils/convert_security_api.test.ts b/packages/core/security/core-security-server-internal/src/utils/convert_security_api.test.ts
index 7c2e49092f73e..40d9e788ea01b 100644
--- a/packages/core/security/core-security-server-internal/src/utils/convert_security_api.test.ts
+++ b/packages/core/security/core-security-server-internal/src/utils/convert_security_api.test.ts
@@ -15,6 +15,16 @@ describe('convertSecurityApi', () => {
     const source: CoreSecurityDelegateContract = {
       authc: {
         getCurrentUser: jest.fn(),
+        apiKeys: {
+          areAPIKeysEnabled: jest.fn(),
+          areCrossClusterAPIKeysEnabled: jest.fn(),
+          validate: jest.fn(),
+          invalidate: jest.fn(),
+          invalidateAsInternalUser: jest.fn(),
+          grantAsInternalUser: jest.fn(),
+          create: jest.fn(),
+          update: jest.fn(),
+        },
       },
       audit: {
         asScoped: jest.fn().mockReturnValue(createAuditLoggerMock.create()),
@@ -23,6 +33,7 @@ describe('convertSecurityApi', () => {
     };
     const output = convertSecurityApi(source);
     expect(output.authc.getCurrentUser).toBe(source.authc.getCurrentUser);
+    expect(output.authc.apiKeys).toBe(source.authc.apiKeys);
     expect(output.audit.asScoped).toBe(source.audit.asScoped);
     expect(output.audit.withoutRequest).toBe(source.audit.withoutRequest);
   });
diff --git a/packages/core/security/core-security-server-internal/src/utils/default_implementation.test.ts b/packages/core/security/core-security-server-internal/src/utils/default_implementation.test.ts
index e4348404671b9..bc7fac96b7dd3 100644
--- a/packages/core/security/core-security-server-internal/src/utils/default_implementation.test.ts
+++ b/packages/core/security/core-security-server-internal/src/utils/default_implementation.test.ts
@@ -23,6 +23,15 @@ describe('getDefaultSecurityImplementation', () => {
     });
   });
 
+  describe('authc.apiKeys', () => {
+    it('returns stub object', async () => {
+      const { apiKeys } = implementation.authc;
+      const areAPIKeysEnabled = await apiKeys.areAPIKeysEnabled();
+
+      expect(areAPIKeysEnabled).toBe(false);
+    });
+  });
+
   describe('audit.asScoped', () => {
     it('returns null', async () => {
       const logger = implementation.audit.asScoped({} as any);
diff --git a/packages/core/security/core-security-server-internal/src/utils/default_implementation.ts b/packages/core/security/core-security-server-internal/src/utils/default_implementation.ts
index 91819807f1064..8eaeb7b2577b5 100644
--- a/packages/core/security/core-security-server-internal/src/utils/default_implementation.ts
+++ b/packages/core/security/core-security-server-internal/src/utils/default_implementation.ts
@@ -8,10 +8,23 @@
 
 import type { CoreSecurityDelegateContract } from '@kbn/core-security-server';
 
+const API_KEYS_DISABLED_ERROR = new Error('API keys are disabled');
+const REJECT_WHEN_API_KEYS_DISABLED = () => Promise.reject(API_KEYS_DISABLED_ERROR);
+
 export const getDefaultSecurityImplementation = (): CoreSecurityDelegateContract => {
   return {
     authc: {
       getCurrentUser: () => null,
+      apiKeys: {
+        areAPIKeysEnabled: () => Promise.resolve(false),
+        areCrossClusterAPIKeysEnabled: () => Promise.resolve(false),
+        create: REJECT_WHEN_API_KEYS_DISABLED,
+        update: REJECT_WHEN_API_KEYS_DISABLED,
+        grantAsInternalUser: REJECT_WHEN_API_KEYS_DISABLED,
+        validate: REJECT_WHEN_API_KEYS_DISABLED,
+        invalidate: REJECT_WHEN_API_KEYS_DISABLED,
+        invalidateAsInternalUser: REJECT_WHEN_API_KEYS_DISABLED,
+      },
     },
     audit: {
       asScoped: () => {
diff --git a/packages/core/security/core-security-server-mocks/index.ts b/packages/core/security/core-security-server-mocks/index.ts
index 23c49282252f0..c834759973c1e 100644
--- a/packages/core/security/core-security-server-mocks/index.ts
+++ b/packages/core/security/core-security-server-mocks/index.ts
@@ -9,3 +9,4 @@
 export { securityServiceMock } from './src/security_service.mock';
 export type { InternalSecurityStartMock, SecurityStartMock } from './src/security_service.mock';
 export { auditLoggerMock } from './src/audit.mock';
+export { apiKeysMock } from './src/api_keys.mock';
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.mock.ts b/packages/core/security/core-security-server-mocks/src/api_keys.mock.ts
similarity index 59%
rename from x-pack/plugins/security/server/authentication/api_keys/api_keys.mock.ts
rename to packages/core/security/core-security-server-mocks/src/api_keys.mock.ts
index cfa857ca833a2..108f8380264e6 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.mock.ts
+++ b/packages/core/security/core-security-server-mocks/src/api_keys.mock.ts
@@ -1,16 +1,15 @@
 /*
  * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
  * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
  */
 
-import type { PublicMethodsOf } from '@kbn/utility-types';
-
-import type { APIKeys } from './api_keys';
+import type { APIKeysService } from '@kbn/core-security-server';
 
 export const apiKeysMock = {
-  create: (): jest.Mocked<PublicMethodsOf<APIKeys>> => ({
+  create: (): jest.MockedObjectDeep<APIKeysService> => ({
     areAPIKeysEnabled: jest.fn(),
     areCrossClusterAPIKeysEnabled: jest.fn(),
     create: jest.fn(),
diff --git a/packages/core/security/core-security-server-mocks/src/security_service.mock.ts b/packages/core/security/core-security-server-mocks/src/security_service.mock.ts
index d833048990ff5..86a39af3b16d5 100644
--- a/packages/core/security/core-security-server-mocks/src/security_service.mock.ts
+++ b/packages/core/security/core-security-server-mocks/src/security_service.mock.ts
@@ -15,6 +15,7 @@ import type {
   InternalSecurityServiceSetup,
   InternalSecurityServiceStart,
 } from '@kbn/core-security-server-internal';
+import { apiKeysMock } from './api_keys.mock';
 import { auditServiceMock, type MockedAuditService } from './audit.mock';
 import { mockAuthenticatedUser, MockAuthenticatedUserProps } from '@kbn/core-security-common/mocks';
 
@@ -35,6 +36,7 @@ const createStartMock = (): SecurityStartMock => {
   const mock = {
     authc: {
       getCurrentUser: jest.fn(),
+      apiKeys: apiKeysMock.create(),
     },
     audit: auditServiceMock.create(),
   };
@@ -61,6 +63,7 @@ const createInternalStartMock = (): InternalSecurityStartMock => {
   const mock = {
     authc: {
       getCurrentUser: jest.fn(),
+      apiKeys: apiKeysMock.create(),
     },
     audit: auditServiceMock.create(),
   };
@@ -82,6 +85,13 @@ const createRequestHandlerContextMock = () => {
   const mock: jest.MockedObjectDeep<SecurityRequestHandlerContext> = {
     authc: {
       getCurrentUser: jest.fn(),
+      apiKeys: {
+        areAPIKeysEnabled: jest.fn(),
+        create: jest.fn(),
+        update: jest.fn(),
+        validate: jest.fn(),
+        invalidate: jest.fn(),
+      },
     },
     audit: {
       logger: {
diff --git a/packages/core/security/core-security-server/index.ts b/packages/core/security/core-security-server/index.ts
index 6a111ab6e27ab..b5dd091c7b87a 100644
--- a/packages/core/security/core-security-server/index.ts
+++ b/packages/core/security/core-security-server/index.ts
@@ -26,4 +26,26 @@ export type {
   AuditRequest,
 } from './src/audit_logging/audit_events';
 export type { AuditLogger } from './src/audit_logging/audit_logger';
+
+export type {
+  APIKeysServiceWithContext,
+  APIKeysService,
+  CreateAPIKeyParams,
+  CreateAPIKeyResult,
+  InvalidateAPIKeyResult,
+  InvalidateAPIKeysParams,
+  ValidateAPIKeyParams,
+  CreateRestAPIKeyParams,
+  CreateRestAPIKeyWithKibanaPrivilegesParams,
+  CreateCrossClusterAPIKeyParams,
+  GrantAPIKeyResult,
+  UpdateAPIKeyParams,
+  UpdateAPIKeyResult,
+  UpdateCrossClusterAPIKeyParams,
+  UpdateRestAPIKeyParams,
+  UpdateRestAPIKeyWithKibanaPrivilegesParams,
+} from './src/authentication/api_keys';
+
+export type { KibanaPrivilegesType, ElasticsearchPrivilegesType } from './src/roles';
+export { isCreateRestAPIKeyParams } from './src/authentication/api_keys';
 export type { CoreFipsService } from './src/fips';
diff --git a/packages/core/security/core-security-server/src/authc.ts b/packages/core/security/core-security-server/src/authc.ts
index 97654104858ea..85ba4fc71542a 100644
--- a/packages/core/security/core-security-server/src/authc.ts
+++ b/packages/core/security/core-security-server/src/authc.ts
@@ -8,6 +8,7 @@
 
 import type { KibanaRequest } from '@kbn/core-http-server';
 import type { AuthenticatedUser } from '@kbn/core-security-common';
+import type { APIKeysService } from './authentication/api_keys';
 
 /**
  * Core's authentication service
@@ -22,4 +23,5 @@ export interface CoreAuthenticationService {
    * @param request The request to retrieve the authenticated user for.
    */
   getCurrentUser(request: KibanaRequest): AuthenticatedUser | null;
+  apiKeys: APIKeysService;
 }
diff --git a/packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts b/packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts
new file mode 100644
index 0000000000000..e842c38d8674d
--- /dev/null
+++ b/packages/core/security/core-security-server/src/authentication/api_keys/api_keys.ts
@@ -0,0 +1,268 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { estypes } from '@elastic/elasticsearch';
+
+import type { KibanaRequest } from '@kbn/core-http-server';
+
+import { ElasticsearchPrivilegesType, KibanaPrivilegesType } from '../../roles';
+
+/**
+ * Interface for managing API keys in Elasticsearch, including creation,
+ * validation, and invalidation of API keys,
+ * as well as checking the status of API key features.
+ */
+export interface APIKeys {
+  /**
+   * Determines if API Keys are enabled in Elasticsearch.
+   */
+  areAPIKeysEnabled(): Promise<boolean>;
+
+  /**
+   * Determines if Cross-Cluster API Keys are enabled in Elasticsearch.
+   */
+  areCrossClusterAPIKeysEnabled(): Promise<boolean>;
+
+  /**
+   * Tries to create an API key for the current user.
+   *
+   * Returns newly created API key or `null` if API keys are disabled.
+   *
+   * User needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.
+   *
+   * @param request Request instance.
+   * @param createParams The params to create an API key
+   */
+  create(
+    request: KibanaRequest,
+    createParams: CreateAPIKeyParams
+  ): Promise<CreateAPIKeyResult | null>;
+
+  /**
+   * Attempts update an API key with the provided 'role_descriptors' and 'metadata'
+   *
+   * Returns `updated`, `true` if the update was successful, `false` if there was nothing to update
+   *
+   * User needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.
+   *
+   * @param request Request instance.
+   * @param updateParams The params to edit an API key
+   */
+  update(
+    request: KibanaRequest,
+    updateParams: UpdateAPIKeyParams
+  ): Promise<UpdateAPIKeyResult | null>;
+
+  /**
+   * Tries to grant an API key for the current user.
+   * @param request Request instance.
+   * @param createParams Create operation parameters.
+   */
+  grantAsInternalUser(
+    request: KibanaRequest,
+    createParams: CreateRestAPIKeyParams | CreateRestAPIKeyWithKibanaPrivilegesParams
+  ): Promise<GrantAPIKeyResult | null>;
+
+  /**
+   * Tries to validate an API key.
+   * @param apiKeyPrams ValidateAPIKeyParams.
+   */
+  validate(apiKeyPrams: ValidateAPIKeyParams): Promise<boolean>;
+
+  /**
+   * Tries to invalidate an API keys.
+   * @param request Request instance.
+   * @param params The params to invalidate an API keys.
+   */
+  invalidate(
+    request: KibanaRequest,
+    params: InvalidateAPIKeysParams
+  ): Promise<InvalidateAPIKeyResult | null>;
+
+  /**
+   * Tries to invalidate the API keys by using the internal user.
+   * @param params The params to invalidate the API keys.
+   */
+  invalidateAsInternalUser(params: InvalidateAPIKeysParams): Promise<InvalidateAPIKeyResult | null>;
+}
+
+export type CreateAPIKeyParams =
+  | CreateRestAPIKeyParams
+  | CreateRestAPIKeyWithKibanaPrivilegesParams
+  | CreateCrossClusterAPIKeyParams;
+
+/**
+ * Response of Kibana Create API key endpoint.
+ */
+export type CreateAPIKeyResult = estypes.SecurityCreateApiKeyResponse;
+
+export interface CreateRestAPIKeyParams {
+  type?: 'rest';
+  expiration?: string;
+  name: string;
+  role_descriptors: Record<string, { [key: string]: any }>;
+  metadata?: { [key: string]: any };
+}
+
+export interface CreateRestAPIKeyWithKibanaPrivilegesParams {
+  type?: 'rest';
+  expiration?: string;
+  name: string;
+  metadata?: { [key: string]: any };
+  kibana_role_descriptors: Record<
+    string,
+    {
+      elasticsearch: ElasticsearchPrivilegesType & { [key: string]: unknown };
+      kibana: KibanaPrivilegesType;
+    }
+  >;
+}
+
+export interface CreateCrossClusterAPIKeyParams {
+  type: 'cross_cluster';
+  expiration?: string;
+  name: string;
+  metadata?: { [key: string]: any };
+  access: {
+    search?: Array<{
+      names: string[];
+      query?: unknown;
+      field_security?: unknown;
+      allow_restricted_indices?: boolean;
+    }>;
+    replication?: Array<{
+      names: string[];
+    }>;
+  };
+}
+
+export interface GrantAPIKeyResult {
+  /**
+   * Unique id for this API key
+   */
+  id: string;
+  /**
+   * Name for this API key
+   */
+  name: string;
+  /**
+   * Generated API key
+   */
+  api_key: string;
+}
+
+/**
+ * Represents the parameters for validating API Key credentials.
+ */
+export interface ValidateAPIKeyParams {
+  /**
+   * Unique id for this API key
+   */
+  id: string;
+
+  /**
+   * Generated API Key (secret)
+   */
+  api_key: string;
+}
+
+/**
+ * Represents the params for invalidating multiple API keys
+ */
+export interface InvalidateAPIKeysParams {
+  /**
+   * List of unique API key IDs
+   */
+  ids: string[];
+}
+
+/**
+ * The return value when invalidating an API key in Elasticsearch.
+ */
+export interface InvalidateAPIKeyResult {
+  /**
+   * The IDs of the API keys that were invalidated as part of the request.
+   */
+  invalidated_api_keys: string[];
+  /**
+   * The IDs of the API keys that were already invalidated.
+   */
+  previously_invalidated_api_keys: string[];
+  /**
+   * The number of errors that were encountered when invalidating the API keys.
+   */
+  error_count: number;
+  /**
+   * Details about these errors. This field is not present in the response when error_count is 0.
+   */
+  error_details?: Array<{
+    type?: string;
+    reason?: string;
+    caused_by?: {
+      type?: string;
+      reason?: string;
+    };
+  }>;
+}
+
+/**
+ * Response of Kibana Update API key endpoint.
+ */
+export type UpdateAPIKeyResult = estypes.SecurityUpdateApiKeyResponse;
+
+/**
+ * Request body of Kibana Update API key endpoint.
+ */
+export type UpdateAPIKeyParams =
+  | UpdateRestAPIKeyParams
+  | UpdateCrossClusterAPIKeyParams
+  | UpdateRestAPIKeyWithKibanaPrivilegesParams;
+
+export interface UpdateRestAPIKeyParams {
+  id: string;
+  type?: 'rest';
+  expiration?: string;
+  role_descriptors: Record<string, { [key: string]: unknown }>;
+  metadata?: { [key: string]: any };
+}
+
+export interface UpdateCrossClusterAPIKeyParams {
+  id: string;
+  type: 'cross_cluster';
+  expiration?: string;
+  metadata?: { [key: string]: any };
+  access: {
+    search?: Array<{
+      names: string[];
+      query?: unknown;
+      field_security?: unknown;
+      allow_restricted_indices?: boolean;
+    }>;
+    replication?: Array<{
+      names: string[];
+    }>;
+  };
+}
+
+export interface UpdateRestAPIKeyWithKibanaPrivilegesParams {
+  id: string;
+  type?: 'rest';
+  expiration?: string;
+  metadata?: { [key: string]: any };
+  kibana_role_descriptors: Record<
+    string,
+    {
+      elasticsearch: ElasticsearchPrivilegesType & { [key: string]: unknown };
+      kibana: KibanaPrivilegesType;
+    }
+  >;
+}
+
+export function isCreateRestAPIKeyParams(params: any): params is CreateRestAPIKeyParams {
+  return 'role_descriptors' in params;
+}
diff --git a/packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts b/packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts
new file mode 100644
index 0000000000000..7090f7312774f
--- /dev/null
+++ b/packages/core/security/core-security-server/src/authentication/api_keys/api_keys_context.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type {
+  CreateAPIKeyParams,
+  CreateAPIKeyResult,
+  UpdateAPIKeyParams,
+  UpdateAPIKeyResult,
+  ValidateAPIKeyParams,
+  InvalidateAPIKeyResult,
+  InvalidateAPIKeysParams,
+} from './api_keys';
+
+/**
+ * Public API Keys service exposed through core context to manage
+ * API keys in Elasticsearch, including creation,
+ * validation, and invalidation of API keys,
+ * as well as checking the status of API key features.
+ */
+export interface APIKeysServiceWithContext {
+  /**
+   * Determines if API Keys are enabled in Elasticsearch.
+   */
+  areAPIKeysEnabled(): Promise<boolean>;
+
+  /**
+   * Tries to create an API key for the current user.
+   *
+   * Returns newly created API key or `null` if API keys are disabled.
+   *
+   * User needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.
+   *
+   * @param createParams The params to create an API key
+   */
+  create(createParams: CreateAPIKeyParams): Promise<CreateAPIKeyResult | null>;
+
+  /**
+   * Attempts update an API key with the provided 'role_descriptors' and 'metadata'
+   *
+   * Returns `updated`, `true` if the update was successful, `false` if there was nothing to update
+   *
+   * User needs `manage_api_key` privilege to update REST API keys and `manage_security` for cross-cluster API keys.
+   *
+   * @param updateParams The params to edit an API key
+   */
+  update(updateParams: UpdateAPIKeyParams): Promise<UpdateAPIKeyResult | null>;
+
+  /**
+   * Tries to validate an API key.
+   * @param apiKeyPrams ValidateAPIKeyParams.
+   */
+  validate(apiKeyPrams: ValidateAPIKeyParams): Promise<boolean>;
+
+  /**
+   * Tries to invalidate an API keys.
+   * @param params The params to invalidate an API keys.
+   */
+  invalidate(params: InvalidateAPIKeysParams): Promise<InvalidateAPIKeyResult | null>;
+}
diff --git a/packages/core/security/core-security-server/src/authentication/api_keys/index.ts b/packages/core/security/core-security-server/src/authentication/api_keys/index.ts
new file mode 100644
index 0000000000000..da7163bb50879
--- /dev/null
+++ b/packages/core/security/core-security-server/src/authentication/api_keys/index.ts
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export type {
+  APIKeys as APIKeysService,
+  CreateAPIKeyParams,
+  CreateAPIKeyResult,
+  InvalidateAPIKeyResult,
+  InvalidateAPIKeysParams,
+  ValidateAPIKeyParams,
+  CreateRestAPIKeyParams,
+  CreateRestAPIKeyWithKibanaPrivilegesParams,
+  CreateCrossClusterAPIKeyParams,
+  GrantAPIKeyResult,
+  UpdateAPIKeyParams,
+  UpdateAPIKeyResult,
+  UpdateCrossClusterAPIKeyParams,
+  UpdateRestAPIKeyParams,
+  UpdateRestAPIKeyWithKibanaPrivilegesParams,
+} from './api_keys';
+export type { APIKeysServiceWithContext } from './api_keys_context';
+export { isCreateRestAPIKeyParams } from './api_keys';
diff --git a/packages/core/security/core-security-server/src/request_handler_context.ts b/packages/core/security/core-security-server/src/request_handler_context.ts
index 37915c24ddaa1..6cb13b3afb9a8 100644
--- a/packages/core/security/core-security-server/src/request_handler_context.ts
+++ b/packages/core/security/core-security-server/src/request_handler_context.ts
@@ -7,7 +7,9 @@
  */
 
 import type { AuthenticatedUser } from '@kbn/core-security-common';
+
 import { AuditLogger } from './audit_logging/audit_logger';
+import type { APIKeysServiceWithContext } from './authentication/api_keys';
 
 export interface SecurityRequestHandlerContext {
   authc: AuthcRequestHandlerContext;
@@ -16,6 +18,7 @@ export interface SecurityRequestHandlerContext {
 
 export interface AuthcRequestHandlerContext {
   getCurrentUser(): AuthenticatedUser | null;
+  apiKeys: APIKeysServiceWithContext;
 }
 
 export interface AuditRequestHandlerContext {
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/index.ts b/packages/core/security/core-security-server/src/roles/index.ts
similarity index 81%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/index.ts
rename to packages/core/security/core-security-server/src/roles/index.ts
index 057b8ad60b999..420f6780fdd85 100644
--- a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/index.ts
+++ b/packages/core/security/core-security-server/src/roles/index.ts
@@ -6,5 +6,4 @@
  * Side Public License, v 1.
  */
 
-export * from './use_alert_data_view';
-export * from './use_rule_aad_fields';
+export type { ElasticsearchPrivilegesType, KibanaPrivilegesType } from './schema';
diff --git a/packages/core/security/core-security-server/src/roles/schema.ts b/packages/core/security/core-security-server/src/roles/schema.ts
new file mode 100644
index 0000000000000..693916ef3d9b3
--- /dev/null
+++ b/packages/core/security/core-security-server/src/roles/schema.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Type representing Elasticsearch specific portion of the role definition.
+ */
+export interface ElasticsearchPrivilegesType {
+  cluster?: string[];
+  remote_cluster?: Array<{
+    privileges: string[];
+    clusters: string[];
+  }>;
+  indices?: Array<{
+    names: string[];
+    field_security?: Record<'grant' | 'except', string[]>;
+    privileges: string[];
+    query?: string;
+    allow_restricted_indices?: boolean;
+  }>;
+  remote_indices?: Array<{
+    clusters: string[];
+    names: string[];
+    field_security?: Record<'grant' | 'except', string[]>;
+    privileges: string[];
+    query?: string;
+    allow_restricted_indices?: boolean;
+  }>;
+  run_as?: string[];
+}
+/**
+ * Type representing Kibana specific portion of the role definition.
+ */
+export type KibanaPrivilegesType = Array<{
+  spaces: string[];
+  base?: string[];
+  feature?: Record<string, string[]>;
+}>;
diff --git a/packages/deeplinks/observability/locators/dataset_quality.ts b/packages/deeplinks/observability/locators/dataset_quality.ts
index bfa760bf62c06..e30648e3f129c 100644
--- a/packages/deeplinks/observability/locators/dataset_quality.ts
+++ b/packages/deeplinks/observability/locators/dataset_quality.ts
@@ -8,7 +8,7 @@
 
 import { SerializableRecord } from '@kbn/utility-types';
 
-export const DATASET_QUALITY_LOCATOR_ID = 'DATASET_QUALITY_LOCATOR';
+export const DATA_QUALITY_LOCATOR_ID = 'DATA_QUALITY_LOCATOR';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type RefreshInterval = {
@@ -23,11 +23,22 @@ type TimeRangeConfig = {
   refresh: RefreshInterval;
 };
 
+// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
+type DatasetConfig = {
+  rawName: string;
+  type: string;
+  name: string;
+  namespace: string;
+};
+
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type Filters = {
   timeRange: TimeRangeConfig;
 };
 
-export interface DatasetQualityLocatorParams extends SerializableRecord {
+export interface DataQualityLocatorParams extends SerializableRecord {
   filters?: Filters;
+  flyout?: {
+    dataset: DatasetConfig;
+  };
 }
diff --git a/packages/deeplinks/observability/locators/index.ts b/packages/deeplinks/observability/locators/index.ts
index 73fe4b64bce9f..67e79ecb577ea 100644
--- a/packages/deeplinks/observability/locators/index.ts
+++ b/packages/deeplinks/observability/locators/index.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
+export * from './dataset_quality';
 export * from './logs_explorer';
 export * from './observability_logs_explorer';
 export * from './observability_onboarding';
-export * from './dataset_quality';
+export * from './uptime';
diff --git a/packages/deeplinks/observability/locators/uptime.ts b/packages/deeplinks/observability/locators/uptime.ts
new file mode 100644
index 0000000000000..a0f42801b6610
--- /dev/null
+++ b/packages/deeplinks/observability/locators/uptime.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { SerializableRecord } from '@kbn/utility-types';
+
+export const uptimeOverviewLocatorID = 'UPTIME_OVERVIEW_LOCATOR';
+
+export interface UptimeOverviewLocatorInfraParams extends SerializableRecord {
+  ip?: string;
+  host?: string;
+  container?: string;
+  pod?: string;
+}
+
+export interface UptimeOverviewLocatorParams extends SerializableRecord {
+  dateRangeStart?: string;
+  dateRangeEnd?: string;
+  search?: string;
+}
diff --git a/packages/deeplinks/search/constants.ts b/packages/deeplinks/search/constants.ts
index 3fdcc78bb68a1..8aa53658320f5 100644
--- a/packages/deeplinks/search/constants.ts
+++ b/packages/deeplinks/search/constants.ts
@@ -8,7 +8,7 @@
 
 export const ENTERPRISE_SEARCH_APP_ID = 'enterpriseSearch';
 export const ENTERPRISE_SEARCH_CONTENT_APP_ID = 'enterpriseSearchContent';
-export const ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID = 'enterpriseSearchInferenceEndpoints';
+export const ENTERPRISE_SEARCH_RELEVANCE_APP_ID = 'enterpriseSearchRelevance';
 export const ENTERPRISE_SEARCH_APPLICATIONS_APP_ID = 'enterpriseSearchApplications';
 export const ENTERPRISE_SEARCH_ANALYTICS_APP_ID = 'enterpriseSearchAnalytics';
 export const ENTERPRISE_SEARCH_APPSEARCH_APP_ID = 'appSearch';
diff --git a/packages/deeplinks/search/deep_links.ts b/packages/deeplinks/search/deep_links.ts
index f004d1b2c9dd6..4b32ec9757bde 100644
--- a/packages/deeplinks/search/deep_links.ts
+++ b/packages/deeplinks/search/deep_links.ts
@@ -12,6 +12,7 @@ import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
+  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
   ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID,
@@ -23,6 +24,7 @@ import {
 export type EnterpriseSearchApp = typeof ENTERPRISE_SEARCH_APP_ID;
 export type EnterpriseSearchContentApp = typeof ENTERPRISE_SEARCH_CONTENT_APP_ID;
 export type EnterpriseSearchApplicationsApp = typeof ENTERPRISE_SEARCH_APPLICATIONS_APP_ID;
+export type EnterpriseSearchRelevanceApp = typeof ENTERPRISE_SEARCH_RELEVANCE_APP_ID;
 export type EnterpriseSearchAnalyticsApp = typeof ENTERPRISE_SEARCH_ANALYTICS_APP_ID;
 export type EnterpriseSearchAppsearchApp = typeof ENTERPRISE_SEARCH_APPSEARCH_APP_ID;
 export type EnterpriseSearchWorkplaceSearchApp = typeof ENTERPRISE_SEARCH_WORKPLACESEARCH_APP_ID;
@@ -38,10 +40,13 @@ export type ApplicationsLinkId = 'searchApplications' | 'playground';
 
 export type AppsearchLinkId = 'engines';
 
+export type RelevanceLinkId = 'inferenceEndpoints';
+
 export type DeepLinkId =
   | EnterpriseSearchApp
   | EnterpriseSearchContentApp
   | EnterpriseSearchApplicationsApp
+  | EnterpriseSearchRelevanceApp
   | EnterpriseSearchAnalyticsApp
   | EnterpriseSearchAppsearchApp
   | EnterpriseSearchWorkplaceSearchApp
@@ -52,4 +57,5 @@ export type DeepLinkId =
   | SearchHomepage
   | `${EnterpriseSearchContentApp}:${ContentLinkId}`
   | `${EnterpriseSearchApplicationsApp}:${ApplicationsLinkId}`
-  | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`;
+  | `${EnterpriseSearchAppsearchApp}:${AppsearchLinkId}`
+  | `${EnterpriseSearchRelevanceApp}:${RelevanceLinkId}`;
diff --git a/packages/deeplinks/search/index.ts b/packages/deeplinks/search/index.ts
index 663d625e9fd72..a18f0cb31426f 100644
--- a/packages/deeplinks/search/index.ts
+++ b/packages/deeplinks/search/index.ts
@@ -9,7 +9,7 @@
 export {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
diff --git a/packages/kbn-alerts-grouping/README.md b/packages/kbn-alerts-grouping/README.md
new file mode 100644
index 0000000000000..65629e708fc99
--- /dev/null
+++ b/packages/kbn-alerts-grouping/README.md
@@ -0,0 +1,3 @@
+# @kbn/alerts-grouping
+
+Platform components to create hierarchical alerts grouping UIs
diff --git a/packages/kbn-alerts-grouping/index.ts b/packages/kbn-alerts-grouping/index.ts
new file mode 100644
index 0000000000000..e9e2476dde7a7
--- /dev/null
+++ b/packages/kbn-alerts-grouping/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export { AlertsGrouping } from './src/components/alerts_grouping';
+export { type AlertsGroupingProps } from './src/types';
+export { useAlertsGroupingState } from './src/contexts/alerts_grouping_context';
diff --git a/packages/kbn-alerts-grouping/jest.config.js b/packages/kbn-alerts-grouping/jest.config.js
new file mode 100644
index 0000000000000..540837079010f
--- /dev/null
+++ b/packages/kbn-alerts-grouping/jest.config.js
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-alerts-grouping'],
+  setupFilesAfterEnv: ['<rootDir>/packages/kbn-alerts-grouping/setup_tests.ts'],
+};
diff --git a/packages/kbn-alerts-grouping/kibana.jsonc b/packages/kbn-alerts-grouping/kibana.jsonc
new file mode 100644
index 0000000000000..b98a1f0779eb3
--- /dev/null
+++ b/packages/kbn-alerts-grouping/kibana.jsonc
@@ -0,0 +1,5 @@
+{
+  "type": "shared-browser",
+  "id": "@kbn/alerts-grouping",
+  "owner": "@elastic/response-ops"
+}
diff --git a/packages/kbn-alerts-grouping/package.json b/packages/kbn-alerts-grouping/package.json
new file mode 100644
index 0000000000000..9f490fbb2ec10
--- /dev/null
+++ b/packages/kbn-alerts-grouping/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@kbn/alerts-grouping",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/packages/kbn-grouping/setup_test.ts b/packages/kbn-alerts-grouping/setup_tests.ts
similarity index 100%
rename from packages/kbn-grouping/setup_test.ts
rename to packages/kbn-alerts-grouping/setup_tests.ts
diff --git a/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx b/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx
new file mode 100644
index 0000000000000..c60ef03ca35e5
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/components/alerts_grouping.test.tsx
@@ -0,0 +1,495 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Adapted from x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.test.tsx
+ */
+import React from 'react';
+import { render, within, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import type { Filter } from '@kbn/es-query';
+
+import { AlertsGrouping } from './alerts_grouping';
+
+import { useGetAlertsGroupAggregationsQuery } from '@kbn/alerts-ui-shared';
+import useResizeObserver from 'use-resize-observer/polyfilled';
+import { groupingSearchResponse } from '../mocks/grouping_query.mock';
+import { useAlertsGroupingState } from '../contexts/alerts_grouping_context';
+import { I18nProvider } from '@kbn/i18n-react';
+import {
+  mockFeatureIds,
+  mockDate,
+  mockGroupingProps,
+  mockGroupingId,
+  mockOptions,
+} from '../mocks/grouping_props.mock';
+
+jest.mock('@kbn/alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query', () => ({
+  useGetAlertsGroupAggregationsQuery: jest.fn(),
+}));
+
+jest.mock('@kbn/alerts-ui-shared/src/common/hooks/use_alert_data_view', () => ({
+  useAlertDataView: jest.fn().mockReturnValue({ dataViews: [{ fields: [] }] }),
+}));
+
+jest.mock('../contexts/alerts_grouping_context', () => {
+  const original = jest.requireActual('../contexts/alerts_grouping_context');
+  return {
+    ...original,
+    useAlertsGroupingState: jest.fn(),
+  };
+});
+
+const mockUseAlertsGroupingState = useAlertsGroupingState as jest.Mock;
+
+jest.mock('uuid', () => ({
+  v4: jest.fn().mockReturnValue('test-uuid'),
+}));
+
+const mockUseGetAlertsGroupAggregationsQuery = useGetAlertsGroupAggregationsQuery as jest.Mock;
+
+const mockUseResizeObserver: jest.Mock = useResizeObserver as jest.Mock;
+jest.mock('use-resize-observer/polyfilled');
+mockUseResizeObserver.mockImplementation(() => ({}));
+
+const renderChildComponent = (_groupingFilters: Filter[]) => <p data-test-subj="alerts-table" />;
+
+const getMockStorageState = (groups: string[] = ['none']) =>
+  JSON.stringify({
+    [mockGroupingId]: {
+      activeGroups: groups,
+      options: mockOptions,
+    },
+  });
+
+const mockQueryResponse = {
+  loading: false,
+  data: {
+    aggregations: {
+      groupsCount: {
+        value: 0,
+      },
+    },
+  },
+};
+
+const TestProviders = ({ children }: { children: React.ReactNode }) => (
+  <I18nProvider>{children}</I18nProvider>
+);
+
+const mockAlertsGroupingState = {
+  grouping: {
+    options: mockOptions,
+    activeGroups: ['kibana.alert.rule.name'],
+  },
+  updateGrouping: jest.fn(),
+};
+
+describe('AlertsGrouping', () => {
+  beforeEach(() => {
+    window.localStorage.clear();
+    mockUseGetAlertsGroupAggregationsQuery.mockImplementation(() => ({
+      loading: false,
+      data: groupingSearchResponse,
+    }));
+    mockUseAlertsGroupingState.mockReturnValue(mockAlertsGroupingState);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders empty grouping table when group is selected without data', () => {
+    mockUseGetAlertsGroupAggregationsQuery.mockReturnValue(mockQueryResponse);
+    window.localStorage.setItem(
+      `grouping-table-${mockGroupingId}`,
+      getMockStorageState(['kibana.alert.rule.name'])
+    );
+
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+    expect(screen.queryByTestId('alerts-table')).not.toBeInTheDocument();
+    expect(screen.getByTestId('empty-results-panel')).toBeInTheDocument();
+  });
+
+  it('renders grouping table in first accordion level when single group is selected', () => {
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+    expect(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('alerts-table')
+    ).toBeInTheDocument();
+  });
+
+  it('Query gets passed correctly', () => {
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+    expect(mockUseGetAlertsGroupAggregationsQuery).toHaveBeenLastCalledWith(
+      expect.objectContaining({
+        params: {
+          aggregations: {},
+          featureIds: mockFeatureIds,
+          groupByField: 'kibana.alert.rule.name',
+          filters: [
+            {
+              bool: {
+                filter: [],
+                must: [],
+                must_not: [],
+                should: [],
+              },
+            },
+            {
+              range: {
+                '@timestamp': {
+                  gte: mockDate.from,
+                  lte: mockDate.to,
+                },
+              },
+            },
+          ],
+          pageIndex: 0,
+          pageSize: 25,
+        },
+      })
+    );
+  });
+
+  it('renders grouping table in second accordion level when 2 groups are selected', () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'user.name'],
+      },
+    });
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+    expect(
+      within(screen.getByTestId('level-0-group-0')).queryByTestId('alerts-table')
+    ).not.toBeInTheDocument();
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+    expect(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('alerts-table')
+    ).toBeInTheDocument();
+  });
+
+  it('resets all levels pagination when selected group changes', async () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'host.name', 'user.name'],
+      },
+    });
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    userEvent.click(screen.getByTestId('pagination-button-1'));
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('pagination-button-1')
+    );
+
+    [
+      screen.getByTestId('grouping-level-0-pagination'),
+      screen.getByTestId('grouping-level-1-pagination'),
+      screen.getByTestId('grouping-level-2-pagination'),
+    ].forEach((pagination) => {
+      expect(
+        within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+      ).toEqual(null);
+      expect(
+        within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+      ).toEqual('true');
+    });
+
+    userEvent.click(screen.getAllByTestId('group-selector-dropdown')[0]);
+    // Wait for element to have pointer events enabled
+    await waitFor(() => userEvent.click(screen.getAllByTestId('panel-user.name')[0]));
+
+    [
+      screen.getByTestId('grouping-level-0-pagination'),
+      screen.getByTestId('grouping-level-1-pagination'),
+      // level 2 has been removed with the group selection change
+    ].forEach((pagination) => {
+      expect(
+        within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+      ).toEqual('true');
+      expect(
+        within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+      ).toEqual(null);
+    });
+  });
+
+  it('resets all levels pagination when global query updates', () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'host.name', 'user.name'],
+      },
+    });
+
+    const { rerender } = render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    userEvent.click(screen.getByTestId('pagination-button-1'));
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('pagination-button-1')
+    );
+
+    rerender(
+      <TestProviders>
+        <AlertsGrouping
+          {...{ ...mockGroupingProps, globalQuery: { query: 'updated', language: 'language' } }}
+        >
+          {renderChildComponent}
+        </AlertsGrouping>
+      </TestProviders>
+    );
+
+    [
+      screen.getByTestId('grouping-level-0-pagination'),
+      screen.getByTestId('grouping-level-1-pagination'),
+      screen.getByTestId('grouping-level-2-pagination'),
+    ].forEach((pagination) => {
+      expect(
+        within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+      ).toEqual('true');
+      expect(
+        within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+      ).toEqual(null);
+    });
+  });
+
+  it('resets only most inner group pagination when its parent groups open/close', () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'host.name', 'user.name'],
+      },
+    });
+
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    // set level 0 page to 2
+    userEvent.click(screen.getByTestId('pagination-button-1'));
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    // set level 1 page to 2
+    userEvent.click(
+      within(screen.getByTestId('level-0-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    // set level 2 page to 2
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(screen.getByTestId('level-2-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    // open different level 1 group
+
+    // level 0, 1 pagination is the same
+    userEvent.click(
+      within(screen.getByTestId('level-1-group-1')).getByTestId('group-panel-toggle')
+    );
+    [
+      screen.getByTestId('grouping-level-0-pagination'),
+      screen.getByTestId('grouping-level-1-pagination'),
+    ].forEach((pagination) => {
+      expect(
+        within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+      ).toEqual(null);
+      expect(
+        within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+      ).toEqual('true');
+    });
+
+    // level 2 pagination is reset
+    expect(
+      within(screen.getByTestId('grouping-level-2-pagination'))
+        .getByTestId('pagination-button-0')
+        .getAttribute('aria-current')
+    ).toEqual('true');
+    expect(
+      within(screen.getByTestId('grouping-level-2-pagination'))
+        .getByTestId('pagination-button-1')
+        .getAttribute('aria-current')
+    ).toEqual(null);
+  });
+
+  it(`resets innermost level's current page when that level's page size updates`, async () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'host.name', 'user.name'],
+      },
+    });
+
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    userEvent.click(await screen.findByTestId('pagination-button-1'));
+    userEvent.click(
+      within(await screen.findByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+    userEvent.click(
+      within(await screen.findByTestId('level-0-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(await screen.findByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    userEvent.click(
+      within(await screen.findByTestId('level-1-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(await screen.findByTestId('grouping-level-2')).getByTestId(
+        'tablePaginationPopoverButton'
+      )
+    );
+    userEvent.click(await screen.findByTestId('tablePagination-100-rows'));
+
+    [
+      await screen.findByTestId('grouping-level-0-pagination'),
+      await screen.findByTestId('grouping-level-1-pagination'),
+      await screen.findByTestId('grouping-level-2-pagination'),
+    ].forEach((pagination, i) => {
+      if (i !== 2) {
+        expect(
+          within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+        ).toEqual(null);
+        expect(
+          within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+        ).toEqual('true');
+      } else {
+        expect(
+          within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+        ).toEqual('true');
+        expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
+      }
+    });
+  });
+
+  it(`resets outermost level's current page when that level's page size updates`, async () => {
+    mockUseAlertsGroupingState.mockReturnValue({
+      ...mockAlertsGroupingState,
+      grouping: {
+        ...mockAlertsGroupingState.grouping,
+        activeGroups: ['kibana.alert.rule.name', 'host.name', 'user.name'],
+      },
+    });
+
+    render(
+      <TestProviders>
+        <AlertsGrouping {...mockGroupingProps}>{renderChildComponent}</AlertsGrouping>
+      </TestProviders>
+    );
+
+    userEvent.click(screen.getByTestId('pagination-button-1'));
+    userEvent.click(
+      within(await screen.findByTestId('level-0-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    userEvent.click(
+      within(await screen.findByTestId('level-0-group-0')).getByTestId('pagination-button-1')
+    );
+    userEvent.click(
+      within(await screen.findByTestId('level-1-group-0')).getByTestId('group-panel-toggle')
+    );
+
+    userEvent.click(
+      within(await screen.findByTestId('level-1-group-0')).getByTestId('pagination-button-1')
+    );
+    const tablePaginations = await screen.findAllByTestId('tablePaginationPopoverButton');
+    userEvent.click(tablePaginations[tablePaginations.length - 1]);
+    await waitFor(() => userEvent.click(screen.getByTestId('tablePagination-100-rows')));
+
+    [
+      screen.getByTestId('grouping-level-0-pagination'),
+      screen.getByTestId('grouping-level-1-pagination'),
+      screen.getByTestId('grouping-level-2-pagination'),
+    ].forEach((pagination, i) => {
+      if (i !== 0) {
+        expect(
+          within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+        ).toEqual(null);
+        expect(
+          within(pagination).getByTestId('pagination-button-1').getAttribute('aria-current')
+        ).toEqual('true');
+      } else {
+        expect(
+          within(pagination).getByTestId('pagination-button-0').getAttribute('aria-current')
+        ).toEqual('true');
+        expect(within(pagination).queryByTestId('pagination-button-1')).not.toBeInTheDocument();
+      }
+    });
+  });
+});
diff --git a/packages/kbn-alerts-grouping/src/components/alerts_grouping.tsx b/packages/kbn-alerts-grouping/src/components/alerts_grouping.tsx
new file mode 100644
index 0000000000000..130997dd393ce
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/components/alerts_grouping.tsx
@@ -0,0 +1,285 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, {
+  Dispatch,
+  memo,
+  SetStateAction,
+  useCallback,
+  useEffect,
+  useMemo,
+  useRef,
+  useState,
+} from 'react';
+import type { Filter } from '@kbn/es-query';
+import { isNoneGroup, useGrouping } from '@kbn/grouping';
+import { isEqual } from 'lodash/fp';
+import { i18n } from '@kbn/i18n';
+import { useAlertDataView } from '@kbn/alerts-ui-shared';
+import useLocalStorage from 'react-use/lib/useLocalStorage';
+import { AlertsGroupingLevel, AlertsGroupingLevelProps } from './alerts_grouping_level';
+import { AlertsGroupingProps } from '../types';
+import {
+  AlertsGroupingContextProvider,
+  useAlertsGroupingState,
+} from '../contexts/alerts_grouping_context';
+import { DEFAULT_PAGE_INDEX, DEFAULT_PAGE_SIZE, MAX_GROUPING_LEVELS } from '../constants';
+
+/**
+ * Handles recursive rendering of grouping levels
+ */
+const NextLevel = ({
+  level,
+  selectedGroups,
+  children,
+  parentGroupingFilter,
+  groupingFilters,
+  getLevel,
+}: Pick<AlertsGroupingLevelProps, 'children' | 'parentGroupingFilter'> & {
+  level: number;
+  selectedGroups: string[];
+  groupingFilters: Filter[];
+  getLevel: (level: number, selectedGroup: string, parentGroupingFilter?: Filter[]) => JSX.Element;
+}): JSX.Element => {
+  const nextGroupingFilters = useMemo(
+    () => [...groupingFilters, ...(parentGroupingFilter ?? [])],
+    [groupingFilters, parentGroupingFilter]
+  );
+  if (level < selectedGroups.length - 1) {
+    return getLevel(level + 1, selectedGroups[level + 1], nextGroupingFilters)!;
+  }
+  return children(nextGroupingFilters)!;
+};
+
+const AlertsGroupingInternal = (props: AlertsGroupingProps) => {
+  const {
+    groupingId,
+    services,
+    featureIds,
+    defaultGroupingOptions,
+    defaultFilters,
+    globalFilters,
+    globalQuery,
+    renderGroupPanel,
+    getGroupStats,
+    children,
+  } = props;
+  const { dataViews, notifications, http } = services;
+  const { grouping, updateGrouping } = useAlertsGroupingState(groupingId);
+
+  const { dataViews: alertDataViews } = useAlertDataView({
+    featureIds,
+    dataViewsService: dataViews,
+    http,
+    toasts: notifications.toasts,
+  });
+  const dataView = useMemo(() => alertDataViews?.[0], [alertDataViews]);
+  const [pageSize, setPageSize] = useLocalStorage<number[]>(
+    `grouping-table-${groupingId}`,
+    Array(MAX_GROUPING_LEVELS).fill(DEFAULT_PAGE_SIZE)
+  ) as [number[], Dispatch<SetStateAction<number[]>>, () => void];
+
+  const onOptionsChange = useCallback(
+    (options) => {
+      // useGrouping > useAlertsGroupingState options sync
+      // the available grouping options change when the user selects
+      // a new field not in the default ones
+      updateGrouping({
+        options,
+      });
+    },
+    [updateGrouping]
+  );
+
+  const { getGrouping, selectedGroups, setSelectedGroups } = useGrouping({
+    componentProps: {
+      groupPanelRenderer: renderGroupPanel,
+      getGroupStats,
+      unit: (totalCount) =>
+        i18n.translate('alertsGrouping.unit', {
+          values: { totalCount },
+          defaultMessage: `{totalCount, plural, =1 {alert} other {alerts}}`,
+        }),
+    },
+    defaultGroupingOptions,
+    fields: dataView?.fields ?? [],
+    groupingId,
+    maxGroupingLevels: MAX_GROUPING_LEVELS,
+    onOptionsChange,
+  });
+
+  useEffect(() => {
+    // The `none` grouping is managed from the internal selector state
+    if (isNoneGroup(selectedGroups)) {
+      // Set active groups from selected groups
+      updateGrouping({
+        activeGroups: selectedGroups,
+      });
+    }
+  }, [selectedGroups, updateGrouping]);
+
+  useEffect(() => {
+    if (!isNoneGroup(grouping.activeGroups)) {
+      // Set selected groups from active groups
+      setSelectedGroups(grouping.activeGroups);
+    }
+  }, [grouping.activeGroups, setSelectedGroups]);
+
+  const [pageIndex, setPageIndex] = useState<number[]>(
+    Array(MAX_GROUPING_LEVELS).fill(DEFAULT_PAGE_INDEX)
+  );
+
+  const resetAllPagination = useCallback(() => {
+    setPageIndex((curr) => curr.map(() => DEFAULT_PAGE_INDEX));
+  }, []);
+
+  const setPageVar = useCallback(
+    (newNumber: number, groupingLevel: number, pageType: 'index' | 'size') => {
+      if (pageType === 'index') {
+        setPageIndex((currentIndex) => {
+          const newArr = [...currentIndex];
+          newArr[groupingLevel] = newNumber;
+          return newArr;
+        });
+      }
+
+      if (pageType === 'size') {
+        setPageSize((currentIndex) => {
+          const newArr = [...currentIndex];
+          newArr[groupingLevel] = newNumber;
+          return newArr;
+        });
+        // set page index to 0 when page size is changed
+        setPageIndex((currentIndex) => {
+          const newArr = [...currentIndex];
+          newArr[groupingLevel] = 0;
+          return newArr;
+        });
+      }
+    },
+    [setPageSize]
+  );
+
+  const paginationResetTriggers = useRef({
+    defaultFilters,
+    globalFilters,
+    globalQuery,
+    selectedGroups,
+  });
+
+  useEffect(() => {
+    const triggers = {
+      defaultFilters,
+      globalFilters,
+      globalQuery,
+      selectedGroups,
+    };
+    if (!isEqual(paginationResetTriggers.current, triggers)) {
+      resetAllPagination();
+      paginationResetTriggers.current = triggers;
+    }
+  }, [defaultFilters, globalFilters, globalQuery, resetAllPagination, selectedGroups]);
+
+  const getLevel = useCallback(
+    (level: number, selectedGroup: string, parentGroupingFilter?: Filter[]) => {
+      const resetGroupChildrenPagination = (parentLevel: number) => {
+        setPageIndex((allPages) => {
+          const resetPages = allPages.splice(parentLevel + 1, allPages.length);
+          return [...allPages, ...resetPages.map(() => DEFAULT_PAGE_INDEX)];
+        });
+      };
+
+      return (
+        <AlertsGroupingLevel
+          {...props}
+          getGrouping={getGrouping}
+          groupingLevel={level}
+          onGroupClose={() => resetGroupChildrenPagination(level)}
+          pageIndex={pageIndex[level] ?? DEFAULT_PAGE_INDEX}
+          pageSize={pageSize[level] ?? DEFAULT_PAGE_SIZE}
+          parentGroupingFilter={parentGroupingFilter}
+          selectedGroup={selectedGroup}
+          setPageIndex={(newIndex: number) => setPageVar(newIndex, level, 'index')}
+          setPageSize={(newSize: number) => setPageVar(newSize, level, 'size')}
+        >
+          {(groupingFilters) => (
+            <NextLevel
+              selectedGroups={selectedGroups}
+              groupingFilters={groupingFilters}
+              getLevel={getLevel}
+              parentGroupingFilter={parentGroupingFilter}
+              level={level}
+            >
+              {children}
+            </NextLevel>
+          )}
+        </AlertsGroupingLevel>
+      );
+    },
+    [children, getGrouping, pageIndex, pageSize, props, selectedGroups, setPageVar]
+  );
+
+  if (!dataView) {
+    return null;
+  }
+
+  return getLevel(0, selectedGroups[0]);
+};
+
+/**
+ * A coordinator component to show multiple alert tables grouped by one or more fields
+ *
+ * @example Basic grouping
+ * ```ts
+ * const {
+ *   notifications,
+ *   dataViews,
+ *   http,
+ * } = useKibana().services;
+ *
+ *
+ * return (
+ *   <AlertsGrouping
+ *     featureIds={[...]}
+ *     globalQuery={{ query: ..., language: 'kql' }}
+ *     globalFilters={...}
+ *     from={...}
+ *     to={...}
+ *     groupingId={...}
+ *     defaultGroupingOptions={...}
+ *     getAggregationsByGroupingField={getAggregationsByGroupingField}
+ *     renderGroupPanel={renderGroupPanel}
+ *     getGroupStats={getStats}
+ *     services={{
+ *       notifications,
+ *       dataViews,
+ *       http,
+ *     }}
+ *   >
+ *     {(groupingFilters) => {
+ *       const query = buildEsQuery({
+ *         filters: groupingFilters,
+ *       });
+ *       return (
+ *         <AlertsTable
+ *           query={query}
+ *           ...
+ *         />
+ *       );
+ *     }}
+ *   </AlertsGrouping>
+ * );
+ * ```
+ */
+export const AlertsGrouping = memo((props: AlertsGroupingProps) => {
+  return (
+    <AlertsGroupingContextProvider>
+      <AlertsGroupingInternal {...props} />
+    </AlertsGroupingContextProvider>
+  );
+});
diff --git a/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.test.tsx b/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.test.tsx
new file mode 100644
index 0000000000000..45424f34d9cb4
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.test.tsx
@@ -0,0 +1,121 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { render, waitFor } from '@testing-library/react';
+import { AlertsGroupingLevel, type AlertsGroupingLevelProps } from './alerts_grouping_level';
+import { useGetAlertsGroupAggregationsQuery } from '@kbn/alerts-ui-shared';
+import * as buildEsQueryModule from '@kbn/es-query/src/es_query/build_es_query';
+import { mockGroupingProps } from '../mocks/grouping_props.mock';
+import { groupingSearchResponse } from '../mocks/grouping_query.mock';
+
+jest.mock('@kbn/alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query', () => ({
+  useGetAlertsGroupAggregationsQuery: jest.fn(),
+}));
+
+const mockUseGetAlertsGroupAggregationsQuery = useGetAlertsGroupAggregationsQuery as jest.Mock;
+mockUseGetAlertsGroupAggregationsQuery.mockReturnValue({
+  loading: false,
+  data: groupingSearchResponse,
+});
+
+jest.mock('@kbn/alerts-ui-shared/src/common/hooks/use_alert_data_view', () => ({
+  useAlertDataView: jest.fn().mockReturnValue({ dataViews: [{ fields: [] }] }),
+}));
+
+jest.mock('../contexts/alerts_grouping_context', () => {
+  const original = jest.requireActual('../contexts/alerts_grouping_context');
+  return {
+    ...original,
+    useAlertsGroupingState: jest.fn(),
+  };
+});
+
+const getGrouping = jest
+  .fn()
+  .mockImplementation(({ renderChildComponent }) => <span>{renderChildComponent()}</span>);
+
+const mockGroupingLevelProps: Omit<AlertsGroupingLevelProps, 'children'> = {
+  ...mockGroupingProps,
+  getGrouping,
+  onGroupClose: jest.fn(),
+  pageIndex: 0,
+  pageSize: 10,
+  selectedGroup: 'selectedGroup',
+  setPageIndex: jest.fn(),
+  setPageSize: jest.fn(),
+};
+
+describe('AlertsGroupingLevel', () => {
+  let buildEsQuerySpy: jest.SpyInstance;
+
+  beforeAll(() => {
+    buildEsQuerySpy = jest.spyOn(buildEsQueryModule, 'buildEsQuery');
+  });
+
+  it('should render', () => {
+    const { getByTestId } = render(
+      <AlertsGroupingLevel {...mockGroupingLevelProps}>
+        {() => <span data-test-subj="grouping-level" />}
+      </AlertsGroupingLevel>
+    );
+    expect(getByTestId('grouping-level')).toBeInTheDocument();
+  });
+
+  it('should account for global, default and parent filters', async () => {
+    const globalFilter = { meta: { value: 'global', disabled: false } };
+    const defaultFilter = { meta: { value: 'default' } };
+    const parentFilter = { meta: { value: 'parent' } };
+    render(
+      <AlertsGroupingLevel
+        {...mockGroupingLevelProps}
+        globalFilters={[globalFilter]}
+        defaultFilters={[defaultFilter]}
+        parentGroupingFilter={[parentFilter]}
+      >
+        {() => <span data-test-subj="grouping-level" />}
+      </AlertsGroupingLevel>
+    );
+    await waitFor(() =>
+      expect(buildEsQuerySpy).toHaveBeenLastCalledWith(undefined, expect.anything(), [
+        globalFilter,
+        defaultFilter,
+        parentFilter,
+      ])
+    );
+  });
+
+  it('should discard disabled global filters', async () => {
+    const globalFilters = [
+      { meta: { value: 'global1', disabled: false } },
+      { meta: { value: 'global2', disabled: true } },
+    ];
+    render(
+      <AlertsGroupingLevel {...mockGroupingLevelProps} globalFilters={globalFilters}>
+        {() => <span data-test-subj="grouping-level" />}
+      </AlertsGroupingLevel>
+    );
+    await waitFor(() =>
+      expect(buildEsQuerySpy).toHaveBeenLastCalledWith(undefined, expect.anything(), [
+        globalFilters[0],
+      ])
+    );
+  });
+
+  it('should call getGrouping with the right aggregations', () => {
+    render(
+      <AlertsGroupingLevel {...mockGroupingLevelProps}>
+        {() => <span data-test-subj="grouping-level" />}
+      </AlertsGroupingLevel>
+    );
+
+    expect(Object.keys(getGrouping.mock.calls[0][0].data)).toMatchObject(
+      Object.keys(groupingSearchResponse.aggregations)
+    );
+  });
+});
diff --git a/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.tsx b/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.tsx
new file mode 100644
index 0000000000000..e4511e8dea774
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/components/alerts_grouping_level.tsx
@@ -0,0 +1,173 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { memo, ReactElement, useMemo } from 'react';
+import { v4 as uuidv4 } from 'uuid';
+import type { Filter } from '@kbn/es-query';
+import { buildEsQuery } from '@kbn/es-query';
+import { type GroupingAggregation } from '@kbn/grouping';
+import { isNoneGroup } from '@kbn/grouping';
+import type { DynamicGroupingProps } from '@kbn/grouping/src';
+import { parseGroupingQuery } from '@kbn/grouping/src';
+import {
+  useGetAlertsGroupAggregationsQuery,
+  UseGetAlertsGroupAggregationsQueryProps,
+} from '@kbn/alerts-ui-shared';
+import { AlertsGroupingProps } from '../types';
+
+export interface AlertsGroupingLevelProps<T extends Record<string, unknown> = {}>
+  extends AlertsGroupingProps<T> {
+  getGrouping: (
+    props: Omit<DynamicGroupingProps<T>, 'groupSelector' | 'pagination'>
+  ) => ReactElement;
+  groupingLevel?: number;
+  onGroupClose: () => void;
+  pageIndex: number;
+  pageSize: number;
+  parentGroupingFilter?: Filter[];
+  selectedGroup: string;
+  setPageIndex: (newIndex: number) => void;
+  setPageSize: (newSize: number) => void;
+}
+
+const DEFAULT_FILTERS: Filter[] = [];
+
+/**
+ * Renders an alerts grouping level
+ */
+export const AlertsGroupingLevel = memo(
+  <T extends Record<string, unknown> = {}>({
+    featureIds,
+    defaultFilters = DEFAULT_FILTERS,
+    from,
+    getGrouping,
+    globalFilters,
+    globalQuery,
+    groupingLevel,
+    loading = false,
+    onGroupClose,
+    pageIndex,
+    pageSize,
+    parentGroupingFilter,
+    children,
+    selectedGroup,
+    setPageIndex,
+    setPageSize,
+    to,
+    takeActionItems,
+    getAggregationsByGroupingField,
+    services: { http, notifications },
+  }: AlertsGroupingLevelProps<T>) => {
+    const filters = useMemo(() => {
+      try {
+        return [
+          buildEsQuery(undefined, globalQuery != null ? [globalQuery] : [], [
+            ...(globalFilters?.filter((f) => f.meta.disabled === false) ?? []),
+            ...(defaultFilters ?? []),
+            ...(parentGroupingFilter ?? []),
+          ]),
+        ];
+      } catch (e) {
+        return [];
+      }
+    }, [defaultFilters, globalFilters, globalQuery, parentGroupingFilter]);
+
+    // Create a unique, but stable (across re-renders) value
+    const uniqueValue = useMemo(() => `alerts-grouping-level-${uuidv4()}`, []);
+
+    const aggregationsQuery = useMemo<UseGetAlertsGroupAggregationsQueryProps['params']>(() => {
+      return {
+        featureIds,
+        groupByField: selectedGroup,
+        aggregations: getAggregationsByGroupingField(selectedGroup)?.reduce(
+          (acc, val) => Object.assign(acc, val),
+          {}
+        ),
+        filters: [
+          ...filters,
+          {
+            range: {
+              '@timestamp': {
+                gte: from,
+                lte: to,
+              },
+            },
+          },
+        ],
+        pageIndex,
+        pageSize,
+      };
+    }, [
+      featureIds,
+      filters,
+      from,
+      getAggregationsByGroupingField,
+      pageIndex,
+      pageSize,
+      selectedGroup,
+      to,
+    ]);
+
+    const { data: alertGroupsData, isLoading: isLoadingGroups } =
+      useGetAlertsGroupAggregationsQuery<GroupingAggregation<T>>({
+        http,
+        toasts: notifications.toasts,
+        enabled: aggregationsQuery && !isNoneGroup([selectedGroup]),
+        params: aggregationsQuery,
+      });
+
+    const queriedGroup = useMemo<string | null>(
+      () => (!isNoneGroup([selectedGroup]) ? selectedGroup : null),
+      [selectedGroup]
+    );
+
+    const aggs = useMemo(
+      // queriedGroup because `selectedGroup` updates before the query response
+      () =>
+        parseGroupingQuery(
+          // fallback to selectedGroup if queriedGroup.current is null, this happens in tests
+          queriedGroup === null ? selectedGroup : queriedGroup,
+          uniqueValue,
+          alertGroupsData?.aggregations
+        ),
+      [alertGroupsData?.aggregations, queriedGroup, selectedGroup, uniqueValue]
+    );
+
+    return useMemo(
+      () =>
+        getGrouping({
+          activePage: pageIndex,
+          data: aggs,
+          groupingLevel,
+          isLoading: loading || isLoadingGroups,
+          itemsPerPage: pageSize,
+          onChangeGroupsItemsPerPage: (size: number) => setPageSize(size),
+          onChangeGroupsPage: (index) => setPageIndex(index),
+          onGroupClose,
+          renderChildComponent: children,
+          selectedGroup,
+          takeActionItems,
+        }),
+      [
+        getGrouping,
+        pageIndex,
+        aggs,
+        groupingLevel,
+        loading,
+        isLoadingGroups,
+        pageSize,
+        onGroupClose,
+        children,
+        selectedGroup,
+        takeActionItems,
+        setPageSize,
+        setPageIndex,
+      ]
+    );
+  }
+);
diff --git a/packages/kbn-alerts-grouping/src/constants.ts b/packages/kbn-alerts-grouping/src/constants.ts
new file mode 100644
index 0000000000000..d42678e64520c
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/constants.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const DEFAULT_PAGE_SIZE = 25;
+export const DEFAULT_PAGE_INDEX = 0;
+export const MAX_GROUPING_LEVELS = 3;
diff --git a/packages/kbn-alerts-grouping/src/contexts/alerts_grouping_context.tsx b/packages/kbn-alerts-grouping/src/contexts/alerts_grouping_context.tsx
new file mode 100644
index 0000000000000..cc5e06e652cd4
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/contexts/alerts_grouping_context.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React, {
+  createContext,
+  Dispatch,
+  PropsWithChildren,
+  SetStateAction,
+  useCallback,
+  useContext,
+  useMemo,
+  useState,
+} from 'react';
+import { AlertsGroupingState, GroupModel } from '../types';
+
+const initialActiveGroups = ['none'];
+
+export const AlertsGroupingContext = createContext({
+  groupingState: {} as AlertsGroupingState,
+  setGroupingState: (() => {}) as Dispatch<SetStateAction<AlertsGroupingState>>,
+});
+
+export const AlertsGroupingContextProvider = ({ children }: PropsWithChildren<{}>) => {
+  const [groupingState, setGroupingState] = useState<AlertsGroupingState>({});
+  return (
+    <AlertsGroupingContext.Provider
+      value={useMemo(
+        () => ({ groupingState, setGroupingState }),
+        [groupingState, setGroupingState]
+      )}
+    >
+      {children}
+    </AlertsGroupingContext.Provider>
+  );
+};
+
+export const useAlertsGroupingState = (groupingId: string) => {
+  const { groupingState, setGroupingState } = useContext(AlertsGroupingContext);
+  const updateGrouping = useCallback(
+    (groupModel: Partial<GroupModel> | null) => {
+      if (groupModel === null) {
+        setGroupingState((prevState) => {
+          const newState = { ...prevState };
+          delete newState[groupingId];
+          return newState;
+        });
+        return;
+      }
+      setGroupingState((prevState) => ({
+        ...prevState,
+        [groupingId]: {
+          // @ts-expect-error options might not be defined
+          options: [],
+          // @ts-expect-error activeGroups might not be defined
+          activeGroups: initialActiveGroups,
+          ...prevState[groupingId],
+          ...groupModel,
+        },
+      }));
+    },
+    [setGroupingState, groupingId]
+  );
+  const grouping = useMemo(
+    () => groupingState[groupingId] ?? { activeGroups: ['none'] },
+    [groupingState, groupingId]
+  );
+  return {
+    grouping,
+    updateGrouping,
+  };
+};
diff --git a/packages/kbn-alerts-grouping/src/index.ts b/packages/kbn-alerts-grouping/src/index.ts
new file mode 100644
index 0000000000000..db8b9dc84f8f6
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export * from './components/alerts_grouping';
+export * from './contexts/alerts_grouping_context';
+export * from './types';
diff --git a/packages/kbn-alerts-grouping/src/mocks/grouping_props.mock.tsx b/packages/kbn-alerts-grouping/src/mocks/grouping_props.mock.tsx
new file mode 100644
index 0000000000000..ac8e55bfb0222
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/mocks/grouping_props.mock.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { AlertConsumers } from '@kbn/rule-data-utils';
+import { AlertsGroupingProps } from '../types';
+
+export const mockGroupingId = 'test';
+
+export const mockFeatureIds = [AlertConsumers.STACK_ALERTS];
+
+export const mockDate = {
+  from: '2020-07-07T08:20:18.966Z',
+  to: '2020-07-08T08:20:18.966Z',
+};
+
+export const mockOptions = [
+  { label: 'ruleName', key: 'kibana.alert.rule.name' },
+  { label: 'userName', key: 'user.name' },
+  { label: 'hostName', key: 'host.name' },
+  { label: 'sourceIP', key: 'source.ip' },
+];
+
+export const mockGroupingProps: Omit<AlertsGroupingProps, 'children'> = {
+  ...mockDate,
+  groupingId: mockGroupingId,
+  featureIds: mockFeatureIds,
+  defaultGroupingOptions: mockOptions,
+  getAggregationsByGroupingField: () => [],
+  getGroupStats: () => [{ title: 'Stat', component: <span /> }],
+  renderGroupPanel: () => <span />,
+  takeActionItems: undefined,
+  defaultFilters: [],
+  globalFilters: [],
+  globalQuery: {
+    query: 'query',
+    language: 'language',
+  },
+  loading: false,
+  services: {
+    dataViews: {
+      clearInstanceCache: jest.fn(),
+      create: jest.fn(),
+    } as unknown as AlertsGroupingProps['services']['dataViews'],
+    http: {
+      get: jest.fn(),
+    } as unknown as AlertsGroupingProps['services']['http'],
+    notifications: {
+      toasts: {
+        addDanger: jest.fn(),
+      },
+    } as unknown as AlertsGroupingProps['services']['notifications'],
+  },
+};
diff --git a/packages/kbn-alerts-grouping/src/mocks/grouping_query.mock.ts b/packages/kbn-alerts-grouping/src/mocks/grouping_query.mock.ts
new file mode 100644
index 0000000000000..3cdf07ec8c31f
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/mocks/grouping_query.mock.ts
@@ -0,0 +1,1382 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export const getQuery = ({
+  selectedGroup,
+  uniqueValue,
+  timeRange,
+  featureIds,
+}: {
+  selectedGroup: string;
+  uniqueValue: string;
+  timeRange: { from: string; to: string };
+  featureIds: string[];
+}) => ({
+  _source: false,
+  aggs: {
+    unitsCount: {
+      value_count: {
+        field: 'groupByField',
+      },
+    },
+    groupsCount: {
+      cardinality: {
+        field: 'groupByField',
+      },
+    },
+    groupByFields: {
+      aggs: {
+        bucket_truncate: {
+          bucket_sort: {
+            from: 0,
+            size: 25,
+            sort: [
+              {
+                unitsCount: {
+                  order: 'desc',
+                },
+              },
+            ],
+          },
+        },
+      },
+      terms: {
+        field: 'groupByField',
+        size: 10000,
+      },
+    },
+  },
+  feature_ids: featureIds,
+  query: {
+    bool: {
+      filter: [
+        { bool: { filter: [], must: [], must_not: [], should: [] } },
+        {
+          range: {
+            '@timestamp': {
+              gte: timeRange.from,
+              lte: timeRange.to,
+            },
+          },
+        },
+      ],
+    },
+  },
+  runtime_mappings: {
+    groupByField: {
+      type: 'keyword',
+      script: {
+        source:
+          "if (doc[params['selectedGroup']].size()==0) { emit(params['uniqueValue']) } else { emit(doc[params['selectedGroup']].join(params['uniqueValue']))}",
+        params: {
+          selectedGroup,
+          uniqueValue,
+        },
+      },
+    },
+  },
+  size: 0,
+});
+
+export const groupingSearchResponse = {
+  hits: {
+    total: {
+      value: 6048,
+      relation: 'eq',
+    },
+    max_score: null,
+    hits: [],
+  },
+  aggregations: {
+    groupsCount: {
+      value: 32,
+    },
+    groupByFields: {
+      buckets: [
+        {
+          key: ['critical hosts [Duplicate]'],
+          key_as_string: 'critical hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical hosts [Duplicate] [Duplicate]'],
+          key_as_string: 'critical hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts [Duplicate]'],
+          key_as_string: 'high hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts [Duplicate] [Duplicate]'],
+          key_as_string: 'high hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts  [Duplicate]'],
+          key_as_string: 'low hosts  [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts  [Duplicate] [Duplicate]'],
+          key_as_string: 'low hosts  [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts [Duplicate]'],
+          key_as_string: 'medium hosts [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts [Duplicate] [Duplicate]'],
+          key_as_string: 'medium hosts [Duplicate] [Duplicate]',
+          doc_count: 300,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 300,
+              },
+              {
+                key: 'rule',
+                doc_count: 300,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 300,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 300,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical users  [Duplicate]'],
+          key_as_string: 'critical users  [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['critical users  [Duplicate] [Duplicate]'],
+          key_as_string: 'critical users  [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['high users  [Duplicate]'],
+          key_as_string: 'high users  [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['high users  [Duplicate] [Duplicate]'],
+          key_as_string: 'high users  [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['low users [Duplicate]'],
+          key_as_string: 'low users [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['low users [Duplicate] [Duplicate]'],
+          key_as_string: 'low users [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['medium users [Duplicate]'],
+          key_as_string: 'medium users [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['medium users [Duplicate] [Duplicate]'],
+          key_as_string: 'medium users [Duplicate] [Duplicate]',
+          doc_count: 273,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 273,
+              },
+              {
+                key: 'rule',
+                doc_count: 273,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 273,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 273,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+        {
+          key: ['critical hosts'],
+          key_as_string: 'critical hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical hosts [Duplicate] [Duplicate] [Duplicate]'],
+          key_as_string: 'critical hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts'],
+          key_as_string: 'high hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['high hosts [Duplicate] [Duplicate] [Duplicate]'],
+          key_as_string: 'high hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'high',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts '],
+          key_as_string: 'low hosts ',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['low hosts  [Duplicate] [Duplicate] [Duplicate]'],
+          key_as_string: 'low hosts  [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'low',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts'],
+          key_as_string: 'medium hosts',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['medium hosts [Duplicate] [Duplicate] [Duplicate]'],
+          key_as_string: 'medium hosts [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 100,
+          hostsCountAggregation: {
+            value: 30,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 100,
+              },
+              {
+                key: 'rule',
+                doc_count: 100,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 100,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'medium',
+                doc_count: 100,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 0,
+          },
+        },
+        {
+          key: ['critical users  [Duplicate] [Duplicate] [Duplicate]'],
+          key_as_string: 'critical users  [Duplicate] [Duplicate] [Duplicate]',
+          doc_count: 91,
+          hostsCountAggregation: {
+            value: 10,
+          },
+          ruleTags: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'cool',
+                doc_count: 91,
+              },
+              {
+                key: 'rule',
+                doc_count: 91,
+              },
+            ],
+          },
+          description: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'f',
+                doc_count: 1,
+              },
+            ],
+          },
+          unitsCount: {
+            value: 91,
+          },
+          severitiesSubAggregation: {
+            doc_count_error_upper_bound: 0,
+            sum_other_doc_count: 0,
+            buckets: [
+              {
+                key: 'critical',
+                doc_count: 91,
+              },
+            ],
+          },
+          countSeveritySubAggregation: {
+            value: 1,
+          },
+          usersCountAggregation: {
+            value: 91,
+          },
+        },
+      ],
+    },
+    description: {
+      doc_count_error_upper_bound: 0,
+      sum_other_doc_count: 0,
+      buckets: [
+        {
+          key: 'f',
+          doc_count: 1,
+        },
+      ],
+    },
+    unitsCount: {
+      value: 6048,
+    },
+  },
+};
diff --git a/packages/kbn-alerts-grouping/src/types.ts b/packages/kbn-alerts-grouping/src/types.ts
new file mode 100644
index 0000000000000..8d226bb74e71f
--- /dev/null
+++ b/packages/kbn-alerts-grouping/src/types.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { Filter, Query } from '@kbn/es-query';
+import { ValidFeatureId } from '@kbn/rule-data-utils';
+import type { NotificationsStart } from '@kbn/core-notifications-browser';
+import type { DataViewsServicePublic } from '@kbn/data-views-plugin/public/types';
+import type { HttpSetup } from '@kbn/core-http-browser';
+import {
+  GroupingProps,
+  GroupOption,
+  GroupPanelRenderer,
+  GetGroupStats,
+  NamedAggregation,
+} from '@kbn/grouping/src';
+import { ReactElement } from 'react';
+
+export interface GroupModel {
+  activeGroups: string[];
+  options: Array<{ key: string; label: string }>;
+}
+
+export interface AlertsGroupingState {
+  [groupingId: string]: GroupModel;
+}
+
+export interface AlertsGroupingProps<T extends Record<string, unknown> = {}> {
+  /**
+   * The leaf component that will be rendered in the grouping panels
+   */
+  children: (groupingFilters: Filter[]) => ReactElement;
+  /**
+   * Render function for the group panel header
+   */
+  renderGroupPanel?: GroupPanelRenderer<T>;
+  /**
+   * A function that given the current grouping field and aggregation results, returns an array of
+   * stat items to be rendered in the group panel
+   */
+  getGroupStats?: GetGroupStats<T>;
+  /**
+   * Default search filters
+   */
+  defaultFilters?: Filter[];
+  /**
+   * Global search filters
+   */
+  globalFilters: Filter[];
+  /**
+   * Items that will be rendered in the `Take Actions` menu
+   */
+  takeActionItems?: GroupingProps<T>['takeActionItems'];
+  /**
+   * The default fields available for grouping
+   */
+  defaultGroupingOptions: GroupOption[];
+  /**
+   * The alerting feature ids this grouping covers
+   */
+  featureIds: ValidFeatureId[];
+  /**
+   * Time filter start
+   */
+  from: string;
+  /**
+   * Time filter end
+   */
+  to: string;
+  /**
+   * Global search query (i.e. from the KQL bar)
+   */
+  globalQuery: Query;
+  /**
+   * External loading state
+   */
+  loading?: boolean;
+  /**
+   * ID used to retrieve the current grouping configuration from the state
+   */
+  groupingId: string;
+  /**
+   * Resolves an array of aggregations for a given grouping field
+   */
+  getAggregationsByGroupingField: (field: string) => NamedAggregation[];
+  /**
+   * Services required for the grouping component
+   */
+  services: {
+    notifications: NotificationsStart;
+    dataViews: DataViewsServicePublic;
+    http: HttpSetup;
+  };
+}
diff --git a/packages/kbn-alerts-grouping/tsconfig.json b/packages/kbn-alerts-grouping/tsconfig.json
new file mode 100644
index 0000000000000..04b795b97c890
--- /dev/null
+++ b/packages/kbn-alerts-grouping/tsconfig.json
@@ -0,0 +1,28 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/es-query",
+    "@kbn/grouping",
+    "@kbn/i18n",
+    "@kbn/alerts-ui-shared",
+    "@kbn/rule-data-utils",
+    "@kbn/core-notifications-browser",
+    "@kbn/data-views-plugin",
+    "@kbn/core-http-browser",
+    "@kbn/i18n-react",
+  ]
+}
diff --git a/packages/kbn-alerts-ui-shared/index.ts b/packages/kbn-alerts-ui-shared/index.ts
index a93fbd476165b..8fbffe5926ad8 100644
--- a/packages/kbn-alerts-ui-shared/index.ts
+++ b/packages/kbn-alerts-ui-shared/index.ts
@@ -11,8 +11,7 @@ export type { AlertLifecycleStatusBadgeProps } from './src/alert_lifecycle_statu
 export { MaintenanceWindowCallout } from './src/maintenance_window_callout';
 export { AddMessageVariables } from './src/add_message_variables';
 
-export * from './src/alerts_search_bar/hooks';
-export * from './src/alerts_search_bar/apis';
+export * from './src/common/hooks';
 export { AlertsSearchBar } from './src/alerts_search_bar';
 export type { AlertsSearchBarProps } from './src/alerts_search_bar/types';
 
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/constants.ts b/packages/kbn-alerts-ui-shared/src/alerts_search_bar/constants.ts
index c81588af58bf9..1d8e3b72708b5 100644
--- a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/constants.ts
+++ b/packages/kbn-alerts-ui-shared/src/alerts_search_bar/constants.ts
@@ -6,8 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { DataView, DataViewField } from '@kbn/data-views-plugin/common';
+import type { DataView } from '@kbn/data-views-plugin/common';
 
 export const NO_INDEX_PATTERNS: DataView[] = [];
-export const EMPTY_AAD_FIELDS: DataViewField[] = [];
 export * from '../common/constants';
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/index.tsx b/packages/kbn-alerts-ui-shared/src/alerts_search_bar/index.tsx
index 13bca396cb401..9a095200a8506 100644
--- a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/index.tsx
+++ b/packages/kbn-alerts-ui-shared/src/alerts_search_bar/index.tsx
@@ -13,9 +13,7 @@ import { AlertConsumers } from '@kbn/rule-data-utils';
 import { NO_INDEX_PATTERNS } from './constants';
 import { SEARCH_BAR_PLACEHOLDER } from './translations';
 import type { AlertsSearchBarProps, QueryLanguageType } from './types';
-import { useLoadRuleTypesQuery } from '../common/hooks/use_load_rule_types_query';
-import { useAlertDataView } from './hooks/use_alert_data_view';
-import { useRuleAADFields } from './hooks/use_rule_aad_fields';
+import { useLoadRuleTypesQuery, useAlertDataView, useRuleAADFields } from '../common/hooks';
 
 const SA_ALERTS = { type: 'alerts', fields: {} } as SuggestionsAbstraction;
 
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts b/packages/kbn-alerts-ui-shared/src/common/apis/fetch_aad_fields.ts
similarity index 100%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_aad_fields.ts
rename to packages/kbn-alerts-ui-shared/src/common/apis/fetch_aad_fields.ts
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts b/packages/kbn-alerts-ui-shared/src/common/apis/fetch_alert_fields.ts
similarity index 100%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_fields.ts
rename to packages/kbn-alerts-ui-shared/src/common/apis/fetch_alert_fields.ts
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts b/packages/kbn-alerts-ui-shared/src/common/apis/fetch_alert_index_names.ts
similarity index 100%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/fetch_alert_index_names.ts
rename to packages/kbn-alerts-ui-shared/src/common/apis/fetch_alert_index_names.ts
diff --git a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.test.ts b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.test.ts
index 28a0c39c998df..7cb64b51427e0 100644
--- a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.test.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.test.ts
@@ -114,13 +114,9 @@ describe('updateRule', () => {
         },
       ],
     });
-    expect(http.put.mock.calls[0]).toMatchInlineSnapshot(`
-      Array [
-        "/api/alerting/rule/12%2F3",
-        Object {
-          "body": "{\\"name\\":\\"test\\",\\"tags\\":[\\"foo\\"],\\"schedule\\":{\\"interval\\":\\"1m\\"},\\"params\\":{},\\"actions\\":[],\\"alert_delay\\":{\\"active\\":10}}",
-        },
-      ]
-    `);
+
+    expect(http.put).toHaveBeenCalledWith('/api/alerting/rule/12%2F3', {
+      body: '{"name":"test","tags":["foo"],"schedule":{"interval":"1m"},"params":{},"actions":[{"group":"default","id":"2","params":{},"frequency":{"notify_when":"onActionGroupChange","throttle":null,"summary":false},"use_alert_data_for_template":false},{"id":".test-system-action","params":{}}],"alert_delay":{"active":10}}',
+    });
   });
 });
diff --git a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.ts b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.ts
index 7d9dbf71211ee..841778eaa52ee 100644
--- a/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/apis/update_rule/update_rule.ts
@@ -44,7 +44,7 @@ export async function updateRule({
   const res = await http.put<AsApiContract<Rule>>(
     `${BASE_ALERTING_API_PATH}/rule/${encodeURIComponent(id)}`,
     {
-      body: JSON.stringify(transformUpdateRuleBody(pick(rule, UPDATE_FIELDS))),
+      body: JSON.stringify(transformUpdateRuleBody(pick(rule, UPDATE_FIELDS_WITH_ACTIONS))),
     }
   );
   return transformRule(res);
diff --git a/packages/kbn-alerts-ui-shared/src/common/constants.ts b/packages/kbn-alerts-ui-shared/src/common/constants.ts
index fcbf498988a66..ccc59f18d299c 100644
--- a/packages/kbn-alerts-ui-shared/src/common/constants.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/constants.ts
@@ -6,8 +6,11 @@
  * Side Public License, v 1.
  */
 
+import type { DataViewField } from '@kbn/data-views-plugin/common';
+
 export const ALERTS_FEATURE_ID = 'alerts';
 export const BASE_ALERTING_API_PATH = '/api/alerting';
 export const INTERNAL_BASE_ALERTING_API_PATH = '/internal/alerting';
 export const BASE_RAC_ALERTS_API_PATH = '/internal/rac/alerts';
+export const EMPTY_AAD_FIELDS: DataViewField[] = [];
 export const BASE_TRIGGERS_ACTIONS_UI_API_PATH = '/internal/triggers_actions_ui';
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/index.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/index.ts
index dc59bf57610b3..614b14515f511 100644
--- a/packages/kbn-alerts-ui-shared/src/common/hooks/index.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/index.ts
@@ -6,7 +6,10 @@
  * Side Public License, v 1.
  */
 
+export * from './use_alert_data_view';
+export * from './use_find_alerts_query';
 export * from './use_load_rule_types_query';
+export * from './use_rule_aad_fields';
 export * from './use_load_ui_config';
 export * from './use_health_check';
 export * from './use_load_ui_health';
@@ -14,3 +17,4 @@ export * from './use_load_alerting_framework_health';
 export * from './use_create_rule';
 export * from './use_update_rule';
 export * from './use_resolve_rule';
+export * from './use_get_alerts_group_aggregations_query';
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts
similarity index 98%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts
rename to packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts
index 47e1456158826..8c76671819b25 100644
--- a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_alert_data_view.ts
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_alert_data_view.ts
@@ -67,6 +67,7 @@ export function useAlertDataView(props: UseAlertDataViewProps): UseAlertDataView
     queryFn: queryIndexNameFn,
     onError: onErrorFn,
     refetchOnWindowFocus: false,
+    staleTime: 60 * 1000, // To prevent duplicated requests
     enabled: featureIds.length > 0 && !hasSecurityAndO11yFeatureIds,
   });
 
@@ -80,6 +81,7 @@ export function useAlertDataView(props: UseAlertDataViewProps): UseAlertDataView
     queryFn: queryAlertFieldsFn,
     onError: onErrorFn,
     refetchOnWindowFocus: false,
+    staleTime: 60 * 1000,
     enabled: hasNoSecuritySolution,
   });
 
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts
new file mode 100644
index 0000000000000..a0d1b68458e04
--- /dev/null
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_find_alerts_query.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { useQuery } from '@tanstack/react-query';
+import type { HttpStart } from '@kbn/core-http-browser';
+import type { ToastsStart } from '@kbn/core-notifications-browser';
+import { ISearchRequestParams } from '@kbn/search-types';
+import { SearchResponseBody } from '@elastic/elasticsearch/lib/api/types';
+import { BASE_RAC_ALERTS_API_PATH } from '../constants';
+
+export interface UseFindAlertsQueryProps {
+  http: HttpStart;
+  toasts: ToastsStart;
+  enabled?: boolean;
+  params: ISearchRequestParams & { feature_ids?: string[] };
+}
+
+/**
+ * A generic hook to find alerts
+ *
+ * Still applies alerts authorization rules but, unlike triggers_actions_ui's `useFetchAlerts` hook,
+ * allows to perform arbitrary queries
+ */
+export const useFindAlertsQuery = <T>({
+  http,
+  toasts,
+  enabled = true,
+  params,
+}: UseFindAlertsQueryProps) => {
+  const onErrorFn = (error: Error) => {
+    if (error) {
+      toasts.addDanger(
+        i18n.translate('alertsUIShared.hooks.useFindAlertsQuery.unableToFindAlertsQueryMessage', {
+          defaultMessage: 'Unable to find alerts',
+        })
+      );
+    }
+  };
+
+  return useQuery({
+    queryKey: ['findAlerts', JSON.stringify(params)],
+    queryFn: () =>
+      http.post<SearchResponseBody<{}, T>>(`${BASE_RAC_ALERTS_API_PATH}/find`, {
+        body: JSON.stringify(params),
+      }),
+    onError: onErrorFn,
+    refetchOnWindowFocus: false,
+    enabled,
+  });
+};
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx
new file mode 100644
index 0000000000000..f4566ffed2e45
--- /dev/null
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.test.tsx
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { renderHook } from '@testing-library/react-hooks/dom';
+import type { HttpStart } from '@kbn/core-http-browser';
+import { ToastsStart } from '@kbn/core-notifications-browser';
+import { AlertConsumers } from '@kbn/rule-data-utils';
+
+import { useGetAlertsGroupAggregationsQuery } from './use_get_alerts_group_aggregations_query';
+import { waitFor } from '@testing-library/react';
+import { BASE_RAC_ALERTS_API_PATH } from '../constants';
+
+const queryClient = new QueryClient({
+  defaultOptions: {
+    queries: {
+      retry: false,
+    },
+  },
+});
+
+const wrapper = ({ children }: { children: Node }) => (
+  <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>
+);
+
+const mockHttp = {
+  post: jest.fn(),
+};
+const http = mockHttp as unknown as HttpStart;
+
+const mockToasts = {
+  addDanger: jest.fn(),
+};
+const toasts = mockToasts as unknown as ToastsStart;
+
+const params = {
+  featureIds: [AlertConsumers.STACK_ALERTS],
+  groupByField: 'kibana.alert.rule.name',
+};
+
+describe('useAlertsGroupAggregationsQuery', () => {
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('displays toast on errors', async () => {
+    mockHttp.post.mockRejectedValue(new Error('An error occurred'));
+    renderHook(
+      () =>
+        useGetAlertsGroupAggregationsQuery({
+          params,
+          enabled: true,
+          toasts,
+          http,
+        }),
+      { wrapper }
+    );
+
+    await waitFor(() => expect(mockToasts.addDanger).toHaveBeenCalled());
+  });
+
+  test('calls API endpoint with the correct body', async () => {
+    renderHook(
+      () =>
+        useGetAlertsGroupAggregationsQuery({
+          params,
+          enabled: true,
+          toasts,
+          http,
+        }),
+      { wrapper }
+    );
+
+    await waitFor(() =>
+      expect(mockHttp.post).toHaveBeenLastCalledWith(
+        `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+        {
+          body: JSON.stringify(params),
+        }
+      )
+    );
+  });
+});
diff --git a/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts
new file mode 100644
index 0000000000000..eab5b9ac510fa
--- /dev/null
+++ b/packages/kbn-alerts-ui-shared/src/common/hooks/use_get_alerts_group_aggregations_query.ts
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { useQuery } from '@tanstack/react-query';
+import type { HttpStart } from '@kbn/core-http-browser';
+import type { ToastsStart } from '@kbn/core-notifications-browser';
+import { SearchResponseBody } from '@elastic/elasticsearch/lib/api/types';
+import { AlertConsumers } from '@kbn/rule-data-utils';
+import type {
+  AggregationsAggregationContainer,
+  QueryDslQueryContainer,
+  SortCombinations,
+} from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { BASE_RAC_ALERTS_API_PATH } from '../constants';
+
+export interface UseGetAlertsGroupAggregationsQueryProps {
+  http: HttpStart;
+  toasts: ToastsStart;
+  enabled?: boolean;
+  params: {
+    featureIds: AlertConsumers[];
+    groupByField: string;
+    aggregations?: Record<string, AggregationsAggregationContainer>;
+    filters?: QueryDslQueryContainer[];
+    sort?: SortCombinations[];
+    pageIndex?: number;
+    pageSize?: number;
+  };
+}
+
+/**
+ * Fetches alerts aggregations for a given groupByField.
+ *
+ * Some default aggregations are applied:
+ * - `groupByFields`, to get the buckets based on the provided grouping field,
+ *   - `unitsCount`, to count the number of alerts in each bucket,
+ * - `unitsCount`, to count the total number of alerts targeted by the query,
+ * - `groupsCount`, to count the total number of groups.
+ *
+ * The provided `aggregations` are applied within `groupByFields`. Here the `groupByField` runtime
+ * field can be used to perform grouping-based aggregations.
+ *
+ * Applies alerting RBAC through featureIds.
+ */
+export const useGetAlertsGroupAggregationsQuery = <T>({
+  http,
+  toasts,
+  enabled = true,
+  params,
+}: UseGetAlertsGroupAggregationsQueryProps) => {
+  const onErrorFn = (error: Error) => {
+    if (error) {
+      toasts.addDanger(
+        i18n.translate(
+          'alertsUIShared.hooks.useFindAlertsQuery.unableToFetchAlertsGroupingAggregations',
+          {
+            defaultMessage: 'Unable to fetch alerts grouping aggregations',
+          }
+        )
+      );
+    }
+  };
+
+  return useQuery({
+    queryKey: ['getAlertsGroupAggregations', JSON.stringify(params)],
+    queryFn: () =>
+      http.post<SearchResponseBody<{}, T>>(`${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`, {
+        body: JSON.stringify(params),
+      }),
+    onError: onErrorFn,
+    refetchOnWindowFocus: false,
+    enabled,
+  });
+};
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts b/packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts
similarity index 100%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/hooks/use_rule_aad_fields.ts
rename to packages/kbn-alerts-ui-shared/src/common/hooks/use_rule_aad_fields.ts
diff --git a/packages/kbn-alerts-ui-shared/tsconfig.json b/packages/kbn-alerts-ui-shared/tsconfig.json
index 8edc3ff6eda78..7fe9d16ad314e 100644
--- a/packages/kbn-alerts-ui-shared/tsconfig.json
+++ b/packages/kbn-alerts-ui-shared/tsconfig.json
@@ -37,6 +37,7 @@
     "@kbn/core-doc-links-browser",
     "@kbn/charts-plugin",
     "@kbn/data-plugin",
+    "@kbn/search-types",
     "@kbn/utility-types",
     "@kbn/core-application-browser",
     "@kbn/react-kibana-mount",
diff --git a/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts b/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts
index 489221eea3d7a..4e7ab744d8ecd 100644
--- a/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts
+++ b/packages/kbn-apm-synthtrace-client/src/lib/logs/index.ts
@@ -14,6 +14,7 @@ export type LogDocument = Fields &
     'input.type': string;
     'log.file.path'?: string;
     'service.name'?: string;
+    'service.environment'?: string;
     'data_stream.namespace': string;
     'data_stream.type': string;
     'data_stream.dataset': string;
diff --git a/packages/kbn-check-mappings-update-cli/current_fields.json b/packages/kbn-check-mappings-update-cli/current_fields.json
index e0f2ae0f4f4ba..59cd87288e8ec 100644
--- a/packages/kbn-check-mappings-update-cli/current_fields.json
+++ b/packages/kbn-check-mappings-update-cli/current_fields.json
@@ -301,7 +301,8 @@
     "metrics",
     "name",
     "staticFields",
-    "type"
+    "type",
+    "version"
   ],
   "entity-discovery-api-key": [
     "apiKey"
@@ -1029,6 +1030,13 @@
     "createDate",
     "slug"
   ],
+  "usage-counter": [
+    "count",
+    "counterName",
+    "counterType",
+    "domainId",
+    "source"
+  ],
   "usage-counters": [
     "domainId"
   ],
diff --git a/packages/kbn-check-mappings-update-cli/current_mappings.json b/packages/kbn-check-mappings-update-cli/current_mappings.json
index 778ed3c37992c..47602ca181b5e 100644
--- a/packages/kbn-check-mappings-update-cli/current_mappings.json
+++ b/packages/kbn-check-mappings-update-cli/current_mappings.json
@@ -1028,6 +1028,9 @@
       },
       "type": {
         "type": "keyword"
+      },
+      "version": {
+        "type": "keyword"
       }
     }
   },
@@ -3407,6 +3410,26 @@
       }
     }
   },
+  "usage-counter": {
+    "dynamic": false,
+    "properties": {
+      "count": {
+        "type": "integer"
+      },
+      "counterName": {
+        "type": "keyword"
+      },
+      "counterType": {
+        "type": "keyword"
+      },
+      "domainId": {
+        "type": "keyword"
+      },
+      "source": {
+        "type": "keyword"
+      }
+    }
+  },
   "usage-counters": {
     "dynamic": false,
     "properties": {
diff --git a/packages/kbn-cli-dev-mode/src/log_adapter.ts b/packages/kbn-cli-dev-mode/src/log_adapter.ts
index 58260939a6dae..eb76594036fca 100644
--- a/packages/kbn-cli-dev-mode/src/log_adapter.ts
+++ b/packages/kbn-cli-dev-mode/src/log_adapter.ts
@@ -10,8 +10,12 @@ import { Logger } from '@kbn/logging';
 import { Log } from './log';
 
 export const convertToLogger = (cliLog: Log): Logger => {
-  const getErrorMessage = (msgOrError: string | Error): string => {
-    return typeof msgOrError === 'string' ? msgOrError : msgOrError.message;
+  const getErrorMessage = (msgOrError: string | (() => string) | Error): string => {
+    return typeof msgOrError === 'function'
+      ? msgOrError()
+      : typeof msgOrError === 'string'
+      ? msgOrError
+      : msgOrError.message;
   };
 
   const adapter: Logger = {
diff --git a/packages/kbn-config-schema/README.md b/packages/kbn-config-schema/README.md
index 10d96578d4689..2074ab7698e63 100644
--- a/packages/kbn-config-schema/README.md
+++ b/packages/kbn-config-schema/README.md
@@ -138,6 +138,7 @@ __Options:__
   * `validate: (value: number) => string | void` - defines a custom validator function, see [Custom validation](#custom-validation) section for more details.
   * `min: number` - defines a minimum value the number should have.
   * `max: number` - defines a maximum value the number should have.
+  * `unsafe: boolean` - if true, will accept unsafe numbers (integers > 2^53).
 
 __Usage:__
 ```typescript
@@ -460,8 +461,12 @@ const valueSchema = schema.duration({ defaultValue: '70ms' });
 ```
 
 __Notes:__
-* The string value for `schema.duration()` supports the following optional suffixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `Y`. The default suffix is `ms`.
+* The string value for `schema.duration()` supports the following optional suffixes: `ms`, `s`, `m`, `h`, `d`, `w`, `M` and `y`. The default suffix is `ms`.
 * The number value is treated as a number of milliseconds and hence should be a positive integer, e.g. `100` is equal to `'100ms'`.
+* Multi-unit duration strings are supported (`1m30s`).
+  * Spaces are not allowed.
+  * It allows any order in the units (`1m30s1d`).
+  * It allows the same unit to be specified multiple times (`1m30s50m` is the same as `51m30s`).
 
 #### `schema.conditional()`
 
diff --git a/packages/kbn-config-schema/src/duration/index.ts b/packages/kbn-config-schema/src/duration/index.ts
index 1b1d47a24abd3..5111a603bfbdc 100644
--- a/packages/kbn-config-schema/src/duration/index.ts
+++ b/packages/kbn-config-schema/src/duration/index.ts
@@ -6,29 +6,36 @@
  * Side Public License, v 1.
  */
 
-import { Duration, duration as momentDuration, DurationInputArg2, isDuration } from 'moment';
+import { Duration, duration as momentDuration, isDuration } from 'moment';
 export type { Duration };
 export { isDuration };
 
-const timeFormatRegex = /^(0|[1-9][0-9]*)(ms|s|m|h|d|w|M|Y)$/;
+const timeFormatRegex = /^(0|[1-9][0-9]*)(ms|s|m|h|d|w|M|y|Y)(.*)$/;
+type TimeUnitString = 'ms' | 's' | 'm' | 'h' | 'd' | 'w' | 'M' | 'y' | 'Y'; // Moment officially supports lowercased 'y', but keeping 'Y' for BWC
 
-function stringToDuration(text: string) {
+function stringToDuration(text: string): Duration {
   const result = timeFormatRegex.exec(text);
   if (!result) {
     const number = Number(text);
     if (typeof number !== 'number' || isNaN(number)) {
       throw new Error(
         `Failed to parse value as time value. Value must be a duration in milliseconds, or follow the format ` +
-          `<count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer.`
+          `<count>[ms|s|m|h|d|w|M|y] (e.g. '70ms', '5s', '3d', '1y', '1m30s'), where the duration is a safe positive integer.`
       );
     }
     return numberToDuration(number);
   }
 
   const count = parseInt(result[1], 10);
-  const unit = result[2] as DurationInputArg2;
+  const unit = result[2] as TimeUnitString;
+  const rest = result[3];
 
-  return momentDuration(count, unit);
+  const duration = momentDuration(count, unit as Exclude<TimeUnitString, 'Y'>); // Moment still supports capital 'Y', but officially (and type-wise), it doesn't.
+
+  if (rest) {
+    return duration.add(stringToDuration(rest));
+  }
+  return duration;
 }
 
 function numberToDuration(numberMs: number) {
diff --git a/packages/kbn-config-schema/src/types/duration_type.test.ts b/packages/kbn-config-schema/src/types/duration_type.test.ts
index 18327b65cd1f6..779962b6354b8 100644
--- a/packages/kbn-config-schema/src/types/duration_type.test.ts
+++ b/packages/kbn-config-schema/src/types/duration_type.test.ts
@@ -24,6 +24,22 @@ test('handles number', () => {
   expect(duration().validate(123000)).toEqual(momentDuration(123000));
 });
 
+test('handles multi-unit', () => {
+  expect(duration().validate('1m30s')).toEqual(momentDuration(90000));
+  expect(duration().validate('1m30s70ms')).toEqual(momentDuration(90070));
+});
+
+test.each([60000, '60000', '60000ms', '60s', '1m', '1m0s'])(
+  'multiple ways of introducing 1 minute: %p',
+  (d) => {
+    expect(duration().validate(d)).toEqual(momentDuration(60000));
+  }
+);
+
+test('it supports years as Y and y', () => {
+  expect(duration().validate('1y')).toEqual(duration().validate('1Y'));
+});
+
 test('is required by default', () => {
   expect(() => duration().validate(undefined)).toThrowErrorMatchingInlineSnapshot(
     `"expected value of type [moment.Duration] but got [undefined]"`
@@ -184,10 +200,10 @@ test('returns error when not valid string or non-safe positive integer', () => {
   );
 
   expect(() => duration().validate('123foo')).toThrowErrorMatchingInlineSnapshot(
-    `"Failed to parse value as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`
+    `"Failed to parse value as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|y] (e.g. '70ms', '5s', '3d', '1y', '1m30s'), where the duration is a safe positive integer."`
   );
 
   expect(() => duration().validate('123 456')).toThrowErrorMatchingInlineSnapshot(
-    `"Failed to parse value as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|Y] (e.g. '70ms', '5s', '3d', '1Y'), where the duration is a safe positive integer."`
+    `"Failed to parse value as time value. Value must be a duration in milliseconds, or follow the format <count>[ms|s|m|h|d|w|M|y] (e.g. '70ms', '5s', '3d', '1y', '1m30s'), where the duration is a safe positive integer."`
   );
 });
diff --git a/packages/kbn-config-schema/src/types/number_type.test.ts b/packages/kbn-config-schema/src/types/number_type.test.ts
index 3077d41d29cc5..0e1fcdd1dc028 100644
--- a/packages/kbn-config-schema/src/types/number_type.test.ts
+++ b/packages/kbn-config-schema/src/types/number_type.test.ts
@@ -64,6 +64,26 @@ describe('#max', () => {
   });
 });
 
+describe('#unsafe', () => {
+  it('rejects unsafe numbers when undefined', () => {
+    expect(() => schema.number().validate(9007199254740992)).toThrowErrorMatchingInlineSnapshot(
+      `"\\"value\\" must be a safe number"`
+    );
+  });
+
+  it('rejects unsafe numbers when false', () => {
+    expect(() =>
+      schema.number({ unsafe: false }).validate(9007199254740992)
+    ).toThrowErrorMatchingInlineSnapshot(`"\\"value\\" must be a safe number"`);
+  });
+
+  it('accepts unsafe numbers when true', () => {
+    expect(schema.number({ unsafe: true }).validate(9007199254740992)).toBeGreaterThan(
+      9007199254740991
+    );
+  });
+});
+
 describe('#defaultValue', () => {
   test('returns default when number is undefined', () => {
     expect(schema.number({ defaultValue: 2 }).validate(undefined)).toBe(2);
diff --git a/packages/kbn-config-schema/src/types/number_type.ts b/packages/kbn-config-schema/src/types/number_type.ts
index 6b86fe7e7fc71..195e3916feb96 100644
--- a/packages/kbn-config-schema/src/types/number_type.ts
+++ b/packages/kbn-config-schema/src/types/number_type.ts
@@ -13,6 +13,12 @@ import { Type, TypeOptions } from './type';
 export type NumberOptions = TypeOptions<number> & {
   min?: number;
   max?: number;
+  /**
+   * When set to true, will accept unsafe numbers (integers > 2^53).
+   * Otherwise, unsafe numbers will fail validation.
+   * Default: `false`
+   */
+  unsafe?: boolean;
 };
 
 export class NumberType extends Type<number> {
@@ -21,10 +27,12 @@ export class NumberType extends Type<number> {
     if (options.min !== undefined) {
       schema = schema.min(options.min);
     }
-
     if (options.max !== undefined) {
       schema = schema.max(options.max);
     }
+    if (options.unsafe === true) {
+      schema = schema.unsafe(true);
+    }
 
     super(schema, options);
   }
diff --git a/packages/kbn-crypto-browser/BUILD.bazel b/packages/kbn-crypto-browser/BUILD.bazel
new file mode 100644
index 0000000000000..c959d62ffde68
--- /dev/null
+++ b/packages/kbn-crypto-browser/BUILD.bazel
@@ -0,0 +1,32 @@
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
+
+SRCS = glob(
+  [
+    "**/*.ts",
+  ],
+  exclude = [
+    "**/*.config.js",
+    "**/*.mock.*",
+    "**/*.test.*",
+    "**/*.stories.*",
+    "**/__snapshots__/**",
+    "**/integration_tests/**",
+    "**/mocks/**",
+    "**/scripts/**",
+    "**/storybook/**",
+    "**/test_fixtures/**",
+    "**/test_helpers/**",
+  ],
+)
+
+BUNDLER_DEPS = [
+  "@npm//tslib",
+]
+
+js_library(
+  name = "kbn-crypto-browser",
+  package_name = "@kbn/crypto-browser",
+  srcs = ["package.json"] + SRCS,
+  deps = BUNDLER_DEPS,
+  visibility = ["//visibility:public"],
+)
diff --git a/packages/kbn-data-view-utils/index.ts b/packages/kbn-data-view-utils/index.ts
index 1c881dbdacf79..ad783bc163c59 100644
--- a/packages/kbn-data-view-utils/index.ts
+++ b/packages/kbn-data-view-utils/index.ts
@@ -7,6 +7,6 @@
  */
 
 export * from './src/constants';
-
+export { convertDatatableColumnToDataViewFieldSpec } from './src/utils/convert_to_data_view_field_spec';
 export { createRegExpPatternFrom } from './src/utils/create_regexp_pattern_from';
 export { testPatternAgainstAllowedList } from './src/utils/test_pattern_against_allowed_list';
diff --git a/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.test.ts b/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.test.ts
new file mode 100644
index 0000000000000..94dce4a6a60da
--- /dev/null
+++ b/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.test.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { DatatableColumnType } from '@kbn/expressions-plugin/common';
+import { convertDatatableColumnToDataViewFieldSpec } from './convert_to_data_view_field_spec';
+
+describe('convertDatatableColumnToDataViewFieldSpec', () => {
+  it('should return a DataViewField object for a counter column', () => {
+    const column = {
+      id: 'bytes_counter',
+      name: 'bytes_counter',
+      meta: {
+        esType: 'counter_long',
+        type: 'number' as DatatableColumnType,
+      },
+      isNull: false,
+    };
+    const result = convertDatatableColumnToDataViewFieldSpec(column);
+    expect(result).toEqual(
+      expect.objectContaining({
+        name: 'bytes_counter',
+        type: 'number',
+        esTypes: ['long'],
+        searchable: true,
+        aggregatable: false,
+        isNull: false,
+        timeSeriesMetric: 'counter',
+      })
+    );
+  });
+
+  it('should return a DataViewField object with timeSeriesMetric undefined if esType does not start with counter_', () => {
+    const column = {
+      id: 'test',
+      name: 'test',
+      meta: {
+        esType: 'keyword',
+        type: 'string' as DatatableColumnType,
+      },
+      isNull: false,
+    };
+    const result = convertDatatableColumnToDataViewFieldSpec(column);
+    expect(result.timeSeriesMetric).toBeUndefined();
+    expect(result).toEqual(
+      expect.objectContaining({
+        name: 'test',
+        type: 'string',
+        esTypes: ['keyword'],
+        searchable: true,
+        aggregatable: false,
+        isNull: false,
+      })
+    );
+  });
+});
diff --git a/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.ts b/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.ts
new file mode 100644
index 0000000000000..7cc408a414ade
--- /dev/null
+++ b/packages/kbn-data-view-utils/src/utils/convert_to_data_view_field_spec.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { DatatableColumn } from '@kbn/expressions-plugin/common';
+import type { MappingTimeSeriesMetricType } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import type { FieldSpec } from '@kbn/data-views-plugin/common';
+
+/**
+ * Convert a datatable column to a DataViewFieldSpec
+ */
+export function convertDatatableColumnToDataViewFieldSpec(column: DatatableColumn): FieldSpec {
+  let esType = column.meta?.esType;
+  let timeSeriesMetric: MappingTimeSeriesMetricType | undefined;
+
+  // 'counter_integer', 'counter_long', 'counter_double'...
+  if (esType?.startsWith('counter_')) {
+    esType = esType?.replace('counter_', '');
+    timeSeriesMetric = 'counter';
+  }
+
+  // `DataViewField` class is defined in "data-views" plugin, so we can't create an instance of it from a package.
+  // We will return a data view field spec here instead then.
+  return {
+    name: column.name,
+    type: column.meta?.type ?? 'unknown',
+    esTypes: esType ? [esType] : undefined,
+    searchable: true,
+    aggregatable: false,
+    isNull: Boolean(column?.isNull),
+    ...(timeSeriesMetric ? { timeSeriesMetric } : {}),
+  };
+}
diff --git a/packages/kbn-data-view-utils/tsconfig.json b/packages/kbn-data-view-utils/tsconfig.json
index a41af0b7c5017..05400030e1001 100644
--- a/packages/kbn-data-view-utils/tsconfig.json
+++ b/packages/kbn-data-view-utils/tsconfig.json
@@ -14,5 +14,9 @@
   ],
   "exclude": [
     "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/data-views-plugin",
+    "@kbn/expressions-plugin",
   ]
 }
diff --git a/packages/kbn-doc-links/src/get_doc_links.ts b/packages/kbn-doc-links/src/get_doc_links.ts
index 951bdbb531d60..9b38a716a714c 100644
--- a/packages/kbn-doc-links/src/get_doc_links.ts
+++ b/packages/kbn-doc-links/src/get_doc_links.ts
@@ -462,6 +462,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
     },
     securitySolution: {
       artifactControl: `${SECURITY_SOLUTION_DOCS}artifact-control.html`,
+      avcResults: `${ELASTIC_WEBSITE_URL}blog/elastic-security-malware-protection-test-av-comparatives`,
       trustedApps: `${SECURITY_SOLUTION_DOCS}trusted-apps-ov.html`,
       eventFilters: `${SECURITY_SOLUTION_DOCS}event-filters.html`,
       blocklist: `${SECURITY_SOLUTION_DOCS}blocklist.html`,
@@ -487,8 +488,6 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       ruleUiAdvancedParams: `${SECURITY_SOLUTION_DOCS}rules-ui-create.html#rule-ui-advanced-params`,
       entityAnalytics: {
         riskScorePrerequisites: `${SECURITY_SOLUTION_DOCS}ers-requirements.html`,
-        hostRiskScore: `${SECURITY_SOLUTION_DOCS}host-risk-score.html`,
-        userRiskScore: `${SECURITY_SOLUTION_DOCS}user-risk-score.html`,
         entityRiskScoring: `${SECURITY_SOLUTION_DOCS}entity-risk-scoring.html`,
         assetCriticality: `${SECURITY_SOLUTION_DOCS}asset-criticality.html`,
       },
@@ -521,6 +520,7 @@ export const getDocLinks = ({ kibanaBranch, buildFlavor }: GetDocLinkOptions): D
       rollupSettings: `${KIBANA_DOCS}advanced-options.html#kibana-rollups-settings`,
       visualizationSettings: `${KIBANA_DOCS}advanced-options.html#kibana-visualization-settings`,
       timelionSettings: `${KIBANA_DOCS}advanced-options.html#kibana-timelion-settings`,
+      generalSettings: `${KIBANA_DOCS}advanced-options.html#kibana-general-settings`,
       savedObjectsApiList: `${KIBANA_DOCS}saved-objects-api.html#saved-objects-api`,
     },
     ml: {
diff --git a/packages/kbn-doc-links/src/types.ts b/packages/kbn-doc-links/src/types.ts
index 7a296aac6d8ba..c6b1b753ce883 100644
--- a/packages/kbn-doc-links/src/types.ts
+++ b/packages/kbn-doc-links/src/types.ts
@@ -334,6 +334,7 @@ export interface DocLinks {
   };
   readonly securitySolution: {
     readonly artifactControl: string;
+    readonly avcResults: string;
     readonly trustedApps: string;
     readonly eventFilters: string;
     readonly blocklist: string;
@@ -359,8 +360,6 @@ export interface DocLinks {
     readonly ruleUiAdvancedParams: string;
     readonly entityAnalytics: {
       readonly riskScorePrerequisites: string;
-      readonly hostRiskScore: string;
-      readonly userRiskScore: string;
       readonly entityRiskScoring: string;
       readonly assetCriticality: string;
     };
diff --git a/packages/kbn-esql-ast/index.ts b/packages/kbn-esql-ast/index.ts
index fc129c5c6fac3..6c8cd3c23e50b 100644
--- a/packages/kbn-esql-ast/index.ts
+++ b/packages/kbn-esql-ast/index.ts
@@ -22,6 +22,7 @@ export type {
   ESQLSource,
   ESQLColumn,
   ESQLLiteral,
+  ESQLParamLiteral,
   AstProviderFn,
   EditorError,
   ESQLAstNode,
diff --git a/packages/kbn-esql-ast/src/__tests__/ast_parser.from.test.ts b/packages/kbn-esql-ast/src/__tests__/ast_parser.from.test.ts
index 00559da4fff9c..a88b51f63ea16 100644
--- a/packages/kbn-esql-ast/src/__tests__/ast_parser.from.test.ts
+++ b/packages/kbn-esql-ast/src/__tests__/ast_parser.from.test.ts
@@ -60,6 +60,36 @@ describe('FROM', () => {
       ]);
     });
 
+    it('can parse FROM query with single quote or triple quote', () => {
+      const text = '\tFROM "foo%" \t\t, """bar{{00-00}}""", \n  baz';
+      const { ast, errors } = parse(text);
+
+      expect(errors.length).toBe(0);
+      expect(ast).toMatchObject([
+        {
+          type: 'command',
+          name: 'from',
+          args: [
+            {
+              type: 'source',
+              name: 'foo%',
+              sourceType: 'index',
+            },
+            {
+              type: 'source',
+              name: 'bar{{00-00}}',
+              sourceType: 'index',
+            },
+            {
+              type: 'source',
+              name: 'baz',
+              sourceType: 'index',
+            },
+          ],
+        },
+      ]);
+    });
+
     it('can parse FROM query with a single metadata column', () => {
       const text = 'from foo METADATA bar';
       const { ast, errors } = parse(text);
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4 b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
index d7a4b88e6d5c5..12a47a195dfda 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.g4
@@ -44,13 +44,15 @@ WS
     : [ \r\n\t]+ -> channel(HIDDEN)
     ;
 
-fragment INDEX_UNQUOTED_IDENTIFIER_PART
-    : ~[=`|,[\]/ \t\r\n]
-    | '/' ~[*/] // allow single / but not followed by another / or * which would start a comment
+// in 8.14 ` were not allowed
+// this has been relaxed in 8.15 since " is used for quoting
+fragment UNQUOTED_SOURCE_PART
+    : ~[:"=|,[\]/ \t\r\n]
+    | '/' ~[*/] // allow single / but not followed by another / or * which would start a comment -- used in index pattern date spec
     ;
 
-INDEX_UNQUOTED_IDENTIFIER
-    : INDEX_UNQUOTED_IDENTIFIER_PART+
+UNQUOTED_SOURCE
+    : UNQUOTED_SOURCE_PART+
     ;
 
 //
@@ -212,15 +214,13 @@ mode FROM_MODE;
 FROM_PIPE : PIPE -> type(PIPE), popMode;
 FROM_OPENING_BRACKET : OPENING_BRACKET -> type(OPENING_BRACKET);
 FROM_CLOSING_BRACKET : CLOSING_BRACKET -> type(CLOSING_BRACKET);
+FROM_COLON : COLON -> type(COLON);
 FROM_COMMA : COMMA -> type(COMMA);
 FROM_ASSIGN : ASSIGN -> type(ASSIGN);
-FROM_QUOTED_STRING : QUOTED_STRING -> type(QUOTED_STRING);
-
 METADATA : 'metadata';
 
-FROM_INDEX_UNQUOTED_IDENTIFIER
-    : INDEX_UNQUOTED_IDENTIFIER -> type(INDEX_UNQUOTED_IDENTIFIER)
-    ;
+FROM_UNQUOTED_SOURCE : UNQUOTED_SOURCE -> type(UNQUOTED_SOURCE);
+FROM_QUOTED_SOURCE : QUOTED_STRING -> type(QUOTED_STRING);
 
 FROM_LINE_COMMENT
     : LINE_COMMENT -> channel(HIDDEN)
@@ -311,10 +311,6 @@ ENRICH_POLICY_NAME
     : (ENRICH_POLICY_NAME_BODY+ COLON)? ENRICH_POLICY_NAME_BODY+
     ;
 
-ENRICH_QUOTED_IDENTIFIER
-    : QUOTED_IDENTIFIER -> type(QUOTED_IDENTIFIER)
-    ;
-
 ENRICH_MODE_UNQUOTED_VALUE
     : ENRICH_POLICY_NAME -> type(ENRICH_POLICY_NAME)
     ;
@@ -331,7 +327,7 @@ ENRICH_WS
     : WS -> channel(HIDDEN)
     ;
 
-// submode for Enrich to allow different lexing between policy identifier (loose) and field identifiers
+// submode for Enrich to allow different lexing between policy source (loose) and field identifiers
 mode ENRICH_FIELD_MODE;
 ENRICH_FIELD_PIPE : PIPE -> type(PIPE), popMode, popMode;
 ENRICH_FIELD_ASSIGN : ASSIGN -> type(ASSIGN);
@@ -363,13 +359,13 @@ ENRICH_FIELD_WS
 // LOOKUP ON key
 mode LOOKUP_MODE;
 LOOKUP_PIPE : PIPE -> type(PIPE), popMode;
+LOOKUP_COLON : COLON -> type(COLON);
 LOOKUP_COMMA : COMMA -> type(COMMA);
 LOOKUP_DOT: DOT -> type(DOT);
 LOOKUP_ON : ON -> type(ON), pushMode(LOOKUP_FIELD_MODE);
 
-LOOKUP_INDEX_UNQUOTED_IDENTIFIER
-    : INDEX_UNQUOTED_IDENTIFIER -> type(INDEX_UNQUOTED_IDENTIFIER)
-    ;
+LOOKUP_UNQUOTED_SOURCE: UNQUOTED_SOURCE -> type(UNQUOTED_SOURCE);
+LOOKUP_QUOTED_SOURCE : QUOTED_STRING -> type(QUOTED_STRING);
 
 LOOKUP_LINE_COMMENT
     : LINE_COMMENT -> channel(HIDDEN)
@@ -496,9 +492,8 @@ SETTING_WS
 mode METRICS_MODE;
 METRICS_PIPE : PIPE -> type(PIPE), popMode;
 
-METRICS_INDEX_UNQUOTED_IDENTIFIER
-    : INDEX_UNQUOTED_IDENTIFIER -> type(INDEX_UNQUOTED_IDENTIFIER), popMode, pushMode(CLOSING_METRICS_MODE)
-    ;
+METRICS_UNQUOTED_SOURCE: UNQUOTED_SOURCE -> type(UNQUOTED_SOURCE), popMode, pushMode(CLOSING_METRICS_MODE);
+METRICS_QUOTED_SOURCE : QUOTED_STRING -> type(QUOTED_STRING), popMode, pushMode(CLOSING_METRICS_MODE);
 
 METRICS_LINE_COMMENT
     : LINE_COMMENT -> channel(HIDDEN)
@@ -515,6 +510,10 @@ METRICS_WS
 // TODO: remove this workaround mode - see https://github.com/elastic/elasticsearch/issues/108528
 mode CLOSING_METRICS_MODE;
 
+CLOSING_METRICS_COLON
+    : COLON -> type(COLON), popMode, pushMode(METRICS_MODE)
+    ;
+
 CLOSING_METRICS_COMMA
     : COMMA -> type(COMMA), popMode, pushMode(METRICS_MODE)
     ;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
index 911e1371fd129..f0826dc49df6e 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.interp
@@ -151,7 +151,7 @@ UNKNOWN_CMD
 LINE_COMMENT
 MULTILINE_COMMENT
 WS
-INDEX_UNQUOTED_IDENTIFIER
+UNQUOTED_SOURCE
 EXPLAIN_WS
 EXPLAIN_LINE_COMMENT
 EXPLAIN_MULTILINE_COMMENT
@@ -277,8 +277,8 @@ UNKNOWN_CMD
 LINE_COMMENT
 MULTILINE_COMMENT
 WS
-INDEX_UNQUOTED_IDENTIFIER_PART
-INDEX_UNQUOTED_IDENTIFIER
+UNQUOTED_SOURCE_PART
+UNQUOTED_SOURCE
 EXPLAIN_OPENING_BRACKET
 EXPLAIN_PIPE
 EXPLAIN_WS
@@ -345,11 +345,12 @@ EXPR_WS
 FROM_PIPE
 FROM_OPENING_BRACKET
 FROM_CLOSING_BRACKET
+FROM_COLON
 FROM_COMMA
 FROM_ASSIGN
-FROM_QUOTED_STRING
 METADATA
-FROM_INDEX_UNQUOTED_IDENTIFIER
+FROM_UNQUOTED_SOURCE
+FROM_QUOTED_SOURCE
 FROM_LINE_COMMENT
 FROM_MULTILINE_COMMENT
 FROM_WS
@@ -377,7 +378,6 @@ ON
 WITH
 ENRICH_POLICY_NAME_BODY
 ENRICH_POLICY_NAME
-ENRICH_QUOTED_IDENTIFIER
 ENRICH_MODE_UNQUOTED_VALUE
 ENRICH_LINE_COMMENT
 ENRICH_MULTILINE_COMMENT
@@ -393,10 +393,12 @@ ENRICH_FIELD_LINE_COMMENT
 ENRICH_FIELD_MULTILINE_COMMENT
 ENRICH_FIELD_WS
 LOOKUP_PIPE
+LOOKUP_COLON
 LOOKUP_COMMA
 LOOKUP_DOT
 LOOKUP_ON
-LOOKUP_INDEX_UNQUOTED_IDENTIFIER
+LOOKUP_UNQUOTED_SOURCE
+LOOKUP_QUOTED_SOURCE
 LOOKUP_LINE_COMMENT
 LOOKUP_MULTILINE_COMMENT
 LOOKUP_WS
@@ -431,10 +433,12 @@ SETTING_LINE_COMMENT
 SETTTING_MULTILINE_COMMENT
 SETTING_WS
 METRICS_PIPE
-METRICS_INDEX_UNQUOTED_IDENTIFIER
+METRICS_UNQUOTED_SOURCE
+METRICS_QUOTED_SOURCE
 METRICS_LINE_COMMENT
 METRICS_MULTILINE_COMMENT
 METRICS_WS
+CLOSING_METRICS_COLON
 CLOSING_METRICS_COMMA
 CLOSING_METRICS_LINE_COMMENT
 CLOSING_METRICS_MULTILINE_COMMENT
@@ -467,4 +471,4 @@ METRICS_MODE
 CLOSING_METRICS_MODE
 
 atn:
-[4, 0, 124, 1422, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 2, 157, 7, 157, 2, 158, 7, 158, 2, 159, 7, 159, 2, 160, 7, 160, 2, 161, 7, 161, 2, 162, 7, 162, 2, 163, 7, 163, 2, 164, 7, 164, 2, 165, 7, 165, 2, 166, 7, 166, 2, 167, 7, 167, 2, 168, 7, 168, 2, 169, 7, 169, 2, 170, 7, 170, 2, 171, 7, 171, 2, 172, 7, 172, 2, 173, 7, 173, 2, 174, 7, 174, 2, 175, 7, 175, 2, 176, 7, 176, 2, 177, 7, 177, 2, 178, 7, 178, 2, 179, 7, 179, 2, 180, 7, 180, 2, 181, 7, 181, 2, 182, 7, 182, 2, 183, 7, 183, 2, 184, 7, 184, 2, 185, 7, 185, 2, 186, 7, 186, 2, 187, 7, 187, 2, 188, 7, 188, 2, 189, 7, 189, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 4, 20, 567, 8, 20, 11, 20, 12, 20, 568, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 577, 8, 21, 10, 21, 12, 21, 580, 9, 21, 1, 21, 3, 21, 583, 8, 21, 1, 21, 3, 21, 586, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 595, 8, 22, 10, 22, 12, 22, 598, 9, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 4, 23, 606, 8, 23, 11, 23, 12, 23, 607, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 3, 24, 615, 8, 24, 1, 25, 4, 25, 618, 8, 25, 11, 25, 12, 25, 619, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 3, 36, 659, 8, 36, 1, 36, 4, 36, 662, 8, 36, 11, 36, 12, 36, 663, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 3, 39, 673, 8, 39, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 3, 41, 680, 8, 41, 1, 42, 1, 42, 1, 42, 5, 42, 685, 8, 42, 10, 42, 12, 42, 688, 9, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 5, 42, 696, 8, 42, 10, 42, 12, 42, 699, 9, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 706, 8, 42, 1, 42, 3, 42, 709, 8, 42, 3, 42, 711, 8, 42, 1, 43, 4, 43, 714, 8, 43, 11, 43, 12, 43, 715, 1, 44, 4, 44, 719, 8, 44, 11, 44, 12, 44, 720, 1, 44, 1, 44, 5, 44, 725, 8, 44, 10, 44, 12, 44, 728, 9, 44, 1, 44, 1, 44, 4, 44, 732, 8, 44, 11, 44, 12, 44, 733, 1, 44, 4, 44, 737, 8, 44, 11, 44, 12, 44, 738, 1, 44, 1, 44, 5, 44, 743, 8, 44, 10, 44, 12, 44, 746, 9, 44, 3, 44, 748, 8, 44, 1, 44, 1, 44, 1, 44, 1, 44, 4, 44, 754, 8, 44, 11, 44, 12, 44, 755, 1, 44, 1, 44, 3, 44, 760, 8, 44, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 70, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 72, 1, 73, 1, 73, 1, 74, 1, 74, 1, 74, 1, 75, 1, 75, 1, 76, 1, 76, 1, 77, 1, 77, 1, 78, 1, 78, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 5, 80, 882, 8, 80, 10, 80, 12, 80, 885, 9, 80, 1, 80, 1, 80, 4, 80, 889, 8, 80, 11, 80, 12, 80, 890, 3, 80, 893, 8, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 5, 83, 907, 8, 83, 10, 83, 12, 83, 910, 9, 83, 1, 83, 1, 83, 3, 83, 914, 8, 83, 1, 83, 4, 83, 917, 8, 83, 11, 83, 12, 83, 918, 3, 83, 921, 8, 83, 1, 84, 1, 84, 4, 84, 925, 8, 84, 11, 84, 12, 84, 926, 1, 84, 1, 84, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 1, 96, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 1, 100, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 3, 103, 1012, 8, 103, 1, 104, 1, 104, 3, 104, 1016, 8, 104, 1, 104, 5, 104, 1019, 8, 104, 10, 104, 12, 104, 1022, 9, 104, 1, 104, 1, 104, 3, 104, 1026, 8, 104, 1, 104, 4, 104, 1029, 8, 104, 11, 104, 12, 104, 1030, 3, 104, 1033, 8, 104, 1, 105, 1, 105, 4, 105, 1037, 8, 105, 11, 105, 12, 105, 1038, 1, 106, 1, 106, 1, 106, 1, 106, 1, 107, 1, 107, 1, 107, 1, 107, 1, 108, 1, 108, 1, 108, 1, 108, 1, 109, 1, 109, 1, 109, 1, 109, 1, 109, 1, 110, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 117, 1, 117, 1, 118, 1, 118, 1, 118, 1, 118, 1, 118, 1, 119, 1, 119, 1, 119, 1, 119, 1, 119, 1, 120, 1, 120, 1, 120, 1, 120, 1, 120, 1, 121, 1, 121, 1, 121, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 123, 4, 123, 1114, 8, 123, 11, 123, 12, 123, 1115, 1, 123, 1, 123, 3, 123, 1120, 8, 123, 1, 123, 4, 123, 1123, 8, 123, 11, 123, 12, 123, 1124, 1, 124, 1, 124, 1, 124, 1, 124, 1, 125, 1, 125, 1, 125, 1, 125, 1, 126, 1, 126, 1, 126, 1, 126, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 128, 1, 128, 1, 129, 1, 129, 1, 129, 1, 129, 1, 129, 1, 129, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 154, 1, 154, 1, 154, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 159, 1, 159, 1, 160, 1, 160, 1, 160, 1, 160, 1, 161, 1, 161, 1, 161, 1, 161, 1, 161, 1, 162, 1, 162, 1, 162, 1, 162, 1, 162, 1, 163, 1, 163, 1, 163, 1, 163, 1, 164, 1, 164, 1, 164, 1, 164, 1, 165, 1, 165, 1, 165, 1, 165, 1, 166, 1, 166, 1, 166, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 167, 1, 168, 1, 168, 1, 168, 1, 168, 1, 169, 1, 169, 1, 169, 1, 169, 1, 170, 1, 170, 1, 170, 1, 170, 1, 171, 1, 171, 1, 171, 1, 171, 1, 171, 1, 172, 1, 172, 1, 173, 1, 173, 1, 173, 1, 173, 1, 173, 4, 173, 1343, 8, 173, 11, 173, 12, 173, 1344, 1, 174, 1, 174, 1, 174, 1, 174, 1, 175, 1, 175, 1, 175, 1, 175, 1, 176, 1, 176, 1, 176, 1, 176, 1, 177, 1, 177, 1, 177, 1, 177, 1, 177, 1, 178, 1, 178, 1, 178, 1, 178, 1, 178, 1, 178, 1, 179, 1, 179, 1, 179, 1, 179, 1, 180, 1, 180, 1, 180, 1, 180, 1, 181, 1, 181, 1, 181, 1, 181, 1, 182, 1, 182, 1, 182, 1, 182, 1, 182, 1, 182, 1, 183, 1, 183, 1, 183, 1, 183, 1, 184, 1, 184, 1, 184, 1, 184, 1, 185, 1, 185, 1, 185, 1, 185, 1, 186, 1, 186, 1, 186, 1, 186, 1, 186, 1, 186, 1, 187, 1, 187, 1, 187, 1, 187, 1, 187, 1, 187, 1, 188, 1, 188, 1, 188, 1, 188, 1, 188, 1, 188, 1, 189, 1, 189, 1, 189, 1, 189, 1, 189, 2, 596, 697, 0, 190, 16, 1, 18, 2, 20, 3, 22, 4, 24, 5, 26, 6, 28, 7, 30, 8, 32, 9, 34, 10, 36, 11, 38, 12, 40, 13, 42, 14, 44, 15, 46, 16, 48, 17, 50, 18, 52, 19, 54, 20, 56, 21, 58, 22, 60, 23, 62, 24, 64, 0, 66, 25, 68, 0, 70, 0, 72, 26, 74, 27, 76, 28, 78, 29, 80, 0, 82, 0, 84, 0, 86, 0, 88, 0, 90, 0, 92, 0, 94, 0, 96, 0, 98, 0, 100, 30, 102, 31, 104, 32, 106, 33, 108, 34, 110, 35, 112, 36, 114, 37, 116, 38, 118, 39, 120, 40, 122, 41, 124, 42, 126, 43, 128, 44, 130, 45, 132, 46, 134, 47, 136, 48, 138, 49, 140, 50, 142, 51, 144, 52, 146, 53, 148, 54, 150, 55, 152, 56, 154, 57, 156, 58, 158, 59, 160, 60, 162, 61, 164, 62, 166, 63, 168, 64, 170, 65, 172, 66, 174, 67, 176, 68, 178, 69, 180, 70, 182, 71, 184, 0, 186, 72, 188, 73, 190, 74, 192, 75, 194, 0, 196, 0, 198, 0, 200, 0, 202, 0, 204, 0, 206, 76, 208, 0, 210, 77, 212, 78, 214, 79, 216, 0, 218, 0, 220, 0, 222, 0, 224, 0, 226, 80, 228, 81, 230, 82, 232, 83, 234, 0, 236, 0, 238, 0, 240, 0, 242, 84, 244, 0, 246, 85, 248, 86, 250, 87, 252, 0, 254, 0, 256, 88, 258, 89, 260, 0, 262, 90, 264, 0, 266, 0, 268, 91, 270, 92, 272, 93, 274, 0, 276, 0, 278, 0, 280, 0, 282, 0, 284, 0, 286, 0, 288, 94, 290, 95, 292, 96, 294, 0, 296, 0, 298, 0, 300, 0, 302, 0, 304, 97, 306, 98, 308, 99, 310, 0, 312, 0, 314, 0, 316, 0, 318, 100, 320, 101, 322, 102, 324, 0, 326, 0, 328, 0, 330, 0, 332, 103, 334, 104, 336, 105, 338, 0, 340, 106, 342, 107, 344, 108, 346, 109, 348, 0, 350, 110, 352, 111, 354, 112, 356, 113, 358, 0, 360, 114, 362, 115, 364, 116, 366, 117, 368, 118, 370, 0, 372, 0, 374, 119, 376, 120, 378, 121, 380, 0, 382, 122, 384, 123, 386, 124, 388, 0, 390, 0, 392, 0, 394, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 85, 85, 117, 117, 2, 0, 87, 87, 119, 119, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 10, 0, 9, 10, 13, 13, 32, 32, 44, 44, 47, 47, 61, 61, 91, 91, 93, 93, 96, 96, 124, 124, 2, 0, 42, 42, 47, 47, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1448, 0, 16, 1, 0, 0, 0, 0, 18, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 32, 1, 0, 0, 0, 0, 34, 1, 0, 0, 0, 0, 36, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 40, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 0, 56, 1, 0, 0, 0, 0, 58, 1, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 62, 1, 0, 0, 0, 0, 66, 1, 0, 0, 0, 1, 68, 1, 0, 0, 0, 1, 70, 1, 0, 0, 0, 1, 72, 1, 0, 0, 0, 1, 74, 1, 0, 0, 0, 1, 76, 1, 0, 0, 0, 2, 78, 1, 0, 0, 0, 2, 100, 1, 0, 0, 0, 2, 102, 1, 0, 0, 0, 2, 104, 1, 0, 0, 0, 2, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 2, 112, 1, 0, 0, 0, 2, 114, 1, 0, 0, 0, 2, 116, 1, 0, 0, 0, 2, 118, 1, 0, 0, 0, 2, 120, 1, 0, 0, 0, 2, 122, 1, 0, 0, 0, 2, 124, 1, 0, 0, 0, 2, 126, 1, 0, 0, 0, 2, 128, 1, 0, 0, 0, 2, 130, 1, 0, 0, 0, 2, 132, 1, 0, 0, 0, 2, 134, 1, 0, 0, 0, 2, 136, 1, 0, 0, 0, 2, 138, 1, 0, 0, 0, 2, 140, 1, 0, 0, 0, 2, 142, 1, 0, 0, 0, 2, 144, 1, 0, 0, 0, 2, 146, 1, 0, 0, 0, 2, 148, 1, 0, 0, 0, 2, 150, 1, 0, 0, 0, 2, 152, 1, 0, 0, 0, 2, 154, 1, 0, 0, 0, 2, 156, 1, 0, 0, 0, 2, 158, 1, 0, 0, 0, 2, 160, 1, 0, 0, 0, 2, 162, 1, 0, 0, 0, 2, 164, 1, 0, 0, 0, 2, 166, 1, 0, 0, 0, 2, 168, 1, 0, 0, 0, 2, 170, 1, 0, 0, 0, 2, 172, 1, 0, 0, 0, 2, 174, 1, 0, 0, 0, 2, 176, 1, 0, 0, 0, 2, 178, 1, 0, 0, 0, 2, 180, 1, 0, 0, 0, 2, 182, 1, 0, 0, 0, 2, 186, 1, 0, 0, 0, 2, 188, 1, 0, 0, 0, 2, 190, 1, 0, 0, 0, 2, 192, 1, 0, 0, 0, 3, 194, 1, 0, 0, 0, 3, 196, 1, 0, 0, 0, 3, 198, 1, 0, 0, 0, 3, 200, 1, 0, 0, 0, 3, 202, 1, 0, 0, 0, 3, 204, 1, 0, 0, 0, 3, 206, 1, 0, 0, 0, 3, 208, 1, 0, 0, 0, 3, 210, 1, 0, 0, 0, 3, 212, 1, 0, 0, 0, 3, 214, 1, 0, 0, 0, 4, 216, 1, 0, 0, 0, 4, 218, 1, 0, 0, 0, 4, 220, 1, 0, 0, 0, 4, 226, 1, 0, 0, 0, 4, 228, 1, 0, 0, 0, 4, 230, 1, 0, 0, 0, 4, 232, 1, 0, 0, 0, 5, 234, 1, 0, 0, 0, 5, 236, 1, 0, 0, 0, 5, 238, 1, 0, 0, 0, 5, 240, 1, 0, 0, 0, 5, 242, 1, 0, 0, 0, 5, 244, 1, 0, 0, 0, 5, 246, 1, 0, 0, 0, 5, 248, 1, 0, 0, 0, 5, 250, 1, 0, 0, 0, 6, 252, 1, 0, 0, 0, 6, 254, 1, 0, 0, 0, 6, 256, 1, 0, 0, 0, 6, 258, 1, 0, 0, 0, 6, 262, 1, 0, 0, 0, 6, 264, 1, 0, 0, 0, 6, 266, 1, 0, 0, 0, 6, 268, 1, 0, 0, 0, 6, 270, 1, 0, 0, 0, 6, 272, 1, 0, 0, 0, 7, 274, 1, 0, 0, 0, 7, 276, 1, 0, 0, 0, 7, 278, 1, 0, 0, 0, 7, 280, 1, 0, 0, 0, 7, 282, 1, 0, 0, 0, 7, 284, 1, 0, 0, 0, 7, 286, 1, 0, 0, 0, 7, 288, 1, 0, 0, 0, 7, 290, 1, 0, 0, 0, 7, 292, 1, 0, 0, 0, 8, 294, 1, 0, 0, 0, 8, 296, 1, 0, 0, 0, 8, 298, 1, 0, 0, 0, 8, 300, 1, 0, 0, 0, 8, 302, 1, 0, 0, 0, 8, 304, 1, 0, 0, 0, 8, 306, 1, 0, 0, 0, 8, 308, 1, 0, 0, 0, 9, 310, 1, 0, 0, 0, 9, 312, 1, 0, 0, 0, 9, 314, 1, 0, 0, 0, 9, 316, 1, 0, 0, 0, 9, 318, 1, 0, 0, 0, 9, 320, 1, 0, 0, 0, 9, 322, 1, 0, 0, 0, 10, 324, 1, 0, 0, 0, 10, 326, 1, 0, 0, 0, 10, 328, 1, 0, 0, 0, 10, 330, 1, 0, 0, 0, 10, 332, 1, 0, 0, 0, 10, 334, 1, 0, 0, 0, 10, 336, 1, 0, 0, 0, 11, 338, 1, 0, 0, 0, 11, 340, 1, 0, 0, 0, 11, 342, 1, 0, 0, 0, 11, 344, 1, 0, 0, 0, 11, 346, 1, 0, 0, 0, 12, 348, 1, 0, 0, 0, 12, 350, 1, 0, 0, 0, 12, 352, 1, 0, 0, 0, 12, 354, 1, 0, 0, 0, 12, 356, 1, 0, 0, 0, 13, 358, 1, 0, 0, 0, 13, 360, 1, 0, 0, 0, 13, 362, 1, 0, 0, 0, 13, 364, 1, 0, 0, 0, 13, 366, 1, 0, 0, 0, 13, 368, 1, 0, 0, 0, 14, 370, 1, 0, 0, 0, 14, 372, 1, 0, 0, 0, 14, 374, 1, 0, 0, 0, 14, 376, 1, 0, 0, 0, 14, 378, 1, 0, 0, 0, 15, 380, 1, 0, 0, 0, 15, 382, 1, 0, 0, 0, 15, 384, 1, 0, 0, 0, 15, 386, 1, 0, 0, 0, 15, 388, 1, 0, 0, 0, 15, 390, 1, 0, 0, 0, 15, 392, 1, 0, 0, 0, 15, 394, 1, 0, 0, 0, 16, 396, 1, 0, 0, 0, 18, 406, 1, 0, 0, 0, 20, 413, 1, 0, 0, 0, 22, 422, 1, 0, 0, 0, 24, 429, 1, 0, 0, 0, 26, 439, 1, 0, 0, 0, 28, 446, 1, 0, 0, 0, 30, 453, 1, 0, 0, 0, 32, 467, 1, 0, 0, 0, 34, 474, 1, 0, 0, 0, 36, 482, 1, 0, 0, 0, 38, 491, 1, 0, 0, 0, 40, 498, 1, 0, 0, 0, 42, 508, 1, 0, 0, 0, 44, 520, 1, 0, 0, 0, 46, 529, 1, 0, 0, 0, 48, 535, 1, 0, 0, 0, 50, 542, 1, 0, 0, 0, 52, 549, 1, 0, 0, 0, 54, 557, 1, 0, 0, 0, 56, 566, 1, 0, 0, 0, 58, 572, 1, 0, 0, 0, 60, 589, 1, 0, 0, 0, 62, 605, 1, 0, 0, 0, 64, 614, 1, 0, 0, 0, 66, 617, 1, 0, 0, 0, 68, 621, 1, 0, 0, 0, 70, 626, 1, 0, 0, 0, 72, 631, 1, 0, 0, 0, 74, 635, 1, 0, 0, 0, 76, 639, 1, 0, 0, 0, 78, 643, 1, 0, 0, 0, 80, 647, 1, 0, 0, 0, 82, 649, 1, 0, 0, 0, 84, 651, 1, 0, 0, 0, 86, 654, 1, 0, 0, 0, 88, 656, 1, 0, 0, 0, 90, 665, 1, 0, 0, 0, 92, 667, 1, 0, 0, 0, 94, 672, 1, 0, 0, 0, 96, 674, 1, 0, 0, 0, 98, 679, 1, 0, 0, 0, 100, 710, 1, 0, 0, 0, 102, 713, 1, 0, 0, 0, 104, 759, 1, 0, 0, 0, 106, 761, 1, 0, 0, 0, 108, 764, 1, 0, 0, 0, 110, 768, 1, 0, 0, 0, 112, 772, 1, 0, 0, 0, 114, 774, 1, 0, 0, 0, 116, 777, 1, 0, 0, 0, 118, 779, 1, 0, 0, 0, 120, 784, 1, 0, 0, 0, 122, 786, 1, 0, 0, 0, 124, 792, 1, 0, 0, 0, 126, 798, 1, 0, 0, 0, 128, 803, 1, 0, 0, 0, 130, 805, 1, 0, 0, 0, 132, 808, 1, 0, 0, 0, 134, 811, 1, 0, 0, 0, 136, 816, 1, 0, 0, 0, 138, 820, 1, 0, 0, 0, 140, 825, 1, 0, 0, 0, 142, 831, 1, 0, 0, 0, 144, 834, 1, 0, 0, 0, 146, 836, 1, 0, 0, 0, 148, 842, 1, 0, 0, 0, 150, 844, 1, 0, 0, 0, 152, 849, 1, 0, 0, 0, 154, 852, 1, 0, 0, 0, 156, 855, 1, 0, 0, 0, 158, 858, 1, 0, 0, 0, 160, 860, 1, 0, 0, 0, 162, 863, 1, 0, 0, 0, 164, 865, 1, 0, 0, 0, 166, 868, 1, 0, 0, 0, 168, 870, 1, 0, 0, 0, 170, 872, 1, 0, 0, 0, 172, 874, 1, 0, 0, 0, 174, 876, 1, 0, 0, 0, 176, 892, 1, 0, 0, 0, 178, 894, 1, 0, 0, 0, 180, 899, 1, 0, 0, 0, 182, 920, 1, 0, 0, 0, 184, 922, 1, 0, 0, 0, 186, 930, 1, 0, 0, 0, 188, 932, 1, 0, 0, 0, 190, 936, 1, 0, 0, 0, 192, 940, 1, 0, 0, 0, 194, 944, 1, 0, 0, 0, 196, 949, 1, 0, 0, 0, 198, 953, 1, 0, 0, 0, 200, 957, 1, 0, 0, 0, 202, 961, 1, 0, 0, 0, 204, 965, 1, 0, 0, 0, 206, 969, 1, 0, 0, 0, 208, 978, 1, 0, 0, 0, 210, 982, 1, 0, 0, 0, 212, 986, 1, 0, 0, 0, 214, 990, 1, 0, 0, 0, 216, 994, 1, 0, 0, 0, 218, 999, 1, 0, 0, 0, 220, 1003, 1, 0, 0, 0, 222, 1011, 1, 0, 0, 0, 224, 1032, 1, 0, 0, 0, 226, 1036, 1, 0, 0, 0, 228, 1040, 1, 0, 0, 0, 230, 1044, 1, 0, 0, 0, 232, 1048, 1, 0, 0, 0, 234, 1052, 1, 0, 0, 0, 236, 1057, 1, 0, 0, 0, 238, 1061, 1, 0, 0, 0, 240, 1065, 1, 0, 0, 0, 242, 1069, 1, 0, 0, 0, 244, 1072, 1, 0, 0, 0, 246, 1076, 1, 0, 0, 0, 248, 1080, 1, 0, 0, 0, 250, 1084, 1, 0, 0, 0, 252, 1088, 1, 0, 0, 0, 254, 1093, 1, 0, 0, 0, 256, 1098, 1, 0, 0, 0, 258, 1103, 1, 0, 0, 0, 260, 1110, 1, 0, 0, 0, 262, 1119, 1, 0, 0, 0, 264, 1126, 1, 0, 0, 0, 266, 1130, 1, 0, 0, 0, 268, 1134, 1, 0, 0, 0, 270, 1138, 1, 0, 0, 0, 272, 1142, 1, 0, 0, 0, 274, 1146, 1, 0, 0, 0, 276, 1152, 1, 0, 0, 0, 278, 1156, 1, 0, 0, 0, 280, 1160, 1, 0, 0, 0, 282, 1164, 1, 0, 0, 0, 284, 1168, 1, 0, 0, 0, 286, 1172, 1, 0, 0, 0, 288, 1176, 1, 0, 0, 0, 290, 1180, 1, 0, 0, 0, 292, 1184, 1, 0, 0, 0, 294, 1188, 1, 0, 0, 0, 296, 1193, 1, 0, 0, 0, 298, 1197, 1, 0, 0, 0, 300, 1201, 1, 0, 0, 0, 302, 1206, 1, 0, 0, 0, 304, 1210, 1, 0, 0, 0, 306, 1214, 1, 0, 0, 0, 308, 1218, 1, 0, 0, 0, 310, 1222, 1, 0, 0, 0, 312, 1228, 1, 0, 0, 0, 314, 1232, 1, 0, 0, 0, 316, 1236, 1, 0, 0, 0, 318, 1240, 1, 0, 0, 0, 320, 1244, 1, 0, 0, 0, 322, 1248, 1, 0, 0, 0, 324, 1252, 1, 0, 0, 0, 326, 1257, 1, 0, 0, 0, 328, 1261, 1, 0, 0, 0, 330, 1265, 1, 0, 0, 0, 332, 1269, 1, 0, 0, 0, 334, 1273, 1, 0, 0, 0, 336, 1277, 1, 0, 0, 0, 338, 1281, 1, 0, 0, 0, 340, 1286, 1, 0, 0, 0, 342, 1291, 1, 0, 0, 0, 344, 1295, 1, 0, 0, 0, 346, 1299, 1, 0, 0, 0, 348, 1303, 1, 0, 0, 0, 350, 1308, 1, 0, 0, 0, 352, 1318, 1, 0, 0, 0, 354, 1322, 1, 0, 0, 0, 356, 1326, 1, 0, 0, 0, 358, 1330, 1, 0, 0, 0, 360, 1335, 1, 0, 0, 0, 362, 1342, 1, 0, 0, 0, 364, 1346, 1, 0, 0, 0, 366, 1350, 1, 0, 0, 0, 368, 1354, 1, 0, 0, 0, 370, 1358, 1, 0, 0, 0, 372, 1363, 1, 0, 0, 0, 374, 1369, 1, 0, 0, 0, 376, 1373, 1, 0, 0, 0, 378, 1377, 1, 0, 0, 0, 380, 1381, 1, 0, 0, 0, 382, 1387, 1, 0, 0, 0, 384, 1391, 1, 0, 0, 0, 386, 1395, 1, 0, 0, 0, 388, 1399, 1, 0, 0, 0, 390, 1405, 1, 0, 0, 0, 392, 1411, 1, 0, 0, 0, 394, 1417, 1, 0, 0, 0, 396, 397, 7, 0, 0, 0, 397, 398, 7, 1, 0, 0, 398, 399, 7, 2, 0, 0, 399, 400, 7, 2, 0, 0, 400, 401, 7, 3, 0, 0, 401, 402, 7, 4, 0, 0, 402, 403, 7, 5, 0, 0, 403, 404, 1, 0, 0, 0, 404, 405, 6, 0, 0, 0, 405, 17, 1, 0, 0, 0, 406, 407, 7, 0, 0, 0, 407, 408, 7, 6, 0, 0, 408, 409, 7, 7, 0, 0, 409, 410, 7, 8, 0, 0, 410, 411, 1, 0, 0, 0, 411, 412, 6, 1, 1, 0, 412, 19, 1, 0, 0, 0, 413, 414, 7, 3, 0, 0, 414, 415, 7, 9, 0, 0, 415, 416, 7, 6, 0, 0, 416, 417, 7, 1, 0, 0, 417, 418, 7, 4, 0, 0, 418, 419, 7, 10, 0, 0, 419, 420, 1, 0, 0, 0, 420, 421, 6, 2, 2, 0, 421, 21, 1, 0, 0, 0, 422, 423, 7, 3, 0, 0, 423, 424, 7, 11, 0, 0, 424, 425, 7, 12, 0, 0, 425, 426, 7, 13, 0, 0, 426, 427, 1, 0, 0, 0, 427, 428, 6, 3, 0, 0, 428, 23, 1, 0, 0, 0, 429, 430, 7, 3, 0, 0, 430, 431, 7, 14, 0, 0, 431, 432, 7, 8, 0, 0, 432, 433, 7, 13, 0, 0, 433, 434, 7, 12, 0, 0, 434, 435, 7, 1, 0, 0, 435, 436, 7, 9, 0, 0, 436, 437, 1, 0, 0, 0, 437, 438, 6, 4, 3, 0, 438, 25, 1, 0, 0, 0, 439, 440, 7, 15, 0, 0, 440, 441, 7, 6, 0, 0, 441, 442, 7, 7, 0, 0, 442, 443, 7, 16, 0, 0, 443, 444, 1, 0, 0, 0, 444, 445, 6, 5, 4, 0, 445, 27, 1, 0, 0, 0, 446, 447, 7, 17, 0, 0, 447, 448, 7, 6, 0, 0, 448, 449, 7, 7, 0, 0, 449, 450, 7, 18, 0, 0, 450, 451, 1, 0, 0, 0, 451, 452, 6, 6, 0, 0, 452, 29, 1, 0, 0, 0, 453, 454, 7, 1, 0, 0, 454, 455, 7, 9, 0, 0, 455, 456, 7, 13, 0, 0, 456, 457, 7, 1, 0, 0, 457, 458, 7, 9, 0, 0, 458, 459, 7, 3, 0, 0, 459, 460, 7, 2, 0, 0, 460, 461, 7, 5, 0, 0, 461, 462, 7, 12, 0, 0, 462, 463, 7, 5, 0, 0, 463, 464, 7, 2, 0, 0, 464, 465, 1, 0, 0, 0, 465, 466, 6, 7, 0, 0, 466, 31, 1, 0, 0, 0, 467, 468, 7, 18, 0, 0, 468, 469, 7, 3, 0, 0, 469, 470, 7, 3, 0, 0, 470, 471, 7, 8, 0, 0, 471, 472, 1, 0, 0, 0, 472, 473, 6, 8, 1, 0, 473, 33, 1, 0, 0, 0, 474, 475, 7, 13, 0, 0, 475, 476, 7, 1, 0, 0, 476, 477, 7, 16, 0, 0, 477, 478, 7, 1, 0, 0, 478, 479, 7, 5, 0, 0, 479, 480, 1, 0, 0, 0, 480, 481, 6, 9, 0, 0, 481, 35, 1, 0, 0, 0, 482, 483, 7, 13, 0, 0, 483, 484, 7, 7, 0, 0, 484, 485, 7, 7, 0, 0, 485, 486, 7, 18, 0, 0, 486, 487, 7, 19, 0, 0, 487, 488, 7, 8, 0, 0, 488, 489, 1, 0, 0, 0, 489, 490, 6, 10, 5, 0, 490, 37, 1, 0, 0, 0, 491, 492, 7, 16, 0, 0, 492, 493, 7, 3, 0, 0, 493, 494, 7, 5, 0, 0, 494, 495, 7, 12, 0, 0, 495, 496, 1, 0, 0, 0, 496, 497, 6, 11, 6, 0, 497, 39, 1, 0, 0, 0, 498, 499, 7, 16, 0, 0, 499, 500, 7, 3, 0, 0, 500, 501, 7, 5, 0, 0, 501, 502, 7, 6, 0, 0, 502, 503, 7, 1, 0, 0, 503, 504, 7, 4, 0, 0, 504, 505, 7, 2, 0, 0, 505, 506, 1, 0, 0, 0, 506, 507, 6, 12, 7, 0, 507, 41, 1, 0, 0, 0, 508, 509, 7, 16, 0, 0, 509, 510, 7, 11, 0, 0, 510, 511, 5, 95, 0, 0, 511, 512, 7, 3, 0, 0, 512, 513, 7, 14, 0, 0, 513, 514, 7, 8, 0, 0, 514, 515, 7, 12, 0, 0, 515, 516, 7, 9, 0, 0, 516, 517, 7, 0, 0, 0, 517, 518, 1, 0, 0, 0, 518, 519, 6, 13, 8, 0, 519, 43, 1, 0, 0, 0, 520, 521, 7, 6, 0, 0, 521, 522, 7, 3, 0, 0, 522, 523, 7, 9, 0, 0, 523, 524, 7, 12, 0, 0, 524, 525, 7, 16, 0, 0, 525, 526, 7, 3, 0, 0, 526, 527, 1, 0, 0, 0, 527, 528, 6, 14, 9, 0, 528, 45, 1, 0, 0, 0, 529, 530, 7, 6, 0, 0, 530, 531, 7, 7, 0, 0, 531, 532, 7, 20, 0, 0, 532, 533, 1, 0, 0, 0, 533, 534, 6, 15, 0, 0, 534, 47, 1, 0, 0, 0, 535, 536, 7, 2, 0, 0, 536, 537, 7, 10, 0, 0, 537, 538, 7, 7, 0, 0, 538, 539, 7, 20, 0, 0, 539, 540, 1, 0, 0, 0, 540, 541, 6, 16, 10, 0, 541, 49, 1, 0, 0, 0, 542, 543, 7, 2, 0, 0, 543, 544, 7, 7, 0, 0, 544, 545, 7, 6, 0, 0, 545, 546, 7, 5, 0, 0, 546, 547, 1, 0, 0, 0, 547, 548, 6, 17, 0, 0, 548, 51, 1, 0, 0, 0, 549, 550, 7, 2, 0, 0, 550, 551, 7, 5, 0, 0, 551, 552, 7, 12, 0, 0, 552, 553, 7, 5, 0, 0, 553, 554, 7, 2, 0, 0, 554, 555, 1, 0, 0, 0, 555, 556, 6, 18, 0, 0, 556, 53, 1, 0, 0, 0, 557, 558, 7, 20, 0, 0, 558, 559, 7, 10, 0, 0, 559, 560, 7, 3, 0, 0, 560, 561, 7, 6, 0, 0, 561, 562, 7, 3, 0, 0, 562, 563, 1, 0, 0, 0, 563, 564, 6, 19, 0, 0, 564, 55, 1, 0, 0, 0, 565, 567, 8, 21, 0, 0, 566, 565, 1, 0, 0, 0, 567, 568, 1, 0, 0, 0, 568, 566, 1, 0, 0, 0, 568, 569, 1, 0, 0, 0, 569, 570, 1, 0, 0, 0, 570, 571, 6, 20, 0, 0, 571, 57, 1, 0, 0, 0, 572, 573, 5, 47, 0, 0, 573, 574, 5, 47, 0, 0, 574, 578, 1, 0, 0, 0, 575, 577, 8, 22, 0, 0, 576, 575, 1, 0, 0, 0, 577, 580, 1, 0, 0, 0, 578, 576, 1, 0, 0, 0, 578, 579, 1, 0, 0, 0, 579, 582, 1, 0, 0, 0, 580, 578, 1, 0, 0, 0, 581, 583, 5, 13, 0, 0, 582, 581, 1, 0, 0, 0, 582, 583, 1, 0, 0, 0, 583, 585, 1, 0, 0, 0, 584, 586, 5, 10, 0, 0, 585, 584, 1, 0, 0, 0, 585, 586, 1, 0, 0, 0, 586, 587, 1, 0, 0, 0, 587, 588, 6, 21, 11, 0, 588, 59, 1, 0, 0, 0, 589, 590, 5, 47, 0, 0, 590, 591, 5, 42, 0, 0, 591, 596, 1, 0, 0, 0, 592, 595, 3, 60, 22, 0, 593, 595, 9, 0, 0, 0, 594, 592, 1, 0, 0, 0, 594, 593, 1, 0, 0, 0, 595, 598, 1, 0, 0, 0, 596, 597, 1, 0, 0, 0, 596, 594, 1, 0, 0, 0, 597, 599, 1, 0, 0, 0, 598, 596, 1, 0, 0, 0, 599, 600, 5, 42, 0, 0, 600, 601, 5, 47, 0, 0, 601, 602, 1, 0, 0, 0, 602, 603, 6, 22, 11, 0, 603, 61, 1, 0, 0, 0, 604, 606, 7, 23, 0, 0, 605, 604, 1, 0, 0, 0, 606, 607, 1, 0, 0, 0, 607, 605, 1, 0, 0, 0, 607, 608, 1, 0, 0, 0, 608, 609, 1, 0, 0, 0, 609, 610, 6, 23, 11, 0, 610, 63, 1, 0, 0, 0, 611, 615, 8, 24, 0, 0, 612, 613, 5, 47, 0, 0, 613, 615, 8, 25, 0, 0, 614, 611, 1, 0, 0, 0, 614, 612, 1, 0, 0, 0, 615, 65, 1, 0, 0, 0, 616, 618, 3, 64, 24, 0, 617, 616, 1, 0, 0, 0, 618, 619, 1, 0, 0, 0, 619, 617, 1, 0, 0, 0, 619, 620, 1, 0, 0, 0, 620, 67, 1, 0, 0, 0, 621, 622, 3, 178, 81, 0, 622, 623, 1, 0, 0, 0, 623, 624, 6, 26, 12, 0, 624, 625, 6, 26, 13, 0, 625, 69, 1, 0, 0, 0, 626, 627, 3, 78, 31, 0, 627, 628, 1, 0, 0, 0, 628, 629, 6, 27, 14, 0, 629, 630, 6, 27, 15, 0, 630, 71, 1, 0, 0, 0, 631, 632, 3, 62, 23, 0, 632, 633, 1, 0, 0, 0, 633, 634, 6, 28, 11, 0, 634, 73, 1, 0, 0, 0, 635, 636, 3, 58, 21, 0, 636, 637, 1, 0, 0, 0, 637, 638, 6, 29, 11, 0, 638, 75, 1, 0, 0, 0, 639, 640, 3, 60, 22, 0, 640, 641, 1, 0, 0, 0, 641, 642, 6, 30, 11, 0, 642, 77, 1, 0, 0, 0, 643, 644, 5, 124, 0, 0, 644, 645, 1, 0, 0, 0, 645, 646, 6, 31, 15, 0, 646, 79, 1, 0, 0, 0, 647, 648, 7, 26, 0, 0, 648, 81, 1, 0, 0, 0, 649, 650, 7, 27, 0, 0, 650, 83, 1, 0, 0, 0, 651, 652, 5, 92, 0, 0, 652, 653, 7, 28, 0, 0, 653, 85, 1, 0, 0, 0, 654, 655, 8, 29, 0, 0, 655, 87, 1, 0, 0, 0, 656, 658, 7, 3, 0, 0, 657, 659, 7, 30, 0, 0, 658, 657, 1, 0, 0, 0, 658, 659, 1, 0, 0, 0, 659, 661, 1, 0, 0, 0, 660, 662, 3, 80, 32, 0, 661, 660, 1, 0, 0, 0, 662, 663, 1, 0, 0, 0, 663, 661, 1, 0, 0, 0, 663, 664, 1, 0, 0, 0, 664, 89, 1, 0, 0, 0, 665, 666, 5, 64, 0, 0, 666, 91, 1, 0, 0, 0, 667, 668, 5, 96, 0, 0, 668, 93, 1, 0, 0, 0, 669, 673, 8, 31, 0, 0, 670, 671, 5, 96, 0, 0, 671, 673, 5, 96, 0, 0, 672, 669, 1, 0, 0, 0, 672, 670, 1, 0, 0, 0, 673, 95, 1, 0, 0, 0, 674, 675, 5, 95, 0, 0, 675, 97, 1, 0, 0, 0, 676, 680, 3, 82, 33, 0, 677, 680, 3, 80, 32, 0, 678, 680, 3, 96, 40, 0, 679, 676, 1, 0, 0, 0, 679, 677, 1, 0, 0, 0, 679, 678, 1, 0, 0, 0, 680, 99, 1, 0, 0, 0, 681, 686, 5, 34, 0, 0, 682, 685, 3, 84, 34, 0, 683, 685, 3, 86, 35, 0, 684, 682, 1, 0, 0, 0, 684, 683, 1, 0, 0, 0, 685, 688, 1, 0, 0, 0, 686, 684, 1, 0, 0, 0, 686, 687, 1, 0, 0, 0, 687, 689, 1, 0, 0, 0, 688, 686, 1, 0, 0, 0, 689, 711, 5, 34, 0, 0, 690, 691, 5, 34, 0, 0, 691, 692, 5, 34, 0, 0, 692, 693, 5, 34, 0, 0, 693, 697, 1, 0, 0, 0, 694, 696, 8, 22, 0, 0, 695, 694, 1, 0, 0, 0, 696, 699, 1, 0, 0, 0, 697, 698, 1, 0, 0, 0, 697, 695, 1, 0, 0, 0, 698, 700, 1, 0, 0, 0, 699, 697, 1, 0, 0, 0, 700, 701, 5, 34, 0, 0, 701, 702, 5, 34, 0, 0, 702, 703, 5, 34, 0, 0, 703, 705, 1, 0, 0, 0, 704, 706, 5, 34, 0, 0, 705, 704, 1, 0, 0, 0, 705, 706, 1, 0, 0, 0, 706, 708, 1, 0, 0, 0, 707, 709, 5, 34, 0, 0, 708, 707, 1, 0, 0, 0, 708, 709, 1, 0, 0, 0, 709, 711, 1, 0, 0, 0, 710, 681, 1, 0, 0, 0, 710, 690, 1, 0, 0, 0, 711, 101, 1, 0, 0, 0, 712, 714, 3, 80, 32, 0, 713, 712, 1, 0, 0, 0, 714, 715, 1, 0, 0, 0, 715, 713, 1, 0, 0, 0, 715, 716, 1, 0, 0, 0, 716, 103, 1, 0, 0, 0, 717, 719, 3, 80, 32, 0, 718, 717, 1, 0, 0, 0, 719, 720, 1, 0, 0, 0, 720, 718, 1, 0, 0, 0, 720, 721, 1, 0, 0, 0, 721, 722, 1, 0, 0, 0, 722, 726, 3, 120, 52, 0, 723, 725, 3, 80, 32, 0, 724, 723, 1, 0, 0, 0, 725, 728, 1, 0, 0, 0, 726, 724, 1, 0, 0, 0, 726, 727, 1, 0, 0, 0, 727, 760, 1, 0, 0, 0, 728, 726, 1, 0, 0, 0, 729, 731, 3, 120, 52, 0, 730, 732, 3, 80, 32, 0, 731, 730, 1, 0, 0, 0, 732, 733, 1, 0, 0, 0, 733, 731, 1, 0, 0, 0, 733, 734, 1, 0, 0, 0, 734, 760, 1, 0, 0, 0, 735, 737, 3, 80, 32, 0, 736, 735, 1, 0, 0, 0, 737, 738, 1, 0, 0, 0, 738, 736, 1, 0, 0, 0, 738, 739, 1, 0, 0, 0, 739, 747, 1, 0, 0, 0, 740, 744, 3, 120, 52, 0, 741, 743, 3, 80, 32, 0, 742, 741, 1, 0, 0, 0, 743, 746, 1, 0, 0, 0, 744, 742, 1, 0, 0, 0, 744, 745, 1, 0, 0, 0, 745, 748, 1, 0, 0, 0, 746, 744, 1, 0, 0, 0, 747, 740, 1, 0, 0, 0, 747, 748, 1, 0, 0, 0, 748, 749, 1, 0, 0, 0, 749, 750, 3, 88, 36, 0, 750, 760, 1, 0, 0, 0, 751, 753, 3, 120, 52, 0, 752, 754, 3, 80, 32, 0, 753, 752, 1, 0, 0, 0, 754, 755, 1, 0, 0, 0, 755, 753, 1, 0, 0, 0, 755, 756, 1, 0, 0, 0, 756, 757, 1, 0, 0, 0, 757, 758, 3, 88, 36, 0, 758, 760, 1, 0, 0, 0, 759, 718, 1, 0, 0, 0, 759, 729, 1, 0, 0, 0, 759, 736, 1, 0, 0, 0, 759, 751, 1, 0, 0, 0, 760, 105, 1, 0, 0, 0, 761, 762, 7, 32, 0, 0, 762, 763, 7, 33, 0, 0, 763, 107, 1, 0, 0, 0, 764, 765, 7, 12, 0, 0, 765, 766, 7, 9, 0, 0, 766, 767, 7, 0, 0, 0, 767, 109, 1, 0, 0, 0, 768, 769, 7, 12, 0, 0, 769, 770, 7, 2, 0, 0, 770, 771, 7, 4, 0, 0, 771, 111, 1, 0, 0, 0, 772, 773, 5, 61, 0, 0, 773, 113, 1, 0, 0, 0, 774, 775, 5, 58, 0, 0, 775, 776, 5, 58, 0, 0, 776, 115, 1, 0, 0, 0, 777, 778, 5, 44, 0, 0, 778, 117, 1, 0, 0, 0, 779, 780, 7, 0, 0, 0, 780, 781, 7, 3, 0, 0, 781, 782, 7, 2, 0, 0, 782, 783, 7, 4, 0, 0, 783, 119, 1, 0, 0, 0, 784, 785, 5, 46, 0, 0, 785, 121, 1, 0, 0, 0, 786, 787, 7, 15, 0, 0, 787, 788, 7, 12, 0, 0, 788, 789, 7, 13, 0, 0, 789, 790, 7, 2, 0, 0, 790, 791, 7, 3, 0, 0, 791, 123, 1, 0, 0, 0, 792, 793, 7, 15, 0, 0, 793, 794, 7, 1, 0, 0, 794, 795, 7, 6, 0, 0, 795, 796, 7, 2, 0, 0, 796, 797, 7, 5, 0, 0, 797, 125, 1, 0, 0, 0, 798, 799, 7, 13, 0, 0, 799, 800, 7, 12, 0, 0, 800, 801, 7, 2, 0, 0, 801, 802, 7, 5, 0, 0, 802, 127, 1, 0, 0, 0, 803, 804, 5, 40, 0, 0, 804, 129, 1, 0, 0, 0, 805, 806, 7, 1, 0, 0, 806, 807, 7, 9, 0, 0, 807, 131, 1, 0, 0, 0, 808, 809, 7, 1, 0, 0, 809, 810, 7, 2, 0, 0, 810, 133, 1, 0, 0, 0, 811, 812, 7, 13, 0, 0, 812, 813, 7, 1, 0, 0, 813, 814, 7, 18, 0, 0, 814, 815, 7, 3, 0, 0, 815, 135, 1, 0, 0, 0, 816, 817, 7, 9, 0, 0, 817, 818, 7, 7, 0, 0, 818, 819, 7, 5, 0, 0, 819, 137, 1, 0, 0, 0, 820, 821, 7, 9, 0, 0, 821, 822, 7, 19, 0, 0, 822, 823, 7, 13, 0, 0, 823, 824, 7, 13, 0, 0, 824, 139, 1, 0, 0, 0, 825, 826, 7, 9, 0, 0, 826, 827, 7, 19, 0, 0, 827, 828, 7, 13, 0, 0, 828, 829, 7, 13, 0, 0, 829, 830, 7, 2, 0, 0, 830, 141, 1, 0, 0, 0, 831, 832, 7, 7, 0, 0, 832, 833, 7, 6, 0, 0, 833, 143, 1, 0, 0, 0, 834, 835, 5, 63, 0, 0, 835, 145, 1, 0, 0, 0, 836, 837, 7, 6, 0, 0, 837, 838, 7, 13, 0, 0, 838, 839, 7, 1, 0, 0, 839, 840, 7, 18, 0, 0, 840, 841, 7, 3, 0, 0, 841, 147, 1, 0, 0, 0, 842, 843, 5, 41, 0, 0, 843, 149, 1, 0, 0, 0, 844, 845, 7, 5, 0, 0, 845, 846, 7, 6, 0, 0, 846, 847, 7, 19, 0, 0, 847, 848, 7, 3, 0, 0, 848, 151, 1, 0, 0, 0, 849, 850, 5, 61, 0, 0, 850, 851, 5, 61, 0, 0, 851, 153, 1, 0, 0, 0, 852, 853, 5, 61, 0, 0, 853, 854, 5, 126, 0, 0, 854, 155, 1, 0, 0, 0, 855, 856, 5, 33, 0, 0, 856, 857, 5, 61, 0, 0, 857, 157, 1, 0, 0, 0, 858, 859, 5, 60, 0, 0, 859, 159, 1, 0, 0, 0, 860, 861, 5, 60, 0, 0, 861, 862, 5, 61, 0, 0, 862, 161, 1, 0, 0, 0, 863, 864, 5, 62, 0, 0, 864, 163, 1, 0, 0, 0, 865, 866, 5, 62, 0, 0, 866, 867, 5, 61, 0, 0, 867, 165, 1, 0, 0, 0, 868, 869, 5, 43, 0, 0, 869, 167, 1, 0, 0, 0, 870, 871, 5, 45, 0, 0, 871, 169, 1, 0, 0, 0, 872, 873, 5, 42, 0, 0, 873, 171, 1, 0, 0, 0, 874, 875, 5, 47, 0, 0, 875, 173, 1, 0, 0, 0, 876, 877, 5, 37, 0, 0, 877, 175, 1, 0, 0, 0, 878, 879, 3, 144, 64, 0, 879, 883, 3, 82, 33, 0, 880, 882, 3, 98, 41, 0, 881, 880, 1, 0, 0, 0, 882, 885, 1, 0, 0, 0, 883, 881, 1, 0, 0, 0, 883, 884, 1, 0, 0, 0, 884, 893, 1, 0, 0, 0, 885, 883, 1, 0, 0, 0, 886, 888, 3, 144, 64, 0, 887, 889, 3, 80, 32, 0, 888, 887, 1, 0, 0, 0, 889, 890, 1, 0, 0, 0, 890, 888, 1, 0, 0, 0, 890, 891, 1, 0, 0, 0, 891, 893, 1, 0, 0, 0, 892, 878, 1, 0, 0, 0, 892, 886, 1, 0, 0, 0, 893, 177, 1, 0, 0, 0, 894, 895, 5, 91, 0, 0, 895, 896, 1, 0, 0, 0, 896, 897, 6, 81, 0, 0, 897, 898, 6, 81, 0, 0, 898, 179, 1, 0, 0, 0, 899, 900, 5, 93, 0, 0, 900, 901, 1, 0, 0, 0, 901, 902, 6, 82, 15, 0, 902, 903, 6, 82, 15, 0, 903, 181, 1, 0, 0, 0, 904, 908, 3, 82, 33, 0, 905, 907, 3, 98, 41, 0, 906, 905, 1, 0, 0, 0, 907, 910, 1, 0, 0, 0, 908, 906, 1, 0, 0, 0, 908, 909, 1, 0, 0, 0, 909, 921, 1, 0, 0, 0, 910, 908, 1, 0, 0, 0, 911, 914, 3, 96, 40, 0, 912, 914, 3, 90, 37, 0, 913, 911, 1, 0, 0, 0, 913, 912, 1, 0, 0, 0, 914, 916, 1, 0, 0, 0, 915, 917, 3, 98, 41, 0, 916, 915, 1, 0, 0, 0, 917, 918, 1, 0, 0, 0, 918, 916, 1, 0, 0, 0, 918, 919, 1, 0, 0, 0, 919, 921, 1, 0, 0, 0, 920, 904, 1, 0, 0, 0, 920, 913, 1, 0, 0, 0, 921, 183, 1, 0, 0, 0, 922, 924, 3, 92, 38, 0, 923, 925, 3, 94, 39, 0, 924, 923, 1, 0, 0, 0, 925, 926, 1, 0, 0, 0, 926, 924, 1, 0, 0, 0, 926, 927, 1, 0, 0, 0, 927, 928, 1, 0, 0, 0, 928, 929, 3, 92, 38, 0, 929, 185, 1, 0, 0, 0, 930, 931, 3, 184, 84, 0, 931, 187, 1, 0, 0, 0, 932, 933, 3, 58, 21, 0, 933, 934, 1, 0, 0, 0, 934, 935, 6, 86, 11, 0, 935, 189, 1, 0, 0, 0, 936, 937, 3, 60, 22, 0, 937, 938, 1, 0, 0, 0, 938, 939, 6, 87, 11, 0, 939, 191, 1, 0, 0, 0, 940, 941, 3, 62, 23, 0, 941, 942, 1, 0, 0, 0, 942, 943, 6, 88, 11, 0, 943, 193, 1, 0, 0, 0, 944, 945, 3, 78, 31, 0, 945, 946, 1, 0, 0, 0, 946, 947, 6, 89, 14, 0, 947, 948, 6, 89, 15, 0, 948, 195, 1, 0, 0, 0, 949, 950, 3, 178, 81, 0, 950, 951, 1, 0, 0, 0, 951, 952, 6, 90, 12, 0, 952, 197, 1, 0, 0, 0, 953, 954, 3, 180, 82, 0, 954, 955, 1, 0, 0, 0, 955, 956, 6, 91, 16, 0, 956, 199, 1, 0, 0, 0, 957, 958, 3, 116, 50, 0, 958, 959, 1, 0, 0, 0, 959, 960, 6, 92, 17, 0, 960, 201, 1, 0, 0, 0, 961, 962, 3, 112, 48, 0, 962, 963, 1, 0, 0, 0, 963, 964, 6, 93, 18, 0, 964, 203, 1, 0, 0, 0, 965, 966, 3, 100, 42, 0, 966, 967, 1, 0, 0, 0, 967, 968, 6, 94, 19, 0, 968, 205, 1, 0, 0, 0, 969, 970, 7, 16, 0, 0, 970, 971, 7, 3, 0, 0, 971, 972, 7, 5, 0, 0, 972, 973, 7, 12, 0, 0, 973, 974, 7, 0, 0, 0, 974, 975, 7, 12, 0, 0, 975, 976, 7, 5, 0, 0, 976, 977, 7, 12, 0, 0, 977, 207, 1, 0, 0, 0, 978, 979, 3, 66, 25, 0, 979, 980, 1, 0, 0, 0, 980, 981, 6, 96, 20, 0, 981, 209, 1, 0, 0, 0, 982, 983, 3, 58, 21, 0, 983, 984, 1, 0, 0, 0, 984, 985, 6, 97, 11, 0, 985, 211, 1, 0, 0, 0, 986, 987, 3, 60, 22, 0, 987, 988, 1, 0, 0, 0, 988, 989, 6, 98, 11, 0, 989, 213, 1, 0, 0, 0, 990, 991, 3, 62, 23, 0, 991, 992, 1, 0, 0, 0, 992, 993, 6, 99, 11, 0, 993, 215, 1, 0, 0, 0, 994, 995, 3, 78, 31, 0, 995, 996, 1, 0, 0, 0, 996, 997, 6, 100, 14, 0, 997, 998, 6, 100, 15, 0, 998, 217, 1, 0, 0, 0, 999, 1000, 3, 120, 52, 0, 1000, 1001, 1, 0, 0, 0, 1001, 1002, 6, 101, 21, 0, 1002, 219, 1, 0, 0, 0, 1003, 1004, 3, 116, 50, 0, 1004, 1005, 1, 0, 0, 0, 1005, 1006, 6, 102, 17, 0, 1006, 221, 1, 0, 0, 0, 1007, 1012, 3, 82, 33, 0, 1008, 1012, 3, 80, 32, 0, 1009, 1012, 3, 96, 40, 0, 1010, 1012, 3, 170, 77, 0, 1011, 1007, 1, 0, 0, 0, 1011, 1008, 1, 0, 0, 0, 1011, 1009, 1, 0, 0, 0, 1011, 1010, 1, 0, 0, 0, 1012, 223, 1, 0, 0, 0, 1013, 1016, 3, 82, 33, 0, 1014, 1016, 3, 170, 77, 0, 1015, 1013, 1, 0, 0, 0, 1015, 1014, 1, 0, 0, 0, 1016, 1020, 1, 0, 0, 0, 1017, 1019, 3, 222, 103, 0, 1018, 1017, 1, 0, 0, 0, 1019, 1022, 1, 0, 0, 0, 1020, 1018, 1, 0, 0, 0, 1020, 1021, 1, 0, 0, 0, 1021, 1033, 1, 0, 0, 0, 1022, 1020, 1, 0, 0, 0, 1023, 1026, 3, 96, 40, 0, 1024, 1026, 3, 90, 37, 0, 1025, 1023, 1, 0, 0, 0, 1025, 1024, 1, 0, 0, 0, 1026, 1028, 1, 0, 0, 0, 1027, 1029, 3, 222, 103, 0, 1028, 1027, 1, 0, 0, 0, 1029, 1030, 1, 0, 0, 0, 1030, 1028, 1, 0, 0, 0, 1030, 1031, 1, 0, 0, 0, 1031, 1033, 1, 0, 0, 0, 1032, 1015, 1, 0, 0, 0, 1032, 1025, 1, 0, 0, 0, 1033, 225, 1, 0, 0, 0, 1034, 1037, 3, 224, 104, 0, 1035, 1037, 3, 184, 84, 0, 1036, 1034, 1, 0, 0, 0, 1036, 1035, 1, 0, 0, 0, 1037, 1038, 1, 0, 0, 0, 1038, 1036, 1, 0, 0, 0, 1038, 1039, 1, 0, 0, 0, 1039, 227, 1, 0, 0, 0, 1040, 1041, 3, 58, 21, 0, 1041, 1042, 1, 0, 0, 0, 1042, 1043, 6, 106, 11, 0, 1043, 229, 1, 0, 0, 0, 1044, 1045, 3, 60, 22, 0, 1045, 1046, 1, 0, 0, 0, 1046, 1047, 6, 107, 11, 0, 1047, 231, 1, 0, 0, 0, 1048, 1049, 3, 62, 23, 0, 1049, 1050, 1, 0, 0, 0, 1050, 1051, 6, 108, 11, 0, 1051, 233, 1, 0, 0, 0, 1052, 1053, 3, 78, 31, 0, 1053, 1054, 1, 0, 0, 0, 1054, 1055, 6, 109, 14, 0, 1055, 1056, 6, 109, 15, 0, 1056, 235, 1, 0, 0, 0, 1057, 1058, 3, 112, 48, 0, 1058, 1059, 1, 0, 0, 0, 1059, 1060, 6, 110, 18, 0, 1060, 237, 1, 0, 0, 0, 1061, 1062, 3, 116, 50, 0, 1062, 1063, 1, 0, 0, 0, 1063, 1064, 6, 111, 17, 0, 1064, 239, 1, 0, 0, 0, 1065, 1066, 3, 120, 52, 0, 1066, 1067, 1, 0, 0, 0, 1067, 1068, 6, 112, 21, 0, 1068, 241, 1, 0, 0, 0, 1069, 1070, 7, 12, 0, 0, 1070, 1071, 7, 2, 0, 0, 1071, 243, 1, 0, 0, 0, 1072, 1073, 3, 226, 105, 0, 1073, 1074, 1, 0, 0, 0, 1074, 1075, 6, 114, 22, 0, 1075, 245, 1, 0, 0, 0, 1076, 1077, 3, 58, 21, 0, 1077, 1078, 1, 0, 0, 0, 1078, 1079, 6, 115, 11, 0, 1079, 247, 1, 0, 0, 0, 1080, 1081, 3, 60, 22, 0, 1081, 1082, 1, 0, 0, 0, 1082, 1083, 6, 116, 11, 0, 1083, 249, 1, 0, 0, 0, 1084, 1085, 3, 62, 23, 0, 1085, 1086, 1, 0, 0, 0, 1086, 1087, 6, 117, 11, 0, 1087, 251, 1, 0, 0, 0, 1088, 1089, 3, 78, 31, 0, 1089, 1090, 1, 0, 0, 0, 1090, 1091, 6, 118, 14, 0, 1091, 1092, 6, 118, 15, 0, 1092, 253, 1, 0, 0, 0, 1093, 1094, 3, 178, 81, 0, 1094, 1095, 1, 0, 0, 0, 1095, 1096, 6, 119, 12, 0, 1096, 1097, 6, 119, 23, 0, 1097, 255, 1, 0, 0, 0, 1098, 1099, 7, 7, 0, 0, 1099, 1100, 7, 9, 0, 0, 1100, 1101, 1, 0, 0, 0, 1101, 1102, 6, 120, 24, 0, 1102, 257, 1, 0, 0, 0, 1103, 1104, 7, 20, 0, 0, 1104, 1105, 7, 1, 0, 0, 1105, 1106, 7, 5, 0, 0, 1106, 1107, 7, 10, 0, 0, 1107, 1108, 1, 0, 0, 0, 1108, 1109, 6, 121, 24, 0, 1109, 259, 1, 0, 0, 0, 1110, 1111, 8, 34, 0, 0, 1111, 261, 1, 0, 0, 0, 1112, 1114, 3, 260, 122, 0, 1113, 1112, 1, 0, 0, 0, 1114, 1115, 1, 0, 0, 0, 1115, 1113, 1, 0, 0, 0, 1115, 1116, 1, 0, 0, 0, 1116, 1117, 1, 0, 0, 0, 1117, 1118, 3, 360, 172, 0, 1118, 1120, 1, 0, 0, 0, 1119, 1113, 1, 0, 0, 0, 1119, 1120, 1, 0, 0, 0, 1120, 1122, 1, 0, 0, 0, 1121, 1123, 3, 260, 122, 0, 1122, 1121, 1, 0, 0, 0, 1123, 1124, 1, 0, 0, 0, 1124, 1122, 1, 0, 0, 0, 1124, 1125, 1, 0, 0, 0, 1125, 263, 1, 0, 0, 0, 1126, 1127, 3, 186, 85, 0, 1127, 1128, 1, 0, 0, 0, 1128, 1129, 6, 124, 25, 0, 1129, 265, 1, 0, 0, 0, 1130, 1131, 3, 262, 123, 0, 1131, 1132, 1, 0, 0, 0, 1132, 1133, 6, 125, 26, 0, 1133, 267, 1, 0, 0, 0, 1134, 1135, 3, 58, 21, 0, 1135, 1136, 1, 0, 0, 0, 1136, 1137, 6, 126, 11, 0, 1137, 269, 1, 0, 0, 0, 1138, 1139, 3, 60, 22, 0, 1139, 1140, 1, 0, 0, 0, 1140, 1141, 6, 127, 11, 0, 1141, 271, 1, 0, 0, 0, 1142, 1143, 3, 62, 23, 0, 1143, 1144, 1, 0, 0, 0, 1144, 1145, 6, 128, 11, 0, 1145, 273, 1, 0, 0, 0, 1146, 1147, 3, 78, 31, 0, 1147, 1148, 1, 0, 0, 0, 1148, 1149, 6, 129, 14, 0, 1149, 1150, 6, 129, 15, 0, 1150, 1151, 6, 129, 15, 0, 1151, 275, 1, 0, 0, 0, 1152, 1153, 3, 112, 48, 0, 1153, 1154, 1, 0, 0, 0, 1154, 1155, 6, 130, 18, 0, 1155, 277, 1, 0, 0, 0, 1156, 1157, 3, 116, 50, 0, 1157, 1158, 1, 0, 0, 0, 1158, 1159, 6, 131, 17, 0, 1159, 279, 1, 0, 0, 0, 1160, 1161, 3, 120, 52, 0, 1161, 1162, 1, 0, 0, 0, 1162, 1163, 6, 132, 21, 0, 1163, 281, 1, 0, 0, 0, 1164, 1165, 3, 258, 121, 0, 1165, 1166, 1, 0, 0, 0, 1166, 1167, 6, 133, 27, 0, 1167, 283, 1, 0, 0, 0, 1168, 1169, 3, 226, 105, 0, 1169, 1170, 1, 0, 0, 0, 1170, 1171, 6, 134, 22, 0, 1171, 285, 1, 0, 0, 0, 1172, 1173, 3, 186, 85, 0, 1173, 1174, 1, 0, 0, 0, 1174, 1175, 6, 135, 25, 0, 1175, 287, 1, 0, 0, 0, 1176, 1177, 3, 58, 21, 0, 1177, 1178, 1, 0, 0, 0, 1178, 1179, 6, 136, 11, 0, 1179, 289, 1, 0, 0, 0, 1180, 1181, 3, 60, 22, 0, 1181, 1182, 1, 0, 0, 0, 1182, 1183, 6, 137, 11, 0, 1183, 291, 1, 0, 0, 0, 1184, 1185, 3, 62, 23, 0, 1185, 1186, 1, 0, 0, 0, 1186, 1187, 6, 138, 11, 0, 1187, 293, 1, 0, 0, 0, 1188, 1189, 3, 78, 31, 0, 1189, 1190, 1, 0, 0, 0, 1190, 1191, 6, 139, 14, 0, 1191, 1192, 6, 139, 15, 0, 1192, 295, 1, 0, 0, 0, 1193, 1194, 3, 116, 50, 0, 1194, 1195, 1, 0, 0, 0, 1195, 1196, 6, 140, 17, 0, 1196, 297, 1, 0, 0, 0, 1197, 1198, 3, 120, 52, 0, 1198, 1199, 1, 0, 0, 0, 1199, 1200, 6, 141, 21, 0, 1200, 299, 1, 0, 0, 0, 1201, 1202, 3, 256, 120, 0, 1202, 1203, 1, 0, 0, 0, 1203, 1204, 6, 142, 28, 0, 1204, 1205, 6, 142, 29, 0, 1205, 301, 1, 0, 0, 0, 1206, 1207, 3, 66, 25, 0, 1207, 1208, 1, 0, 0, 0, 1208, 1209, 6, 143, 20, 0, 1209, 303, 1, 0, 0, 0, 1210, 1211, 3, 58, 21, 0, 1211, 1212, 1, 0, 0, 0, 1212, 1213, 6, 144, 11, 0, 1213, 305, 1, 0, 0, 0, 1214, 1215, 3, 60, 22, 0, 1215, 1216, 1, 0, 0, 0, 1216, 1217, 6, 145, 11, 0, 1217, 307, 1, 0, 0, 0, 1218, 1219, 3, 62, 23, 0, 1219, 1220, 1, 0, 0, 0, 1220, 1221, 6, 146, 11, 0, 1221, 309, 1, 0, 0, 0, 1222, 1223, 3, 78, 31, 0, 1223, 1224, 1, 0, 0, 0, 1224, 1225, 6, 147, 14, 0, 1225, 1226, 6, 147, 15, 0, 1226, 1227, 6, 147, 15, 0, 1227, 311, 1, 0, 0, 0, 1228, 1229, 3, 116, 50, 0, 1229, 1230, 1, 0, 0, 0, 1230, 1231, 6, 148, 17, 0, 1231, 313, 1, 0, 0, 0, 1232, 1233, 3, 120, 52, 0, 1233, 1234, 1, 0, 0, 0, 1234, 1235, 6, 149, 21, 0, 1235, 315, 1, 0, 0, 0, 1236, 1237, 3, 226, 105, 0, 1237, 1238, 1, 0, 0, 0, 1238, 1239, 6, 150, 22, 0, 1239, 317, 1, 0, 0, 0, 1240, 1241, 3, 58, 21, 0, 1241, 1242, 1, 0, 0, 0, 1242, 1243, 6, 151, 11, 0, 1243, 319, 1, 0, 0, 0, 1244, 1245, 3, 60, 22, 0, 1245, 1246, 1, 0, 0, 0, 1246, 1247, 6, 152, 11, 0, 1247, 321, 1, 0, 0, 0, 1248, 1249, 3, 62, 23, 0, 1249, 1250, 1, 0, 0, 0, 1250, 1251, 6, 153, 11, 0, 1251, 323, 1, 0, 0, 0, 1252, 1253, 3, 78, 31, 0, 1253, 1254, 1, 0, 0, 0, 1254, 1255, 6, 154, 14, 0, 1255, 1256, 6, 154, 15, 0, 1256, 325, 1, 0, 0, 0, 1257, 1258, 3, 120, 52, 0, 1258, 1259, 1, 0, 0, 0, 1259, 1260, 6, 155, 21, 0, 1260, 327, 1, 0, 0, 0, 1261, 1262, 3, 186, 85, 0, 1262, 1263, 1, 0, 0, 0, 1263, 1264, 6, 156, 25, 0, 1264, 329, 1, 0, 0, 0, 1265, 1266, 3, 182, 83, 0, 1266, 1267, 1, 0, 0, 0, 1267, 1268, 6, 157, 30, 0, 1268, 331, 1, 0, 0, 0, 1269, 1270, 3, 58, 21, 0, 1270, 1271, 1, 0, 0, 0, 1271, 1272, 6, 158, 11, 0, 1272, 333, 1, 0, 0, 0, 1273, 1274, 3, 60, 22, 0, 1274, 1275, 1, 0, 0, 0, 1275, 1276, 6, 159, 11, 0, 1276, 335, 1, 0, 0, 0, 1277, 1278, 3, 62, 23, 0, 1278, 1279, 1, 0, 0, 0, 1279, 1280, 6, 160, 11, 0, 1280, 337, 1, 0, 0, 0, 1281, 1282, 3, 78, 31, 0, 1282, 1283, 1, 0, 0, 0, 1283, 1284, 6, 161, 14, 0, 1284, 1285, 6, 161, 15, 0, 1285, 339, 1, 0, 0, 0, 1286, 1287, 7, 1, 0, 0, 1287, 1288, 7, 9, 0, 0, 1288, 1289, 7, 15, 0, 0, 1289, 1290, 7, 7, 0, 0, 1290, 341, 1, 0, 0, 0, 1291, 1292, 3, 58, 21, 0, 1292, 1293, 1, 0, 0, 0, 1293, 1294, 6, 163, 11, 0, 1294, 343, 1, 0, 0, 0, 1295, 1296, 3, 60, 22, 0, 1296, 1297, 1, 0, 0, 0, 1297, 1298, 6, 164, 11, 0, 1298, 345, 1, 0, 0, 0, 1299, 1300, 3, 62, 23, 0, 1300, 1301, 1, 0, 0, 0, 1301, 1302, 6, 165, 11, 0, 1302, 347, 1, 0, 0, 0, 1303, 1304, 3, 78, 31, 0, 1304, 1305, 1, 0, 0, 0, 1305, 1306, 6, 166, 14, 0, 1306, 1307, 6, 166, 15, 0, 1307, 349, 1, 0, 0, 0, 1308, 1309, 7, 15, 0, 0, 1309, 1310, 7, 19, 0, 0, 1310, 1311, 7, 9, 0, 0, 1311, 1312, 7, 4, 0, 0, 1312, 1313, 7, 5, 0, 0, 1313, 1314, 7, 1, 0, 0, 1314, 1315, 7, 7, 0, 0, 1315, 1316, 7, 9, 0, 0, 1316, 1317, 7, 2, 0, 0, 1317, 351, 1, 0, 0, 0, 1318, 1319, 3, 58, 21, 0, 1319, 1320, 1, 0, 0, 0, 1320, 1321, 6, 168, 11, 0, 1321, 353, 1, 0, 0, 0, 1322, 1323, 3, 60, 22, 0, 1323, 1324, 1, 0, 0, 0, 1324, 1325, 6, 169, 11, 0, 1325, 355, 1, 0, 0, 0, 1326, 1327, 3, 62, 23, 0, 1327, 1328, 1, 0, 0, 0, 1328, 1329, 6, 170, 11, 0, 1329, 357, 1, 0, 0, 0, 1330, 1331, 3, 180, 82, 0, 1331, 1332, 1, 0, 0, 0, 1332, 1333, 6, 171, 16, 0, 1333, 1334, 6, 171, 15, 0, 1334, 359, 1, 0, 0, 0, 1335, 1336, 5, 58, 0, 0, 1336, 361, 1, 0, 0, 0, 1337, 1343, 3, 90, 37, 0, 1338, 1343, 3, 80, 32, 0, 1339, 1343, 3, 120, 52, 0, 1340, 1343, 3, 82, 33, 0, 1341, 1343, 3, 96, 40, 0, 1342, 1337, 1, 0, 0, 0, 1342, 1338, 1, 0, 0, 0, 1342, 1339, 1, 0, 0, 0, 1342, 1340, 1, 0, 0, 0, 1342, 1341, 1, 0, 0, 0, 1343, 1344, 1, 0, 0, 0, 1344, 1342, 1, 0, 0, 0, 1344, 1345, 1, 0, 0, 0, 1345, 363, 1, 0, 0, 0, 1346, 1347, 3, 58, 21, 0, 1347, 1348, 1, 0, 0, 0, 1348, 1349, 6, 174, 11, 0, 1349, 365, 1, 0, 0, 0, 1350, 1351, 3, 60, 22, 0, 1351, 1352, 1, 0, 0, 0, 1352, 1353, 6, 175, 11, 0, 1353, 367, 1, 0, 0, 0, 1354, 1355, 3, 62, 23, 0, 1355, 1356, 1, 0, 0, 0, 1356, 1357, 6, 176, 11, 0, 1357, 369, 1, 0, 0, 0, 1358, 1359, 3, 78, 31, 0, 1359, 1360, 1, 0, 0, 0, 1360, 1361, 6, 177, 14, 0, 1361, 1362, 6, 177, 15, 0, 1362, 371, 1, 0, 0, 0, 1363, 1364, 3, 66, 25, 0, 1364, 1365, 1, 0, 0, 0, 1365, 1366, 6, 178, 20, 0, 1366, 1367, 6, 178, 15, 0, 1367, 1368, 6, 178, 31, 0, 1368, 373, 1, 0, 0, 0, 1369, 1370, 3, 58, 21, 0, 1370, 1371, 1, 0, 0, 0, 1371, 1372, 6, 179, 11, 0, 1372, 375, 1, 0, 0, 0, 1373, 1374, 3, 60, 22, 0, 1374, 1375, 1, 0, 0, 0, 1375, 1376, 6, 180, 11, 0, 1376, 377, 1, 0, 0, 0, 1377, 1378, 3, 62, 23, 0, 1378, 1379, 1, 0, 0, 0, 1379, 1380, 6, 181, 11, 0, 1380, 379, 1, 0, 0, 0, 1381, 1382, 3, 116, 50, 0, 1382, 1383, 1, 0, 0, 0, 1383, 1384, 6, 182, 17, 0, 1384, 1385, 6, 182, 15, 0, 1385, 1386, 6, 182, 7, 0, 1386, 381, 1, 0, 0, 0, 1387, 1388, 3, 58, 21, 0, 1388, 1389, 1, 0, 0, 0, 1389, 1390, 6, 183, 11, 0, 1390, 383, 1, 0, 0, 0, 1391, 1392, 3, 60, 22, 0, 1392, 1393, 1, 0, 0, 0, 1393, 1394, 6, 184, 11, 0, 1394, 385, 1, 0, 0, 0, 1395, 1396, 3, 62, 23, 0, 1396, 1397, 1, 0, 0, 0, 1397, 1398, 6, 185, 11, 0, 1398, 387, 1, 0, 0, 0, 1399, 1400, 3, 186, 85, 0, 1400, 1401, 1, 0, 0, 0, 1401, 1402, 6, 186, 15, 0, 1402, 1403, 6, 186, 0, 0, 1403, 1404, 6, 186, 25, 0, 1404, 389, 1, 0, 0, 0, 1405, 1406, 3, 182, 83, 0, 1406, 1407, 1, 0, 0, 0, 1407, 1408, 6, 187, 15, 0, 1408, 1409, 6, 187, 0, 0, 1409, 1410, 6, 187, 30, 0, 1410, 391, 1, 0, 0, 0, 1411, 1412, 3, 106, 45, 0, 1412, 1413, 1, 0, 0, 0, 1413, 1414, 6, 188, 15, 0, 1414, 1415, 6, 188, 0, 0, 1415, 1416, 6, 188, 32, 0, 1416, 393, 1, 0, 0, 0, 1417, 1418, 3, 78, 31, 0, 1418, 1419, 1, 0, 0, 0, 1419, 1420, 6, 189, 14, 0, 1420, 1421, 6, 189, 15, 0, 1421, 395, 1, 0, 0, 0, 65, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 568, 578, 582, 585, 594, 596, 607, 614, 619, 658, 663, 672, 679, 684, 686, 697, 705, 708, 710, 715, 720, 726, 733, 738, 744, 747, 755, 759, 883, 890, 892, 908, 913, 918, 920, 926, 1011, 1015, 1020, 1025, 1030, 1032, 1036, 1038, 1115, 1119, 1124, 1342, 1344, 33, 5, 2, 0, 5, 4, 0, 5, 6, 0, 5, 1, 0, 5, 3, 0, 5, 8, 0, 5, 12, 0, 5, 14, 0, 5, 10, 0, 5, 5, 0, 5, 11, 0, 0, 1, 0, 7, 69, 0, 5, 0, 0, 7, 29, 0, 4, 0, 0, 7, 70, 0, 7, 38, 0, 7, 36, 0, 7, 30, 0, 7, 25, 0, 7, 40, 0, 7, 80, 0, 5, 13, 0, 5, 7, 0, 7, 72, 0, 7, 90, 0, 7, 89, 0, 7, 88, 0, 5, 9, 0, 7, 71, 0, 5, 15, 0, 7, 33, 0]
\ No newline at end of file
+[4, 0, 124, 1450, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 2, 58, 7, 58, 2, 59, 7, 59, 2, 60, 7, 60, 2, 61, 7, 61, 2, 62, 7, 62, 2, 63, 7, 63, 2, 64, 7, 64, 2, 65, 7, 65, 2, 66, 7, 66, 2, 67, 7, 67, 2, 68, 7, 68, 2, 69, 7, 69, 2, 70, 7, 70, 2, 71, 7, 71, 2, 72, 7, 72, 2, 73, 7, 73, 2, 74, 7, 74, 2, 75, 7, 75, 2, 76, 7, 76, 2, 77, 7, 77, 2, 78, 7, 78, 2, 79, 7, 79, 2, 80, 7, 80, 2, 81, 7, 81, 2, 82, 7, 82, 2, 83, 7, 83, 2, 84, 7, 84, 2, 85, 7, 85, 2, 86, 7, 86, 2, 87, 7, 87, 2, 88, 7, 88, 2, 89, 7, 89, 2, 90, 7, 90, 2, 91, 7, 91, 2, 92, 7, 92, 2, 93, 7, 93, 2, 94, 7, 94, 2, 95, 7, 95, 2, 96, 7, 96, 2, 97, 7, 97, 2, 98, 7, 98, 2, 99, 7, 99, 2, 100, 7, 100, 2, 101, 7, 101, 2, 102, 7, 102, 2, 103, 7, 103, 2, 104, 7, 104, 2, 105, 7, 105, 2, 106, 7, 106, 2, 107, 7, 107, 2, 108, 7, 108, 2, 109, 7, 109, 2, 110, 7, 110, 2, 111, 7, 111, 2, 112, 7, 112, 2, 113, 7, 113, 2, 114, 7, 114, 2, 115, 7, 115, 2, 116, 7, 116, 2, 117, 7, 117, 2, 118, 7, 118, 2, 119, 7, 119, 2, 120, 7, 120, 2, 121, 7, 121, 2, 122, 7, 122, 2, 123, 7, 123, 2, 124, 7, 124, 2, 125, 7, 125, 2, 126, 7, 126, 2, 127, 7, 127, 2, 128, 7, 128, 2, 129, 7, 129, 2, 130, 7, 130, 2, 131, 7, 131, 2, 132, 7, 132, 2, 133, 7, 133, 2, 134, 7, 134, 2, 135, 7, 135, 2, 136, 7, 136, 2, 137, 7, 137, 2, 138, 7, 138, 2, 139, 7, 139, 2, 140, 7, 140, 2, 141, 7, 141, 2, 142, 7, 142, 2, 143, 7, 143, 2, 144, 7, 144, 2, 145, 7, 145, 2, 146, 7, 146, 2, 147, 7, 147, 2, 148, 7, 148, 2, 149, 7, 149, 2, 150, 7, 150, 2, 151, 7, 151, 2, 152, 7, 152, 2, 153, 7, 153, 2, 154, 7, 154, 2, 155, 7, 155, 2, 156, 7, 156, 2, 157, 7, 157, 2, 158, 7, 158, 2, 159, 7, 159, 2, 160, 7, 160, 2, 161, 7, 161, 2, 162, 7, 162, 2, 163, 7, 163, 2, 164, 7, 164, 2, 165, 7, 165, 2, 166, 7, 166, 2, 167, 7, 167, 2, 168, 7, 168, 2, 169, 7, 169, 2, 170, 7, 170, 2, 171, 7, 171, 2, 172, 7, 172, 2, 173, 7, 173, 2, 174, 7, 174, 2, 175, 7, 175, 2, 176, 7, 176, 2, 177, 7, 177, 2, 178, 7, 178, 2, 179, 7, 179, 2, 180, 7, 180, 2, 181, 7, 181, 2, 182, 7, 182, 2, 183, 7, 183, 2, 184, 7, 184, 2, 185, 7, 185, 2, 186, 7, 186, 2, 187, 7, 187, 2, 188, 7, 188, 2, 189, 7, 189, 2, 190, 7, 190, 2, 191, 7, 191, 2, 192, 7, 192, 2, 193, 7, 193, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 4, 20, 575, 8, 20, 11, 20, 12, 20, 576, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 21, 5, 21, 585, 8, 21, 10, 21, 12, 21, 588, 9, 21, 1, 21, 3, 21, 591, 8, 21, 1, 21, 3, 21, 594, 8, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 603, 8, 22, 10, 22, 12, 22, 606, 9, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 4, 23, 614, 8, 23, 11, 23, 12, 23, 615, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 3, 24, 623, 8, 24, 1, 25, 4, 25, 626, 8, 25, 11, 25, 12, 25, 627, 1, 26, 1, 26, 1, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 27, 1, 27, 1, 27, 1, 28, 1, 28, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 30, 1, 30, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 36, 1, 36, 3, 36, 667, 8, 36, 1, 36, 4, 36, 670, 8, 36, 11, 36, 12, 36, 671, 1, 37, 1, 37, 1, 38, 1, 38, 1, 39, 1, 39, 1, 39, 3, 39, 681, 8, 39, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 3, 41, 688, 8, 41, 1, 42, 1, 42, 1, 42, 5, 42, 693, 8, 42, 10, 42, 12, 42, 696, 9, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 5, 42, 704, 8, 42, 10, 42, 12, 42, 707, 9, 42, 1, 42, 1, 42, 1, 42, 1, 42, 1, 42, 3, 42, 714, 8, 42, 1, 42, 3, 42, 717, 8, 42, 3, 42, 719, 8, 42, 1, 43, 4, 43, 722, 8, 43, 11, 43, 12, 43, 723, 1, 44, 4, 44, 727, 8, 44, 11, 44, 12, 44, 728, 1, 44, 1, 44, 5, 44, 733, 8, 44, 10, 44, 12, 44, 736, 9, 44, 1, 44, 1, 44, 4, 44, 740, 8, 44, 11, 44, 12, 44, 741, 1, 44, 4, 44, 745, 8, 44, 11, 44, 12, 44, 746, 1, 44, 1, 44, 5, 44, 751, 8, 44, 10, 44, 12, 44, 754, 9, 44, 3, 44, 756, 8, 44, 1, 44, 1, 44, 1, 44, 1, 44, 4, 44, 762, 8, 44, 11, 44, 12, 44, 763, 1, 44, 1, 44, 3, 44, 768, 8, 44, 1, 45, 1, 45, 1, 45, 1, 46, 1, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 47, 1, 47, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 58, 1, 58, 1, 58, 1, 59, 1, 59, 1, 59, 1, 59, 1, 59, 1, 60, 1, 60, 1, 60, 1, 60, 1, 61, 1, 61, 1, 61, 1, 61, 1, 61, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 62, 1, 63, 1, 63, 1, 63, 1, 64, 1, 64, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 65, 1, 66, 1, 66, 1, 67, 1, 67, 1, 67, 1, 67, 1, 67, 1, 68, 1, 68, 1, 68, 1, 69, 1, 69, 1, 69, 1, 70, 1, 70, 1, 70, 1, 71, 1, 71, 1, 72, 1, 72, 1, 72, 1, 73, 1, 73, 1, 74, 1, 74, 1, 74, 1, 75, 1, 75, 1, 76, 1, 76, 1, 77, 1, 77, 1, 78, 1, 78, 1, 79, 1, 79, 1, 80, 1, 80, 1, 80, 5, 80, 890, 8, 80, 10, 80, 12, 80, 893, 9, 80, 1, 80, 1, 80, 4, 80, 897, 8, 80, 11, 80, 12, 80, 898, 3, 80, 901, 8, 80, 1, 81, 1, 81, 1, 81, 1, 81, 1, 81, 1, 82, 1, 82, 1, 82, 1, 82, 1, 82, 1, 83, 1, 83, 5, 83, 915, 8, 83, 10, 83, 12, 83, 918, 9, 83, 1, 83, 1, 83, 3, 83, 922, 8, 83, 1, 83, 4, 83, 925, 8, 83, 11, 83, 12, 83, 926, 3, 83, 929, 8, 83, 1, 84, 1, 84, 4, 84, 933, 8, 84, 11, 84, 12, 84, 934, 1, 84, 1, 84, 1, 85, 1, 85, 1, 86, 1, 86, 1, 86, 1, 86, 1, 87, 1, 87, 1, 87, 1, 87, 1, 88, 1, 88, 1, 88, 1, 88, 1, 89, 1, 89, 1, 89, 1, 89, 1, 89, 1, 90, 1, 90, 1, 90, 1, 90, 1, 91, 1, 91, 1, 91, 1, 91, 1, 92, 1, 92, 1, 92, 1, 92, 1, 93, 1, 93, 1, 93, 1, 93, 1, 94, 1, 94, 1, 94, 1, 94, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 95, 1, 96, 1, 96, 1, 96, 1, 96, 1, 97, 1, 97, 1, 97, 1, 97, 1, 98, 1, 98, 1, 98, 1, 98, 1, 99, 1, 99, 1, 99, 1, 99, 1, 100, 1, 100, 1, 100, 1, 100, 1, 101, 1, 101, 1, 101, 1, 101, 1, 101, 1, 102, 1, 102, 1, 102, 1, 102, 1, 103, 1, 103, 1, 103, 1, 103, 1, 104, 1, 104, 1, 104, 1, 104, 3, 104, 1024, 8, 104, 1, 105, 1, 105, 3, 105, 1028, 8, 105, 1, 105, 5, 105, 1031, 8, 105, 10, 105, 12, 105, 1034, 9, 105, 1, 105, 1, 105, 3, 105, 1038, 8, 105, 1, 105, 4, 105, 1041, 8, 105, 11, 105, 12, 105, 1042, 3, 105, 1045, 8, 105, 1, 106, 1, 106, 4, 106, 1049, 8, 106, 11, 106, 12, 106, 1050, 1, 107, 1, 107, 1, 107, 1, 107, 1, 108, 1, 108, 1, 108, 1, 108, 1, 109, 1, 109, 1, 109, 1, 109, 1, 110, 1, 110, 1, 110, 1, 110, 1, 110, 1, 111, 1, 111, 1, 111, 1, 111, 1, 112, 1, 112, 1, 112, 1, 112, 1, 113, 1, 113, 1, 113, 1, 113, 1, 114, 1, 114, 1, 114, 1, 115, 1, 115, 1, 115, 1, 115, 1, 116, 1, 116, 1, 116, 1, 116, 1, 117, 1, 117, 1, 117, 1, 117, 1, 118, 1, 118, 1, 118, 1, 118, 1, 119, 1, 119, 1, 119, 1, 119, 1, 119, 1, 120, 1, 120, 1, 120, 1, 120, 1, 120, 1, 121, 1, 121, 1, 121, 1, 121, 1, 121, 1, 122, 1, 122, 1, 122, 1, 122, 1, 122, 1, 122, 1, 122, 1, 123, 1, 123, 1, 124, 4, 124, 1126, 8, 124, 11, 124, 12, 124, 1127, 1, 124, 1, 124, 3, 124, 1132, 8, 124, 1, 124, 4, 124, 1135, 8, 124, 11, 124, 12, 124, 1136, 1, 125, 1, 125, 1, 125, 1, 125, 1, 126, 1, 126, 1, 126, 1, 126, 1, 127, 1, 127, 1, 127, 1, 127, 1, 128, 1, 128, 1, 128, 1, 128, 1, 129, 1, 129, 1, 129, 1, 129, 1, 129, 1, 129, 1, 130, 1, 130, 1, 130, 1, 130, 1, 131, 1, 131, 1, 131, 1, 131, 1, 132, 1, 132, 1, 132, 1, 132, 1, 133, 1, 133, 1, 133, 1, 133, 1, 134, 1, 134, 1, 134, 1, 134, 1, 135, 1, 135, 1, 135, 1, 135, 1, 136, 1, 136, 1, 136, 1, 136, 1, 137, 1, 137, 1, 137, 1, 137, 1, 138, 1, 138, 1, 138, 1, 138, 1, 139, 1, 139, 1, 139, 1, 139, 1, 139, 1, 140, 1, 140, 1, 140, 1, 140, 1, 141, 1, 141, 1, 141, 1, 141, 1, 142, 1, 142, 1, 142, 1, 142, 1, 143, 1, 143, 1, 143, 1, 143, 1, 143, 1, 144, 1, 144, 1, 144, 1, 144, 1, 145, 1, 145, 1, 145, 1, 145, 1, 146, 1, 146, 1, 146, 1, 146, 1, 147, 1, 147, 1, 147, 1, 147, 1, 148, 1, 148, 1, 148, 1, 148, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 149, 1, 150, 1, 150, 1, 150, 1, 150, 1, 151, 1, 151, 1, 151, 1, 151, 1, 152, 1, 152, 1, 152, 1, 152, 1, 153, 1, 153, 1, 153, 1, 153, 1, 154, 1, 154, 1, 154, 1, 154, 1, 155, 1, 155, 1, 155, 1, 155, 1, 156, 1, 156, 1, 156, 1, 156, 1, 156, 1, 157, 1, 157, 1, 157, 1, 157, 1, 158, 1, 158, 1, 158, 1, 158, 1, 159, 1, 159, 1, 159, 1, 159, 1, 160, 1, 160, 1, 160, 1, 160, 1, 161, 1, 161, 1, 161, 1, 161, 1, 162, 1, 162, 1, 162, 1, 162, 1, 163, 1, 163, 1, 163, 1, 163, 1, 163, 1, 164, 1, 164, 1, 164, 1, 164, 1, 164, 1, 165, 1, 165, 1, 165, 1, 165, 1, 166, 1, 166, 1, 166, 1, 166, 1, 167, 1, 167, 1, 167, 1, 167, 1, 168, 1, 168, 1, 168, 1, 168, 1, 168, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 169, 1, 170, 1, 170, 1, 170, 1, 170, 1, 171, 1, 171, 1, 171, 1, 171, 1, 172, 1, 172, 1, 172, 1, 172, 1, 173, 1, 173, 1, 173, 1, 173, 1, 173, 1, 174, 1, 174, 1, 175, 1, 175, 1, 175, 1, 175, 1, 175, 4, 175, 1359, 8, 175, 11, 175, 12, 175, 1360, 1, 176, 1, 176, 1, 176, 1, 176, 1, 177, 1, 177, 1, 177, 1, 177, 1, 178, 1, 178, 1, 178, 1, 178, 1, 179, 1, 179, 1, 179, 1, 179, 1, 179, 1, 180, 1, 180, 1, 180, 1, 180, 1, 180, 1, 180, 1, 181, 1, 181, 1, 181, 1, 181, 1, 181, 1, 181, 1, 182, 1, 182, 1, 182, 1, 182, 1, 183, 1, 183, 1, 183, 1, 183, 1, 184, 1, 184, 1, 184, 1, 184, 1, 185, 1, 185, 1, 185, 1, 185, 1, 185, 1, 185, 1, 186, 1, 186, 1, 186, 1, 186, 1, 186, 1, 186, 1, 187, 1, 187, 1, 187, 1, 187, 1, 188, 1, 188, 1, 188, 1, 188, 1, 189, 1, 189, 1, 189, 1, 189, 1, 190, 1, 190, 1, 190, 1, 190, 1, 190, 1, 190, 1, 191, 1, 191, 1, 191, 1, 191, 1, 191, 1, 191, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 192, 1, 193, 1, 193, 1, 193, 1, 193, 1, 193, 2, 604, 705, 0, 194, 16, 1, 18, 2, 20, 3, 22, 4, 24, 5, 26, 6, 28, 7, 30, 8, 32, 9, 34, 10, 36, 11, 38, 12, 40, 13, 42, 14, 44, 15, 46, 16, 48, 17, 50, 18, 52, 19, 54, 20, 56, 21, 58, 22, 60, 23, 62, 24, 64, 0, 66, 25, 68, 0, 70, 0, 72, 26, 74, 27, 76, 28, 78, 29, 80, 0, 82, 0, 84, 0, 86, 0, 88, 0, 90, 0, 92, 0, 94, 0, 96, 0, 98, 0, 100, 30, 102, 31, 104, 32, 106, 33, 108, 34, 110, 35, 112, 36, 114, 37, 116, 38, 118, 39, 120, 40, 122, 41, 124, 42, 126, 43, 128, 44, 130, 45, 132, 46, 134, 47, 136, 48, 138, 49, 140, 50, 142, 51, 144, 52, 146, 53, 148, 54, 150, 55, 152, 56, 154, 57, 156, 58, 158, 59, 160, 60, 162, 61, 164, 62, 166, 63, 168, 64, 170, 65, 172, 66, 174, 67, 176, 68, 178, 69, 180, 70, 182, 71, 184, 0, 186, 72, 188, 73, 190, 74, 192, 75, 194, 0, 196, 0, 198, 0, 200, 0, 202, 0, 204, 0, 206, 76, 208, 0, 210, 0, 212, 77, 214, 78, 216, 79, 218, 0, 220, 0, 222, 0, 224, 0, 226, 0, 228, 80, 230, 81, 232, 82, 234, 83, 236, 0, 238, 0, 240, 0, 242, 0, 244, 84, 246, 0, 248, 85, 250, 86, 252, 87, 254, 0, 256, 0, 258, 88, 260, 89, 262, 0, 264, 90, 266, 0, 268, 91, 270, 92, 272, 93, 274, 0, 276, 0, 278, 0, 280, 0, 282, 0, 284, 0, 286, 0, 288, 94, 290, 95, 292, 96, 294, 0, 296, 0, 298, 0, 300, 0, 302, 0, 304, 0, 306, 0, 308, 97, 310, 98, 312, 99, 314, 0, 316, 0, 318, 0, 320, 0, 322, 100, 324, 101, 326, 102, 328, 0, 330, 0, 332, 0, 334, 0, 336, 103, 338, 104, 340, 105, 342, 0, 344, 106, 346, 107, 348, 108, 350, 109, 352, 0, 354, 110, 356, 111, 358, 112, 360, 113, 362, 0, 364, 114, 366, 115, 368, 116, 370, 117, 372, 118, 374, 0, 376, 0, 378, 0, 380, 119, 382, 120, 384, 121, 386, 0, 388, 0, 390, 122, 392, 123, 394, 124, 396, 0, 398, 0, 400, 0, 402, 0, 16, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 35, 2, 0, 68, 68, 100, 100, 2, 0, 73, 73, 105, 105, 2, 0, 83, 83, 115, 115, 2, 0, 69, 69, 101, 101, 2, 0, 67, 67, 99, 99, 2, 0, 84, 84, 116, 116, 2, 0, 82, 82, 114, 114, 2, 0, 79, 79, 111, 111, 2, 0, 80, 80, 112, 112, 2, 0, 78, 78, 110, 110, 2, 0, 72, 72, 104, 104, 2, 0, 86, 86, 118, 118, 2, 0, 65, 65, 97, 97, 2, 0, 76, 76, 108, 108, 2, 0, 88, 88, 120, 120, 2, 0, 70, 70, 102, 102, 2, 0, 77, 77, 109, 109, 2, 0, 71, 71, 103, 103, 2, 0, 75, 75, 107, 107, 2, 0, 85, 85, 117, 117, 2, 0, 87, 87, 119, 119, 6, 0, 9, 10, 13, 13, 32, 32, 47, 47, 91, 91, 93, 93, 2, 0, 10, 10, 13, 13, 3, 0, 9, 10, 13, 13, 32, 32, 11, 0, 9, 10, 13, 13, 32, 32, 34, 34, 44, 44, 47, 47, 58, 58, 61, 61, 91, 91, 93, 93, 124, 124, 2, 0, 42, 42, 47, 47, 1, 0, 48, 57, 2, 0, 65, 90, 97, 122, 8, 0, 34, 34, 78, 78, 82, 82, 84, 84, 92, 92, 110, 110, 114, 114, 116, 116, 4, 0, 10, 10, 13, 13, 34, 34, 92, 92, 2, 0, 43, 43, 45, 45, 1, 0, 96, 96, 2, 0, 66, 66, 98, 98, 2, 0, 89, 89, 121, 121, 11, 0, 9, 10, 13, 13, 32, 32, 34, 35, 44, 44, 47, 47, 58, 58, 60, 60, 62, 63, 92, 92, 124, 124, 1476, 0, 16, 1, 0, 0, 0, 0, 18, 1, 0, 0, 0, 0, 20, 1, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 24, 1, 0, 0, 0, 0, 26, 1, 0, 0, 0, 0, 28, 1, 0, 0, 0, 0, 30, 1, 0, 0, 0, 0, 32, 1, 0, 0, 0, 0, 34, 1, 0, 0, 0, 0, 36, 1, 0, 0, 0, 0, 38, 1, 0, 0, 0, 0, 40, 1, 0, 0, 0, 0, 42, 1, 0, 0, 0, 0, 44, 1, 0, 0, 0, 0, 46, 1, 0, 0, 0, 0, 48, 1, 0, 0, 0, 0, 50, 1, 0, 0, 0, 0, 52, 1, 0, 0, 0, 0, 54, 1, 0, 0, 0, 0, 56, 1, 0, 0, 0, 0, 58, 1, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 62, 1, 0, 0, 0, 0, 66, 1, 0, 0, 0, 1, 68, 1, 0, 0, 0, 1, 70, 1, 0, 0, 0, 1, 72, 1, 0, 0, 0, 1, 74, 1, 0, 0, 0, 1, 76, 1, 0, 0, 0, 2, 78, 1, 0, 0, 0, 2, 100, 1, 0, 0, 0, 2, 102, 1, 0, 0, 0, 2, 104, 1, 0, 0, 0, 2, 106, 1, 0, 0, 0, 2, 108, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 2, 112, 1, 0, 0, 0, 2, 114, 1, 0, 0, 0, 2, 116, 1, 0, 0, 0, 2, 118, 1, 0, 0, 0, 2, 120, 1, 0, 0, 0, 2, 122, 1, 0, 0, 0, 2, 124, 1, 0, 0, 0, 2, 126, 1, 0, 0, 0, 2, 128, 1, 0, 0, 0, 2, 130, 1, 0, 0, 0, 2, 132, 1, 0, 0, 0, 2, 134, 1, 0, 0, 0, 2, 136, 1, 0, 0, 0, 2, 138, 1, 0, 0, 0, 2, 140, 1, 0, 0, 0, 2, 142, 1, 0, 0, 0, 2, 144, 1, 0, 0, 0, 2, 146, 1, 0, 0, 0, 2, 148, 1, 0, 0, 0, 2, 150, 1, 0, 0, 0, 2, 152, 1, 0, 0, 0, 2, 154, 1, 0, 0, 0, 2, 156, 1, 0, 0, 0, 2, 158, 1, 0, 0, 0, 2, 160, 1, 0, 0, 0, 2, 162, 1, 0, 0, 0, 2, 164, 1, 0, 0, 0, 2, 166, 1, 0, 0, 0, 2, 168, 1, 0, 0, 0, 2, 170, 1, 0, 0, 0, 2, 172, 1, 0, 0, 0, 2, 174, 1, 0, 0, 0, 2, 176, 1, 0, 0, 0, 2, 178, 1, 0, 0, 0, 2, 180, 1, 0, 0, 0, 2, 182, 1, 0, 0, 0, 2, 186, 1, 0, 0, 0, 2, 188, 1, 0, 0, 0, 2, 190, 1, 0, 0, 0, 2, 192, 1, 0, 0, 0, 3, 194, 1, 0, 0, 0, 3, 196, 1, 0, 0, 0, 3, 198, 1, 0, 0, 0, 3, 200, 1, 0, 0, 0, 3, 202, 1, 0, 0, 0, 3, 204, 1, 0, 0, 0, 3, 206, 1, 0, 0, 0, 3, 208, 1, 0, 0, 0, 3, 210, 1, 0, 0, 0, 3, 212, 1, 0, 0, 0, 3, 214, 1, 0, 0, 0, 3, 216, 1, 0, 0, 0, 4, 218, 1, 0, 0, 0, 4, 220, 1, 0, 0, 0, 4, 222, 1, 0, 0, 0, 4, 228, 1, 0, 0, 0, 4, 230, 1, 0, 0, 0, 4, 232, 1, 0, 0, 0, 4, 234, 1, 0, 0, 0, 5, 236, 1, 0, 0, 0, 5, 238, 1, 0, 0, 0, 5, 240, 1, 0, 0, 0, 5, 242, 1, 0, 0, 0, 5, 244, 1, 0, 0, 0, 5, 246, 1, 0, 0, 0, 5, 248, 1, 0, 0, 0, 5, 250, 1, 0, 0, 0, 5, 252, 1, 0, 0, 0, 6, 254, 1, 0, 0, 0, 6, 256, 1, 0, 0, 0, 6, 258, 1, 0, 0, 0, 6, 260, 1, 0, 0, 0, 6, 264, 1, 0, 0, 0, 6, 266, 1, 0, 0, 0, 6, 268, 1, 0, 0, 0, 6, 270, 1, 0, 0, 0, 6, 272, 1, 0, 0, 0, 7, 274, 1, 0, 0, 0, 7, 276, 1, 0, 0, 0, 7, 278, 1, 0, 0, 0, 7, 280, 1, 0, 0, 0, 7, 282, 1, 0, 0, 0, 7, 284, 1, 0, 0, 0, 7, 286, 1, 0, 0, 0, 7, 288, 1, 0, 0, 0, 7, 290, 1, 0, 0, 0, 7, 292, 1, 0, 0, 0, 8, 294, 1, 0, 0, 0, 8, 296, 1, 0, 0, 0, 8, 298, 1, 0, 0, 0, 8, 300, 1, 0, 0, 0, 8, 302, 1, 0, 0, 0, 8, 304, 1, 0, 0, 0, 8, 306, 1, 0, 0, 0, 8, 308, 1, 0, 0, 0, 8, 310, 1, 0, 0, 0, 8, 312, 1, 0, 0, 0, 9, 314, 1, 0, 0, 0, 9, 316, 1, 0, 0, 0, 9, 318, 1, 0, 0, 0, 9, 320, 1, 0, 0, 0, 9, 322, 1, 0, 0, 0, 9, 324, 1, 0, 0, 0, 9, 326, 1, 0, 0, 0, 10, 328, 1, 0, 0, 0, 10, 330, 1, 0, 0, 0, 10, 332, 1, 0, 0, 0, 10, 334, 1, 0, 0, 0, 10, 336, 1, 0, 0, 0, 10, 338, 1, 0, 0, 0, 10, 340, 1, 0, 0, 0, 11, 342, 1, 0, 0, 0, 11, 344, 1, 0, 0, 0, 11, 346, 1, 0, 0, 0, 11, 348, 1, 0, 0, 0, 11, 350, 1, 0, 0, 0, 12, 352, 1, 0, 0, 0, 12, 354, 1, 0, 0, 0, 12, 356, 1, 0, 0, 0, 12, 358, 1, 0, 0, 0, 12, 360, 1, 0, 0, 0, 13, 362, 1, 0, 0, 0, 13, 364, 1, 0, 0, 0, 13, 366, 1, 0, 0, 0, 13, 368, 1, 0, 0, 0, 13, 370, 1, 0, 0, 0, 13, 372, 1, 0, 0, 0, 14, 374, 1, 0, 0, 0, 14, 376, 1, 0, 0, 0, 14, 378, 1, 0, 0, 0, 14, 380, 1, 0, 0, 0, 14, 382, 1, 0, 0, 0, 14, 384, 1, 0, 0, 0, 15, 386, 1, 0, 0, 0, 15, 388, 1, 0, 0, 0, 15, 390, 1, 0, 0, 0, 15, 392, 1, 0, 0, 0, 15, 394, 1, 0, 0, 0, 15, 396, 1, 0, 0, 0, 15, 398, 1, 0, 0, 0, 15, 400, 1, 0, 0, 0, 15, 402, 1, 0, 0, 0, 16, 404, 1, 0, 0, 0, 18, 414, 1, 0, 0, 0, 20, 421, 1, 0, 0, 0, 22, 430, 1, 0, 0, 0, 24, 437, 1, 0, 0, 0, 26, 447, 1, 0, 0, 0, 28, 454, 1, 0, 0, 0, 30, 461, 1, 0, 0, 0, 32, 475, 1, 0, 0, 0, 34, 482, 1, 0, 0, 0, 36, 490, 1, 0, 0, 0, 38, 499, 1, 0, 0, 0, 40, 506, 1, 0, 0, 0, 42, 516, 1, 0, 0, 0, 44, 528, 1, 0, 0, 0, 46, 537, 1, 0, 0, 0, 48, 543, 1, 0, 0, 0, 50, 550, 1, 0, 0, 0, 52, 557, 1, 0, 0, 0, 54, 565, 1, 0, 0, 0, 56, 574, 1, 0, 0, 0, 58, 580, 1, 0, 0, 0, 60, 597, 1, 0, 0, 0, 62, 613, 1, 0, 0, 0, 64, 622, 1, 0, 0, 0, 66, 625, 1, 0, 0, 0, 68, 629, 1, 0, 0, 0, 70, 634, 1, 0, 0, 0, 72, 639, 1, 0, 0, 0, 74, 643, 1, 0, 0, 0, 76, 647, 1, 0, 0, 0, 78, 651, 1, 0, 0, 0, 80, 655, 1, 0, 0, 0, 82, 657, 1, 0, 0, 0, 84, 659, 1, 0, 0, 0, 86, 662, 1, 0, 0, 0, 88, 664, 1, 0, 0, 0, 90, 673, 1, 0, 0, 0, 92, 675, 1, 0, 0, 0, 94, 680, 1, 0, 0, 0, 96, 682, 1, 0, 0, 0, 98, 687, 1, 0, 0, 0, 100, 718, 1, 0, 0, 0, 102, 721, 1, 0, 0, 0, 104, 767, 1, 0, 0, 0, 106, 769, 1, 0, 0, 0, 108, 772, 1, 0, 0, 0, 110, 776, 1, 0, 0, 0, 112, 780, 1, 0, 0, 0, 114, 782, 1, 0, 0, 0, 116, 785, 1, 0, 0, 0, 118, 787, 1, 0, 0, 0, 120, 792, 1, 0, 0, 0, 122, 794, 1, 0, 0, 0, 124, 800, 1, 0, 0, 0, 126, 806, 1, 0, 0, 0, 128, 811, 1, 0, 0, 0, 130, 813, 1, 0, 0, 0, 132, 816, 1, 0, 0, 0, 134, 819, 1, 0, 0, 0, 136, 824, 1, 0, 0, 0, 138, 828, 1, 0, 0, 0, 140, 833, 1, 0, 0, 0, 142, 839, 1, 0, 0, 0, 144, 842, 1, 0, 0, 0, 146, 844, 1, 0, 0, 0, 148, 850, 1, 0, 0, 0, 150, 852, 1, 0, 0, 0, 152, 857, 1, 0, 0, 0, 154, 860, 1, 0, 0, 0, 156, 863, 1, 0, 0, 0, 158, 866, 1, 0, 0, 0, 160, 868, 1, 0, 0, 0, 162, 871, 1, 0, 0, 0, 164, 873, 1, 0, 0, 0, 166, 876, 1, 0, 0, 0, 168, 878, 1, 0, 0, 0, 170, 880, 1, 0, 0, 0, 172, 882, 1, 0, 0, 0, 174, 884, 1, 0, 0, 0, 176, 900, 1, 0, 0, 0, 178, 902, 1, 0, 0, 0, 180, 907, 1, 0, 0, 0, 182, 928, 1, 0, 0, 0, 184, 930, 1, 0, 0, 0, 186, 938, 1, 0, 0, 0, 188, 940, 1, 0, 0, 0, 190, 944, 1, 0, 0, 0, 192, 948, 1, 0, 0, 0, 194, 952, 1, 0, 0, 0, 196, 957, 1, 0, 0, 0, 198, 961, 1, 0, 0, 0, 200, 965, 1, 0, 0, 0, 202, 969, 1, 0, 0, 0, 204, 973, 1, 0, 0, 0, 206, 977, 1, 0, 0, 0, 208, 986, 1, 0, 0, 0, 210, 990, 1, 0, 0, 0, 212, 994, 1, 0, 0, 0, 214, 998, 1, 0, 0, 0, 216, 1002, 1, 0, 0, 0, 218, 1006, 1, 0, 0, 0, 220, 1011, 1, 0, 0, 0, 222, 1015, 1, 0, 0, 0, 224, 1023, 1, 0, 0, 0, 226, 1044, 1, 0, 0, 0, 228, 1048, 1, 0, 0, 0, 230, 1052, 1, 0, 0, 0, 232, 1056, 1, 0, 0, 0, 234, 1060, 1, 0, 0, 0, 236, 1064, 1, 0, 0, 0, 238, 1069, 1, 0, 0, 0, 240, 1073, 1, 0, 0, 0, 242, 1077, 1, 0, 0, 0, 244, 1081, 1, 0, 0, 0, 246, 1084, 1, 0, 0, 0, 248, 1088, 1, 0, 0, 0, 250, 1092, 1, 0, 0, 0, 252, 1096, 1, 0, 0, 0, 254, 1100, 1, 0, 0, 0, 256, 1105, 1, 0, 0, 0, 258, 1110, 1, 0, 0, 0, 260, 1115, 1, 0, 0, 0, 262, 1122, 1, 0, 0, 0, 264, 1131, 1, 0, 0, 0, 266, 1138, 1, 0, 0, 0, 268, 1142, 1, 0, 0, 0, 270, 1146, 1, 0, 0, 0, 272, 1150, 1, 0, 0, 0, 274, 1154, 1, 0, 0, 0, 276, 1160, 1, 0, 0, 0, 278, 1164, 1, 0, 0, 0, 280, 1168, 1, 0, 0, 0, 282, 1172, 1, 0, 0, 0, 284, 1176, 1, 0, 0, 0, 286, 1180, 1, 0, 0, 0, 288, 1184, 1, 0, 0, 0, 290, 1188, 1, 0, 0, 0, 292, 1192, 1, 0, 0, 0, 294, 1196, 1, 0, 0, 0, 296, 1201, 1, 0, 0, 0, 298, 1205, 1, 0, 0, 0, 300, 1209, 1, 0, 0, 0, 302, 1213, 1, 0, 0, 0, 304, 1218, 1, 0, 0, 0, 306, 1222, 1, 0, 0, 0, 308, 1226, 1, 0, 0, 0, 310, 1230, 1, 0, 0, 0, 312, 1234, 1, 0, 0, 0, 314, 1238, 1, 0, 0, 0, 316, 1244, 1, 0, 0, 0, 318, 1248, 1, 0, 0, 0, 320, 1252, 1, 0, 0, 0, 322, 1256, 1, 0, 0, 0, 324, 1260, 1, 0, 0, 0, 326, 1264, 1, 0, 0, 0, 328, 1268, 1, 0, 0, 0, 330, 1273, 1, 0, 0, 0, 332, 1277, 1, 0, 0, 0, 334, 1281, 1, 0, 0, 0, 336, 1285, 1, 0, 0, 0, 338, 1289, 1, 0, 0, 0, 340, 1293, 1, 0, 0, 0, 342, 1297, 1, 0, 0, 0, 344, 1302, 1, 0, 0, 0, 346, 1307, 1, 0, 0, 0, 348, 1311, 1, 0, 0, 0, 350, 1315, 1, 0, 0, 0, 352, 1319, 1, 0, 0, 0, 354, 1324, 1, 0, 0, 0, 356, 1334, 1, 0, 0, 0, 358, 1338, 1, 0, 0, 0, 360, 1342, 1, 0, 0, 0, 362, 1346, 1, 0, 0, 0, 364, 1351, 1, 0, 0, 0, 366, 1358, 1, 0, 0, 0, 368, 1362, 1, 0, 0, 0, 370, 1366, 1, 0, 0, 0, 372, 1370, 1, 0, 0, 0, 374, 1374, 1, 0, 0, 0, 376, 1379, 1, 0, 0, 0, 378, 1385, 1, 0, 0, 0, 380, 1391, 1, 0, 0, 0, 382, 1395, 1, 0, 0, 0, 384, 1399, 1, 0, 0, 0, 386, 1403, 1, 0, 0, 0, 388, 1409, 1, 0, 0, 0, 390, 1415, 1, 0, 0, 0, 392, 1419, 1, 0, 0, 0, 394, 1423, 1, 0, 0, 0, 396, 1427, 1, 0, 0, 0, 398, 1433, 1, 0, 0, 0, 400, 1439, 1, 0, 0, 0, 402, 1445, 1, 0, 0, 0, 404, 405, 7, 0, 0, 0, 405, 406, 7, 1, 0, 0, 406, 407, 7, 2, 0, 0, 407, 408, 7, 2, 0, 0, 408, 409, 7, 3, 0, 0, 409, 410, 7, 4, 0, 0, 410, 411, 7, 5, 0, 0, 411, 412, 1, 0, 0, 0, 412, 413, 6, 0, 0, 0, 413, 17, 1, 0, 0, 0, 414, 415, 7, 0, 0, 0, 415, 416, 7, 6, 0, 0, 416, 417, 7, 7, 0, 0, 417, 418, 7, 8, 0, 0, 418, 419, 1, 0, 0, 0, 419, 420, 6, 1, 1, 0, 420, 19, 1, 0, 0, 0, 421, 422, 7, 3, 0, 0, 422, 423, 7, 9, 0, 0, 423, 424, 7, 6, 0, 0, 424, 425, 7, 1, 0, 0, 425, 426, 7, 4, 0, 0, 426, 427, 7, 10, 0, 0, 427, 428, 1, 0, 0, 0, 428, 429, 6, 2, 2, 0, 429, 21, 1, 0, 0, 0, 430, 431, 7, 3, 0, 0, 431, 432, 7, 11, 0, 0, 432, 433, 7, 12, 0, 0, 433, 434, 7, 13, 0, 0, 434, 435, 1, 0, 0, 0, 435, 436, 6, 3, 0, 0, 436, 23, 1, 0, 0, 0, 437, 438, 7, 3, 0, 0, 438, 439, 7, 14, 0, 0, 439, 440, 7, 8, 0, 0, 440, 441, 7, 13, 0, 0, 441, 442, 7, 12, 0, 0, 442, 443, 7, 1, 0, 0, 443, 444, 7, 9, 0, 0, 444, 445, 1, 0, 0, 0, 445, 446, 6, 4, 3, 0, 446, 25, 1, 0, 0, 0, 447, 448, 7, 15, 0, 0, 448, 449, 7, 6, 0, 0, 449, 450, 7, 7, 0, 0, 450, 451, 7, 16, 0, 0, 451, 452, 1, 0, 0, 0, 452, 453, 6, 5, 4, 0, 453, 27, 1, 0, 0, 0, 454, 455, 7, 17, 0, 0, 455, 456, 7, 6, 0, 0, 456, 457, 7, 7, 0, 0, 457, 458, 7, 18, 0, 0, 458, 459, 1, 0, 0, 0, 459, 460, 6, 6, 0, 0, 460, 29, 1, 0, 0, 0, 461, 462, 7, 1, 0, 0, 462, 463, 7, 9, 0, 0, 463, 464, 7, 13, 0, 0, 464, 465, 7, 1, 0, 0, 465, 466, 7, 9, 0, 0, 466, 467, 7, 3, 0, 0, 467, 468, 7, 2, 0, 0, 468, 469, 7, 5, 0, 0, 469, 470, 7, 12, 0, 0, 470, 471, 7, 5, 0, 0, 471, 472, 7, 2, 0, 0, 472, 473, 1, 0, 0, 0, 473, 474, 6, 7, 0, 0, 474, 31, 1, 0, 0, 0, 475, 476, 7, 18, 0, 0, 476, 477, 7, 3, 0, 0, 477, 478, 7, 3, 0, 0, 478, 479, 7, 8, 0, 0, 479, 480, 1, 0, 0, 0, 480, 481, 6, 8, 1, 0, 481, 33, 1, 0, 0, 0, 482, 483, 7, 13, 0, 0, 483, 484, 7, 1, 0, 0, 484, 485, 7, 16, 0, 0, 485, 486, 7, 1, 0, 0, 486, 487, 7, 5, 0, 0, 487, 488, 1, 0, 0, 0, 488, 489, 6, 9, 0, 0, 489, 35, 1, 0, 0, 0, 490, 491, 7, 13, 0, 0, 491, 492, 7, 7, 0, 0, 492, 493, 7, 7, 0, 0, 493, 494, 7, 18, 0, 0, 494, 495, 7, 19, 0, 0, 495, 496, 7, 8, 0, 0, 496, 497, 1, 0, 0, 0, 497, 498, 6, 10, 5, 0, 498, 37, 1, 0, 0, 0, 499, 500, 7, 16, 0, 0, 500, 501, 7, 3, 0, 0, 501, 502, 7, 5, 0, 0, 502, 503, 7, 12, 0, 0, 503, 504, 1, 0, 0, 0, 504, 505, 6, 11, 6, 0, 505, 39, 1, 0, 0, 0, 506, 507, 7, 16, 0, 0, 507, 508, 7, 3, 0, 0, 508, 509, 7, 5, 0, 0, 509, 510, 7, 6, 0, 0, 510, 511, 7, 1, 0, 0, 511, 512, 7, 4, 0, 0, 512, 513, 7, 2, 0, 0, 513, 514, 1, 0, 0, 0, 514, 515, 6, 12, 7, 0, 515, 41, 1, 0, 0, 0, 516, 517, 7, 16, 0, 0, 517, 518, 7, 11, 0, 0, 518, 519, 5, 95, 0, 0, 519, 520, 7, 3, 0, 0, 520, 521, 7, 14, 0, 0, 521, 522, 7, 8, 0, 0, 522, 523, 7, 12, 0, 0, 523, 524, 7, 9, 0, 0, 524, 525, 7, 0, 0, 0, 525, 526, 1, 0, 0, 0, 526, 527, 6, 13, 8, 0, 527, 43, 1, 0, 0, 0, 528, 529, 7, 6, 0, 0, 529, 530, 7, 3, 0, 0, 530, 531, 7, 9, 0, 0, 531, 532, 7, 12, 0, 0, 532, 533, 7, 16, 0, 0, 533, 534, 7, 3, 0, 0, 534, 535, 1, 0, 0, 0, 535, 536, 6, 14, 9, 0, 536, 45, 1, 0, 0, 0, 537, 538, 7, 6, 0, 0, 538, 539, 7, 7, 0, 0, 539, 540, 7, 20, 0, 0, 540, 541, 1, 0, 0, 0, 541, 542, 6, 15, 0, 0, 542, 47, 1, 0, 0, 0, 543, 544, 7, 2, 0, 0, 544, 545, 7, 10, 0, 0, 545, 546, 7, 7, 0, 0, 546, 547, 7, 20, 0, 0, 547, 548, 1, 0, 0, 0, 548, 549, 6, 16, 10, 0, 549, 49, 1, 0, 0, 0, 550, 551, 7, 2, 0, 0, 551, 552, 7, 7, 0, 0, 552, 553, 7, 6, 0, 0, 553, 554, 7, 5, 0, 0, 554, 555, 1, 0, 0, 0, 555, 556, 6, 17, 0, 0, 556, 51, 1, 0, 0, 0, 557, 558, 7, 2, 0, 0, 558, 559, 7, 5, 0, 0, 559, 560, 7, 12, 0, 0, 560, 561, 7, 5, 0, 0, 561, 562, 7, 2, 0, 0, 562, 563, 1, 0, 0, 0, 563, 564, 6, 18, 0, 0, 564, 53, 1, 0, 0, 0, 565, 566, 7, 20, 0, 0, 566, 567, 7, 10, 0, 0, 567, 568, 7, 3, 0, 0, 568, 569, 7, 6, 0, 0, 569, 570, 7, 3, 0, 0, 570, 571, 1, 0, 0, 0, 571, 572, 6, 19, 0, 0, 572, 55, 1, 0, 0, 0, 573, 575, 8, 21, 0, 0, 574, 573, 1, 0, 0, 0, 575, 576, 1, 0, 0, 0, 576, 574, 1, 0, 0, 0, 576, 577, 1, 0, 0, 0, 577, 578, 1, 0, 0, 0, 578, 579, 6, 20, 0, 0, 579, 57, 1, 0, 0, 0, 580, 581, 5, 47, 0, 0, 581, 582, 5, 47, 0, 0, 582, 586, 1, 0, 0, 0, 583, 585, 8, 22, 0, 0, 584, 583, 1, 0, 0, 0, 585, 588, 1, 0, 0, 0, 586, 584, 1, 0, 0, 0, 586, 587, 1, 0, 0, 0, 587, 590, 1, 0, 0, 0, 588, 586, 1, 0, 0, 0, 589, 591, 5, 13, 0, 0, 590, 589, 1, 0, 0, 0, 590, 591, 1, 0, 0, 0, 591, 593, 1, 0, 0, 0, 592, 594, 5, 10, 0, 0, 593, 592, 1, 0, 0, 0, 593, 594, 1, 0, 0, 0, 594, 595, 1, 0, 0, 0, 595, 596, 6, 21, 11, 0, 596, 59, 1, 0, 0, 0, 597, 598, 5, 47, 0, 0, 598, 599, 5, 42, 0, 0, 599, 604, 1, 0, 0, 0, 600, 603, 3, 60, 22, 0, 601, 603, 9, 0, 0, 0, 602, 600, 1, 0, 0, 0, 602, 601, 1, 0, 0, 0, 603, 606, 1, 0, 0, 0, 604, 605, 1, 0, 0, 0, 604, 602, 1, 0, 0, 0, 605, 607, 1, 0, 0, 0, 606, 604, 1, 0, 0, 0, 607, 608, 5, 42, 0, 0, 608, 609, 5, 47, 0, 0, 609, 610, 1, 0, 0, 0, 610, 611, 6, 22, 11, 0, 611, 61, 1, 0, 0, 0, 612, 614, 7, 23, 0, 0, 613, 612, 1, 0, 0, 0, 614, 615, 1, 0, 0, 0, 615, 613, 1, 0, 0, 0, 615, 616, 1, 0, 0, 0, 616, 617, 1, 0, 0, 0, 617, 618, 6, 23, 11, 0, 618, 63, 1, 0, 0, 0, 619, 623, 8, 24, 0, 0, 620, 621, 5, 47, 0, 0, 621, 623, 8, 25, 0, 0, 622, 619, 1, 0, 0, 0, 622, 620, 1, 0, 0, 0, 623, 65, 1, 0, 0, 0, 624, 626, 3, 64, 24, 0, 625, 624, 1, 0, 0, 0, 626, 627, 1, 0, 0, 0, 627, 625, 1, 0, 0, 0, 627, 628, 1, 0, 0, 0, 628, 67, 1, 0, 0, 0, 629, 630, 3, 178, 81, 0, 630, 631, 1, 0, 0, 0, 631, 632, 6, 26, 12, 0, 632, 633, 6, 26, 13, 0, 633, 69, 1, 0, 0, 0, 634, 635, 3, 78, 31, 0, 635, 636, 1, 0, 0, 0, 636, 637, 6, 27, 14, 0, 637, 638, 6, 27, 15, 0, 638, 71, 1, 0, 0, 0, 639, 640, 3, 62, 23, 0, 640, 641, 1, 0, 0, 0, 641, 642, 6, 28, 11, 0, 642, 73, 1, 0, 0, 0, 643, 644, 3, 58, 21, 0, 644, 645, 1, 0, 0, 0, 645, 646, 6, 29, 11, 0, 646, 75, 1, 0, 0, 0, 647, 648, 3, 60, 22, 0, 648, 649, 1, 0, 0, 0, 649, 650, 6, 30, 11, 0, 650, 77, 1, 0, 0, 0, 651, 652, 5, 124, 0, 0, 652, 653, 1, 0, 0, 0, 653, 654, 6, 31, 15, 0, 654, 79, 1, 0, 0, 0, 655, 656, 7, 26, 0, 0, 656, 81, 1, 0, 0, 0, 657, 658, 7, 27, 0, 0, 658, 83, 1, 0, 0, 0, 659, 660, 5, 92, 0, 0, 660, 661, 7, 28, 0, 0, 661, 85, 1, 0, 0, 0, 662, 663, 8, 29, 0, 0, 663, 87, 1, 0, 0, 0, 664, 666, 7, 3, 0, 0, 665, 667, 7, 30, 0, 0, 666, 665, 1, 0, 0, 0, 666, 667, 1, 0, 0, 0, 667, 669, 1, 0, 0, 0, 668, 670, 3, 80, 32, 0, 669, 668, 1, 0, 0, 0, 670, 671, 1, 0, 0, 0, 671, 669, 1, 0, 0, 0, 671, 672, 1, 0, 0, 0, 672, 89, 1, 0, 0, 0, 673, 674, 5, 64, 0, 0, 674, 91, 1, 0, 0, 0, 675, 676, 5, 96, 0, 0, 676, 93, 1, 0, 0, 0, 677, 681, 8, 31, 0, 0, 678, 679, 5, 96, 0, 0, 679, 681, 5, 96, 0, 0, 680, 677, 1, 0, 0, 0, 680, 678, 1, 0, 0, 0, 681, 95, 1, 0, 0, 0, 682, 683, 5, 95, 0, 0, 683, 97, 1, 0, 0, 0, 684, 688, 3, 82, 33, 0, 685, 688, 3, 80, 32, 0, 686, 688, 3, 96, 40, 0, 687, 684, 1, 0, 0, 0, 687, 685, 1, 0, 0, 0, 687, 686, 1, 0, 0, 0, 688, 99, 1, 0, 0, 0, 689, 694, 5, 34, 0, 0, 690, 693, 3, 84, 34, 0, 691, 693, 3, 86, 35, 0, 692, 690, 1, 0, 0, 0, 692, 691, 1, 0, 0, 0, 693, 696, 1, 0, 0, 0, 694, 692, 1, 0, 0, 0, 694, 695, 1, 0, 0, 0, 695, 697, 1, 0, 0, 0, 696, 694, 1, 0, 0, 0, 697, 719, 5, 34, 0, 0, 698, 699, 5, 34, 0, 0, 699, 700, 5, 34, 0, 0, 700, 701, 5, 34, 0, 0, 701, 705, 1, 0, 0, 0, 702, 704, 8, 22, 0, 0, 703, 702, 1, 0, 0, 0, 704, 707, 1, 0, 0, 0, 705, 706, 1, 0, 0, 0, 705, 703, 1, 0, 0, 0, 706, 708, 1, 0, 0, 0, 707, 705, 1, 0, 0, 0, 708, 709, 5, 34, 0, 0, 709, 710, 5, 34, 0, 0, 710, 711, 5, 34, 0, 0, 711, 713, 1, 0, 0, 0, 712, 714, 5, 34, 0, 0, 713, 712, 1, 0, 0, 0, 713, 714, 1, 0, 0, 0, 714, 716, 1, 0, 0, 0, 715, 717, 5, 34, 0, 0, 716, 715, 1, 0, 0, 0, 716, 717, 1, 0, 0, 0, 717, 719, 1, 0, 0, 0, 718, 689, 1, 0, 0, 0, 718, 698, 1, 0, 0, 0, 719, 101, 1, 0, 0, 0, 720, 722, 3, 80, 32, 0, 721, 720, 1, 0, 0, 0, 722, 723, 1, 0, 0, 0, 723, 721, 1, 0, 0, 0, 723, 724, 1, 0, 0, 0, 724, 103, 1, 0, 0, 0, 725, 727, 3, 80, 32, 0, 726, 725, 1, 0, 0, 0, 727, 728, 1, 0, 0, 0, 728, 726, 1, 0, 0, 0, 728, 729, 1, 0, 0, 0, 729, 730, 1, 0, 0, 0, 730, 734, 3, 120, 52, 0, 731, 733, 3, 80, 32, 0, 732, 731, 1, 0, 0, 0, 733, 736, 1, 0, 0, 0, 734, 732, 1, 0, 0, 0, 734, 735, 1, 0, 0, 0, 735, 768, 1, 0, 0, 0, 736, 734, 1, 0, 0, 0, 737, 739, 3, 120, 52, 0, 738, 740, 3, 80, 32, 0, 739, 738, 1, 0, 0, 0, 740, 741, 1, 0, 0, 0, 741, 739, 1, 0, 0, 0, 741, 742, 1, 0, 0, 0, 742, 768, 1, 0, 0, 0, 743, 745, 3, 80, 32, 0, 744, 743, 1, 0, 0, 0, 745, 746, 1, 0, 0, 0, 746, 744, 1, 0, 0, 0, 746, 747, 1, 0, 0, 0, 747, 755, 1, 0, 0, 0, 748, 752, 3, 120, 52, 0, 749, 751, 3, 80, 32, 0, 750, 749, 1, 0, 0, 0, 751, 754, 1, 0, 0, 0, 752, 750, 1, 0, 0, 0, 752, 753, 1, 0, 0, 0, 753, 756, 1, 0, 0, 0, 754, 752, 1, 0, 0, 0, 755, 748, 1, 0, 0, 0, 755, 756, 1, 0, 0, 0, 756, 757, 1, 0, 0, 0, 757, 758, 3, 88, 36, 0, 758, 768, 1, 0, 0, 0, 759, 761, 3, 120, 52, 0, 760, 762, 3, 80, 32, 0, 761, 760, 1, 0, 0, 0, 762, 763, 1, 0, 0, 0, 763, 761, 1, 0, 0, 0, 763, 764, 1, 0, 0, 0, 764, 765, 1, 0, 0, 0, 765, 766, 3, 88, 36, 0, 766, 768, 1, 0, 0, 0, 767, 726, 1, 0, 0, 0, 767, 737, 1, 0, 0, 0, 767, 744, 1, 0, 0, 0, 767, 759, 1, 0, 0, 0, 768, 105, 1, 0, 0, 0, 769, 770, 7, 32, 0, 0, 770, 771, 7, 33, 0, 0, 771, 107, 1, 0, 0, 0, 772, 773, 7, 12, 0, 0, 773, 774, 7, 9, 0, 0, 774, 775, 7, 0, 0, 0, 775, 109, 1, 0, 0, 0, 776, 777, 7, 12, 0, 0, 777, 778, 7, 2, 0, 0, 778, 779, 7, 4, 0, 0, 779, 111, 1, 0, 0, 0, 780, 781, 5, 61, 0, 0, 781, 113, 1, 0, 0, 0, 782, 783, 5, 58, 0, 0, 783, 784, 5, 58, 0, 0, 784, 115, 1, 0, 0, 0, 785, 786, 5, 44, 0, 0, 786, 117, 1, 0, 0, 0, 787, 788, 7, 0, 0, 0, 788, 789, 7, 3, 0, 0, 789, 790, 7, 2, 0, 0, 790, 791, 7, 4, 0, 0, 791, 119, 1, 0, 0, 0, 792, 793, 5, 46, 0, 0, 793, 121, 1, 0, 0, 0, 794, 795, 7, 15, 0, 0, 795, 796, 7, 12, 0, 0, 796, 797, 7, 13, 0, 0, 797, 798, 7, 2, 0, 0, 798, 799, 7, 3, 0, 0, 799, 123, 1, 0, 0, 0, 800, 801, 7, 15, 0, 0, 801, 802, 7, 1, 0, 0, 802, 803, 7, 6, 0, 0, 803, 804, 7, 2, 0, 0, 804, 805, 7, 5, 0, 0, 805, 125, 1, 0, 0, 0, 806, 807, 7, 13, 0, 0, 807, 808, 7, 12, 0, 0, 808, 809, 7, 2, 0, 0, 809, 810, 7, 5, 0, 0, 810, 127, 1, 0, 0, 0, 811, 812, 5, 40, 0, 0, 812, 129, 1, 0, 0, 0, 813, 814, 7, 1, 0, 0, 814, 815, 7, 9, 0, 0, 815, 131, 1, 0, 0, 0, 816, 817, 7, 1, 0, 0, 817, 818, 7, 2, 0, 0, 818, 133, 1, 0, 0, 0, 819, 820, 7, 13, 0, 0, 820, 821, 7, 1, 0, 0, 821, 822, 7, 18, 0, 0, 822, 823, 7, 3, 0, 0, 823, 135, 1, 0, 0, 0, 824, 825, 7, 9, 0, 0, 825, 826, 7, 7, 0, 0, 826, 827, 7, 5, 0, 0, 827, 137, 1, 0, 0, 0, 828, 829, 7, 9, 0, 0, 829, 830, 7, 19, 0, 0, 830, 831, 7, 13, 0, 0, 831, 832, 7, 13, 0, 0, 832, 139, 1, 0, 0, 0, 833, 834, 7, 9, 0, 0, 834, 835, 7, 19, 0, 0, 835, 836, 7, 13, 0, 0, 836, 837, 7, 13, 0, 0, 837, 838, 7, 2, 0, 0, 838, 141, 1, 0, 0, 0, 839, 840, 7, 7, 0, 0, 840, 841, 7, 6, 0, 0, 841, 143, 1, 0, 0, 0, 842, 843, 5, 63, 0, 0, 843, 145, 1, 0, 0, 0, 844, 845, 7, 6, 0, 0, 845, 846, 7, 13, 0, 0, 846, 847, 7, 1, 0, 0, 847, 848, 7, 18, 0, 0, 848, 849, 7, 3, 0, 0, 849, 147, 1, 0, 0, 0, 850, 851, 5, 41, 0, 0, 851, 149, 1, 0, 0, 0, 852, 853, 7, 5, 0, 0, 853, 854, 7, 6, 0, 0, 854, 855, 7, 19, 0, 0, 855, 856, 7, 3, 0, 0, 856, 151, 1, 0, 0, 0, 857, 858, 5, 61, 0, 0, 858, 859, 5, 61, 0, 0, 859, 153, 1, 0, 0, 0, 860, 861, 5, 61, 0, 0, 861, 862, 5, 126, 0, 0, 862, 155, 1, 0, 0, 0, 863, 864, 5, 33, 0, 0, 864, 865, 5, 61, 0, 0, 865, 157, 1, 0, 0, 0, 866, 867, 5, 60, 0, 0, 867, 159, 1, 0, 0, 0, 868, 869, 5, 60, 0, 0, 869, 870, 5, 61, 0, 0, 870, 161, 1, 0, 0, 0, 871, 872, 5, 62, 0, 0, 872, 163, 1, 0, 0, 0, 873, 874, 5, 62, 0, 0, 874, 875, 5, 61, 0, 0, 875, 165, 1, 0, 0, 0, 876, 877, 5, 43, 0, 0, 877, 167, 1, 0, 0, 0, 878, 879, 5, 45, 0, 0, 879, 169, 1, 0, 0, 0, 880, 881, 5, 42, 0, 0, 881, 171, 1, 0, 0, 0, 882, 883, 5, 47, 0, 0, 883, 173, 1, 0, 0, 0, 884, 885, 5, 37, 0, 0, 885, 175, 1, 0, 0, 0, 886, 887, 3, 144, 64, 0, 887, 891, 3, 82, 33, 0, 888, 890, 3, 98, 41, 0, 889, 888, 1, 0, 0, 0, 890, 893, 1, 0, 0, 0, 891, 889, 1, 0, 0, 0, 891, 892, 1, 0, 0, 0, 892, 901, 1, 0, 0, 0, 893, 891, 1, 0, 0, 0, 894, 896, 3, 144, 64, 0, 895, 897, 3, 80, 32, 0, 896, 895, 1, 0, 0, 0, 897, 898, 1, 0, 0, 0, 898, 896, 1, 0, 0, 0, 898, 899, 1, 0, 0, 0, 899, 901, 1, 0, 0, 0, 900, 886, 1, 0, 0, 0, 900, 894, 1, 0, 0, 0, 901, 177, 1, 0, 0, 0, 902, 903, 5, 91, 0, 0, 903, 904, 1, 0, 0, 0, 904, 905, 6, 81, 0, 0, 905, 906, 6, 81, 0, 0, 906, 179, 1, 0, 0, 0, 907, 908, 5, 93, 0, 0, 908, 909, 1, 0, 0, 0, 909, 910, 6, 82, 15, 0, 910, 911, 6, 82, 15, 0, 911, 181, 1, 0, 0, 0, 912, 916, 3, 82, 33, 0, 913, 915, 3, 98, 41, 0, 914, 913, 1, 0, 0, 0, 915, 918, 1, 0, 0, 0, 916, 914, 1, 0, 0, 0, 916, 917, 1, 0, 0, 0, 917, 929, 1, 0, 0, 0, 918, 916, 1, 0, 0, 0, 919, 922, 3, 96, 40, 0, 920, 922, 3, 90, 37, 0, 921, 919, 1, 0, 0, 0, 921, 920, 1, 0, 0, 0, 922, 924, 1, 0, 0, 0, 923, 925, 3, 98, 41, 0, 924, 923, 1, 0, 0, 0, 925, 926, 1, 0, 0, 0, 926, 924, 1, 0, 0, 0, 926, 927, 1, 0, 0, 0, 927, 929, 1, 0, 0, 0, 928, 912, 1, 0, 0, 0, 928, 921, 1, 0, 0, 0, 929, 183, 1, 0, 0, 0, 930, 932, 3, 92, 38, 0, 931, 933, 3, 94, 39, 0, 932, 931, 1, 0, 0, 0, 933, 934, 1, 0, 0, 0, 934, 932, 1, 0, 0, 0, 934, 935, 1, 0, 0, 0, 935, 936, 1, 0, 0, 0, 936, 937, 3, 92, 38, 0, 937, 185, 1, 0, 0, 0, 938, 939, 3, 184, 84, 0, 939, 187, 1, 0, 0, 0, 940, 941, 3, 58, 21, 0, 941, 942, 1, 0, 0, 0, 942, 943, 6, 86, 11, 0, 943, 189, 1, 0, 0, 0, 944, 945, 3, 60, 22, 0, 945, 946, 1, 0, 0, 0, 946, 947, 6, 87, 11, 0, 947, 191, 1, 0, 0, 0, 948, 949, 3, 62, 23, 0, 949, 950, 1, 0, 0, 0, 950, 951, 6, 88, 11, 0, 951, 193, 1, 0, 0, 0, 952, 953, 3, 78, 31, 0, 953, 954, 1, 0, 0, 0, 954, 955, 6, 89, 14, 0, 955, 956, 6, 89, 15, 0, 956, 195, 1, 0, 0, 0, 957, 958, 3, 178, 81, 0, 958, 959, 1, 0, 0, 0, 959, 960, 6, 90, 12, 0, 960, 197, 1, 0, 0, 0, 961, 962, 3, 180, 82, 0, 962, 963, 1, 0, 0, 0, 963, 964, 6, 91, 16, 0, 964, 199, 1, 0, 0, 0, 965, 966, 3, 364, 174, 0, 966, 967, 1, 0, 0, 0, 967, 968, 6, 92, 17, 0, 968, 201, 1, 0, 0, 0, 969, 970, 3, 116, 50, 0, 970, 971, 1, 0, 0, 0, 971, 972, 6, 93, 18, 0, 972, 203, 1, 0, 0, 0, 973, 974, 3, 112, 48, 0, 974, 975, 1, 0, 0, 0, 975, 976, 6, 94, 19, 0, 976, 205, 1, 0, 0, 0, 977, 978, 7, 16, 0, 0, 978, 979, 7, 3, 0, 0, 979, 980, 7, 5, 0, 0, 980, 981, 7, 12, 0, 0, 981, 982, 7, 0, 0, 0, 982, 983, 7, 12, 0, 0, 983, 984, 7, 5, 0, 0, 984, 985, 7, 12, 0, 0, 985, 207, 1, 0, 0, 0, 986, 987, 3, 66, 25, 0, 987, 988, 1, 0, 0, 0, 988, 989, 6, 96, 20, 0, 989, 209, 1, 0, 0, 0, 990, 991, 3, 100, 42, 0, 991, 992, 1, 0, 0, 0, 992, 993, 6, 97, 21, 0, 993, 211, 1, 0, 0, 0, 994, 995, 3, 58, 21, 0, 995, 996, 1, 0, 0, 0, 996, 997, 6, 98, 11, 0, 997, 213, 1, 0, 0, 0, 998, 999, 3, 60, 22, 0, 999, 1000, 1, 0, 0, 0, 1000, 1001, 6, 99, 11, 0, 1001, 215, 1, 0, 0, 0, 1002, 1003, 3, 62, 23, 0, 1003, 1004, 1, 0, 0, 0, 1004, 1005, 6, 100, 11, 0, 1005, 217, 1, 0, 0, 0, 1006, 1007, 3, 78, 31, 0, 1007, 1008, 1, 0, 0, 0, 1008, 1009, 6, 101, 14, 0, 1009, 1010, 6, 101, 15, 0, 1010, 219, 1, 0, 0, 0, 1011, 1012, 3, 120, 52, 0, 1012, 1013, 1, 0, 0, 0, 1013, 1014, 6, 102, 22, 0, 1014, 221, 1, 0, 0, 0, 1015, 1016, 3, 116, 50, 0, 1016, 1017, 1, 0, 0, 0, 1017, 1018, 6, 103, 18, 0, 1018, 223, 1, 0, 0, 0, 1019, 1024, 3, 82, 33, 0, 1020, 1024, 3, 80, 32, 0, 1021, 1024, 3, 96, 40, 0, 1022, 1024, 3, 170, 77, 0, 1023, 1019, 1, 0, 0, 0, 1023, 1020, 1, 0, 0, 0, 1023, 1021, 1, 0, 0, 0, 1023, 1022, 1, 0, 0, 0, 1024, 225, 1, 0, 0, 0, 1025, 1028, 3, 82, 33, 0, 1026, 1028, 3, 170, 77, 0, 1027, 1025, 1, 0, 0, 0, 1027, 1026, 1, 0, 0, 0, 1028, 1032, 1, 0, 0, 0, 1029, 1031, 3, 224, 104, 0, 1030, 1029, 1, 0, 0, 0, 1031, 1034, 1, 0, 0, 0, 1032, 1030, 1, 0, 0, 0, 1032, 1033, 1, 0, 0, 0, 1033, 1045, 1, 0, 0, 0, 1034, 1032, 1, 0, 0, 0, 1035, 1038, 3, 96, 40, 0, 1036, 1038, 3, 90, 37, 0, 1037, 1035, 1, 0, 0, 0, 1037, 1036, 1, 0, 0, 0, 1038, 1040, 1, 0, 0, 0, 1039, 1041, 3, 224, 104, 0, 1040, 1039, 1, 0, 0, 0, 1041, 1042, 1, 0, 0, 0, 1042, 1040, 1, 0, 0, 0, 1042, 1043, 1, 0, 0, 0, 1043, 1045, 1, 0, 0, 0, 1044, 1027, 1, 0, 0, 0, 1044, 1037, 1, 0, 0, 0, 1045, 227, 1, 0, 0, 0, 1046, 1049, 3, 226, 105, 0, 1047, 1049, 3, 184, 84, 0, 1048, 1046, 1, 0, 0, 0, 1048, 1047, 1, 0, 0, 0, 1049, 1050, 1, 0, 0, 0, 1050, 1048, 1, 0, 0, 0, 1050, 1051, 1, 0, 0, 0, 1051, 229, 1, 0, 0, 0, 1052, 1053, 3, 58, 21, 0, 1053, 1054, 1, 0, 0, 0, 1054, 1055, 6, 107, 11, 0, 1055, 231, 1, 0, 0, 0, 1056, 1057, 3, 60, 22, 0, 1057, 1058, 1, 0, 0, 0, 1058, 1059, 6, 108, 11, 0, 1059, 233, 1, 0, 0, 0, 1060, 1061, 3, 62, 23, 0, 1061, 1062, 1, 0, 0, 0, 1062, 1063, 6, 109, 11, 0, 1063, 235, 1, 0, 0, 0, 1064, 1065, 3, 78, 31, 0, 1065, 1066, 1, 0, 0, 0, 1066, 1067, 6, 110, 14, 0, 1067, 1068, 6, 110, 15, 0, 1068, 237, 1, 0, 0, 0, 1069, 1070, 3, 112, 48, 0, 1070, 1071, 1, 0, 0, 0, 1071, 1072, 6, 111, 19, 0, 1072, 239, 1, 0, 0, 0, 1073, 1074, 3, 116, 50, 0, 1074, 1075, 1, 0, 0, 0, 1075, 1076, 6, 112, 18, 0, 1076, 241, 1, 0, 0, 0, 1077, 1078, 3, 120, 52, 0, 1078, 1079, 1, 0, 0, 0, 1079, 1080, 6, 113, 22, 0, 1080, 243, 1, 0, 0, 0, 1081, 1082, 7, 12, 0, 0, 1082, 1083, 7, 2, 0, 0, 1083, 245, 1, 0, 0, 0, 1084, 1085, 3, 228, 106, 0, 1085, 1086, 1, 0, 0, 0, 1086, 1087, 6, 115, 23, 0, 1087, 247, 1, 0, 0, 0, 1088, 1089, 3, 58, 21, 0, 1089, 1090, 1, 0, 0, 0, 1090, 1091, 6, 116, 11, 0, 1091, 249, 1, 0, 0, 0, 1092, 1093, 3, 60, 22, 0, 1093, 1094, 1, 0, 0, 0, 1094, 1095, 6, 117, 11, 0, 1095, 251, 1, 0, 0, 0, 1096, 1097, 3, 62, 23, 0, 1097, 1098, 1, 0, 0, 0, 1098, 1099, 6, 118, 11, 0, 1099, 253, 1, 0, 0, 0, 1100, 1101, 3, 78, 31, 0, 1101, 1102, 1, 0, 0, 0, 1102, 1103, 6, 119, 14, 0, 1103, 1104, 6, 119, 15, 0, 1104, 255, 1, 0, 0, 0, 1105, 1106, 3, 178, 81, 0, 1106, 1107, 1, 0, 0, 0, 1107, 1108, 6, 120, 12, 0, 1108, 1109, 6, 120, 24, 0, 1109, 257, 1, 0, 0, 0, 1110, 1111, 7, 7, 0, 0, 1111, 1112, 7, 9, 0, 0, 1112, 1113, 1, 0, 0, 0, 1113, 1114, 6, 121, 25, 0, 1114, 259, 1, 0, 0, 0, 1115, 1116, 7, 20, 0, 0, 1116, 1117, 7, 1, 0, 0, 1117, 1118, 7, 5, 0, 0, 1118, 1119, 7, 10, 0, 0, 1119, 1120, 1, 0, 0, 0, 1120, 1121, 6, 122, 25, 0, 1121, 261, 1, 0, 0, 0, 1122, 1123, 8, 34, 0, 0, 1123, 263, 1, 0, 0, 0, 1124, 1126, 3, 262, 123, 0, 1125, 1124, 1, 0, 0, 0, 1126, 1127, 1, 0, 0, 0, 1127, 1125, 1, 0, 0, 0, 1127, 1128, 1, 0, 0, 0, 1128, 1129, 1, 0, 0, 0, 1129, 1130, 3, 364, 174, 0, 1130, 1132, 1, 0, 0, 0, 1131, 1125, 1, 0, 0, 0, 1131, 1132, 1, 0, 0, 0, 1132, 1134, 1, 0, 0, 0, 1133, 1135, 3, 262, 123, 0, 1134, 1133, 1, 0, 0, 0, 1135, 1136, 1, 0, 0, 0, 1136, 1134, 1, 0, 0, 0, 1136, 1137, 1, 0, 0, 0, 1137, 265, 1, 0, 0, 0, 1138, 1139, 3, 264, 124, 0, 1139, 1140, 1, 0, 0, 0, 1140, 1141, 6, 125, 26, 0, 1141, 267, 1, 0, 0, 0, 1142, 1143, 3, 58, 21, 0, 1143, 1144, 1, 0, 0, 0, 1144, 1145, 6, 126, 11, 0, 1145, 269, 1, 0, 0, 0, 1146, 1147, 3, 60, 22, 0, 1147, 1148, 1, 0, 0, 0, 1148, 1149, 6, 127, 11, 0, 1149, 271, 1, 0, 0, 0, 1150, 1151, 3, 62, 23, 0, 1151, 1152, 1, 0, 0, 0, 1152, 1153, 6, 128, 11, 0, 1153, 273, 1, 0, 0, 0, 1154, 1155, 3, 78, 31, 0, 1155, 1156, 1, 0, 0, 0, 1156, 1157, 6, 129, 14, 0, 1157, 1158, 6, 129, 15, 0, 1158, 1159, 6, 129, 15, 0, 1159, 275, 1, 0, 0, 0, 1160, 1161, 3, 112, 48, 0, 1161, 1162, 1, 0, 0, 0, 1162, 1163, 6, 130, 19, 0, 1163, 277, 1, 0, 0, 0, 1164, 1165, 3, 116, 50, 0, 1165, 1166, 1, 0, 0, 0, 1166, 1167, 6, 131, 18, 0, 1167, 279, 1, 0, 0, 0, 1168, 1169, 3, 120, 52, 0, 1169, 1170, 1, 0, 0, 0, 1170, 1171, 6, 132, 22, 0, 1171, 281, 1, 0, 0, 0, 1172, 1173, 3, 260, 122, 0, 1173, 1174, 1, 0, 0, 0, 1174, 1175, 6, 133, 27, 0, 1175, 283, 1, 0, 0, 0, 1176, 1177, 3, 228, 106, 0, 1177, 1178, 1, 0, 0, 0, 1178, 1179, 6, 134, 23, 0, 1179, 285, 1, 0, 0, 0, 1180, 1181, 3, 186, 85, 0, 1181, 1182, 1, 0, 0, 0, 1182, 1183, 6, 135, 28, 0, 1183, 287, 1, 0, 0, 0, 1184, 1185, 3, 58, 21, 0, 1185, 1186, 1, 0, 0, 0, 1186, 1187, 6, 136, 11, 0, 1187, 289, 1, 0, 0, 0, 1188, 1189, 3, 60, 22, 0, 1189, 1190, 1, 0, 0, 0, 1190, 1191, 6, 137, 11, 0, 1191, 291, 1, 0, 0, 0, 1192, 1193, 3, 62, 23, 0, 1193, 1194, 1, 0, 0, 0, 1194, 1195, 6, 138, 11, 0, 1195, 293, 1, 0, 0, 0, 1196, 1197, 3, 78, 31, 0, 1197, 1198, 1, 0, 0, 0, 1198, 1199, 6, 139, 14, 0, 1199, 1200, 6, 139, 15, 0, 1200, 295, 1, 0, 0, 0, 1201, 1202, 3, 364, 174, 0, 1202, 1203, 1, 0, 0, 0, 1203, 1204, 6, 140, 17, 0, 1204, 297, 1, 0, 0, 0, 1205, 1206, 3, 116, 50, 0, 1206, 1207, 1, 0, 0, 0, 1207, 1208, 6, 141, 18, 0, 1208, 299, 1, 0, 0, 0, 1209, 1210, 3, 120, 52, 0, 1210, 1211, 1, 0, 0, 0, 1211, 1212, 6, 142, 22, 0, 1212, 301, 1, 0, 0, 0, 1213, 1214, 3, 258, 121, 0, 1214, 1215, 1, 0, 0, 0, 1215, 1216, 6, 143, 29, 0, 1216, 1217, 6, 143, 30, 0, 1217, 303, 1, 0, 0, 0, 1218, 1219, 3, 66, 25, 0, 1219, 1220, 1, 0, 0, 0, 1220, 1221, 6, 144, 20, 0, 1221, 305, 1, 0, 0, 0, 1222, 1223, 3, 100, 42, 0, 1223, 1224, 1, 0, 0, 0, 1224, 1225, 6, 145, 21, 0, 1225, 307, 1, 0, 0, 0, 1226, 1227, 3, 58, 21, 0, 1227, 1228, 1, 0, 0, 0, 1228, 1229, 6, 146, 11, 0, 1229, 309, 1, 0, 0, 0, 1230, 1231, 3, 60, 22, 0, 1231, 1232, 1, 0, 0, 0, 1232, 1233, 6, 147, 11, 0, 1233, 311, 1, 0, 0, 0, 1234, 1235, 3, 62, 23, 0, 1235, 1236, 1, 0, 0, 0, 1236, 1237, 6, 148, 11, 0, 1237, 313, 1, 0, 0, 0, 1238, 1239, 3, 78, 31, 0, 1239, 1240, 1, 0, 0, 0, 1240, 1241, 6, 149, 14, 0, 1241, 1242, 6, 149, 15, 0, 1242, 1243, 6, 149, 15, 0, 1243, 315, 1, 0, 0, 0, 1244, 1245, 3, 116, 50, 0, 1245, 1246, 1, 0, 0, 0, 1246, 1247, 6, 150, 18, 0, 1247, 317, 1, 0, 0, 0, 1248, 1249, 3, 120, 52, 0, 1249, 1250, 1, 0, 0, 0, 1250, 1251, 6, 151, 22, 0, 1251, 319, 1, 0, 0, 0, 1252, 1253, 3, 228, 106, 0, 1253, 1254, 1, 0, 0, 0, 1254, 1255, 6, 152, 23, 0, 1255, 321, 1, 0, 0, 0, 1256, 1257, 3, 58, 21, 0, 1257, 1258, 1, 0, 0, 0, 1258, 1259, 6, 153, 11, 0, 1259, 323, 1, 0, 0, 0, 1260, 1261, 3, 60, 22, 0, 1261, 1262, 1, 0, 0, 0, 1262, 1263, 6, 154, 11, 0, 1263, 325, 1, 0, 0, 0, 1264, 1265, 3, 62, 23, 0, 1265, 1266, 1, 0, 0, 0, 1266, 1267, 6, 155, 11, 0, 1267, 327, 1, 0, 0, 0, 1268, 1269, 3, 78, 31, 0, 1269, 1270, 1, 0, 0, 0, 1270, 1271, 6, 156, 14, 0, 1271, 1272, 6, 156, 15, 0, 1272, 329, 1, 0, 0, 0, 1273, 1274, 3, 120, 52, 0, 1274, 1275, 1, 0, 0, 0, 1275, 1276, 6, 157, 22, 0, 1276, 331, 1, 0, 0, 0, 1277, 1278, 3, 186, 85, 0, 1278, 1279, 1, 0, 0, 0, 1279, 1280, 6, 158, 28, 0, 1280, 333, 1, 0, 0, 0, 1281, 1282, 3, 182, 83, 0, 1282, 1283, 1, 0, 0, 0, 1283, 1284, 6, 159, 31, 0, 1284, 335, 1, 0, 0, 0, 1285, 1286, 3, 58, 21, 0, 1286, 1287, 1, 0, 0, 0, 1287, 1288, 6, 160, 11, 0, 1288, 337, 1, 0, 0, 0, 1289, 1290, 3, 60, 22, 0, 1290, 1291, 1, 0, 0, 0, 1291, 1292, 6, 161, 11, 0, 1292, 339, 1, 0, 0, 0, 1293, 1294, 3, 62, 23, 0, 1294, 1295, 1, 0, 0, 0, 1295, 1296, 6, 162, 11, 0, 1296, 341, 1, 0, 0, 0, 1297, 1298, 3, 78, 31, 0, 1298, 1299, 1, 0, 0, 0, 1299, 1300, 6, 163, 14, 0, 1300, 1301, 6, 163, 15, 0, 1301, 343, 1, 0, 0, 0, 1302, 1303, 7, 1, 0, 0, 1303, 1304, 7, 9, 0, 0, 1304, 1305, 7, 15, 0, 0, 1305, 1306, 7, 7, 0, 0, 1306, 345, 1, 0, 0, 0, 1307, 1308, 3, 58, 21, 0, 1308, 1309, 1, 0, 0, 0, 1309, 1310, 6, 165, 11, 0, 1310, 347, 1, 0, 0, 0, 1311, 1312, 3, 60, 22, 0, 1312, 1313, 1, 0, 0, 0, 1313, 1314, 6, 166, 11, 0, 1314, 349, 1, 0, 0, 0, 1315, 1316, 3, 62, 23, 0, 1316, 1317, 1, 0, 0, 0, 1317, 1318, 6, 167, 11, 0, 1318, 351, 1, 0, 0, 0, 1319, 1320, 3, 78, 31, 0, 1320, 1321, 1, 0, 0, 0, 1321, 1322, 6, 168, 14, 0, 1322, 1323, 6, 168, 15, 0, 1323, 353, 1, 0, 0, 0, 1324, 1325, 7, 15, 0, 0, 1325, 1326, 7, 19, 0, 0, 1326, 1327, 7, 9, 0, 0, 1327, 1328, 7, 4, 0, 0, 1328, 1329, 7, 5, 0, 0, 1329, 1330, 7, 1, 0, 0, 1330, 1331, 7, 7, 0, 0, 1331, 1332, 7, 9, 0, 0, 1332, 1333, 7, 2, 0, 0, 1333, 355, 1, 0, 0, 0, 1334, 1335, 3, 58, 21, 0, 1335, 1336, 1, 0, 0, 0, 1336, 1337, 6, 170, 11, 0, 1337, 357, 1, 0, 0, 0, 1338, 1339, 3, 60, 22, 0, 1339, 1340, 1, 0, 0, 0, 1340, 1341, 6, 171, 11, 0, 1341, 359, 1, 0, 0, 0, 1342, 1343, 3, 62, 23, 0, 1343, 1344, 1, 0, 0, 0, 1344, 1345, 6, 172, 11, 0, 1345, 361, 1, 0, 0, 0, 1346, 1347, 3, 180, 82, 0, 1347, 1348, 1, 0, 0, 0, 1348, 1349, 6, 173, 16, 0, 1349, 1350, 6, 173, 15, 0, 1350, 363, 1, 0, 0, 0, 1351, 1352, 5, 58, 0, 0, 1352, 365, 1, 0, 0, 0, 1353, 1359, 3, 90, 37, 0, 1354, 1359, 3, 80, 32, 0, 1355, 1359, 3, 120, 52, 0, 1356, 1359, 3, 82, 33, 0, 1357, 1359, 3, 96, 40, 0, 1358, 1353, 1, 0, 0, 0, 1358, 1354, 1, 0, 0, 0, 1358, 1355, 1, 0, 0, 0, 1358, 1356, 1, 0, 0, 0, 1358, 1357, 1, 0, 0, 0, 1359, 1360, 1, 0, 0, 0, 1360, 1358, 1, 0, 0, 0, 1360, 1361, 1, 0, 0, 0, 1361, 367, 1, 0, 0, 0, 1362, 1363, 3, 58, 21, 0, 1363, 1364, 1, 0, 0, 0, 1364, 1365, 6, 176, 11, 0, 1365, 369, 1, 0, 0, 0, 1366, 1367, 3, 60, 22, 0, 1367, 1368, 1, 0, 0, 0, 1368, 1369, 6, 177, 11, 0, 1369, 371, 1, 0, 0, 0, 1370, 1371, 3, 62, 23, 0, 1371, 1372, 1, 0, 0, 0, 1372, 1373, 6, 178, 11, 0, 1373, 373, 1, 0, 0, 0, 1374, 1375, 3, 78, 31, 0, 1375, 1376, 1, 0, 0, 0, 1376, 1377, 6, 179, 14, 0, 1377, 1378, 6, 179, 15, 0, 1378, 375, 1, 0, 0, 0, 1379, 1380, 3, 66, 25, 0, 1380, 1381, 1, 0, 0, 0, 1381, 1382, 6, 180, 20, 0, 1382, 1383, 6, 180, 15, 0, 1383, 1384, 6, 180, 32, 0, 1384, 377, 1, 0, 0, 0, 1385, 1386, 3, 100, 42, 0, 1386, 1387, 1, 0, 0, 0, 1387, 1388, 6, 181, 21, 0, 1388, 1389, 6, 181, 15, 0, 1389, 1390, 6, 181, 32, 0, 1390, 379, 1, 0, 0, 0, 1391, 1392, 3, 58, 21, 0, 1392, 1393, 1, 0, 0, 0, 1393, 1394, 6, 182, 11, 0, 1394, 381, 1, 0, 0, 0, 1395, 1396, 3, 60, 22, 0, 1396, 1397, 1, 0, 0, 0, 1397, 1398, 6, 183, 11, 0, 1398, 383, 1, 0, 0, 0, 1399, 1400, 3, 62, 23, 0, 1400, 1401, 1, 0, 0, 0, 1401, 1402, 6, 184, 11, 0, 1402, 385, 1, 0, 0, 0, 1403, 1404, 3, 364, 174, 0, 1404, 1405, 1, 0, 0, 0, 1405, 1406, 6, 185, 17, 0, 1406, 1407, 6, 185, 15, 0, 1407, 1408, 6, 185, 7, 0, 1408, 387, 1, 0, 0, 0, 1409, 1410, 3, 116, 50, 0, 1410, 1411, 1, 0, 0, 0, 1411, 1412, 6, 186, 18, 0, 1412, 1413, 6, 186, 15, 0, 1413, 1414, 6, 186, 7, 0, 1414, 389, 1, 0, 0, 0, 1415, 1416, 3, 58, 21, 0, 1416, 1417, 1, 0, 0, 0, 1417, 1418, 6, 187, 11, 0, 1418, 391, 1, 0, 0, 0, 1419, 1420, 3, 60, 22, 0, 1420, 1421, 1, 0, 0, 0, 1421, 1422, 6, 188, 11, 0, 1422, 393, 1, 0, 0, 0, 1423, 1424, 3, 62, 23, 0, 1424, 1425, 1, 0, 0, 0, 1425, 1426, 6, 189, 11, 0, 1426, 395, 1, 0, 0, 0, 1427, 1428, 3, 186, 85, 0, 1428, 1429, 1, 0, 0, 0, 1429, 1430, 6, 190, 15, 0, 1430, 1431, 6, 190, 0, 0, 1431, 1432, 6, 190, 28, 0, 1432, 397, 1, 0, 0, 0, 1433, 1434, 3, 182, 83, 0, 1434, 1435, 1, 0, 0, 0, 1435, 1436, 6, 191, 15, 0, 1436, 1437, 6, 191, 0, 0, 1437, 1438, 6, 191, 31, 0, 1438, 399, 1, 0, 0, 0, 1439, 1440, 3, 106, 45, 0, 1440, 1441, 1, 0, 0, 0, 1441, 1442, 6, 192, 15, 0, 1442, 1443, 6, 192, 0, 0, 1443, 1444, 6, 192, 33, 0, 1444, 401, 1, 0, 0, 0, 1445, 1446, 3, 78, 31, 0, 1446, 1447, 1, 0, 0, 0, 1447, 1448, 6, 193, 14, 0, 1448, 1449, 6, 193, 15, 0, 1449, 403, 1, 0, 0, 0, 65, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 576, 586, 590, 593, 602, 604, 615, 622, 627, 666, 671, 680, 687, 692, 694, 705, 713, 716, 718, 723, 728, 734, 741, 746, 752, 755, 763, 767, 891, 898, 900, 916, 921, 926, 928, 934, 1023, 1027, 1032, 1037, 1042, 1044, 1048, 1050, 1127, 1131, 1136, 1358, 1360, 34, 5, 2, 0, 5, 4, 0, 5, 6, 0, 5, 1, 0, 5, 3, 0, 5, 8, 0, 5, 12, 0, 5, 14, 0, 5, 10, 0, 5, 5, 0, 5, 11, 0, 0, 1, 0, 7, 69, 0, 5, 0, 0, 7, 29, 0, 4, 0, 0, 7, 70, 0, 7, 114, 0, 7, 38, 0, 7, 36, 0, 7, 25, 0, 7, 30, 0, 7, 40, 0, 7, 80, 0, 5, 13, 0, 5, 7, 0, 7, 90, 0, 7, 89, 0, 7, 72, 0, 7, 88, 0, 5, 9, 0, 7, 71, 0, 5, 15, 0, 7, 33, 0]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
index 04798fc3dca8a..63eb3a86419a3 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.tokens
@@ -22,7 +22,7 @@ UNKNOWN_CMD=21
 LINE_COMMENT=22
 MULTILINE_COMMENT=23
 WS=24
-INDEX_UNQUOTED_IDENTIFIER=25
+UNQUOTED_SOURCE=25
 EXPLAIN_WS=26
 EXPLAIN_LINE_COMMENT=27
 EXPLAIN_MULTILINE_COMMENT=28
diff --git a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
index ff985e02ccf1d..ab1f2d1a3b4d5 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_lexer.ts
@@ -37,7 +37,7 @@ export default class esql_lexer extends Lexer {
 	public static readonly LINE_COMMENT = 22;
 	public static readonly MULTILINE_COMMENT = 23;
 	public static readonly WS = 24;
-	public static readonly INDEX_UNQUOTED_IDENTIFIER = 25;
+	public static readonly UNQUOTED_SOURCE = 25;
 	public static readonly EXPLAIN_WS = 26;
 	public static readonly EXPLAIN_LINE_COMMENT = 27;
 	public static readonly EXPLAIN_MULTILINE_COMMENT = 28;
@@ -230,7 +230,7 @@ export default class esql_lexer extends Lexer {
                                                              "UNKNOWN_CMD", 
                                                              "LINE_COMMENT", 
                                                              "MULTILINE_COMMENT", 
-                                                             "WS", "INDEX_UNQUOTED_IDENTIFIER", 
+                                                             "WS", "UNQUOTED_SOURCE", 
                                                              "EXPLAIN_WS", 
                                                              "EXPLAIN_LINE_COMMENT", 
                                                              "EXPLAIN_MULTILINE_COMMENT", 
@@ -321,7 +321,7 @@ export default class esql_lexer extends Lexer {
 		"DISSECT", "DROP", "ENRICH", "EVAL", "EXPLAIN", "FROM", "GROK", "INLINESTATS", 
 		"KEEP", "LIMIT", "LOOKUP", "META", "METRICS", "MV_EXPAND", "RENAME", "ROW", 
 		"SHOW", "SORT", "STATS", "WHERE", "UNKNOWN_CMD", "LINE_COMMENT", "MULTILINE_COMMENT", 
-		"WS", "INDEX_UNQUOTED_IDENTIFIER_PART", "INDEX_UNQUOTED_IDENTIFIER", "EXPLAIN_OPENING_BRACKET", 
+		"WS", "UNQUOTED_SOURCE_PART", "UNQUOTED_SOURCE", "EXPLAIN_OPENING_BRACKET", 
 		"EXPLAIN_PIPE", "EXPLAIN_WS", "EXPLAIN_LINE_COMMENT", "EXPLAIN_MULTILINE_COMMENT", 
 		"PIPE", "DIGIT", "LETTER", "ESCAPE_SEQUENCE", "UNESCAPED_CHARS", "EXPONENT", 
 		"ASPERAND", "BACKQUOTE", "BACKQUOTE_BLOCK", "UNDERSCORE", "UNQUOTED_ID_BODY", 
@@ -332,32 +332,33 @@ export default class esql_lexer extends Lexer {
 		"ASTERISK", "SLASH", "PERCENT", "NAMED_OR_POSITIONAL_PARAM", "OPENING_BRACKET", 
 		"CLOSING_BRACKET", "UNQUOTED_IDENTIFIER", "QUOTED_ID", "QUOTED_IDENTIFIER", 
 		"EXPR_LINE_COMMENT", "EXPR_MULTILINE_COMMENT", "EXPR_WS", "FROM_PIPE", 
-		"FROM_OPENING_BRACKET", "FROM_CLOSING_BRACKET", "FROM_COMMA", "FROM_ASSIGN", 
-		"FROM_QUOTED_STRING", "METADATA", "FROM_INDEX_UNQUOTED_IDENTIFIER", "FROM_LINE_COMMENT", 
-		"FROM_MULTILINE_COMMENT", "FROM_WS", "PROJECT_PIPE", "PROJECT_DOT", "PROJECT_COMMA", 
-		"UNQUOTED_ID_BODY_WITH_PATTERN", "UNQUOTED_ID_PATTERN", "ID_PATTERN", 
-		"PROJECT_LINE_COMMENT", "PROJECT_MULTILINE_COMMENT", "PROJECT_WS", "RENAME_PIPE", 
-		"RENAME_ASSIGN", "RENAME_COMMA", "RENAME_DOT", "AS", "RENAME_ID_PATTERN", 
+		"FROM_OPENING_BRACKET", "FROM_CLOSING_BRACKET", "FROM_COLON", "FROM_COMMA", 
+		"FROM_ASSIGN", "METADATA", "FROM_UNQUOTED_SOURCE", "FROM_QUOTED_SOURCE", 
+		"FROM_LINE_COMMENT", "FROM_MULTILINE_COMMENT", "FROM_WS", "PROJECT_PIPE", 
+		"PROJECT_DOT", "PROJECT_COMMA", "UNQUOTED_ID_BODY_WITH_PATTERN", "UNQUOTED_ID_PATTERN", 
+		"ID_PATTERN", "PROJECT_LINE_COMMENT", "PROJECT_MULTILINE_COMMENT", "PROJECT_WS", 
+		"RENAME_PIPE", "RENAME_ASSIGN", "RENAME_COMMA", "RENAME_DOT", "AS", "RENAME_ID_PATTERN", 
 		"RENAME_LINE_COMMENT", "RENAME_MULTILINE_COMMENT", "RENAME_WS", "ENRICH_PIPE", 
 		"ENRICH_OPENING_BRACKET", "ON", "WITH", "ENRICH_POLICY_NAME_BODY", "ENRICH_POLICY_NAME", 
-		"ENRICH_QUOTED_IDENTIFIER", "ENRICH_MODE_UNQUOTED_VALUE", "ENRICH_LINE_COMMENT", 
-		"ENRICH_MULTILINE_COMMENT", "ENRICH_WS", "ENRICH_FIELD_PIPE", "ENRICH_FIELD_ASSIGN", 
-		"ENRICH_FIELD_COMMA", "ENRICH_FIELD_DOT", "ENRICH_FIELD_WITH", "ENRICH_FIELD_ID_PATTERN", 
-		"ENRICH_FIELD_QUOTED_IDENTIFIER", "ENRICH_FIELD_LINE_COMMENT", "ENRICH_FIELD_MULTILINE_COMMENT", 
-		"ENRICH_FIELD_WS", "LOOKUP_PIPE", "LOOKUP_COMMA", "LOOKUP_DOT", "LOOKUP_ON", 
-		"LOOKUP_INDEX_UNQUOTED_IDENTIFIER", "LOOKUP_LINE_COMMENT", "LOOKUP_MULTILINE_COMMENT", 
-		"LOOKUP_WS", "LOOKUP_FIELD_PIPE", "LOOKUP_FIELD_COMMA", "LOOKUP_FIELD_DOT", 
-		"LOOKUP_FIELD_ID_PATTERN", "LOOKUP_FIELD_LINE_COMMENT", "LOOKUP_FIELD_MULTILINE_COMMENT", 
-		"LOOKUP_FIELD_WS", "MVEXPAND_PIPE", "MVEXPAND_DOT", "MVEXPAND_QUOTED_IDENTIFIER", 
-		"MVEXPAND_UNQUOTED_IDENTIFIER", "MVEXPAND_LINE_COMMENT", "MVEXPAND_MULTILINE_COMMENT", 
-		"MVEXPAND_WS", "SHOW_PIPE", "INFO", "SHOW_LINE_COMMENT", "SHOW_MULTILINE_COMMENT", 
-		"SHOW_WS", "META_PIPE", "FUNCTIONS", "META_LINE_COMMENT", "META_MULTILINE_COMMENT", 
+		"ENRICH_MODE_UNQUOTED_VALUE", "ENRICH_LINE_COMMENT", "ENRICH_MULTILINE_COMMENT", 
+		"ENRICH_WS", "ENRICH_FIELD_PIPE", "ENRICH_FIELD_ASSIGN", "ENRICH_FIELD_COMMA", 
+		"ENRICH_FIELD_DOT", "ENRICH_FIELD_WITH", "ENRICH_FIELD_ID_PATTERN", "ENRICH_FIELD_QUOTED_IDENTIFIER", 
+		"ENRICH_FIELD_LINE_COMMENT", "ENRICH_FIELD_MULTILINE_COMMENT", "ENRICH_FIELD_WS", 
+		"LOOKUP_PIPE", "LOOKUP_COLON", "LOOKUP_COMMA", "LOOKUP_DOT", "LOOKUP_ON", 
+		"LOOKUP_UNQUOTED_SOURCE", "LOOKUP_QUOTED_SOURCE", "LOOKUP_LINE_COMMENT", 
+		"LOOKUP_MULTILINE_COMMENT", "LOOKUP_WS", "LOOKUP_FIELD_PIPE", "LOOKUP_FIELD_COMMA", 
+		"LOOKUP_FIELD_DOT", "LOOKUP_FIELD_ID_PATTERN", "LOOKUP_FIELD_LINE_COMMENT", 
+		"LOOKUP_FIELD_MULTILINE_COMMENT", "LOOKUP_FIELD_WS", "MVEXPAND_PIPE", 
+		"MVEXPAND_DOT", "MVEXPAND_QUOTED_IDENTIFIER", "MVEXPAND_UNQUOTED_IDENTIFIER", 
+		"MVEXPAND_LINE_COMMENT", "MVEXPAND_MULTILINE_COMMENT", "MVEXPAND_WS", 
+		"SHOW_PIPE", "INFO", "SHOW_LINE_COMMENT", "SHOW_MULTILINE_COMMENT", "SHOW_WS", 
+		"META_PIPE", "FUNCTIONS", "META_LINE_COMMENT", "META_MULTILINE_COMMENT", 
 		"META_WS", "SETTING_CLOSING_BRACKET", "COLON", "SETTING", "SETTING_LINE_COMMENT", 
-		"SETTTING_MULTILINE_COMMENT", "SETTING_WS", "METRICS_PIPE", "METRICS_INDEX_UNQUOTED_IDENTIFIER", 
-		"METRICS_LINE_COMMENT", "METRICS_MULTILINE_COMMENT", "METRICS_WS", "CLOSING_METRICS_COMMA", 
-		"CLOSING_METRICS_LINE_COMMENT", "CLOSING_METRICS_MULTILINE_COMMENT", "CLOSING_METRICS_WS", 
-		"CLOSING_METRICS_QUOTED_IDENTIFIER", "CLOSING_METRICS_UNQUOTED_IDENTIFIER", 
-		"CLOSING_METRICS_BY", "CLOSING_METRICS_PIPE",
+		"SETTTING_MULTILINE_COMMENT", "SETTING_WS", "METRICS_PIPE", "METRICS_UNQUOTED_SOURCE", 
+		"METRICS_QUOTED_SOURCE", "METRICS_LINE_COMMENT", "METRICS_MULTILINE_COMMENT", 
+		"METRICS_WS", "CLOSING_METRICS_COLON", "CLOSING_METRICS_COMMA", "CLOSING_METRICS_LINE_COMMENT", 
+		"CLOSING_METRICS_MULTILINE_COMMENT", "CLOSING_METRICS_WS", "CLOSING_METRICS_QUOTED_IDENTIFIER", 
+		"CLOSING_METRICS_UNQUOTED_IDENTIFIER", "CLOSING_METRICS_BY", "CLOSING_METRICS_PIPE",
 	];
 
 
@@ -378,7 +379,7 @@ export default class esql_lexer extends Lexer {
 
 	public get modeNames(): string[] { return esql_lexer.modeNames; }
 
-	public static readonly _serializedATN: number[] = [4,0,124,1422,6,-1,6,
+	public static readonly _serializedATN: number[] = [4,0,124,1450,6,-1,6,
 	-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,6,-1,
 	2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,
 	2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,
@@ -408,463 +409,474 @@ export default class esql_lexer extends Lexer {
 	2,169,7,169,2,170,7,170,2,171,7,171,2,172,7,172,2,173,7,173,2,174,7,174,
 	2,175,7,175,2,176,7,176,2,177,7,177,2,178,7,178,2,179,7,179,2,180,7,180,
 	2,181,7,181,2,182,7,182,2,183,7,183,2,184,7,184,2,185,7,185,2,186,7,186,
-	2,187,7,187,2,188,7,188,2,189,7,189,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,
-	1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,3,
-	1,3,1,3,1,3,1,3,1,3,1,3,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,5,1,5,
-	1,5,1,5,1,5,1,5,1,5,1,6,1,6,1,6,1,6,1,6,1,6,1,6,1,7,1,7,1,7,1,7,1,7,1,7,
-	1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,9,
-	1,9,1,9,1,9,1,9,1,9,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,11,1,
-	11,1,11,1,11,1,11,1,11,1,11,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,
-	1,12,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,
-	14,1,14,1,14,1,14,1,14,1,14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,16,
-	1,16,1,16,1,16,1,16,1,16,1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,18,1,
-	18,1,18,1,18,1,18,1,18,1,18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,
-	1,20,4,20,567,8,20,11,20,12,20,568,1,20,1,20,1,21,1,21,1,21,1,21,5,21,577,
-	8,21,10,21,12,21,580,9,21,1,21,3,21,583,8,21,1,21,3,21,586,8,21,1,21,1,
-	21,1,22,1,22,1,22,1,22,1,22,5,22,595,8,22,10,22,12,22,598,9,22,1,22,1,22,
-	1,22,1,22,1,22,1,23,4,23,606,8,23,11,23,12,23,607,1,23,1,23,1,24,1,24,1,
-	24,3,24,615,8,24,1,25,4,25,618,8,25,11,25,12,25,619,1,26,1,26,1,26,1,26,
-	1,26,1,27,1,27,1,27,1,27,1,27,1,28,1,28,1,28,1,28,1,29,1,29,1,29,1,29,1,
-	30,1,30,1,30,1,30,1,31,1,31,1,31,1,31,1,32,1,32,1,33,1,33,1,34,1,34,1,34,
-	1,35,1,35,1,36,1,36,3,36,659,8,36,1,36,4,36,662,8,36,11,36,12,36,663,1,
-	37,1,37,1,38,1,38,1,39,1,39,1,39,3,39,673,8,39,1,40,1,40,1,41,1,41,1,41,
-	3,41,680,8,41,1,42,1,42,1,42,5,42,685,8,42,10,42,12,42,688,9,42,1,42,1,
-	42,1,42,1,42,1,42,1,42,5,42,696,8,42,10,42,12,42,699,9,42,1,42,1,42,1,42,
-	1,42,1,42,3,42,706,8,42,1,42,3,42,709,8,42,3,42,711,8,42,1,43,4,43,714,
-	8,43,11,43,12,43,715,1,44,4,44,719,8,44,11,44,12,44,720,1,44,1,44,5,44,
-	725,8,44,10,44,12,44,728,9,44,1,44,1,44,4,44,732,8,44,11,44,12,44,733,1,
-	44,4,44,737,8,44,11,44,12,44,738,1,44,1,44,5,44,743,8,44,10,44,12,44,746,
-	9,44,3,44,748,8,44,1,44,1,44,1,44,1,44,4,44,754,8,44,11,44,12,44,755,1,
-	44,1,44,3,44,760,8,44,1,45,1,45,1,45,1,46,1,46,1,46,1,46,1,47,1,47,1,47,
-	1,47,1,48,1,48,1,49,1,49,1,49,1,50,1,50,1,51,1,51,1,51,1,51,1,51,1,52,1,
-	52,1,53,1,53,1,53,1,53,1,53,1,53,1,54,1,54,1,54,1,54,1,54,1,54,1,55,1,55,
-	1,55,1,55,1,55,1,56,1,56,1,57,1,57,1,57,1,58,1,58,1,58,1,59,1,59,1,59,1,
-	59,1,59,1,60,1,60,1,60,1,60,1,61,1,61,1,61,1,61,1,61,1,62,1,62,1,62,1,62,
-	1,62,1,62,1,63,1,63,1,63,1,64,1,64,1,65,1,65,1,65,1,65,1,65,1,65,1,66,1,
-	66,1,67,1,67,1,67,1,67,1,67,1,68,1,68,1,68,1,69,1,69,1,69,1,70,1,70,1,70,
-	1,71,1,71,1,72,1,72,1,72,1,73,1,73,1,74,1,74,1,74,1,75,1,75,1,76,1,76,1,
-	77,1,77,1,78,1,78,1,79,1,79,1,80,1,80,1,80,5,80,882,8,80,10,80,12,80,885,
-	9,80,1,80,1,80,4,80,889,8,80,11,80,12,80,890,3,80,893,8,80,1,81,1,81,1,
-	81,1,81,1,81,1,82,1,82,1,82,1,82,1,82,1,83,1,83,5,83,907,8,83,10,83,12,
-	83,910,9,83,1,83,1,83,3,83,914,8,83,1,83,4,83,917,8,83,11,83,12,83,918,
-	3,83,921,8,83,1,84,1,84,4,84,925,8,84,11,84,12,84,926,1,84,1,84,1,85,1,
-	85,1,86,1,86,1,86,1,86,1,87,1,87,1,87,1,87,1,88,1,88,1,88,1,88,1,89,1,89,
-	1,89,1,89,1,89,1,90,1,90,1,90,1,90,1,91,1,91,1,91,1,91,1,92,1,92,1,92,1,
-	92,1,93,1,93,1,93,1,93,1,94,1,94,1,94,1,94,1,95,1,95,1,95,1,95,1,95,1,95,
-	1,95,1,95,1,95,1,96,1,96,1,96,1,96,1,97,1,97,1,97,1,97,1,98,1,98,1,98,1,
-	98,1,99,1,99,1,99,1,99,1,100,1,100,1,100,1,100,1,100,1,101,1,101,1,101,
-	1,101,1,102,1,102,1,102,1,102,1,103,1,103,1,103,1,103,3,103,1012,8,103,
-	1,104,1,104,3,104,1016,8,104,1,104,5,104,1019,8,104,10,104,12,104,1022,
-	9,104,1,104,1,104,3,104,1026,8,104,1,104,4,104,1029,8,104,11,104,12,104,
-	1030,3,104,1033,8,104,1,105,1,105,4,105,1037,8,105,11,105,12,105,1038,1,
-	106,1,106,1,106,1,106,1,107,1,107,1,107,1,107,1,108,1,108,1,108,1,108,1,
-	109,1,109,1,109,1,109,1,109,1,110,1,110,1,110,1,110,1,111,1,111,1,111,1,
-	111,1,112,1,112,1,112,1,112,1,113,1,113,1,113,1,114,1,114,1,114,1,114,1,
-	115,1,115,1,115,1,115,1,116,1,116,1,116,1,116,1,117,1,117,1,117,1,117,1,
-	118,1,118,1,118,1,118,1,118,1,119,1,119,1,119,1,119,1,119,1,120,1,120,1,
-	120,1,120,1,120,1,121,1,121,1,121,1,121,1,121,1,121,1,121,1,122,1,122,1,
-	123,4,123,1114,8,123,11,123,12,123,1115,1,123,1,123,3,123,1120,8,123,1,
-	123,4,123,1123,8,123,11,123,12,123,1124,1,124,1,124,1,124,1,124,1,125,1,
-	125,1,125,1,125,1,126,1,126,1,126,1,126,1,127,1,127,1,127,1,127,1,128,1,
-	128,1,128,1,128,1,129,1,129,1,129,1,129,1,129,1,129,1,130,1,130,1,130,1,
-	130,1,131,1,131,1,131,1,131,1,132,1,132,1,132,1,132,1,133,1,133,1,133,1,
-	133,1,134,1,134,1,134,1,134,1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,
-	136,1,137,1,137,1,137,1,137,1,138,1,138,1,138,1,138,1,139,1,139,1,139,1,
-	139,1,139,1,140,1,140,1,140,1,140,1,141,1,141,1,141,1,141,1,142,1,142,1,
-	142,1,142,1,142,1,143,1,143,1,143,1,143,1,144,1,144,1,144,1,144,1,145,1,
-	145,1,145,1,145,1,146,1,146,1,146,1,146,1,147,1,147,1,147,1,147,1,147,1,
-	147,1,148,1,148,1,148,1,148,1,149,1,149,1,149,1,149,1,150,1,150,1,150,1,
-	150,1,151,1,151,1,151,1,151,1,152,1,152,1,152,1,152,1,153,1,153,1,153,1,
-	153,1,154,1,154,1,154,1,154,1,154,1,155,1,155,1,155,1,155,1,156,1,156,1,
-	156,1,156,1,157,1,157,1,157,1,157,1,158,1,158,1,158,1,158,1,159,1,159,1,
-	159,1,159,1,160,1,160,1,160,1,160,1,161,1,161,1,161,1,161,1,161,1,162,1,
-	162,1,162,1,162,1,162,1,163,1,163,1,163,1,163,1,164,1,164,1,164,1,164,1,
-	165,1,165,1,165,1,165,1,166,1,166,1,166,1,166,1,166,1,167,1,167,1,167,1,
-	167,1,167,1,167,1,167,1,167,1,167,1,167,1,168,1,168,1,168,1,168,1,169,1,
-	169,1,169,1,169,1,170,1,170,1,170,1,170,1,171,1,171,1,171,1,171,1,171,1,
-	172,1,172,1,173,1,173,1,173,1,173,1,173,4,173,1343,8,173,11,173,12,173,
-	1344,1,174,1,174,1,174,1,174,1,175,1,175,1,175,1,175,1,176,1,176,1,176,
-	1,176,1,177,1,177,1,177,1,177,1,177,1,178,1,178,1,178,1,178,1,178,1,178,
-	1,179,1,179,1,179,1,179,1,180,1,180,1,180,1,180,1,181,1,181,1,181,1,181,
-	1,182,1,182,1,182,1,182,1,182,1,182,1,183,1,183,1,183,1,183,1,184,1,184,
-	1,184,1,184,1,185,1,185,1,185,1,185,1,186,1,186,1,186,1,186,1,186,1,186,
-	1,187,1,187,1,187,1,187,1,187,1,187,1,188,1,188,1,188,1,188,1,188,1,188,
-	1,189,1,189,1,189,1,189,1,189,2,596,697,0,190,16,1,18,2,20,3,22,4,24,5,
-	26,6,28,7,30,8,32,9,34,10,36,11,38,12,40,13,42,14,44,15,46,16,48,17,50,
-	18,52,19,54,20,56,21,58,22,60,23,62,24,64,0,66,25,68,0,70,0,72,26,74,27,
-	76,28,78,29,80,0,82,0,84,0,86,0,88,0,90,0,92,0,94,0,96,0,98,0,100,30,102,
-	31,104,32,106,33,108,34,110,35,112,36,114,37,116,38,118,39,120,40,122,41,
-	124,42,126,43,128,44,130,45,132,46,134,47,136,48,138,49,140,50,142,51,144,
-	52,146,53,148,54,150,55,152,56,154,57,156,58,158,59,160,60,162,61,164,62,
-	166,63,168,64,170,65,172,66,174,67,176,68,178,69,180,70,182,71,184,0,186,
-	72,188,73,190,74,192,75,194,0,196,0,198,0,200,0,202,0,204,0,206,76,208,
-	0,210,77,212,78,214,79,216,0,218,0,220,0,222,0,224,0,226,80,228,81,230,
-	82,232,83,234,0,236,0,238,0,240,0,242,84,244,0,246,85,248,86,250,87,252,
-	0,254,0,256,88,258,89,260,0,262,90,264,0,266,0,268,91,270,92,272,93,274,
-	0,276,0,278,0,280,0,282,0,284,0,286,0,288,94,290,95,292,96,294,0,296,0,
-	298,0,300,0,302,0,304,97,306,98,308,99,310,0,312,0,314,0,316,0,318,100,
-	320,101,322,102,324,0,326,0,328,0,330,0,332,103,334,104,336,105,338,0,340,
-	106,342,107,344,108,346,109,348,0,350,110,352,111,354,112,356,113,358,0,
-	360,114,362,115,364,116,366,117,368,118,370,0,372,0,374,119,376,120,378,
-	121,380,0,382,122,384,123,386,124,388,0,390,0,392,0,394,0,16,0,1,2,3,4,
-	5,6,7,8,9,10,11,12,13,14,15,35,2,0,68,68,100,100,2,0,73,73,105,105,2,0,
-	83,83,115,115,2,0,69,69,101,101,2,0,67,67,99,99,2,0,84,84,116,116,2,0,82,
-	82,114,114,2,0,79,79,111,111,2,0,80,80,112,112,2,0,78,78,110,110,2,0,72,
-	72,104,104,2,0,86,86,118,118,2,0,65,65,97,97,2,0,76,76,108,108,2,0,88,88,
-	120,120,2,0,70,70,102,102,2,0,77,77,109,109,2,0,71,71,103,103,2,0,75,75,
-	107,107,2,0,85,85,117,117,2,0,87,87,119,119,6,0,9,10,13,13,32,32,47,47,
-	91,91,93,93,2,0,10,10,13,13,3,0,9,10,13,13,32,32,10,0,9,10,13,13,32,32,
-	44,44,47,47,61,61,91,91,93,93,96,96,124,124,2,0,42,42,47,47,1,0,48,57,2,
-	0,65,90,97,122,8,0,34,34,78,78,82,82,84,84,92,92,110,110,114,114,116,116,
-	4,0,10,10,13,13,34,34,92,92,2,0,43,43,45,45,1,0,96,96,2,0,66,66,98,98,2,
-	0,89,89,121,121,11,0,9,10,13,13,32,32,34,35,44,44,47,47,58,58,60,60,62,
-	63,92,92,124,124,1448,0,16,1,0,0,0,0,18,1,0,0,0,0,20,1,0,0,0,0,22,1,0,0,
-	0,0,24,1,0,0,0,0,26,1,0,0,0,0,28,1,0,0,0,0,30,1,0,0,0,0,32,1,0,0,0,0,34,
-	1,0,0,0,0,36,1,0,0,0,0,38,1,0,0,0,0,40,1,0,0,0,0,42,1,0,0,0,0,44,1,0,0,
-	0,0,46,1,0,0,0,0,48,1,0,0,0,0,50,1,0,0,0,0,52,1,0,0,0,0,54,1,0,0,0,0,56,
-	1,0,0,0,0,58,1,0,0,0,0,60,1,0,0,0,0,62,1,0,0,0,0,66,1,0,0,0,1,68,1,0,0,
-	0,1,70,1,0,0,0,1,72,1,0,0,0,1,74,1,0,0,0,1,76,1,0,0,0,2,78,1,0,0,0,2,100,
-	1,0,0,0,2,102,1,0,0,0,2,104,1,0,0,0,2,106,1,0,0,0,2,108,1,0,0,0,2,110,1,
-	0,0,0,2,112,1,0,0,0,2,114,1,0,0,0,2,116,1,0,0,0,2,118,1,0,0,0,2,120,1,0,
-	0,0,2,122,1,0,0,0,2,124,1,0,0,0,2,126,1,0,0,0,2,128,1,0,0,0,2,130,1,0,0,
-	0,2,132,1,0,0,0,2,134,1,0,0,0,2,136,1,0,0,0,2,138,1,0,0,0,2,140,1,0,0,0,
-	2,142,1,0,0,0,2,144,1,0,0,0,2,146,1,0,0,0,2,148,1,0,0,0,2,150,1,0,0,0,2,
-	152,1,0,0,0,2,154,1,0,0,0,2,156,1,0,0,0,2,158,1,0,0,0,2,160,1,0,0,0,2,162,
-	1,0,0,0,2,164,1,0,0,0,2,166,1,0,0,0,2,168,1,0,0,0,2,170,1,0,0,0,2,172,1,
-	0,0,0,2,174,1,0,0,0,2,176,1,0,0,0,2,178,1,0,0,0,2,180,1,0,0,0,2,182,1,0,
-	0,0,2,186,1,0,0,0,2,188,1,0,0,0,2,190,1,0,0,0,2,192,1,0,0,0,3,194,1,0,0,
-	0,3,196,1,0,0,0,3,198,1,0,0,0,3,200,1,0,0,0,3,202,1,0,0,0,3,204,1,0,0,0,
-	3,206,1,0,0,0,3,208,1,0,0,0,3,210,1,0,0,0,3,212,1,0,0,0,3,214,1,0,0,0,4,
-	216,1,0,0,0,4,218,1,0,0,0,4,220,1,0,0,0,4,226,1,0,0,0,4,228,1,0,0,0,4,230,
-	1,0,0,0,4,232,1,0,0,0,5,234,1,0,0,0,5,236,1,0,0,0,5,238,1,0,0,0,5,240,1,
-	0,0,0,5,242,1,0,0,0,5,244,1,0,0,0,5,246,1,0,0,0,5,248,1,0,0,0,5,250,1,0,
-	0,0,6,252,1,0,0,0,6,254,1,0,0,0,6,256,1,0,0,0,6,258,1,0,0,0,6,262,1,0,0,
-	0,6,264,1,0,0,0,6,266,1,0,0,0,6,268,1,0,0,0,6,270,1,0,0,0,6,272,1,0,0,0,
-	7,274,1,0,0,0,7,276,1,0,0,0,7,278,1,0,0,0,7,280,1,0,0,0,7,282,1,0,0,0,7,
-	284,1,0,0,0,7,286,1,0,0,0,7,288,1,0,0,0,7,290,1,0,0,0,7,292,1,0,0,0,8,294,
-	1,0,0,0,8,296,1,0,0,0,8,298,1,0,0,0,8,300,1,0,0,0,8,302,1,0,0,0,8,304,1,
-	0,0,0,8,306,1,0,0,0,8,308,1,0,0,0,9,310,1,0,0,0,9,312,1,0,0,0,9,314,1,0,
-	0,0,9,316,1,0,0,0,9,318,1,0,0,0,9,320,1,0,0,0,9,322,1,0,0,0,10,324,1,0,
-	0,0,10,326,1,0,0,0,10,328,1,0,0,0,10,330,1,0,0,0,10,332,1,0,0,0,10,334,
-	1,0,0,0,10,336,1,0,0,0,11,338,1,0,0,0,11,340,1,0,0,0,11,342,1,0,0,0,11,
-	344,1,0,0,0,11,346,1,0,0,0,12,348,1,0,0,0,12,350,1,0,0,0,12,352,1,0,0,0,
-	12,354,1,0,0,0,12,356,1,0,0,0,13,358,1,0,0,0,13,360,1,0,0,0,13,362,1,0,
-	0,0,13,364,1,0,0,0,13,366,1,0,0,0,13,368,1,0,0,0,14,370,1,0,0,0,14,372,
-	1,0,0,0,14,374,1,0,0,0,14,376,1,0,0,0,14,378,1,0,0,0,15,380,1,0,0,0,15,
-	382,1,0,0,0,15,384,1,0,0,0,15,386,1,0,0,0,15,388,1,0,0,0,15,390,1,0,0,0,
-	15,392,1,0,0,0,15,394,1,0,0,0,16,396,1,0,0,0,18,406,1,0,0,0,20,413,1,0,
-	0,0,22,422,1,0,0,0,24,429,1,0,0,0,26,439,1,0,0,0,28,446,1,0,0,0,30,453,
-	1,0,0,0,32,467,1,0,0,0,34,474,1,0,0,0,36,482,1,0,0,0,38,491,1,0,0,0,40,
-	498,1,0,0,0,42,508,1,0,0,0,44,520,1,0,0,0,46,529,1,0,0,0,48,535,1,0,0,0,
-	50,542,1,0,0,0,52,549,1,0,0,0,54,557,1,0,0,0,56,566,1,0,0,0,58,572,1,0,
-	0,0,60,589,1,0,0,0,62,605,1,0,0,0,64,614,1,0,0,0,66,617,1,0,0,0,68,621,
-	1,0,0,0,70,626,1,0,0,0,72,631,1,0,0,0,74,635,1,0,0,0,76,639,1,0,0,0,78,
-	643,1,0,0,0,80,647,1,0,0,0,82,649,1,0,0,0,84,651,1,0,0,0,86,654,1,0,0,0,
-	88,656,1,0,0,0,90,665,1,0,0,0,92,667,1,0,0,0,94,672,1,0,0,0,96,674,1,0,
-	0,0,98,679,1,0,0,0,100,710,1,0,0,0,102,713,1,0,0,0,104,759,1,0,0,0,106,
-	761,1,0,0,0,108,764,1,0,0,0,110,768,1,0,0,0,112,772,1,0,0,0,114,774,1,0,
-	0,0,116,777,1,0,0,0,118,779,1,0,0,0,120,784,1,0,0,0,122,786,1,0,0,0,124,
-	792,1,0,0,0,126,798,1,0,0,0,128,803,1,0,0,0,130,805,1,0,0,0,132,808,1,0,
-	0,0,134,811,1,0,0,0,136,816,1,0,0,0,138,820,1,0,0,0,140,825,1,0,0,0,142,
-	831,1,0,0,0,144,834,1,0,0,0,146,836,1,0,0,0,148,842,1,0,0,0,150,844,1,0,
-	0,0,152,849,1,0,0,0,154,852,1,0,0,0,156,855,1,0,0,0,158,858,1,0,0,0,160,
-	860,1,0,0,0,162,863,1,0,0,0,164,865,1,0,0,0,166,868,1,0,0,0,168,870,1,0,
-	0,0,170,872,1,0,0,0,172,874,1,0,0,0,174,876,1,0,0,0,176,892,1,0,0,0,178,
-	894,1,0,0,0,180,899,1,0,0,0,182,920,1,0,0,0,184,922,1,0,0,0,186,930,1,0,
-	0,0,188,932,1,0,0,0,190,936,1,0,0,0,192,940,1,0,0,0,194,944,1,0,0,0,196,
-	949,1,0,0,0,198,953,1,0,0,0,200,957,1,0,0,0,202,961,1,0,0,0,204,965,1,0,
-	0,0,206,969,1,0,0,0,208,978,1,0,0,0,210,982,1,0,0,0,212,986,1,0,0,0,214,
-	990,1,0,0,0,216,994,1,0,0,0,218,999,1,0,0,0,220,1003,1,0,0,0,222,1011,1,
-	0,0,0,224,1032,1,0,0,0,226,1036,1,0,0,0,228,1040,1,0,0,0,230,1044,1,0,0,
-	0,232,1048,1,0,0,0,234,1052,1,0,0,0,236,1057,1,0,0,0,238,1061,1,0,0,0,240,
-	1065,1,0,0,0,242,1069,1,0,0,0,244,1072,1,0,0,0,246,1076,1,0,0,0,248,1080,
-	1,0,0,0,250,1084,1,0,0,0,252,1088,1,0,0,0,254,1093,1,0,0,0,256,1098,1,0,
-	0,0,258,1103,1,0,0,0,260,1110,1,0,0,0,262,1119,1,0,0,0,264,1126,1,0,0,0,
-	266,1130,1,0,0,0,268,1134,1,0,0,0,270,1138,1,0,0,0,272,1142,1,0,0,0,274,
-	1146,1,0,0,0,276,1152,1,0,0,0,278,1156,1,0,0,0,280,1160,1,0,0,0,282,1164,
-	1,0,0,0,284,1168,1,0,0,0,286,1172,1,0,0,0,288,1176,1,0,0,0,290,1180,1,0,
-	0,0,292,1184,1,0,0,0,294,1188,1,0,0,0,296,1193,1,0,0,0,298,1197,1,0,0,0,
-	300,1201,1,0,0,0,302,1206,1,0,0,0,304,1210,1,0,0,0,306,1214,1,0,0,0,308,
-	1218,1,0,0,0,310,1222,1,0,0,0,312,1228,1,0,0,0,314,1232,1,0,0,0,316,1236,
-	1,0,0,0,318,1240,1,0,0,0,320,1244,1,0,0,0,322,1248,1,0,0,0,324,1252,1,0,
-	0,0,326,1257,1,0,0,0,328,1261,1,0,0,0,330,1265,1,0,0,0,332,1269,1,0,0,0,
-	334,1273,1,0,0,0,336,1277,1,0,0,0,338,1281,1,0,0,0,340,1286,1,0,0,0,342,
-	1291,1,0,0,0,344,1295,1,0,0,0,346,1299,1,0,0,0,348,1303,1,0,0,0,350,1308,
-	1,0,0,0,352,1318,1,0,0,0,354,1322,1,0,0,0,356,1326,1,0,0,0,358,1330,1,0,
-	0,0,360,1335,1,0,0,0,362,1342,1,0,0,0,364,1346,1,0,0,0,366,1350,1,0,0,0,
-	368,1354,1,0,0,0,370,1358,1,0,0,0,372,1363,1,0,0,0,374,1369,1,0,0,0,376,
-	1373,1,0,0,0,378,1377,1,0,0,0,380,1381,1,0,0,0,382,1387,1,0,0,0,384,1391,
-	1,0,0,0,386,1395,1,0,0,0,388,1399,1,0,0,0,390,1405,1,0,0,0,392,1411,1,0,
-	0,0,394,1417,1,0,0,0,396,397,7,0,0,0,397,398,7,1,0,0,398,399,7,2,0,0,399,
-	400,7,2,0,0,400,401,7,3,0,0,401,402,7,4,0,0,402,403,7,5,0,0,403,404,1,0,
-	0,0,404,405,6,0,0,0,405,17,1,0,0,0,406,407,7,0,0,0,407,408,7,6,0,0,408,
-	409,7,7,0,0,409,410,7,8,0,0,410,411,1,0,0,0,411,412,6,1,1,0,412,19,1,0,
-	0,0,413,414,7,3,0,0,414,415,7,9,0,0,415,416,7,6,0,0,416,417,7,1,0,0,417,
-	418,7,4,0,0,418,419,7,10,0,0,419,420,1,0,0,0,420,421,6,2,2,0,421,21,1,0,
-	0,0,422,423,7,3,0,0,423,424,7,11,0,0,424,425,7,12,0,0,425,426,7,13,0,0,
-	426,427,1,0,0,0,427,428,6,3,0,0,428,23,1,0,0,0,429,430,7,3,0,0,430,431,
-	7,14,0,0,431,432,7,8,0,0,432,433,7,13,0,0,433,434,7,12,0,0,434,435,7,1,
-	0,0,435,436,7,9,0,0,436,437,1,0,0,0,437,438,6,4,3,0,438,25,1,0,0,0,439,
-	440,7,15,0,0,440,441,7,6,0,0,441,442,7,7,0,0,442,443,7,16,0,0,443,444,1,
-	0,0,0,444,445,6,5,4,0,445,27,1,0,0,0,446,447,7,17,0,0,447,448,7,6,0,0,448,
-	449,7,7,0,0,449,450,7,18,0,0,450,451,1,0,0,0,451,452,6,6,0,0,452,29,1,0,
-	0,0,453,454,7,1,0,0,454,455,7,9,0,0,455,456,7,13,0,0,456,457,7,1,0,0,457,
-	458,7,9,0,0,458,459,7,3,0,0,459,460,7,2,0,0,460,461,7,5,0,0,461,462,7,12,
-	0,0,462,463,7,5,0,0,463,464,7,2,0,0,464,465,1,0,0,0,465,466,6,7,0,0,466,
-	31,1,0,0,0,467,468,7,18,0,0,468,469,7,3,0,0,469,470,7,3,0,0,470,471,7,8,
-	0,0,471,472,1,0,0,0,472,473,6,8,1,0,473,33,1,0,0,0,474,475,7,13,0,0,475,
-	476,7,1,0,0,476,477,7,16,0,0,477,478,7,1,0,0,478,479,7,5,0,0,479,480,1,
-	0,0,0,480,481,6,9,0,0,481,35,1,0,0,0,482,483,7,13,0,0,483,484,7,7,0,0,484,
-	485,7,7,0,0,485,486,7,18,0,0,486,487,7,19,0,0,487,488,7,8,0,0,488,489,1,
-	0,0,0,489,490,6,10,5,0,490,37,1,0,0,0,491,492,7,16,0,0,492,493,7,3,0,0,
-	493,494,7,5,0,0,494,495,7,12,0,0,495,496,1,0,0,0,496,497,6,11,6,0,497,39,
-	1,0,0,0,498,499,7,16,0,0,499,500,7,3,0,0,500,501,7,5,0,0,501,502,7,6,0,
-	0,502,503,7,1,0,0,503,504,7,4,0,0,504,505,7,2,0,0,505,506,1,0,0,0,506,507,
-	6,12,7,0,507,41,1,0,0,0,508,509,7,16,0,0,509,510,7,11,0,0,510,511,5,95,
-	0,0,511,512,7,3,0,0,512,513,7,14,0,0,513,514,7,8,0,0,514,515,7,12,0,0,515,
-	516,7,9,0,0,516,517,7,0,0,0,517,518,1,0,0,0,518,519,6,13,8,0,519,43,1,0,
-	0,0,520,521,7,6,0,0,521,522,7,3,0,0,522,523,7,9,0,0,523,524,7,12,0,0,524,
-	525,7,16,0,0,525,526,7,3,0,0,526,527,1,0,0,0,527,528,6,14,9,0,528,45,1,
-	0,0,0,529,530,7,6,0,0,530,531,7,7,0,0,531,532,7,20,0,0,532,533,1,0,0,0,
-	533,534,6,15,0,0,534,47,1,0,0,0,535,536,7,2,0,0,536,537,7,10,0,0,537,538,
-	7,7,0,0,538,539,7,20,0,0,539,540,1,0,0,0,540,541,6,16,10,0,541,49,1,0,0,
-	0,542,543,7,2,0,0,543,544,7,7,0,0,544,545,7,6,0,0,545,546,7,5,0,0,546,547,
-	1,0,0,0,547,548,6,17,0,0,548,51,1,0,0,0,549,550,7,2,0,0,550,551,7,5,0,0,
-	551,552,7,12,0,0,552,553,7,5,0,0,553,554,7,2,0,0,554,555,1,0,0,0,555,556,
-	6,18,0,0,556,53,1,0,0,0,557,558,7,20,0,0,558,559,7,10,0,0,559,560,7,3,0,
-	0,560,561,7,6,0,0,561,562,7,3,0,0,562,563,1,0,0,0,563,564,6,19,0,0,564,
-	55,1,0,0,0,565,567,8,21,0,0,566,565,1,0,0,0,567,568,1,0,0,0,568,566,1,0,
-	0,0,568,569,1,0,0,0,569,570,1,0,0,0,570,571,6,20,0,0,571,57,1,0,0,0,572,
-	573,5,47,0,0,573,574,5,47,0,0,574,578,1,0,0,0,575,577,8,22,0,0,576,575,
-	1,0,0,0,577,580,1,0,0,0,578,576,1,0,0,0,578,579,1,0,0,0,579,582,1,0,0,0,
-	580,578,1,0,0,0,581,583,5,13,0,0,582,581,1,0,0,0,582,583,1,0,0,0,583,585,
-	1,0,0,0,584,586,5,10,0,0,585,584,1,0,0,0,585,586,1,0,0,0,586,587,1,0,0,
-	0,587,588,6,21,11,0,588,59,1,0,0,0,589,590,5,47,0,0,590,591,5,42,0,0,591,
-	596,1,0,0,0,592,595,3,60,22,0,593,595,9,0,0,0,594,592,1,0,0,0,594,593,1,
-	0,0,0,595,598,1,0,0,0,596,597,1,0,0,0,596,594,1,0,0,0,597,599,1,0,0,0,598,
-	596,1,0,0,0,599,600,5,42,0,0,600,601,5,47,0,0,601,602,1,0,0,0,602,603,6,
-	22,11,0,603,61,1,0,0,0,604,606,7,23,0,0,605,604,1,0,0,0,606,607,1,0,0,0,
-	607,605,1,0,0,0,607,608,1,0,0,0,608,609,1,0,0,0,609,610,6,23,11,0,610,63,
-	1,0,0,0,611,615,8,24,0,0,612,613,5,47,0,0,613,615,8,25,0,0,614,611,1,0,
-	0,0,614,612,1,0,0,0,615,65,1,0,0,0,616,618,3,64,24,0,617,616,1,0,0,0,618,
-	619,1,0,0,0,619,617,1,0,0,0,619,620,1,0,0,0,620,67,1,0,0,0,621,622,3,178,
-	81,0,622,623,1,0,0,0,623,624,6,26,12,0,624,625,6,26,13,0,625,69,1,0,0,0,
-	626,627,3,78,31,0,627,628,1,0,0,0,628,629,6,27,14,0,629,630,6,27,15,0,630,
-	71,1,0,0,0,631,632,3,62,23,0,632,633,1,0,0,0,633,634,6,28,11,0,634,73,1,
-	0,0,0,635,636,3,58,21,0,636,637,1,0,0,0,637,638,6,29,11,0,638,75,1,0,0,
-	0,639,640,3,60,22,0,640,641,1,0,0,0,641,642,6,30,11,0,642,77,1,0,0,0,643,
-	644,5,124,0,0,644,645,1,0,0,0,645,646,6,31,15,0,646,79,1,0,0,0,647,648,
-	7,26,0,0,648,81,1,0,0,0,649,650,7,27,0,0,650,83,1,0,0,0,651,652,5,92,0,
-	0,652,653,7,28,0,0,653,85,1,0,0,0,654,655,8,29,0,0,655,87,1,0,0,0,656,658,
-	7,3,0,0,657,659,7,30,0,0,658,657,1,0,0,0,658,659,1,0,0,0,659,661,1,0,0,
-	0,660,662,3,80,32,0,661,660,1,0,0,0,662,663,1,0,0,0,663,661,1,0,0,0,663,
-	664,1,0,0,0,664,89,1,0,0,0,665,666,5,64,0,0,666,91,1,0,0,0,667,668,5,96,
-	0,0,668,93,1,0,0,0,669,673,8,31,0,0,670,671,5,96,0,0,671,673,5,96,0,0,672,
-	669,1,0,0,0,672,670,1,0,0,0,673,95,1,0,0,0,674,675,5,95,0,0,675,97,1,0,
-	0,0,676,680,3,82,33,0,677,680,3,80,32,0,678,680,3,96,40,0,679,676,1,0,0,
-	0,679,677,1,0,0,0,679,678,1,0,0,0,680,99,1,0,0,0,681,686,5,34,0,0,682,685,
-	3,84,34,0,683,685,3,86,35,0,684,682,1,0,0,0,684,683,1,0,0,0,685,688,1,0,
-	0,0,686,684,1,0,0,0,686,687,1,0,0,0,687,689,1,0,0,0,688,686,1,0,0,0,689,
-	711,5,34,0,0,690,691,5,34,0,0,691,692,5,34,0,0,692,693,5,34,0,0,693,697,
-	1,0,0,0,694,696,8,22,0,0,695,694,1,0,0,0,696,699,1,0,0,0,697,698,1,0,0,
-	0,697,695,1,0,0,0,698,700,1,0,0,0,699,697,1,0,0,0,700,701,5,34,0,0,701,
-	702,5,34,0,0,702,703,5,34,0,0,703,705,1,0,0,0,704,706,5,34,0,0,705,704,
-	1,0,0,0,705,706,1,0,0,0,706,708,1,0,0,0,707,709,5,34,0,0,708,707,1,0,0,
-	0,708,709,1,0,0,0,709,711,1,0,0,0,710,681,1,0,0,0,710,690,1,0,0,0,711,101,
-	1,0,0,0,712,714,3,80,32,0,713,712,1,0,0,0,714,715,1,0,0,0,715,713,1,0,0,
-	0,715,716,1,0,0,0,716,103,1,0,0,0,717,719,3,80,32,0,718,717,1,0,0,0,719,
-	720,1,0,0,0,720,718,1,0,0,0,720,721,1,0,0,0,721,722,1,0,0,0,722,726,3,120,
-	52,0,723,725,3,80,32,0,724,723,1,0,0,0,725,728,1,0,0,0,726,724,1,0,0,0,
-	726,727,1,0,0,0,727,760,1,0,0,0,728,726,1,0,0,0,729,731,3,120,52,0,730,
-	732,3,80,32,0,731,730,1,0,0,0,732,733,1,0,0,0,733,731,1,0,0,0,733,734,1,
-	0,0,0,734,760,1,0,0,0,735,737,3,80,32,0,736,735,1,0,0,0,737,738,1,0,0,0,
-	738,736,1,0,0,0,738,739,1,0,0,0,739,747,1,0,0,0,740,744,3,120,52,0,741,
-	743,3,80,32,0,742,741,1,0,0,0,743,746,1,0,0,0,744,742,1,0,0,0,744,745,1,
-	0,0,0,745,748,1,0,0,0,746,744,1,0,0,0,747,740,1,0,0,0,747,748,1,0,0,0,748,
-	749,1,0,0,0,749,750,3,88,36,0,750,760,1,0,0,0,751,753,3,120,52,0,752,754,
-	3,80,32,0,753,752,1,0,0,0,754,755,1,0,0,0,755,753,1,0,0,0,755,756,1,0,0,
-	0,756,757,1,0,0,0,757,758,3,88,36,0,758,760,1,0,0,0,759,718,1,0,0,0,759,
-	729,1,0,0,0,759,736,1,0,0,0,759,751,1,0,0,0,760,105,1,0,0,0,761,762,7,32,
-	0,0,762,763,7,33,0,0,763,107,1,0,0,0,764,765,7,12,0,0,765,766,7,9,0,0,766,
-	767,7,0,0,0,767,109,1,0,0,0,768,769,7,12,0,0,769,770,7,2,0,0,770,771,7,
-	4,0,0,771,111,1,0,0,0,772,773,5,61,0,0,773,113,1,0,0,0,774,775,5,58,0,0,
-	775,776,5,58,0,0,776,115,1,0,0,0,777,778,5,44,0,0,778,117,1,0,0,0,779,780,
-	7,0,0,0,780,781,7,3,0,0,781,782,7,2,0,0,782,783,7,4,0,0,783,119,1,0,0,0,
-	784,785,5,46,0,0,785,121,1,0,0,0,786,787,7,15,0,0,787,788,7,12,0,0,788,
-	789,7,13,0,0,789,790,7,2,0,0,790,791,7,3,0,0,791,123,1,0,0,0,792,793,7,
-	15,0,0,793,794,7,1,0,0,794,795,7,6,0,0,795,796,7,2,0,0,796,797,7,5,0,0,
-	797,125,1,0,0,0,798,799,7,13,0,0,799,800,7,12,0,0,800,801,7,2,0,0,801,802,
-	7,5,0,0,802,127,1,0,0,0,803,804,5,40,0,0,804,129,1,0,0,0,805,806,7,1,0,
-	0,806,807,7,9,0,0,807,131,1,0,0,0,808,809,7,1,0,0,809,810,7,2,0,0,810,133,
-	1,0,0,0,811,812,7,13,0,0,812,813,7,1,0,0,813,814,7,18,0,0,814,815,7,3,0,
-	0,815,135,1,0,0,0,816,817,7,9,0,0,817,818,7,7,0,0,818,819,7,5,0,0,819,137,
-	1,0,0,0,820,821,7,9,0,0,821,822,7,19,0,0,822,823,7,13,0,0,823,824,7,13,
-	0,0,824,139,1,0,0,0,825,826,7,9,0,0,826,827,7,19,0,0,827,828,7,13,0,0,828,
-	829,7,13,0,0,829,830,7,2,0,0,830,141,1,0,0,0,831,832,7,7,0,0,832,833,7,
-	6,0,0,833,143,1,0,0,0,834,835,5,63,0,0,835,145,1,0,0,0,836,837,7,6,0,0,
-	837,838,7,13,0,0,838,839,7,1,0,0,839,840,7,18,0,0,840,841,7,3,0,0,841,147,
-	1,0,0,0,842,843,5,41,0,0,843,149,1,0,0,0,844,845,7,5,0,0,845,846,7,6,0,
-	0,846,847,7,19,0,0,847,848,7,3,0,0,848,151,1,0,0,0,849,850,5,61,0,0,850,
-	851,5,61,0,0,851,153,1,0,0,0,852,853,5,61,0,0,853,854,5,126,0,0,854,155,
-	1,0,0,0,855,856,5,33,0,0,856,857,5,61,0,0,857,157,1,0,0,0,858,859,5,60,
-	0,0,859,159,1,0,0,0,860,861,5,60,0,0,861,862,5,61,0,0,862,161,1,0,0,0,863,
-	864,5,62,0,0,864,163,1,0,0,0,865,866,5,62,0,0,866,867,5,61,0,0,867,165,
-	1,0,0,0,868,869,5,43,0,0,869,167,1,0,0,0,870,871,5,45,0,0,871,169,1,0,0,
-	0,872,873,5,42,0,0,873,171,1,0,0,0,874,875,5,47,0,0,875,173,1,0,0,0,876,
-	877,5,37,0,0,877,175,1,0,0,0,878,879,3,144,64,0,879,883,3,82,33,0,880,882,
-	3,98,41,0,881,880,1,0,0,0,882,885,1,0,0,0,883,881,1,0,0,0,883,884,1,0,0,
-	0,884,893,1,0,0,0,885,883,1,0,0,0,886,888,3,144,64,0,887,889,3,80,32,0,
-	888,887,1,0,0,0,889,890,1,0,0,0,890,888,1,0,0,0,890,891,1,0,0,0,891,893,
-	1,0,0,0,892,878,1,0,0,0,892,886,1,0,0,0,893,177,1,0,0,0,894,895,5,91,0,
-	0,895,896,1,0,0,0,896,897,6,81,0,0,897,898,6,81,0,0,898,179,1,0,0,0,899,
-	900,5,93,0,0,900,901,1,0,0,0,901,902,6,82,15,0,902,903,6,82,15,0,903,181,
-	1,0,0,0,904,908,3,82,33,0,905,907,3,98,41,0,906,905,1,0,0,0,907,910,1,0,
-	0,0,908,906,1,0,0,0,908,909,1,0,0,0,909,921,1,0,0,0,910,908,1,0,0,0,911,
-	914,3,96,40,0,912,914,3,90,37,0,913,911,1,0,0,0,913,912,1,0,0,0,914,916,
-	1,0,0,0,915,917,3,98,41,0,916,915,1,0,0,0,917,918,1,0,0,0,918,916,1,0,0,
-	0,918,919,1,0,0,0,919,921,1,0,0,0,920,904,1,0,0,0,920,913,1,0,0,0,921,183,
-	1,0,0,0,922,924,3,92,38,0,923,925,3,94,39,0,924,923,1,0,0,0,925,926,1,0,
-	0,0,926,924,1,0,0,0,926,927,1,0,0,0,927,928,1,0,0,0,928,929,3,92,38,0,929,
-	185,1,0,0,0,930,931,3,184,84,0,931,187,1,0,0,0,932,933,3,58,21,0,933,934,
-	1,0,0,0,934,935,6,86,11,0,935,189,1,0,0,0,936,937,3,60,22,0,937,938,1,0,
-	0,0,938,939,6,87,11,0,939,191,1,0,0,0,940,941,3,62,23,0,941,942,1,0,0,0,
-	942,943,6,88,11,0,943,193,1,0,0,0,944,945,3,78,31,0,945,946,1,0,0,0,946,
-	947,6,89,14,0,947,948,6,89,15,0,948,195,1,0,0,0,949,950,3,178,81,0,950,
-	951,1,0,0,0,951,952,6,90,12,0,952,197,1,0,0,0,953,954,3,180,82,0,954,955,
-	1,0,0,0,955,956,6,91,16,0,956,199,1,0,0,0,957,958,3,116,50,0,958,959,1,
-	0,0,0,959,960,6,92,17,0,960,201,1,0,0,0,961,962,3,112,48,0,962,963,1,0,
-	0,0,963,964,6,93,18,0,964,203,1,0,0,0,965,966,3,100,42,0,966,967,1,0,0,
-	0,967,968,6,94,19,0,968,205,1,0,0,0,969,970,7,16,0,0,970,971,7,3,0,0,971,
-	972,7,5,0,0,972,973,7,12,0,0,973,974,7,0,0,0,974,975,7,12,0,0,975,976,7,
-	5,0,0,976,977,7,12,0,0,977,207,1,0,0,0,978,979,3,66,25,0,979,980,1,0,0,
-	0,980,981,6,96,20,0,981,209,1,0,0,0,982,983,3,58,21,0,983,984,1,0,0,0,984,
-	985,6,97,11,0,985,211,1,0,0,0,986,987,3,60,22,0,987,988,1,0,0,0,988,989,
-	6,98,11,0,989,213,1,0,0,0,990,991,3,62,23,0,991,992,1,0,0,0,992,993,6,99,
-	11,0,993,215,1,0,0,0,994,995,3,78,31,0,995,996,1,0,0,0,996,997,6,100,14,
-	0,997,998,6,100,15,0,998,217,1,0,0,0,999,1000,3,120,52,0,1000,1001,1,0,
-	0,0,1001,1002,6,101,21,0,1002,219,1,0,0,0,1003,1004,3,116,50,0,1004,1005,
-	1,0,0,0,1005,1006,6,102,17,0,1006,221,1,0,0,0,1007,1012,3,82,33,0,1008,
-	1012,3,80,32,0,1009,1012,3,96,40,0,1010,1012,3,170,77,0,1011,1007,1,0,0,
-	0,1011,1008,1,0,0,0,1011,1009,1,0,0,0,1011,1010,1,0,0,0,1012,223,1,0,0,
-	0,1013,1016,3,82,33,0,1014,1016,3,170,77,0,1015,1013,1,0,0,0,1015,1014,
-	1,0,0,0,1016,1020,1,0,0,0,1017,1019,3,222,103,0,1018,1017,1,0,0,0,1019,
-	1022,1,0,0,0,1020,1018,1,0,0,0,1020,1021,1,0,0,0,1021,1033,1,0,0,0,1022,
-	1020,1,0,0,0,1023,1026,3,96,40,0,1024,1026,3,90,37,0,1025,1023,1,0,0,0,
-	1025,1024,1,0,0,0,1026,1028,1,0,0,0,1027,1029,3,222,103,0,1028,1027,1,0,
-	0,0,1029,1030,1,0,0,0,1030,1028,1,0,0,0,1030,1031,1,0,0,0,1031,1033,1,0,
-	0,0,1032,1015,1,0,0,0,1032,1025,1,0,0,0,1033,225,1,0,0,0,1034,1037,3,224,
-	104,0,1035,1037,3,184,84,0,1036,1034,1,0,0,0,1036,1035,1,0,0,0,1037,1038,
-	1,0,0,0,1038,1036,1,0,0,0,1038,1039,1,0,0,0,1039,227,1,0,0,0,1040,1041,
-	3,58,21,0,1041,1042,1,0,0,0,1042,1043,6,106,11,0,1043,229,1,0,0,0,1044,
-	1045,3,60,22,0,1045,1046,1,0,0,0,1046,1047,6,107,11,0,1047,231,1,0,0,0,
-	1048,1049,3,62,23,0,1049,1050,1,0,0,0,1050,1051,6,108,11,0,1051,233,1,0,
-	0,0,1052,1053,3,78,31,0,1053,1054,1,0,0,0,1054,1055,6,109,14,0,1055,1056,
-	6,109,15,0,1056,235,1,0,0,0,1057,1058,3,112,48,0,1058,1059,1,0,0,0,1059,
-	1060,6,110,18,0,1060,237,1,0,0,0,1061,1062,3,116,50,0,1062,1063,1,0,0,0,
-	1063,1064,6,111,17,0,1064,239,1,0,0,0,1065,1066,3,120,52,0,1066,1067,1,
-	0,0,0,1067,1068,6,112,21,0,1068,241,1,0,0,0,1069,1070,7,12,0,0,1070,1071,
-	7,2,0,0,1071,243,1,0,0,0,1072,1073,3,226,105,0,1073,1074,1,0,0,0,1074,1075,
-	6,114,22,0,1075,245,1,0,0,0,1076,1077,3,58,21,0,1077,1078,1,0,0,0,1078,
-	1079,6,115,11,0,1079,247,1,0,0,0,1080,1081,3,60,22,0,1081,1082,1,0,0,0,
-	1082,1083,6,116,11,0,1083,249,1,0,0,0,1084,1085,3,62,23,0,1085,1086,1,0,
-	0,0,1086,1087,6,117,11,0,1087,251,1,0,0,0,1088,1089,3,78,31,0,1089,1090,
-	1,0,0,0,1090,1091,6,118,14,0,1091,1092,6,118,15,0,1092,253,1,0,0,0,1093,
-	1094,3,178,81,0,1094,1095,1,0,0,0,1095,1096,6,119,12,0,1096,1097,6,119,
-	23,0,1097,255,1,0,0,0,1098,1099,7,7,0,0,1099,1100,7,9,0,0,1100,1101,1,0,
-	0,0,1101,1102,6,120,24,0,1102,257,1,0,0,0,1103,1104,7,20,0,0,1104,1105,
-	7,1,0,0,1105,1106,7,5,0,0,1106,1107,7,10,0,0,1107,1108,1,0,0,0,1108,1109,
-	6,121,24,0,1109,259,1,0,0,0,1110,1111,8,34,0,0,1111,261,1,0,0,0,1112,1114,
-	3,260,122,0,1113,1112,1,0,0,0,1114,1115,1,0,0,0,1115,1113,1,0,0,0,1115,
-	1116,1,0,0,0,1116,1117,1,0,0,0,1117,1118,3,360,172,0,1118,1120,1,0,0,0,
-	1119,1113,1,0,0,0,1119,1120,1,0,0,0,1120,1122,1,0,0,0,1121,1123,3,260,122,
-	0,1122,1121,1,0,0,0,1123,1124,1,0,0,0,1124,1122,1,0,0,0,1124,1125,1,0,0,
-	0,1125,263,1,0,0,0,1126,1127,3,186,85,0,1127,1128,1,0,0,0,1128,1129,6,124,
-	25,0,1129,265,1,0,0,0,1130,1131,3,262,123,0,1131,1132,1,0,0,0,1132,1133,
-	6,125,26,0,1133,267,1,0,0,0,1134,1135,3,58,21,0,1135,1136,1,0,0,0,1136,
-	1137,6,126,11,0,1137,269,1,0,0,0,1138,1139,3,60,22,0,1139,1140,1,0,0,0,
-	1140,1141,6,127,11,0,1141,271,1,0,0,0,1142,1143,3,62,23,0,1143,1144,1,0,
-	0,0,1144,1145,6,128,11,0,1145,273,1,0,0,0,1146,1147,3,78,31,0,1147,1148,
-	1,0,0,0,1148,1149,6,129,14,0,1149,1150,6,129,15,0,1150,1151,6,129,15,0,
-	1151,275,1,0,0,0,1152,1153,3,112,48,0,1153,1154,1,0,0,0,1154,1155,6,130,
-	18,0,1155,277,1,0,0,0,1156,1157,3,116,50,0,1157,1158,1,0,0,0,1158,1159,
-	6,131,17,0,1159,279,1,0,0,0,1160,1161,3,120,52,0,1161,1162,1,0,0,0,1162,
-	1163,6,132,21,0,1163,281,1,0,0,0,1164,1165,3,258,121,0,1165,1166,1,0,0,
-	0,1166,1167,6,133,27,0,1167,283,1,0,0,0,1168,1169,3,226,105,0,1169,1170,
-	1,0,0,0,1170,1171,6,134,22,0,1171,285,1,0,0,0,1172,1173,3,186,85,0,1173,
-	1174,1,0,0,0,1174,1175,6,135,25,0,1175,287,1,0,0,0,1176,1177,3,58,21,0,
-	1177,1178,1,0,0,0,1178,1179,6,136,11,0,1179,289,1,0,0,0,1180,1181,3,60,
-	22,0,1181,1182,1,0,0,0,1182,1183,6,137,11,0,1183,291,1,0,0,0,1184,1185,
-	3,62,23,0,1185,1186,1,0,0,0,1186,1187,6,138,11,0,1187,293,1,0,0,0,1188,
-	1189,3,78,31,0,1189,1190,1,0,0,0,1190,1191,6,139,14,0,1191,1192,6,139,15,
-	0,1192,295,1,0,0,0,1193,1194,3,116,50,0,1194,1195,1,0,0,0,1195,1196,6,140,
-	17,0,1196,297,1,0,0,0,1197,1198,3,120,52,0,1198,1199,1,0,0,0,1199,1200,
-	6,141,21,0,1200,299,1,0,0,0,1201,1202,3,256,120,0,1202,1203,1,0,0,0,1203,
-	1204,6,142,28,0,1204,1205,6,142,29,0,1205,301,1,0,0,0,1206,1207,3,66,25,
-	0,1207,1208,1,0,0,0,1208,1209,6,143,20,0,1209,303,1,0,0,0,1210,1211,3,58,
-	21,0,1211,1212,1,0,0,0,1212,1213,6,144,11,0,1213,305,1,0,0,0,1214,1215,
-	3,60,22,0,1215,1216,1,0,0,0,1216,1217,6,145,11,0,1217,307,1,0,0,0,1218,
-	1219,3,62,23,0,1219,1220,1,0,0,0,1220,1221,6,146,11,0,1221,309,1,0,0,0,
-	1222,1223,3,78,31,0,1223,1224,1,0,0,0,1224,1225,6,147,14,0,1225,1226,6,
-	147,15,0,1226,1227,6,147,15,0,1227,311,1,0,0,0,1228,1229,3,116,50,0,1229,
-	1230,1,0,0,0,1230,1231,6,148,17,0,1231,313,1,0,0,0,1232,1233,3,120,52,0,
-	1233,1234,1,0,0,0,1234,1235,6,149,21,0,1235,315,1,0,0,0,1236,1237,3,226,
-	105,0,1237,1238,1,0,0,0,1238,1239,6,150,22,0,1239,317,1,0,0,0,1240,1241,
-	3,58,21,0,1241,1242,1,0,0,0,1242,1243,6,151,11,0,1243,319,1,0,0,0,1244,
-	1245,3,60,22,0,1245,1246,1,0,0,0,1246,1247,6,152,11,0,1247,321,1,0,0,0,
-	1248,1249,3,62,23,0,1249,1250,1,0,0,0,1250,1251,6,153,11,0,1251,323,1,0,
-	0,0,1252,1253,3,78,31,0,1253,1254,1,0,0,0,1254,1255,6,154,14,0,1255,1256,
-	6,154,15,0,1256,325,1,0,0,0,1257,1258,3,120,52,0,1258,1259,1,0,0,0,1259,
-	1260,6,155,21,0,1260,327,1,0,0,0,1261,1262,3,186,85,0,1262,1263,1,0,0,0,
-	1263,1264,6,156,25,0,1264,329,1,0,0,0,1265,1266,3,182,83,0,1266,1267,1,
-	0,0,0,1267,1268,6,157,30,0,1268,331,1,0,0,0,1269,1270,3,58,21,0,1270,1271,
-	1,0,0,0,1271,1272,6,158,11,0,1272,333,1,0,0,0,1273,1274,3,60,22,0,1274,
-	1275,1,0,0,0,1275,1276,6,159,11,0,1276,335,1,0,0,0,1277,1278,3,62,23,0,
-	1278,1279,1,0,0,0,1279,1280,6,160,11,0,1280,337,1,0,0,0,1281,1282,3,78,
-	31,0,1282,1283,1,0,0,0,1283,1284,6,161,14,0,1284,1285,6,161,15,0,1285,339,
-	1,0,0,0,1286,1287,7,1,0,0,1287,1288,7,9,0,0,1288,1289,7,15,0,0,1289,1290,
-	7,7,0,0,1290,341,1,0,0,0,1291,1292,3,58,21,0,1292,1293,1,0,0,0,1293,1294,
-	6,163,11,0,1294,343,1,0,0,0,1295,1296,3,60,22,0,1296,1297,1,0,0,0,1297,
-	1298,6,164,11,0,1298,345,1,0,0,0,1299,1300,3,62,23,0,1300,1301,1,0,0,0,
-	1301,1302,6,165,11,0,1302,347,1,0,0,0,1303,1304,3,78,31,0,1304,1305,1,0,
-	0,0,1305,1306,6,166,14,0,1306,1307,6,166,15,0,1307,349,1,0,0,0,1308,1309,
-	7,15,0,0,1309,1310,7,19,0,0,1310,1311,7,9,0,0,1311,1312,7,4,0,0,1312,1313,
-	7,5,0,0,1313,1314,7,1,0,0,1314,1315,7,7,0,0,1315,1316,7,9,0,0,1316,1317,
-	7,2,0,0,1317,351,1,0,0,0,1318,1319,3,58,21,0,1319,1320,1,0,0,0,1320,1321,
-	6,168,11,0,1321,353,1,0,0,0,1322,1323,3,60,22,0,1323,1324,1,0,0,0,1324,
-	1325,6,169,11,0,1325,355,1,0,0,0,1326,1327,3,62,23,0,1327,1328,1,0,0,0,
-	1328,1329,6,170,11,0,1329,357,1,0,0,0,1330,1331,3,180,82,0,1331,1332,1,
-	0,0,0,1332,1333,6,171,16,0,1333,1334,6,171,15,0,1334,359,1,0,0,0,1335,1336,
-	5,58,0,0,1336,361,1,0,0,0,1337,1343,3,90,37,0,1338,1343,3,80,32,0,1339,
-	1343,3,120,52,0,1340,1343,3,82,33,0,1341,1343,3,96,40,0,1342,1337,1,0,0,
-	0,1342,1338,1,0,0,0,1342,1339,1,0,0,0,1342,1340,1,0,0,0,1342,1341,1,0,0,
-	0,1343,1344,1,0,0,0,1344,1342,1,0,0,0,1344,1345,1,0,0,0,1345,363,1,0,0,
-	0,1346,1347,3,58,21,0,1347,1348,1,0,0,0,1348,1349,6,174,11,0,1349,365,1,
-	0,0,0,1350,1351,3,60,22,0,1351,1352,1,0,0,0,1352,1353,6,175,11,0,1353,367,
-	1,0,0,0,1354,1355,3,62,23,0,1355,1356,1,0,0,0,1356,1357,6,176,11,0,1357,
-	369,1,0,0,0,1358,1359,3,78,31,0,1359,1360,1,0,0,0,1360,1361,6,177,14,0,
-	1361,1362,6,177,15,0,1362,371,1,0,0,0,1363,1364,3,66,25,0,1364,1365,1,0,
-	0,0,1365,1366,6,178,20,0,1366,1367,6,178,15,0,1367,1368,6,178,31,0,1368,
-	373,1,0,0,0,1369,1370,3,58,21,0,1370,1371,1,0,0,0,1371,1372,6,179,11,0,
-	1372,375,1,0,0,0,1373,1374,3,60,22,0,1374,1375,1,0,0,0,1375,1376,6,180,
-	11,0,1376,377,1,0,0,0,1377,1378,3,62,23,0,1378,1379,1,0,0,0,1379,1380,6,
-	181,11,0,1380,379,1,0,0,0,1381,1382,3,116,50,0,1382,1383,1,0,0,0,1383,1384,
-	6,182,17,0,1384,1385,6,182,15,0,1385,1386,6,182,7,0,1386,381,1,0,0,0,1387,
-	1388,3,58,21,0,1388,1389,1,0,0,0,1389,1390,6,183,11,0,1390,383,1,0,0,0,
-	1391,1392,3,60,22,0,1392,1393,1,0,0,0,1393,1394,6,184,11,0,1394,385,1,0,
-	0,0,1395,1396,3,62,23,0,1396,1397,1,0,0,0,1397,1398,6,185,11,0,1398,387,
-	1,0,0,0,1399,1400,3,186,85,0,1400,1401,1,0,0,0,1401,1402,6,186,15,0,1402,
-	1403,6,186,0,0,1403,1404,6,186,25,0,1404,389,1,0,0,0,1405,1406,3,182,83,
-	0,1406,1407,1,0,0,0,1407,1408,6,187,15,0,1408,1409,6,187,0,0,1409,1410,
-	6,187,30,0,1410,391,1,0,0,0,1411,1412,3,106,45,0,1412,1413,1,0,0,0,1413,
-	1414,6,188,15,0,1414,1415,6,188,0,0,1415,1416,6,188,32,0,1416,393,1,0,0,
-	0,1417,1418,3,78,31,0,1418,1419,1,0,0,0,1419,1420,6,189,14,0,1420,1421,
-	6,189,15,0,1421,395,1,0,0,0,65,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,568,
-	578,582,585,594,596,607,614,619,658,663,672,679,684,686,697,705,708,710,
-	715,720,726,733,738,744,747,755,759,883,890,892,908,913,918,920,926,1011,
-	1015,1020,1025,1030,1032,1036,1038,1115,1119,1124,1342,1344,33,5,2,0,5,
+	2,187,7,187,2,188,7,188,2,189,7,189,2,190,7,190,2,191,7,191,2,192,7,192,
+	2,193,7,193,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,
+	1,1,1,1,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,
+	1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,1,6,
+	1,6,1,6,1,6,1,6,1,6,1,6,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,1,7,
+	1,7,1,7,1,8,1,8,1,8,1,8,1,8,1,8,1,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,10,
+	1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,10,1,11,1,11,1,11,1,11,1,11,1,11,1,
+	11,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,12,1,13,1,13,1,13,1,13,
+	1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,13,1,14,1,14,1,14,1,14,1,14,1,14,1,
+	14,1,14,1,14,1,15,1,15,1,15,1,15,1,15,1,15,1,16,1,16,1,16,1,16,1,16,1,16,
+	1,16,1,17,1,17,1,17,1,17,1,17,1,17,1,17,1,18,1,18,1,18,1,18,1,18,1,18,1,
+	18,1,18,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,19,1,20,4,20,575,8,20,11,20,
+	12,20,576,1,20,1,20,1,21,1,21,1,21,1,21,5,21,585,8,21,10,21,12,21,588,9,
+	21,1,21,3,21,591,8,21,1,21,3,21,594,8,21,1,21,1,21,1,22,1,22,1,22,1,22,
+	1,22,5,22,603,8,22,10,22,12,22,606,9,22,1,22,1,22,1,22,1,22,1,22,1,23,4,
+	23,614,8,23,11,23,12,23,615,1,23,1,23,1,24,1,24,1,24,3,24,623,8,24,1,25,
+	4,25,626,8,25,11,25,12,25,627,1,26,1,26,1,26,1,26,1,26,1,27,1,27,1,27,1,
+	27,1,27,1,28,1,28,1,28,1,28,1,29,1,29,1,29,1,29,1,30,1,30,1,30,1,30,1,31,
+	1,31,1,31,1,31,1,32,1,32,1,33,1,33,1,34,1,34,1,34,1,35,1,35,1,36,1,36,3,
+	36,667,8,36,1,36,4,36,670,8,36,11,36,12,36,671,1,37,1,37,1,38,1,38,1,39,
+	1,39,1,39,3,39,681,8,39,1,40,1,40,1,41,1,41,1,41,3,41,688,8,41,1,42,1,42,
+	1,42,5,42,693,8,42,10,42,12,42,696,9,42,1,42,1,42,1,42,1,42,1,42,1,42,5,
+	42,704,8,42,10,42,12,42,707,9,42,1,42,1,42,1,42,1,42,1,42,3,42,714,8,42,
+	1,42,3,42,717,8,42,3,42,719,8,42,1,43,4,43,722,8,43,11,43,12,43,723,1,44,
+	4,44,727,8,44,11,44,12,44,728,1,44,1,44,5,44,733,8,44,10,44,12,44,736,9,
+	44,1,44,1,44,4,44,740,8,44,11,44,12,44,741,1,44,4,44,745,8,44,11,44,12,
+	44,746,1,44,1,44,5,44,751,8,44,10,44,12,44,754,9,44,3,44,756,8,44,1,44,
+	1,44,1,44,1,44,4,44,762,8,44,11,44,12,44,763,1,44,1,44,3,44,768,8,44,1,
+	45,1,45,1,45,1,46,1,46,1,46,1,46,1,47,1,47,1,47,1,47,1,48,1,48,1,49,1,49,
+	1,49,1,50,1,50,1,51,1,51,1,51,1,51,1,51,1,52,1,52,1,53,1,53,1,53,1,53,1,
+	53,1,53,1,54,1,54,1,54,1,54,1,54,1,54,1,55,1,55,1,55,1,55,1,55,1,56,1,56,
+	1,57,1,57,1,57,1,58,1,58,1,58,1,59,1,59,1,59,1,59,1,59,1,60,1,60,1,60,1,
+	60,1,61,1,61,1,61,1,61,1,61,1,62,1,62,1,62,1,62,1,62,1,62,1,63,1,63,1,63,
+	1,64,1,64,1,65,1,65,1,65,1,65,1,65,1,65,1,66,1,66,1,67,1,67,1,67,1,67,1,
+	67,1,68,1,68,1,68,1,69,1,69,1,69,1,70,1,70,1,70,1,71,1,71,1,72,1,72,1,72,
+	1,73,1,73,1,74,1,74,1,74,1,75,1,75,1,76,1,76,1,77,1,77,1,78,1,78,1,79,1,
+	79,1,80,1,80,1,80,5,80,890,8,80,10,80,12,80,893,9,80,1,80,1,80,4,80,897,
+	8,80,11,80,12,80,898,3,80,901,8,80,1,81,1,81,1,81,1,81,1,81,1,82,1,82,1,
+	82,1,82,1,82,1,83,1,83,5,83,915,8,83,10,83,12,83,918,9,83,1,83,1,83,3,83,
+	922,8,83,1,83,4,83,925,8,83,11,83,12,83,926,3,83,929,8,83,1,84,1,84,4,84,
+	933,8,84,11,84,12,84,934,1,84,1,84,1,85,1,85,1,86,1,86,1,86,1,86,1,87,1,
+	87,1,87,1,87,1,88,1,88,1,88,1,88,1,89,1,89,1,89,1,89,1,89,1,90,1,90,1,90,
+	1,90,1,91,1,91,1,91,1,91,1,92,1,92,1,92,1,92,1,93,1,93,1,93,1,93,1,94,1,
+	94,1,94,1,94,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,95,1,96,1,96,1,96,
+	1,96,1,97,1,97,1,97,1,97,1,98,1,98,1,98,1,98,1,99,1,99,1,99,1,99,1,100,
+	1,100,1,100,1,100,1,101,1,101,1,101,1,101,1,101,1,102,1,102,1,102,1,102,
+	1,103,1,103,1,103,1,103,1,104,1,104,1,104,1,104,3,104,1024,8,104,1,105,
+	1,105,3,105,1028,8,105,1,105,5,105,1031,8,105,10,105,12,105,1034,9,105,
+	1,105,1,105,3,105,1038,8,105,1,105,4,105,1041,8,105,11,105,12,105,1042,
+	3,105,1045,8,105,1,106,1,106,4,106,1049,8,106,11,106,12,106,1050,1,107,
+	1,107,1,107,1,107,1,108,1,108,1,108,1,108,1,109,1,109,1,109,1,109,1,110,
+	1,110,1,110,1,110,1,110,1,111,1,111,1,111,1,111,1,112,1,112,1,112,1,112,
+	1,113,1,113,1,113,1,113,1,114,1,114,1,114,1,115,1,115,1,115,1,115,1,116,
+	1,116,1,116,1,116,1,117,1,117,1,117,1,117,1,118,1,118,1,118,1,118,1,119,
+	1,119,1,119,1,119,1,119,1,120,1,120,1,120,1,120,1,120,1,121,1,121,1,121,
+	1,121,1,121,1,122,1,122,1,122,1,122,1,122,1,122,1,122,1,123,1,123,1,124,
+	4,124,1126,8,124,11,124,12,124,1127,1,124,1,124,3,124,1132,8,124,1,124,
+	4,124,1135,8,124,11,124,12,124,1136,1,125,1,125,1,125,1,125,1,126,1,126,
+	1,126,1,126,1,127,1,127,1,127,1,127,1,128,1,128,1,128,1,128,1,129,1,129,
+	1,129,1,129,1,129,1,129,1,130,1,130,1,130,1,130,1,131,1,131,1,131,1,131,
+	1,132,1,132,1,132,1,132,1,133,1,133,1,133,1,133,1,134,1,134,1,134,1,134,
+	1,135,1,135,1,135,1,135,1,136,1,136,1,136,1,136,1,137,1,137,1,137,1,137,
+	1,138,1,138,1,138,1,138,1,139,1,139,1,139,1,139,1,139,1,140,1,140,1,140,
+	1,140,1,141,1,141,1,141,1,141,1,142,1,142,1,142,1,142,1,143,1,143,1,143,
+	1,143,1,143,1,144,1,144,1,144,1,144,1,145,1,145,1,145,1,145,1,146,1,146,
+	1,146,1,146,1,147,1,147,1,147,1,147,1,148,1,148,1,148,1,148,1,149,1,149,
+	1,149,1,149,1,149,1,149,1,150,1,150,1,150,1,150,1,151,1,151,1,151,1,151,
+	1,152,1,152,1,152,1,152,1,153,1,153,1,153,1,153,1,154,1,154,1,154,1,154,
+	1,155,1,155,1,155,1,155,1,156,1,156,1,156,1,156,1,156,1,157,1,157,1,157,
+	1,157,1,158,1,158,1,158,1,158,1,159,1,159,1,159,1,159,1,160,1,160,1,160,
+	1,160,1,161,1,161,1,161,1,161,1,162,1,162,1,162,1,162,1,163,1,163,1,163,
+	1,163,1,163,1,164,1,164,1,164,1,164,1,164,1,165,1,165,1,165,1,165,1,166,
+	1,166,1,166,1,166,1,167,1,167,1,167,1,167,1,168,1,168,1,168,1,168,1,168,
+	1,169,1,169,1,169,1,169,1,169,1,169,1,169,1,169,1,169,1,169,1,170,1,170,
+	1,170,1,170,1,171,1,171,1,171,1,171,1,172,1,172,1,172,1,172,1,173,1,173,
+	1,173,1,173,1,173,1,174,1,174,1,175,1,175,1,175,1,175,1,175,4,175,1359,
+	8,175,11,175,12,175,1360,1,176,1,176,1,176,1,176,1,177,1,177,1,177,1,177,
+	1,178,1,178,1,178,1,178,1,179,1,179,1,179,1,179,1,179,1,180,1,180,1,180,
+	1,180,1,180,1,180,1,181,1,181,1,181,1,181,1,181,1,181,1,182,1,182,1,182,
+	1,182,1,183,1,183,1,183,1,183,1,184,1,184,1,184,1,184,1,185,1,185,1,185,
+	1,185,1,185,1,185,1,186,1,186,1,186,1,186,1,186,1,186,1,187,1,187,1,187,
+	1,187,1,188,1,188,1,188,1,188,1,189,1,189,1,189,1,189,1,190,1,190,1,190,
+	1,190,1,190,1,190,1,191,1,191,1,191,1,191,1,191,1,191,1,192,1,192,1,192,
+	1,192,1,192,1,192,1,193,1,193,1,193,1,193,1,193,2,604,705,0,194,16,1,18,
+	2,20,3,22,4,24,5,26,6,28,7,30,8,32,9,34,10,36,11,38,12,40,13,42,14,44,15,
+	46,16,48,17,50,18,52,19,54,20,56,21,58,22,60,23,62,24,64,0,66,25,68,0,70,
+	0,72,26,74,27,76,28,78,29,80,0,82,0,84,0,86,0,88,0,90,0,92,0,94,0,96,0,
+	98,0,100,30,102,31,104,32,106,33,108,34,110,35,112,36,114,37,116,38,118,
+	39,120,40,122,41,124,42,126,43,128,44,130,45,132,46,134,47,136,48,138,49,
+	140,50,142,51,144,52,146,53,148,54,150,55,152,56,154,57,156,58,158,59,160,
+	60,162,61,164,62,166,63,168,64,170,65,172,66,174,67,176,68,178,69,180,70,
+	182,71,184,0,186,72,188,73,190,74,192,75,194,0,196,0,198,0,200,0,202,0,
+	204,0,206,76,208,0,210,0,212,77,214,78,216,79,218,0,220,0,222,0,224,0,226,
+	0,228,80,230,81,232,82,234,83,236,0,238,0,240,0,242,0,244,84,246,0,248,
+	85,250,86,252,87,254,0,256,0,258,88,260,89,262,0,264,90,266,0,268,91,270,
+	92,272,93,274,0,276,0,278,0,280,0,282,0,284,0,286,0,288,94,290,95,292,96,
+	294,0,296,0,298,0,300,0,302,0,304,0,306,0,308,97,310,98,312,99,314,0,316,
+	0,318,0,320,0,322,100,324,101,326,102,328,0,330,0,332,0,334,0,336,103,338,
+	104,340,105,342,0,344,106,346,107,348,108,350,109,352,0,354,110,356,111,
+	358,112,360,113,362,0,364,114,366,115,368,116,370,117,372,118,374,0,376,
+	0,378,0,380,119,382,120,384,121,386,0,388,0,390,122,392,123,394,124,396,
+	0,398,0,400,0,402,0,16,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,35,2,0,68,
+	68,100,100,2,0,73,73,105,105,2,0,83,83,115,115,2,0,69,69,101,101,2,0,67,
+	67,99,99,2,0,84,84,116,116,2,0,82,82,114,114,2,0,79,79,111,111,2,0,80,80,
+	112,112,2,0,78,78,110,110,2,0,72,72,104,104,2,0,86,86,118,118,2,0,65,65,
+	97,97,2,0,76,76,108,108,2,0,88,88,120,120,2,0,70,70,102,102,2,0,77,77,109,
+	109,2,0,71,71,103,103,2,0,75,75,107,107,2,0,85,85,117,117,2,0,87,87,119,
+	119,6,0,9,10,13,13,32,32,47,47,91,91,93,93,2,0,10,10,13,13,3,0,9,10,13,
+	13,32,32,11,0,9,10,13,13,32,32,34,34,44,44,47,47,58,58,61,61,91,91,93,93,
+	124,124,2,0,42,42,47,47,1,0,48,57,2,0,65,90,97,122,8,0,34,34,78,78,82,82,
+	84,84,92,92,110,110,114,114,116,116,4,0,10,10,13,13,34,34,92,92,2,0,43,
+	43,45,45,1,0,96,96,2,0,66,66,98,98,2,0,89,89,121,121,11,0,9,10,13,13,32,
+	32,34,35,44,44,47,47,58,58,60,60,62,63,92,92,124,124,1476,0,16,1,0,0,0,
+	0,18,1,0,0,0,0,20,1,0,0,0,0,22,1,0,0,0,0,24,1,0,0,0,0,26,1,0,0,0,0,28,1,
+	0,0,0,0,30,1,0,0,0,0,32,1,0,0,0,0,34,1,0,0,0,0,36,1,0,0,0,0,38,1,0,0,0,
+	0,40,1,0,0,0,0,42,1,0,0,0,0,44,1,0,0,0,0,46,1,0,0,0,0,48,1,0,0,0,0,50,1,
+	0,0,0,0,52,1,0,0,0,0,54,1,0,0,0,0,56,1,0,0,0,0,58,1,0,0,0,0,60,1,0,0,0,
+	0,62,1,0,0,0,0,66,1,0,0,0,1,68,1,0,0,0,1,70,1,0,0,0,1,72,1,0,0,0,1,74,1,
+	0,0,0,1,76,1,0,0,0,2,78,1,0,0,0,2,100,1,0,0,0,2,102,1,0,0,0,2,104,1,0,0,
+	0,2,106,1,0,0,0,2,108,1,0,0,0,2,110,1,0,0,0,2,112,1,0,0,0,2,114,1,0,0,0,
+	2,116,1,0,0,0,2,118,1,0,0,0,2,120,1,0,0,0,2,122,1,0,0,0,2,124,1,0,0,0,2,
+	126,1,0,0,0,2,128,1,0,0,0,2,130,1,0,0,0,2,132,1,0,0,0,2,134,1,0,0,0,2,136,
+	1,0,0,0,2,138,1,0,0,0,2,140,1,0,0,0,2,142,1,0,0,0,2,144,1,0,0,0,2,146,1,
+	0,0,0,2,148,1,0,0,0,2,150,1,0,0,0,2,152,1,0,0,0,2,154,1,0,0,0,2,156,1,0,
+	0,0,2,158,1,0,0,0,2,160,1,0,0,0,2,162,1,0,0,0,2,164,1,0,0,0,2,166,1,0,0,
+	0,2,168,1,0,0,0,2,170,1,0,0,0,2,172,1,0,0,0,2,174,1,0,0,0,2,176,1,0,0,0,
+	2,178,1,0,0,0,2,180,1,0,0,0,2,182,1,0,0,0,2,186,1,0,0,0,2,188,1,0,0,0,2,
+	190,1,0,0,0,2,192,1,0,0,0,3,194,1,0,0,0,3,196,1,0,0,0,3,198,1,0,0,0,3,200,
+	1,0,0,0,3,202,1,0,0,0,3,204,1,0,0,0,3,206,1,0,0,0,3,208,1,0,0,0,3,210,1,
+	0,0,0,3,212,1,0,0,0,3,214,1,0,0,0,3,216,1,0,0,0,4,218,1,0,0,0,4,220,1,0,
+	0,0,4,222,1,0,0,0,4,228,1,0,0,0,4,230,1,0,0,0,4,232,1,0,0,0,4,234,1,0,0,
+	0,5,236,1,0,0,0,5,238,1,0,0,0,5,240,1,0,0,0,5,242,1,0,0,0,5,244,1,0,0,0,
+	5,246,1,0,0,0,5,248,1,0,0,0,5,250,1,0,0,0,5,252,1,0,0,0,6,254,1,0,0,0,6,
+	256,1,0,0,0,6,258,1,0,0,0,6,260,1,0,0,0,6,264,1,0,0,0,6,266,1,0,0,0,6,268,
+	1,0,0,0,6,270,1,0,0,0,6,272,1,0,0,0,7,274,1,0,0,0,7,276,1,0,0,0,7,278,1,
+	0,0,0,7,280,1,0,0,0,7,282,1,0,0,0,7,284,1,0,0,0,7,286,1,0,0,0,7,288,1,0,
+	0,0,7,290,1,0,0,0,7,292,1,0,0,0,8,294,1,0,0,0,8,296,1,0,0,0,8,298,1,0,0,
+	0,8,300,1,0,0,0,8,302,1,0,0,0,8,304,1,0,0,0,8,306,1,0,0,0,8,308,1,0,0,0,
+	8,310,1,0,0,0,8,312,1,0,0,0,9,314,1,0,0,0,9,316,1,0,0,0,9,318,1,0,0,0,9,
+	320,1,0,0,0,9,322,1,0,0,0,9,324,1,0,0,0,9,326,1,0,0,0,10,328,1,0,0,0,10,
+	330,1,0,0,0,10,332,1,0,0,0,10,334,1,0,0,0,10,336,1,0,0,0,10,338,1,0,0,0,
+	10,340,1,0,0,0,11,342,1,0,0,0,11,344,1,0,0,0,11,346,1,0,0,0,11,348,1,0,
+	0,0,11,350,1,0,0,0,12,352,1,0,0,0,12,354,1,0,0,0,12,356,1,0,0,0,12,358,
+	1,0,0,0,12,360,1,0,0,0,13,362,1,0,0,0,13,364,1,0,0,0,13,366,1,0,0,0,13,
+	368,1,0,0,0,13,370,1,0,0,0,13,372,1,0,0,0,14,374,1,0,0,0,14,376,1,0,0,0,
+	14,378,1,0,0,0,14,380,1,0,0,0,14,382,1,0,0,0,14,384,1,0,0,0,15,386,1,0,
+	0,0,15,388,1,0,0,0,15,390,1,0,0,0,15,392,1,0,0,0,15,394,1,0,0,0,15,396,
+	1,0,0,0,15,398,1,0,0,0,15,400,1,0,0,0,15,402,1,0,0,0,16,404,1,0,0,0,18,
+	414,1,0,0,0,20,421,1,0,0,0,22,430,1,0,0,0,24,437,1,0,0,0,26,447,1,0,0,0,
+	28,454,1,0,0,0,30,461,1,0,0,0,32,475,1,0,0,0,34,482,1,0,0,0,36,490,1,0,
+	0,0,38,499,1,0,0,0,40,506,1,0,0,0,42,516,1,0,0,0,44,528,1,0,0,0,46,537,
+	1,0,0,0,48,543,1,0,0,0,50,550,1,0,0,0,52,557,1,0,0,0,54,565,1,0,0,0,56,
+	574,1,0,0,0,58,580,1,0,0,0,60,597,1,0,0,0,62,613,1,0,0,0,64,622,1,0,0,0,
+	66,625,1,0,0,0,68,629,1,0,0,0,70,634,1,0,0,0,72,639,1,0,0,0,74,643,1,0,
+	0,0,76,647,1,0,0,0,78,651,1,0,0,0,80,655,1,0,0,0,82,657,1,0,0,0,84,659,
+	1,0,0,0,86,662,1,0,0,0,88,664,1,0,0,0,90,673,1,0,0,0,92,675,1,0,0,0,94,
+	680,1,0,0,0,96,682,1,0,0,0,98,687,1,0,0,0,100,718,1,0,0,0,102,721,1,0,0,
+	0,104,767,1,0,0,0,106,769,1,0,0,0,108,772,1,0,0,0,110,776,1,0,0,0,112,780,
+	1,0,0,0,114,782,1,0,0,0,116,785,1,0,0,0,118,787,1,0,0,0,120,792,1,0,0,0,
+	122,794,1,0,0,0,124,800,1,0,0,0,126,806,1,0,0,0,128,811,1,0,0,0,130,813,
+	1,0,0,0,132,816,1,0,0,0,134,819,1,0,0,0,136,824,1,0,0,0,138,828,1,0,0,0,
+	140,833,1,0,0,0,142,839,1,0,0,0,144,842,1,0,0,0,146,844,1,0,0,0,148,850,
+	1,0,0,0,150,852,1,0,0,0,152,857,1,0,0,0,154,860,1,0,0,0,156,863,1,0,0,0,
+	158,866,1,0,0,0,160,868,1,0,0,0,162,871,1,0,0,0,164,873,1,0,0,0,166,876,
+	1,0,0,0,168,878,1,0,0,0,170,880,1,0,0,0,172,882,1,0,0,0,174,884,1,0,0,0,
+	176,900,1,0,0,0,178,902,1,0,0,0,180,907,1,0,0,0,182,928,1,0,0,0,184,930,
+	1,0,0,0,186,938,1,0,0,0,188,940,1,0,0,0,190,944,1,0,0,0,192,948,1,0,0,0,
+	194,952,1,0,0,0,196,957,1,0,0,0,198,961,1,0,0,0,200,965,1,0,0,0,202,969,
+	1,0,0,0,204,973,1,0,0,0,206,977,1,0,0,0,208,986,1,0,0,0,210,990,1,0,0,0,
+	212,994,1,0,0,0,214,998,1,0,0,0,216,1002,1,0,0,0,218,1006,1,0,0,0,220,1011,
+	1,0,0,0,222,1015,1,0,0,0,224,1023,1,0,0,0,226,1044,1,0,0,0,228,1048,1,0,
+	0,0,230,1052,1,0,0,0,232,1056,1,0,0,0,234,1060,1,0,0,0,236,1064,1,0,0,0,
+	238,1069,1,0,0,0,240,1073,1,0,0,0,242,1077,1,0,0,0,244,1081,1,0,0,0,246,
+	1084,1,0,0,0,248,1088,1,0,0,0,250,1092,1,0,0,0,252,1096,1,0,0,0,254,1100,
+	1,0,0,0,256,1105,1,0,0,0,258,1110,1,0,0,0,260,1115,1,0,0,0,262,1122,1,0,
+	0,0,264,1131,1,0,0,0,266,1138,1,0,0,0,268,1142,1,0,0,0,270,1146,1,0,0,0,
+	272,1150,1,0,0,0,274,1154,1,0,0,0,276,1160,1,0,0,0,278,1164,1,0,0,0,280,
+	1168,1,0,0,0,282,1172,1,0,0,0,284,1176,1,0,0,0,286,1180,1,0,0,0,288,1184,
+	1,0,0,0,290,1188,1,0,0,0,292,1192,1,0,0,0,294,1196,1,0,0,0,296,1201,1,0,
+	0,0,298,1205,1,0,0,0,300,1209,1,0,0,0,302,1213,1,0,0,0,304,1218,1,0,0,0,
+	306,1222,1,0,0,0,308,1226,1,0,0,0,310,1230,1,0,0,0,312,1234,1,0,0,0,314,
+	1238,1,0,0,0,316,1244,1,0,0,0,318,1248,1,0,0,0,320,1252,1,0,0,0,322,1256,
+	1,0,0,0,324,1260,1,0,0,0,326,1264,1,0,0,0,328,1268,1,0,0,0,330,1273,1,0,
+	0,0,332,1277,1,0,0,0,334,1281,1,0,0,0,336,1285,1,0,0,0,338,1289,1,0,0,0,
+	340,1293,1,0,0,0,342,1297,1,0,0,0,344,1302,1,0,0,0,346,1307,1,0,0,0,348,
+	1311,1,0,0,0,350,1315,1,0,0,0,352,1319,1,0,0,0,354,1324,1,0,0,0,356,1334,
+	1,0,0,0,358,1338,1,0,0,0,360,1342,1,0,0,0,362,1346,1,0,0,0,364,1351,1,0,
+	0,0,366,1358,1,0,0,0,368,1362,1,0,0,0,370,1366,1,0,0,0,372,1370,1,0,0,0,
+	374,1374,1,0,0,0,376,1379,1,0,0,0,378,1385,1,0,0,0,380,1391,1,0,0,0,382,
+	1395,1,0,0,0,384,1399,1,0,0,0,386,1403,1,0,0,0,388,1409,1,0,0,0,390,1415,
+	1,0,0,0,392,1419,1,0,0,0,394,1423,1,0,0,0,396,1427,1,0,0,0,398,1433,1,0,
+	0,0,400,1439,1,0,0,0,402,1445,1,0,0,0,404,405,7,0,0,0,405,406,7,1,0,0,406,
+	407,7,2,0,0,407,408,7,2,0,0,408,409,7,3,0,0,409,410,7,4,0,0,410,411,7,5,
+	0,0,411,412,1,0,0,0,412,413,6,0,0,0,413,17,1,0,0,0,414,415,7,0,0,0,415,
+	416,7,6,0,0,416,417,7,7,0,0,417,418,7,8,0,0,418,419,1,0,0,0,419,420,6,1,
+	1,0,420,19,1,0,0,0,421,422,7,3,0,0,422,423,7,9,0,0,423,424,7,6,0,0,424,
+	425,7,1,0,0,425,426,7,4,0,0,426,427,7,10,0,0,427,428,1,0,0,0,428,429,6,
+	2,2,0,429,21,1,0,0,0,430,431,7,3,0,0,431,432,7,11,0,0,432,433,7,12,0,0,
+	433,434,7,13,0,0,434,435,1,0,0,0,435,436,6,3,0,0,436,23,1,0,0,0,437,438,
+	7,3,0,0,438,439,7,14,0,0,439,440,7,8,0,0,440,441,7,13,0,0,441,442,7,12,
+	0,0,442,443,7,1,0,0,443,444,7,9,0,0,444,445,1,0,0,0,445,446,6,4,3,0,446,
+	25,1,0,0,0,447,448,7,15,0,0,448,449,7,6,0,0,449,450,7,7,0,0,450,451,7,16,
+	0,0,451,452,1,0,0,0,452,453,6,5,4,0,453,27,1,0,0,0,454,455,7,17,0,0,455,
+	456,7,6,0,0,456,457,7,7,0,0,457,458,7,18,0,0,458,459,1,0,0,0,459,460,6,
+	6,0,0,460,29,1,0,0,0,461,462,7,1,0,0,462,463,7,9,0,0,463,464,7,13,0,0,464,
+	465,7,1,0,0,465,466,7,9,0,0,466,467,7,3,0,0,467,468,7,2,0,0,468,469,7,5,
+	0,0,469,470,7,12,0,0,470,471,7,5,0,0,471,472,7,2,0,0,472,473,1,0,0,0,473,
+	474,6,7,0,0,474,31,1,0,0,0,475,476,7,18,0,0,476,477,7,3,0,0,477,478,7,3,
+	0,0,478,479,7,8,0,0,479,480,1,0,0,0,480,481,6,8,1,0,481,33,1,0,0,0,482,
+	483,7,13,0,0,483,484,7,1,0,0,484,485,7,16,0,0,485,486,7,1,0,0,486,487,7,
+	5,0,0,487,488,1,0,0,0,488,489,6,9,0,0,489,35,1,0,0,0,490,491,7,13,0,0,491,
+	492,7,7,0,0,492,493,7,7,0,0,493,494,7,18,0,0,494,495,7,19,0,0,495,496,7,
+	8,0,0,496,497,1,0,0,0,497,498,6,10,5,0,498,37,1,0,0,0,499,500,7,16,0,0,
+	500,501,7,3,0,0,501,502,7,5,0,0,502,503,7,12,0,0,503,504,1,0,0,0,504,505,
+	6,11,6,0,505,39,1,0,0,0,506,507,7,16,0,0,507,508,7,3,0,0,508,509,7,5,0,
+	0,509,510,7,6,0,0,510,511,7,1,0,0,511,512,7,4,0,0,512,513,7,2,0,0,513,514,
+	1,0,0,0,514,515,6,12,7,0,515,41,1,0,0,0,516,517,7,16,0,0,517,518,7,11,0,
+	0,518,519,5,95,0,0,519,520,7,3,0,0,520,521,7,14,0,0,521,522,7,8,0,0,522,
+	523,7,12,0,0,523,524,7,9,0,0,524,525,7,0,0,0,525,526,1,0,0,0,526,527,6,
+	13,8,0,527,43,1,0,0,0,528,529,7,6,0,0,529,530,7,3,0,0,530,531,7,9,0,0,531,
+	532,7,12,0,0,532,533,7,16,0,0,533,534,7,3,0,0,534,535,1,0,0,0,535,536,6,
+	14,9,0,536,45,1,0,0,0,537,538,7,6,0,0,538,539,7,7,0,0,539,540,7,20,0,0,
+	540,541,1,0,0,0,541,542,6,15,0,0,542,47,1,0,0,0,543,544,7,2,0,0,544,545,
+	7,10,0,0,545,546,7,7,0,0,546,547,7,20,0,0,547,548,1,0,0,0,548,549,6,16,
+	10,0,549,49,1,0,0,0,550,551,7,2,0,0,551,552,7,7,0,0,552,553,7,6,0,0,553,
+	554,7,5,0,0,554,555,1,0,0,0,555,556,6,17,0,0,556,51,1,0,0,0,557,558,7,2,
+	0,0,558,559,7,5,0,0,559,560,7,12,0,0,560,561,7,5,0,0,561,562,7,2,0,0,562,
+	563,1,0,0,0,563,564,6,18,0,0,564,53,1,0,0,0,565,566,7,20,0,0,566,567,7,
+	10,0,0,567,568,7,3,0,0,568,569,7,6,0,0,569,570,7,3,0,0,570,571,1,0,0,0,
+	571,572,6,19,0,0,572,55,1,0,0,0,573,575,8,21,0,0,574,573,1,0,0,0,575,576,
+	1,0,0,0,576,574,1,0,0,0,576,577,1,0,0,0,577,578,1,0,0,0,578,579,6,20,0,
+	0,579,57,1,0,0,0,580,581,5,47,0,0,581,582,5,47,0,0,582,586,1,0,0,0,583,
+	585,8,22,0,0,584,583,1,0,0,0,585,588,1,0,0,0,586,584,1,0,0,0,586,587,1,
+	0,0,0,587,590,1,0,0,0,588,586,1,0,0,0,589,591,5,13,0,0,590,589,1,0,0,0,
+	590,591,1,0,0,0,591,593,1,0,0,0,592,594,5,10,0,0,593,592,1,0,0,0,593,594,
+	1,0,0,0,594,595,1,0,0,0,595,596,6,21,11,0,596,59,1,0,0,0,597,598,5,47,0,
+	0,598,599,5,42,0,0,599,604,1,0,0,0,600,603,3,60,22,0,601,603,9,0,0,0,602,
+	600,1,0,0,0,602,601,1,0,0,0,603,606,1,0,0,0,604,605,1,0,0,0,604,602,1,0,
+	0,0,605,607,1,0,0,0,606,604,1,0,0,0,607,608,5,42,0,0,608,609,5,47,0,0,609,
+	610,1,0,0,0,610,611,6,22,11,0,611,61,1,0,0,0,612,614,7,23,0,0,613,612,1,
+	0,0,0,614,615,1,0,0,0,615,613,1,0,0,0,615,616,1,0,0,0,616,617,1,0,0,0,617,
+	618,6,23,11,0,618,63,1,0,0,0,619,623,8,24,0,0,620,621,5,47,0,0,621,623,
+	8,25,0,0,622,619,1,0,0,0,622,620,1,0,0,0,623,65,1,0,0,0,624,626,3,64,24,
+	0,625,624,1,0,0,0,626,627,1,0,0,0,627,625,1,0,0,0,627,628,1,0,0,0,628,67,
+	1,0,0,0,629,630,3,178,81,0,630,631,1,0,0,0,631,632,6,26,12,0,632,633,6,
+	26,13,0,633,69,1,0,0,0,634,635,3,78,31,0,635,636,1,0,0,0,636,637,6,27,14,
+	0,637,638,6,27,15,0,638,71,1,0,0,0,639,640,3,62,23,0,640,641,1,0,0,0,641,
+	642,6,28,11,0,642,73,1,0,0,0,643,644,3,58,21,0,644,645,1,0,0,0,645,646,
+	6,29,11,0,646,75,1,0,0,0,647,648,3,60,22,0,648,649,1,0,0,0,649,650,6,30,
+	11,0,650,77,1,0,0,0,651,652,5,124,0,0,652,653,1,0,0,0,653,654,6,31,15,0,
+	654,79,1,0,0,0,655,656,7,26,0,0,656,81,1,0,0,0,657,658,7,27,0,0,658,83,
+	1,0,0,0,659,660,5,92,0,0,660,661,7,28,0,0,661,85,1,0,0,0,662,663,8,29,0,
+	0,663,87,1,0,0,0,664,666,7,3,0,0,665,667,7,30,0,0,666,665,1,0,0,0,666,667,
+	1,0,0,0,667,669,1,0,0,0,668,670,3,80,32,0,669,668,1,0,0,0,670,671,1,0,0,
+	0,671,669,1,0,0,0,671,672,1,0,0,0,672,89,1,0,0,0,673,674,5,64,0,0,674,91,
+	1,0,0,0,675,676,5,96,0,0,676,93,1,0,0,0,677,681,8,31,0,0,678,679,5,96,0,
+	0,679,681,5,96,0,0,680,677,1,0,0,0,680,678,1,0,0,0,681,95,1,0,0,0,682,683,
+	5,95,0,0,683,97,1,0,0,0,684,688,3,82,33,0,685,688,3,80,32,0,686,688,3,96,
+	40,0,687,684,1,0,0,0,687,685,1,0,0,0,687,686,1,0,0,0,688,99,1,0,0,0,689,
+	694,5,34,0,0,690,693,3,84,34,0,691,693,3,86,35,0,692,690,1,0,0,0,692,691,
+	1,0,0,0,693,696,1,0,0,0,694,692,1,0,0,0,694,695,1,0,0,0,695,697,1,0,0,0,
+	696,694,1,0,0,0,697,719,5,34,0,0,698,699,5,34,0,0,699,700,5,34,0,0,700,
+	701,5,34,0,0,701,705,1,0,0,0,702,704,8,22,0,0,703,702,1,0,0,0,704,707,1,
+	0,0,0,705,706,1,0,0,0,705,703,1,0,0,0,706,708,1,0,0,0,707,705,1,0,0,0,708,
+	709,5,34,0,0,709,710,5,34,0,0,710,711,5,34,0,0,711,713,1,0,0,0,712,714,
+	5,34,0,0,713,712,1,0,0,0,713,714,1,0,0,0,714,716,1,0,0,0,715,717,5,34,0,
+	0,716,715,1,0,0,0,716,717,1,0,0,0,717,719,1,0,0,0,718,689,1,0,0,0,718,698,
+	1,0,0,0,719,101,1,0,0,0,720,722,3,80,32,0,721,720,1,0,0,0,722,723,1,0,0,
+	0,723,721,1,0,0,0,723,724,1,0,0,0,724,103,1,0,0,0,725,727,3,80,32,0,726,
+	725,1,0,0,0,727,728,1,0,0,0,728,726,1,0,0,0,728,729,1,0,0,0,729,730,1,0,
+	0,0,730,734,3,120,52,0,731,733,3,80,32,0,732,731,1,0,0,0,733,736,1,0,0,
+	0,734,732,1,0,0,0,734,735,1,0,0,0,735,768,1,0,0,0,736,734,1,0,0,0,737,739,
+	3,120,52,0,738,740,3,80,32,0,739,738,1,0,0,0,740,741,1,0,0,0,741,739,1,
+	0,0,0,741,742,1,0,0,0,742,768,1,0,0,0,743,745,3,80,32,0,744,743,1,0,0,0,
+	745,746,1,0,0,0,746,744,1,0,0,0,746,747,1,0,0,0,747,755,1,0,0,0,748,752,
+	3,120,52,0,749,751,3,80,32,0,750,749,1,0,0,0,751,754,1,0,0,0,752,750,1,
+	0,0,0,752,753,1,0,0,0,753,756,1,0,0,0,754,752,1,0,0,0,755,748,1,0,0,0,755,
+	756,1,0,0,0,756,757,1,0,0,0,757,758,3,88,36,0,758,768,1,0,0,0,759,761,3,
+	120,52,0,760,762,3,80,32,0,761,760,1,0,0,0,762,763,1,0,0,0,763,761,1,0,
+	0,0,763,764,1,0,0,0,764,765,1,0,0,0,765,766,3,88,36,0,766,768,1,0,0,0,767,
+	726,1,0,0,0,767,737,1,0,0,0,767,744,1,0,0,0,767,759,1,0,0,0,768,105,1,0,
+	0,0,769,770,7,32,0,0,770,771,7,33,0,0,771,107,1,0,0,0,772,773,7,12,0,0,
+	773,774,7,9,0,0,774,775,7,0,0,0,775,109,1,0,0,0,776,777,7,12,0,0,777,778,
+	7,2,0,0,778,779,7,4,0,0,779,111,1,0,0,0,780,781,5,61,0,0,781,113,1,0,0,
+	0,782,783,5,58,0,0,783,784,5,58,0,0,784,115,1,0,0,0,785,786,5,44,0,0,786,
+	117,1,0,0,0,787,788,7,0,0,0,788,789,7,3,0,0,789,790,7,2,0,0,790,791,7,4,
+	0,0,791,119,1,0,0,0,792,793,5,46,0,0,793,121,1,0,0,0,794,795,7,15,0,0,795,
+	796,7,12,0,0,796,797,7,13,0,0,797,798,7,2,0,0,798,799,7,3,0,0,799,123,1,
+	0,0,0,800,801,7,15,0,0,801,802,7,1,0,0,802,803,7,6,0,0,803,804,7,2,0,0,
+	804,805,7,5,0,0,805,125,1,0,0,0,806,807,7,13,0,0,807,808,7,12,0,0,808,809,
+	7,2,0,0,809,810,7,5,0,0,810,127,1,0,0,0,811,812,5,40,0,0,812,129,1,0,0,
+	0,813,814,7,1,0,0,814,815,7,9,0,0,815,131,1,0,0,0,816,817,7,1,0,0,817,818,
+	7,2,0,0,818,133,1,0,0,0,819,820,7,13,0,0,820,821,7,1,0,0,821,822,7,18,0,
+	0,822,823,7,3,0,0,823,135,1,0,0,0,824,825,7,9,0,0,825,826,7,7,0,0,826,827,
+	7,5,0,0,827,137,1,0,0,0,828,829,7,9,0,0,829,830,7,19,0,0,830,831,7,13,0,
+	0,831,832,7,13,0,0,832,139,1,0,0,0,833,834,7,9,0,0,834,835,7,19,0,0,835,
+	836,7,13,0,0,836,837,7,13,0,0,837,838,7,2,0,0,838,141,1,0,0,0,839,840,7,
+	7,0,0,840,841,7,6,0,0,841,143,1,0,0,0,842,843,5,63,0,0,843,145,1,0,0,0,
+	844,845,7,6,0,0,845,846,7,13,0,0,846,847,7,1,0,0,847,848,7,18,0,0,848,849,
+	7,3,0,0,849,147,1,0,0,0,850,851,5,41,0,0,851,149,1,0,0,0,852,853,7,5,0,
+	0,853,854,7,6,0,0,854,855,7,19,0,0,855,856,7,3,0,0,856,151,1,0,0,0,857,
+	858,5,61,0,0,858,859,5,61,0,0,859,153,1,0,0,0,860,861,5,61,0,0,861,862,
+	5,126,0,0,862,155,1,0,0,0,863,864,5,33,0,0,864,865,5,61,0,0,865,157,1,0,
+	0,0,866,867,5,60,0,0,867,159,1,0,0,0,868,869,5,60,0,0,869,870,5,61,0,0,
+	870,161,1,0,0,0,871,872,5,62,0,0,872,163,1,0,0,0,873,874,5,62,0,0,874,875,
+	5,61,0,0,875,165,1,0,0,0,876,877,5,43,0,0,877,167,1,0,0,0,878,879,5,45,
+	0,0,879,169,1,0,0,0,880,881,5,42,0,0,881,171,1,0,0,0,882,883,5,47,0,0,883,
+	173,1,0,0,0,884,885,5,37,0,0,885,175,1,0,0,0,886,887,3,144,64,0,887,891,
+	3,82,33,0,888,890,3,98,41,0,889,888,1,0,0,0,890,893,1,0,0,0,891,889,1,0,
+	0,0,891,892,1,0,0,0,892,901,1,0,0,0,893,891,1,0,0,0,894,896,3,144,64,0,
+	895,897,3,80,32,0,896,895,1,0,0,0,897,898,1,0,0,0,898,896,1,0,0,0,898,899,
+	1,0,0,0,899,901,1,0,0,0,900,886,1,0,0,0,900,894,1,0,0,0,901,177,1,0,0,0,
+	902,903,5,91,0,0,903,904,1,0,0,0,904,905,6,81,0,0,905,906,6,81,0,0,906,
+	179,1,0,0,0,907,908,5,93,0,0,908,909,1,0,0,0,909,910,6,82,15,0,910,911,
+	6,82,15,0,911,181,1,0,0,0,912,916,3,82,33,0,913,915,3,98,41,0,914,913,1,
+	0,0,0,915,918,1,0,0,0,916,914,1,0,0,0,916,917,1,0,0,0,917,929,1,0,0,0,918,
+	916,1,0,0,0,919,922,3,96,40,0,920,922,3,90,37,0,921,919,1,0,0,0,921,920,
+	1,0,0,0,922,924,1,0,0,0,923,925,3,98,41,0,924,923,1,0,0,0,925,926,1,0,0,
+	0,926,924,1,0,0,0,926,927,1,0,0,0,927,929,1,0,0,0,928,912,1,0,0,0,928,921,
+	1,0,0,0,929,183,1,0,0,0,930,932,3,92,38,0,931,933,3,94,39,0,932,931,1,0,
+	0,0,933,934,1,0,0,0,934,932,1,0,0,0,934,935,1,0,0,0,935,936,1,0,0,0,936,
+	937,3,92,38,0,937,185,1,0,0,0,938,939,3,184,84,0,939,187,1,0,0,0,940,941,
+	3,58,21,0,941,942,1,0,0,0,942,943,6,86,11,0,943,189,1,0,0,0,944,945,3,60,
+	22,0,945,946,1,0,0,0,946,947,6,87,11,0,947,191,1,0,0,0,948,949,3,62,23,
+	0,949,950,1,0,0,0,950,951,6,88,11,0,951,193,1,0,0,0,952,953,3,78,31,0,953,
+	954,1,0,0,0,954,955,6,89,14,0,955,956,6,89,15,0,956,195,1,0,0,0,957,958,
+	3,178,81,0,958,959,1,0,0,0,959,960,6,90,12,0,960,197,1,0,0,0,961,962,3,
+	180,82,0,962,963,1,0,0,0,963,964,6,91,16,0,964,199,1,0,0,0,965,966,3,364,
+	174,0,966,967,1,0,0,0,967,968,6,92,17,0,968,201,1,0,0,0,969,970,3,116,50,
+	0,970,971,1,0,0,0,971,972,6,93,18,0,972,203,1,0,0,0,973,974,3,112,48,0,
+	974,975,1,0,0,0,975,976,6,94,19,0,976,205,1,0,0,0,977,978,7,16,0,0,978,
+	979,7,3,0,0,979,980,7,5,0,0,980,981,7,12,0,0,981,982,7,0,0,0,982,983,7,
+	12,0,0,983,984,7,5,0,0,984,985,7,12,0,0,985,207,1,0,0,0,986,987,3,66,25,
+	0,987,988,1,0,0,0,988,989,6,96,20,0,989,209,1,0,0,0,990,991,3,100,42,0,
+	991,992,1,0,0,0,992,993,6,97,21,0,993,211,1,0,0,0,994,995,3,58,21,0,995,
+	996,1,0,0,0,996,997,6,98,11,0,997,213,1,0,0,0,998,999,3,60,22,0,999,1000,
+	1,0,0,0,1000,1001,6,99,11,0,1001,215,1,0,0,0,1002,1003,3,62,23,0,1003,1004,
+	1,0,0,0,1004,1005,6,100,11,0,1005,217,1,0,0,0,1006,1007,3,78,31,0,1007,
+	1008,1,0,0,0,1008,1009,6,101,14,0,1009,1010,6,101,15,0,1010,219,1,0,0,0,
+	1011,1012,3,120,52,0,1012,1013,1,0,0,0,1013,1014,6,102,22,0,1014,221,1,
+	0,0,0,1015,1016,3,116,50,0,1016,1017,1,0,0,0,1017,1018,6,103,18,0,1018,
+	223,1,0,0,0,1019,1024,3,82,33,0,1020,1024,3,80,32,0,1021,1024,3,96,40,0,
+	1022,1024,3,170,77,0,1023,1019,1,0,0,0,1023,1020,1,0,0,0,1023,1021,1,0,
+	0,0,1023,1022,1,0,0,0,1024,225,1,0,0,0,1025,1028,3,82,33,0,1026,1028,3,
+	170,77,0,1027,1025,1,0,0,0,1027,1026,1,0,0,0,1028,1032,1,0,0,0,1029,1031,
+	3,224,104,0,1030,1029,1,0,0,0,1031,1034,1,0,0,0,1032,1030,1,0,0,0,1032,
+	1033,1,0,0,0,1033,1045,1,0,0,0,1034,1032,1,0,0,0,1035,1038,3,96,40,0,1036,
+	1038,3,90,37,0,1037,1035,1,0,0,0,1037,1036,1,0,0,0,1038,1040,1,0,0,0,1039,
+	1041,3,224,104,0,1040,1039,1,0,0,0,1041,1042,1,0,0,0,1042,1040,1,0,0,0,
+	1042,1043,1,0,0,0,1043,1045,1,0,0,0,1044,1027,1,0,0,0,1044,1037,1,0,0,0,
+	1045,227,1,0,0,0,1046,1049,3,226,105,0,1047,1049,3,184,84,0,1048,1046,1,
+	0,0,0,1048,1047,1,0,0,0,1049,1050,1,0,0,0,1050,1048,1,0,0,0,1050,1051,1,
+	0,0,0,1051,229,1,0,0,0,1052,1053,3,58,21,0,1053,1054,1,0,0,0,1054,1055,
+	6,107,11,0,1055,231,1,0,0,0,1056,1057,3,60,22,0,1057,1058,1,0,0,0,1058,
+	1059,6,108,11,0,1059,233,1,0,0,0,1060,1061,3,62,23,0,1061,1062,1,0,0,0,
+	1062,1063,6,109,11,0,1063,235,1,0,0,0,1064,1065,3,78,31,0,1065,1066,1,0,
+	0,0,1066,1067,6,110,14,0,1067,1068,6,110,15,0,1068,237,1,0,0,0,1069,1070,
+	3,112,48,0,1070,1071,1,0,0,0,1071,1072,6,111,19,0,1072,239,1,0,0,0,1073,
+	1074,3,116,50,0,1074,1075,1,0,0,0,1075,1076,6,112,18,0,1076,241,1,0,0,0,
+	1077,1078,3,120,52,0,1078,1079,1,0,0,0,1079,1080,6,113,22,0,1080,243,1,
+	0,0,0,1081,1082,7,12,0,0,1082,1083,7,2,0,0,1083,245,1,0,0,0,1084,1085,3,
+	228,106,0,1085,1086,1,0,0,0,1086,1087,6,115,23,0,1087,247,1,0,0,0,1088,
+	1089,3,58,21,0,1089,1090,1,0,0,0,1090,1091,6,116,11,0,1091,249,1,0,0,0,
+	1092,1093,3,60,22,0,1093,1094,1,0,0,0,1094,1095,6,117,11,0,1095,251,1,0,
+	0,0,1096,1097,3,62,23,0,1097,1098,1,0,0,0,1098,1099,6,118,11,0,1099,253,
+	1,0,0,0,1100,1101,3,78,31,0,1101,1102,1,0,0,0,1102,1103,6,119,14,0,1103,
+	1104,6,119,15,0,1104,255,1,0,0,0,1105,1106,3,178,81,0,1106,1107,1,0,0,0,
+	1107,1108,6,120,12,0,1108,1109,6,120,24,0,1109,257,1,0,0,0,1110,1111,7,
+	7,0,0,1111,1112,7,9,0,0,1112,1113,1,0,0,0,1113,1114,6,121,25,0,1114,259,
+	1,0,0,0,1115,1116,7,20,0,0,1116,1117,7,1,0,0,1117,1118,7,5,0,0,1118,1119,
+	7,10,0,0,1119,1120,1,0,0,0,1120,1121,6,122,25,0,1121,261,1,0,0,0,1122,1123,
+	8,34,0,0,1123,263,1,0,0,0,1124,1126,3,262,123,0,1125,1124,1,0,0,0,1126,
+	1127,1,0,0,0,1127,1125,1,0,0,0,1127,1128,1,0,0,0,1128,1129,1,0,0,0,1129,
+	1130,3,364,174,0,1130,1132,1,0,0,0,1131,1125,1,0,0,0,1131,1132,1,0,0,0,
+	1132,1134,1,0,0,0,1133,1135,3,262,123,0,1134,1133,1,0,0,0,1135,1136,1,0,
+	0,0,1136,1134,1,0,0,0,1136,1137,1,0,0,0,1137,265,1,0,0,0,1138,1139,3,264,
+	124,0,1139,1140,1,0,0,0,1140,1141,6,125,26,0,1141,267,1,0,0,0,1142,1143,
+	3,58,21,0,1143,1144,1,0,0,0,1144,1145,6,126,11,0,1145,269,1,0,0,0,1146,
+	1147,3,60,22,0,1147,1148,1,0,0,0,1148,1149,6,127,11,0,1149,271,1,0,0,0,
+	1150,1151,3,62,23,0,1151,1152,1,0,0,0,1152,1153,6,128,11,0,1153,273,1,0,
+	0,0,1154,1155,3,78,31,0,1155,1156,1,0,0,0,1156,1157,6,129,14,0,1157,1158,
+	6,129,15,0,1158,1159,6,129,15,0,1159,275,1,0,0,0,1160,1161,3,112,48,0,1161,
+	1162,1,0,0,0,1162,1163,6,130,19,0,1163,277,1,0,0,0,1164,1165,3,116,50,0,
+	1165,1166,1,0,0,0,1166,1167,6,131,18,0,1167,279,1,0,0,0,1168,1169,3,120,
+	52,0,1169,1170,1,0,0,0,1170,1171,6,132,22,0,1171,281,1,0,0,0,1172,1173,
+	3,260,122,0,1173,1174,1,0,0,0,1174,1175,6,133,27,0,1175,283,1,0,0,0,1176,
+	1177,3,228,106,0,1177,1178,1,0,0,0,1178,1179,6,134,23,0,1179,285,1,0,0,
+	0,1180,1181,3,186,85,0,1181,1182,1,0,0,0,1182,1183,6,135,28,0,1183,287,
+	1,0,0,0,1184,1185,3,58,21,0,1185,1186,1,0,0,0,1186,1187,6,136,11,0,1187,
+	289,1,0,0,0,1188,1189,3,60,22,0,1189,1190,1,0,0,0,1190,1191,6,137,11,0,
+	1191,291,1,0,0,0,1192,1193,3,62,23,0,1193,1194,1,0,0,0,1194,1195,6,138,
+	11,0,1195,293,1,0,0,0,1196,1197,3,78,31,0,1197,1198,1,0,0,0,1198,1199,6,
+	139,14,0,1199,1200,6,139,15,0,1200,295,1,0,0,0,1201,1202,3,364,174,0,1202,
+	1203,1,0,0,0,1203,1204,6,140,17,0,1204,297,1,0,0,0,1205,1206,3,116,50,0,
+	1206,1207,1,0,0,0,1207,1208,6,141,18,0,1208,299,1,0,0,0,1209,1210,3,120,
+	52,0,1210,1211,1,0,0,0,1211,1212,6,142,22,0,1212,301,1,0,0,0,1213,1214,
+	3,258,121,0,1214,1215,1,0,0,0,1215,1216,6,143,29,0,1216,1217,6,143,30,0,
+	1217,303,1,0,0,0,1218,1219,3,66,25,0,1219,1220,1,0,0,0,1220,1221,6,144,
+	20,0,1221,305,1,0,0,0,1222,1223,3,100,42,0,1223,1224,1,0,0,0,1224,1225,
+	6,145,21,0,1225,307,1,0,0,0,1226,1227,3,58,21,0,1227,1228,1,0,0,0,1228,
+	1229,6,146,11,0,1229,309,1,0,0,0,1230,1231,3,60,22,0,1231,1232,1,0,0,0,
+	1232,1233,6,147,11,0,1233,311,1,0,0,0,1234,1235,3,62,23,0,1235,1236,1,0,
+	0,0,1236,1237,6,148,11,0,1237,313,1,0,0,0,1238,1239,3,78,31,0,1239,1240,
+	1,0,0,0,1240,1241,6,149,14,0,1241,1242,6,149,15,0,1242,1243,6,149,15,0,
+	1243,315,1,0,0,0,1244,1245,3,116,50,0,1245,1246,1,0,0,0,1246,1247,6,150,
+	18,0,1247,317,1,0,0,0,1248,1249,3,120,52,0,1249,1250,1,0,0,0,1250,1251,
+	6,151,22,0,1251,319,1,0,0,0,1252,1253,3,228,106,0,1253,1254,1,0,0,0,1254,
+	1255,6,152,23,0,1255,321,1,0,0,0,1256,1257,3,58,21,0,1257,1258,1,0,0,0,
+	1258,1259,6,153,11,0,1259,323,1,0,0,0,1260,1261,3,60,22,0,1261,1262,1,0,
+	0,0,1262,1263,6,154,11,0,1263,325,1,0,0,0,1264,1265,3,62,23,0,1265,1266,
+	1,0,0,0,1266,1267,6,155,11,0,1267,327,1,0,0,0,1268,1269,3,78,31,0,1269,
+	1270,1,0,0,0,1270,1271,6,156,14,0,1271,1272,6,156,15,0,1272,329,1,0,0,0,
+	1273,1274,3,120,52,0,1274,1275,1,0,0,0,1275,1276,6,157,22,0,1276,331,1,
+	0,0,0,1277,1278,3,186,85,0,1278,1279,1,0,0,0,1279,1280,6,158,28,0,1280,
+	333,1,0,0,0,1281,1282,3,182,83,0,1282,1283,1,0,0,0,1283,1284,6,159,31,0,
+	1284,335,1,0,0,0,1285,1286,3,58,21,0,1286,1287,1,0,0,0,1287,1288,6,160,
+	11,0,1288,337,1,0,0,0,1289,1290,3,60,22,0,1290,1291,1,0,0,0,1291,1292,6,
+	161,11,0,1292,339,1,0,0,0,1293,1294,3,62,23,0,1294,1295,1,0,0,0,1295,1296,
+	6,162,11,0,1296,341,1,0,0,0,1297,1298,3,78,31,0,1298,1299,1,0,0,0,1299,
+	1300,6,163,14,0,1300,1301,6,163,15,0,1301,343,1,0,0,0,1302,1303,7,1,0,0,
+	1303,1304,7,9,0,0,1304,1305,7,15,0,0,1305,1306,7,7,0,0,1306,345,1,0,0,0,
+	1307,1308,3,58,21,0,1308,1309,1,0,0,0,1309,1310,6,165,11,0,1310,347,1,0,
+	0,0,1311,1312,3,60,22,0,1312,1313,1,0,0,0,1313,1314,6,166,11,0,1314,349,
+	1,0,0,0,1315,1316,3,62,23,0,1316,1317,1,0,0,0,1317,1318,6,167,11,0,1318,
+	351,1,0,0,0,1319,1320,3,78,31,0,1320,1321,1,0,0,0,1321,1322,6,168,14,0,
+	1322,1323,6,168,15,0,1323,353,1,0,0,0,1324,1325,7,15,0,0,1325,1326,7,19,
+	0,0,1326,1327,7,9,0,0,1327,1328,7,4,0,0,1328,1329,7,5,0,0,1329,1330,7,1,
+	0,0,1330,1331,7,7,0,0,1331,1332,7,9,0,0,1332,1333,7,2,0,0,1333,355,1,0,
+	0,0,1334,1335,3,58,21,0,1335,1336,1,0,0,0,1336,1337,6,170,11,0,1337,357,
+	1,0,0,0,1338,1339,3,60,22,0,1339,1340,1,0,0,0,1340,1341,6,171,11,0,1341,
+	359,1,0,0,0,1342,1343,3,62,23,0,1343,1344,1,0,0,0,1344,1345,6,172,11,0,
+	1345,361,1,0,0,0,1346,1347,3,180,82,0,1347,1348,1,0,0,0,1348,1349,6,173,
+	16,0,1349,1350,6,173,15,0,1350,363,1,0,0,0,1351,1352,5,58,0,0,1352,365,
+	1,0,0,0,1353,1359,3,90,37,0,1354,1359,3,80,32,0,1355,1359,3,120,52,0,1356,
+	1359,3,82,33,0,1357,1359,3,96,40,0,1358,1353,1,0,0,0,1358,1354,1,0,0,0,
+	1358,1355,1,0,0,0,1358,1356,1,0,0,0,1358,1357,1,0,0,0,1359,1360,1,0,0,0,
+	1360,1358,1,0,0,0,1360,1361,1,0,0,0,1361,367,1,0,0,0,1362,1363,3,58,21,
+	0,1363,1364,1,0,0,0,1364,1365,6,176,11,0,1365,369,1,0,0,0,1366,1367,3,60,
+	22,0,1367,1368,1,0,0,0,1368,1369,6,177,11,0,1369,371,1,0,0,0,1370,1371,
+	3,62,23,0,1371,1372,1,0,0,0,1372,1373,6,178,11,0,1373,373,1,0,0,0,1374,
+	1375,3,78,31,0,1375,1376,1,0,0,0,1376,1377,6,179,14,0,1377,1378,6,179,15,
+	0,1378,375,1,0,0,0,1379,1380,3,66,25,0,1380,1381,1,0,0,0,1381,1382,6,180,
+	20,0,1382,1383,6,180,15,0,1383,1384,6,180,32,0,1384,377,1,0,0,0,1385,1386,
+	3,100,42,0,1386,1387,1,0,0,0,1387,1388,6,181,21,0,1388,1389,6,181,15,0,
+	1389,1390,6,181,32,0,1390,379,1,0,0,0,1391,1392,3,58,21,0,1392,1393,1,0,
+	0,0,1393,1394,6,182,11,0,1394,381,1,0,0,0,1395,1396,3,60,22,0,1396,1397,
+	1,0,0,0,1397,1398,6,183,11,0,1398,383,1,0,0,0,1399,1400,3,62,23,0,1400,
+	1401,1,0,0,0,1401,1402,6,184,11,0,1402,385,1,0,0,0,1403,1404,3,364,174,
+	0,1404,1405,1,0,0,0,1405,1406,6,185,17,0,1406,1407,6,185,15,0,1407,1408,
+	6,185,7,0,1408,387,1,0,0,0,1409,1410,3,116,50,0,1410,1411,1,0,0,0,1411,
+	1412,6,186,18,0,1412,1413,6,186,15,0,1413,1414,6,186,7,0,1414,389,1,0,0,
+	0,1415,1416,3,58,21,0,1416,1417,1,0,0,0,1417,1418,6,187,11,0,1418,391,1,
+	0,0,0,1419,1420,3,60,22,0,1420,1421,1,0,0,0,1421,1422,6,188,11,0,1422,393,
+	1,0,0,0,1423,1424,3,62,23,0,1424,1425,1,0,0,0,1425,1426,6,189,11,0,1426,
+	395,1,0,0,0,1427,1428,3,186,85,0,1428,1429,1,0,0,0,1429,1430,6,190,15,0,
+	1430,1431,6,190,0,0,1431,1432,6,190,28,0,1432,397,1,0,0,0,1433,1434,3,182,
+	83,0,1434,1435,1,0,0,0,1435,1436,6,191,15,0,1436,1437,6,191,0,0,1437,1438,
+	6,191,31,0,1438,399,1,0,0,0,1439,1440,3,106,45,0,1440,1441,1,0,0,0,1441,
+	1442,6,192,15,0,1442,1443,6,192,0,0,1443,1444,6,192,33,0,1444,401,1,0,0,
+	0,1445,1446,3,78,31,0,1446,1447,1,0,0,0,1447,1448,6,193,14,0,1448,1449,
+	6,193,15,0,1449,403,1,0,0,0,65,0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,576,
+	586,590,593,602,604,615,622,627,666,671,680,687,692,694,705,713,716,718,
+	723,728,734,741,746,752,755,763,767,891,898,900,916,921,926,928,934,1023,
+	1027,1032,1037,1042,1044,1048,1050,1127,1131,1136,1358,1360,34,5,2,0,5,
 	4,0,5,6,0,5,1,0,5,3,0,5,8,0,5,12,0,5,14,0,5,10,0,5,5,0,5,11,0,0,1,0,7,69,
-	0,5,0,0,7,29,0,4,0,0,7,70,0,7,38,0,7,36,0,7,30,0,7,25,0,7,40,0,7,80,0,5,
-	13,0,5,7,0,7,72,0,7,90,0,7,89,0,7,88,0,5,9,0,7,71,0,5,15,0,7,33,0];
+	0,5,0,0,7,29,0,4,0,0,7,70,0,7,114,0,7,38,0,7,36,0,7,25,0,7,30,0,7,40,0,
+	7,80,0,5,13,0,5,7,0,7,90,0,7,89,0,7,72,0,7,88,0,5,9,0,7,71,0,5,15,0,7,33,
+	0];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.g4 b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
index 59c9ee6ca5770..bae91675fbb02 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.g4
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.g4
@@ -115,11 +115,21 @@ field
     ;
 
 fromCommand
-    : FROM indexIdentifier (COMMA indexIdentifier)* metadata?
+    : FROM indexPattern (COMMA indexPattern)* metadata?
     ;
 
-indexIdentifier
-    : INDEX_UNQUOTED_IDENTIFIER
+indexPattern
+    : clusterString COLON indexString
+    | indexString
+    ;
+
+clusterString
+    : UNQUOTED_SOURCE
+    ;
+
+indexString
+    : UNQUOTED_SOURCE
+    | QUOTED_STRING
     ;
 
 metadata
@@ -128,7 +138,7 @@ metadata
     ;
 
 metadataOption
-    : METADATA indexIdentifier (COMMA indexIdentifier)*
+    : METADATA UNQUOTED_SOURCE (COMMA UNQUOTED_SOURCE)*
     ;
 
 deprecated_metadata
@@ -136,7 +146,7 @@ deprecated_metadata
     ;
 
 metricsCommand
-    : METRICS indexIdentifier (COMMA indexIdentifier)* aggregates=fields? (BY grouping=fields)?
+    : METRICS indexPattern (COMMA indexPattern)* aggregates=fields? (BY grouping=fields)?
     ;
 
 evalCommand
@@ -289,5 +299,5 @@ enrichWithClause
     ;
 
 lookupCommand
-    : LOOKUP tableName=INDEX_UNQUOTED_IDENTIFIER ON matchFields=qualifiedNamePatterns
+    : LOOKUP tableName=indexPattern ON matchFields=qualifiedNamePatterns
     ;
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.interp b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
index 5900020590110..6c5edef9e98f0 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.interp
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.interp
@@ -151,7 +151,7 @@ UNKNOWN_CMD
 LINE_COMMENT
 MULTILINE_COMMENT
 WS
-INDEX_UNQUOTED_IDENTIFIER
+UNQUOTED_SOURCE
 EXPLAIN_WS
 EXPLAIN_LINE_COMMENT
 EXPLAIN_MULTILINE_COMMENT
@@ -269,7 +269,9 @@ rowCommand
 fields
 field
 fromCommand
-indexIdentifier
+indexPattern
+clusterString
+indexString
 metadata
 metadataOption
 deprecated_metadata
@@ -312,4 +314,4 @@ lookupCommand
 
 
 atn:
-[4, 1, 124, 554, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 122, 8, 1, 10, 1, 12, 1, 125, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 133, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 149, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 161, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 168, 8, 5, 10, 5, 12, 5, 171, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 178, 8, 5, 1, 5, 1, 5, 3, 5, 182, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 190, 8, 5, 10, 5, 12, 5, 193, 9, 5, 1, 6, 1, 6, 3, 6, 197, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 204, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 209, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 216, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 222, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 230, 8, 8, 10, 8, 12, 8, 233, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 243, 8, 9, 1, 9, 1, 9, 1, 9, 5, 9, 248, 8, 9, 10, 9, 12, 9, 251, 9, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 259, 8, 10, 10, 10, 12, 10, 262, 9, 10, 3, 10, 264, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 5, 13, 276, 8, 13, 10, 13, 12, 13, 279, 9, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 286, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 5, 15, 292, 8, 15, 10, 15, 12, 15, 295, 9, 15, 1, 15, 3, 15, 298, 8, 15, 1, 16, 1, 16, 1, 17, 1, 17, 3, 17, 304, 8, 17, 1, 18, 1, 18, 1, 18, 1, 18, 5, 18, 310, 8, 18, 10, 18, 12, 18, 313, 9, 18, 1, 19, 1, 19, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 20, 5, 20, 323, 8, 20, 10, 20, 12, 20, 326, 9, 20, 1, 20, 3, 20, 329, 8, 20, 1, 20, 1, 20, 3, 20, 333, 8, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 3, 22, 340, 8, 22, 1, 22, 1, 22, 3, 22, 344, 8, 22, 1, 23, 1, 23, 1, 23, 1, 23, 3, 23, 350, 8, 23, 1, 24, 1, 24, 1, 24, 5, 24, 355, 8, 24, 10, 24, 12, 24, 358, 9, 24, 1, 25, 1, 25, 1, 25, 5, 25, 363, 8, 25, 10, 25, 12, 25, 366, 9, 25, 1, 26, 1, 26, 1, 26, 5, 26, 371, 8, 26, 10, 26, 12, 26, 374, 9, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 5, 29, 393, 8, 29, 10, 29, 12, 29, 396, 9, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 5, 29, 404, 8, 29, 10, 29, 12, 29, 407, 9, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 1, 29, 5, 29, 415, 8, 29, 10, 29, 12, 29, 418, 9, 29, 1, 29, 1, 29, 3, 29, 422, 8, 29, 1, 30, 1, 30, 3, 30, 426, 8, 30, 1, 31, 1, 31, 1, 31, 1, 32, 1, 32, 1, 32, 1, 32, 5, 32, 435, 8, 32, 10, 32, 12, 32, 438, 9, 32, 1, 33, 1, 33, 3, 33, 442, 8, 33, 1, 33, 1, 33, 3, 33, 446, 8, 33, 1, 34, 1, 34, 1, 34, 1, 35, 1, 35, 1, 35, 1, 36, 1, 36, 1, 36, 1, 36, 5, 36, 458, 8, 36, 10, 36, 12, 36, 461, 9, 36, 1, 37, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 3, 38, 471, 8, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 41, 1, 41, 1, 41, 5, 41, 483, 8, 41, 10, 41, 12, 41, 486, 9, 41, 1, 42, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 44, 1, 44, 3, 44, 496, 8, 44, 1, 45, 3, 45, 499, 8, 45, 1, 45, 1, 45, 1, 46, 3, 46, 504, 8, 46, 1, 46, 1, 46, 1, 47, 1, 47, 1, 48, 1, 48, 1, 49, 1, 49, 1, 49, 1, 50, 1, 50, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 53, 3, 53, 529, 8, 53, 1, 53, 1, 53, 1, 53, 1, 53, 5, 53, 535, 8, 53, 10, 53, 12, 53, 538, 9, 53, 3, 53, 540, 8, 53, 1, 54, 1, 54, 1, 54, 3, 54, 545, 8, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 1, 55, 0, 4, 2, 10, 16, 18, 56, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 0, 7, 1, 0, 63, 64, 1, 0, 65, 67, 1, 0, 71, 72, 2, 0, 35, 35, 39, 39, 1, 0, 42, 43, 2, 0, 41, 41, 55, 55, 2, 0, 56, 56, 58, 62, 580, 0, 112, 1, 0, 0, 0, 2, 115, 1, 0, 0, 0, 4, 132, 1, 0, 0, 0, 6, 148, 1, 0, 0, 0, 8, 150, 1, 0, 0, 0, 10, 181, 1, 0, 0, 0, 12, 208, 1, 0, 0, 0, 14, 215, 1, 0, 0, 0, 16, 221, 1, 0, 0, 0, 18, 242, 1, 0, 0, 0, 20, 252, 1, 0, 0, 0, 22, 267, 1, 0, 0, 0, 24, 269, 1, 0, 0, 0, 26, 272, 1, 0, 0, 0, 28, 285, 1, 0, 0, 0, 30, 287, 1, 0, 0, 0, 32, 299, 1, 0, 0, 0, 34, 303, 1, 0, 0, 0, 36, 305, 1, 0, 0, 0, 38, 314, 1, 0, 0, 0, 40, 318, 1, 0, 0, 0, 42, 334, 1, 0, 0, 0, 44, 337, 1, 0, 0, 0, 46, 345, 1, 0, 0, 0, 48, 351, 1, 0, 0, 0, 50, 359, 1, 0, 0, 0, 52, 367, 1, 0, 0, 0, 54, 375, 1, 0, 0, 0, 56, 377, 1, 0, 0, 0, 58, 421, 1, 0, 0, 0, 60, 425, 1, 0, 0, 0, 62, 427, 1, 0, 0, 0, 64, 430, 1, 0, 0, 0, 66, 439, 1, 0, 0, 0, 68, 447, 1, 0, 0, 0, 70, 450, 1, 0, 0, 0, 72, 453, 1, 0, 0, 0, 74, 462, 1, 0, 0, 0, 76, 466, 1, 0, 0, 0, 78, 472, 1, 0, 0, 0, 80, 476, 1, 0, 0, 0, 82, 479, 1, 0, 0, 0, 84, 487, 1, 0, 0, 0, 86, 491, 1, 0, 0, 0, 88, 495, 1, 0, 0, 0, 90, 498, 1, 0, 0, 0, 92, 503, 1, 0, 0, 0, 94, 507, 1, 0, 0, 0, 96, 509, 1, 0, 0, 0, 98, 511, 1, 0, 0, 0, 100, 514, 1, 0, 0, 0, 102, 518, 1, 0, 0, 0, 104, 521, 1, 0, 0, 0, 106, 524, 1, 0, 0, 0, 108, 544, 1, 0, 0, 0, 110, 548, 1, 0, 0, 0, 112, 113, 3, 2, 1, 0, 113, 114, 5, 0, 0, 1, 114, 1, 1, 0, 0, 0, 115, 116, 6, 1, -1, 0, 116, 117, 3, 4, 2, 0, 117, 123, 1, 0, 0, 0, 118, 119, 10, 1, 0, 0, 119, 120, 5, 29, 0, 0, 120, 122, 3, 6, 3, 0, 121, 118, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 3, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 133, 3, 98, 49, 0, 127, 133, 3, 30, 15, 0, 128, 133, 3, 24, 12, 0, 129, 133, 3, 40, 20, 0, 130, 133, 3, 102, 51, 0, 131, 133, 3, 104, 52, 0, 132, 126, 1, 0, 0, 0, 132, 127, 1, 0, 0, 0, 132, 128, 1, 0, 0, 0, 132, 129, 1, 0, 0, 0, 132, 130, 1, 0, 0, 0, 132, 131, 1, 0, 0, 0, 133, 5, 1, 0, 0, 0, 134, 149, 3, 42, 21, 0, 135, 149, 3, 46, 23, 0, 136, 149, 3, 62, 31, 0, 137, 149, 3, 110, 55, 0, 138, 149, 3, 68, 34, 0, 139, 149, 3, 64, 32, 0, 140, 149, 3, 44, 22, 0, 141, 149, 3, 8, 4, 0, 142, 149, 3, 70, 35, 0, 143, 149, 3, 72, 36, 0, 144, 149, 3, 76, 38, 0, 145, 149, 3, 78, 39, 0, 146, 149, 3, 106, 53, 0, 147, 149, 3, 80, 40, 0, 148, 134, 1, 0, 0, 0, 148, 135, 1, 0, 0, 0, 148, 136, 1, 0, 0, 0, 148, 137, 1, 0, 0, 0, 148, 138, 1, 0, 0, 0, 148, 139, 1, 0, 0, 0, 148, 140, 1, 0, 0, 0, 148, 141, 1, 0, 0, 0, 148, 142, 1, 0, 0, 0, 148, 143, 1, 0, 0, 0, 148, 144, 1, 0, 0, 0, 148, 145, 1, 0, 0, 0, 148, 146, 1, 0, 0, 0, 148, 147, 1, 0, 0, 0, 149, 7, 1, 0, 0, 0, 150, 151, 5, 20, 0, 0, 151, 152, 3, 10, 5, 0, 152, 9, 1, 0, 0, 0, 153, 154, 6, 5, -1, 0, 154, 155, 5, 48, 0, 0, 155, 182, 3, 10, 5, 7, 156, 182, 3, 14, 7, 0, 157, 182, 3, 12, 6, 0, 158, 160, 3, 14, 7, 0, 159, 161, 5, 48, 0, 0, 160, 159, 1, 0, 0, 0, 160, 161, 1, 0, 0, 0, 161, 162, 1, 0, 0, 0, 162, 163, 5, 45, 0, 0, 163, 164, 5, 44, 0, 0, 164, 169, 3, 14, 7, 0, 165, 166, 5, 38, 0, 0, 166, 168, 3, 14, 7, 0, 167, 165, 1, 0, 0, 0, 168, 171, 1, 0, 0, 0, 169, 167, 1, 0, 0, 0, 169, 170, 1, 0, 0, 0, 170, 172, 1, 0, 0, 0, 171, 169, 1, 0, 0, 0, 172, 173, 5, 54, 0, 0, 173, 182, 1, 0, 0, 0, 174, 175, 3, 14, 7, 0, 175, 177, 5, 46, 0, 0, 176, 178, 5, 48, 0, 0, 177, 176, 1, 0, 0, 0, 177, 178, 1, 0, 0, 0, 178, 179, 1, 0, 0, 0, 179, 180, 5, 49, 0, 0, 180, 182, 1, 0, 0, 0, 181, 153, 1, 0, 0, 0, 181, 156, 1, 0, 0, 0, 181, 157, 1, 0, 0, 0, 181, 158, 1, 0, 0, 0, 181, 174, 1, 0, 0, 0, 182, 191, 1, 0, 0, 0, 183, 184, 10, 4, 0, 0, 184, 185, 5, 34, 0, 0, 185, 190, 3, 10, 5, 5, 186, 187, 10, 3, 0, 0, 187, 188, 5, 51, 0, 0, 188, 190, 3, 10, 5, 4, 189, 183, 1, 0, 0, 0, 189, 186, 1, 0, 0, 0, 190, 193, 1, 0, 0, 0, 191, 189, 1, 0, 0, 0, 191, 192, 1, 0, 0, 0, 192, 11, 1, 0, 0, 0, 193, 191, 1, 0, 0, 0, 194, 196, 3, 14, 7, 0, 195, 197, 5, 48, 0, 0, 196, 195, 1, 0, 0, 0, 196, 197, 1, 0, 0, 0, 197, 198, 1, 0, 0, 0, 198, 199, 5, 47, 0, 0, 199, 200, 3, 94, 47, 0, 200, 209, 1, 0, 0, 0, 201, 203, 3, 14, 7, 0, 202, 204, 5, 48, 0, 0, 203, 202, 1, 0, 0, 0, 203, 204, 1, 0, 0, 0, 204, 205, 1, 0, 0, 0, 205, 206, 5, 53, 0, 0, 206, 207, 3, 94, 47, 0, 207, 209, 1, 0, 0, 0, 208, 194, 1, 0, 0, 0, 208, 201, 1, 0, 0, 0, 209, 13, 1, 0, 0, 0, 210, 216, 3, 16, 8, 0, 211, 212, 3, 16, 8, 0, 212, 213, 3, 96, 48, 0, 213, 214, 3, 16, 8, 0, 214, 216, 1, 0, 0, 0, 215, 210, 1, 0, 0, 0, 215, 211, 1, 0, 0, 0, 216, 15, 1, 0, 0, 0, 217, 218, 6, 8, -1, 0, 218, 222, 3, 18, 9, 0, 219, 220, 7, 0, 0, 0, 220, 222, 3, 16, 8, 3, 221, 217, 1, 0, 0, 0, 221, 219, 1, 0, 0, 0, 222, 231, 1, 0, 0, 0, 223, 224, 10, 2, 0, 0, 224, 225, 7, 1, 0, 0, 225, 230, 3, 16, 8, 3, 226, 227, 10, 1, 0, 0, 227, 228, 7, 0, 0, 0, 228, 230, 3, 16, 8, 2, 229, 223, 1, 0, 0, 0, 229, 226, 1, 0, 0, 0, 230, 233, 1, 0, 0, 0, 231, 229, 1, 0, 0, 0, 231, 232, 1, 0, 0, 0, 232, 17, 1, 0, 0, 0, 233, 231, 1, 0, 0, 0, 234, 235, 6, 9, -1, 0, 235, 243, 3, 58, 29, 0, 236, 243, 3, 48, 24, 0, 237, 243, 3, 20, 10, 0, 238, 239, 5, 44, 0, 0, 239, 240, 3, 10, 5, 0, 240, 241, 5, 54, 0, 0, 241, 243, 1, 0, 0, 0, 242, 234, 1, 0, 0, 0, 242, 236, 1, 0, 0, 0, 242, 237, 1, 0, 0, 0, 242, 238, 1, 0, 0, 0, 243, 249, 1, 0, 0, 0, 244, 245, 10, 1, 0, 0, 245, 246, 5, 37, 0, 0, 246, 248, 3, 22, 11, 0, 247, 244, 1, 0, 0, 0, 248, 251, 1, 0, 0, 0, 249, 247, 1, 0, 0, 0, 249, 250, 1, 0, 0, 0, 250, 19, 1, 0, 0, 0, 251, 249, 1, 0, 0, 0, 252, 253, 3, 54, 27, 0, 253, 263, 5, 44, 0, 0, 254, 264, 5, 65, 0, 0, 255, 260, 3, 10, 5, 0, 256, 257, 5, 38, 0, 0, 257, 259, 3, 10, 5, 0, 258, 256, 1, 0, 0, 0, 259, 262, 1, 0, 0, 0, 260, 258, 1, 0, 0, 0, 260, 261, 1, 0, 0, 0, 261, 264, 1, 0, 0, 0, 262, 260, 1, 0, 0, 0, 263, 254, 1, 0, 0, 0, 263, 255, 1, 0, 0, 0, 263, 264, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 266, 5, 54, 0, 0, 266, 21, 1, 0, 0, 0, 267, 268, 3, 54, 27, 0, 268, 23, 1, 0, 0, 0, 269, 270, 5, 16, 0, 0, 270, 271, 3, 26, 13, 0, 271, 25, 1, 0, 0, 0, 272, 277, 3, 28, 14, 0, 273, 274, 5, 38, 0, 0, 274, 276, 3, 28, 14, 0, 275, 273, 1, 0, 0, 0, 276, 279, 1, 0, 0, 0, 277, 275, 1, 0, 0, 0, 277, 278, 1, 0, 0, 0, 278, 27, 1, 0, 0, 0, 279, 277, 1, 0, 0, 0, 280, 286, 3, 10, 5, 0, 281, 282, 3, 48, 24, 0, 282, 283, 5, 36, 0, 0, 283, 284, 3, 10, 5, 0, 284, 286, 1, 0, 0, 0, 285, 280, 1, 0, 0, 0, 285, 281, 1, 0, 0, 0, 286, 29, 1, 0, 0, 0, 287, 288, 5, 6, 0, 0, 288, 293, 3, 32, 16, 0, 289, 290, 5, 38, 0, 0, 290, 292, 3, 32, 16, 0, 291, 289, 1, 0, 0, 0, 292, 295, 1, 0, 0, 0, 293, 291, 1, 0, 0, 0, 293, 294, 1, 0, 0, 0, 294, 297, 1, 0, 0, 0, 295, 293, 1, 0, 0, 0, 296, 298, 3, 34, 17, 0, 297, 296, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 31, 1, 0, 0, 0, 299, 300, 5, 25, 0, 0, 300, 33, 1, 0, 0, 0, 301, 304, 3, 36, 18, 0, 302, 304, 3, 38, 19, 0, 303, 301, 1, 0, 0, 0, 303, 302, 1, 0, 0, 0, 304, 35, 1, 0, 0, 0, 305, 306, 5, 76, 0, 0, 306, 311, 3, 32, 16, 0, 307, 308, 5, 38, 0, 0, 308, 310, 3, 32, 16, 0, 309, 307, 1, 0, 0, 0, 310, 313, 1, 0, 0, 0, 311, 309, 1, 0, 0, 0, 311, 312, 1, 0, 0, 0, 312, 37, 1, 0, 0, 0, 313, 311, 1, 0, 0, 0, 314, 315, 5, 69, 0, 0, 315, 316, 3, 36, 18, 0, 316, 317, 5, 70, 0, 0, 317, 39, 1, 0, 0, 0, 318, 319, 5, 13, 0, 0, 319, 324, 3, 32, 16, 0, 320, 321, 5, 38, 0, 0, 321, 323, 3, 32, 16, 0, 322, 320, 1, 0, 0, 0, 323, 326, 1, 0, 0, 0, 324, 322, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325, 328, 1, 0, 0, 0, 326, 324, 1, 0, 0, 0, 327, 329, 3, 26, 13, 0, 328, 327, 1, 0, 0, 0, 328, 329, 1, 0, 0, 0, 329, 332, 1, 0, 0, 0, 330, 331, 5, 33, 0, 0, 331, 333, 3, 26, 13, 0, 332, 330, 1, 0, 0, 0, 332, 333, 1, 0, 0, 0, 333, 41, 1, 0, 0, 0, 334, 335, 5, 4, 0, 0, 335, 336, 3, 26, 13, 0, 336, 43, 1, 0, 0, 0, 337, 339, 5, 19, 0, 0, 338, 340, 3, 26, 13, 0, 339, 338, 1, 0, 0, 0, 339, 340, 1, 0, 0, 0, 340, 343, 1, 0, 0, 0, 341, 342, 5, 33, 0, 0, 342, 344, 3, 26, 13, 0, 343, 341, 1, 0, 0, 0, 343, 344, 1, 0, 0, 0, 344, 45, 1, 0, 0, 0, 345, 346, 5, 8, 0, 0, 346, 349, 3, 26, 13, 0, 347, 348, 5, 33, 0, 0, 348, 350, 3, 26, 13, 0, 349, 347, 1, 0, 0, 0, 349, 350, 1, 0, 0, 0, 350, 47, 1, 0, 0, 0, 351, 356, 3, 54, 27, 0, 352, 353, 5, 40, 0, 0, 353, 355, 3, 54, 27, 0, 354, 352, 1, 0, 0, 0, 355, 358, 1, 0, 0, 0, 356, 354, 1, 0, 0, 0, 356, 357, 1, 0, 0, 0, 357, 49, 1, 0, 0, 0, 358, 356, 1, 0, 0, 0, 359, 364, 3, 56, 28, 0, 360, 361, 5, 40, 0, 0, 361, 363, 3, 56, 28, 0, 362, 360, 1, 0, 0, 0, 363, 366, 1, 0, 0, 0, 364, 362, 1, 0, 0, 0, 364, 365, 1, 0, 0, 0, 365, 51, 1, 0, 0, 0, 366, 364, 1, 0, 0, 0, 367, 372, 3, 50, 25, 0, 368, 369, 5, 38, 0, 0, 369, 371, 3, 50, 25, 0, 370, 368, 1, 0, 0, 0, 371, 374, 1, 0, 0, 0, 372, 370, 1, 0, 0, 0, 372, 373, 1, 0, 0, 0, 373, 53, 1, 0, 0, 0, 374, 372, 1, 0, 0, 0, 375, 376, 7, 2, 0, 0, 376, 55, 1, 0, 0, 0, 377, 378, 5, 80, 0, 0, 378, 57, 1, 0, 0, 0, 379, 422, 5, 49, 0, 0, 380, 381, 3, 92, 46, 0, 381, 382, 5, 71, 0, 0, 382, 422, 1, 0, 0, 0, 383, 422, 3, 90, 45, 0, 384, 422, 3, 92, 46, 0, 385, 422, 3, 86, 43, 0, 386, 422, 3, 60, 30, 0, 387, 422, 3, 94, 47, 0, 388, 389, 5, 69, 0, 0, 389, 394, 3, 88, 44, 0, 390, 391, 5, 38, 0, 0, 391, 393, 3, 88, 44, 0, 392, 390, 1, 0, 0, 0, 393, 396, 1, 0, 0, 0, 394, 392, 1, 0, 0, 0, 394, 395, 1, 0, 0, 0, 395, 397, 1, 0, 0, 0, 396, 394, 1, 0, 0, 0, 397, 398, 5, 70, 0, 0, 398, 422, 1, 0, 0, 0, 399, 400, 5, 69, 0, 0, 400, 405, 3, 86, 43, 0, 401, 402, 5, 38, 0, 0, 402, 404, 3, 86, 43, 0, 403, 401, 1, 0, 0, 0, 404, 407, 1, 0, 0, 0, 405, 403, 1, 0, 0, 0, 405, 406, 1, 0, 0, 0, 406, 408, 1, 0, 0, 0, 407, 405, 1, 0, 0, 0, 408, 409, 5, 70, 0, 0, 409, 422, 1, 0, 0, 0, 410, 411, 5, 69, 0, 0, 411, 416, 3, 94, 47, 0, 412, 413, 5, 38, 0, 0, 413, 415, 3, 94, 47, 0, 414, 412, 1, 0, 0, 0, 415, 418, 1, 0, 0, 0, 416, 414, 1, 0, 0, 0, 416, 417, 1, 0, 0, 0, 417, 419, 1, 0, 0, 0, 418, 416, 1, 0, 0, 0, 419, 420, 5, 70, 0, 0, 420, 422, 1, 0, 0, 0, 421, 379, 1, 0, 0, 0, 421, 380, 1, 0, 0, 0, 421, 383, 1, 0, 0, 0, 421, 384, 1, 0, 0, 0, 421, 385, 1, 0, 0, 0, 421, 386, 1, 0, 0, 0, 421, 387, 1, 0, 0, 0, 421, 388, 1, 0, 0, 0, 421, 399, 1, 0, 0, 0, 421, 410, 1, 0, 0, 0, 422, 59, 1, 0, 0, 0, 423, 426, 5, 52, 0, 0, 424, 426, 5, 68, 0, 0, 425, 423, 1, 0, 0, 0, 425, 424, 1, 0, 0, 0, 426, 61, 1, 0, 0, 0, 427, 428, 5, 10, 0, 0, 428, 429, 5, 31, 0, 0, 429, 63, 1, 0, 0, 0, 430, 431, 5, 18, 0, 0, 431, 436, 3, 66, 33, 0, 432, 433, 5, 38, 0, 0, 433, 435, 3, 66, 33, 0, 434, 432, 1, 0, 0, 0, 435, 438, 1, 0, 0, 0, 436, 434, 1, 0, 0, 0, 436, 437, 1, 0, 0, 0, 437, 65, 1, 0, 0, 0, 438, 436, 1, 0, 0, 0, 439, 441, 3, 10, 5, 0, 440, 442, 7, 3, 0, 0, 441, 440, 1, 0, 0, 0, 441, 442, 1, 0, 0, 0, 442, 445, 1, 0, 0, 0, 443, 444, 5, 50, 0, 0, 444, 446, 7, 4, 0, 0, 445, 443, 1, 0, 0, 0, 445, 446, 1, 0, 0, 0, 446, 67, 1, 0, 0, 0, 447, 448, 5, 9, 0, 0, 448, 449, 3, 52, 26, 0, 449, 69, 1, 0, 0, 0, 450, 451, 5, 2, 0, 0, 451, 452, 3, 52, 26, 0, 452, 71, 1, 0, 0, 0, 453, 454, 5, 15, 0, 0, 454, 459, 3, 74, 37, 0, 455, 456, 5, 38, 0, 0, 456, 458, 3, 74, 37, 0, 457, 455, 1, 0, 0, 0, 458, 461, 1, 0, 0, 0, 459, 457, 1, 0, 0, 0, 459, 460, 1, 0, 0, 0, 460, 73, 1, 0, 0, 0, 461, 459, 1, 0, 0, 0, 462, 463, 3, 50, 25, 0, 463, 464, 5, 84, 0, 0, 464, 465, 3, 50, 25, 0, 465, 75, 1, 0, 0, 0, 466, 467, 5, 1, 0, 0, 467, 468, 3, 18, 9, 0, 468, 470, 3, 94, 47, 0, 469, 471, 3, 82, 41, 0, 470, 469, 1, 0, 0, 0, 470, 471, 1, 0, 0, 0, 471, 77, 1, 0, 0, 0, 472, 473, 5, 7, 0, 0, 473, 474, 3, 18, 9, 0, 474, 475, 3, 94, 47, 0, 475, 79, 1, 0, 0, 0, 476, 477, 5, 14, 0, 0, 477, 478, 3, 48, 24, 0, 478, 81, 1, 0, 0, 0, 479, 484, 3, 84, 42, 0, 480, 481, 5, 38, 0, 0, 481, 483, 3, 84, 42, 0, 482, 480, 1, 0, 0, 0, 483, 486, 1, 0, 0, 0, 484, 482, 1, 0, 0, 0, 484, 485, 1, 0, 0, 0, 485, 83, 1, 0, 0, 0, 486, 484, 1, 0, 0, 0, 487, 488, 3, 54, 27, 0, 488, 489, 5, 36, 0, 0, 489, 490, 3, 58, 29, 0, 490, 85, 1, 0, 0, 0, 491, 492, 7, 5, 0, 0, 492, 87, 1, 0, 0, 0, 493, 496, 3, 90, 45, 0, 494, 496, 3, 92, 46, 0, 495, 493, 1, 0, 0, 0, 495, 494, 1, 0, 0, 0, 496, 89, 1, 0, 0, 0, 497, 499, 7, 0, 0, 0, 498, 497, 1, 0, 0, 0, 498, 499, 1, 0, 0, 0, 499, 500, 1, 0, 0, 0, 500, 501, 5, 32, 0, 0, 501, 91, 1, 0, 0, 0, 502, 504, 7, 0, 0, 0, 503, 502, 1, 0, 0, 0, 503, 504, 1, 0, 0, 0, 504, 505, 1, 0, 0, 0, 505, 506, 5, 31, 0, 0, 506, 93, 1, 0, 0, 0, 507, 508, 5, 30, 0, 0, 508, 95, 1, 0, 0, 0, 509, 510, 7, 6, 0, 0, 510, 97, 1, 0, 0, 0, 511, 512, 5, 5, 0, 0, 512, 513, 3, 100, 50, 0, 513, 99, 1, 0, 0, 0, 514, 515, 5, 69, 0, 0, 515, 516, 3, 2, 1, 0, 516, 517, 5, 70, 0, 0, 517, 101, 1, 0, 0, 0, 518, 519, 5, 17, 0, 0, 519, 520, 5, 106, 0, 0, 520, 103, 1, 0, 0, 0, 521, 522, 5, 12, 0, 0, 522, 523, 5, 110, 0, 0, 523, 105, 1, 0, 0, 0, 524, 525, 5, 3, 0, 0, 525, 528, 5, 90, 0, 0, 526, 527, 5, 88, 0, 0, 527, 529, 3, 50, 25, 0, 528, 526, 1, 0, 0, 0, 528, 529, 1, 0, 0, 0, 529, 539, 1, 0, 0, 0, 530, 531, 5, 89, 0, 0, 531, 536, 3, 108, 54, 0, 532, 533, 5, 38, 0, 0, 533, 535, 3, 108, 54, 0, 534, 532, 1, 0, 0, 0, 535, 538, 1, 0, 0, 0, 536, 534, 1, 0, 0, 0, 536, 537, 1, 0, 0, 0, 537, 540, 1, 0, 0, 0, 538, 536, 1, 0, 0, 0, 539, 530, 1, 0, 0, 0, 539, 540, 1, 0, 0, 0, 540, 107, 1, 0, 0, 0, 541, 542, 3, 50, 25, 0, 542, 543, 5, 36, 0, 0, 543, 545, 1, 0, 0, 0, 544, 541, 1, 0, 0, 0, 544, 545, 1, 0, 0, 0, 545, 546, 1, 0, 0, 0, 546, 547, 3, 50, 25, 0, 547, 109, 1, 0, 0, 0, 548, 549, 5, 11, 0, 0, 549, 550, 5, 25, 0, 0, 550, 551, 5, 88, 0, 0, 551, 552, 3, 52, 26, 0, 552, 111, 1, 0, 0, 0, 53, 123, 132, 148, 160, 169, 177, 181, 189, 191, 196, 203, 208, 215, 221, 229, 231, 242, 249, 260, 263, 277, 285, 293, 297, 303, 311, 324, 328, 332, 339, 343, 349, 356, 364, 372, 394, 405, 416, 421, 425, 436, 441, 445, 459, 470, 484, 495, 498, 503, 528, 536, 539, 544]
\ No newline at end of file
+[4, 1, 124, 567, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 2, 30, 7, 30, 2, 31, 7, 31, 2, 32, 7, 32, 2, 33, 7, 33, 2, 34, 7, 34, 2, 35, 7, 35, 2, 36, 7, 36, 2, 37, 7, 37, 2, 38, 7, 38, 2, 39, 7, 39, 2, 40, 7, 40, 2, 41, 7, 41, 2, 42, 7, 42, 2, 43, 7, 43, 2, 44, 7, 44, 2, 45, 7, 45, 2, 46, 7, 46, 2, 47, 7, 47, 2, 48, 7, 48, 2, 49, 7, 49, 2, 50, 7, 50, 2, 51, 7, 51, 2, 52, 7, 52, 2, 53, 7, 53, 2, 54, 7, 54, 2, 55, 7, 55, 2, 56, 7, 56, 2, 57, 7, 57, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 126, 8, 1, 10, 1, 12, 1, 129, 9, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 137, 8, 2, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 3, 3, 153, 8, 3, 1, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 165, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 172, 8, 5, 10, 5, 12, 5, 175, 9, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 3, 5, 182, 8, 5, 1, 5, 1, 5, 3, 5, 186, 8, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 1, 5, 5, 5, 194, 8, 5, 10, 5, 12, 5, 197, 9, 5, 1, 6, 1, 6, 3, 6, 201, 8, 6, 1, 6, 1, 6, 1, 6, 1, 6, 1, 6, 3, 6, 208, 8, 6, 1, 6, 1, 6, 1, 6, 3, 6, 213, 8, 6, 1, 7, 1, 7, 1, 7, 1, 7, 1, 7, 3, 7, 220, 8, 7, 1, 8, 1, 8, 1, 8, 1, 8, 3, 8, 226, 8, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 5, 8, 234, 8, 8, 10, 8, 12, 8, 237, 9, 8, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 1, 9, 3, 9, 247, 8, 9, 1, 9, 1, 9, 1, 9, 5, 9, 252, 8, 9, 10, 9, 12, 9, 255, 9, 9, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 1, 10, 5, 10, 263, 8, 10, 10, 10, 12, 10, 266, 9, 10, 3, 10, 268, 8, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 5, 13, 280, 8, 13, 10, 13, 12, 13, 283, 9, 13, 1, 14, 1, 14, 1, 14, 1, 14, 1, 14, 3, 14, 290, 8, 14, 1, 15, 1, 15, 1, 15, 1, 15, 5, 15, 296, 8, 15, 10, 15, 12, 15, 299, 9, 15, 1, 15, 3, 15, 302, 8, 15, 1, 16, 1, 16, 1, 16, 1, 16, 1, 16, 3, 16, 309, 8, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 19, 1, 19, 3, 19, 317, 8, 19, 1, 20, 1, 20, 1, 20, 1, 20, 5, 20, 323, 8, 20, 10, 20, 12, 20, 326, 9, 20, 1, 21, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 5, 22, 336, 8, 22, 10, 22, 12, 22, 339, 9, 22, 1, 22, 3, 22, 342, 8, 22, 1, 22, 1, 22, 3, 22, 346, 8, 22, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 3, 24, 353, 8, 24, 1, 24, 1, 24, 3, 24, 357, 8, 24, 1, 25, 1, 25, 1, 25, 1, 25, 3, 25, 363, 8, 25, 1, 26, 1, 26, 1, 26, 5, 26, 368, 8, 26, 10, 26, 12, 26, 371, 9, 26, 1, 27, 1, 27, 1, 27, 5, 27, 376, 8, 27, 10, 27, 12, 27, 379, 9, 27, 1, 28, 1, 28, 1, 28, 5, 28, 384, 8, 28, 10, 28, 12, 28, 387, 9, 28, 1, 29, 1, 29, 1, 30, 1, 30, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 406, 8, 31, 10, 31, 12, 31, 409, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 417, 8, 31, 10, 31, 12, 31, 420, 9, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 1, 31, 5, 31, 428, 8, 31, 10, 31, 12, 31, 431, 9, 31, 1, 31, 1, 31, 3, 31, 435, 8, 31, 1, 32, 1, 32, 3, 32, 439, 8, 32, 1, 33, 1, 33, 1, 33, 1, 34, 1, 34, 1, 34, 1, 34, 5, 34, 448, 8, 34, 10, 34, 12, 34, 451, 9, 34, 1, 35, 1, 35, 3, 35, 455, 8, 35, 1, 35, 1, 35, 3, 35, 459, 8, 35, 1, 36, 1, 36, 1, 36, 1, 37, 1, 37, 1, 37, 1, 38, 1, 38, 1, 38, 1, 38, 5, 38, 471, 8, 38, 10, 38, 12, 38, 474, 9, 38, 1, 39, 1, 39, 1, 39, 1, 39, 1, 40, 1, 40, 1, 40, 1, 40, 3, 40, 484, 8, 40, 1, 41, 1, 41, 1, 41, 1, 41, 1, 42, 1, 42, 1, 42, 1, 43, 1, 43, 1, 43, 5, 43, 496, 8, 43, 10, 43, 12, 43, 499, 9, 43, 1, 44, 1, 44, 1, 44, 1, 44, 1, 45, 1, 45, 1, 46, 1, 46, 3, 46, 509, 8, 46, 1, 47, 3, 47, 512, 8, 47, 1, 47, 1, 47, 1, 48, 3, 48, 517, 8, 48, 1, 48, 1, 48, 1, 49, 1, 49, 1, 50, 1, 50, 1, 51, 1, 51, 1, 51, 1, 52, 1, 52, 1, 52, 1, 52, 1, 53, 1, 53, 1, 53, 1, 54, 1, 54, 1, 54, 1, 55, 1, 55, 1, 55, 1, 55, 3, 55, 542, 8, 55, 1, 55, 1, 55, 1, 55, 1, 55, 5, 55, 548, 8, 55, 10, 55, 12, 55, 551, 9, 55, 3, 55, 553, 8, 55, 1, 56, 1, 56, 1, 56, 3, 56, 558, 8, 56, 1, 56, 1, 56, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 1, 57, 0, 4, 2, 10, 16, 18, 58, 0, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102, 104, 106, 108, 110, 112, 114, 0, 8, 1, 0, 63, 64, 1, 0, 65, 67, 2, 0, 25, 25, 30, 30, 1, 0, 71, 72, 2, 0, 35, 35, 39, 39, 1, 0, 42, 43, 2, 0, 41, 41, 55, 55, 2, 0, 56, 56, 58, 62, 592, 0, 116, 1, 0, 0, 0, 2, 119, 1, 0, 0, 0, 4, 136, 1, 0, 0, 0, 6, 152, 1, 0, 0, 0, 8, 154, 1, 0, 0, 0, 10, 185, 1, 0, 0, 0, 12, 212, 1, 0, 0, 0, 14, 219, 1, 0, 0, 0, 16, 225, 1, 0, 0, 0, 18, 246, 1, 0, 0, 0, 20, 256, 1, 0, 0, 0, 22, 271, 1, 0, 0, 0, 24, 273, 1, 0, 0, 0, 26, 276, 1, 0, 0, 0, 28, 289, 1, 0, 0, 0, 30, 291, 1, 0, 0, 0, 32, 308, 1, 0, 0, 0, 34, 310, 1, 0, 0, 0, 36, 312, 1, 0, 0, 0, 38, 316, 1, 0, 0, 0, 40, 318, 1, 0, 0, 0, 42, 327, 1, 0, 0, 0, 44, 331, 1, 0, 0, 0, 46, 347, 1, 0, 0, 0, 48, 350, 1, 0, 0, 0, 50, 358, 1, 0, 0, 0, 52, 364, 1, 0, 0, 0, 54, 372, 1, 0, 0, 0, 56, 380, 1, 0, 0, 0, 58, 388, 1, 0, 0, 0, 60, 390, 1, 0, 0, 0, 62, 434, 1, 0, 0, 0, 64, 438, 1, 0, 0, 0, 66, 440, 1, 0, 0, 0, 68, 443, 1, 0, 0, 0, 70, 452, 1, 0, 0, 0, 72, 460, 1, 0, 0, 0, 74, 463, 1, 0, 0, 0, 76, 466, 1, 0, 0, 0, 78, 475, 1, 0, 0, 0, 80, 479, 1, 0, 0, 0, 82, 485, 1, 0, 0, 0, 84, 489, 1, 0, 0, 0, 86, 492, 1, 0, 0, 0, 88, 500, 1, 0, 0, 0, 90, 504, 1, 0, 0, 0, 92, 508, 1, 0, 0, 0, 94, 511, 1, 0, 0, 0, 96, 516, 1, 0, 0, 0, 98, 520, 1, 0, 0, 0, 100, 522, 1, 0, 0, 0, 102, 524, 1, 0, 0, 0, 104, 527, 1, 0, 0, 0, 106, 531, 1, 0, 0, 0, 108, 534, 1, 0, 0, 0, 110, 537, 1, 0, 0, 0, 112, 557, 1, 0, 0, 0, 114, 561, 1, 0, 0, 0, 116, 117, 3, 2, 1, 0, 117, 118, 5, 0, 0, 1, 118, 1, 1, 0, 0, 0, 119, 120, 6, 1, -1, 0, 120, 121, 3, 4, 2, 0, 121, 127, 1, 0, 0, 0, 122, 123, 10, 1, 0, 0, 123, 124, 5, 29, 0, 0, 124, 126, 3, 6, 3, 0, 125, 122, 1, 0, 0, 0, 126, 129, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 127, 128, 1, 0, 0, 0, 128, 3, 1, 0, 0, 0, 129, 127, 1, 0, 0, 0, 130, 137, 3, 102, 51, 0, 131, 137, 3, 30, 15, 0, 132, 137, 3, 24, 12, 0, 133, 137, 3, 44, 22, 0, 134, 137, 3, 106, 53, 0, 135, 137, 3, 108, 54, 0, 136, 130, 1, 0, 0, 0, 136, 131, 1, 0, 0, 0, 136, 132, 1, 0, 0, 0, 136, 133, 1, 0, 0, 0, 136, 134, 1, 0, 0, 0, 136, 135, 1, 0, 0, 0, 137, 5, 1, 0, 0, 0, 138, 153, 3, 46, 23, 0, 139, 153, 3, 50, 25, 0, 140, 153, 3, 66, 33, 0, 141, 153, 3, 114, 57, 0, 142, 153, 3, 72, 36, 0, 143, 153, 3, 68, 34, 0, 144, 153, 3, 48, 24, 0, 145, 153, 3, 8, 4, 0, 146, 153, 3, 74, 37, 0, 147, 153, 3, 76, 38, 0, 148, 153, 3, 80, 40, 0, 149, 153, 3, 82, 41, 0, 150, 153, 3, 110, 55, 0, 151, 153, 3, 84, 42, 0, 152, 138, 1, 0, 0, 0, 152, 139, 1, 0, 0, 0, 152, 140, 1, 0, 0, 0, 152, 141, 1, 0, 0, 0, 152, 142, 1, 0, 0, 0, 152, 143, 1, 0, 0, 0, 152, 144, 1, 0, 0, 0, 152, 145, 1, 0, 0, 0, 152, 146, 1, 0, 0, 0, 152, 147, 1, 0, 0, 0, 152, 148, 1, 0, 0, 0, 152, 149, 1, 0, 0, 0, 152, 150, 1, 0, 0, 0, 152, 151, 1, 0, 0, 0, 153, 7, 1, 0, 0, 0, 154, 155, 5, 20, 0, 0, 155, 156, 3, 10, 5, 0, 156, 9, 1, 0, 0, 0, 157, 158, 6, 5, -1, 0, 158, 159, 5, 48, 0, 0, 159, 186, 3, 10, 5, 7, 160, 186, 3, 14, 7, 0, 161, 186, 3, 12, 6, 0, 162, 164, 3, 14, 7, 0, 163, 165, 5, 48, 0, 0, 164, 163, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 166, 1, 0, 0, 0, 166, 167, 5, 45, 0, 0, 167, 168, 5, 44, 0, 0, 168, 173, 3, 14, 7, 0, 169, 170, 5, 38, 0, 0, 170, 172, 3, 14, 7, 0, 171, 169, 1, 0, 0, 0, 172, 175, 1, 0, 0, 0, 173, 171, 1, 0, 0, 0, 173, 174, 1, 0, 0, 0, 174, 176, 1, 0, 0, 0, 175, 173, 1, 0, 0, 0, 176, 177, 5, 54, 0, 0, 177, 186, 1, 0, 0, 0, 178, 179, 3, 14, 7, 0, 179, 181, 5, 46, 0, 0, 180, 182, 5, 48, 0, 0, 181, 180, 1, 0, 0, 0, 181, 182, 1, 0, 0, 0, 182, 183, 1, 0, 0, 0, 183, 184, 5, 49, 0, 0, 184, 186, 1, 0, 0, 0, 185, 157, 1, 0, 0, 0, 185, 160, 1, 0, 0, 0, 185, 161, 1, 0, 0, 0, 185, 162, 1, 0, 0, 0, 185, 178, 1, 0, 0, 0, 186, 195, 1, 0, 0, 0, 187, 188, 10, 4, 0, 0, 188, 189, 5, 34, 0, 0, 189, 194, 3, 10, 5, 5, 190, 191, 10, 3, 0, 0, 191, 192, 5, 51, 0, 0, 192, 194, 3, 10, 5, 4, 193, 187, 1, 0, 0, 0, 193, 190, 1, 0, 0, 0, 194, 197, 1, 0, 0, 0, 195, 193, 1, 0, 0, 0, 195, 196, 1, 0, 0, 0, 196, 11, 1, 0, 0, 0, 197, 195, 1, 0, 0, 0, 198, 200, 3, 14, 7, 0, 199, 201, 5, 48, 0, 0, 200, 199, 1, 0, 0, 0, 200, 201, 1, 0, 0, 0, 201, 202, 1, 0, 0, 0, 202, 203, 5, 47, 0, 0, 203, 204, 3, 98, 49, 0, 204, 213, 1, 0, 0, 0, 205, 207, 3, 14, 7, 0, 206, 208, 5, 48, 0, 0, 207, 206, 1, 0, 0, 0, 207, 208, 1, 0, 0, 0, 208, 209, 1, 0, 0, 0, 209, 210, 5, 53, 0, 0, 210, 211, 3, 98, 49, 0, 211, 213, 1, 0, 0, 0, 212, 198, 1, 0, 0, 0, 212, 205, 1, 0, 0, 0, 213, 13, 1, 0, 0, 0, 214, 220, 3, 16, 8, 0, 215, 216, 3, 16, 8, 0, 216, 217, 3, 100, 50, 0, 217, 218, 3, 16, 8, 0, 218, 220, 1, 0, 0, 0, 219, 214, 1, 0, 0, 0, 219, 215, 1, 0, 0, 0, 220, 15, 1, 0, 0, 0, 221, 222, 6, 8, -1, 0, 222, 226, 3, 18, 9, 0, 223, 224, 7, 0, 0, 0, 224, 226, 3, 16, 8, 3, 225, 221, 1, 0, 0, 0, 225, 223, 1, 0, 0, 0, 226, 235, 1, 0, 0, 0, 227, 228, 10, 2, 0, 0, 228, 229, 7, 1, 0, 0, 229, 234, 3, 16, 8, 3, 230, 231, 10, 1, 0, 0, 231, 232, 7, 0, 0, 0, 232, 234, 3, 16, 8, 2, 233, 227, 1, 0, 0, 0, 233, 230, 1, 0, 0, 0, 234, 237, 1, 0, 0, 0, 235, 233, 1, 0, 0, 0, 235, 236, 1, 0, 0, 0, 236, 17, 1, 0, 0, 0, 237, 235, 1, 0, 0, 0, 238, 239, 6, 9, -1, 0, 239, 247, 3, 62, 31, 0, 240, 247, 3, 52, 26, 0, 241, 247, 3, 20, 10, 0, 242, 243, 5, 44, 0, 0, 243, 244, 3, 10, 5, 0, 244, 245, 5, 54, 0, 0, 245, 247, 1, 0, 0, 0, 246, 238, 1, 0, 0, 0, 246, 240, 1, 0, 0, 0, 246, 241, 1, 0, 0, 0, 246, 242, 1, 0, 0, 0, 247, 253, 1, 0, 0, 0, 248, 249, 10, 1, 0, 0, 249, 250, 5, 37, 0, 0, 250, 252, 3, 22, 11, 0, 251, 248, 1, 0, 0, 0, 252, 255, 1, 0, 0, 0, 253, 251, 1, 0, 0, 0, 253, 254, 1, 0, 0, 0, 254, 19, 1, 0, 0, 0, 255, 253, 1, 0, 0, 0, 256, 257, 3, 58, 29, 0, 257, 267, 5, 44, 0, 0, 258, 268, 5, 65, 0, 0, 259, 264, 3, 10, 5, 0, 260, 261, 5, 38, 0, 0, 261, 263, 3, 10, 5, 0, 262, 260, 1, 0, 0, 0, 263, 266, 1, 0, 0, 0, 264, 262, 1, 0, 0, 0, 264, 265, 1, 0, 0, 0, 265, 268, 1, 0, 0, 0, 266, 264, 1, 0, 0, 0, 267, 258, 1, 0, 0, 0, 267, 259, 1, 0, 0, 0, 267, 268, 1, 0, 0, 0, 268, 269, 1, 0, 0, 0, 269, 270, 5, 54, 0, 0, 270, 21, 1, 0, 0, 0, 271, 272, 3, 58, 29, 0, 272, 23, 1, 0, 0, 0, 273, 274, 5, 16, 0, 0, 274, 275, 3, 26, 13, 0, 275, 25, 1, 0, 0, 0, 276, 281, 3, 28, 14, 0, 277, 278, 5, 38, 0, 0, 278, 280, 3, 28, 14, 0, 279, 277, 1, 0, 0, 0, 280, 283, 1, 0, 0, 0, 281, 279, 1, 0, 0, 0, 281, 282, 1, 0, 0, 0, 282, 27, 1, 0, 0, 0, 283, 281, 1, 0, 0, 0, 284, 290, 3, 10, 5, 0, 285, 286, 3, 52, 26, 0, 286, 287, 5, 36, 0, 0, 287, 288, 3, 10, 5, 0, 288, 290, 1, 0, 0, 0, 289, 284, 1, 0, 0, 0, 289, 285, 1, 0, 0, 0, 290, 29, 1, 0, 0, 0, 291, 292, 5, 6, 0, 0, 292, 297, 3, 32, 16, 0, 293, 294, 5, 38, 0, 0, 294, 296, 3, 32, 16, 0, 295, 293, 1, 0, 0, 0, 296, 299, 1, 0, 0, 0, 297, 295, 1, 0, 0, 0, 297, 298, 1, 0, 0, 0, 298, 301, 1, 0, 0, 0, 299, 297, 1, 0, 0, 0, 300, 302, 3, 38, 19, 0, 301, 300, 1, 0, 0, 0, 301, 302, 1, 0, 0, 0, 302, 31, 1, 0, 0, 0, 303, 304, 3, 34, 17, 0, 304, 305, 5, 114, 0, 0, 305, 306, 3, 36, 18, 0, 306, 309, 1, 0, 0, 0, 307, 309, 3, 36, 18, 0, 308, 303, 1, 0, 0, 0, 308, 307, 1, 0, 0, 0, 309, 33, 1, 0, 0, 0, 310, 311, 5, 25, 0, 0, 311, 35, 1, 0, 0, 0, 312, 313, 7, 2, 0, 0, 313, 37, 1, 0, 0, 0, 314, 317, 3, 40, 20, 0, 315, 317, 3, 42, 21, 0, 316, 314, 1, 0, 0, 0, 316, 315, 1, 0, 0, 0, 317, 39, 1, 0, 0, 0, 318, 319, 5, 76, 0, 0, 319, 324, 5, 25, 0, 0, 320, 321, 5, 38, 0, 0, 321, 323, 5, 25, 0, 0, 322, 320, 1, 0, 0, 0, 323, 326, 1, 0, 0, 0, 324, 322, 1, 0, 0, 0, 324, 325, 1, 0, 0, 0, 325, 41, 1, 0, 0, 0, 326, 324, 1, 0, 0, 0, 327, 328, 5, 69, 0, 0, 328, 329, 3, 40, 20, 0, 329, 330, 5, 70, 0, 0, 330, 43, 1, 0, 0, 0, 331, 332, 5, 13, 0, 0, 332, 337, 3, 32, 16, 0, 333, 334, 5, 38, 0, 0, 334, 336, 3, 32, 16, 0, 335, 333, 1, 0, 0, 0, 336, 339, 1, 0, 0, 0, 337, 335, 1, 0, 0, 0, 337, 338, 1, 0, 0, 0, 338, 341, 1, 0, 0, 0, 339, 337, 1, 0, 0, 0, 340, 342, 3, 26, 13, 0, 341, 340, 1, 0, 0, 0, 341, 342, 1, 0, 0, 0, 342, 345, 1, 0, 0, 0, 343, 344, 5, 33, 0, 0, 344, 346, 3, 26, 13, 0, 345, 343, 1, 0, 0, 0, 345, 346, 1, 0, 0, 0, 346, 45, 1, 0, 0, 0, 347, 348, 5, 4, 0, 0, 348, 349, 3, 26, 13, 0, 349, 47, 1, 0, 0, 0, 350, 352, 5, 19, 0, 0, 351, 353, 3, 26, 13, 0, 352, 351, 1, 0, 0, 0, 352, 353, 1, 0, 0, 0, 353, 356, 1, 0, 0, 0, 354, 355, 5, 33, 0, 0, 355, 357, 3, 26, 13, 0, 356, 354, 1, 0, 0, 0, 356, 357, 1, 0, 0, 0, 357, 49, 1, 0, 0, 0, 358, 359, 5, 8, 0, 0, 359, 362, 3, 26, 13, 0, 360, 361, 5, 33, 0, 0, 361, 363, 3, 26, 13, 0, 362, 360, 1, 0, 0, 0, 362, 363, 1, 0, 0, 0, 363, 51, 1, 0, 0, 0, 364, 369, 3, 58, 29, 0, 365, 366, 5, 40, 0, 0, 366, 368, 3, 58, 29, 0, 367, 365, 1, 0, 0, 0, 368, 371, 1, 0, 0, 0, 369, 367, 1, 0, 0, 0, 369, 370, 1, 0, 0, 0, 370, 53, 1, 0, 0, 0, 371, 369, 1, 0, 0, 0, 372, 377, 3, 60, 30, 0, 373, 374, 5, 40, 0, 0, 374, 376, 3, 60, 30, 0, 375, 373, 1, 0, 0, 0, 376, 379, 1, 0, 0, 0, 377, 375, 1, 0, 0, 0, 377, 378, 1, 0, 0, 0, 378, 55, 1, 0, 0, 0, 379, 377, 1, 0, 0, 0, 380, 385, 3, 54, 27, 0, 381, 382, 5, 38, 0, 0, 382, 384, 3, 54, 27, 0, 383, 381, 1, 0, 0, 0, 384, 387, 1, 0, 0, 0, 385, 383, 1, 0, 0, 0, 385, 386, 1, 0, 0, 0, 386, 57, 1, 0, 0, 0, 387, 385, 1, 0, 0, 0, 388, 389, 7, 3, 0, 0, 389, 59, 1, 0, 0, 0, 390, 391, 5, 80, 0, 0, 391, 61, 1, 0, 0, 0, 392, 435, 5, 49, 0, 0, 393, 394, 3, 96, 48, 0, 394, 395, 5, 71, 0, 0, 395, 435, 1, 0, 0, 0, 396, 435, 3, 94, 47, 0, 397, 435, 3, 96, 48, 0, 398, 435, 3, 90, 45, 0, 399, 435, 3, 64, 32, 0, 400, 435, 3, 98, 49, 0, 401, 402, 5, 69, 0, 0, 402, 407, 3, 92, 46, 0, 403, 404, 5, 38, 0, 0, 404, 406, 3, 92, 46, 0, 405, 403, 1, 0, 0, 0, 406, 409, 1, 0, 0, 0, 407, 405, 1, 0, 0, 0, 407, 408, 1, 0, 0, 0, 408, 410, 1, 0, 0, 0, 409, 407, 1, 0, 0, 0, 410, 411, 5, 70, 0, 0, 411, 435, 1, 0, 0, 0, 412, 413, 5, 69, 0, 0, 413, 418, 3, 90, 45, 0, 414, 415, 5, 38, 0, 0, 415, 417, 3, 90, 45, 0, 416, 414, 1, 0, 0, 0, 417, 420, 1, 0, 0, 0, 418, 416, 1, 0, 0, 0, 418, 419, 1, 0, 0, 0, 419, 421, 1, 0, 0, 0, 420, 418, 1, 0, 0, 0, 421, 422, 5, 70, 0, 0, 422, 435, 1, 0, 0, 0, 423, 424, 5, 69, 0, 0, 424, 429, 3, 98, 49, 0, 425, 426, 5, 38, 0, 0, 426, 428, 3, 98, 49, 0, 427, 425, 1, 0, 0, 0, 428, 431, 1, 0, 0, 0, 429, 427, 1, 0, 0, 0, 429, 430, 1, 0, 0, 0, 430, 432, 1, 0, 0, 0, 431, 429, 1, 0, 0, 0, 432, 433, 5, 70, 0, 0, 433, 435, 1, 0, 0, 0, 434, 392, 1, 0, 0, 0, 434, 393, 1, 0, 0, 0, 434, 396, 1, 0, 0, 0, 434, 397, 1, 0, 0, 0, 434, 398, 1, 0, 0, 0, 434, 399, 1, 0, 0, 0, 434, 400, 1, 0, 0, 0, 434, 401, 1, 0, 0, 0, 434, 412, 1, 0, 0, 0, 434, 423, 1, 0, 0, 0, 435, 63, 1, 0, 0, 0, 436, 439, 5, 52, 0, 0, 437, 439, 5, 68, 0, 0, 438, 436, 1, 0, 0, 0, 438, 437, 1, 0, 0, 0, 439, 65, 1, 0, 0, 0, 440, 441, 5, 10, 0, 0, 441, 442, 5, 31, 0, 0, 442, 67, 1, 0, 0, 0, 443, 444, 5, 18, 0, 0, 444, 449, 3, 70, 35, 0, 445, 446, 5, 38, 0, 0, 446, 448, 3, 70, 35, 0, 447, 445, 1, 0, 0, 0, 448, 451, 1, 0, 0, 0, 449, 447, 1, 0, 0, 0, 449, 450, 1, 0, 0, 0, 450, 69, 1, 0, 0, 0, 451, 449, 1, 0, 0, 0, 452, 454, 3, 10, 5, 0, 453, 455, 7, 4, 0, 0, 454, 453, 1, 0, 0, 0, 454, 455, 1, 0, 0, 0, 455, 458, 1, 0, 0, 0, 456, 457, 5, 50, 0, 0, 457, 459, 7, 5, 0, 0, 458, 456, 1, 0, 0, 0, 458, 459, 1, 0, 0, 0, 459, 71, 1, 0, 0, 0, 460, 461, 5, 9, 0, 0, 461, 462, 3, 56, 28, 0, 462, 73, 1, 0, 0, 0, 463, 464, 5, 2, 0, 0, 464, 465, 3, 56, 28, 0, 465, 75, 1, 0, 0, 0, 466, 467, 5, 15, 0, 0, 467, 472, 3, 78, 39, 0, 468, 469, 5, 38, 0, 0, 469, 471, 3, 78, 39, 0, 470, 468, 1, 0, 0, 0, 471, 474, 1, 0, 0, 0, 472, 470, 1, 0, 0, 0, 472, 473, 1, 0, 0, 0, 473, 77, 1, 0, 0, 0, 474, 472, 1, 0, 0, 0, 475, 476, 3, 54, 27, 0, 476, 477, 5, 84, 0, 0, 477, 478, 3, 54, 27, 0, 478, 79, 1, 0, 0, 0, 479, 480, 5, 1, 0, 0, 480, 481, 3, 18, 9, 0, 481, 483, 3, 98, 49, 0, 482, 484, 3, 86, 43, 0, 483, 482, 1, 0, 0, 0, 483, 484, 1, 0, 0, 0, 484, 81, 1, 0, 0, 0, 485, 486, 5, 7, 0, 0, 486, 487, 3, 18, 9, 0, 487, 488, 3, 98, 49, 0, 488, 83, 1, 0, 0, 0, 489, 490, 5, 14, 0, 0, 490, 491, 3, 52, 26, 0, 491, 85, 1, 0, 0, 0, 492, 497, 3, 88, 44, 0, 493, 494, 5, 38, 0, 0, 494, 496, 3, 88, 44, 0, 495, 493, 1, 0, 0, 0, 496, 499, 1, 0, 0, 0, 497, 495, 1, 0, 0, 0, 497, 498, 1, 0, 0, 0, 498, 87, 1, 0, 0, 0, 499, 497, 1, 0, 0, 0, 500, 501, 3, 58, 29, 0, 501, 502, 5, 36, 0, 0, 502, 503, 3, 62, 31, 0, 503, 89, 1, 0, 0, 0, 504, 505, 7, 6, 0, 0, 505, 91, 1, 0, 0, 0, 506, 509, 3, 94, 47, 0, 507, 509, 3, 96, 48, 0, 508, 506, 1, 0, 0, 0, 508, 507, 1, 0, 0, 0, 509, 93, 1, 0, 0, 0, 510, 512, 7, 0, 0, 0, 511, 510, 1, 0, 0, 0, 511, 512, 1, 0, 0, 0, 512, 513, 1, 0, 0, 0, 513, 514, 5, 32, 0, 0, 514, 95, 1, 0, 0, 0, 515, 517, 7, 0, 0, 0, 516, 515, 1, 0, 0, 0, 516, 517, 1, 0, 0, 0, 517, 518, 1, 0, 0, 0, 518, 519, 5, 31, 0, 0, 519, 97, 1, 0, 0, 0, 520, 521, 5, 30, 0, 0, 521, 99, 1, 0, 0, 0, 522, 523, 7, 7, 0, 0, 523, 101, 1, 0, 0, 0, 524, 525, 5, 5, 0, 0, 525, 526, 3, 104, 52, 0, 526, 103, 1, 0, 0, 0, 527, 528, 5, 69, 0, 0, 528, 529, 3, 2, 1, 0, 529, 530, 5, 70, 0, 0, 530, 105, 1, 0, 0, 0, 531, 532, 5, 17, 0, 0, 532, 533, 5, 106, 0, 0, 533, 107, 1, 0, 0, 0, 534, 535, 5, 12, 0, 0, 535, 536, 5, 110, 0, 0, 536, 109, 1, 0, 0, 0, 537, 538, 5, 3, 0, 0, 538, 541, 5, 90, 0, 0, 539, 540, 5, 88, 0, 0, 540, 542, 3, 54, 27, 0, 541, 539, 1, 0, 0, 0, 541, 542, 1, 0, 0, 0, 542, 552, 1, 0, 0, 0, 543, 544, 5, 89, 0, 0, 544, 549, 3, 112, 56, 0, 545, 546, 5, 38, 0, 0, 546, 548, 3, 112, 56, 0, 547, 545, 1, 0, 0, 0, 548, 551, 1, 0, 0, 0, 549, 547, 1, 0, 0, 0, 549, 550, 1, 0, 0, 0, 550, 553, 1, 0, 0, 0, 551, 549, 1, 0, 0, 0, 552, 543, 1, 0, 0, 0, 552, 553, 1, 0, 0, 0, 553, 111, 1, 0, 0, 0, 554, 555, 3, 54, 27, 0, 555, 556, 5, 36, 0, 0, 556, 558, 1, 0, 0, 0, 557, 554, 1, 0, 0, 0, 557, 558, 1, 0, 0, 0, 558, 559, 1, 0, 0, 0, 559, 560, 3, 54, 27, 0, 560, 113, 1, 0, 0, 0, 561, 562, 5, 11, 0, 0, 562, 563, 3, 32, 16, 0, 563, 564, 5, 88, 0, 0, 564, 565, 3, 56, 28, 0, 565, 115, 1, 0, 0, 0, 54, 127, 136, 152, 164, 173, 181, 185, 193, 195, 200, 207, 212, 219, 225, 233, 235, 246, 253, 264, 267, 281, 289, 297, 301, 308, 316, 324, 337, 341, 345, 352, 356, 362, 369, 377, 385, 407, 418, 429, 434, 438, 449, 454, 458, 472, 483, 497, 508, 511, 516, 541, 549, 552, 557]
\ No newline at end of file
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
index 04798fc3dca8a..63eb3a86419a3 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.tokens
@@ -22,7 +22,7 @@ UNKNOWN_CMD=21
 LINE_COMMENT=22
 MULTILINE_COMMENT=23
 WS=24
-INDEX_UNQUOTED_IDENTIFIER=25
+UNQUOTED_SOURCE=25
 EXPLAIN_WS=26
 EXPLAIN_LINE_COMMENT=27
 EXPLAIN_MULTILINE_COMMENT=28
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser.ts b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
index 5181349c62c88..1c8ce9f0d86e5 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser.ts
@@ -42,7 +42,7 @@ export default class esql_parser extends Parser {
 	public static readonly LINE_COMMENT = 22;
 	public static readonly MULTILINE_COMMENT = 23;
 	public static readonly WS = 24;
-	public static readonly INDEX_UNQUOTED_IDENTIFIER = 25;
+	public static readonly UNQUOTED_SOURCE = 25;
 	public static readonly EXPLAIN_WS = 26;
 	public static readonly EXPLAIN_LINE_COMMENT = 27;
 	public static readonly EXPLAIN_MULTILINE_COMMENT = 28;
@@ -159,213 +159,216 @@ export default class esql_parser extends Parser {
 	public static readonly RULE_fields = 13;
 	public static readonly RULE_field = 14;
 	public static readonly RULE_fromCommand = 15;
-	public static readonly RULE_indexIdentifier = 16;
-	public static readonly RULE_metadata = 17;
-	public static readonly RULE_metadataOption = 18;
-	public static readonly RULE_deprecated_metadata = 19;
-	public static readonly RULE_metricsCommand = 20;
-	public static readonly RULE_evalCommand = 21;
-	public static readonly RULE_statsCommand = 22;
-	public static readonly RULE_inlinestatsCommand = 23;
-	public static readonly RULE_qualifiedName = 24;
-	public static readonly RULE_qualifiedNamePattern = 25;
-	public static readonly RULE_qualifiedNamePatterns = 26;
-	public static readonly RULE_identifier = 27;
-	public static readonly RULE_identifierPattern = 28;
-	public static readonly RULE_constant = 29;
-	public static readonly RULE_params = 30;
-	public static readonly RULE_limitCommand = 31;
-	public static readonly RULE_sortCommand = 32;
-	public static readonly RULE_orderExpression = 33;
-	public static readonly RULE_keepCommand = 34;
-	public static readonly RULE_dropCommand = 35;
-	public static readonly RULE_renameCommand = 36;
-	public static readonly RULE_renameClause = 37;
-	public static readonly RULE_dissectCommand = 38;
-	public static readonly RULE_grokCommand = 39;
-	public static readonly RULE_mvExpandCommand = 40;
-	public static readonly RULE_commandOptions = 41;
-	public static readonly RULE_commandOption = 42;
-	public static readonly RULE_booleanValue = 43;
-	public static readonly RULE_numericValue = 44;
-	public static readonly RULE_decimalValue = 45;
-	public static readonly RULE_integerValue = 46;
-	public static readonly RULE_string = 47;
-	public static readonly RULE_comparisonOperator = 48;
-	public static readonly RULE_explainCommand = 49;
-	public static readonly RULE_subqueryExpression = 50;
-	public static readonly RULE_showCommand = 51;
-	public static readonly RULE_metaCommand = 52;
-	public static readonly RULE_enrichCommand = 53;
-	public static readonly RULE_enrichWithClause = 54;
-	public static readonly RULE_lookupCommand = 55;
-	public static readonly literalNames: (string | null)[] = [ null, "'dissect'", 
-                                                            "'drop'", "'enrich'", 
-                                                            "'eval'", "'explain'", 
-                                                            "'from'", "'grok'", 
-                                                            "'inlinestats'", 
-                                                            "'keep'", "'limit'", 
-                                                            "'lookup'", 
-                                                            "'meta'", "'metrics'", 
-                                                            "'mv_expand'", 
-                                                            "'rename'", 
-                                                            "'row'", "'show'", 
-                                                            "'sort'", "'stats'", 
-                                                            "'where'", null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, "'|'", 
-                                                            null, null, 
-                                                            null, "'by'", 
-                                                            "'and'", "'asc'", 
-                                                            "'='", "'::'", 
-                                                            "','", "'desc'", 
-                                                            "'.'", "'false'", 
-                                                            "'first'", "'last'", 
-                                                            "'('", "'in'", 
-                                                            "'is'", "'like'", 
-                                                            "'not'", "'null'", 
-                                                            "'nulls'", "'or'", 
-                                                            "'?'", "'rlike'", 
-                                                            "')'", "'true'", 
-                                                            "'=='", "'=~'", 
-                                                            "'!='", "'<'", 
-                                                            "'<='", "'>'", 
-                                                            "'>='", "'+'", 
-                                                            "'-'", "'*'", 
-                                                            "'/'", "'%'", 
-                                                            null, null, 
-                                                            "']'", null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            "'metadata'", 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, "'as'", 
-                                                            null, null, 
-                                                            null, "'on'", 
-                                                            "'with'", null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, null, 
-                                                            null, "'info'", 
-                                                            null, null, 
-                                                            null, "'functions'", 
-                                                            null, null, 
+	public static readonly RULE_indexPattern = 16;
+	public static readonly RULE_clusterString = 17;
+	public static readonly RULE_indexString = 18;
+	public static readonly RULE_metadata = 19;
+	public static readonly RULE_metadataOption = 20;
+	public static readonly RULE_deprecated_metadata = 21;
+	public static readonly RULE_metricsCommand = 22;
+	public static readonly RULE_evalCommand = 23;
+	public static readonly RULE_statsCommand = 24;
+	public static readonly RULE_inlinestatsCommand = 25;
+	public static readonly RULE_qualifiedName = 26;
+	public static readonly RULE_qualifiedNamePattern = 27;
+	public static readonly RULE_qualifiedNamePatterns = 28;
+	public static readonly RULE_identifier = 29;
+	public static readonly RULE_identifierPattern = 30;
+	public static readonly RULE_constant = 31;
+	public static readonly RULE_params = 32;
+	public static readonly RULE_limitCommand = 33;
+	public static readonly RULE_sortCommand = 34;
+	public static readonly RULE_orderExpression = 35;
+	public static readonly RULE_keepCommand = 36;
+	public static readonly RULE_dropCommand = 37;
+	public static readonly RULE_renameCommand = 38;
+	public static readonly RULE_renameClause = 39;
+	public static readonly RULE_dissectCommand = 40;
+	public static readonly RULE_grokCommand = 41;
+	public static readonly RULE_mvExpandCommand = 42;
+	public static readonly RULE_commandOptions = 43;
+	public static readonly RULE_commandOption = 44;
+	public static readonly RULE_booleanValue = 45;
+	public static readonly RULE_numericValue = 46;
+	public static readonly RULE_decimalValue = 47;
+	public static readonly RULE_integerValue = 48;
+	public static readonly RULE_string = 49;
+	public static readonly RULE_comparisonOperator = 50;
+	public static readonly RULE_explainCommand = 51;
+	public static readonly RULE_subqueryExpression = 52;
+	public static readonly RULE_showCommand = 53;
+	public static readonly RULE_metaCommand = 54;
+	public static readonly RULE_enrichCommand = 55;
+	public static readonly RULE_enrichWithClause = 56;
+	public static readonly RULE_lookupCommand = 57;
+	public static readonly literalNames: (string | null)[] = [ null, "'dissect'",
+                                                            "'drop'", "'enrich'",
+                                                            "'eval'", "'explain'",
+                                                            "'from'", "'grok'",
+                                                            "'inlinestats'",
+                                                            "'keep'", "'limit'",
+                                                            "'lookup'",
+                                                            "'meta'", "'metrics'",
+                                                            "'mv_expand'",
+                                                            "'rename'",
+                                                            "'row'", "'show'",
+                                                            "'sort'", "'stats'",
+                                                            "'where'", null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, "'|'",
+                                                            null, null,
+                                                            null, "'by'",
+                                                            "'and'", "'asc'",
+                                                            "'='", "'::'",
+                                                            "','", "'desc'",
+                                                            "'.'", "'false'",
+                                                            "'first'", "'last'",
+                                                            "'('", "'in'",
+                                                            "'is'", "'like'",
+                                                            "'not'", "'null'",
+                                                            "'nulls'", "'or'",
+                                                            "'?'", "'rlike'",
+                                                            "')'", "'true'",
+                                                            "'=='", "'=~'",
+                                                            "'!='", "'<'",
+                                                            "'<='", "'>'",
+                                                            "'>='", "'+'",
+                                                            "'-'", "'*'",
+                                                            "'/'", "'%'",
+                                                            null, null,
+                                                            "']'", null,
+                                                            null, null,
+                                                            null, null,
+                                                            "'metadata'",
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, "'as'",
+                                                            null, null,
+                                                            null, "'on'",
+                                                            "'with'", null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, null,
+                                                            null, "'info'",
+                                                            null, null,
+                                                            null, "'functions'",
+                                                            null, null,
                                                             null, "':'" ];
-	public static readonly symbolicNames: (string | null)[] = [ null, "DISSECT", 
-                                                             "DROP", "ENRICH", 
-                                                             "EVAL", "EXPLAIN", 
-                                                             "FROM", "GROK", 
-                                                             "INLINESTATS", 
-                                                             "KEEP", "LIMIT", 
-                                                             "LOOKUP", "META", 
-                                                             "METRICS", 
-                                                             "MV_EXPAND", 
-                                                             "RENAME", "ROW", 
-                                                             "SHOW", "SORT", 
-                                                             "STATS", "WHERE", 
-                                                             "UNKNOWN_CMD", 
-                                                             "LINE_COMMENT", 
-                                                             "MULTILINE_COMMENT", 
-                                                             "WS", "INDEX_UNQUOTED_IDENTIFIER", 
-                                                             "EXPLAIN_WS", 
-                                                             "EXPLAIN_LINE_COMMENT", 
-                                                             "EXPLAIN_MULTILINE_COMMENT", 
-                                                             "PIPE", "QUOTED_STRING", 
-                                                             "INTEGER_LITERAL", 
-                                                             "DECIMAL_LITERAL", 
-                                                             "BY", "AND", 
-                                                             "ASC", "ASSIGN", 
-                                                             "CAST_OP", 
-                                                             "COMMA", "DESC", 
-                                                             "DOT", "FALSE", 
-                                                             "FIRST", "LAST", 
-                                                             "LP", "IN", 
-                                                             "IS", "LIKE", 
-                                                             "NOT", "NULL", 
-                                                             "NULLS", "OR", 
-                                                             "PARAM", "RLIKE", 
-                                                             "RP", "TRUE", 
-                                                             "EQ", "CIEQ", 
-                                                             "NEQ", "LT", 
-                                                             "LTE", "GT", 
-                                                             "GTE", "PLUS", 
-                                                             "MINUS", "ASTERISK", 
-                                                             "SLASH", "PERCENT", 
-                                                             "NAMED_OR_POSITIONAL_PARAM", 
-                                                             "OPENING_BRACKET", 
-                                                             "CLOSING_BRACKET", 
-                                                             "UNQUOTED_IDENTIFIER", 
-                                                             "QUOTED_IDENTIFIER", 
-                                                             "EXPR_LINE_COMMENT", 
-                                                             "EXPR_MULTILINE_COMMENT", 
-                                                             "EXPR_WS", 
-                                                             "METADATA", 
-                                                             "FROM_LINE_COMMENT", 
-                                                             "FROM_MULTILINE_COMMENT", 
-                                                             "FROM_WS", 
-                                                             "ID_PATTERN", 
-                                                             "PROJECT_LINE_COMMENT", 
-                                                             "PROJECT_MULTILINE_COMMENT", 
-                                                             "PROJECT_WS", 
-                                                             "AS", "RENAME_LINE_COMMENT", 
-                                                             "RENAME_MULTILINE_COMMENT", 
-                                                             "RENAME_WS", 
-                                                             "ON", "WITH", 
-                                                             "ENRICH_POLICY_NAME", 
-                                                             "ENRICH_LINE_COMMENT", 
-                                                             "ENRICH_MULTILINE_COMMENT", 
-                                                             "ENRICH_WS", 
-                                                             "ENRICH_FIELD_LINE_COMMENT", 
-                                                             "ENRICH_FIELD_MULTILINE_COMMENT", 
-                                                             "ENRICH_FIELD_WS", 
-                                                             "LOOKUP_LINE_COMMENT", 
-                                                             "LOOKUP_MULTILINE_COMMENT", 
-                                                             "LOOKUP_WS", 
-                                                             "LOOKUP_FIELD_LINE_COMMENT", 
-                                                             "LOOKUP_FIELD_MULTILINE_COMMENT", 
-                                                             "LOOKUP_FIELD_WS", 
-                                                             "MVEXPAND_LINE_COMMENT", 
-                                                             "MVEXPAND_MULTILINE_COMMENT", 
-                                                             "MVEXPAND_WS", 
-                                                             "INFO", "SHOW_LINE_COMMENT", 
-                                                             "SHOW_MULTILINE_COMMENT", 
-                                                             "SHOW_WS", 
-                                                             "FUNCTIONS", 
-                                                             "META_LINE_COMMENT", 
-                                                             "META_MULTILINE_COMMENT", 
-                                                             "META_WS", 
-                                                             "COLON", "SETTING", 
-                                                             "SETTING_LINE_COMMENT", 
-                                                             "SETTTING_MULTILINE_COMMENT", 
-                                                             "SETTING_WS", 
-                                                             "METRICS_LINE_COMMENT", 
-                                                             "METRICS_MULTILINE_COMMENT", 
-                                                             "METRICS_WS", 
-                                                             "CLOSING_METRICS_LINE_COMMENT", 
-                                                             "CLOSING_METRICS_MULTILINE_COMMENT", 
+	public static readonly symbolicNames: (string | null)[] = [ null, "DISSECT",
+                                                             "DROP", "ENRICH",
+                                                             "EVAL", "EXPLAIN",
+                                                             "FROM", "GROK",
+                                                             "INLINESTATS",
+                                                             "KEEP", "LIMIT",
+                                                             "LOOKUP", "META",
+                                                             "METRICS",
+                                                             "MV_EXPAND",
+                                                             "RENAME", "ROW",
+                                                             "SHOW", "SORT",
+                                                             "STATS", "WHERE",
+                                                             "UNKNOWN_CMD",
+                                                             "LINE_COMMENT",
+                                                             "MULTILINE_COMMENT",
+                                                             "WS", "UNQUOTED_SOURCE",
+                                                             "EXPLAIN_WS",
+                                                             "EXPLAIN_LINE_COMMENT",
+                                                             "EXPLAIN_MULTILINE_COMMENT",
+                                                             "PIPE", "QUOTED_STRING",
+                                                             "INTEGER_LITERAL",
+                                                             "DECIMAL_LITERAL",
+                                                             "BY", "AND",
+                                                             "ASC", "ASSIGN",
+                                                             "CAST_OP",
+                                                             "COMMA", "DESC",
+                                                             "DOT", "FALSE",
+                                                             "FIRST", "LAST",
+                                                             "LP", "IN",
+                                                             "IS", "LIKE",
+                                                             "NOT", "NULL",
+                                                             "NULLS", "OR",
+                                                             "PARAM", "RLIKE",
+                                                             "RP", "TRUE",
+                                                             "EQ", "CIEQ",
+                                                             "NEQ", "LT",
+                                                             "LTE", "GT",
+                                                             "GTE", "PLUS",
+                                                             "MINUS", "ASTERISK",
+                                                             "SLASH", "PERCENT",
+                                                             "NAMED_OR_POSITIONAL_PARAM",
+                                                             "OPENING_BRACKET",
+                                                             "CLOSING_BRACKET",
+                                                             "UNQUOTED_IDENTIFIER",
+                                                             "QUOTED_IDENTIFIER",
+                                                             "EXPR_LINE_COMMENT",
+                                                             "EXPR_MULTILINE_COMMENT",
+                                                             "EXPR_WS",
+                                                             "METADATA",
+                                                             "FROM_LINE_COMMENT",
+                                                             "FROM_MULTILINE_COMMENT",
+                                                             "FROM_WS",
+                                                             "ID_PATTERN",
+                                                             "PROJECT_LINE_COMMENT",
+                                                             "PROJECT_MULTILINE_COMMENT",
+                                                             "PROJECT_WS",
+                                                             "AS", "RENAME_LINE_COMMENT",
+                                                             "RENAME_MULTILINE_COMMENT",
+                                                             "RENAME_WS",
+                                                             "ON", "WITH",
+                                                             "ENRICH_POLICY_NAME",
+                                                             "ENRICH_LINE_COMMENT",
+                                                             "ENRICH_MULTILINE_COMMENT",
+                                                             "ENRICH_WS",
+                                                             "ENRICH_FIELD_LINE_COMMENT",
+                                                             "ENRICH_FIELD_MULTILINE_COMMENT",
+                                                             "ENRICH_FIELD_WS",
+                                                             "LOOKUP_LINE_COMMENT",
+                                                             "LOOKUP_MULTILINE_COMMENT",
+                                                             "LOOKUP_WS",
+                                                             "LOOKUP_FIELD_LINE_COMMENT",
+                                                             "LOOKUP_FIELD_MULTILINE_COMMENT",
+                                                             "LOOKUP_FIELD_WS",
+                                                             "MVEXPAND_LINE_COMMENT",
+                                                             "MVEXPAND_MULTILINE_COMMENT",
+                                                             "MVEXPAND_WS",
+                                                             "INFO", "SHOW_LINE_COMMENT",
+                                                             "SHOW_MULTILINE_COMMENT",
+                                                             "SHOW_WS",
+                                                             "FUNCTIONS",
+                                                             "META_LINE_COMMENT",
+                                                             "META_MULTILINE_COMMENT",
+                                                             "META_WS",
+                                                             "COLON", "SETTING",
+                                                             "SETTING_LINE_COMMENT",
+                                                             "SETTTING_MULTILINE_COMMENT",
+                                                             "SETTING_WS",
+                                                             "METRICS_LINE_COMMENT",
+                                                             "METRICS_MULTILINE_COMMENT",
+                                                             "METRICS_WS",
+                                                             "CLOSING_METRICS_LINE_COMMENT",
+                                                             "CLOSING_METRICS_MULTILINE_COMMENT",
                                                              "CLOSING_METRICS_WS" ];
 	// tslint:disable:no-trailing-whitespace
 	public static readonly ruleNames: string[] = [
-		"singleStatement", "query", "sourceCommand", "processingCommand", "whereCommand", 
-		"booleanExpression", "regexBooleanExpression", "valueExpression", "operatorExpression", 
-		"primaryExpression", "functionExpression", "dataType", "rowCommand", "fields", 
-		"field", "fromCommand", "indexIdentifier", "metadata", "metadataOption", 
-		"deprecated_metadata", "metricsCommand", "evalCommand", "statsCommand", 
-		"inlinestatsCommand", "qualifiedName", "qualifiedNamePattern", "qualifiedNamePatterns", 
-		"identifier", "identifierPattern", "constant", "params", "limitCommand", 
-		"sortCommand", "orderExpression", "keepCommand", "dropCommand", "renameCommand", 
-		"renameClause", "dissectCommand", "grokCommand", "mvExpandCommand", "commandOptions", 
-		"commandOption", "booleanValue", "numericValue", "decimalValue", "integerValue", 
-		"string", "comparisonOperator", "explainCommand", "subqueryExpression", 
-		"showCommand", "metaCommand", "enrichCommand", "enrichWithClause", "lookupCommand",
+		"singleStatement", "query", "sourceCommand", "processingCommand", "whereCommand",
+		"booleanExpression", "regexBooleanExpression", "valueExpression", "operatorExpression",
+		"primaryExpression", "functionExpression", "dataType", "rowCommand", "fields",
+		"field", "fromCommand", "indexPattern", "clusterString", "indexString",
+		"metadata", "metadataOption", "deprecated_metadata", "metricsCommand",
+		"evalCommand", "statsCommand", "inlinestatsCommand", "qualifiedName",
+		"qualifiedNamePattern", "qualifiedNamePatterns", "identifier", "identifierPattern",
+		"constant", "params", "limitCommand", "sortCommand", "orderExpression",
+		"keepCommand", "dropCommand", "renameCommand", "renameClause", "dissectCommand",
+		"grokCommand", "mvExpandCommand", "commandOptions", "commandOption", "booleanValue",
+		"numericValue", "decimalValue", "integerValue", "string", "comparisonOperator",
+		"explainCommand", "subqueryExpression", "showCommand", "metaCommand",
+		"enrichCommand", "enrichWithClause", "lookupCommand",
 	];
 	public get grammarFileName(): string { return "esql_parser.g4"; }
 	public get literalNames(): (string | null)[] { return esql_parser.literalNames; }
@@ -388,9 +391,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 112;
+			this.state = 116;
 			this.query(0);
-			this.state = 113;
+			this.state = 117;
 			this.match(esql_parser.EOF);
 			}
 		}
@@ -432,11 +435,11 @@ export default class esql_parser extends Parser {
 			this._ctx = localctx;
 			_prevctx = localctx;
 
-			this.state = 116;
+			this.state = 120;
 			this.sourceCommand();
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 123;
+			this.state = 127;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 0, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -449,18 +452,18 @@ export default class esql_parser extends Parser {
 					{
 					localctx = new CompositeQueryContext(this, new QueryContext(this, _parentctx, _parentState));
 					this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_query);
-					this.state = 118;
+					this.state = 122;
 					if (!(this.precpred(this._ctx, 1))) {
 						throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
 					}
-					this.state = 119;
+					this.state = 123;
 					this.match(esql_parser.PIPE);
-					this.state = 120;
+					this.state = 124;
 					this.processingCommand();
 					}
 					}
 				}
-				this.state = 125;
+				this.state = 129;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 0, this._ctx);
 			}
@@ -485,48 +488,48 @@ export default class esql_parser extends Parser {
 		let localctx: SourceCommandContext = new SourceCommandContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 4, esql_parser.RULE_sourceCommand);
 		try {
-			this.state = 132;
+			this.state = 136;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 5:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 126;
+				this.state = 130;
 				this.explainCommand();
 				}
 				break;
 			case 6:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 127;
+				this.state = 131;
 				this.fromCommand();
 				}
 				break;
 			case 16:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 128;
+				this.state = 132;
 				this.rowCommand();
 				}
 				break;
 			case 13:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 129;
+				this.state = 133;
 				this.metricsCommand();
 				}
 				break;
 			case 17:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 130;
+				this.state = 134;
 				this.showCommand();
 				}
 				break;
 			case 12:
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 131;
+				this.state = 135;
 				this.metaCommand();
 				}
 				break;
@@ -553,104 +556,104 @@ export default class esql_parser extends Parser {
 		let localctx: ProcessingCommandContext = new ProcessingCommandContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 6, esql_parser.RULE_processingCommand);
 		try {
-			this.state = 148;
+			this.state = 152;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 4:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 134;
+				this.state = 138;
 				this.evalCommand();
 				}
 				break;
 			case 8:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 135;
+				this.state = 139;
 				this.inlinestatsCommand();
 				}
 				break;
 			case 10:
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 136;
+				this.state = 140;
 				this.limitCommand();
 				}
 				break;
 			case 11:
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 137;
+				this.state = 141;
 				this.lookupCommand();
 				}
 				break;
 			case 9:
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 138;
+				this.state = 142;
 				this.keepCommand();
 				}
 				break;
 			case 18:
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 139;
+				this.state = 143;
 				this.sortCommand();
 				}
 				break;
 			case 19:
 				this.enterOuterAlt(localctx, 7);
 				{
-				this.state = 140;
+				this.state = 144;
 				this.statsCommand();
 				}
 				break;
 			case 20:
 				this.enterOuterAlt(localctx, 8);
 				{
-				this.state = 141;
+				this.state = 145;
 				this.whereCommand();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 9);
 				{
-				this.state = 142;
+				this.state = 146;
 				this.dropCommand();
 				}
 				break;
 			case 15:
 				this.enterOuterAlt(localctx, 10);
 				{
-				this.state = 143;
+				this.state = 147;
 				this.renameCommand();
 				}
 				break;
 			case 1:
 				this.enterOuterAlt(localctx, 11);
 				{
-				this.state = 144;
+				this.state = 148;
 				this.dissectCommand();
 				}
 				break;
 			case 7:
 				this.enterOuterAlt(localctx, 12);
 				{
-				this.state = 145;
+				this.state = 149;
 				this.grokCommand();
 				}
 				break;
 			case 3:
 				this.enterOuterAlt(localctx, 13);
 				{
-				this.state = 146;
+				this.state = 150;
 				this.enrichCommand();
 				}
 				break;
 			case 14:
 				this.enterOuterAlt(localctx, 14);
 				{
-				this.state = 147;
+				this.state = 151;
 				this.mvExpandCommand();
 				}
 				break;
@@ -679,9 +682,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 150;
+			this.state = 154;
 			this.match(esql_parser.WHERE);
-			this.state = 151;
+			this.state = 155;
 			this.booleanExpression(0);
 			}
 		}
@@ -719,7 +722,7 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 181;
+			this.state = 185;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 6, this._ctx) ) {
 			case 1:
@@ -728,9 +731,9 @@ export default class esql_parser extends Parser {
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 154;
+				this.state = 158;
 				this.match(esql_parser.NOT);
-				this.state = 155;
+				this.state = 159;
 				this.booleanExpression(7);
 				}
 				break;
@@ -739,7 +742,7 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanDefaultContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 156;
+				this.state = 160;
 				this.valueExpression();
 				}
 				break;
@@ -748,7 +751,7 @@ export default class esql_parser extends Parser {
 				localctx = new RegexExpressionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 157;
+				this.state = 161;
 				this.regexBooleanExpression();
 				}
 				break;
@@ -757,41 +760,41 @@ export default class esql_parser extends Parser {
 				localctx = new LogicalInContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 158;
+				this.state = 162;
 				this.valueExpression();
-				this.state = 160;
+				this.state = 164;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===48) {
 					{
-					this.state = 159;
+					this.state = 163;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 162;
+				this.state = 166;
 				this.match(esql_parser.IN);
-				this.state = 163;
+				this.state = 167;
 				this.match(esql_parser.LP);
-				this.state = 164;
+				this.state = 168;
 				this.valueExpression();
-				this.state = 169;
+				this.state = 173;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===38) {
 					{
 					{
-					this.state = 165;
+					this.state = 169;
 					this.match(esql_parser.COMMA);
-					this.state = 166;
+					this.state = 170;
 					this.valueExpression();
 					}
 					}
-					this.state = 171;
+					this.state = 175;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 172;
+				this.state = 176;
 				this.match(esql_parser.RP);
 				}
 				break;
@@ -800,27 +803,27 @@ export default class esql_parser extends Parser {
 				localctx = new IsNullContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 174;
+				this.state = 178;
 				this.valueExpression();
-				this.state = 175;
+				this.state = 179;
 				this.match(esql_parser.IS);
-				this.state = 177;
+				this.state = 181;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===48) {
 					{
-					this.state = 176;
+					this.state = 180;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 179;
+				this.state = 183;
 				this.match(esql_parser.NULL);
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 191;
+			this.state = 195;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -830,7 +833,7 @@ export default class esql_parser extends Parser {
 					}
 					_prevctx = localctx;
 					{
-					this.state = 189;
+					this.state = 193;
 					this._errHandler.sync(this);
 					switch ( this._interp.adaptivePredict(this._input, 7, this._ctx) ) {
 					case 1:
@@ -838,13 +841,13 @@ export default class esql_parser extends Parser {
 						localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
 						(localctx as LogicalBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
-						this.state = 183;
+						this.state = 187;
 						if (!(this.precpred(this._ctx, 4))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 4)");
 						}
-						this.state = 184;
+						this.state = 188;
 						(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.AND);
-						this.state = 185;
+						this.state = 189;
 						(localctx as LogicalBinaryContext)._right = this.booleanExpression(5);
 						}
 						break;
@@ -853,20 +856,20 @@ export default class esql_parser extends Parser {
 						localctx = new LogicalBinaryContext(this, new BooleanExpressionContext(this, _parentctx, _parentState));
 						(localctx as LogicalBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_booleanExpression);
-						this.state = 186;
+						this.state = 190;
 						if (!(this.precpred(this._ctx, 3))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 3)");
 						}
-						this.state = 187;
+						this.state = 191;
 						(localctx as LogicalBinaryContext)._operator = this.match(esql_parser.OR);
-						this.state = 188;
+						this.state = 192;
 						(localctx as LogicalBinaryContext)._right = this.booleanExpression(4);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 193;
+				this.state = 197;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 8, this._ctx);
 			}
@@ -892,48 +895,48 @@ export default class esql_parser extends Parser {
 		this.enterRule(localctx, 12, esql_parser.RULE_regexBooleanExpression);
 		let _la: number;
 		try {
-			this.state = 208;
+			this.state = 212;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 11, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 194;
+				this.state = 198;
 				this.valueExpression();
-				this.state = 196;
+				this.state = 200;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===48) {
 					{
-					this.state = 195;
+					this.state = 199;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 198;
+				this.state = 202;
 				localctx._kind = this.match(esql_parser.LIKE);
-				this.state = 199;
+				this.state = 203;
 				localctx._pattern = this.string_();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 201;
+				this.state = 205;
 				this.valueExpression();
-				this.state = 203;
+				this.state = 207;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				if (_la===48) {
 					{
-					this.state = 202;
+					this.state = 206;
 					this.match(esql_parser.NOT);
 					}
 				}
 
-				this.state = 205;
+				this.state = 209;
 				localctx._kind = this.match(esql_parser.RLIKE);
-				this.state = 206;
+				this.state = 210;
 				localctx._pattern = this.string_();
 				}
 				break;
@@ -958,14 +961,14 @@ export default class esql_parser extends Parser {
 		let localctx: ValueExpressionContext = new ValueExpressionContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 14, esql_parser.RULE_valueExpression);
 		try {
-			this.state = 215;
+			this.state = 219;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 12, this._ctx) ) {
 			case 1:
 				localctx = new ValueExpressionDefaultContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 210;
+				this.state = 214;
 				this.operatorExpression(0);
 				}
 				break;
@@ -973,11 +976,11 @@ export default class esql_parser extends Parser {
 				localctx = new ComparisonContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 211;
+				this.state = 215;
 				(localctx as ComparisonContext)._left = this.operatorExpression(0);
-				this.state = 212;
+				this.state = 216;
 				this.comparisonOperator();
-				this.state = 213;
+				this.state = 217;
 				(localctx as ComparisonContext)._right = this.operatorExpression(0);
 				}
 				break;
@@ -1017,7 +1020,7 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 221;
+			this.state = 225;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 13, this._ctx) ) {
 			case 1:
@@ -1026,7 +1029,7 @@ export default class esql_parser extends Parser {
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 218;
+				this.state = 222;
 				this.primaryExpression(0);
 				}
 				break;
@@ -1035,7 +1038,7 @@ export default class esql_parser extends Parser {
 				localctx = new ArithmeticUnaryContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 219;
+				this.state = 223;
 				(localctx as ArithmeticUnaryContext)._operator = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===63 || _la===64)) {
@@ -1045,13 +1048,13 @@ export default class esql_parser extends Parser {
 					this._errHandler.reportMatch(this);
 				    this.consume();
 				}
-				this.state = 220;
+				this.state = 224;
 				this.operatorExpression(3);
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 231;
+			this.state = 235;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1061,7 +1064,7 @@ export default class esql_parser extends Parser {
 					}
 					_prevctx = localctx;
 					{
-					this.state = 229;
+					this.state = 233;
 					this._errHandler.sync(this);
 					switch ( this._interp.adaptivePredict(this._input, 14, this._ctx) ) {
 					case 1:
@@ -1069,11 +1072,11 @@ export default class esql_parser extends Parser {
 						localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
 						(localctx as ArithmeticBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
-						this.state = 223;
+						this.state = 227;
 						if (!(this.precpred(this._ctx, 2))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 2)");
 						}
-						this.state = 224;
+						this.state = 228;
 						(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(((((_la - 65)) & ~0x1F) === 0 && ((1 << (_la - 65)) & 7) !== 0))) {
@@ -1083,7 +1086,7 @@ export default class esql_parser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 225;
+						this.state = 229;
 						(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(3);
 						}
 						break;
@@ -1092,11 +1095,11 @@ export default class esql_parser extends Parser {
 						localctx = new ArithmeticBinaryContext(this, new OperatorExpressionContext(this, _parentctx, _parentState));
 						(localctx as ArithmeticBinaryContext)._left = _prevctx;
 						this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_operatorExpression);
-						this.state = 226;
+						this.state = 230;
 						if (!(this.precpred(this._ctx, 1))) {
 							throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
 						}
-						this.state = 227;
+						this.state = 231;
 						(localctx as ArithmeticBinaryContext)._operator = this._input.LT(1);
 						_la = this._input.LA(1);
 						if(!(_la===63 || _la===64)) {
@@ -1106,14 +1109,14 @@ export default class esql_parser extends Parser {
 							this._errHandler.reportMatch(this);
 						    this.consume();
 						}
-						this.state = 228;
+						this.state = 232;
 						(localctx as ArithmeticBinaryContext)._right = this.operatorExpression(2);
 						}
 						break;
 					}
 					}
 				}
-				this.state = 233;
+				this.state = 237;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 15, this._ctx);
 			}
@@ -1152,7 +1155,7 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 242;
+			this.state = 246;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 16, this._ctx) ) {
 			case 1:
@@ -1161,7 +1164,7 @@ export default class esql_parser extends Parser {
 				this._ctx = localctx;
 				_prevctx = localctx;
 
-				this.state = 235;
+				this.state = 239;
 				this.constant();
 				}
 				break;
@@ -1170,7 +1173,7 @@ export default class esql_parser extends Parser {
 				localctx = new DereferenceContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 236;
+				this.state = 240;
 				this.qualifiedName();
 				}
 				break;
@@ -1179,7 +1182,7 @@ export default class esql_parser extends Parser {
 				localctx = new FunctionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 237;
+				this.state = 241;
 				this.functionExpression();
 				}
 				break;
@@ -1188,17 +1191,17 @@ export default class esql_parser extends Parser {
 				localctx = new ParenthesizedExpressionContext(this, localctx);
 				this._ctx = localctx;
 				_prevctx = localctx;
-				this.state = 238;
+				this.state = 242;
 				this.match(esql_parser.LP);
-				this.state = 239;
+				this.state = 243;
 				this.booleanExpression(0);
-				this.state = 240;
+				this.state = 244;
 				this.match(esql_parser.RP);
 				}
 				break;
 			}
 			this._ctx.stop = this._input.LT(-1);
-			this.state = 249;
+			this.state = 253;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 17, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
@@ -1211,18 +1214,18 @@ export default class esql_parser extends Parser {
 					{
 					localctx = new InlineCastContext(this, new PrimaryExpressionContext(this, _parentctx, _parentState));
 					this.pushNewRecursionContext(localctx, _startState, esql_parser.RULE_primaryExpression);
-					this.state = 244;
+					this.state = 248;
 					if (!(this.precpred(this._ctx, 1))) {
 						throw this.createFailedPredicateException("this.precpred(this._ctx, 1)");
 					}
-					this.state = 245;
+					this.state = 249;
 					this.match(esql_parser.CAST_OP);
-					this.state = 246;
+					this.state = 250;
 					this.dataType();
 					}
 					}
 				}
-				this.state = 251;
+				this.state = 255;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 17, this._ctx);
 			}
@@ -1250,16 +1253,16 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 252;
+			this.state = 256;
 			this.identifier();
-			this.state = 253;
+			this.state = 257;
 			this.match(esql_parser.LP);
-			this.state = 263;
+			this.state = 267;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 65:
 				{
-				this.state = 254;
+				this.state = 258;
 				this.match(esql_parser.ASTERISK);
 				}
 				break;
@@ -1280,21 +1283,21 @@ export default class esql_parser extends Parser {
 			case 72:
 				{
 				{
-				this.state = 255;
+				this.state = 259;
 				this.booleanExpression(0);
-				this.state = 260;
+				this.state = 264;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===38) {
 					{
 					{
-					this.state = 256;
+					this.state = 260;
 					this.match(esql_parser.COMMA);
-					this.state = 257;
+					this.state = 261;
 					this.booleanExpression(0);
 					}
 					}
-					this.state = 262;
+					this.state = 266;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
@@ -1306,7 +1309,7 @@ export default class esql_parser extends Parser {
 			default:
 				break;
 			}
-			this.state = 265;
+			this.state = 269;
 			this.match(esql_parser.RP);
 			}
 		}
@@ -1332,7 +1335,7 @@ export default class esql_parser extends Parser {
 			localctx = new ToDataTypeContext(this, localctx);
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 267;
+			this.state = 271;
 			this.identifier();
 			}
 		}
@@ -1357,9 +1360,9 @@ export default class esql_parser extends Parser {
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 269;
+			this.state = 273;
 			this.match(esql_parser.ROW);
-			this.state = 270;
+			this.state = 274;
 			this.fields();
 			}
 		}
@@ -1385,23 +1388,23 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 272;
+			this.state = 276;
 			this.field();
-			this.state = 277;
+			this.state = 281;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 273;
+					this.state = 277;
 					this.match(esql_parser.COMMA);
-					this.state = 274;
+					this.state = 278;
 					this.field();
 					}
 					}
 				}
-				this.state = 279;
+				this.state = 283;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 20, this._ctx);
 			}
@@ -1426,24 +1429,24 @@ export default class esql_parser extends Parser {
 		let localctx: FieldContext = new FieldContext(this, this._ctx, this.state);
 		this.enterRule(localctx, 28, esql_parser.RULE_field);
 		try {
-			this.state = 285;
+			this.state = 289;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 21, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 280;
+				this.state = 284;
 				this.booleanExpression(0);
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 281;
+				this.state = 285;
 				this.qualifiedName();
-				this.state = 282;
+				this.state = 286;
 				this.match(esql_parser.ASSIGN);
-				this.state = 283;
+				this.state = 287;
 				this.booleanExpression(0);
 				}
 				break;
@@ -1471,34 +1474,34 @@ export default class esql_parser extends Parser {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 287;
+			this.state = 291;
 			this.match(esql_parser.FROM);
-			this.state = 288;
-			this.indexIdentifier();
-			this.state = 293;
+			this.state = 292;
+			this.indexPattern();
+			this.state = 297;
 			this._errHandler.sync(this);
 			_alt = this._interp.adaptivePredict(this._input, 22, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 289;
+					this.state = 293;
 					this.match(esql_parser.COMMA);
-					this.state = 290;
-					this.indexIdentifier();
+					this.state = 294;
+					this.indexPattern();
 					}
 					}
 				}
-				this.state = 295;
+				this.state = 299;
 				this._errHandler.sync(this);
 				_alt = this._interp.adaptivePredict(this._input, 22, this._ctx);
 			}
-			this.state = 297;
+			this.state = 301;
 			this._errHandler.sync(this);
 			switch ( this._interp.adaptivePredict(this._input, 23, this._ctx) ) {
 			case 1:
 				{
-				this.state = 296;
+				this.state = 300;
 				this.metadata();
 				}
 				break;
@@ -1520,14 +1523,89 @@ export default class esql_parser extends Parser {
 		return localctx;
 	}
 	// @RuleVersion(0)
-	public indexIdentifier(): IndexIdentifierContext {
-		let localctx: IndexIdentifierContext = new IndexIdentifierContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 32, esql_parser.RULE_indexIdentifier);
+	public indexPattern(): IndexPatternContext {
+		let localctx: IndexPatternContext = new IndexPatternContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 32, esql_parser.RULE_indexPattern);
+		try {
+			this.state = 308;
+			this._errHandler.sync(this);
+			switch ( this._interp.adaptivePredict(this._input, 24, this._ctx) ) {
+			case 1:
+				this.enterOuterAlt(localctx, 1);
+				{
+				this.state = 303;
+				this.clusterString();
+				this.state = 304;
+				this.match(esql_parser.COLON);
+				this.state = 305;
+				this.indexString();
+				}
+				break;
+			case 2:
+				this.enterOuterAlt(localctx, 2);
+				{
+				this.state = 307;
+				this.indexString();
+				}
+				break;
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
+	public clusterString(): ClusterStringContext {
+		let localctx: ClusterStringContext = new ClusterStringContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 34, esql_parser.RULE_clusterString);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 299;
-			this.match(esql_parser.INDEX_UNQUOTED_IDENTIFIER);
+			this.state = 310;
+			this.match(esql_parser.UNQUOTED_SOURCE);
+			}
+		}
+		catch (re) {
+			if (re instanceof RecognitionException) {
+				localctx.exception = re;
+				this._errHandler.reportError(this, re);
+				this._errHandler.recover(this, re);
+			} else {
+				throw re;
+			}
+		}
+		finally {
+			this.exitRule();
+		}
+		return localctx;
+	}
+	// @RuleVersion(0)
+	public indexString(): IndexStringContext {
+		let localctx: IndexStringContext = new IndexStringContext(this, this._ctx, this.state);
+		this.enterRule(localctx, 36, esql_parser.RULE_indexString);
+		let _la: number;
+		try {
+			this.enterOuterAlt(localctx, 1);
+			{
+			this.state = 312;
+			_la = this._input.LA(1);
+			if(!(_la===25 || _la===30)) {
+			this._errHandler.recoverInline(this);
+			}
+			else {
+				this._errHandler.reportMatch(this);
+			    this.consume();
+			}
 			}
 		}
 		catch (re) {
@@ -1547,22 +1625,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metadata(): MetadataContext {
 		let localctx: MetadataContext = new MetadataContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 34, esql_parser.RULE_metadata);
+		this.enterRule(localctx, 38, esql_parser.RULE_metadata);
 		try {
-			this.state = 303;
+			this.state = 316;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 76:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 301;
+				this.state = 314;
 				this.metadataOption();
 				}
 				break;
 			case 69:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 302;
+				this.state = 315;
 				this.deprecated_metadata();
 				}
 				break;
@@ -1587,32 +1665,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metadataOption(): MetadataOptionContext {
 		let localctx: MetadataOptionContext = new MetadataOptionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 36, esql_parser.RULE_metadataOption);
+		this.enterRule(localctx, 40, esql_parser.RULE_metadataOption);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 305;
+			this.state = 318;
 			this.match(esql_parser.METADATA);
-			this.state = 306;
-			this.indexIdentifier();
-			this.state = 311;
+			this.state = 319;
+			this.match(esql_parser.UNQUOTED_SOURCE);
+			this.state = 324;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 25, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 307;
+					this.state = 320;
 					this.match(esql_parser.COMMA);
-					this.state = 308;
-					this.indexIdentifier();
+					this.state = 321;
+					this.match(esql_parser.UNQUOTED_SOURCE);
 					}
 					}
 				}
-				this.state = 313;
+				this.state = 326;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 25, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
 			}
 			}
 		}
@@ -1633,15 +1711,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public deprecated_metadata(): Deprecated_metadataContext {
 		let localctx: Deprecated_metadataContext = new Deprecated_metadataContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 38, esql_parser.RULE_deprecated_metadata);
+		this.enterRule(localctx, 42, esql_parser.RULE_deprecated_metadata);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 314;
+			this.state = 327;
 			this.match(esql_parser.OPENING_BRACKET);
-			this.state = 315;
+			this.state = 328;
 			this.metadataOption();
-			this.state = 316;
+			this.state = 329;
 			this.match(esql_parser.CLOSING_BRACKET);
 			}
 		}
@@ -1662,51 +1740,51 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metricsCommand(): MetricsCommandContext {
 		let localctx: MetricsCommandContext = new MetricsCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 40, esql_parser.RULE_metricsCommand);
+		this.enterRule(localctx, 44, esql_parser.RULE_metricsCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 318;
+			this.state = 331;
 			this.match(esql_parser.METRICS);
-			this.state = 319;
-			this.indexIdentifier();
-			this.state = 324;
+			this.state = 332;
+			this.indexPattern();
+			this.state = 337;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 320;
+					this.state = 333;
 					this.match(esql_parser.COMMA);
-					this.state = 321;
-					this.indexIdentifier();
+					this.state = 334;
+					this.indexPattern();
 					}
 					}
 				}
-				this.state = 326;
+				this.state = 339;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 26, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 27, this._ctx);
 			}
-			this.state = 328;
+			this.state = 341;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 27, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
 			case 1:
 				{
-				this.state = 327;
+				this.state = 340;
 				localctx._aggregates = this.fields();
 				}
 				break;
 			}
-			this.state = 332;
+			this.state = 345;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 28, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 29, this._ctx) ) {
 			case 1:
 				{
-				this.state = 330;
+				this.state = 343;
 				this.match(esql_parser.BY);
-				this.state = 331;
+				this.state = 344;
 				localctx._grouping = this.fields();
 				}
 				break;
@@ -1730,13 +1808,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public evalCommand(): EvalCommandContext {
 		let localctx: EvalCommandContext = new EvalCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 42, esql_parser.RULE_evalCommand);
+		this.enterRule(localctx, 46, esql_parser.RULE_evalCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 334;
+			this.state = 347;
 			this.match(esql_parser.EVAL);
-			this.state = 335;
+			this.state = 348;
 			this.fields();
 			}
 		}
@@ -1757,30 +1835,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public statsCommand(): StatsCommandContext {
 		let localctx: StatsCommandContext = new StatsCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 44, esql_parser.RULE_statsCommand);
+		this.enterRule(localctx, 48, esql_parser.RULE_statsCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 337;
+			this.state = 350;
 			this.match(esql_parser.STATS);
-			this.state = 339;
+			this.state = 352;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 29, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 30, this._ctx) ) {
 			case 1:
 				{
-				this.state = 338;
+				this.state = 351;
 				localctx._stats = this.fields();
 				}
 				break;
 			}
-			this.state = 343;
+			this.state = 356;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 30, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 31, this._ctx) ) {
 			case 1:
 				{
-				this.state = 341;
+				this.state = 354;
 				this.match(esql_parser.BY);
-				this.state = 342;
+				this.state = 355;
 				localctx._grouping = this.fields();
 				}
 				break;
@@ -1804,22 +1882,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public inlinestatsCommand(): InlinestatsCommandContext {
 		let localctx: InlinestatsCommandContext = new InlinestatsCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 46, esql_parser.RULE_inlinestatsCommand);
+		this.enterRule(localctx, 50, esql_parser.RULE_inlinestatsCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 345;
+			this.state = 358;
 			this.match(esql_parser.INLINESTATS);
-			this.state = 346;
+			this.state = 359;
 			localctx._stats = this.fields();
-			this.state = 349;
+			this.state = 362;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 31, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 32, this._ctx) ) {
 			case 1:
 				{
-				this.state = 347;
+				this.state = 360;
 				this.match(esql_parser.BY);
-				this.state = 348;
+				this.state = 361;
 				localctx._grouping = this.fields();
 				}
 				break;
@@ -1843,30 +1921,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public qualifiedName(): QualifiedNameContext {
 		let localctx: QualifiedNameContext = new QualifiedNameContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 48, esql_parser.RULE_qualifiedName);
+		this.enterRule(localctx, 52, esql_parser.RULE_qualifiedName);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 351;
+			this.state = 364;
 			this.identifier();
-			this.state = 356;
+			this.state = 369;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 352;
+					this.state = 365;
 					this.match(esql_parser.DOT);
-					this.state = 353;
+					this.state = 366;
 					this.identifier();
 					}
 					}
 				}
-				this.state = 358;
+				this.state = 371;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 32, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
 			}
 			}
 		}
@@ -1887,30 +1965,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public qualifiedNamePattern(): QualifiedNamePatternContext {
 		let localctx: QualifiedNamePatternContext = new QualifiedNamePatternContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 50, esql_parser.RULE_qualifiedNamePattern);
+		this.enterRule(localctx, 54, esql_parser.RULE_qualifiedNamePattern);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 359;
+			this.state = 372;
 			this.identifierPattern();
-			this.state = 364;
+			this.state = 377;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 360;
+					this.state = 373;
 					this.match(esql_parser.DOT);
-					this.state = 361;
+					this.state = 374;
 					this.identifierPattern();
 					}
 					}
 				}
-				this.state = 366;
+				this.state = 379;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 33, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
 			}
 			}
 		}
@@ -1931,30 +2009,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public qualifiedNamePatterns(): QualifiedNamePatternsContext {
 		let localctx: QualifiedNamePatternsContext = new QualifiedNamePatternsContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 52, esql_parser.RULE_qualifiedNamePatterns);
+		this.enterRule(localctx, 56, esql_parser.RULE_qualifiedNamePatterns);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 367;
+			this.state = 380;
 			this.qualifiedNamePattern();
-			this.state = 372;
+			this.state = 385;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 35, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 368;
+					this.state = 381;
 					this.match(esql_parser.COMMA);
-					this.state = 369;
+					this.state = 382;
 					this.qualifiedNamePattern();
 					}
 					}
 				}
-				this.state = 374;
+				this.state = 387;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 34, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 35, this._ctx);
 			}
 			}
 		}
@@ -1975,12 +2053,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public identifier(): IdentifierContext {
 		let localctx: IdentifierContext = new IdentifierContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 54, esql_parser.RULE_identifier);
+		this.enterRule(localctx, 58, esql_parser.RULE_identifier);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 375;
+			this.state = 388;
 			_la = this._input.LA(1);
 			if(!(_la===71 || _la===72)) {
 			this._errHandler.recoverInline(this);
@@ -2008,11 +2086,11 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public identifierPattern(): IdentifierPatternContext {
 		let localctx: IdentifierPatternContext = new IdentifierPatternContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 56, esql_parser.RULE_identifierPattern);
+		this.enterRule(localctx, 60, esql_parser.RULE_identifierPattern);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 377;
+			this.state = 390;
 			this.match(esql_parser.ID_PATTERN);
 			}
 		}
@@ -2033,17 +2111,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public constant(): ConstantContext {
 		let localctx: ConstantContext = new ConstantContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 58, esql_parser.RULE_constant);
+		this.enterRule(localctx, 62, esql_parser.RULE_constant);
 		let _la: number;
 		try {
-			this.state = 421;
+			this.state = 434;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 38, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 39, this._ctx) ) {
 			case 1:
 				localctx = new NullLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 379;
+				this.state = 392;
 				this.match(esql_parser.NULL);
 				}
 				break;
@@ -2051,9 +2129,9 @@ export default class esql_parser extends Parser {
 				localctx = new QualifiedIntegerLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 380;
+				this.state = 393;
 				this.integerValue();
-				this.state = 381;
+				this.state = 394;
 				this.match(esql_parser.UNQUOTED_IDENTIFIER);
 				}
 				break;
@@ -2061,7 +2139,7 @@ export default class esql_parser extends Parser {
 				localctx = new DecimalLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 3);
 				{
-				this.state = 383;
+				this.state = 396;
 				this.decimalValue();
 				}
 				break;
@@ -2069,7 +2147,7 @@ export default class esql_parser extends Parser {
 				localctx = new IntegerLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 4);
 				{
-				this.state = 384;
+				this.state = 397;
 				this.integerValue();
 				}
 				break;
@@ -2077,7 +2155,7 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 5);
 				{
-				this.state = 385;
+				this.state = 398;
 				this.booleanValue();
 				}
 				break;
@@ -2085,7 +2163,7 @@ export default class esql_parser extends Parser {
 				localctx = new InputParamsContext(this, localctx);
 				this.enterOuterAlt(localctx, 6);
 				{
-				this.state = 386;
+				this.state = 399;
 				this.params();
 				}
 				break;
@@ -2093,7 +2171,7 @@ export default class esql_parser extends Parser {
 				localctx = new StringLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 7);
 				{
-				this.state = 387;
+				this.state = 400;
 				this.string_();
 				}
 				break;
@@ -2101,27 +2179,27 @@ export default class esql_parser extends Parser {
 				localctx = new NumericArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 8);
 				{
-				this.state = 388;
+				this.state = 401;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 389;
+				this.state = 402;
 				this.numericValue();
-				this.state = 394;
+				this.state = 407;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===38) {
 					{
 					{
-					this.state = 390;
+					this.state = 403;
 					this.match(esql_parser.COMMA);
-					this.state = 391;
+					this.state = 404;
 					this.numericValue();
 					}
 					}
-					this.state = 396;
+					this.state = 409;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 397;
+				this.state = 410;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -2129,27 +2207,27 @@ export default class esql_parser extends Parser {
 				localctx = new BooleanArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 9);
 				{
-				this.state = 399;
+				this.state = 412;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 400;
+				this.state = 413;
 				this.booleanValue();
-				this.state = 405;
+				this.state = 418;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===38) {
 					{
 					{
-					this.state = 401;
+					this.state = 414;
 					this.match(esql_parser.COMMA);
-					this.state = 402;
+					this.state = 415;
 					this.booleanValue();
 					}
 					}
-					this.state = 407;
+					this.state = 420;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 408;
+				this.state = 421;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -2157,27 +2235,27 @@ export default class esql_parser extends Parser {
 				localctx = new StringArrayLiteralContext(this, localctx);
 				this.enterOuterAlt(localctx, 10);
 				{
-				this.state = 410;
+				this.state = 423;
 				this.match(esql_parser.OPENING_BRACKET);
-				this.state = 411;
+				this.state = 424;
 				this.string_();
-				this.state = 416;
+				this.state = 429;
 				this._errHandler.sync(this);
 				_la = this._input.LA(1);
 				while (_la===38) {
 					{
 					{
-					this.state = 412;
+					this.state = 425;
 					this.match(esql_parser.COMMA);
-					this.state = 413;
+					this.state = 426;
 					this.string_();
 					}
 					}
-					this.state = 418;
+					this.state = 431;
 					this._errHandler.sync(this);
 					_la = this._input.LA(1);
 				}
-				this.state = 419;
+				this.state = 432;
 				this.match(esql_parser.CLOSING_BRACKET);
 				}
 				break;
@@ -2200,16 +2278,16 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public params(): ParamsContext {
 		let localctx: ParamsContext = new ParamsContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 60, esql_parser.RULE_params);
+		this.enterRule(localctx, 64, esql_parser.RULE_params);
 		try {
-			this.state = 425;
+			this.state = 438;
 			this._errHandler.sync(this);
 			switch (this._input.LA(1)) {
 			case 52:
 				localctx = new InputParamContext(this, localctx);
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 423;
+				this.state = 436;
 				this.match(esql_parser.PARAM);
 				}
 				break;
@@ -2217,7 +2295,7 @@ export default class esql_parser extends Parser {
 				localctx = new InputNamedOrPositionalParamContext(this, localctx);
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 424;
+				this.state = 437;
 				this.match(esql_parser.NAMED_OR_POSITIONAL_PARAM);
 				}
 				break;
@@ -2242,13 +2320,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public limitCommand(): LimitCommandContext {
 		let localctx: LimitCommandContext = new LimitCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 62, esql_parser.RULE_limitCommand);
+		this.enterRule(localctx, 66, esql_parser.RULE_limitCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 427;
+			this.state = 440;
 			this.match(esql_parser.LIMIT);
-			this.state = 428;
+			this.state = 441;
 			this.match(esql_parser.INTEGER_LITERAL);
 			}
 		}
@@ -2269,32 +2347,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public sortCommand(): SortCommandContext {
 		let localctx: SortCommandContext = new SortCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 64, esql_parser.RULE_sortCommand);
+		this.enterRule(localctx, 68, esql_parser.RULE_sortCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 430;
+			this.state = 443;
 			this.match(esql_parser.SORT);
-			this.state = 431;
+			this.state = 444;
 			this.orderExpression();
-			this.state = 436;
+			this.state = 449;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 432;
+					this.state = 445;
 					this.match(esql_parser.COMMA);
-					this.state = 433;
+					this.state = 446;
 					this.orderExpression();
 					}
 					}
 				}
-				this.state = 438;
+				this.state = 451;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 40, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 41, this._ctx);
 			}
 			}
 		}
@@ -2315,19 +2393,19 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public orderExpression(): OrderExpressionContext {
 		let localctx: OrderExpressionContext = new OrderExpressionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 66, esql_parser.RULE_orderExpression);
+		this.enterRule(localctx, 70, esql_parser.RULE_orderExpression);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 439;
+			this.state = 452;
 			this.booleanExpression(0);
-			this.state = 441;
+			this.state = 454;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 41, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 42, this._ctx) ) {
 			case 1:
 				{
-				this.state = 440;
+				this.state = 453;
 				localctx._ordering = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===35 || _la===39)) {
@@ -2340,14 +2418,14 @@ export default class esql_parser extends Parser {
 				}
 				break;
 			}
-			this.state = 445;
+			this.state = 458;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 42, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 43, this._ctx) ) {
 			case 1:
 				{
-				this.state = 443;
+				this.state = 456;
 				this.match(esql_parser.NULLS);
-				this.state = 444;
+				this.state = 457;
 				localctx._nullOrdering = this._input.LT(1);
 				_la = this._input.LA(1);
 				if(!(_la===42 || _la===43)) {
@@ -2379,13 +2457,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public keepCommand(): KeepCommandContext {
 		let localctx: KeepCommandContext = new KeepCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 68, esql_parser.RULE_keepCommand);
+		this.enterRule(localctx, 72, esql_parser.RULE_keepCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 447;
+			this.state = 460;
 			this.match(esql_parser.KEEP);
-			this.state = 448;
+			this.state = 461;
 			this.qualifiedNamePatterns();
 			}
 		}
@@ -2406,13 +2484,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public dropCommand(): DropCommandContext {
 		let localctx: DropCommandContext = new DropCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 70, esql_parser.RULE_dropCommand);
+		this.enterRule(localctx, 74, esql_parser.RULE_dropCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 450;
+			this.state = 463;
 			this.match(esql_parser.DROP);
-			this.state = 451;
+			this.state = 464;
 			this.qualifiedNamePatterns();
 			}
 		}
@@ -2433,32 +2511,32 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public renameCommand(): RenameCommandContext {
 		let localctx: RenameCommandContext = new RenameCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 72, esql_parser.RULE_renameCommand);
+		this.enterRule(localctx, 76, esql_parser.RULE_renameCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 453;
+			this.state = 466;
 			this.match(esql_parser.RENAME);
-			this.state = 454;
+			this.state = 467;
 			this.renameClause();
-			this.state = 459;
+			this.state = 472;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 44, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 455;
+					this.state = 468;
 					this.match(esql_parser.COMMA);
-					this.state = 456;
+					this.state = 469;
 					this.renameClause();
 					}
 					}
 				}
-				this.state = 461;
+				this.state = 474;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 43, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 44, this._ctx);
 			}
 			}
 		}
@@ -2479,15 +2557,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public renameClause(): RenameClauseContext {
 		let localctx: RenameClauseContext = new RenameClauseContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 74, esql_parser.RULE_renameClause);
+		this.enterRule(localctx, 78, esql_parser.RULE_renameClause);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 462;
+			this.state = 475;
 			localctx._oldName = this.qualifiedNamePattern();
-			this.state = 463;
+			this.state = 476;
 			this.match(esql_parser.AS);
-			this.state = 464;
+			this.state = 477;
 			localctx._newName = this.qualifiedNamePattern();
 			}
 		}
@@ -2508,22 +2586,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public dissectCommand(): DissectCommandContext {
 		let localctx: DissectCommandContext = new DissectCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 76, esql_parser.RULE_dissectCommand);
+		this.enterRule(localctx, 80, esql_parser.RULE_dissectCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 466;
+			this.state = 479;
 			this.match(esql_parser.DISSECT);
-			this.state = 467;
+			this.state = 480;
 			this.primaryExpression(0);
-			this.state = 468;
+			this.state = 481;
 			this.string_();
-			this.state = 470;
+			this.state = 483;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 44, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 45, this._ctx) ) {
 			case 1:
 				{
-				this.state = 469;
+				this.state = 482;
 				this.commandOptions();
 				}
 				break;
@@ -2547,15 +2625,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public grokCommand(): GrokCommandContext {
 		let localctx: GrokCommandContext = new GrokCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 78, esql_parser.RULE_grokCommand);
+		this.enterRule(localctx, 82, esql_parser.RULE_grokCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 472;
+			this.state = 485;
 			this.match(esql_parser.GROK);
-			this.state = 473;
+			this.state = 486;
 			this.primaryExpression(0);
-			this.state = 474;
+			this.state = 487;
 			this.string_();
 			}
 		}
@@ -2576,13 +2654,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public mvExpandCommand(): MvExpandCommandContext {
 		let localctx: MvExpandCommandContext = new MvExpandCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 80, esql_parser.RULE_mvExpandCommand);
+		this.enterRule(localctx, 84, esql_parser.RULE_mvExpandCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 476;
+			this.state = 489;
 			this.match(esql_parser.MV_EXPAND);
-			this.state = 477;
+			this.state = 490;
 			this.qualifiedName();
 			}
 		}
@@ -2603,30 +2681,30 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public commandOptions(): CommandOptionsContext {
 		let localctx: CommandOptionsContext = new CommandOptionsContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 82, esql_parser.RULE_commandOptions);
+		this.enterRule(localctx, 86, esql_parser.RULE_commandOptions);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 479;
+			this.state = 492;
 			this.commandOption();
-			this.state = 484;
+			this.state = 497;
 			this._errHandler.sync(this);
-			_alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+			_alt = this._interp.adaptivePredict(this._input, 46, this._ctx);
 			while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 				if (_alt === 1) {
 					{
 					{
-					this.state = 480;
+					this.state = 493;
 					this.match(esql_parser.COMMA);
-					this.state = 481;
+					this.state = 494;
 					this.commandOption();
 					}
 					}
 				}
-				this.state = 486;
+				this.state = 499;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 45, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 46, this._ctx);
 			}
 			}
 		}
@@ -2647,15 +2725,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public commandOption(): CommandOptionContext {
 		let localctx: CommandOptionContext = new CommandOptionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 84, esql_parser.RULE_commandOption);
+		this.enterRule(localctx, 88, esql_parser.RULE_commandOption);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 487;
+			this.state = 500;
 			this.identifier();
-			this.state = 488;
+			this.state = 501;
 			this.match(esql_parser.ASSIGN);
-			this.state = 489;
+			this.state = 502;
 			this.constant();
 			}
 		}
@@ -2676,12 +2754,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public booleanValue(): BooleanValueContext {
 		let localctx: BooleanValueContext = new BooleanValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 86, esql_parser.RULE_booleanValue);
+		this.enterRule(localctx, 90, esql_parser.RULE_booleanValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 491;
+			this.state = 504;
 			_la = this._input.LA(1);
 			if(!(_la===41 || _la===55)) {
 			this._errHandler.recoverInline(this);
@@ -2709,22 +2787,22 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public numericValue(): NumericValueContext {
 		let localctx: NumericValueContext = new NumericValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 88, esql_parser.RULE_numericValue);
+		this.enterRule(localctx, 92, esql_parser.RULE_numericValue);
 		try {
-			this.state = 495;
+			this.state = 508;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 46, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 47, this._ctx) ) {
 			case 1:
 				this.enterOuterAlt(localctx, 1);
 				{
-				this.state = 493;
+				this.state = 506;
 				this.decimalValue();
 				}
 				break;
 			case 2:
 				this.enterOuterAlt(localctx, 2);
 				{
-				this.state = 494;
+				this.state = 507;
 				this.integerValue();
 				}
 				break;
@@ -2747,17 +2825,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public decimalValue(): DecimalValueContext {
 		let localctx: DecimalValueContext = new DecimalValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 90, esql_parser.RULE_decimalValue);
+		this.enterRule(localctx, 94, esql_parser.RULE_decimalValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 498;
+			this.state = 511;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===63 || _la===64) {
 				{
-				this.state = 497;
+				this.state = 510;
 				_la = this._input.LA(1);
 				if(!(_la===63 || _la===64)) {
 				this._errHandler.recoverInline(this);
@@ -2769,7 +2847,7 @@ export default class esql_parser extends Parser {
 				}
 			}
 
-			this.state = 500;
+			this.state = 513;
 			this.match(esql_parser.DECIMAL_LITERAL);
 			}
 		}
@@ -2790,17 +2868,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public integerValue(): IntegerValueContext {
 		let localctx: IntegerValueContext = new IntegerValueContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 92, esql_parser.RULE_integerValue);
+		this.enterRule(localctx, 96, esql_parser.RULE_integerValue);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 503;
+			this.state = 516;
 			this._errHandler.sync(this);
 			_la = this._input.LA(1);
 			if (_la===63 || _la===64) {
 				{
-				this.state = 502;
+				this.state = 515;
 				_la = this._input.LA(1);
 				if(!(_la===63 || _la===64)) {
 				this._errHandler.recoverInline(this);
@@ -2812,7 +2890,7 @@ export default class esql_parser extends Parser {
 				}
 			}
 
-			this.state = 505;
+			this.state = 518;
 			this.match(esql_parser.INTEGER_LITERAL);
 			}
 		}
@@ -2833,11 +2911,11 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public string_(): StringContext {
 		let localctx: StringContext = new StringContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 94, esql_parser.RULE_string);
+		this.enterRule(localctx, 98, esql_parser.RULE_string);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 507;
+			this.state = 520;
 			this.match(esql_parser.QUOTED_STRING);
 			}
 		}
@@ -2858,12 +2936,12 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public comparisonOperator(): ComparisonOperatorContext {
 		let localctx: ComparisonOperatorContext = new ComparisonOperatorContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 96, esql_parser.RULE_comparisonOperator);
+		this.enterRule(localctx, 100, esql_parser.RULE_comparisonOperator);
 		let _la: number;
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 509;
+			this.state = 522;
 			_la = this._input.LA(1);
 			if(!(((((_la - 56)) & ~0x1F) === 0 && ((1 << (_la - 56)) & 125) !== 0))) {
 			this._errHandler.recoverInline(this);
@@ -2891,13 +2969,13 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public explainCommand(): ExplainCommandContext {
 		let localctx: ExplainCommandContext = new ExplainCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 98, esql_parser.RULE_explainCommand);
+		this.enterRule(localctx, 102, esql_parser.RULE_explainCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 511;
+			this.state = 524;
 			this.match(esql_parser.EXPLAIN);
-			this.state = 512;
+			this.state = 525;
 			this.subqueryExpression();
 			}
 		}
@@ -2918,15 +2996,15 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public subqueryExpression(): SubqueryExpressionContext {
 		let localctx: SubqueryExpressionContext = new SubqueryExpressionContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 100, esql_parser.RULE_subqueryExpression);
+		this.enterRule(localctx, 104, esql_parser.RULE_subqueryExpression);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 514;
+			this.state = 527;
 			this.match(esql_parser.OPENING_BRACKET);
-			this.state = 515;
+			this.state = 528;
 			this.query(0);
-			this.state = 516;
+			this.state = 529;
 			this.match(esql_parser.CLOSING_BRACKET);
 			}
 		}
@@ -2947,14 +3025,14 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public showCommand(): ShowCommandContext {
 		let localctx: ShowCommandContext = new ShowCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 102, esql_parser.RULE_showCommand);
+		this.enterRule(localctx, 106, esql_parser.RULE_showCommand);
 		try {
 			localctx = new ShowInfoContext(this, localctx);
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 518;
+			this.state = 531;
 			this.match(esql_parser.SHOW);
-			this.state = 519;
+			this.state = 532;
 			this.match(esql_parser.INFO);
 			}
 		}
@@ -2975,14 +3053,14 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public metaCommand(): MetaCommandContext {
 		let localctx: MetaCommandContext = new MetaCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 104, esql_parser.RULE_metaCommand);
+		this.enterRule(localctx, 108, esql_parser.RULE_metaCommand);
 		try {
 			localctx = new MetaFunctionsContext(this, localctx);
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 521;
+			this.state = 534;
 			this.match(esql_parser.META);
-			this.state = 522;
+			this.state = 535;
 			this.match(esql_parser.FUNCTIONS);
 			}
 		}
@@ -3003,53 +3081,53 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public enrichCommand(): EnrichCommandContext {
 		let localctx: EnrichCommandContext = new EnrichCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 106, esql_parser.RULE_enrichCommand);
+		this.enterRule(localctx, 110, esql_parser.RULE_enrichCommand);
 		try {
 			let _alt: number;
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 524;
+			this.state = 537;
 			this.match(esql_parser.ENRICH);
-			this.state = 525;
+			this.state = 538;
 			localctx._policyName = this.match(esql_parser.ENRICH_POLICY_NAME);
-			this.state = 528;
+			this.state = 541;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 49, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 50, this._ctx) ) {
 			case 1:
 				{
-				this.state = 526;
+				this.state = 539;
 				this.match(esql_parser.ON);
-				this.state = 527;
+				this.state = 540;
 				localctx._matchField = this.qualifiedNamePattern();
 				}
 				break;
 			}
-			this.state = 539;
+			this.state = 552;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 51, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 52, this._ctx) ) {
 			case 1:
 				{
-				this.state = 530;
+				this.state = 543;
 				this.match(esql_parser.WITH);
-				this.state = 531;
+				this.state = 544;
 				this.enrichWithClause();
-				this.state = 536;
+				this.state = 549;
 				this._errHandler.sync(this);
-				_alt = this._interp.adaptivePredict(this._input, 50, this._ctx);
+				_alt = this._interp.adaptivePredict(this._input, 51, this._ctx);
 				while (_alt !== 2 && _alt !== ATN.INVALID_ALT_NUMBER) {
 					if (_alt === 1) {
 						{
 						{
-						this.state = 532;
+						this.state = 545;
 						this.match(esql_parser.COMMA);
-						this.state = 533;
+						this.state = 546;
 						this.enrichWithClause();
 						}
 						}
 					}
-					this.state = 538;
+					this.state = 551;
 					this._errHandler.sync(this);
-					_alt = this._interp.adaptivePredict(this._input, 50, this._ctx);
+					_alt = this._interp.adaptivePredict(this._input, 51, this._ctx);
 				}
 				}
 				break;
@@ -3073,23 +3151,23 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public enrichWithClause(): EnrichWithClauseContext {
 		let localctx: EnrichWithClauseContext = new EnrichWithClauseContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 108, esql_parser.RULE_enrichWithClause);
+		this.enterRule(localctx, 112, esql_parser.RULE_enrichWithClause);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 544;
+			this.state = 557;
 			this._errHandler.sync(this);
-			switch ( this._interp.adaptivePredict(this._input, 52, this._ctx) ) {
+			switch ( this._interp.adaptivePredict(this._input, 53, this._ctx) ) {
 			case 1:
 				{
-				this.state = 541;
+				this.state = 554;
 				localctx._newName = this.qualifiedNamePattern();
-				this.state = 542;
+				this.state = 555;
 				this.match(esql_parser.ASSIGN);
 				}
 				break;
 			}
-			this.state = 546;
+			this.state = 559;
 			localctx._enrichField = this.qualifiedNamePattern();
 			}
 		}
@@ -3110,17 +3188,17 @@ export default class esql_parser extends Parser {
 	// @RuleVersion(0)
 	public lookupCommand(): LookupCommandContext {
 		let localctx: LookupCommandContext = new LookupCommandContext(this, this._ctx, this.state);
-		this.enterRule(localctx, 110, esql_parser.RULE_lookupCommand);
+		this.enterRule(localctx, 114, esql_parser.RULE_lookupCommand);
 		try {
 			this.enterOuterAlt(localctx, 1);
 			{
-			this.state = 548;
+			this.state = 561;
 			this.match(esql_parser.LOOKUP);
-			this.state = 549;
-			localctx._tableName = this.match(esql_parser.INDEX_UNQUOTED_IDENTIFIER);
-			this.state = 550;
+			this.state = 562;
+			localctx._tableName = this.indexPattern();
+			this.state = 563;
 			this.match(esql_parser.ON);
-			this.state = 551;
+			this.state = 564;
 			localctx._matchFields = this.qualifiedNamePatterns();
 			}
 		}
@@ -3185,7 +3263,7 @@ export default class esql_parser extends Parser {
 		return true;
 	}
 
-	public static readonly _serializedATN: number[] = [4,1,124,554,2,0,7,0,
+	public static readonly _serializedATN: number[] = [4,1,124,567,2,0,7,0,
 	2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,
 	2,10,7,10,2,11,7,11,2,12,7,12,2,13,7,13,2,14,7,14,2,15,7,15,2,16,7,16,2,
 	17,7,17,2,18,7,18,2,19,7,19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,
@@ -3193,179 +3271,183 @@ export default class esql_parser extends Parser {
 	31,2,32,7,32,2,33,7,33,2,34,7,34,2,35,7,35,2,36,7,36,2,37,7,37,2,38,7,38,
 	2,39,7,39,2,40,7,40,2,41,7,41,2,42,7,42,2,43,7,43,2,44,7,44,2,45,7,45,2,
 	46,7,46,2,47,7,47,2,48,7,48,2,49,7,49,2,50,7,50,2,51,7,51,2,52,7,52,2,53,
-	7,53,2,54,7,54,2,55,7,55,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,5,1,122,8,
-	1,10,1,12,1,125,9,1,1,2,1,2,1,2,1,2,1,2,1,2,3,2,133,8,2,1,3,1,3,1,3,1,3,
-	1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,3,3,149,8,3,1,4,1,4,1,4,1,5,1,5,
-	1,5,1,5,1,5,1,5,1,5,3,5,161,8,5,1,5,1,5,1,5,1,5,1,5,5,5,168,8,5,10,5,12,
-	5,171,9,5,1,5,1,5,1,5,1,5,1,5,3,5,178,8,5,1,5,1,5,3,5,182,8,5,1,5,1,5,1,
-	5,1,5,1,5,1,5,5,5,190,8,5,10,5,12,5,193,9,5,1,6,1,6,3,6,197,8,6,1,6,1,6,
-	1,6,1,6,1,6,3,6,204,8,6,1,6,1,6,1,6,3,6,209,8,6,1,7,1,7,1,7,1,7,1,7,3,7,
-	216,8,7,1,8,1,8,1,8,1,8,3,8,222,8,8,1,8,1,8,1,8,1,8,1,8,1,8,5,8,230,8,8,
-	10,8,12,8,233,9,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,3,9,243,8,9,1,9,1,9,1,
-	9,5,9,248,8,9,10,9,12,9,251,9,9,1,10,1,10,1,10,1,10,1,10,1,10,5,10,259,
-	8,10,10,10,12,10,262,9,10,3,10,264,8,10,1,10,1,10,1,11,1,11,1,12,1,12,1,
-	12,1,13,1,13,1,13,5,13,276,8,13,10,13,12,13,279,9,13,1,14,1,14,1,14,1,14,
-	1,14,3,14,286,8,14,1,15,1,15,1,15,1,15,5,15,292,8,15,10,15,12,15,295,9,
-	15,1,15,3,15,298,8,15,1,16,1,16,1,17,1,17,3,17,304,8,17,1,18,1,18,1,18,
-	1,18,5,18,310,8,18,10,18,12,18,313,9,18,1,19,1,19,1,19,1,19,1,20,1,20,1,
-	20,1,20,5,20,323,8,20,10,20,12,20,326,9,20,1,20,3,20,329,8,20,1,20,1,20,
-	3,20,333,8,20,1,21,1,21,1,21,1,22,1,22,3,22,340,8,22,1,22,1,22,3,22,344,
-	8,22,1,23,1,23,1,23,1,23,3,23,350,8,23,1,24,1,24,1,24,5,24,355,8,24,10,
-	24,12,24,358,9,24,1,25,1,25,1,25,5,25,363,8,25,10,25,12,25,366,9,25,1,26,
-	1,26,1,26,5,26,371,8,26,10,26,12,26,374,9,26,1,27,1,27,1,28,1,28,1,29,1,
-	29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,1,29,5,29,393,8,29,
-	10,29,12,29,396,9,29,1,29,1,29,1,29,1,29,1,29,1,29,5,29,404,8,29,10,29,
-	12,29,407,9,29,1,29,1,29,1,29,1,29,1,29,1,29,5,29,415,8,29,10,29,12,29,
-	418,9,29,1,29,1,29,3,29,422,8,29,1,30,1,30,3,30,426,8,30,1,31,1,31,1,31,
-	1,32,1,32,1,32,1,32,5,32,435,8,32,10,32,12,32,438,9,32,1,33,1,33,3,33,442,
-	8,33,1,33,1,33,3,33,446,8,33,1,34,1,34,1,34,1,35,1,35,1,35,1,36,1,36,1,
-	36,1,36,5,36,458,8,36,10,36,12,36,461,9,36,1,37,1,37,1,37,1,37,1,38,1,38,
-	1,38,1,38,3,38,471,8,38,1,39,1,39,1,39,1,39,1,40,1,40,1,40,1,41,1,41,1,
-	41,5,41,483,8,41,10,41,12,41,486,9,41,1,42,1,42,1,42,1,42,1,43,1,43,1,44,
-	1,44,3,44,496,8,44,1,45,3,45,499,8,45,1,45,1,45,1,46,3,46,504,8,46,1,46,
-	1,46,1,47,1,47,1,48,1,48,1,49,1,49,1,49,1,50,1,50,1,50,1,50,1,51,1,51,1,
-	51,1,52,1,52,1,52,1,53,1,53,1,53,1,53,3,53,529,8,53,1,53,1,53,1,53,1,53,
-	5,53,535,8,53,10,53,12,53,538,9,53,3,53,540,8,53,1,54,1,54,1,54,3,54,545,
-	8,54,1,54,1,54,1,55,1,55,1,55,1,55,1,55,1,55,0,4,2,10,16,18,56,0,2,4,6,
-	8,10,12,14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,
-	56,58,60,62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,
-	104,106,108,110,0,7,1,0,63,64,1,0,65,67,1,0,71,72,2,0,35,35,39,39,1,0,42,
-	43,2,0,41,41,55,55,2,0,56,56,58,62,580,0,112,1,0,0,0,2,115,1,0,0,0,4,132,
-	1,0,0,0,6,148,1,0,0,0,8,150,1,0,0,0,10,181,1,0,0,0,12,208,1,0,0,0,14,215,
-	1,0,0,0,16,221,1,0,0,0,18,242,1,0,0,0,20,252,1,0,0,0,22,267,1,0,0,0,24,
-	269,1,0,0,0,26,272,1,0,0,0,28,285,1,0,0,0,30,287,1,0,0,0,32,299,1,0,0,0,
-	34,303,1,0,0,0,36,305,1,0,0,0,38,314,1,0,0,0,40,318,1,0,0,0,42,334,1,0,
-	0,0,44,337,1,0,0,0,46,345,1,0,0,0,48,351,1,0,0,0,50,359,1,0,0,0,52,367,
-	1,0,0,0,54,375,1,0,0,0,56,377,1,0,0,0,58,421,1,0,0,0,60,425,1,0,0,0,62,
-	427,1,0,0,0,64,430,1,0,0,0,66,439,1,0,0,0,68,447,1,0,0,0,70,450,1,0,0,0,
-	72,453,1,0,0,0,74,462,1,0,0,0,76,466,1,0,0,0,78,472,1,0,0,0,80,476,1,0,
-	0,0,82,479,1,0,0,0,84,487,1,0,0,0,86,491,1,0,0,0,88,495,1,0,0,0,90,498,
-	1,0,0,0,92,503,1,0,0,0,94,507,1,0,0,0,96,509,1,0,0,0,98,511,1,0,0,0,100,
-	514,1,0,0,0,102,518,1,0,0,0,104,521,1,0,0,0,106,524,1,0,0,0,108,544,1,0,
-	0,0,110,548,1,0,0,0,112,113,3,2,1,0,113,114,5,0,0,1,114,1,1,0,0,0,115,116,
-	6,1,-1,0,116,117,3,4,2,0,117,123,1,0,0,0,118,119,10,1,0,0,119,120,5,29,
-	0,0,120,122,3,6,3,0,121,118,1,0,0,0,122,125,1,0,0,0,123,121,1,0,0,0,123,
-	124,1,0,0,0,124,3,1,0,0,0,125,123,1,0,0,0,126,133,3,98,49,0,127,133,3,30,
-	15,0,128,133,3,24,12,0,129,133,3,40,20,0,130,133,3,102,51,0,131,133,3,104,
-	52,0,132,126,1,0,0,0,132,127,1,0,0,0,132,128,1,0,0,0,132,129,1,0,0,0,132,
-	130,1,0,0,0,132,131,1,0,0,0,133,5,1,0,0,0,134,149,3,42,21,0,135,149,3,46,
-	23,0,136,149,3,62,31,0,137,149,3,110,55,0,138,149,3,68,34,0,139,149,3,64,
-	32,0,140,149,3,44,22,0,141,149,3,8,4,0,142,149,3,70,35,0,143,149,3,72,36,
-	0,144,149,3,76,38,0,145,149,3,78,39,0,146,149,3,106,53,0,147,149,3,80,40,
-	0,148,134,1,0,0,0,148,135,1,0,0,0,148,136,1,0,0,0,148,137,1,0,0,0,148,138,
-	1,0,0,0,148,139,1,0,0,0,148,140,1,0,0,0,148,141,1,0,0,0,148,142,1,0,0,0,
-	148,143,1,0,0,0,148,144,1,0,0,0,148,145,1,0,0,0,148,146,1,0,0,0,148,147,
-	1,0,0,0,149,7,1,0,0,0,150,151,5,20,0,0,151,152,3,10,5,0,152,9,1,0,0,0,153,
-	154,6,5,-1,0,154,155,5,48,0,0,155,182,3,10,5,7,156,182,3,14,7,0,157,182,
-	3,12,6,0,158,160,3,14,7,0,159,161,5,48,0,0,160,159,1,0,0,0,160,161,1,0,
-	0,0,161,162,1,0,0,0,162,163,5,45,0,0,163,164,5,44,0,0,164,169,3,14,7,0,
-	165,166,5,38,0,0,166,168,3,14,7,0,167,165,1,0,0,0,168,171,1,0,0,0,169,167,
-	1,0,0,0,169,170,1,0,0,0,170,172,1,0,0,0,171,169,1,0,0,0,172,173,5,54,0,
-	0,173,182,1,0,0,0,174,175,3,14,7,0,175,177,5,46,0,0,176,178,5,48,0,0,177,
-	176,1,0,0,0,177,178,1,0,0,0,178,179,1,0,0,0,179,180,5,49,0,0,180,182,1,
-	0,0,0,181,153,1,0,0,0,181,156,1,0,0,0,181,157,1,0,0,0,181,158,1,0,0,0,181,
-	174,1,0,0,0,182,191,1,0,0,0,183,184,10,4,0,0,184,185,5,34,0,0,185,190,3,
-	10,5,5,186,187,10,3,0,0,187,188,5,51,0,0,188,190,3,10,5,4,189,183,1,0,0,
-	0,189,186,1,0,0,0,190,193,1,0,0,0,191,189,1,0,0,0,191,192,1,0,0,0,192,11,
-	1,0,0,0,193,191,1,0,0,0,194,196,3,14,7,0,195,197,5,48,0,0,196,195,1,0,0,
-	0,196,197,1,0,0,0,197,198,1,0,0,0,198,199,5,47,0,0,199,200,3,94,47,0,200,
-	209,1,0,0,0,201,203,3,14,7,0,202,204,5,48,0,0,203,202,1,0,0,0,203,204,1,
-	0,0,0,204,205,1,0,0,0,205,206,5,53,0,0,206,207,3,94,47,0,207,209,1,0,0,
-	0,208,194,1,0,0,0,208,201,1,0,0,0,209,13,1,0,0,0,210,216,3,16,8,0,211,212,
-	3,16,8,0,212,213,3,96,48,0,213,214,3,16,8,0,214,216,1,0,0,0,215,210,1,0,
-	0,0,215,211,1,0,0,0,216,15,1,0,0,0,217,218,6,8,-1,0,218,222,3,18,9,0,219,
-	220,7,0,0,0,220,222,3,16,8,3,221,217,1,0,0,0,221,219,1,0,0,0,222,231,1,
-	0,0,0,223,224,10,2,0,0,224,225,7,1,0,0,225,230,3,16,8,3,226,227,10,1,0,
-	0,227,228,7,0,0,0,228,230,3,16,8,2,229,223,1,0,0,0,229,226,1,0,0,0,230,
-	233,1,0,0,0,231,229,1,0,0,0,231,232,1,0,0,0,232,17,1,0,0,0,233,231,1,0,
-	0,0,234,235,6,9,-1,0,235,243,3,58,29,0,236,243,3,48,24,0,237,243,3,20,10,
-	0,238,239,5,44,0,0,239,240,3,10,5,0,240,241,5,54,0,0,241,243,1,0,0,0,242,
-	234,1,0,0,0,242,236,1,0,0,0,242,237,1,0,0,0,242,238,1,0,0,0,243,249,1,0,
-	0,0,244,245,10,1,0,0,245,246,5,37,0,0,246,248,3,22,11,0,247,244,1,0,0,0,
-	248,251,1,0,0,0,249,247,1,0,0,0,249,250,1,0,0,0,250,19,1,0,0,0,251,249,
-	1,0,0,0,252,253,3,54,27,0,253,263,5,44,0,0,254,264,5,65,0,0,255,260,3,10,
-	5,0,256,257,5,38,0,0,257,259,3,10,5,0,258,256,1,0,0,0,259,262,1,0,0,0,260,
-	258,1,0,0,0,260,261,1,0,0,0,261,264,1,0,0,0,262,260,1,0,0,0,263,254,1,0,
-	0,0,263,255,1,0,0,0,263,264,1,0,0,0,264,265,1,0,0,0,265,266,5,54,0,0,266,
-	21,1,0,0,0,267,268,3,54,27,0,268,23,1,0,0,0,269,270,5,16,0,0,270,271,3,
-	26,13,0,271,25,1,0,0,0,272,277,3,28,14,0,273,274,5,38,0,0,274,276,3,28,
-	14,0,275,273,1,0,0,0,276,279,1,0,0,0,277,275,1,0,0,0,277,278,1,0,0,0,278,
-	27,1,0,0,0,279,277,1,0,0,0,280,286,3,10,5,0,281,282,3,48,24,0,282,283,5,
-	36,0,0,283,284,3,10,5,0,284,286,1,0,0,0,285,280,1,0,0,0,285,281,1,0,0,0,
-	286,29,1,0,0,0,287,288,5,6,0,0,288,293,3,32,16,0,289,290,5,38,0,0,290,292,
-	3,32,16,0,291,289,1,0,0,0,292,295,1,0,0,0,293,291,1,0,0,0,293,294,1,0,0,
-	0,294,297,1,0,0,0,295,293,1,0,0,0,296,298,3,34,17,0,297,296,1,0,0,0,297,
-	298,1,0,0,0,298,31,1,0,0,0,299,300,5,25,0,0,300,33,1,0,0,0,301,304,3,36,
-	18,0,302,304,3,38,19,0,303,301,1,0,0,0,303,302,1,0,0,0,304,35,1,0,0,0,305,
-	306,5,76,0,0,306,311,3,32,16,0,307,308,5,38,0,0,308,310,3,32,16,0,309,307,
-	1,0,0,0,310,313,1,0,0,0,311,309,1,0,0,0,311,312,1,0,0,0,312,37,1,0,0,0,
-	313,311,1,0,0,0,314,315,5,69,0,0,315,316,3,36,18,0,316,317,5,70,0,0,317,
-	39,1,0,0,0,318,319,5,13,0,0,319,324,3,32,16,0,320,321,5,38,0,0,321,323,
-	3,32,16,0,322,320,1,0,0,0,323,326,1,0,0,0,324,322,1,0,0,0,324,325,1,0,0,
-	0,325,328,1,0,0,0,326,324,1,0,0,0,327,329,3,26,13,0,328,327,1,0,0,0,328,
-	329,1,0,0,0,329,332,1,0,0,0,330,331,5,33,0,0,331,333,3,26,13,0,332,330,
-	1,0,0,0,332,333,1,0,0,0,333,41,1,0,0,0,334,335,5,4,0,0,335,336,3,26,13,
-	0,336,43,1,0,0,0,337,339,5,19,0,0,338,340,3,26,13,0,339,338,1,0,0,0,339,
-	340,1,0,0,0,340,343,1,0,0,0,341,342,5,33,0,0,342,344,3,26,13,0,343,341,
-	1,0,0,0,343,344,1,0,0,0,344,45,1,0,0,0,345,346,5,8,0,0,346,349,3,26,13,
-	0,347,348,5,33,0,0,348,350,3,26,13,0,349,347,1,0,0,0,349,350,1,0,0,0,350,
-	47,1,0,0,0,351,356,3,54,27,0,352,353,5,40,0,0,353,355,3,54,27,0,354,352,
-	1,0,0,0,355,358,1,0,0,0,356,354,1,0,0,0,356,357,1,0,0,0,357,49,1,0,0,0,
-	358,356,1,0,0,0,359,364,3,56,28,0,360,361,5,40,0,0,361,363,3,56,28,0,362,
-	360,1,0,0,0,363,366,1,0,0,0,364,362,1,0,0,0,364,365,1,0,0,0,365,51,1,0,
-	0,0,366,364,1,0,0,0,367,372,3,50,25,0,368,369,5,38,0,0,369,371,3,50,25,
-	0,370,368,1,0,0,0,371,374,1,0,0,0,372,370,1,0,0,0,372,373,1,0,0,0,373,53,
-	1,0,0,0,374,372,1,0,0,0,375,376,7,2,0,0,376,55,1,0,0,0,377,378,5,80,0,0,
-	378,57,1,0,0,0,379,422,5,49,0,0,380,381,3,92,46,0,381,382,5,71,0,0,382,
-	422,1,0,0,0,383,422,3,90,45,0,384,422,3,92,46,0,385,422,3,86,43,0,386,422,
-	3,60,30,0,387,422,3,94,47,0,388,389,5,69,0,0,389,394,3,88,44,0,390,391,
-	5,38,0,0,391,393,3,88,44,0,392,390,1,0,0,0,393,396,1,0,0,0,394,392,1,0,
-	0,0,394,395,1,0,0,0,395,397,1,0,0,0,396,394,1,0,0,0,397,398,5,70,0,0,398,
-	422,1,0,0,0,399,400,5,69,0,0,400,405,3,86,43,0,401,402,5,38,0,0,402,404,
-	3,86,43,0,403,401,1,0,0,0,404,407,1,0,0,0,405,403,1,0,0,0,405,406,1,0,0,
-	0,406,408,1,0,0,0,407,405,1,0,0,0,408,409,5,70,0,0,409,422,1,0,0,0,410,
-	411,5,69,0,0,411,416,3,94,47,0,412,413,5,38,0,0,413,415,3,94,47,0,414,412,
-	1,0,0,0,415,418,1,0,0,0,416,414,1,0,0,0,416,417,1,0,0,0,417,419,1,0,0,0,
-	418,416,1,0,0,0,419,420,5,70,0,0,420,422,1,0,0,0,421,379,1,0,0,0,421,380,
-	1,0,0,0,421,383,1,0,0,0,421,384,1,0,0,0,421,385,1,0,0,0,421,386,1,0,0,0,
-	421,387,1,0,0,0,421,388,1,0,0,0,421,399,1,0,0,0,421,410,1,0,0,0,422,59,
-	1,0,0,0,423,426,5,52,0,0,424,426,5,68,0,0,425,423,1,0,0,0,425,424,1,0,0,
-	0,426,61,1,0,0,0,427,428,5,10,0,0,428,429,5,31,0,0,429,63,1,0,0,0,430,431,
-	5,18,0,0,431,436,3,66,33,0,432,433,5,38,0,0,433,435,3,66,33,0,434,432,1,
-	0,0,0,435,438,1,0,0,0,436,434,1,0,0,0,436,437,1,0,0,0,437,65,1,0,0,0,438,
-	436,1,0,0,0,439,441,3,10,5,0,440,442,7,3,0,0,441,440,1,0,0,0,441,442,1,
-	0,0,0,442,445,1,0,0,0,443,444,5,50,0,0,444,446,7,4,0,0,445,443,1,0,0,0,
-	445,446,1,0,0,0,446,67,1,0,0,0,447,448,5,9,0,0,448,449,3,52,26,0,449,69,
-	1,0,0,0,450,451,5,2,0,0,451,452,3,52,26,0,452,71,1,0,0,0,453,454,5,15,0,
-	0,454,459,3,74,37,0,455,456,5,38,0,0,456,458,3,74,37,0,457,455,1,0,0,0,
-	458,461,1,0,0,0,459,457,1,0,0,0,459,460,1,0,0,0,460,73,1,0,0,0,461,459,
-	1,0,0,0,462,463,3,50,25,0,463,464,5,84,0,0,464,465,3,50,25,0,465,75,1,0,
-	0,0,466,467,5,1,0,0,467,468,3,18,9,0,468,470,3,94,47,0,469,471,3,82,41,
-	0,470,469,1,0,0,0,470,471,1,0,0,0,471,77,1,0,0,0,472,473,5,7,0,0,473,474,
-	3,18,9,0,474,475,3,94,47,0,475,79,1,0,0,0,476,477,5,14,0,0,477,478,3,48,
-	24,0,478,81,1,0,0,0,479,484,3,84,42,0,480,481,5,38,0,0,481,483,3,84,42,
-	0,482,480,1,0,0,0,483,486,1,0,0,0,484,482,1,0,0,0,484,485,1,0,0,0,485,83,
-	1,0,0,0,486,484,1,0,0,0,487,488,3,54,27,0,488,489,5,36,0,0,489,490,3,58,
-	29,0,490,85,1,0,0,0,491,492,7,5,0,0,492,87,1,0,0,0,493,496,3,90,45,0,494,
-	496,3,92,46,0,495,493,1,0,0,0,495,494,1,0,0,0,496,89,1,0,0,0,497,499,7,
-	0,0,0,498,497,1,0,0,0,498,499,1,0,0,0,499,500,1,0,0,0,500,501,5,32,0,0,
-	501,91,1,0,0,0,502,504,7,0,0,0,503,502,1,0,0,0,503,504,1,0,0,0,504,505,
-	1,0,0,0,505,506,5,31,0,0,506,93,1,0,0,0,507,508,5,30,0,0,508,95,1,0,0,0,
-	509,510,7,6,0,0,510,97,1,0,0,0,511,512,5,5,0,0,512,513,3,100,50,0,513,99,
-	1,0,0,0,514,515,5,69,0,0,515,516,3,2,1,0,516,517,5,70,0,0,517,101,1,0,0,
-	0,518,519,5,17,0,0,519,520,5,106,0,0,520,103,1,0,0,0,521,522,5,12,0,0,522,
-	523,5,110,0,0,523,105,1,0,0,0,524,525,5,3,0,0,525,528,5,90,0,0,526,527,
-	5,88,0,0,527,529,3,50,25,0,528,526,1,0,0,0,528,529,1,0,0,0,529,539,1,0,
-	0,0,530,531,5,89,0,0,531,536,3,108,54,0,532,533,5,38,0,0,533,535,3,108,
-	54,0,534,532,1,0,0,0,535,538,1,0,0,0,536,534,1,0,0,0,536,537,1,0,0,0,537,
-	540,1,0,0,0,538,536,1,0,0,0,539,530,1,0,0,0,539,540,1,0,0,0,540,107,1,0,
-	0,0,541,542,3,50,25,0,542,543,5,36,0,0,543,545,1,0,0,0,544,541,1,0,0,0,
-	544,545,1,0,0,0,545,546,1,0,0,0,546,547,3,50,25,0,547,109,1,0,0,0,548,549,
-	5,11,0,0,549,550,5,25,0,0,550,551,5,88,0,0,551,552,3,52,26,0,552,111,1,
-	0,0,0,53,123,132,148,160,169,177,181,189,191,196,203,208,215,221,229,231,
-	242,249,260,263,277,285,293,297,303,311,324,328,332,339,343,349,356,364,
-	372,394,405,416,421,425,436,441,445,459,470,484,495,498,503,528,536,539,
-	544];
+	7,53,2,54,7,54,2,55,7,55,2,56,7,56,2,57,7,57,1,0,1,0,1,0,1,1,1,1,1,1,1,
+	1,1,1,1,1,5,1,126,8,1,10,1,12,1,129,9,1,1,2,1,2,1,2,1,2,1,2,1,2,3,2,137,
+	8,2,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,1,3,3,3,153,8,3,
+	1,4,1,4,1,4,1,5,1,5,1,5,1,5,1,5,1,5,1,5,3,5,165,8,5,1,5,1,5,1,5,1,5,1,5,
+	5,5,172,8,5,10,5,12,5,175,9,5,1,5,1,5,1,5,1,5,1,5,3,5,182,8,5,1,5,1,5,3,
+	5,186,8,5,1,5,1,5,1,5,1,5,1,5,1,5,5,5,194,8,5,10,5,12,5,197,9,5,1,6,1,6,
+	3,6,201,8,6,1,6,1,6,1,6,1,6,1,6,3,6,208,8,6,1,6,1,6,1,6,3,6,213,8,6,1,7,
+	1,7,1,7,1,7,1,7,3,7,220,8,7,1,8,1,8,1,8,1,8,3,8,226,8,8,1,8,1,8,1,8,1,8,
+	1,8,1,8,5,8,234,8,8,10,8,12,8,237,9,8,1,9,1,9,1,9,1,9,1,9,1,9,1,9,1,9,3,
+	9,247,8,9,1,9,1,9,1,9,5,9,252,8,9,10,9,12,9,255,9,9,1,10,1,10,1,10,1,10,
+	1,10,1,10,5,10,263,8,10,10,10,12,10,266,9,10,3,10,268,8,10,1,10,1,10,1,
+	11,1,11,1,12,1,12,1,12,1,13,1,13,1,13,5,13,280,8,13,10,13,12,13,283,9,13,
+	1,14,1,14,1,14,1,14,1,14,3,14,290,8,14,1,15,1,15,1,15,1,15,5,15,296,8,15,
+	10,15,12,15,299,9,15,1,15,3,15,302,8,15,1,16,1,16,1,16,1,16,1,16,3,16,309,
+	8,16,1,17,1,17,1,18,1,18,1,19,1,19,3,19,317,8,19,1,20,1,20,1,20,1,20,5,
+	20,323,8,20,10,20,12,20,326,9,20,1,21,1,21,1,21,1,21,1,22,1,22,1,22,1,22,
+	5,22,336,8,22,10,22,12,22,339,9,22,1,22,3,22,342,8,22,1,22,1,22,3,22,346,
+	8,22,1,23,1,23,1,23,1,24,1,24,3,24,353,8,24,1,24,1,24,3,24,357,8,24,1,25,
+	1,25,1,25,1,25,3,25,363,8,25,1,26,1,26,1,26,5,26,368,8,26,10,26,12,26,371,
+	9,26,1,27,1,27,1,27,5,27,376,8,27,10,27,12,27,379,9,27,1,28,1,28,1,28,5,
+	28,384,8,28,10,28,12,28,387,9,28,1,29,1,29,1,30,1,30,1,31,1,31,1,31,1,31,
+	1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,1,31,5,31,406,8,31,10,31,12,31,
+	409,9,31,1,31,1,31,1,31,1,31,1,31,1,31,5,31,417,8,31,10,31,12,31,420,9,
+	31,1,31,1,31,1,31,1,31,1,31,1,31,5,31,428,8,31,10,31,12,31,431,9,31,1,31,
+	1,31,3,31,435,8,31,1,32,1,32,3,32,439,8,32,1,33,1,33,1,33,1,34,1,34,1,34,
+	1,34,5,34,448,8,34,10,34,12,34,451,9,34,1,35,1,35,3,35,455,8,35,1,35,1,
+	35,3,35,459,8,35,1,36,1,36,1,36,1,37,1,37,1,37,1,38,1,38,1,38,1,38,5,38,
+	471,8,38,10,38,12,38,474,9,38,1,39,1,39,1,39,1,39,1,40,1,40,1,40,1,40,3,
+	40,484,8,40,1,41,1,41,1,41,1,41,1,42,1,42,1,42,1,43,1,43,1,43,5,43,496,
+	8,43,10,43,12,43,499,9,43,1,44,1,44,1,44,1,44,1,45,1,45,1,46,1,46,3,46,
+	509,8,46,1,47,3,47,512,8,47,1,47,1,47,1,48,3,48,517,8,48,1,48,1,48,1,49,
+	1,49,1,50,1,50,1,51,1,51,1,51,1,52,1,52,1,52,1,52,1,53,1,53,1,53,1,54,1,
+	54,1,54,1,55,1,55,1,55,1,55,3,55,542,8,55,1,55,1,55,1,55,1,55,5,55,548,
+	8,55,10,55,12,55,551,9,55,3,55,553,8,55,1,56,1,56,1,56,3,56,558,8,56,1,
+	56,1,56,1,57,1,57,1,57,1,57,1,57,1,57,0,4,2,10,16,18,58,0,2,4,6,8,10,12,
+	14,16,18,20,22,24,26,28,30,32,34,36,38,40,42,44,46,48,50,52,54,56,58,60,
+	62,64,66,68,70,72,74,76,78,80,82,84,86,88,90,92,94,96,98,100,102,104,106,
+	108,110,112,114,0,8,1,0,63,64,1,0,65,67,2,0,25,25,30,30,1,0,71,72,2,0,35,
+	35,39,39,1,0,42,43,2,0,41,41,55,55,2,0,56,56,58,62,592,0,116,1,0,0,0,2,
+	119,1,0,0,0,4,136,1,0,0,0,6,152,1,0,0,0,8,154,1,0,0,0,10,185,1,0,0,0,12,
+	212,1,0,0,0,14,219,1,0,0,0,16,225,1,0,0,0,18,246,1,0,0,0,20,256,1,0,0,0,
+	22,271,1,0,0,0,24,273,1,0,0,0,26,276,1,0,0,0,28,289,1,0,0,0,30,291,1,0,
+	0,0,32,308,1,0,0,0,34,310,1,0,0,0,36,312,1,0,0,0,38,316,1,0,0,0,40,318,
+	1,0,0,0,42,327,1,0,0,0,44,331,1,0,0,0,46,347,1,0,0,0,48,350,1,0,0,0,50,
+	358,1,0,0,0,52,364,1,0,0,0,54,372,1,0,0,0,56,380,1,0,0,0,58,388,1,0,0,0,
+	60,390,1,0,0,0,62,434,1,0,0,0,64,438,1,0,0,0,66,440,1,0,0,0,68,443,1,0,
+	0,0,70,452,1,0,0,0,72,460,1,0,0,0,74,463,1,0,0,0,76,466,1,0,0,0,78,475,
+	1,0,0,0,80,479,1,0,0,0,82,485,1,0,0,0,84,489,1,0,0,0,86,492,1,0,0,0,88,
+	500,1,0,0,0,90,504,1,0,0,0,92,508,1,0,0,0,94,511,1,0,0,0,96,516,1,0,0,0,
+	98,520,1,0,0,0,100,522,1,0,0,0,102,524,1,0,0,0,104,527,1,0,0,0,106,531,
+	1,0,0,0,108,534,1,0,0,0,110,537,1,0,0,0,112,557,1,0,0,0,114,561,1,0,0,0,
+	116,117,3,2,1,0,117,118,5,0,0,1,118,1,1,0,0,0,119,120,6,1,-1,0,120,121,
+	3,4,2,0,121,127,1,0,0,0,122,123,10,1,0,0,123,124,5,29,0,0,124,126,3,6,3,
+	0,125,122,1,0,0,0,126,129,1,0,0,0,127,125,1,0,0,0,127,128,1,0,0,0,128,3,
+	1,0,0,0,129,127,1,0,0,0,130,137,3,102,51,0,131,137,3,30,15,0,132,137,3,
+	24,12,0,133,137,3,44,22,0,134,137,3,106,53,0,135,137,3,108,54,0,136,130,
+	1,0,0,0,136,131,1,0,0,0,136,132,1,0,0,0,136,133,1,0,0,0,136,134,1,0,0,0,
+	136,135,1,0,0,0,137,5,1,0,0,0,138,153,3,46,23,0,139,153,3,50,25,0,140,153,
+	3,66,33,0,141,153,3,114,57,0,142,153,3,72,36,0,143,153,3,68,34,0,144,153,
+	3,48,24,0,145,153,3,8,4,0,146,153,3,74,37,0,147,153,3,76,38,0,148,153,3,
+	80,40,0,149,153,3,82,41,0,150,153,3,110,55,0,151,153,3,84,42,0,152,138,
+	1,0,0,0,152,139,1,0,0,0,152,140,1,0,0,0,152,141,1,0,0,0,152,142,1,0,0,0,
+	152,143,1,0,0,0,152,144,1,0,0,0,152,145,1,0,0,0,152,146,1,0,0,0,152,147,
+	1,0,0,0,152,148,1,0,0,0,152,149,1,0,0,0,152,150,1,0,0,0,152,151,1,0,0,0,
+	153,7,1,0,0,0,154,155,5,20,0,0,155,156,3,10,5,0,156,9,1,0,0,0,157,158,6,
+	5,-1,0,158,159,5,48,0,0,159,186,3,10,5,7,160,186,3,14,7,0,161,186,3,12,
+	6,0,162,164,3,14,7,0,163,165,5,48,0,0,164,163,1,0,0,0,164,165,1,0,0,0,165,
+	166,1,0,0,0,166,167,5,45,0,0,167,168,5,44,0,0,168,173,3,14,7,0,169,170,
+	5,38,0,0,170,172,3,14,7,0,171,169,1,0,0,0,172,175,1,0,0,0,173,171,1,0,0,
+	0,173,174,1,0,0,0,174,176,1,0,0,0,175,173,1,0,0,0,176,177,5,54,0,0,177,
+	186,1,0,0,0,178,179,3,14,7,0,179,181,5,46,0,0,180,182,5,48,0,0,181,180,
+	1,0,0,0,181,182,1,0,0,0,182,183,1,0,0,0,183,184,5,49,0,0,184,186,1,0,0,
+	0,185,157,1,0,0,0,185,160,1,0,0,0,185,161,1,0,0,0,185,162,1,0,0,0,185,178,
+	1,0,0,0,186,195,1,0,0,0,187,188,10,4,0,0,188,189,5,34,0,0,189,194,3,10,
+	5,5,190,191,10,3,0,0,191,192,5,51,0,0,192,194,3,10,5,4,193,187,1,0,0,0,
+	193,190,1,0,0,0,194,197,1,0,0,0,195,193,1,0,0,0,195,196,1,0,0,0,196,11,
+	1,0,0,0,197,195,1,0,0,0,198,200,3,14,7,0,199,201,5,48,0,0,200,199,1,0,0,
+	0,200,201,1,0,0,0,201,202,1,0,0,0,202,203,5,47,0,0,203,204,3,98,49,0,204,
+	213,1,0,0,0,205,207,3,14,7,0,206,208,5,48,0,0,207,206,1,0,0,0,207,208,1,
+	0,0,0,208,209,1,0,0,0,209,210,5,53,0,0,210,211,3,98,49,0,211,213,1,0,0,
+	0,212,198,1,0,0,0,212,205,1,0,0,0,213,13,1,0,0,0,214,220,3,16,8,0,215,216,
+	3,16,8,0,216,217,3,100,50,0,217,218,3,16,8,0,218,220,1,0,0,0,219,214,1,
+	0,0,0,219,215,1,0,0,0,220,15,1,0,0,0,221,222,6,8,-1,0,222,226,3,18,9,0,
+	223,224,7,0,0,0,224,226,3,16,8,3,225,221,1,0,0,0,225,223,1,0,0,0,226,235,
+	1,0,0,0,227,228,10,2,0,0,228,229,7,1,0,0,229,234,3,16,8,3,230,231,10,1,
+	0,0,231,232,7,0,0,0,232,234,3,16,8,2,233,227,1,0,0,0,233,230,1,0,0,0,234,
+	237,1,0,0,0,235,233,1,0,0,0,235,236,1,0,0,0,236,17,1,0,0,0,237,235,1,0,
+	0,0,238,239,6,9,-1,0,239,247,3,62,31,0,240,247,3,52,26,0,241,247,3,20,10,
+	0,242,243,5,44,0,0,243,244,3,10,5,0,244,245,5,54,0,0,245,247,1,0,0,0,246,
+	238,1,0,0,0,246,240,1,0,0,0,246,241,1,0,0,0,246,242,1,0,0,0,247,253,1,0,
+	0,0,248,249,10,1,0,0,249,250,5,37,0,0,250,252,3,22,11,0,251,248,1,0,0,0,
+	252,255,1,0,0,0,253,251,1,0,0,0,253,254,1,0,0,0,254,19,1,0,0,0,255,253,
+	1,0,0,0,256,257,3,58,29,0,257,267,5,44,0,0,258,268,5,65,0,0,259,264,3,10,
+	5,0,260,261,5,38,0,0,261,263,3,10,5,0,262,260,1,0,0,0,263,266,1,0,0,0,264,
+	262,1,0,0,0,264,265,1,0,0,0,265,268,1,0,0,0,266,264,1,0,0,0,267,258,1,0,
+	0,0,267,259,1,0,0,0,267,268,1,0,0,0,268,269,1,0,0,0,269,270,5,54,0,0,270,
+	21,1,0,0,0,271,272,3,58,29,0,272,23,1,0,0,0,273,274,5,16,0,0,274,275,3,
+	26,13,0,275,25,1,0,0,0,276,281,3,28,14,0,277,278,5,38,0,0,278,280,3,28,
+	14,0,279,277,1,0,0,0,280,283,1,0,0,0,281,279,1,0,0,0,281,282,1,0,0,0,282,
+	27,1,0,0,0,283,281,1,0,0,0,284,290,3,10,5,0,285,286,3,52,26,0,286,287,5,
+	36,0,0,287,288,3,10,5,0,288,290,1,0,0,0,289,284,1,0,0,0,289,285,1,0,0,0,
+	290,29,1,0,0,0,291,292,5,6,0,0,292,297,3,32,16,0,293,294,5,38,0,0,294,296,
+	3,32,16,0,295,293,1,0,0,0,296,299,1,0,0,0,297,295,1,0,0,0,297,298,1,0,0,
+	0,298,301,1,0,0,0,299,297,1,0,0,0,300,302,3,38,19,0,301,300,1,0,0,0,301,
+	302,1,0,0,0,302,31,1,0,0,0,303,304,3,34,17,0,304,305,5,114,0,0,305,306,
+	3,36,18,0,306,309,1,0,0,0,307,309,3,36,18,0,308,303,1,0,0,0,308,307,1,0,
+	0,0,309,33,1,0,0,0,310,311,5,25,0,0,311,35,1,0,0,0,312,313,7,2,0,0,313,
+	37,1,0,0,0,314,317,3,40,20,0,315,317,3,42,21,0,316,314,1,0,0,0,316,315,
+	1,0,0,0,317,39,1,0,0,0,318,319,5,76,0,0,319,324,5,25,0,0,320,321,5,38,0,
+	0,321,323,5,25,0,0,322,320,1,0,0,0,323,326,1,0,0,0,324,322,1,0,0,0,324,
+	325,1,0,0,0,325,41,1,0,0,0,326,324,1,0,0,0,327,328,5,69,0,0,328,329,3,40,
+	20,0,329,330,5,70,0,0,330,43,1,0,0,0,331,332,5,13,0,0,332,337,3,32,16,0,
+	333,334,5,38,0,0,334,336,3,32,16,0,335,333,1,0,0,0,336,339,1,0,0,0,337,
+	335,1,0,0,0,337,338,1,0,0,0,338,341,1,0,0,0,339,337,1,0,0,0,340,342,3,26,
+	13,0,341,340,1,0,0,0,341,342,1,0,0,0,342,345,1,0,0,0,343,344,5,33,0,0,344,
+	346,3,26,13,0,345,343,1,0,0,0,345,346,1,0,0,0,346,45,1,0,0,0,347,348,5,
+	4,0,0,348,349,3,26,13,0,349,47,1,0,0,0,350,352,5,19,0,0,351,353,3,26,13,
+	0,352,351,1,0,0,0,352,353,1,0,0,0,353,356,1,0,0,0,354,355,5,33,0,0,355,
+	357,3,26,13,0,356,354,1,0,0,0,356,357,1,0,0,0,357,49,1,0,0,0,358,359,5,
+	8,0,0,359,362,3,26,13,0,360,361,5,33,0,0,361,363,3,26,13,0,362,360,1,0,
+	0,0,362,363,1,0,0,0,363,51,1,0,0,0,364,369,3,58,29,0,365,366,5,40,0,0,366,
+	368,3,58,29,0,367,365,1,0,0,0,368,371,1,0,0,0,369,367,1,0,0,0,369,370,1,
+	0,0,0,370,53,1,0,0,0,371,369,1,0,0,0,372,377,3,60,30,0,373,374,5,40,0,0,
+	374,376,3,60,30,0,375,373,1,0,0,0,376,379,1,0,0,0,377,375,1,0,0,0,377,378,
+	1,0,0,0,378,55,1,0,0,0,379,377,1,0,0,0,380,385,3,54,27,0,381,382,5,38,0,
+	0,382,384,3,54,27,0,383,381,1,0,0,0,384,387,1,0,0,0,385,383,1,0,0,0,385,
+	386,1,0,0,0,386,57,1,0,0,0,387,385,1,0,0,0,388,389,7,3,0,0,389,59,1,0,0,
+	0,390,391,5,80,0,0,391,61,1,0,0,0,392,435,5,49,0,0,393,394,3,96,48,0,394,
+	395,5,71,0,0,395,435,1,0,0,0,396,435,3,94,47,0,397,435,3,96,48,0,398,435,
+	3,90,45,0,399,435,3,64,32,0,400,435,3,98,49,0,401,402,5,69,0,0,402,407,
+	3,92,46,0,403,404,5,38,0,0,404,406,3,92,46,0,405,403,1,0,0,0,406,409,1,
+	0,0,0,407,405,1,0,0,0,407,408,1,0,0,0,408,410,1,0,0,0,409,407,1,0,0,0,410,
+	411,5,70,0,0,411,435,1,0,0,0,412,413,5,69,0,0,413,418,3,90,45,0,414,415,
+	5,38,0,0,415,417,3,90,45,0,416,414,1,0,0,0,417,420,1,0,0,0,418,416,1,0,
+	0,0,418,419,1,0,0,0,419,421,1,0,0,0,420,418,1,0,0,0,421,422,5,70,0,0,422,
+	435,1,0,0,0,423,424,5,69,0,0,424,429,3,98,49,0,425,426,5,38,0,0,426,428,
+	3,98,49,0,427,425,1,0,0,0,428,431,1,0,0,0,429,427,1,0,0,0,429,430,1,0,0,
+	0,430,432,1,0,0,0,431,429,1,0,0,0,432,433,5,70,0,0,433,435,1,0,0,0,434,
+	392,1,0,0,0,434,393,1,0,0,0,434,396,1,0,0,0,434,397,1,0,0,0,434,398,1,0,
+	0,0,434,399,1,0,0,0,434,400,1,0,0,0,434,401,1,0,0,0,434,412,1,0,0,0,434,
+	423,1,0,0,0,435,63,1,0,0,0,436,439,5,52,0,0,437,439,5,68,0,0,438,436,1,
+	0,0,0,438,437,1,0,0,0,439,65,1,0,0,0,440,441,5,10,0,0,441,442,5,31,0,0,
+	442,67,1,0,0,0,443,444,5,18,0,0,444,449,3,70,35,0,445,446,5,38,0,0,446,
+	448,3,70,35,0,447,445,1,0,0,0,448,451,1,0,0,0,449,447,1,0,0,0,449,450,1,
+	0,0,0,450,69,1,0,0,0,451,449,1,0,0,0,452,454,3,10,5,0,453,455,7,4,0,0,454,
+	453,1,0,0,0,454,455,1,0,0,0,455,458,1,0,0,0,456,457,5,50,0,0,457,459,7,
+	5,0,0,458,456,1,0,0,0,458,459,1,0,0,0,459,71,1,0,0,0,460,461,5,9,0,0,461,
+	462,3,56,28,0,462,73,1,0,0,0,463,464,5,2,0,0,464,465,3,56,28,0,465,75,1,
+	0,0,0,466,467,5,15,0,0,467,472,3,78,39,0,468,469,5,38,0,0,469,471,3,78,
+	39,0,470,468,1,0,0,0,471,474,1,0,0,0,472,470,1,0,0,0,472,473,1,0,0,0,473,
+	77,1,0,0,0,474,472,1,0,0,0,475,476,3,54,27,0,476,477,5,84,0,0,477,478,3,
+	54,27,0,478,79,1,0,0,0,479,480,5,1,0,0,480,481,3,18,9,0,481,483,3,98,49,
+	0,482,484,3,86,43,0,483,482,1,0,0,0,483,484,1,0,0,0,484,81,1,0,0,0,485,
+	486,5,7,0,0,486,487,3,18,9,0,487,488,3,98,49,0,488,83,1,0,0,0,489,490,5,
+	14,0,0,490,491,3,52,26,0,491,85,1,0,0,0,492,497,3,88,44,0,493,494,5,38,
+	0,0,494,496,3,88,44,0,495,493,1,0,0,0,496,499,1,0,0,0,497,495,1,0,0,0,497,
+	498,1,0,0,0,498,87,1,0,0,0,499,497,1,0,0,0,500,501,3,58,29,0,501,502,5,
+	36,0,0,502,503,3,62,31,0,503,89,1,0,0,0,504,505,7,6,0,0,505,91,1,0,0,0,
+	506,509,3,94,47,0,507,509,3,96,48,0,508,506,1,0,0,0,508,507,1,0,0,0,509,
+	93,1,0,0,0,510,512,7,0,0,0,511,510,1,0,0,0,511,512,1,0,0,0,512,513,1,0,
+	0,0,513,514,5,32,0,0,514,95,1,0,0,0,515,517,7,0,0,0,516,515,1,0,0,0,516,
+	517,1,0,0,0,517,518,1,0,0,0,518,519,5,31,0,0,519,97,1,0,0,0,520,521,5,30,
+	0,0,521,99,1,0,0,0,522,523,7,7,0,0,523,101,1,0,0,0,524,525,5,5,0,0,525,
+	526,3,104,52,0,526,103,1,0,0,0,527,528,5,69,0,0,528,529,3,2,1,0,529,530,
+	5,70,0,0,530,105,1,0,0,0,531,532,5,17,0,0,532,533,5,106,0,0,533,107,1,0,
+	0,0,534,535,5,12,0,0,535,536,5,110,0,0,536,109,1,0,0,0,537,538,5,3,0,0,
+	538,541,5,90,0,0,539,540,5,88,0,0,540,542,3,54,27,0,541,539,1,0,0,0,541,
+	542,1,0,0,0,542,552,1,0,0,0,543,544,5,89,0,0,544,549,3,112,56,0,545,546,
+	5,38,0,0,546,548,3,112,56,0,547,545,1,0,0,0,548,551,1,0,0,0,549,547,1,0,
+	0,0,549,550,1,0,0,0,550,553,1,0,0,0,551,549,1,0,0,0,552,543,1,0,0,0,552,
+	553,1,0,0,0,553,111,1,0,0,0,554,555,3,54,27,0,555,556,5,36,0,0,556,558,
+	1,0,0,0,557,554,1,0,0,0,557,558,1,0,0,0,558,559,1,0,0,0,559,560,3,54,27,
+	0,560,113,1,0,0,0,561,562,5,11,0,0,562,563,3,32,16,0,563,564,5,88,0,0,564,
+	565,3,56,28,0,565,115,1,0,0,0,54,127,136,152,164,173,181,185,193,195,200,
+	207,212,219,225,233,235,246,253,264,267,281,289,297,301,308,316,324,337,
+	341,345,352,356,362,369,377,385,407,418,429,434,438,449,454,458,472,483,
+	497,508,511,516,541,549,552,557];
 
 	private static __ATN: ATN;
 	public static get _ATN(): ATN {
@@ -4262,11 +4344,11 @@ export class FromCommandContext extends ParserRuleContext {
 	public FROM(): TerminalNode {
 		return this.getToken(esql_parser.FROM, 0);
 	}
-	public indexIdentifier_list(): IndexIdentifierContext[] {
-		return this.getTypedRuleContexts(IndexIdentifierContext) as IndexIdentifierContext[];
+	public indexPattern_list(): IndexPatternContext[] {
+		return this.getTypedRuleContexts(IndexPatternContext) as IndexPatternContext[];
 	}
-	public indexIdentifier(i: number): IndexIdentifierContext {
-		return this.getTypedRuleContext(IndexIdentifierContext, i) as IndexIdentifierContext;
+	public indexPattern(i: number): IndexPatternContext {
+		return this.getTypedRuleContext(IndexPatternContext, i) as IndexPatternContext;
 	}
 	public COMMA_list(): TerminalNode[] {
 	    	return this.getTokens(esql_parser.COMMA);
@@ -4293,25 +4375,82 @@ export class FromCommandContext extends ParserRuleContext {
 }
 
 
-export class IndexIdentifierContext extends ParserRuleContext {
+export class IndexPatternContext extends ParserRuleContext {
 	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
 		super(parent, invokingState);
     	this.parser = parser;
 	}
-	public INDEX_UNQUOTED_IDENTIFIER(): TerminalNode {
-		return this.getToken(esql_parser.INDEX_UNQUOTED_IDENTIFIER, 0);
+	public clusterString(): ClusterStringContext {
+		return this.getTypedRuleContext(ClusterStringContext, 0) as ClusterStringContext;
+	}
+	public COLON(): TerminalNode {
+		return this.getToken(esql_parser.COLON, 0);
+	}
+	public indexString(): IndexStringContext {
+		return this.getTypedRuleContext(IndexStringContext, 0) as IndexStringContext;
 	}
     public get ruleIndex(): number {
-    	return esql_parser.RULE_indexIdentifier;
+    	return esql_parser.RULE_indexPattern;
 	}
 	public enterRule(listener: esql_parserListener): void {
-	    if(listener.enterIndexIdentifier) {
-	 		listener.enterIndexIdentifier(this);
+	    if(listener.enterIndexPattern) {
+	 		listener.enterIndexPattern(this);
 		}
 	}
 	public exitRule(listener: esql_parserListener): void {
-	    if(listener.exitIndexIdentifier) {
-	 		listener.exitIndexIdentifier(this);
+	    if(listener.exitIndexPattern) {
+	 		listener.exitIndexPattern(this);
+		}
+	}
+}
+
+
+export class ClusterStringContext extends ParserRuleContext {
+	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public UNQUOTED_SOURCE(): TerminalNode {
+		return this.getToken(esql_parser.UNQUOTED_SOURCE, 0);
+	}
+    public get ruleIndex(): number {
+    	return esql_parser.RULE_clusterString;
+	}
+	public enterRule(listener: esql_parserListener): void {
+	    if(listener.enterClusterString) {
+	 		listener.enterClusterString(this);
+		}
+	}
+	public exitRule(listener: esql_parserListener): void {
+	    if(listener.exitClusterString) {
+	 		listener.exitClusterString(this);
+		}
+	}
+}
+
+
+export class IndexStringContext extends ParserRuleContext {
+	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
+		super(parent, invokingState);
+    	this.parser = parser;
+	}
+	public UNQUOTED_SOURCE(): TerminalNode {
+		return this.getToken(esql_parser.UNQUOTED_SOURCE, 0);
+	}
+	public QUOTED_STRING(): TerminalNode {
+		return this.getToken(esql_parser.QUOTED_STRING, 0);
+	}
+    public get ruleIndex(): number {
+    	return esql_parser.RULE_indexString;
+	}
+	public enterRule(listener: esql_parserListener): void {
+	    if(listener.enterIndexString) {
+	 		listener.enterIndexString(this);
+		}
+	}
+	public exitRule(listener: esql_parserListener): void {
+	    if(listener.exitIndexString) {
+	 		listener.exitIndexString(this);
 		}
 	}
 }
@@ -4352,11 +4491,11 @@ export class MetadataOptionContext extends ParserRuleContext {
 	public METADATA(): TerminalNode {
 		return this.getToken(esql_parser.METADATA, 0);
 	}
-	public indexIdentifier_list(): IndexIdentifierContext[] {
-		return this.getTypedRuleContexts(IndexIdentifierContext) as IndexIdentifierContext[];
+	public UNQUOTED_SOURCE_list(): TerminalNode[] {
+      return this.getTokens(esql_parser.UNQUOTED_SOURCE);
 	}
-	public indexIdentifier(i: number): IndexIdentifierContext {
-		return this.getTypedRuleContext(IndexIdentifierContext, i) as IndexIdentifierContext;
+	public UNQUOTED_SOURCE(i: number): TerminalNode {
+		return this.getToken(esql_parser.UNQUOTED_SOURCE, i);
 	}
 	public COMMA_list(): TerminalNode[] {
 	    	return this.getTokens(esql_parser.COMMA);
@@ -4364,7 +4503,7 @@ export class MetadataOptionContext extends ParserRuleContext {
 	public COMMA(i: number): TerminalNode {
 		return this.getToken(esql_parser.COMMA, i);
 	}
-    public get ruleIndex(): number {
+  public get ruleIndex(): number {
     	return esql_parser.RULE_metadataOption;
 	}
 	public enterRule(listener: esql_parserListener): void {
@@ -4420,11 +4559,11 @@ export class MetricsCommandContext extends ParserRuleContext {
 	public METRICS(): TerminalNode {
 		return this.getToken(esql_parser.METRICS, 0);
 	}
-	public indexIdentifier_list(): IndexIdentifierContext[] {
-		return this.getTypedRuleContexts(IndexIdentifierContext) as IndexIdentifierContext[];
+	public indexPattern_list(): IndexPatternContext[] {
+		return this.getTypedRuleContexts(IndexPatternContext) as IndexPatternContext[];
 	}
-	public indexIdentifier(i: number): IndexIdentifierContext {
-		return this.getTypedRuleContext(IndexIdentifierContext, i) as IndexIdentifierContext;
+	public indexPattern(i: number): IndexPatternContext {
+		return this.getTypedRuleContext(IndexPatternContext, i) as IndexPatternContext;
 	}
 	public COMMA_list(): TerminalNode[] {
 	    	return this.getTokens(esql_parser.COMMA);
@@ -5776,7 +5915,7 @@ export class EnrichWithClauseContext extends ParserRuleContext {
 
 
 export class LookupCommandContext extends ParserRuleContext {
-	public _tableName!: Token;
+	public _tableName!: IndexPatternContext;
 	public _matchFields!: QualifiedNamePatternsContext;
 	constructor(parser?: esql_parser, parent?: ParserRuleContext, invokingState?: number) {
 		super(parent, invokingState);
@@ -5788,8 +5927,8 @@ export class LookupCommandContext extends ParserRuleContext {
 	public ON(): TerminalNode {
 		return this.getToken(esql_parser.ON, 0);
 	}
-	public INDEX_UNQUOTED_IDENTIFIER(): TerminalNode {
-		return this.getToken(esql_parser.INDEX_UNQUOTED_IDENTIFIER, 0);
+	public indexPattern(): IndexPatternContext {
+		return this.getTypedRuleContext(IndexPatternContext, 0) as IndexPatternContext;
 	}
 	public qualifiedNamePatterns(): QualifiedNamePatternsContext {
 		return this.getTypedRuleContext(QualifiedNamePatternsContext, 0) as QualifiedNamePatternsContext;
diff --git a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
index eee7a421a1593..e6a28c8d71828 100644
--- a/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
+++ b/packages/kbn-esql-ast/src/antlr/esql_parser_listener.ts
@@ -33,7 +33,9 @@ import { RowCommandContext } from "./esql_parser";
 import { FieldsContext } from "./esql_parser";
 import { FieldContext } from "./esql_parser";
 import { FromCommandContext } from "./esql_parser";
-import { IndexIdentifierContext } from "./esql_parser";
+import { IndexPatternContext } from "./esql_parser";
+import { ClusterStringContext } from "./esql_parser";
+import { IndexStringContext } from "./esql_parser";
 import { MetadataContext } from "./esql_parser";
 import { MetadataOptionContext } from "./esql_parser";
 import { Deprecated_metadataContext } from "./esql_parser";
@@ -419,15 +421,35 @@ export default class esql_parserListener extends ParseTreeListener {
 	 */
 	exitFromCommand?: (ctx: FromCommandContext) => void;
 	/**
-	 * Enter a parse tree produced by `esql_parser.indexIdentifier`.
+	 * Enter a parse tree produced by `esql_parser.indexPattern`.
 	 * @param ctx the parse tree
 	 */
-	enterIndexIdentifier?: (ctx: IndexIdentifierContext) => void;
+	enterIndexPattern?: (ctx: IndexPatternContext) => void;
 	/**
-	 * Exit a parse tree produced by `esql_parser.indexIdentifier`.
+	 * Exit a parse tree produced by `esql_parser.indexPattern`.
 	 * @param ctx the parse tree
 	 */
-	exitIndexIdentifier?: (ctx: IndexIdentifierContext) => void;
+	exitIndexPattern?: (ctx: IndexPatternContext) => void;
+	/**
+	 * Enter a parse tree produced by `esql_parser.clusterString`.
+	 * @param ctx the parse tree
+	 */
+	enterClusterString?: (ctx: ClusterStringContext) => void;
+	/**
+	 * Exit a parse tree produced by `esql_parser.clusterString`.
+	 * @param ctx the parse tree
+	 */
+	exitClusterString?: (ctx: ClusterStringContext) => void;
+	/**
+	 * Enter a parse tree produced by `esql_parser.indexString`.
+	 * @param ctx the parse tree
+	 */
+	enterIndexString?: (ctx: IndexStringContext) => void;
+	/**
+	 * Exit a parse tree produced by `esql_parser.indexString`.
+	 * @param ctx the parse tree
+	 */
+	exitIndexString?: (ctx: IndexStringContext) => void;
 	/**
 	 * Enter a parse tree produced by `esql_parser.metadata`.
 	 * @param ctx the parse tree
diff --git a/packages/kbn-esql-ast/src/ast_factory.ts b/packages/kbn-esql-ast/src/ast_factory.ts
index 9d76ff3a7cd4d..18c2a3c7ecbec 100644
--- a/packages/kbn-esql-ast/src/ast_factory.ts
+++ b/packages/kbn-esql-ast/src/ast_factory.ts
@@ -29,7 +29,7 @@ import {
   default as esql_parser,
   type MetaCommandContext,
   type MetricsCommandContext,
-  IndexIdentifierContext,
+  IndexPatternContext,
 } from './antlr/esql_parser';
 import { default as ESQLParserListener } from './antlr/esql_parser_listener';
 import {
@@ -154,7 +154,7 @@ export class AstListener implements ESQLParserListener {
       type: 'command',
       args: [],
       sources: ctx
-        .getTypedRuleContexts(IndexIdentifierContext)
+        .getTypedRuleContexts(IndexPatternContext)
         .map((sourceCtx) => createSource(sourceCtx)),
     };
     this.ast.push(node);
diff --git a/packages/kbn-esql-ast/src/ast_helpers.ts b/packages/kbn-esql-ast/src/ast_helpers.ts
index 76e130f233807..f3c5ad0b0df18 100644
--- a/packages/kbn-esql-ast/src/ast_helpers.ts
+++ b/packages/kbn-esql-ast/src/ast_helpers.ts
@@ -275,12 +275,24 @@ function safeBackticksRemoval(text: string | undefined) {
   return text?.replace(TICKS_REGEX, '').replace(DOUBLE_TICKS_REGEX, SINGLE_BACKTICK) || '';
 }
 
+function sanitizeSourceString(ctx: ParserRuleContext) {
+  const contextText = ctx.getText();
+  // If wrapped by triple quote, remove
+  if (contextText.startsWith(`"""`) && contextText.endsWith(`"""`)) {
+    return contextText.replace(/\"\"\"/g, '');
+  }
+  // If wrapped by single quote, remove
+  if (contextText.startsWith(`"`) && contextText.endsWith(`"`)) {
+    return contextText.slice(1, -1);
+  }
+  return contextText;
+}
+
 export function sanitizeIdentifierString(ctx: ParserRuleContext) {
   const result =
     getUnquotedText(ctx)?.getText() ||
     safeBackticksRemoval(getQuotedText(ctx)?.getText()) ||
     safeBackticksRemoval(ctx.getText()); // for some reason some quoted text is not detected correctly by the parser
-
   // TODO - understand why <missing null> is now returned as the match text for the FROM command
   return result === '<missing null>' ? '' : result;
 }
@@ -321,7 +333,7 @@ export function createSource(
   ctx: ParserRuleContext,
   type: 'index' | 'policy' = 'index'
 ): ESQLSource {
-  const text = sanitizeIdentifierString(ctx);
+  const text = sanitizeSourceString(ctx);
   return {
     type: 'source',
     name: text,
diff --git a/packages/kbn-esql-ast/src/ast_walker.ts b/packages/kbn-esql-ast/src/ast_walker.ts
index 870301b938a65..33aa91f66a2a6 100644
--- a/packages/kbn-esql-ast/src/ast_walker.ts
+++ b/packages/kbn-esql-ast/src/ast_walker.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { type ParserRuleContext } from 'antlr4';
+import { ParserRuleContext, TerminalNode } from 'antlr4';
 import {
   default as esql_parser,
   ArithmeticBinaryContext,
@@ -57,10 +57,10 @@ import {
   StringLiteralContext,
   type ValueExpressionContext,
   ValueExpressionDefaultContext,
-  IndexIdentifierContext,
   InlineCastContext,
   InputNamedOrPositionalParamContext,
   InputParamContext,
+  IndexPatternContext,
 } from './antlr/esql_parser';
 import {
   createSource,
@@ -98,16 +98,27 @@ import type {
 } from './types';
 
 export function collectAllSourceIdentifiers(ctx: FromCommandContext): ESQLAstItem[] {
-  const fromContexts = ctx.getTypedRuleContexts(IndexIdentifierContext);
-
+  const fromContexts = ctx.getTypedRuleContexts(IndexPatternContext);
   return fromContexts.map((sourceCtx) => createSource(sourceCtx));
 }
 
+function terminalNodeToParserRuleContext(node: TerminalNode): ParserRuleContext {
+  const context = new ParserRuleContext();
+  context.start = node.symbol;
+  context.stop = node.symbol;
+  context.children = [node];
+  return context;
+}
 function extractIdentifiers(
   ctx: KeepCommandContext | DropCommandContext | MvExpandCommandContext | MetadataOptionContext
 ) {
   if (ctx instanceof MetadataOptionContext) {
-    return wrapIdentifierAsArray(ctx.indexIdentifier_list());
+    return ctx
+      .UNQUOTED_SOURCE_list()
+      .map((node) => {
+        return terminalNodeToParserRuleContext(node);
+      })
+      .flat();
   }
   if (ctx instanceof MvExpandCommandContext) {
     return wrapIdentifierAsArray(ctx.qualifiedName());
diff --git a/packages/kbn-esql-utils/src/utils/query_parsing_helpers.test.ts b/packages/kbn-esql-utils/src/utils/query_parsing_helpers.test.ts
index b1bafc2ce4359..ab5c1ca04ac7f 100644
--- a/packages/kbn-esql-utils/src/utils/query_parsing_helpers.test.ts
+++ b/packages/kbn-esql-utils/src/utils/query_parsing_helpers.test.ts
@@ -64,6 +64,12 @@ describe('esql query helpers', () => {
         'METRICS pods load=avg(cpu), writes=max(rate(indexing_requests)) BY pod | SORT pod'
       );
       expect(idxPattern16).toBe('pods');
+
+      const idxPattern17 = getIndexPatternFromESQLQuery('FROM "$foo%"');
+      expect(idxPattern17).toBe('$foo%');
+
+      const idxPattern18 = getIndexPatternFromESQLQuery('FROM """foo-{{mm-dd_yy}}"""');
+      expect(idxPattern18).toBe('foo-{{mm-dd_yy}}');
     });
   });
 
diff --git a/packages/kbn-esql-validation-autocomplete/BUILD.bazel b/packages/kbn-esql-validation-autocomplete/BUILD.bazel
index 07106718615d1..1e956d1903dca 100644
--- a/packages/kbn-esql-validation-autocomplete/BUILD.bazel
+++ b/packages/kbn-esql-validation-autocomplete/BUILD.bazel
@@ -22,7 +22,7 @@ SRCS = glob(
 
 SHARED_DEPS = [
   "//packages/kbn-i18n",
-  "@npm//js-levenshtein",
+  "@npm//fastest-levenshtein",
 ]
 
 js_library(
diff --git a/packages/kbn-esql-validation-autocomplete/scripts/generate_function_definitions.ts b/packages/kbn-esql-validation-autocomplete/scripts/generate_function_definitions.ts
index d50d7cc903fce..aa92c7bd024d5 100644
--- a/packages/kbn-esql-validation-autocomplete/scripts/generate_function_definitions.ts
+++ b/packages/kbn-esql-validation-autocomplete/scripts/generate_function_definitions.ts
@@ -145,6 +145,39 @@ const dateDiffOptions = [
   'ns',
 ];
 
+const dateExtractOptions = [
+  'ALIGNED_DAY_OF_WEEK_IN_MONTH',
+  'ALIGNED_DAY_OF_WEEK_IN_YEAR',
+  'ALIGNED_WEEK_OF_MONTH',
+  'ALIGNED_WEEK_OF_YEAR',
+  'AMPM_OF_DAY',
+  'CLOCK_HOUR_OF_AMPM',
+  'CLOCK_HOUR_OF_DAY',
+  'DAY_OF_MONTH',
+  'DAY_OF_WEEK',
+  'DAY_OF_YEAR',
+  'EPOCH_DAY',
+  'ERA',
+  'HOUR_OF_AMPM',
+  'HOUR_OF_DAY',
+  'INSTANT_SECONDS',
+  'MICRO_OF_DAY',
+  'MICRO_OF_SECOND',
+  'MILLI_OF_DAY',
+  'MILLI_OF_SECOND',
+  'MINUTE_OF_DAY',
+  'MINUTE_OF_HOUR',
+  'MONTH_OF_YEAR',
+  'NANO_OF_DAY',
+  'NANO_OF_SECOND',
+  'OFFSET_SECONDS',
+  'PROLEPTIC_MONTH',
+  'SECOND_OF_DAY',
+  'SECOND_OF_MINUTE',
+  'YEAR',
+  'YEAR_OF_ERA',
+];
+
 /**
  * Enrichments for function definitions
  *
@@ -168,8 +201,7 @@ const functionEnrichments: Record<string, RecursivePartial<FunctionDefinition>>
   date_extract: {
     signatures: [
       {
-        // override the first param as type chrono_literal
-        params: [{ type: 'chrono_literal' }],
+        params: [{ literalOptions: dateExtractOptions }],
       },
     ],
   },
diff --git a/packages/kbn-esql-validation-autocomplete/scripts/generate_function_validation_tests.ts b/packages/kbn-esql-validation-autocomplete/scripts/generate_function_validation_tests.ts
index 0ace35433b67e..8d6394fe96af6 100644
--- a/packages/kbn-esql-validation-autocomplete/scripts/generate_function_validation_tests.ts
+++ b/packages/kbn-esql-validation-autocomplete/scripts/generate_function_validation_tests.ts
@@ -15,7 +15,7 @@ import { statsAggregationFunctionDefinitions } from '../src/definitions/aggs';
 import { evalFunctionDefinitions } from '../src/definitions/functions';
 import { groupingFunctionDefinitions } from '../src/definitions/grouping';
 import { getFunctionSignatures } from '../src/definitions/helpers';
-import { timeUnits, chronoLiterals } from '../src/definitions/literals';
+import { timeUnits } from '../src/definitions/literals';
 import { nonNullable } from '../src/shared/helpers';
 import {
   SupportedFieldType,
@@ -1045,14 +1045,10 @@ function getFieldName(
 }
 
 const literals = {
-  chrono_literal: chronoLiterals[0].name,
   time_literal: timeUnits[0],
 };
 
-function getLiteralType(typeString: 'chrono_literal' | 'time_literal') {
-  if (typeString === 'chrono_literal') {
-    return literals[typeString];
-  }
+function getLiteralType(typeString: 'time_literal') {
   return `1 ${literals[typeString]}`;
 }
 
@@ -1116,7 +1112,7 @@ function getFieldMapping(
     }
     if (/literal$/.test(typeString) && useLiterals) {
       return {
-        name: getLiteralType(typeString as 'chrono_literal' | 'time_literal'),
+        name: getLiteralType(typeString as 'time_literal'),
         type,
         ...rest,
       };
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
index 6f0562d7f118e..2f87d392a702e 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.test.ts
@@ -10,7 +10,7 @@ import { suggest } from './autocomplete';
 import { evalFunctionDefinitions } from '../definitions/functions';
 import { builtinFunctions } from '../definitions/builtin';
 import { statsAggregationFunctionDefinitions } from '../definitions/aggs';
-import { chronoLiterals, timeUnitsToSuggest } from '../definitions/literals';
+import { timeUnitsToSuggest } from '../definitions/literals';
 import { commandDefinitions } from '../definitions/commands';
 import { getUnitDuration, TRIGGER_SUGGESTION_COMMAND } from './factories';
 import { camelCase, partition } from 'lodash';
@@ -53,15 +53,27 @@ const fields: Array<{ name: string; type: string; suggestedAs?: string }> = [
 ];
 
 const indexes = ([] as Array<{ name: string; hidden: boolean; suggestedAs?: string }>).concat(
-  ['a', 'index', 'otherIndex', '.secretIndex', 'my-index'].map((name) => ({
+  [
+    'a',
+    'index',
+    'otherIndex',
+    '.secretIndex',
+    'my-index',
+    'my-index$',
+    'my_index{}',
+    'my-index+1',
+    'synthetics-*',
+  ].map((name) => ({
     name,
     hidden: name.startsWith('.'),
   })),
-  ['my-index[quoted]', 'my-index$', 'my_index{}'].map((name) => ({
-    name,
-    hidden: false,
-    suggestedAs: `\`${name}\``,
-  }))
+  ['my-index[quoted]', 'my:index', 'my,index', 'logstash-{now/d{yyyy.MM.dd|+12:00}}'].map(
+    (name) => ({
+      name,
+      hidden: false,
+      suggestedAs: `"${name}"`,
+    })
+  )
 );
 
 const integrations: Integration[] = ['nginx', 'k8s'].map((name) => ({
@@ -207,9 +219,6 @@ function getLiteralsByType(_type: string | string[]) {
     // return only singular
     return timeUnitsToSuggest.map(({ name }) => `1 ${name}`).filter((s) => !/s$/.test(s));
   }
-  if (type.includes('chrono_literal')) {
-    return chronoLiterals.map(({ name }) => name);
-  }
   return [];
 }
 
@@ -368,8 +377,9 @@ describe('autocomplete', () => {
   });
 
   describe('from', () => {
-    const suggestedIndexes = indexes.filter(({ hidden }) => !hidden).map(({ name }) => name);
-
+    const suggestedIndexes = indexes
+      .filter(({ hidden }) => !hidden)
+      .map(({ name, suggestedAs }) => suggestedAs || name);
     // Monaco will filter further down here
     testSuggestions(
       'f',
@@ -397,8 +407,7 @@ describe('autocomplete', () => {
     const dataSources = indexes.concat(integrations);
     const suggestedDataSources = dataSources
       .filter(({ hidden }) => !hidden)
-      .map(({ name }) => name);
-
+      .map(({ name, suggestedAs }) => suggestedAs || name);
     testSuggestions('from ', suggestedDataSources, '', [undefined, dataSources, undefined]);
     testSuggestions('from a,', suggestedDataSources, '', [undefined, dataSources, undefined]);
     testSuggestions('from *,', suggestedDataSources, '', [undefined, dataSources, undefined]);
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
index 727335fe6d961..03504552370b6 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/autocomplete.ts
@@ -86,6 +86,7 @@ import {
   getQueryForFields,
   getSourcesFromCommands,
   isAggFunctionUsedAlready,
+  removeQuoteForSuggestedSources,
 } from './helper';
 import { FunctionParameter } from '../definitions/types';
 
@@ -857,19 +858,28 @@ async function getExpressionSuggestionsByType(
         suggestions.push(...(policies.length ? policies : [buildNoPoliciesAvailableDefinition()]));
       } else {
         const index = getSourcesFromCommands(commands, 'index');
+        const canRemoveQuote = isNewExpression && innerText.includes('"');
+
         // This is going to be empty for simple indices, and not empty for integrations
-        if (index && index.text) {
+        if (index && index.text && index.text !== EDITOR_MARKER) {
           const source = index.text.replace(EDITOR_MARKER, '');
           const dataSource = await getDatastreamsForIntegration(source);
+
           const newDefinitions = buildSourcesDefinitions(
             dataSource?.dataStreams?.map(({ name }) => ({ name, isIntegration: false })) || []
           );
-          suggestions.push(...newDefinitions);
+          suggestions.push(
+            ...(canRemoveQuote ? removeQuoteForSuggestedSources(newDefinitions) : newDefinitions)
+          );
         } else {
           // FROM <suggest>
           // @TODO: filter down the suggestions here based on other existing sources defined
           const sourcesDefinitions = await getSources();
-          suggestions.push(...sourcesDefinitions);
+          suggestions.push(
+            ...(canRemoveQuote
+              ? removeQuoteForSuggestedSources(sourcesDefinitions)
+              : sourcesDefinitions)
+          );
         }
       }
     }
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/factories.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/factories.ts
index 53e65c2f95aba..df1da9d092d73 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/factories.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/factories.ts
@@ -12,14 +12,14 @@ import { groupingFunctionDefinitions } from '../definitions/grouping';
 import { statsAggregationFunctionDefinitions } from '../definitions/aggs';
 import { evalFunctionDefinitions } from '../definitions/functions';
 import { getFunctionSignatures, getCommandSignature } from '../definitions/helpers';
-import { chronoLiterals, timeUnitsToSuggest } from '../definitions/literals';
+import { timeUnitsToSuggest } from '../definitions/literals';
 import {
   FunctionDefinition,
   CommandDefinition,
   CommandOptionsDefinition,
   CommandModeDefinition,
 } from '../definitions/types';
-import { getCommandDefinition, shouldBeQuotedText } from '../shared/helpers';
+import { shouldBeQuotedSource, getCommandDefinition, shouldBeQuotedText } from '../shared/helpers';
 import { buildDocumentation, buildFunctionDocumentation } from './documentation_util';
 import { DOUBLE_BACKTICK, SINGLE_TICK_REGEX } from '../shared/constants';
 
@@ -37,6 +37,13 @@ function getSafeInsertText(text: string, options: { dashSupported?: boolean } =
     ? `\`${text.replace(SINGLE_TICK_REGEX, DOUBLE_BACKTICK)}\``
     : text;
 }
+export function getQuotedText(text: string) {
+  return text.startsWith(`"`) && text.endsWith(`"`) ? text : `"${text}"`;
+}
+
+function getSafeInsertSourceText(text: string) {
+  return shouldBeQuotedSource(text) ? getQuotedText(text) : text;
+}
 
 export function getSuggestionFunctionDefinition(fn: FunctionDefinition): SuggestionRawDefinition {
   const fullSignatures = getFunctionSignatures(fn);
@@ -148,7 +155,7 @@ export const buildSourcesDefinitions = (
 ): SuggestionRawDefinition[] =>
   sources.map(({ name, isIntegration, title }) => ({
     label: title ?? name,
-    text: name,
+    text: getSafeInsertSourceText(name),
     isSnippet: isIntegration,
     ...(isIntegration && { command: TRIGGER_SUGGESTION_COMMAND }),
     kind: isIntegration ? 'Class' : 'Issue',
@@ -336,9 +343,6 @@ export function getCompatibleLiterals(commandName: string, types: string[], name
   if (types.includes('time_literal_unit')) {
     suggestions.push(...buildConstantsDefinitions(timeUnitsToSuggest.map(({ name }) => name))); // i.e. year, month, ...
   }
-  if (types.includes('chrono_literal')) {
-    suggestions.push(...buildConstantsDefinitions(chronoLiterals.map(({ name }) => name))); // i.e. EPOC_DAY, ...
-  }
   if (types.includes('string')) {
     if (names) {
       const index = types.indexOf('string');
diff --git a/packages/kbn-esql-validation-autocomplete/src/autocomplete/helper.ts b/packages/kbn-esql-validation-autocomplete/src/autocomplete/helper.ts
index fa6e364c78ca9..f9586670b29e6 100644
--- a/packages/kbn-esql-validation-autocomplete/src/autocomplete/helper.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/autocomplete/helper.ts
@@ -7,8 +7,9 @@
  */
 
 import type { ESQLAstItem, ESQLCommand, ESQLFunction, ESQLSource } from '@kbn/esql-ast';
-import { FunctionDefinition } from '../definitions/types';
+import type { FunctionDefinition } from '../definitions/types';
 import { getFunctionDefinition, isAssignment, isFunctionItem } from '../shared/helpers';
+import type { SuggestionRawDefinition } from './types';
 
 function extractFunctionArgs(args: ESQLAstItem[]): ESQLFunction[] {
   return args.flatMap((arg) => (isAssignment(arg) ? arg.args[1] : arg)).filter(isFunctionItem);
@@ -71,3 +72,11 @@ export function getSourcesFromCommands(commands: ESQLCommand[], sourceType: 'ind
 
   return sources.length === 1 ? sources[0] : undefined;
 }
+
+export function removeQuoteForSuggestedSources(suggestions: SuggestionRawDefinition[]) {
+  return suggestions.map((d) => ({
+    ...d,
+    // "text" -> text
+    text: d.text.startsWith('"') && d.text.endsWith('"') ? d.text.slice(1, -1) : d.text,
+  }));
+}
diff --git a/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts b/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
index 2c8620223ebb3..f6469a736a0e8 100644
--- a/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/code_actions/actions.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 import { i18n } from '@kbn/i18n';
-import levenshtein from 'js-levenshtein';
+import { distance } from 'fastest-levenshtein';
 import type { AstProviderFn, ESQLAst, EditorError, ESQLMessage } from '@kbn/esql-ast';
 import { uniqBy } from 'lodash';
 import {
@@ -90,8 +90,7 @@ function createAction(title: string, solution: string, error: EditorError): Code
 async function getSpellingPossibilities(fn: () => Promise<string[]>, errorText: string) {
   const allPossibilities = await fn();
   const allSolutions = allPossibilities.reduce((solutions, item) => {
-    const distance = levenshtein(item, errorText);
-    if (distance < 3) {
+    if (distance(item, errorText) < 3) {
       solutions.push(item);
     }
     return solutions;
@@ -306,8 +305,8 @@ async function getSpellingActionForMetadata(
 ) {
   const errorText = queryString.substring(error.startColumn - 1, error.endColumn - 1);
   const allSolutions = METADATA_FIELDS.reduce((solutions, item) => {
-    const distance = levenshtein(item, errorText);
-    if (distance < 3) {
+    const dist = distance(item, errorText);
+    if (dist < 3) {
       solutions.push(item);
     }
     return solutions;
diff --git a/packages/kbn-esql-validation-autocomplete/src/definitions/functions.ts b/packages/kbn-esql-validation-autocomplete/src/definitions/functions.ts
index ceb5789e0dd39..87c9f82360b44 100644
--- a/packages/kbn-esql-validation-autocomplete/src/definitions/functions.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/definitions/functions.ts
@@ -668,8 +668,40 @@ const dateExtractDefinition: FunctionDefinition = {
       params: [
         {
           name: 'datePart',
-          type: 'chrono_literal',
+          type: 'string',
           optional: false,
+          literalOptions: [
+            'ALIGNED_DAY_OF_WEEK_IN_MONTH',
+            'ALIGNED_DAY_OF_WEEK_IN_YEAR',
+            'ALIGNED_WEEK_OF_MONTH',
+            'ALIGNED_WEEK_OF_YEAR',
+            'AMPM_OF_DAY',
+            'CLOCK_HOUR_OF_AMPM',
+            'CLOCK_HOUR_OF_DAY',
+            'DAY_OF_MONTH',
+            'DAY_OF_WEEK',
+            'DAY_OF_YEAR',
+            'EPOCH_DAY',
+            'ERA',
+            'HOUR_OF_AMPM',
+            'HOUR_OF_DAY',
+            'INSTANT_SECONDS',
+            'MICRO_OF_DAY',
+            'MICRO_OF_SECOND',
+            'MILLI_OF_DAY',
+            'MILLI_OF_SECOND',
+            'MINUTE_OF_DAY',
+            'MINUTE_OF_HOUR',
+            'MONTH_OF_YEAR',
+            'NANO_OF_DAY',
+            'NANO_OF_SECOND',
+            'OFFSET_SECONDS',
+            'PROLEPTIC_MONTH',
+            'SECOND_OF_DAY',
+            'SECOND_OF_MINUTE',
+            'YEAR',
+            'YEAR_OF_ERA',
+          ],
         },
         {
           name: 'date',
diff --git a/packages/kbn-esql-validation-autocomplete/src/shared/helpers.test.ts b/packages/kbn-esql-validation-autocomplete/src/shared/helpers.test.ts
new file mode 100644
index 0000000000000..87eb31de4d3c9
--- /dev/null
+++ b/packages/kbn-esql-validation-autocomplete/src/shared/helpers.test.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { shouldBeQuotedSource } from './helpers';
+
+describe('shouldBeQuotedSource', () => {
+  it('does not have to be quoted for sources with acceptable characters @-+$', () => {
+    expect(shouldBeQuotedSource('foo')).toBe(false);
+    expect(shouldBeQuotedSource('123-test@foo_bar+baz1')).toBe(false);
+    expect(shouldBeQuotedSource('my-index*')).toBe(false);
+    expect(shouldBeQuotedSource('my-index$')).toBe(false);
+    expect(shouldBeQuotedSource('.my-index$')).toBe(false);
+  });
+  it(`should be quoted if containing any of special characters [:"=|,[\]/ \t\r\n]`, () => {
+    expect(shouldBeQuotedSource('foo\ttest')).toBe(true);
+    expect(shouldBeQuotedSource('foo\rtest')).toBe(true);
+    expect(shouldBeQuotedSource('foo\ntest')).toBe(true);
+    expect(shouldBeQuotedSource('foo:test=bar')).toBe(true);
+    expect(shouldBeQuotedSource('foo|test=bar')).toBe(true);
+    expect(shouldBeQuotedSource('foo[test]=bar')).toBe(true);
+    expect(shouldBeQuotedSource('foo/test=bar')).toBe(true);
+    expect(shouldBeQuotedSource('foo test=bar')).toBe(true);
+    expect(shouldBeQuotedSource('foo,test-*,abc')).toBe(true);
+    expect(shouldBeQuotedSource('foo, test-*, abc, xyz')).toBe(true);
+    expect(shouldBeQuotedSource('foo, test-*, abc, xyz,test123')).toBe(true);
+    expect(shouldBeQuotedSource('foo,test,xyz')).toBe(true);
+    expect(
+      shouldBeQuotedSource('<logstash-{now/M{yyyy.MM}}>,<logstash-{now/d{yyyy.MM.dd|+12:00}}>')
+    ).toBe(true);
+    expect(shouldBeQuotedSource('`backtick`,``multiple`back``ticks```')).toBe(true);
+    expect(shouldBeQuotedSource('test,metadata,metaata,.metadata')).toBe(true);
+    expect(shouldBeQuotedSource('cluster:index')).toBe(true);
+    expect(shouldBeQuotedSource('cluster:index|pattern')).toBe(true);
+    expect(shouldBeQuotedSource('cluster:.index')).toBe(true);
+    expect(shouldBeQuotedSource('cluster*:index*')).toBe(true);
+    expect(shouldBeQuotedSource('cluster*:*')).toBe(true);
+    expect(shouldBeQuotedSource('*:index*')).toBe(true);
+    expect(shouldBeQuotedSource('*:index|pattern')).toBe(true);
+    expect(shouldBeQuotedSource('*:*')).toBe(true);
+    expect(shouldBeQuotedSource('*:*,cluster*:index|pattern,i|p')).toBe(true);
+    expect(shouldBeQuotedSource('index-[dd-mm]')).toBe(true);
+  });
+});
diff --git a/packages/kbn-esql-validation-autocomplete/src/shared/helpers.ts b/packages/kbn-esql-validation-autocomplete/src/shared/helpers.ts
index effd6b1b16ddd..9bdb1f4e416a1 100644
--- a/packages/kbn-esql-validation-autocomplete/src/shared/helpers.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/shared/helpers.ts
@@ -17,14 +17,14 @@ import type {
   ESQLSource,
   ESQLTimeInterval,
 } from '@kbn/esql-ast';
-import { ESQLInlineCast } from '@kbn/esql-ast/src/types';
+import { ESQLInlineCast, ESQLParamLiteral } from '@kbn/esql-ast/src/types';
 import { statsAggregationFunctionDefinitions } from '../definitions/aggs';
 import { builtinFunctions } from '../definitions/builtin';
 import { commandDefinitions } from '../definitions/commands';
 import { evalFunctionDefinitions } from '../definitions/functions';
 import { groupingFunctionDefinitions } from '../definitions/grouping';
 import { getFunctionSignatures } from '../definitions/helpers';
-import { timeUnits, chronoLiterals } from '../definitions/literals';
+import { timeUnits } from '../definitions/literals';
 import {
   byOption,
   metadataOption,
@@ -233,9 +233,6 @@ function compareLiteralType(argType: string, item: ESQLLiteral) {
     return false;
   }
 
-  if (argType === 'chrono_literal') {
-    return chronoLiterals.some(({ name }) => name === item.text);
-  }
   // date-type parameters accept string literals because of ES auto-casting
   return ['string', 'date'].includes(argType);
 }
@@ -407,7 +404,7 @@ export function checkFunctionArgMatchesDefinition(
   parentCommand?: string
 ) {
   const argType = parameterDefinition.type;
-  if (argType === 'any') {
+  if (argType === 'any' || isParam(arg)) {
     return true;
   }
   if (arg.type === 'literal') {
@@ -566,6 +563,10 @@ export function isRestartingExpression(text: string) {
   return getLastCharFromTrimmed(text) === ',';
 }
 
+export function shouldBeQuotedSource(text: string) {
+  // Based on lexer `fragment UNQUOTED_SOURCE_PART`
+  return /[:"=|,[\]\/ \t\r\n]/.test(text);
+}
 export function shouldBeQuotedText(
   text: string,
   { dashSupported }: { dashSupported?: boolean } = {}
@@ -575,3 +576,9 @@ export function shouldBeQuotedText(
 
 export const isAggFunction = (arg: ESQLFunction): boolean =>
   getFunctionDefinition(arg.name)?.type === 'agg';
+
+export const isParam = (x: unknown): x is ESQLParamLiteral =>
+  !!x &&
+  typeof x === 'object' &&
+  (x as ESQLParamLiteral).type === 'literal' &&
+  (x as ESQLParamLiteral).literalType === 'param';
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
index 74301ced77e63..06d23a30c441d 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.from.ts
@@ -20,7 +20,7 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
             "SyntaxError: mismatched input 'f' expecting {'explain', 'from', 'meta', 'metrics', 'row', 'show'}",
           ]);
           await expectErrors('from ', [
-            "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+            "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
           ]);
         });
 
@@ -30,6 +30,8 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
 
             await expectErrors('from index', []);
             await expectErrors('FROM index', []);
+            await expectErrors('FROM "index"', []);
+            await expectErrors('FROM """index"""', []);
             await expectErrors('FrOm index', []);
             await expectErrors('from index, other_index', []);
             await expectErrors('from index, other_index,.secret_index', []);
@@ -65,10 +67,10 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
             const { expectErrors } = await setup();
 
             await expectErrors('from index,', [
-              "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+              "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
             ]);
             await expectErrors(`FROM index\n, \tother_index\t,\n \t `, [
-              "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+              "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
             ]);
 
             await expectErrors(`from assignment = 1`, [
@@ -80,10 +82,7 @@ export const validationFromCommandTestSuite = (setup: helpers.Setup) => {
           test('errors on invalid syntax', async () => {
             const { expectErrors } = await setup();
 
-            await expectErrors('FROM `index`', [
-              "SyntaxError: token recognition error at: '`'",
-              "SyntaxError: token recognition error at: '`'",
-            ]);
+            await expectErrors('FROM `index`', ['Unknown index [`index`]']);
             await expectErrors(`from assignment = 1`, [
               "SyntaxError: mismatched input '=' expecting <EOF>",
               'Unknown index [assignment]',
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
index 5d1ddb0865ea5..44c15c722a1de 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/test_suites/validation.command.metrics.ts
@@ -19,7 +19,7 @@ export const validationMetricsCommandTestSuite = (setup: helpers.Setup) => {
             "SyntaxError: mismatched input 'm' expecting {'explain', 'from', 'meta', 'metrics', 'row', 'show'}",
           ]);
           await expectErrors('metrics ', [
-            "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+            "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
           ]);
         });
 
@@ -61,10 +61,10 @@ export const validationMetricsCommandTestSuite = (setup: helpers.Setup) => {
             const { expectErrors } = await setup();
 
             await expectErrors('metrics index,', [
-              "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+              "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
             ]);
             await expectErrors(`metrics index\n, \tother_index\t,\n \t `, [
-              "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'",
+              "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}",
             ]);
           });
 
@@ -75,10 +75,7 @@ export const validationMetricsCommandTestSuite = (setup: helpers.Setup) => {
               "SyntaxError: token recognition error at: '='",
               "SyntaxError: token recognition error at: '1'",
             ]);
-            await expectErrors('metrics `index`', [
-              "SyntaxError: token recognition error at: '`'",
-              "SyntaxError: token recognition error at: '`'",
-            ]);
+            await expectErrors('metrics `index`', ['Unknown index [`index`]']);
           });
 
           test('errors on unknown index', async () => {
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.params.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.params.test.ts
new file mode 100644
index 0000000000000..17f91a72c52a4
--- /dev/null
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/__tests__/validation.params.test.ts
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { setup } from './helpers';
+
+test('should allow param inside agg function argument', async () => {
+  const { validate } = await setup();
+
+  const res1 = await validate('FROM index | STATS avg(?)');
+  const res2 = await validate('FROM index | STATS avg(?named)');
+  const res3 = await validate('FROM index | STATS avg(?123)');
+
+  expect(res1).toMatchObject({ errors: [], warnings: [] });
+  expect(res2).toMatchObject({ errors: [], warnings: [] });
+  expect(res3).toMatchObject({ errors: [], warnings: [] });
+});
+
+test('allow params in WHERE command expressions', async () => {
+  const { validate } = await setup();
+
+  const res1 = await validate('FROM index | WHERE stringField >= ?earliest');
+  const res2 = await validate(`
+    FROM index
+      | WHERE stringField >= ?earliest
+      | WHERE stringField <= ?0
+      | WHERE stringField == ?
+  `);
+  const res3 = await validate(`
+    FROM index
+      | WHERE stringField >= ?earliest
+        AND stringField <= ?0
+        AND stringField == ?
+  `);
+
+  expect(res1).toMatchObject({ errors: [], warnings: [] });
+  expect(res2).toMatchObject({ errors: [], warnings: [] });
+  expect(res3).toMatchObject({ errors: [], warnings: [] });
+});
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
index daf8d7c6de862..7f70b266458f7 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/esql_validation_meta_tests.json
@@ -8662,7 +8662,8 @@
     {
       "query": "from a_index | enrich `this``is fine`",
       "error": [
-        "SyntaxError: mismatched input '`this``is fine`' expecting ENRICH_POLICY_NAME"
+        "SyntaxError: extraneous input 'fine`' expecting <EOF>",
+        "Unknown policy [`this``is]"
       ],
       "warning": []
     },
@@ -11005,6 +11006,13 @@
       "error": [],
       "warning": []
     },
+    {
+      "query": "from a_index | eval date_extract(\"SOME_RANDOM_STRING\", now())",
+      "error": [],
+      "warning": [
+        "Invalid option [\"SOME_RANDOM_STRING\"] for date_extract. Supported options: [\"ALIGNED_DAY_OF_WEEK_IN_MONTH\", \"ALIGNED_DAY_OF_WEEK_IN_YEAR\", \"ALIGNED_WEEK_OF_MONTH\", \"ALIGNED_WEEK_OF_YEAR\", \"AMPM_OF_DAY\", \"CLOCK_HOUR_OF_AMPM\", \"CLOCK_HOUR_OF_DAY\", \"DAY_OF_MONTH\", \"DAY_OF_WEEK\", \"DAY_OF_YEAR\", \"EPOCH_DAY\", \"ERA\", \"HOUR_OF_AMPM\", \"HOUR_OF_DAY\", \"INSTANT_SECONDS\", \"MICRO_OF_DAY\", \"MICRO_OF_SECOND\", \"MILLI_OF_DAY\", \"MILLI_OF_SECOND\", \"MINUTE_OF_DAY\", \"MINUTE_OF_HOUR\", \"MONTH_OF_YEAR\", \"NANO_OF_DAY\", \"NANO_OF_SECOND\", \"OFFSET_SECONDS\", \"PROLEPTIC_MONTH\", \"SECOND_OF_DAY\", \"SECOND_OF_MINUTE\", \"YEAR\", \"YEAR_OF_ERA\"]."
+      ]
+    },
     {
       "query": "from a_index | eval var = date_extract(\"ALIGNED_DAY_OF_WEEK_IN_MONTH\", dateField)",
       "error": [],
@@ -11023,7 +11031,6 @@
     {
       "query": "from a_index | eval date_extract(stringField, stringField)",
       "error": [
-        "Argument of [date_extract] must be [chrono_literal], found value [stringField] type [string]",
         "Argument of [date_extract] must be [date], found value [stringField] type [string]"
       ],
       "warning": []
@@ -11043,7 +11050,7 @@
     {
       "query": "row var = date_extract(true, true)",
       "error": [
-        "Argument of [date_extract] must be [chrono_literal], found value [true] type [boolean]",
+        "Argument of [date_extract] must be [string], found value [true] type [boolean]",
         "Argument of [date_extract] must be [date], found value [true] type [boolean]"
       ],
       "warning": []
@@ -11056,7 +11063,7 @@
     {
       "query": "from a_index | eval date_extract(booleanField, booleanField)",
       "error": [
-        "Argument of [date_extract] must be [chrono_literal], found value [booleanField] type [boolean]",
+        "Argument of [date_extract] must be [string], found value [booleanField] type [boolean]",
         "Argument of [date_extract] must be [date], found value [booleanField] type [boolean]"
       ],
       "warning": []
@@ -26377,7 +26384,7 @@
     {
       "query": "from ",
       "error": [
-        "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'"
+        "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}"
       ],
       "warning": []
     },
@@ -26391,6 +26398,16 @@
       "error": [],
       "warning": []
     },
+    {
+      "query": "FROM \"index\"",
+      "error": [],
+      "warning": []
+    },
+    {
+      "query": "FROM \"\"\"index\"\"\"",
+      "error": [],
+      "warning": []
+    },
     {
       "query": "FrOm index",
       "error": [],
@@ -26539,14 +26556,14 @@
     {
       "query": "from index,",
       "error": [
-        "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'"
+        "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}"
       ],
       "warning": []
     },
     {
       "query": "FROM index\n, \tother_index\t,\n \t ",
       "error": [
-        "SyntaxError: missing INDEX_UNQUOTED_IDENTIFIER at '<EOF>'"
+        "SyntaxError: mismatched input '<EOF>' expecting {UNQUOTED_SOURCE, QUOTED_STRING}"
       ],
       "warning": []
     },
@@ -26561,8 +26578,7 @@
     {
       "query": "FROM `index`",
       "error": [
-        "SyntaxError: token recognition error at: '`'",
-        "SyntaxError: token recognition error at: '`'"
+        "Unknown index [`index`]"
       ],
       "warning": []
     },
diff --git a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
index 6c1b66574862c..062e0b9ae78f1 100644
--- a/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
+++ b/packages/kbn-esql-validation-autocomplete/src/validation/validation.test.ts
@@ -12,7 +12,7 @@ import { ignoreErrorsMap, validateQuery } from './validation';
 import { evalFunctionDefinitions } from '../definitions/functions';
 import { getFunctionSignatures } from '../definitions/helpers';
 import { FunctionDefinition, SupportedFieldType, supportedFieldTypes } from '../definitions/types';
-import { chronoLiterals, timeUnits, timeUnitsToSuggest } from '../definitions/literals';
+import { timeUnits, timeUnitsToSuggest } from '../definitions/literals';
 import { statsAggregationFunctionDefinitions } from '../definitions/aggs';
 import capitalize from 'lodash/capitalize';
 import { camelCase } from 'lodash';
@@ -58,13 +58,9 @@ const nestedFunctions = {
 };
 
 const literals = {
-  chrono_literal: chronoLiterals[0].name,
   time_literal: timeUnitsToSuggest[0].name,
 };
-function getLiteralType(typeString: 'chrono_literal' | 'time_literal') {
-  if (typeString === 'chrono_literal') {
-    return literals[typeString];
-  }
+function getLiteralType(typeString: 'time_literal') {
   return `1 ${literals[typeString]}`;
 }
 
@@ -144,7 +140,7 @@ function getFieldMapping(
     }
     if (/literal$/.test(typeString) && useLiterals) {
       return {
-        name: getLiteralType(typeString as 'chrono_literal' | 'time_literal'),
+        name: getLiteralType(typeString as 'time_literal'),
         type,
         ...rest,
       };
@@ -1359,7 +1355,8 @@ describe('validation logic', () => {
       ]);
       testErrorsAndWarnings(`from a_index | enrich policy `, []);
       testErrorsAndWarnings('from a_index | enrich `this``is fine`', [
-        "SyntaxError: mismatched input '`this``is fine`' expecting ENRICH_POLICY_NAME",
+        "SyntaxError: extraneous input 'fine`' expecting <EOF>",
+        'Unknown policy [`this``is]',
       ]);
       testErrorsAndWarnings('from a_index | enrich this is fine', [
         "SyntaxError: mismatched input 'is' expecting <EOF>",
@@ -2609,6 +2606,13 @@ describe('validation logic', () => {
       describe('date_extract', () => {
         testErrorsAndWarnings('row var = date_extract("ALIGNED_DAY_OF_WEEK_IN_MONTH", now())', []);
         testErrorsAndWarnings('row date_extract("ALIGNED_DAY_OF_WEEK_IN_MONTH", now())', []);
+        testErrorsAndWarnings(
+          'from a_index | eval date_extract("SOME_RANDOM_STRING", now())',
+          [],
+          [
+            'Invalid option ["SOME_RANDOM_STRING"] for date_extract. Supported options: ["ALIGNED_DAY_OF_WEEK_IN_MONTH", "ALIGNED_DAY_OF_WEEK_IN_YEAR", "ALIGNED_WEEK_OF_MONTH", "ALIGNED_WEEK_OF_YEAR", "AMPM_OF_DAY", "CLOCK_HOUR_OF_AMPM", "CLOCK_HOUR_OF_DAY", "DAY_OF_MONTH", "DAY_OF_WEEK", "DAY_OF_YEAR", "EPOCH_DAY", "ERA", "HOUR_OF_AMPM", "HOUR_OF_DAY", "INSTANT_SECONDS", "MICRO_OF_DAY", "MICRO_OF_SECOND", "MILLI_OF_DAY", "MILLI_OF_SECOND", "MINUTE_OF_DAY", "MINUTE_OF_HOUR", "MONTH_OF_YEAR", "NANO_OF_DAY", "NANO_OF_SECOND", "OFFSET_SECONDS", "PROLEPTIC_MONTH", "SECOND_OF_DAY", "SECOND_OF_MINUTE", "YEAR", "YEAR_OF_ERA"].',
+          ]
+        );
 
         testErrorsAndWarnings(
           'from a_index | eval var = date_extract("ALIGNED_DAY_OF_WEEK_IN_MONTH", dateField)',
@@ -2626,7 +2630,6 @@ describe('validation logic', () => {
         );
 
         testErrorsAndWarnings('from a_index | eval date_extract(stringField, stringField)', [
-          'Argument of [date_extract] must be [chrono_literal], found value [stringField] type [string]',
           'Argument of [date_extract] must be [date], found value [stringField] type [string]',
         ]);
 
@@ -2641,7 +2644,7 @@ describe('validation logic', () => {
         );
 
         testErrorsAndWarnings('row var = date_extract(true, true)', [
-          'Argument of [date_extract] must be [chrono_literal], found value [true] type [boolean]',
+          'Argument of [date_extract] must be [string], found value [true] type [boolean]',
           'Argument of [date_extract] must be [date], found value [true] type [boolean]',
         ]);
 
@@ -2651,7 +2654,7 @@ describe('validation logic', () => {
         );
 
         testErrorsAndWarnings('from a_index | eval date_extract(booleanField, booleanField)', [
-          'Argument of [date_extract] must be [chrono_literal], found value [booleanField] type [boolean]',
+          'Argument of [date_extract] must be [string], found value [booleanField] type [boolean]',
           'Argument of [date_extract] must be [date], found value [booleanField] type [boolean]',
         ]);
         testErrorsAndWarnings('from a_index | eval date_extract(null, null)', []);
diff --git a/packages/kbn-field-types/src/kbn_field_types.ts b/packages/kbn-field-types/src/kbn_field_types.ts
index 7ec22de078230..5059d37da1d0e 100644
--- a/packages/kbn-field-types/src/kbn_field_types.ts
+++ b/packages/kbn-field-types/src/kbn_field_types.ts
@@ -50,6 +50,10 @@ export const getFilterableKbnTypeNames = (): string[] =>
   registeredKbnTypes.filter((type) => type.filterable).map((type) => type.name);
 
 export function esFieldTypeToKibanaFieldType(type: string) {
+  // 'counter_integer', 'counter_long', 'counter_double'...
+  if (type.startsWith('counter_')) {
+    return KBN_FIELD_TYPES.NUMBER;
+  }
   switch (type) {
     case ES_FIELD_TYPES._INDEX:
       return KBN_FIELD_TYPES.STRING;
diff --git a/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.test.tsx b/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.test.tsx
index 1311d1c5bbc2f..ef9b0572c689d 100644
--- a/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.test.tsx
+++ b/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.test.tsx
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { type DataViewField } from '@kbn/data-views-plugin/common';
 import {
   fieldNameWildcardMatcher,
   getFieldSearchMatchingHighlight,
@@ -16,54 +15,107 @@ const name = 'test.this_value.maybe';
 describe('fieldNameWildcardMatcher', function () {
   describe('fieldNameWildcardMatcher()', () => {
     it('should work correctly with wildcard', async () => {
-      expect(fieldNameWildcardMatcher({ displayName: 'test' } as DataViewField, 'no')).toBe(false);
-      expect(
-        fieldNameWildcardMatcher({ displayName: 'test', name: 'yes' } as DataViewField, 'yes')
-      ).toBe(true);
+      expect(fieldNameWildcardMatcher({ displayName: 'test', name: 'test' }, 'no')).toBe(false);
+      expect(fieldNameWildcardMatcher({ displayName: 'test', name: 'yes' }, 'yes')).toBe(true);
 
       const search = 'test*ue';
-      expect(fieldNameWildcardMatcher({ displayName: 'test' } as DataViewField, search)).toBe(
-        false
-      );
-      expect(fieldNameWildcardMatcher({ displayName: 'test.value' } as DataViewField, search)).toBe(
-        true
-      );
-      expect(fieldNameWildcardMatcher({ name: 'test.this_value' } as DataViewField, search)).toBe(
-        true
-      );
-      expect(fieldNameWildcardMatcher({ name: 'message.test' } as DataViewField, search)).toBe(
-        false
-      );
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, search)).toBe(false);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, `${search}*`)).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, '*value*')).toBe(true);
+      expect(fieldNameWildcardMatcher({ displayName: 'test', name: 'test' }, search)).toBe(false);
+      expect(
+        fieldNameWildcardMatcher({ displayName: 'test.value', name: 'test.value' }, search)
+      ).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'test.this_value' }, search)).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'message.test' }, search)).toBe(false);
+      expect(fieldNameWildcardMatcher({ name }, search)).toBe(false);
+      expect(fieldNameWildcardMatcher({ name }, `${search}*`)).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, '*value*')).toBe(true);
     });
 
     it('should work correctly with spaces', async () => {
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test maybe    ')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test maybe*')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test. this')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'this      _value be')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'this')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, '  value  ')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'be')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test this here')).toBe(false);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, 'test that')).toBe(false);
-      expect(fieldNameWildcardMatcher({ name } as DataViewField, '    ')).toBe(false);
-      expect(fieldNameWildcardMatcher({ name: 'geo.location3' } as DataViewField, '3')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'geo_location3' } as DataViewField, 'geo 3')).toBe(
-        true
-      );
+      expect(fieldNameWildcardMatcher({ name }, 'test maybe    ')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'test maybe*')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'test. this')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'this      _value be')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'test')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'this')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, '  value  ')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'be')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name }, 'test this here')).toBe(false);
+      expect(fieldNameWildcardMatcher({ name }, 'test that')).toBe(false);
+      expect(fieldNameWildcardMatcher({ name }, '    ')).toBe(false);
+      expect(fieldNameWildcardMatcher({ name: 'geo.location3' }, '3')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'geo_location3' }, 'geo 3')).toBe(true);
     });
 
     it('should be case-insensitive', async () => {
-      expect(fieldNameWildcardMatcher({ name: 'Test' } as DataViewField, 'test')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'test' } as DataViewField, 'Test')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'tesT' } as DataViewField, 'Tes*')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'tesT' } as DataViewField, 'tes*')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'tesT' } as DataViewField, 't T')).toBe(true);
-      expect(fieldNameWildcardMatcher({ name: 'tesT' } as DataViewField, 't t')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'Test' }, 'test')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'test' }, 'Test')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'tesT' }, 'Tes*')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'tesT' }, 'tes*')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'tesT' }, 't T')).toBe(true);
+      expect(fieldNameWildcardMatcher({ name: 'tesT' }, 't t')).toBe(true);
+    });
+
+    describe('fuzzy search', () => {
+      test('only matches strings longer than 3 characters', () => {
+        expect(fieldNameWildcardMatcher({ name: 'a' }, 'b')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'ab' }, 'cb')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abc' }, 'abb')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abcd' }, 'abbd')).toBe(true);
+      });
+      test('is case insensitive', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefg' }, 'AAbcdef')).toBe(true);
+      });
+      test('tests both displayName and name', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefg' }, 'aabcdefg')).toBe(true);
+        expect(
+          fieldNameWildcardMatcher({ name: 'abcdefg', displayName: 'irrelevantstring' }, 'bbcdefg')
+        ).toBe(true);
+        expect(
+          fieldNameWildcardMatcher({ name: 'irrelevantstring', displayName: 'abcdefg' }, 'bbcdefg')
+        ).toBe(true);
+      });
+      test('finds matches with a typo at the beginning of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, '.bcdefghijklmno')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, '.bcde')).toBe(true);
+      });
+      test('finds matches with a typo in the middle of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, 'abcdefghi.klmno')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, 'ghi.klm')).toBe(true);
+      });
+      test('finds matches with a typo at the end of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, 'abcdefghijklmn.')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmno' }, 'klmn.')).toBe(true);
+      });
+      test('finds matches with an additional character at the beginning of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, '.abcdefghijklmn')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, '.abcde')).toBe(true);
+      });
+      test('finds matches with an additional character in the middle of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'abcdefgh.ijklmn')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'fgh.ijklm')).toBe(true);
+      });
+      test('finds matches with an additional character at the end of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'abcdefghijklmn.')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'ghijklmn.')).toBe(true);
+      });
+      test('finds matches with a missing character in the middle of the string', () => {
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'abcdefgijklmn')).toBe(true);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefghijklmn' }, 'gijkl')).toBe(true);
+      });
+      test('does not find matches exceeding edit distance 1', () => {
+        // swapping edit distance = 2
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'abdcefhghijklm')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'abdce')).toBe(false);
+        // 2 char removed
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'abcfhghijklm')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'abcfhg')).toBe(false);
+        // 2 chars added
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'abcfhghijklmmm')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'hijklmmm')).toBe(false);
+        // 2 typos
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'cccdefhghijklm')).toBe(false);
+        expect(fieldNameWildcardMatcher({ name: 'abcdefhghijklm' }, 'cccdefh')).toBe(false);
+      });
     });
   });
 
@@ -74,10 +126,10 @@ describe('fieldNameWildcardMatcher', function () {
       expect(getFieldSearchMatchingHighlight('test this')).toBe('');
     });
 
-    it('should correctly return a full match for a wildcard search', async () => {
-      expect(getFieldSearchMatchingHighlight('Test this', 'test*')).toBe('Test this');
-      expect(getFieldSearchMatchingHighlight('test this', '*this')).toBe('test this');
-      expect(getFieldSearchMatchingHighlight('test this', ' te th')).toBe('test this');
+    it('should correctly return a match for a wildcard search', async () => {
+      expect(getFieldSearchMatchingHighlight('Test this', 'test*')).toBe('test');
+      expect(getFieldSearchMatchingHighlight('test this', '*this')).toBe(' this');
+      expect(getFieldSearchMatchingHighlight('test this', ' te th')).toBe('t th');
     });
   });
 });
diff --git a/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.ts b/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.ts
index ba06e36e95c9f..472f377ccddae 100644
--- a/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.ts
+++ b/packages/kbn-field-utils/src/utils/field_name_wildcard_matcher.ts
@@ -7,6 +7,7 @@
  */
 
 import { escapeRegExp, memoize } from 'lodash';
+import { distance } from 'fastest-levenshtein';
 
 const makeRegEx = memoize(function makeRegEx(glob: string) {
   const trimmedGlob = glob.trim();
@@ -21,7 +22,7 @@ const makeRegEx = memoize(function makeRegEx(glob: string) {
     globRegex = '.*' + globRegex + '.*';
   }
 
-  return new RegExp(globRegex.includes('*') ? `^${globRegex}$` : globRegex, 'i');
+  return new RegExp(globRegex.includes('*') ? `^${globRegex}$` : globRegex);
 });
 
 /**
@@ -37,11 +38,61 @@ export const fieldNameWildcardMatcher = (
   if (!fieldSearchHighlight?.trim()) {
     return false;
   }
+  const searchLower = fieldSearchHighlight.toLowerCase();
+  const displayNameLower = field.displayName?.toLowerCase();
+  const nameLower = field.name.toLowerCase();
 
-  const regExp = makeRegEx(fieldSearchHighlight);
-  return (!!field.displayName && regExp.test(field.displayName)) || regExp.test(field.name);
+  const regExp = makeRegEx(searchLower);
+  const doesWildcardMatch =
+    (!!displayNameLower && regExp.test(displayNameLower)) || regExp.test(nameLower);
+  if (doesWildcardMatch) {
+    return true;
+  }
+
+  if (searchLower.length < FUZZY_STRING_MIN_LENGTH) {
+    return false;
+  }
+  return testFuzzySearch({ name: nameLower, displayName: displayNameLower }, searchLower);
 };
 
+const FUZZY_STRING_MIN_LENGTH = 4;
+const FUZZY_SEARCH_DISTANCE = 1;
+
+const testFuzzySearch = (field: { name: string; displayName?: string }, searchValue: string) => {
+  return (
+    Boolean(testFuzzySearchForString(field.displayName, searchValue)) ||
+    (field.name !== field.displayName && Boolean(testFuzzySearchForString(field.name, searchValue)))
+  );
+};
+
+const testFuzzySearchForString = (label: string | undefined, searchValue: string) => {
+  if (!label || label.length < searchValue.length - 2) {
+    return false;
+  }
+
+  const substrLength = Math.max(
+    Math.min(searchValue.length, label.length),
+    FUZZY_STRING_MIN_LENGTH
+  );
+
+  // performance optimization: instead of building the whole matrix,
+  // only iterate through the strings of the substring length +- 1 character,
+  // for example for searchValue = 'test' and label = 'test_value',
+  // we iterate through 'test', 'est_', 'st_v' (and +- character cases too).
+  const iterationsCount = label.length - substrLength + 1;
+  for (let i = 0; i <= iterationsCount; i++) {
+    for (let j = substrLength - 1; j <= substrLength + 1; j++) {
+      if (compareLevenshtein(searchValue, label.substring(i, j + i))) {
+        return label.substring(i, j + i);
+      }
+    }
+  }
+  return false;
+};
+
+const compareLevenshtein = (str1: string, str2: string) =>
+  distance(str1, str2) <= FUZZY_SEARCH_DISTANCE;
+
 /**
  * Adapts fieldNameWildcardMatcher to combobox props.
  * @param field
@@ -64,13 +115,15 @@ export function getFieldSearchMatchingHighlight(
   displayName: string,
   fieldSearchHighlight?: string
 ): string {
+  if (!fieldSearchHighlight) {
+    return '';
+  }
   const searchHighlight = (fieldSearchHighlight || '').trim();
-  if (
-    (searchHighlight.includes('*') || searchHighlight.includes(' ')) &&
-    fieldNameWildcardMatcher({ name: displayName }, searchHighlight)
-  ) {
-    return displayName;
+  if (displayName.toLowerCase().indexOf(searchHighlight.toLowerCase()) > -1) {
+    return searchHighlight;
   }
-
-  return searchHighlight;
+  return (
+    testFuzzySearchForString(displayName.toLowerCase(), searchHighlight.toLowerCase()) ||
+    displayName
+  );
 }
diff --git a/packages/kbn-field-utils/src/utils/get_text_based_column_icon_type.ts b/packages/kbn-field-utils/src/utils/get_text_based_column_icon_type.ts
index 0ccad94674208..3c37b9b01c3fb 100644
--- a/packages/kbn-field-utils/src/utils/get_text_based_column_icon_type.ts
+++ b/packages/kbn-field-utils/src/utils/get_text_based_column_icon_type.ts
@@ -7,6 +7,7 @@
  */
 
 import type { DatatableColumnMeta } from '@kbn/expressions-plugin/common';
+import { convertDatatableColumnToDataViewFieldSpec } from '@kbn/data-view-utils';
 import { getFieldIconType } from './get_field_icon_type';
 
 export function getTextBasedColumnIconType(
@@ -19,10 +20,8 @@ export function getTextBasedColumnIconType(
     | null
 ): string | null {
   return columnMeta && columnMeta.type
-    ? getFieldIconType({
-        name: '',
-        type: columnMeta.type,
-        esTypes: columnMeta.esType ? [columnMeta.esType] : [],
-      })
+    ? getFieldIconType(
+        convertDatatableColumnToDataViewFieldSpec({ id: '', name: '', meta: columnMeta })
+      )
     : null;
 }
diff --git a/packages/kbn-field-utils/tsconfig.json b/packages/kbn-field-utils/tsconfig.json
index 4b75159b5f7fe..9ac5ba7e942bc 100644
--- a/packages/kbn-field-utils/tsconfig.json
+++ b/packages/kbn-field-utils/tsconfig.json
@@ -10,6 +10,7 @@
     "@kbn/react-field",
     "@kbn/field-types",
     "@kbn/expressions-plugin",
+    "@kbn/data-view-utils",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/packages/kbn-grouping/index.tsx b/packages/kbn-grouping/index.tsx
index 1b83c314714b7..7dd711b72d015 100644
--- a/packages/kbn-grouping/index.tsx
+++ b/packages/kbn-grouping/index.tsx
@@ -13,7 +13,7 @@ import type {
   GroupingAggregation,
   NamedAggregation,
   RawBucket,
-  StatRenderer,
+  GroupStatsItem,
 } from './src';
 
 export { getGroupingQuery, isNoneGroup, useGrouping };
@@ -24,5 +24,5 @@ export type {
   GroupingAggregation,
   NamedAggregation,
   RawBucket,
-  StatRenderer,
+  GroupStatsItem,
 };
diff --git a/packages/kbn-grouping/jest.config.js b/packages/kbn-grouping/jest.config.js
index d415d4101ad86..80b0183f089c3 100644
--- a/packages/kbn-grouping/jest.config.js
+++ b/packages/kbn-grouping/jest.config.js
@@ -22,5 +22,5 @@ module.exports = {
     '!<rootDir>/packages/kbn-grouping/**/translations',
     '!<rootDir>/packages/kbn-grouping/**/types/*',
   ],
-  setupFilesAfterEnv: ['<rootDir>/packages/kbn-grouping/setup_test.ts'],
+  setupFilesAfterEnv: ['<rootDir>/packages/kbn-grouping/setup_tests.ts'],
 };
diff --git a/packages/kbn-grouping/setup_tests.ts b/packages/kbn-grouping/setup_tests.ts
new file mode 100644
index 0000000000000..bb55d97ec9302
--- /dev/null
+++ b/packages/kbn-grouping/setup_tests.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+// eslint-disable-next-line import/no-extraneous-dependencies
+import '@testing-library/jest-dom';
diff --git a/packages/kbn-grouping/src/components/accordion_panel/group_stats.test.tsx b/packages/kbn-grouping/src/components/accordion_panel/group_stats.test.tsx
index 8ccc1c912b62d..5960a0a65b295 100644
--- a/packages/kbn-grouping/src/components/accordion_panel/group_stats.test.tsx
+++ b/packages/kbn-grouping/src/components/accordion_panel/group_stats.test.tsx
@@ -16,10 +16,10 @@ const testProps = {
   groupFilter: [],
   groupNumber: 0,
   onTakeActionsOpen,
-  statRenderers: [
+  stats: [
     {
       title: 'Severity',
-      renderer: <p data-test-subj="customMetricStat" />,
+      component: <p data-test-subj="customMetricStat" />,
     },
     { title: "IP's:", badge: { value: 1 } },
     { title: 'Rules:', badge: { value: 2 } },
@@ -34,11 +34,12 @@ describe('Group stats', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
+
   it('renders each stat item', () => {
     const { getByTestId, queryByTestId } = render(<GroupStats {...testProps} />);
     expect(getByTestId('group-stats')).toBeInTheDocument();
-    testProps.statRenderers.forEach(({ title: stat, renderer }) => {
-      if (renderer != null) {
+    testProps.stats.forEach(({ title: stat, component }) => {
+      if (component != null) {
         expect(getByTestId(`customMetric-${stat}`)).toBeInTheDocument();
         expect(queryByTestId(`metric-${stat}`)).not.toBeInTheDocument();
       } else {
@@ -47,6 +48,7 @@ describe('Group stats', () => {
       }
     });
   });
+
   it('when onTakeActionsOpen is defined, call onTakeActionsOpen on popover click', () => {
     const { getByTestId, queryByTestId } = render(<GroupStats {...testProps} />);
     fireEvent.click(getByTestId('take-action-button'));
@@ -55,6 +57,7 @@ describe('Group stats', () => {
       expect(queryByTestId(actionItem)).not.toBeInTheDocument();
     });
   });
+
   it('when onTakeActionsOpen is undefined, render take actions dropdown on popover click', () => {
     const { getByTestId } = render(<GroupStats {...testProps} onTakeActionsOpen={undefined} />);
     fireEvent.click(getByTestId('take-action-button'));
@@ -62,4 +65,16 @@ describe('Group stats', () => {
       expect(getByTestId(actionItem)).toBeInTheDocument();
     });
   });
+
+  it('shows the Take Actions menu when action items are provided', () => {
+    const { queryByTestId } = render(
+      <GroupStats {...testProps} takeActionItems={() => [<span />]} />
+    );
+    expect(queryByTestId('take-action-button')).toBeInTheDocument();
+  });
+
+  it('hides the Take Actions menu when no action item is provided', () => {
+    const { queryByTestId } = render(<GroupStats {...testProps} takeActionItems={() => []} />);
+    expect(queryByTestId('take-action-button')).not.toBeInTheDocument();
+  });
 });
diff --git a/packages/kbn-grouping/src/components/accordion_panel/group_stats.tsx b/packages/kbn-grouping/src/components/accordion_panel/group_stats.tsx
index 61f40982507b8..87e083fa76255 100644
--- a/packages/kbn-grouping/src/components/accordion_panel/group_stats.tsx
+++ b/packages/kbn-grouping/src/components/accordion_panel/group_stats.tsx
@@ -15,9 +15,11 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { Fragment, useCallback, useMemo, useState } from 'react';
 import { Filter } from '@kbn/es-query';
-import { StatRenderer } from '../types';
+import { css } from '@emotion/react';
+import { euiThemeVars } from '@kbn/ui-theme';
+import { GroupStatsItem } from '../types';
 import { statsContainerCss } from '../styles';
 import { TAKE_ACTION } from '../translations';
 
@@ -26,38 +28,44 @@ interface GroupStatsProps<T> {
   groupFilter: Filter[];
   groupNumber: number;
   onTakeActionsOpen?: () => void;
-  statRenderers?: StatRenderer[];
-  takeActionItems: (groupFilters: Filter[], groupNumber: number) => JSX.Element[];
+  stats?: GroupStatsItem[];
+  takeActionItems?: (groupFilters: Filter[], groupNumber: number) => JSX.Element[];
 }
 
+const Separator = () => {
+  return (
+    <EuiFlexItem
+      grow={false}
+      role="separator"
+      css={css`
+        align-self: center;
+        height: 20px;
+        border-right: ${euiThemeVars.euiBorderThin};
+      `}
+    />
+  );
+};
+
 const GroupStatsComponent = <T,>({
   bucketKey,
   groupFilter,
   groupNumber,
   onTakeActionsOpen,
-  statRenderers,
+  stats,
   takeActionItems: getTakeActionItems,
 }: GroupStatsProps<T>) => {
   const [isPopoverOpen, setPopover] = useState(false);
-  const [takeActionItems, setTakeActionItems] = useState<JSX.Element[]>([]);
+  const takeActionItems = useMemo(() => {
+    return getTakeActionItems?.(groupFilter, groupNumber) ?? [];
+  }, [getTakeActionItems, groupFilter, groupNumber]);
 
   const onButtonClick = useCallback(() => {
-    if (!isPopoverOpen && takeActionItems.length === 0) {
-      setTakeActionItems(getTakeActionItems(groupFilter, groupNumber));
-    }
     return !isPopoverOpen && onTakeActionsOpen ? onTakeActionsOpen() : setPopover(!isPopoverOpen);
-  }, [
-    getTakeActionItems,
-    groupFilter,
-    groupNumber,
-    isPopoverOpen,
-    onTakeActionsOpen,
-    takeActionItems.length,
-  ]);
+  }, [isPopoverOpen, onTakeActionsOpen]);
 
-  const statsComponent = useMemo(
+  const statsComponents = useMemo(
     () =>
-      statRenderers?.map((stat) => {
+      stats?.map((stat) => {
         const { dataTestSubj, component } =
           stat.badge != null
             ? {
@@ -73,7 +81,7 @@ const GroupStatsComponent = <T,>({
                   </EuiToolTip>
                 ),
               }
-            : { dataTestSubj: `customMetric-${stat.title}`, component: stat.renderer };
+            : { dataTestSubj: `customMetric-${stat.title}`, component: stat.component };
 
         return (
           <EuiFlexItem grow={false} key={stat.title}>
@@ -83,33 +91,34 @@ const GroupStatsComponent = <T,>({
             </span>
           </EuiFlexItem>
         );
-      }),
-    [statRenderers]
+      }) ?? [],
+    [stats]
   );
 
   const takeActionMenu = useMemo(
-    () => (
-      <EuiFlexItem grow={false}>
-        <EuiPopover
-          anchorPosition="downLeft"
-          button={
-            <EuiButtonEmpty
-              data-test-subj="take-action-button"
-              onClick={onButtonClick}
-              iconType="arrowDown"
-              iconSide="right"
-            >
-              {TAKE_ACTION}
-            </EuiButtonEmpty>
-          }
-          closePopover={() => setPopover(false)}
-          isOpen={isPopoverOpen}
-          panelPaddingSize="none"
-        >
-          <EuiContextMenuPanel items={takeActionItems} />
-        </EuiPopover>
-      </EuiFlexItem>
-    ),
+    () =>
+      takeActionItems.length ? (
+        <EuiFlexItem grow={false}>
+          <EuiPopover
+            anchorPosition="downLeft"
+            button={
+              <EuiButtonEmpty
+                data-test-subj="take-action-button"
+                onClick={onButtonClick}
+                iconType="arrowDown"
+                iconSide="right"
+              >
+                {TAKE_ACTION}
+              </EuiButtonEmpty>
+            }
+            closePopover={() => setPopover(false)}
+            isOpen={isPopoverOpen}
+            panelPaddingSize="none"
+          >
+            <EuiContextMenuPanel items={takeActionItems} />
+          </EuiPopover>
+        </EuiFlexItem>
+      ) : null,
     [isPopoverOpen, onButtonClick, takeActionItems]
   );
 
@@ -117,11 +126,15 @@ const GroupStatsComponent = <T,>({
     <EuiFlexGroup
       data-test-subj="group-stats"
       key={`stats-${bucketKey}`}
-      gutterSize="none"
+      gutterSize="m"
       alignItems="center"
     >
-      {statsComponent}
-      {takeActionMenu}
+      {[...statsComponents, takeActionMenu].filter(Boolean).map((component, index, { length }) => (
+        <Fragment key={index}>
+          {component}
+          {index < length - 1 && <Separator />}
+        </Fragment>
+      ))}
     </EuiFlexGroup>
   );
 };
diff --git a/packages/kbn-grouping/src/components/accordion_panel/index.tsx b/packages/kbn-grouping/src/components/accordion_panel/index.tsx
index 60237b2a10780..ae13509b51a9e 100644
--- a/packages/kbn-grouping/src/components/accordion_panel/index.tsx
+++ b/packages/kbn-grouping/src/components/accordion_panel/index.tsx
@@ -18,7 +18,7 @@ interface GroupPanelProps<T> {
   extraAction?: React.ReactNode;
   forceState?: 'open' | 'closed';
   groupBucket: GroupingBucket<T>;
-  groupPanelRenderer?: JSX.Element;
+  groupPanel?: JSX.Element;
   groupingLevel?: number;
   isLoading: boolean;
   isNullGroup?: boolean;
@@ -62,7 +62,7 @@ const GroupPanelComponent = <T,>({
   extraAction,
   forceState,
   groupBucket,
-  groupPanelRenderer,
+  groupPanel,
   groupingLevel = 0,
   isLoading,
   isNullGroup = false,
@@ -115,7 +115,7 @@ const GroupPanelComponent = <T,>({
       buttonClassName={customAccordionButtonClassName}
       buttonContent={
         <div data-test-subj="group-panel-toggle" className="groupingPanelRenderer">
-          {groupPanelRenderer ?? (
+          {groupPanel ?? (
             <DefaultGroupPanelRenderer
               title={groupFieldValue.asString}
               isNullGroup={isNullGroup}
diff --git a/packages/kbn-grouping/src/components/grouping.test.tsx b/packages/kbn-grouping/src/components/grouping.test.tsx
index 1a40a9d22b343..104ee96f5a815 100644
--- a/packages/kbn-grouping/src/components/grouping.test.tsx
+++ b/packages/kbn-grouping/src/components/grouping.test.tsx
@@ -118,7 +118,7 @@ describe('grouping container', () => {
   });
 
   it('Renders a null group and passes the correct filter to take actions and child component', () => {
-    takeActionItems.mockReturnValue([]);
+    takeActionItems.mockReturnValue([<span />]);
     const { getAllByTestId, getByTestId } = render(
       <I18nProvider>
         <Grouping {...testProps} />
diff --git a/packages/kbn-grouping/src/components/grouping.tsx b/packages/kbn-grouping/src/components/grouping.tsx
index 2b7c0ea4a9dd0..41a64e2cb274c 100644
--- a/packages/kbn-grouping/src/components/grouping.tsx
+++ b/packages/kbn-grouping/src/components/grouping.tsx
@@ -23,8 +23,8 @@ import { GroupStats } from './accordion_panel/group_stats';
 import { EmptyGroupingComponent } from './empty_results_panel';
 import { countCss, groupingContainerCss, groupingContainerCssLevel } from './styles';
 import { GROUPS_UNIT, NULL_GROUP } from './translations';
-import type { ParsedGroupingAggregation, GroupPanelRenderer } from './types';
-import { GroupingBucket, GroupStatsRenderer, OnGroupToggle } from './types';
+import type { ParsedGroupingAggregation, GroupPanelRenderer, GetGroupStats } from './types';
+import { GroupingBucket, OnGroupToggle } from './types';
 import { getTelemetryEvent } from '../telemetry/const';
 
 export interface GroupingProps<T> {
@@ -33,7 +33,7 @@ export interface GroupingProps<T> {
   groupPanelRenderer?: GroupPanelRenderer<T>;
   groupSelector?: JSX.Element;
   // list of custom UI components which correspond to your custom rendered metrics aggregations
-  groupStatsRenderer?: GroupStatsRenderer<T>;
+  getGroupStats?: GetGroupStats<T>;
   groupingId: string;
   groupingLevel?: number;
   inspectButton?: JSX.Element;
@@ -45,7 +45,7 @@ export interface GroupingProps<T> {
   renderChildComponent: (groupFilter: Filter[]) => React.ReactElement;
   onGroupClose: () => void;
   selectedGroup: string;
-  takeActionItems: (groupFilters: Filter[], groupNumber: number) => JSX.Element[];
+  takeActionItems?: (groupFilters: Filter[], groupNumber: number) => JSX.Element[];
   tracker?: (
     type: UiCounterMetricType,
     event: string | string[],
@@ -59,8 +59,8 @@ const GroupingComponent = <T,>({
   activePage,
   data,
   groupPanelRenderer,
+  getGroupStats,
   groupSelector,
-  groupStatsRenderer,
   groupingId,
   groupingLevel = 0,
   inspectButton,
@@ -124,15 +124,13 @@ const GroupingComponent = <T,>({
                         )
                   }
                   groupNumber={groupNumber}
-                  statRenderers={
-                    groupStatsRenderer && groupStatsRenderer(selectedGroup, groupBucket)
-                  }
+                  stats={getGroupStats && getGroupStats(selectedGroup, groupBucket)}
                   takeActionItems={takeActionItems}
                 />
               }
               forceState={(trigger[groupKey] && trigger[groupKey].state) ?? 'closed'}
               groupBucket={groupBucket}
-              groupPanelRenderer={
+              groupPanel={
                 groupPanelRenderer &&
                 groupPanelRenderer(selectedGroup, groupBucket, nullGroupMessage, isLoading)
               }
@@ -166,7 +164,7 @@ const GroupingComponent = <T,>({
     [
       data?.groupByFields?.buckets,
       groupPanelRenderer,
-      groupStatsRenderer,
+      getGroupStats,
       groupingId,
       groupingLevel,
       isLoading,
diff --git a/packages/kbn-grouping/src/components/styles.tsx b/packages/kbn-grouping/src/components/styles.tsx
index 063c0f271f37f..d65cf8c84e353 100644
--- a/packages/kbn-grouping/src/components/styles.tsx
+++ b/packages/kbn-grouping/src/components/styles.tsx
@@ -22,9 +22,6 @@ export const countCss = css`
 export const statsContainerCss = css`
   font-size: ${euiThemeVars.euiFontSizeXS};
   font-weight: ${euiThemeVars.euiFontWeightSemiBold};
-  border-right: ${euiThemeVars.euiBorderThin};
-  margin-right: 16px;
-  padding-right: 16px;
   .smallDot {
     width: 3px !important;
     display: inline-block;
diff --git a/packages/kbn-grouping/src/components/types.ts b/packages/kbn-grouping/src/components/types.ts
index 43a9af13372f7..98822b7c80bc9 100644
--- a/packages/kbn-grouping/src/components/types.ts
+++ b/packages/kbn-grouping/src/components/types.ts
@@ -62,16 +62,16 @@ export interface BadgeMetric {
   width?: number;
 }
 
-export interface StatRenderer {
+export interface GroupStatsItem {
   title: string;
-  renderer?: JSX.Element;
+  component?: JSX.Element;
   badge?: BadgeMetric;
 }
 
-export type GroupStatsRenderer<T> = (
+export type GetGroupStats<T> = (
   selectedGroup: string,
   fieldBucket: RawBucket<T>
-) => StatRenderer[];
+) => GroupStatsItem[];
 
 export type GroupPanelRenderer<T> = (
   selectedGroup: string,
diff --git a/packages/kbn-grouping/src/hooks/use_grouping.tsx b/packages/kbn-grouping/src/hooks/use_grouping.tsx
index af3ae458de285..284343a29d748 100644
--- a/packages/kbn-grouping/src/hooks/use_grouping.tsx
+++ b/packages/kbn-grouping/src/hooks/use_grouping.tsx
@@ -31,7 +31,7 @@ export interface UseGrouping<T> {
  */
 type StaticGroupingProps<T> = Pick<
   GroupingProps<T>,
-  'groupPanelRenderer' | 'groupStatsRenderer' | 'onGroupToggle' | 'unit' | 'groupsUnit'
+  'groupPanelRenderer' | 'getGroupStats' | 'onGroupToggle' | 'unit' | 'groupsUnit'
 >;
 
 /** Type for dynamic grouping component props where T is the consumer `GroupingAggregation`
diff --git a/packages/kbn-health-gateway-server/src/kibana/handlers/status.ts b/packages/kbn-health-gateway-server/src/kibana/handlers/status.ts
index 51da98dfed0f7..0ce8ccbdd3cf7 100644
--- a/packages/kbn-health-gateway-server/src/kibana/handlers/status.ts
+++ b/packages/kbn-health-gateway-server/src/kibana/handlers/status.ts
@@ -57,7 +57,7 @@ export class StatusHandler {
     const body = await this.poll();
     const code = StatusHandler.STATUS_CODE[body.status];
 
-    this.logger.debug(`Returning ${code} response with body: ${JSON.stringify(body)}`);
+    this.logger.debug(() => `Returning ${code} response with body: ${JSON.stringify(body)}`);
 
     return toolkit.response(body).type('application/json').code(code);
   }
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/gauge.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/gauge.test.ts
index 322bfa2fb2da1..6403ec630a66f 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/gauge.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/gauge.test.ts
@@ -98,6 +98,7 @@ test('generates gauge chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count()",
                 },
+                "timeField": undefined,
               },
             },
           },
@@ -189,6 +190,7 @@ test('generates gauge chart config with goal and max', async () => {
                 "query": Object {
                   "esql": "from test | count=count() | eval max=1000 | eval goal=500",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/heatmap.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/heatmap.test.ts
index 9c3c2fa2bdb6b..a6ba22ea8de1a 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/heatmap.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/heatmap.test.ts
@@ -116,6 +116,7 @@ test('generates metric chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by @timestamp, category",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/metric.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/metric.test.ts
index 052c89a0c56c7..05d89bb95cd84 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/metric.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/metric.test.ts
@@ -108,6 +108,7 @@ test('generates metric chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count()",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/partition.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/partition.test.ts
index 120b3069552d8..2511601b5bab5 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/partition.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/partition.test.ts
@@ -115,6 +115,7 @@ test('generates metric chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by @timestamp, category",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/region_map.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/region_map.test.ts
index dc1f37a393fd2..e3a50cc3a07a1 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/region_map.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/region_map.test.ts
@@ -107,6 +107,7 @@ test('generates region map chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by category",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/table.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/table.test.ts
index 90c07d4af46b7..3ddbaa79357e1 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/table.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/table.test.ts
@@ -107,6 +107,7 @@ test('generates table config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by category",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.test.ts
index d7db572bb286a..ff8366f9eeda1 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.test.ts
@@ -107,6 +107,7 @@ test('generates tag cloud chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by category",
                 },
+                "timeField": undefined,
               },
             },
           },
@@ -123,8 +124,8 @@ test('generates tag cloud chart config', async () => {
           "minFontSize": 12,
           "orientation": "single",
           "showLabel": true,
-          "tagAccessor": "category",
-          "valueAccessor": "count",
+          "tagAccessor": "metric_formula_accessor_breakdown",
+          "valueAccessor": "metric_formula_accessor",
         },
       },
       "title": "test",
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.ts
index 551dcfe973d3a..55ce8f1fe1a02 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/tag_cloud.ts
@@ -18,7 +18,6 @@ import {
   buildDatasourceStates,
   buildReferences,
   getAdhocDataviews,
-  isFormulaDataset,
   mapToFormula,
 } from '../utils';
 import { getBreakdownColumn, getFormulaColumn, getValueColumn } from '../columns';
@@ -31,18 +30,17 @@ function getAccessorName(type: 'breakdown') {
 
 function buildVisualizationState(config: LensTagCloudConfig): TagcloudState {
   const layer = config;
-  const isFormula = isFormulaDataset(config.dataset) || isFormulaDataset(layer.dataset);
 
   return {
     layerId: DEFAULT_LAYER_ID,
-    valueAccessor: !isFormula ? layer.value : ACCESSOR,
+    valueAccessor: ACCESSOR,
     maxFontSize: 72,
     minFontSize: 12,
     orientation: 'single',
     showLabel: true,
     ...(layer.breakdown
       ? {
-          tagAccessor: !isFormula ? (layer.breakdown as string) : getAccessorName('breakdown'),
+          tagAccessor: getAccessorName('breakdown'),
         }
       : {}),
   };
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/charts/xy.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/charts/xy.test.ts
index 562c5b0948a48..4af00e3d163bd 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/charts/xy.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/charts/xy.test.ts
@@ -125,6 +125,7 @@ test('generates xy chart config', async () => {
                 "query": Object {
                   "esql": "from test | count=count() by @timestamp",
                 },
+                "timeField": undefined,
               },
             },
           },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/config_builder.ts b/packages/kbn-lens-embeddable-utils/config_builder/config_builder.ts
index 4a14e20b7aea4..f60a758f49e9e 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/config_builder.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/config_builder.ts
@@ -49,7 +49,7 @@ export class LensConfigBuilder {
   async build(
     config: LensConfig,
     options: LensConfigOptions = {}
-  ): Promise<LensAttributes | LensEmbeddableInput | undefined> {
+  ): Promise<LensAttributes | LensEmbeddableInput> {
     const { chartType } = config;
     const chartConfig = await this.charts[chartType](config as any, {
       formulaAPI: this.formulaAPI,
@@ -74,6 +74,6 @@ export class LensConfigBuilder {
       } as LensEmbeddableInput;
     }
 
-    return chartState;
+    return chartState as LensAttributes;
   }
 }
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/types.ts b/packages/kbn-lens-embeddable-utils/config_builder/types.ts
index 19683adb4d423..b246d79c6a0b6 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/types.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/types.ts
@@ -7,7 +7,7 @@
  */
 
 import type { FormulaPublicApi, TypedLensByValueInput } from '@kbn/lens-plugin/public';
-import type { Filter, Query } from '@kbn/es-query';
+import type { AggregateQuery, Filter, Query } from '@kbn/es-query';
 import type { Datatable } from '@kbn/expressions-plugin/common';
 import { DataViewsCommon } from './config_builder';
 
@@ -95,7 +95,7 @@ export interface LensConfigOptions {
   /** optional time range override */
   timeRange?: TimeRange;
   filters?: Filter[];
-  query?: Query;
+  query?: Query | AggregateQuery;
 }
 
 export interface LensAxisTitleVisibilityConfig {
@@ -208,9 +208,9 @@ export type LensRegionMapConfig = Identity<
 export interface LensMosaicConfigBase {
   chartType: 'mosaic';
   /** field name to apply breakdown based on field type or full breakdown configuration */
-  breakdown: LensBreakdownConfig;
+  breakdown: LensBreakdownConfig[];
   /** field name to apply breakdown based on field type or full breakdown configuration */
-  xAxis: LensBreakdownConfig;
+  xAxis?: LensBreakdownConfig;
 }
 
 export type LensMosaicConfig = Identity<LensBaseConfig & LensBaseLayer & LensMosaicConfigBase>;
@@ -228,7 +228,7 @@ export type LensTableConfig = Identity<LensBaseConfig & LensBaseLayer & LensTabl
 export interface LensHeatmapConfigBase {
   chartType: 'heatmap';
   /** field name to apply breakdown based on field type or full breakdown configuration */
-  breakdown: LensBreakdownConfig;
+  breakdown?: LensBreakdownConfig;
   xAxis: LensBreakdownConfig;
   legend?: Identity<LensLegendConfig>;
 }
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/utils.test.ts b/packages/kbn-lens-embeddable-utils/config_builder/utils.test.ts
index d7559b7121ae8..480be9c800b56 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/utils.test.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/utils.test.ts
@@ -208,6 +208,7 @@ describe('buildDatasourceStates', () => {
               "query": Object {
                 "esql": "from test | limit 10",
               },
+              "timeField": undefined,
             },
           },
         },
diff --git a/packages/kbn-lens-embeddable-utils/config_builder/utils.ts b/packages/kbn-lens-embeddable-utils/config_builder/utils.ts
index ffd0a40612a7a..ca4114b4df4fe 100644
--- a/packages/kbn-lens-embeddable-utils/config_builder/utils.ts
+++ b/packages/kbn-lens-embeddable-utils/config_builder/utils.ts
@@ -200,6 +200,7 @@ function buildDatasourceStatesLayer(
     const newLayer = {
       index: dataView!.id!,
       query: { esql: (dataset as LensESQLDataset).esql } as AggregateQuery,
+      timeField: dataView!.timeFieldName,
       columns,
       allColumns: columns,
     };
diff --git a/packages/kbn-logging-mocks/src/logger.mock.ts b/packages/kbn-logging-mocks/src/logger.mock.ts
index 90436fb4516d2..f63f0fa053572 100644
--- a/packages/kbn-logging-mocks/src/logger.mock.ts
+++ b/packages/kbn-logging-mocks/src/logger.mock.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { Logger } from '@kbn/logging';
+import type { Logger, LogMeta, LogMessageSource } from '@kbn/logging';
 
 export type MockedLogger = jest.Mocked<Logger> & { context: string[] };
 
@@ -43,15 +43,39 @@ const clearLoggerMock = (logger: MockedLogger) => {
   logger.log.mockClear();
 };
 
+const convertMessageSource = (
+  value: [message: LogMessageSource, meta?: LogMeta | undefined]
+): [string] | [string, LogMeta | undefined] => {
+  const message = typeof value[0] === 'function' ? value[0]() : value[0];
+  const meta = value[1];
+  if (meta) {
+    return [message, meta];
+  } else {
+    return [message];
+  }
+};
+
+const convertMessageSourceOrError = (
+  value: [message: LogMessageSource | Error, meta?: LogMeta | undefined]
+): [string | Error] | [string | Error, LogMeta | undefined] => {
+  const message = typeof value[0] === 'function' ? value[0]() : value[0];
+  const meta = value[1];
+  if (meta) {
+    return [message, meta];
+  } else {
+    return [message];
+  }
+};
+
 const collectLoggerMock = (logger: MockedLogger) => {
   return {
-    debug: logger.debug.mock.calls,
-    error: logger.error.mock.calls,
-    fatal: logger.fatal.mock.calls,
-    info: logger.info.mock.calls,
+    debug: logger.debug.mock.calls.map(convertMessageSource),
+    error: logger.error.mock.calls.map(convertMessageSourceOrError),
+    fatal: logger.fatal.mock.calls.map(convertMessageSourceOrError),
+    info: logger.info.mock.calls.map(convertMessageSource),
     log: logger.log.mock.calls,
-    trace: logger.trace.mock.calls,
-    warn: logger.warn.mock.calls,
+    trace: logger.trace.mock.calls.map(convertMessageSource),
+    warn: logger.warn.mock.calls.map(convertMessageSourceOrError),
   };
 };
 
diff --git a/packages/kbn-logging/index.ts b/packages/kbn-logging/index.ts
index b6915b73a26bc..a7082d9697232 100644
--- a/packages/kbn-logging/index.ts
+++ b/packages/kbn-logging/index.ts
@@ -9,7 +9,7 @@
 export type { LogLevelId } from './src/log_level';
 export { LogLevel } from './src/log_level';
 export type { LogRecord } from './src/log_record';
-export type { Logger } from './src/logger';
+export type { Logger, LogMessageSource } from './src/logger';
 export type { LogMeta } from './src/log_meta';
 export type { LoggerFactory } from './src/logger_factory';
 export type { Layout } from './src/layout';
diff --git a/packages/kbn-logging/src/logger.ts b/packages/kbn-logging/src/logger.ts
index bd31d4c42f805..45f215abaef63 100644
--- a/packages/kbn-logging/src/logger.ts
+++ b/packages/kbn-logging/src/logger.ts
@@ -10,6 +10,11 @@ import type { LogMeta } from './log_meta';
 import type { LogRecord } from './log_record';
 import type { LogLevelId } from './log_level';
 
+/**
+ * @public
+ */
+export type LogMessageSource = string | (() => string);
+
 /**
  * Logger exposes all the necessary methods to log any type of information and
  * this is the interface used by the logging consumers including plugins.
@@ -20,47 +25,74 @@ export interface Logger {
   /**
    * Log messages at the most detailed log level
    *
-   * @param message - The log message
-   * @param meta -
+   * @param message - The log message, or a function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  trace<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void;
+  trace<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void;
 
   /**
    * Log messages useful for debugging and interactive investigation
-   * @param message - The log message
-   * @param meta -
+   *
+   * @param message - The log message, or a function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  debug<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void;
+  debug<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void;
 
   /**
    * Logs messages related to general application flow
-   * @param message - The log message
-   * @param meta -
+   *
+   * @param message - The log message, or a function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  info<Meta extends LogMeta = LogMeta>(message: string, meta?: Meta): void;
+  info<Meta extends LogMeta = LogMeta>(message: LogMessageSource, meta?: Meta): void;
 
   /**
    * Logs abnormal or unexpected errors or messages
-   * @param errorOrMessage - An Error object or message string to log
-   * @param meta -
+   *
+   * @param errorOrMessage - An Error object, message string, or function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  warn<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void;
+  warn<Meta extends LogMeta = LogMeta>(errorOrMessage: LogMessageSource | Error, meta?: Meta): void;
 
   /**
    * Logs abnormal or unexpected errors or messages that caused a failure in the application flow
    *
-   * @param errorOrMessage - An Error object or message string to log
-   * @param meta -
+   * @param errorOrMessage - An Error object, message string, or function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  error<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void;
+  error<Meta extends LogMeta = LogMeta>(
+    errorOrMessage: LogMessageSource | Error,
+    meta?: Meta
+  ): void;
 
   /**
    * Logs abnormal or unexpected errors or messages that caused an unrecoverable failure
    *
-   * @param errorOrMessage - An Error object or message string to log
-   * @param meta -
+   * @param errorOrMessage - An Error object, message string, or function returning the log message
+   * @param meta - The ECS meta to attach to the log entry
+   *
+   * @remark If a function is provided for the message, it will only be evaluated if the logger's level is high enough for this level.
+   *         This can be used as an alternative to {@link Logger.isLevelEnabled} to wrap expensive logging operations into a conditional blocks.
    */
-  fatal<Meta extends LogMeta = LogMeta>(errorOrMessage: string | Error, meta?: Meta): void;
+  fatal<Meta extends LogMeta = LogMeta>(
+    errorOrMessage: LogMessageSource | Error,
+    meta?: Meta
+  ): void;
 
   /** @internal */
   log(record: LogRecord): void;
diff --git a/packages/kbn-monaco/src/esql/language.ts b/packages/kbn-monaco/src/esql/language.ts
index 4e486a5c24188..7c49da41a996e 100644
--- a/packages/kbn-monaco/src/esql/language.ts
+++ b/packages/kbn-monaco/src/esql/language.ts
@@ -39,11 +39,13 @@ export const ESQLLang: CustomLangModuleType<ESQLCallbacks> = {
       { open: '(', close: ')' },
       { open: '[', close: ']' },
       { open: `'`, close: `'` },
+      { open: '"""', close: '"""' },
       { open: '"', close: '"' },
     ],
     surroundingPairs: [
       { open: '(', close: ')' },
       { open: `'`, close: `'` },
+      { open: '"""', close: '"""' },
       { open: '"', close: '"' },
     ],
   },
diff --git a/packages/kbn-openapi-generator/src/parser/lib/get_circular_refs.ts b/packages/kbn-openapi-generator/src/parser/lib/get_circular_refs.ts
index da9649d5f0c6d..5c1e71170d8c5 100644
--- a/packages/kbn-openapi-generator/src/parser/lib/get_circular_refs.ts
+++ b/packages/kbn-openapi-generator/src/parser/lib/get_circular_refs.ts
@@ -9,7 +9,8 @@
 import type { OpenApiDocument } from '../openapi_types';
 import type { PlainObject } from './helpers/plain_object';
 import { extractByJsonPointer } from './helpers/extract_by_json_pointer';
-import { findRefs } from './find_refs';
+import { findLocalRefs } from './helpers/find_local_refs';
+import { parseRef } from './helpers/parse_ref';
 
 /**
  * Extracts circular references from a provided document.
@@ -19,7 +20,7 @@ export function getCircularRefs(document: OpenApiDocument): Set<string> {
   const localRefs = findLocalRefs(document);
   const circularRefs = new Set<string>();
   const resolveLocalRef = (localRef: string): PlainObject =>
-    extractByJsonPointer(document, extractJsonPointer(localRef));
+    extractByJsonPointer(document, parseRef(localRef).pointer);
 
   // In general references represent a disconnected graph. To find
   // all references cycles we need to check each reference.
@@ -80,26 +81,3 @@ function findCycleHeadRef(
 
   return result;
 }
-
-/**
- * Finds local references
- */
-function findLocalRefs(obj: unknown): string[] {
-  return findRefs(obj).filter((ref) => isLocalRef(ref));
-}
-
-/**
- * Checks whether the provided ref is local.
- * Local references start with `#/`
- */
-function isLocalRef(ref: string): boolean {
-  return ref.startsWith('#/');
-}
-
-/**
- * Extracts a JSON Pointer from a local reference
- * by getting rid of the leading slash
- */
-function extractJsonPointer(ref: string): string {
-  return ref.substring(1);
-}
diff --git a/packages/kbn-openapi-generator/src/parser/lib/get_components.ts b/packages/kbn-openapi-generator/src/parser/lib/get_components.ts
index 6e98793de1afb..ff2f77aced821 100644
--- a/packages/kbn-openapi-generator/src/parser/lib/get_components.ts
+++ b/packages/kbn-openapi-generator/src/parser/lib/get_components.ts
@@ -6,12 +6,124 @@
  * Side Public License, v 1.
  */
 
-import type { OpenApiDocument } from '../openapi_types';
+import type {
+  OpenApiDocument,
+  OpenApiComponentsObject,
+  OpenApiSchemasObject,
+} from '../openapi_types';
+import { extractByJsonPointer } from './helpers/extract_by_json_pointer';
+import { findLocalRefs } from './helpers/find_local_refs';
+import { parseRef } from './helpers/parse_ref';
 
-export function getComponents(parsedSchema: OpenApiDocument) {
-  if (parsedSchema.components?.['x-codegen-enabled'] === false) {
+/**
+ * Returns document components.
+ *
+ * It performs topological sorting of component schemas to enable arbitrary
+ * schemas definition order.
+ */
+export function getComponents(document: OpenApiDocument): OpenApiComponentsObject | undefined {
+  if (document.components?.['x-codegen-enabled'] === false) {
     return undefined;
   }
 
-  return parsedSchema.components;
+  if (!document.components) {
+    return;
+  }
+
+  const refsAdjList = buildLocalRefsAdjacencyList(document.components);
+  const sortedSchemaRefs = sortTopologically(
+    refsAdjList,
+    Array.from(Object.keys(document.components?.schemas ?? {}))
+  );
+  // Starting from ES2020 functions returning or traversing object properties
+  // make it in ascending chronological order of property creation. It makes
+  // it possible to assemble schemas object which will be traversed in
+  // the right order preserving topological sorting.
+  const sortedSchemas: OpenApiSchemasObject = {};
+
+  for (const schemaName of sortedSchemaRefs) {
+    sortedSchemas[schemaName] = extractByJsonPointer(document, `/components/schemas/${schemaName}`);
+  }
+
+  return {
+    ...document.components,
+    schemas: sortedSchemas,
+  };
+}
+
+/**
+ * References adjacency list with keys as schema name and value
+ * as a set of schemas the key references to.
+ */
+type ReferencesAdjacencyList = Map<string, Set<string>>;
+
+/**
+ * Builds a references adjacency list. An adjacency list allow to apply
+ * any graph algorithms working with adjacency lists.
+ * See https://en.wikipedia.org/wiki/Adjacency_list
+ */
+function buildLocalRefsAdjacencyList(
+  componentsObj: OpenApiComponentsObject
+): ReferencesAdjacencyList {
+  if (!componentsObj.schemas) {
+    return new Map();
+  }
+
+  const adjacencyList: ReferencesAdjacencyList = new Map();
+
+  for (const [schemaName, schema] of Object.entries(componentsObj.schemas)) {
+    const dependencies = adjacencyList.get(schemaName);
+    const dependencySchemaNames = findLocalRefs(schema).map((ref) => parseRef(ref).schemaName);
+
+    if (!dependencies) {
+      adjacencyList.set(schemaName, new Set(dependencySchemaNames));
+    } else {
+      for (const dependencySchemaName of dependencySchemaNames) {
+        dependencies.add(dependencySchemaName);
+      }
+    }
+  }
+
+  return adjacencyList;
+}
+
+/**
+ * Sorts dependent references in topological order. Local dependencies are placed
+ * before dependent schemas. External references aren't involved.
+ * See https://en.wikipedia.org/wiki/Topological_sorting
+ *
+ * It uses Depth First Search (DFS) variant of topological sort to preserve schemas
+ * definition order in OpenAPI specification document. Topological sorting doesn't
+ * define any order for non dependent schemas. Preserving original ordering looks
+ * like a good option to minimize diffs and have higher result predictability.
+ *
+ * @param adjacencyList An adjacency list, e.g. built via buildLocalRefsAdjacencyList
+ * @param originalOrder A string array having schema names sorted in OpenAPI spec order
+ * @returns A string array sorting in topological way
+ */
+function sortTopologically(
+  adjacencyList: ReferencesAdjacencyList,
+  originalOrder: string[]
+): string[] {
+  const sortedSchemas: string[] = [];
+  const visited = new Set<string>();
+  const addToSorted = (schemaName: string): void => {
+    if (visited.has(schemaName)) {
+      return;
+    }
+
+    visited.add(schemaName);
+
+    for (const dependencySchemaName of adjacencyList.get(schemaName) ?? []) {
+      addToSorted(dependencySchemaName);
+    }
+
+    sortedSchemas.push(schemaName);
+  };
+
+  for (const schemaName of originalOrder) {
+    addToSorted(schemaName);
+  }
+
+  return sortedSchemas;
 }
diff --git a/packages/kbn-openapi-generator/src/parser/lib/get_imports_map.ts b/packages/kbn-openapi-generator/src/parser/lib/get_imports_map.ts
index 634ac82aaae8c..d843bef8456cc 100644
--- a/packages/kbn-openapi-generator/src/parser/lib/get_imports_map.ts
+++ b/packages/kbn-openapi-generator/src/parser/lib/get_imports_map.ts
@@ -8,7 +8,7 @@
 
 import { uniq } from 'lodash';
 import type { OpenApiDocument } from '../openapi_types';
-import { findRefs } from './find_refs';
+import { findRefs } from './helpers/find_refs';
 
 export interface ImportsMap {
   [importPath: string]: string[];
diff --git a/src/plugins/links/common/embeddable/types.ts b/packages/kbn-openapi-generator/src/parser/lib/helpers/find_local_refs.ts
similarity index 60%
rename from src/plugins/links/common/embeddable/types.ts
rename to packages/kbn-openapi-generator/src/parser/lib/helpers/find_local_refs.ts
index b916d34f70840..8dc9c5a5d7b1e 100644
--- a/src/plugins/links/common/embeddable/types.ts
+++ b/packages/kbn-openapi-generator/src/parser/lib/helpers/find_local_refs.ts
@@ -6,9 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
-import { SerializableRecord } from '@kbn/utility-types';
+import { findRefs } from './find_refs';
+import { isLocalRef } from './is_local_ref';
 
-export type LinksPersistableState = EmbeddableStateWithType & {
-  attributes: SerializableRecord;
-};
+/**
+ * Finds local references
+ */
+export function findLocalRefs(obj: unknown): string[] {
+  return findRefs(obj).filter((ref) => isLocalRef(ref));
+}
diff --git a/packages/kbn-openapi-generator/src/parser/lib/find_refs.ts b/packages/kbn-openapi-generator/src/parser/lib/helpers/find_refs.ts
similarity index 87%
rename from packages/kbn-openapi-generator/src/parser/lib/find_refs.ts
rename to packages/kbn-openapi-generator/src/parser/lib/helpers/find_refs.ts
index 1829c0a5e7ee2..49965fde840ab 100644
--- a/packages/kbn-openapi-generator/src/parser/lib/find_refs.ts
+++ b/packages/kbn-openapi-generator/src/parser/lib/helpers/find_refs.ts
@@ -6,8 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { hasRef } from './helpers/has_ref';
-import { traverseObject } from './helpers/traverse_object';
+import { hasRef } from './has_ref';
+import { traverseObject } from './traverse_object';
 
 /**
  * Traverse the OpenAPI document recursively and find all references
diff --git a/packages/kbn-openapi-generator/src/parser/lib/helpers/is_local_ref.ts b/packages/kbn-openapi-generator/src/parser/lib/helpers/is_local_ref.ts
new file mode 100644
index 0000000000000..40b1973330236
--- /dev/null
+++ b/packages/kbn-openapi-generator/src/parser/lib/helpers/is_local_ref.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+/**
+ * Checks whether the provided ref is local.
+ * Local references start with `#/`
+ */
+export function isLocalRef(ref: string): boolean {
+  return ref.startsWith('#/');
+}
diff --git a/packages/kbn-openapi-generator/src/parser/lib/helpers/parse_ref.ts b/packages/kbn-openapi-generator/src/parser/lib/helpers/parse_ref.ts
new file mode 100644
index 0000000000000..75ee17951cba2
--- /dev/null
+++ b/packages/kbn-openapi-generator/src/parser/lib/helpers/parse_ref.ts
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+interface ParsedRef {
+  uri: string;
+  pointer: string;
+  schemaName: string;
+}
+
+/**
+ * Parses an OpenAPI reference a.k.a JSON reference
+ * See https://datatracker.ietf.org/doc/html/draft-pbryan-zyp-json-ref-03
+ *
+ * JSON reference consists of an optional uri and required JSON pointer
+ * looking like `uri#pointer`. While RFC implies URI usage mostly relative
+ * paths are used.
+ *
+ * An example looks like
+ *
+ * ```
+ * ../path/to/my/file.schema.yaml#/components/schemas/MySchema
+ * ```
+ *
+ *  This function returns `uri`, JSON `pointer` and
+ * `schemaName` which is the last part of the JSON pointer. In the example
+ * above `schemaName` is `MySchema`.
+ */
+export function parseRef(ref: string): ParsedRef {
+  if (!ref.includes('#')) {
+    throw new Error(`Reference parse error: provided ref is not valid "${ref}"`);
+  }
+
+  const [uri, pointer] = ref.split('#');
+  const schemaName = pointer.split('/').at(-1)!;
+
+  return {
+    uri,
+    pointer,
+    schemaName,
+  };
+}
diff --git a/packages/kbn-openapi-generator/src/parser/openapi_types.ts b/packages/kbn-openapi-generator/src/parser/openapi_types.ts
index c8b1e4f715345..669d1d9b68764 100644
--- a/packages/kbn-openapi-generator/src/parser/openapi_types.ts
+++ b/packages/kbn-openapi-generator/src/parser/openapi_types.ts
@@ -16,6 +16,11 @@ interface AdditionalProperties {
 }
 
 export type OpenApiDocument = OpenAPIV3.Document<AdditionalProperties>;
+export type OpenApiComponentsObject = OpenAPIV3.ComponentsObject;
+export type OpenApiSchemasObject = Record<
+  string,
+  OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject
+>;
 
 // Override the OpenAPI types to add the x-codegen-enabled property to the
 // components object.
diff --git a/packages/kbn-openapi-generator/src/template_service/register_helpers.ts b/packages/kbn-openapi-generator/src/template_service/register_helpers.ts
index 55f2d9d60f37a..f02f295954465 100644
--- a/packages/kbn-openapi-generator/src/template_service/register_helpers.ts
+++ b/packages/kbn-openapi-generator/src/template_service/register_helpers.ts
@@ -71,7 +71,7 @@ export function registerHelpers(handlebarsInstance: typeof Handlebars) {
   });
 
   /**
-   * Checks whether provided schema is circular or a part of the circular chain.
+   * Checks whether provided schema is circular or a part of a circular chain.
    *
    * It's expected that `context.circularRefs` has been filled by the parser.
    */
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index 00bcbf6481939..3b7828dc7f67d 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -42,6 +42,7 @@ pageLoadAssetSize:
   embeddableEnhanced: 22107
   enterpriseSearch: 66810
   entityManager: 17175
+  esql: 37000
   esqlDataGrid: 24582
   esUiShared: 326654
   eventAnnotation: 30000
@@ -156,7 +157,6 @@ pageLoadAssetSize:
   synthetics: 40958
   telemetry: 51957
   telemetryManagementSection: 38586
-  textBasedLanguages: 37000
   threatIntelligence: 44299
   timelines: 327300
   transform: 41007
diff --git a/packages/kbn-recently-accessed/README.md b/packages/kbn-recently-accessed/README.md
new file mode 100644
index 0000000000000..a7579822c9123
--- /dev/null
+++ b/packages/kbn-recently-accessed/README.md
@@ -0,0 +1,4 @@
+# @kbn/recently-accessed
+
+The `RecentlyAccessedService` uses browser local storage to manage records of recently accessed objects.
+This can be used to make recent items easier for users to find in listing UIs.
diff --git a/packages/kbn-recently-accessed/index.ts b/packages/kbn-recently-accessed/index.ts
new file mode 100644
index 0000000000000..3b23a548ce946
--- /dev/null
+++ b/packages/kbn-recently-accessed/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+export {
+  type RecentlyAccessed,
+  type RecentlyAccessedHistoryItem,
+  RecentlyAccessedService,
+} from './src';
diff --git a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/index.ts b/packages/kbn-recently-accessed/jest.config.js
similarity index 74%
rename from packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/index.ts
rename to packages/kbn-recently-accessed/jest.config.js
index 4f4cae09d5d3a..1492f7da1fcfe 100644
--- a/packages/kbn-alerts-ui-shared/src/alerts_search_bar/apis/index.ts
+++ b/packages/kbn-recently-accessed/jest.config.js
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
-export * from './fetch_aad_fields';
-export * from './fetch_alert_fields';
-export * from './fetch_alert_index_names';
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../..',
+  roots: ['<rootDir>/packages/kbn-recently-accessed'],
+};
diff --git a/packages/kbn-recently-accessed/kibana.jsonc b/packages/kbn-recently-accessed/kibana.jsonc
new file mode 100644
index 0000000000000..0ec9917dc6b77
--- /dev/null
+++ b/packages/kbn-recently-accessed/kibana.jsonc
@@ -0,0 +1,5 @@
+{
+  "type": "shared-common",
+  "id": "@kbn/recently-accessed",
+  "owner": "@elastic/appex-sharedux"
+}
diff --git a/packages/kbn-recently-accessed/package.json b/packages/kbn-recently-accessed/package.json
new file mode 100644
index 0000000000000..825ccbd8cfdaf
--- /dev/null
+++ b/packages/kbn-recently-accessed/package.json
@@ -0,0 +1,6 @@
+{
+  "name": "@kbn/recently-accessed",
+  "private": true,
+  "version": "1.0.0",
+  "license": "SSPL-1.0 OR Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/create_log_key.test.ts b/packages/kbn-recently-accessed/src/create_log_key.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/create_log_key.test.ts
rename to packages/kbn-recently-accessed/src/create_log_key.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/create_log_key.ts b/packages/kbn-recently-accessed/src/create_log_key.ts
similarity index 88%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/create_log_key.ts
rename to packages/kbn-recently-accessed/src/create_log_key.ts
index a9b0c5cdcf7d4..5a5e8e7cc7ad0 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/create_log_key.ts
+++ b/packages/kbn-recently-accessed/src/create_log_key.ts
@@ -8,7 +8,7 @@
 
 import { Sha256 } from '@kbn/crypto-browser';
 
-export async function createLogKey(type: string, optionalIdentifier?: string) {
+export function createLogKey(type: string, optionalIdentifier?: string) {
   const baseKey = `kibana.history.${type}`;
 
   if (!optionalIdentifier) {
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/index.ts b/packages/kbn-recently-accessed/src/index.ts
similarity index 84%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/index.ts
rename to packages/kbn-recently-accessed/src/index.ts
index 2256f60061b87..389b7eca5c1b2 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/index.ts
+++ b/packages/kbn-recently-accessed/src/index.ts
@@ -7,3 +7,4 @@
  */
 
 export { RecentlyAccessedService } from './recently_accessed_service';
+export type { RecentlyAccessed, RecentlyAccessedHistoryItem } from './types';
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.test.ts b/packages/kbn-recently-accessed/src/persisted_log.test.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.test.ts
rename to packages/kbn-recently-accessed/src/persisted_log.test.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts b/packages/kbn-recently-accessed/src/persisted_log.ts
similarity index 100%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/persisted_log.ts
rename to packages/kbn-recently-accessed/src/persisted_log.ts
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts b/packages/kbn-recently-accessed/src/recently_accessed_service.test.ts
similarity index 98%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts
rename to packages/kbn-recently-accessed/src/recently_accessed_service.test.ts
index e394f81fab11d..0260949295634 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.test.ts
+++ b/packages/kbn-recently-accessed/src/recently_accessed_service.test.ts
@@ -54,7 +54,10 @@ describe('RecentlyAccessed#start()', () => {
 
   const getStart = async () => {
     const http = httpServiceMock.createStartContract();
-    const recentlyAccessed = await new RecentlyAccessedService().start({ http });
+    const recentlyAccessed = await new RecentlyAccessedService().start({
+      http,
+      key: 'recentlyAccessed',
+    });
     return { http, recentlyAccessed };
   };
 
diff --git a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.ts b/packages/kbn-recently-accessed/src/recently_accessed_service.ts
similarity index 68%
rename from packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.ts
rename to packages/kbn-recently-accessed/src/recently_accessed_service.ts
index ec9a04ab5551c..4df97b556e5b6 100644
--- a/packages/core/chrome/core-chrome-browser-internal/src/recently_accessed/recently_accessed_service.ts
+++ b/packages/kbn-recently-accessed/src/recently_accessed_service.ts
@@ -6,23 +6,20 @@
  * Side Public License, v 1.
  */
 
-import type { InternalHttpStart } from '@kbn/core-http-browser-internal';
-import type {
-  ChromeRecentlyAccessed,
-  ChromeRecentlyAccessedHistoryItem,
-} from '@kbn/core-chrome-browser';
+import type { HttpStart } from '@kbn/core-http-browser';
+import type { RecentlyAccessed, RecentlyAccessedHistoryItem } from './types';
 import { PersistedLog } from './persisted_log';
 import { createLogKey } from './create_log_key';
 
 interface StartDeps {
-  http: InternalHttpStart;
+  key: string;
+  http: Pick<HttpStart, 'basePath'>;
 }
 
-/** @internal */
 export class RecentlyAccessedService {
-  async start({ http }: StartDeps): Promise<ChromeRecentlyAccessed> {
-    const logKey = await createLogKey('recentlyAccessed', http.basePath.get());
-    const history = new PersistedLog<ChromeRecentlyAccessedHistoryItem>(logKey, {
+  start({ http, key }: StartDeps): RecentlyAccessed {
+    const logKey = createLogKey(key, http.basePath.get());
+    const history = new PersistedLog<RecentlyAccessedHistoryItem>(logKey, {
       maxLength: 20,
       isEqual: (oldItem, newItem) => oldItem.id === newItem.id,
     });
diff --git a/packages/kbn-recently-accessed/src/types.ts b/packages/kbn-recently-accessed/src/types.ts
new file mode 100644
index 0000000000000..9b729ffc9ed2c
--- /dev/null
+++ b/packages/kbn-recently-accessed/src/types.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Observable } from 'rxjs';
+
+/** @public */
+export interface RecentlyAccessedHistoryItem {
+  link: string;
+  label: string;
+  id: string;
+}
+
+/**
+ * {@link RecentlyAccessed | APIs} for recently accessed history.
+ * @public
+ */
+export interface RecentlyAccessed {
+  /**
+   * Adds a new item to the recently accessed history.
+   *
+   * @example
+   * ```js
+   * chrome.recentlyAccessed.add('/app/map/1234', 'Map 1234', '1234');
+   * ```
+   *
+   * @param link a relative URL to the resource (not including the {@link HttpStart.basePath | `http.basePath`})
+   * @param label the label to display in the UI
+   * @param id a unique string used to de-duplicate the recently accessed list.
+   */
+  add(link: string, label: string, id: string): void;
+
+  /**
+   * Gets an Array of the current recently accessed history.
+   *
+   * @example
+   * ```js
+   * recentlyAccessed.get().forEach(console.log);
+   * ```
+   */
+  get(): RecentlyAccessedHistoryItem[];
+
+  /**
+   * Gets an Observable of the array of recently accessed history.
+   *
+   * @example
+   * ```js
+   * recentlyAccessed.get$().subscribe(console.log);
+   * ```
+   */
+  get$(): Observable<RecentlyAccessedHistoryItem[]>;
+}
diff --git a/packages/kbn-recently-accessed/tsconfig.json b/packages/kbn-recently-accessed/tsconfig.json
new file mode 100644
index 0000000000000..f6029007a4376
--- /dev/null
+++ b/packages/kbn-recently-accessed/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "target/types",
+    "types": [
+      "jest",
+      "node"
+    ]
+  },
+  "include": [
+    "**/*.ts",
+  ],
+  "exclude": [
+    "target/**/*"
+  ],
+  "kbn_references": [
+    "@kbn/crypto-browser",
+    "@kbn/core-http-browser",
+    "@kbn/core-http-browser-mocks",
+  ]
+}
diff --git a/packages/kbn-shared-svg/index.ts b/packages/kbn-shared-svg/index.ts
index 215431706ab94..525b3f456fd7e 100644
--- a/packages/kbn-shared-svg/index.ts
+++ b/packages/kbn-shared-svg/index.ts
@@ -10,5 +10,12 @@ import noResultsIllustrationDark from './src/assets/no_results_dark.svg';
 import noResultsIllustrationLight from './src/assets/no_results_light.svg';
 import dashboardsLight from './src/assets/dashboards_light.svg';
 import dashboardsDark from './src/assets/dashboards_dark.svg';
+import apmLight from './src/assets/oblt_apm_light.svg';
 
-export { noResultsIllustrationDark, noResultsIllustrationLight, dashboardsLight, dashboardsDark };
+export {
+  noResultsIllustrationDark,
+  noResultsIllustrationLight,
+  dashboardsLight,
+  dashboardsDark,
+  apmLight,
+};
diff --git a/packages/kbn-shared-svg/src/assets/oblt_apm_light.svg b/packages/kbn-shared-svg/src/assets/oblt_apm_light.svg
new file mode 100644
index 0000000000000..b3cd9c0e9c344
--- /dev/null
+++ b/packages/kbn-shared-svg/src/assets/oblt_apm_light.svg
@@ -0,0 +1,14 @@
+<svg width="162" height="108" viewBox="0 0 162 108" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g clip-path="url(#clip0_80_104570)">
+<rect y="-0.290283" width="162" height="108.581" fill="url(#pattern0_80_104570)"/>
+</g>
+<defs>
+<pattern id="pattern0_80_104570" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_80_104570" transform="matrix(0.000900875 0 0 0.00134409 -0.00448991 0)"/>
+</pattern>
+<clipPath id="clip0_80_104570">
+<rect width="162" height="108" fill="white"/>
+</clipPath>
+<image id="image0_80_104570" width="1120" height="744" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAABGAAAALoCAYAAAA3PYMmAAAACXBIWXMAABYlAAAWJQFJUiTwAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAALFlSURBVHgB7P1PbFvZ2u/5PWtvynbdc44l9rHksmzXoYAAGQUlBd23by4CFJU0ggBJ2vIkQUaWkwCZJLA8ydTyMJlYHiZBYHkUIBlYvjcBAqS7zRqk+02jG1YhCDIJIFaVLZUlVSjJrrdkk3utrGdzU9qkNilSIiVK/n4OdERublIU/6i8f3zW84gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcPkYAALhk1jd3F8SYf0yOX38sA/brVqXorIwFRsrVESlP5fM7AgAAALQIBACGnB5Mv9/eeyFA16w4cUU5hbVKZUy/Ou3zy/beXCjhm1wQvgpM+PZqLaysb+09E/RkY/vTg/Wt3bWNrY9PBAAA4JIigAEw9JyRMePctABdmpzIL90eH52RE9qoVApXo3BNA5VfPlTm2u1nXJRV7bKgVTGCrjln5/2jWYiczQsAAMAlRQADYOj5A+nFz5/srABnpRoWxUlc/ZITM99ut7vj+ZL/VmrdblxYkFPS6hsNguQrMDl+fda6aObOxOiCAAAAXFIEMAAuhKkp+mqcllZlrG/tvfJfb76WA/sTi6KS///4NWfCoNJxV4metm4L69c/sd9+//hIK3BcLfxqnqs7E/lVAQAAAADgItvY3Jv3wYtLfb0RdLSxUSn8st1++VGa7re+tfvWf1XiBsCnlH6u/HNH/6OEVgV1WhIGAAAwzJiCBADnSKsbXC18Zozs7IfR40FN0Hn/YXfZBOZBepupRVO3buXLckk1Kkdu5S/e75gEZEU9bZ17ztKc5L0ShW+TpWElXbYkAAAAF0hOAGBINRqZJn02LqWoGiwERuacExmphj/6TcsyAM7YJSPhPX+yPtXHufJlDl9UcrCuLlxjVx+OPbRBMK8Lhat/2CWBuGow5z82akyloik3AAC4cAhgAAwtHe+bnLy01Xo+GFnxv+kDf0rCyJZkQLS/xsZGZSYKg4VQzKhE9qlccta5lybp43LRJOHYouCAieyKy4U6pnpMn9tur6fLwwIrZXrMAAAAAEAb77d2F/vRT2PYra1VxvSr3eXakFX7gGxsf3oguDT0OV3/7fK/vvtJ+/K826x0Xf2iPWP835C1d5u7VBEBAAAAGH66FCgOAU44jUUPgvRLztjG7x+faBPT99sXt4mpv//Pmhqybn18ImdMn3emJ/WfBoz6JWdM38v6fEof6O1s+PdXL6HIRaKvd4JPAADQLzThBb4S8TSXSOS7m/mVXq6nB1aBCd8mZ0/U+NIfpK3p98+5aCaryWwjnOlnA1q9zau18GB88EVsOJs06F1r3e4fx/ygmvVmSTeENU6Wb01cfyi4sN5v7i77//ivTk6MnqoqRIPZw2WCbnVyfHRGLhmtnAmMeeT/7vHvJQAAcGqBALj0tIoi58JXuSDUKoa1XqpRjAsOR746V5AeJY10C/r1TRT+kLWPD0realjSzyqZOKBwrhyfuYANZ/WxsNVgMeuya/tyttVEJtVHhf9qXHi3J0bnTxu+qFpOVuP3mHOrpmbvywWhE8E2u6zYqY7YRWNkXgAAAPqAJrzAJZcEIOk+E4WRaqihynI31w+sXXYmeCDGFJyTrhtfNugEo/dbu0+NmO///Bj9mLVPzUSPjZOdfld1mMjORqEUw0hK7fZJqkzqn+JH7vnkt6c/MD2N5P68kJoU29Qols46TPocRg+vVINdf3/Knz8O70Seg5HetehxL49RvKyqGj5xRgrGBMu3bvy159e5vs+clbFeK8wGSavXBtl4Nnm/TskFc/vm6Hy3+ya/Y8+vBwAAgCyU1AKX3Mbm3rw/sGzqgaJjj7+9cf219ECbxE5Nnd2yl7Pyy/beXM7JQT8M/2n38n4YPT7LJT5pyXKtQtNG51aDUJZrkf2x1wNqPQivjkj5vH6fs6SVDf75+2FyYrTrUCAVwBUa23pd4hU3ijbmmZ521j31B/iLMgTWtz6+lci+PO9Q8WvzrlKZDnwQ6MSN+eC5bHI+EMxf7pHvAACgOxSTA5fc/ki0YsU994eGO/plnXvea/iieg1f9CAknvKytbumTTrPowlvN4yLmn4v52R+pM3Sn0HTsExawxfRpNysfvv30ee9hi96AK79e3SJl38OLkUjUQ2U2jUC1sqGXsIXVY1CXYpSSG/L1aS3hrLG3GucDIz5hwwLZ1+a0DJ6OaXRgHiQjXV9+KKBbtG/b/V1NFerHX1PAwCArxMBDHDJ6Sf5d8ZHFybHR/P6dWdi9EzG3upBiIt7J8RLl+avfg7mZQg5Ex4JhvxB9PfJ5J83p5n88+vWx+L7rd233e6vn5hnbje9H8DVl565RpCgz8HSsIZg3dKDZw2UtGKlX79LawCnfABTll646DDQDNovdztr2ufl1ni+JIhpLyxrnVYDzTlnu+4D04vkdXnw2nTOvbzLcwAAABIEMAAGpZA+Y3KmIkMoCqOS/9Z0EK7LkJIGuEX9inuynIAztTHjum+YG5nsagV/f8rSo5wLCy2bxpLeP2dKK1aSPkSnZp0rJicLPVeptKEHx3qQ3DivS4h67bEzOZFf0ilb8aStG9fpFzIkkhD1WeO8Dzh305d/Nv1vZq2Bt38dzNRMdN+66KE2PBYAAIAEPWAADETcf+KwAmNncvx6XvpkY+vjEyd2Xur9FR6epL+CVlNYaxecv2/+0/CHgQSv/F/EMevkpVYJpUcvq7Ma/azLI/y3pqDkJCO0m0cEn/x2TiPdX6cfP3tjo1Kojvjg5QTj1I+jY9q1EfSgqhVSjX71vfBY0JN0s+x24+yPXGezMu9M+CL93n2/tbvo/+Fzzzn5iXAEAAAAwKXwbnN3yYcJrvHVryoI7ZOSvl3/1fP4aj2QT99G1j7rm5WF9D4a+pzFEh79Ge+29LHbrWgIdJrHLVlC5eLb0kaxXfzsXz5U5k665KqV3vfG4zeI5R4XyfvN3eV+vxcGYViXqb3/sLt4ksdvmB9rAADw9WEJEoCBCMU0LacJrelL75nUMpSGng8Y968dLjnS5UZZ++iyEmej+43zTtzi1XpzzVPTg9wkHFlrPeBt7tlzffY0FRl6feuimc+f7JT2A+m07/sPe3NXo3AtF4SvXC1c08BJeqTBjVYWaYNTPa333bjoYc0/jhN9GIesj5U2dNbGzumlJReBkcPlZYENit1cJ/59/fMQ9yHyv3e/grF2NKzwr/HKMIYWgbXL4lxZT/fSo4f+KwAAYJjkBAA60IPAa/sy1uvykUii1cDHMAeC4Hvph6D54EunOvW6NEj39we1pXiJVNU+bbfflytSulqTvrvyJVjyv0dRTye9TEo9XD1ZPuWKPjzakTB62mkJVjeTk+rLO+SZpPrVaODkD8R/7OUAVnvl+OsV9dpSC3febVZmb03kl+UEkoBlLr3c5Got98bFy9ri1bMLv23/Ufr2xl96nuh1HjTQ29iorJgrwT1Xs13d56v1xzNejua0TqsWFv37cWZQS+FqOVkNqz7kOOPFyfXXX/DGmHDx1o2/ZvbQSf7+TGn12lkuowMAAOgnKmAAtKUH+vqJuMuFWnGw9u4Uy0h8UNKXA+UvObtU/yTc7fiD06cnneqk1SFaGdLpYK5+oHtYydOuWqZX/tP8RamHLqVeP6FvnuQi842+GKdSDYuSMf46jIKun++kOqOY2jTWrtKjXsWy53RCVIdKlng8tIZ/8XU29PZd0/2pui+7MmCpaiV3kqqgNH2t6TjxbgKEpDKqtWlyYZCNlPX1rmO8z7xqZF+nUZmSVKs/Hrcr4QsAALjICGCAr0RqrLLrZrSyXp4c6DcUAnP8+N/Gz9FxwRqS+E0rPriY79f468ZBoi7RuT0+uiinMDVVryTQJRfa+yRrH+ts46BwR6rRsQeI3dCDSA2A9KuX6yXPWevjWDjtkhEfjhWytvcyuaoahUfCmiBn1lq36X3V4Ci+fTHT/mdn1lt8/hTd91/5xgF38r2U3ieU8MW7AfeWuVqNx6cX9XRSFVSUc5QLZCiniZ2GPre3Jq4/vEjhivai0j5Xg14WBgAALheWIOHS+Vf/qliQE/qnfyqVZcj5A85544KCM3blTg99NaJqsBCYgwoFHa381ocpU+2WM7hqMJexFKExynhZ2v4cGWv8HGPMwkUYy6sH8v4jeD25cuSyyC5JGI76g++fzvsAsVaTQpix3RwdOd0TG9iSfwyaqzu0yqhmuw6cQuvmtEQosRNJdH/yxtFKilxOyi61rCt+fDM0wrE0U4seujB4439OIdkUh4K61OlOH3rMZPFh0bQx6fsb9Lxk7CQOl8mlqor8c+Jq9ic5Je33YwJ51GsAiLo4RBR5Efg/kP7vqC6t5HEEAABdIYDBpVNz5oU0L4Xomg9vps4zhNFP88MR2WnX0+NgtLPR6oHwyfpvu48nv+3cXLXBaH+P5kBl7CT9R477BF4PhN9v7r70P6s8eWN06MIXXUZixc6ZSF42HrvPn6KZdvsnocvD42437pVTyz0SrSYJglK7XhancdijwxQONvqDch9ilOQUdMnJxmbloTPBI4mbGpuyiWxPFQk+bPshdXas3TIWfW371/mMDxHnNPi528PP0PvjD34ftozXHgucWZSjy3X6QpeLuSD8h3+gC/Hj4uyKnBENnGwYLPrH9h/+/VuWyD7tRwhoQnkgTnBC8fuwFjfyHut1WeLG7x+fOOsW/cmyyUWznfo3AQCAy+eMW+0Bg/fv/vuzenBWlBPIGXduAUz6H+bpxqMN+qlry4FnzO+b76Yp55Hr+wP3zyO2bUPPzJ/nr+MPzGcvah8GXTbgjLxonJ8cv97130ANWEaqUmhXadFy27rEaEoGIO6FEkrRuqAQiV2N/llKWdUiZ+GX7cpcYOs9WgITvkhdtON//7wMiI4I9ynCQe8YPQi+deN6VyHZNzb3IKrZfBCGa4MIyS6zevNnu+Czmx3/fC/1+/HT5TzG5u45Z3YkrP44zOGEvg+rgUx/dzPfUyCXHnvv/94/vX3zdMsoAQDAxUIFDDAknDtoMFrIqkxxJhzL+tQ6aVJ67AG4ViS839p9asQ8iRvYOvu4U3DTvH98B8tW7P07AwhfGtUjkbP5MAjfDurA2IkbO8idk5G23Yp7gRjzzN/XzMCr6bb9c6gHWn7bqn+cH/ZzeUwSfi23u1wPkl3kpn0YNOY/YX88qINYfc5yOpY7I8LygchAq0R0otD61scHcTVYfanU0+Ou865SmQ6i8I11bswExl/N6sHwPMtwumetW/DPbkGf8shWT70UKk2fH+efH/93cCyZoqXNmuezljA2wk59fwU5e/8kr3ENmOMqLGdLvYYoKnkflnu5Ttw/K6mc0fNBeLRHEoCL589XYwXJaGR/CuVv7u+U5Ry4V2Nj+/Um+H0R+n+fXrm/M5Alwt3wz01R+sg/LyU5J19ejU1HImPSJ9dEVs39nXP5AO9rRwADDAlTjR7bIPhJ/1F+N6N3xoiVsdZ2pfoJ6mQPgYg2rfWf3C7v78tON1UTjf2jUMYG1WOjPoI21PHChcDUD4x98LPwJWdn+z1ud3JidGl9c1ebv36vyzl6ue7nEbvsg7HVdvdJb/vd1m4hEPHBgIn/A6lNZo0Jn2xsf1pxotObpPQ5Fz3s5fdqPD7xmcg977Tk7P3m7rI/SH5wkDHVcgX/bUYGQIM/l/wXREeB50JZs9YU/emfq5/iKU8Dk1SL+fDF/vj5DzfXzWs5qMUVM63/cCnqgfiZT/25qFz0XEzwxDrzuN9/DwIN81qeH59gLvvn5+fW58e/xorG/63Q95f7HOjSs4P3RCOciSSa7fS81vs+xT2EHvkgbskHcY9lwPR973+f+zkXPpBAShehPxaAriwGgf63vz+sFf33yaKcAx++zPnf5YX0iXXxh4nn9kGH/11OPymy2fmtHgnlWeBOVuGfZd/Gz0tJcOYIYIAhkXyiutjuciv+oCNVvREZ+/Duzd4PHHtdPnSa5Ub1ZUzBM0n1W2mVNAcupLfpgdWVL4H/tP34f4AkS6Ue+eOxnf0wenxcuKFBiZxAcrulTvvcGR9deP9hd8w0/0NszodKjf4kcz7EeS49/AfPfgnm/e0V4jNhXI3U9v639GHRhK5vn5S00teF9nLxB+TzoZjRWuSmwpHo8Z0BLxvRKgJXi5fqaaHETg/LrwpZG0/SwFjvQ7/DwYtAK4+kw+tPpQLDgu7bTbCRTJYqZF2WjDIvNW0ztuQk1AqondaePM6YR/rCCCWngdtMlz9vYXOz8nLimFApbr7rg/CTVMw0JKFQSQAAwFeJMdTABeA/oX3mD64PD+p92qDTZGSIrW/uLtR7yJjpJDjIFDcHzhAY8w85hh4Ihyb+5HxORxtf/RyPDD5XNrDLbS/0wZkPYMrSA3+wmdr/2GVT5eYfJwP9hF2XOQViHvnv8/75euQPvPv2qVk7Gnz4MPJ5/PPFLacv09eDTglrMxq4nHV7vY511glCV6Nwzb8n17odga3vX93/uBHurXR/XVI2LOOO9f4cN4Y7Fb4oDSQX5Ri5DiGY//twJOi6NZFf1hHlnz/ZqaMBsY6+91/OvuzlNo+jz6H+PcsF4atuficAAIAsBDDAkEsOvBZaNhfO4mD3dGz6TKndXj5LyvzU2Vl3bI8JbYorqQBHAwE5Z/oJtw8Gnmb1mNG+Oz1XIPmDzZqJ7geBW/AHnB3LeGsmrq5JfpZ72anBpzYR1YPp0xzYJ9UJaUU5A1pppAfgt1sqEa7WwrfaDDgZsd70WtCJQkeeE3/+2xvXX2f9DA0+1rd21za2916kbyuZIKTnC8n0pY6S6+r7t5CMcO+aVoFZ65aScOutDwHevN/afbux/alvpe7d0teJPr4aQqz/truQtc8v23v6+xXS24y4Y0Oq/ZFIn8eMUORohUuDVj5lVT9pT5/J8dF8p0q3+vIpd/B3R5fQTRy/pOrguTNBS6UZAABAlwhggGFXDYttLinGE3GGlC5X0INkf+A75Q+K7rfbT3urSOvBl05b6mLcrx5IxWFHQscay4DpgWhckbC596LdgbD2zvEHgFP6u+uXhifWRTO3T7h04bsb+ZVv/z76/LjlNjmXqjRy7Stt4h4quXBND6b9gf2ajuaWE9BlXy3nl+UEGpUe+tVtINT6WCTVKIXk7Nhfqs1BgAZfOsFL4jAwDmJKyflMGnxow9nWyiq//efGaRMGXVbPuFV9bKp/REeefw3BtKJCX0utv3vL46tBTjHue+LsclYlSq8VNr2IqvXQKT4Tmh9++VCZa72/OesKcgJxVZOLZlsCspJ1RyeuabPeflQD+ZBmRoNN7RVzZ2J04bj9rbjDoC6KXgsAAMAJ0AMGGHL+IKEcah/5DGF4tOIj6cHwwh/0FYwxJQmjp+c1zjU5SO4YGujBlz94ng0keOWPOAuiB15iH3c7bUnDDv9tcW2tMnaaccz1EbtuTiL3ul2/mnifyC0GRsbigVTOzq9v7U2363OROnh8Lqeg457DKJgOrtjlzs+lO3g9BGH2Eq64SalNeqg0riVu0f8eY902Ik1eY9pjo1HdsOJv46fPH+2S9EiDk8Z0oniDDZd0+o2NZNc/zvcicbvhiF3q9Hsn9+fVwe9j3dOJm0crGpLno9tmgAfTatKVVdURu3jlS7DjjC1XPx0/7SnpFZPZi0SrazTg0Y9CtPm01ELtq3O/0eDWB0QrPii75y8sJO+NAyMmHG29vWtVmfPBTLld81l9rMMR2enm70H8mH4O5hrvBb1P2vMnMKGGdXO5IJxzNdnxoc9Uox+OhqlXqsF0arlkycSTk46X/M5T8X2M/H1s8/7XZr2u/rycesy5Bpvd7qtVV/6xjfe/+y1NmwEAwMkQwABDTg+m1rd2V+NeKmn+0+KssvnDHgw6Ucgf3NXCoj9ImjlN01CttKnlRL9WB9F8tHHwJaeg4cth+CQF/4n6/W4ntWjlgK25engQmoJkNBrVioN6VcQRC/76T/v9uOhjbq7k7sWjf51/PoP4uX3kD9oX2k1P8WHd45wNntXPZE95coHcyxpn7i34n/m8myVSSePkueTsTqcKp+MEgT+gd0en35ggHkbsf22jv/e9Tq/hlkbOpU5Lr7rlH8uHORf4sMHsBPawr09yHxazrqOvv+S+3PPXKxsTLLcbqR4HYfr+bKZTefT5i0OiRmCkr8+rkX9du4PHvJS1dEqXq0kbcdBlwrc+NCl38/dg3z+vIy0VZfp+ev9h9ycTmMb9GMvV4hAu3i+5zXkfhsahy0kC0ePfs9rjxRTOY3rVSX5eYyx81UWvT9O8FwAAXA4sQQIuAFOz97Wnx+EWt2PFHjnobTNNpJAcJDXRA0BdRqNLCaSD+FP6ZLnK1VpY0fPD0BA0S60W/+5F6bI/R4MeOKaWMpWz9unUuLNf4YseaOso6fXtvYo+5kngU0jtMuYP2ts2ZNVP9HXpk361DVJc+z45ZiT8XroQRnbJ5yLxwaRtel2egOuqb0/hmyhs23cjkINGxaW410uXNJRo1wcnfizHR2e0p0i3fXtsNVgM4ik8puDPFnWpULtlQc60HVlabN2gr6/JG9fvp5b0dT3Ss7HEKQl2VKGbZtX6M7PCEGfsYb8WHwJrKHvkum36s/RKH7vW56ZmNFjU3jDSl/fcaTT6BLXry9MIbbVJdS4IXwxyiRgAALgYCGCAC0APAG9PjM43DsB0+ke31R16sNI6eUebefqDghfJgcGrdr1ksj6l1/NJlU2mQfWl0ekz/n6/6tSvJD4YTPpImDB41W4//b30tnSySWObLmUyLnrobJS5XEgf78b0nTRd7iJ9cqUaLMXLNzqHEmNaZSEn5AOT7ObG/nFz1ejYxsdKX48aCOhrsVP/jPgA2j9f2jOn3fSctven+c7tdLpv2m/IhxKml7BEn3+tCGn0wUm/Fk7KBObIsqC2jXdN2wChfdDnQ41emjjr+1x/P3+/9D1TrG91qz5EOXEQoO8D/7zPWP9e+fyHzaykqQcTe2+OC3c7iat+alqx45+bVNPfJBjLd//37+jt9iMI0b8hjT5BnfrypIxd2z//JuEAAOB8EcAAF0jjAKzdp8vpAKLO7VhnmibvJAcJxZbrFbJur8On9IXNjBG8jeauOnK33aSULOvbPgzZ3mtbXaMHTCaQ+rhpcYu/bf9xr+nn+tBH94krBSZGpzSoardMJ67o8eGT1KeaLKQPmnQJR6dGudoHQkMaf1L3WTE+wOrHchdp/I7pUeMdBEZOPIUlrl45MqHJBxwnmdDUYf+DA2hxcVWIBgFZ4VnW/ak389UpNbrcJLsZa6/SI6qTA/DWcGDh1OGhjX5s3eRMVM7a1djsRq7GHN9XphvJRKLikduv2fv+Nb4op6DPhQ9AlrP+DsXL+eqVW8XABEU5oSSsKOhpkzNdVWYdR/8+aRXf1YwpWb3K+tvYOhXsYCKaLtFyruf3l75WNcjyX+6kjbIBAMBwoQcMcIloAOEPImdtEMSNPYOaXW5tZhuX7psub1A/pXfd7aoHNK520Ny1IKF55sON1eP6JiRVNvHBsP9R2rNmTpvypj/hHqn6y5vuc3R4fQ19rFu8WpMd//Pu689rF1DpQWlrRU9WM9NOkj4by9Jn8Ujtbp8XMV0dPGq4ZFyQBA3+teAfUz0I1B4g2rDVuqAQ5qTy5559mfWYadWRD74eRBI977X/xbVqOOdMc7CnYYy/Tz+mb0vvj75mfXAXN472r4GXkzf6E2o13R+be+SMW9TGsSO5SJfwHDTZrd85Vz5tyKOVOO+2dguB6DKk+njjuxPZj5u+jvzrfNVIsOBDl++114x/fH48SSPjtIM+SC57JHhW426l7199n4UjUjpN0+74b9BmxYeU4Q/VP+xit9drBCKNihp9Lt5v7T414sOXanTqKrPWv0/JMqyTP9bOB2imeUJdEJq11t2SJuEnkvQTKsY/zr93/Pvk5WlfowAA4HwRwADnRMOAnJNnn3NRZhm/jlsNq+EjGeltilHyD/TFdpfHjTTrBzYHn6jmcm1GFlv3o/9I/ugygowGwFl9ZpJPhEvSgT9ILRrTlDyMJf1b4p+rj1Pg4oqVhtKfHw8rDZw9qGQYa/15etB1zW9vPH6Bjcr+oKnlPkY/yznRT7X9gVWxZqPnYSSrrvu/yOXjdmgEU4ehTvho/bfdxzrVJnm9LXe6fjIVKj5ADSUOxWZ6aWrsg47MT+x1mpO0vCZ6nE7Us3oo4eaTs2NhFD5yzh/UH/RFye6pdBKNaTn+dTl2XNPV5PGcl37SsfUmO3xp17g7CW3e+Ov57/4996Fy/zQNY3sJKQ8Co1r9Pvu/TatBzt7X9+xpwotW+ppf39orSVwVpD1k7Il/P6Vhmw+adpwJNGwb06bL+x/7O566dcz7/rXz73sDAABOhyVIwDmJwqiULLHIFI9bNf7grBr2vfRcD2zSTX39AdDbrP10rGzWcpWsg9WspphZnwgf2cc0T1qJbyvVvyV+nBr3wX/XPh/N1RqHj2H652lTzKtRuKY9JN4ly6X0gLdmIr3vevAVLwuYOEEvCa0s0YCiU8+Hds1dG+KQQuJP5Iu5IHiShBBl6UJ9iU7n+9c6ajoWmmfdLL3Q++2DscWmq/oAR7qkvWxEspe1BbnjXxN9V40rFQqNs1oFZf3zr6+FIHAL3fZUSi9j6rSfVvicNMBo9Cdq9E/Rn6XNsrtdMlMNopb3oTtomNsuZHLVuEqq0Dg/YsJ70kf6etQ+QFmNapN+RsXGee2nYmvt+zedhv7tqDcxHs13U0nSaLKry4CynnMNmuqNmkenjv5dOr0vubgaqhQ/h/5v1SAm0AEAgLNFBQxwTpJ/TM9kXRYfbFVdfKTtbHeNUVV8kOADm0jcbjhilzpWzujSosPCk7F297GxXEWXFFjjfv7yyS5lHWjoAey7rd3njeUXGvD4A5NjJ+ToQYz/1Lvg70o8ujde7nLjcNlGY1lVFEqx+sfR/hh64NMIQhrXq1dgHI4OTo/21SaeIu37bCS9S175cGSs8Ul8+vJGZYm1TkMJrWJZvDX+tyNLJEITPnK1+HHNrOzQ3+v95u5L7fsSiX0cb3TR88OqjDacW711zOMa2PoStCxJU9jl1u2NHjp6OqrKWGBaR0PbvHSr+bWVvpHVb8dH+1oloPS+f2NzD3TcrwnNqgtqr9PPmw+TCi1VVl44/d2N68tZt6X9R1oP0Bs9bRpVIv41N9vvMcjJErm42isXxOPjS9VIpnNG5q7Vcvqcl467DX19r2/uPvZ/O37wj/ePkxOjS9rbplPg4H/mWNPDExz/c7qlP9u/U7S6Rl9D8tv2Hzvf3vjLwWsgCMw/Wpc5agijPaS0WivrNvX97t9fr/z1dvz9XmzX7ylLt0t4Uk129axW6bz1v8vMWS4BSt6PXVeG6X2WkehUS8gAAMBgUQEDDCH9h7dOGIk/rf0233WfAv00WatmtOlpXNbfgTON5qdup1NFhd4XDUluTVx/qJUzreFLunGpLr/QBrj6pVObpEt6u8nI3/tZB7Wdmn4qvU7G9U70afHVWk4nPBXjySYtj2Ec7LRUlvigZiGrOuHzx+ihfxw6LmvRx8i6aKZx33VZQ2ocdpaSiU63VCaMtPLqUDJdak2bkzYaJ8fVIC2VT/5+LUuX4tdWy+Ov/VD8a3ogy4y030xj3G/8vRa+ST8nNjhaZZV+HBrTmrTSQR8HbSSto4XTt5EssSscnHdhVw2Te5GzrpA6O6avxZzEr0GtlnrTbWNrDV30vaTf9fxxoUFgDyvdNDjtJdDolZOoJdjLnoJlgqONd3VZZmOyUzIprNDa06mVhhJaTXRc1VIrDe1aNo21a1Y+DOJeWjrZrhauMe4aAIDhRQADDKleR84e5Tr+I1wPsnViUFyOf+P6w9bL9R/x+klzp2U26alHjQMcvd/9LsXvlYZGPtjQg/2SHvj7IOvg99NlBa0H1w3139VNpzYV0xOXsvrceGNZ27Meh6zHsnXpSzwO2wdvkUSzGs5omKXf9avbMcs+cFjO2q4js1uvn0yXKsRnQnOwzMgHPbPxY+dkWe/L7R6W1Ojv5K9zP5lkVNbb0XHVJ3ld6PMUP2cfdhfbjTV2R1/rhfT458NpNHHIUNLfJ/04NKY1SctSmJFqsNg4H08YS4dKfawSadAlf/WlgY1ldf61mB5Jnnp+enWwDGhz74UuBUoHEvpY1J/vaKaX4LQbetsH49t11LkPTNLvg3iZzZFljnLk8dX7G0RhHI6mt3caYx4vxfOhRC4IX7WGcsfJCu38+7zc6TpxkFc55SStE0q/B9r8nQIAAEOAJUg4d9P/XnHaJ4H9+wejHrB0PU2mWeTk3n/93yvuSh9oA8X/8j8vnagPxEnpSF8fiOgnxz6AsCeeHKIHaC6Kqxjif9T7gKVscv6gNVXanjQ2XUzOFpJeNQ/lBLSKRpcY6Wl/wFTWpsCnKaPXA6FwX3b2r0X3030T1jd3F6x1z/zBtVz5EveeWExfL+fCgmt57dRsTYOceMmEHoSHtZbpOd5V17napv5Y5V7pAbU2GfUHnbOd+jlk9INZlR5o4NDSaFlDh6d3b2YumdFtxfrJw346yX3oquKiQR93PfhLnr+StFlid9xtNKbxiC4r8q8xfwCvFRH+P1ihvhZLGkSlrxMZu6rLwdJygVTS55OGroutPy8e1+za9Ksxh1UY+nzplC2tfPFBxevJE/R4aW0K3Sp5TcyvrfnH4K/BYmM53yF34mDTPz6v/Mt+LF7t46xOGyvrj2xc3s+lNY3XQaOySyvj/LcF7cUUSPg2tEb/xsaXHUxuC4NFY8w//Kad1mWIyn4J5n1Y2Fo981KDvXb3I54Advh+LiTBREm60Poe0vByssNjFE8Mq8krfXz1Ner/Xj48y6VAWu30y3alrL24+r00DgAA9A8BDM6d9jfwaUXfG82ehD/MWwr6VBfm6gfQZxrA9GOaTD0sOFJBUUiW4xzcdtIn5ID2nZETaEzbST/s2mOjMbFHTkCXbricm75ak5YeLdZ/BT7MMNP+gP6JP/BbTh947o9EK1erwRP/eiwk92QnjA7HAuvBoj/IeZizwbPDffzvHrUPYA4mzEh9SYNWVmSFP/WR0VLoZQxwp94eGjj4A/mla9eO9jNJ0+qg5OB31NSSXjQncPh7xj1Syv78bK8HoPFtRHGfFZ2iJJI9Az2uykofZOppH66VD56TLnrNNEKCIHLTEmQntq1L85KfWZITaPSQ8b9R4bj+MVop5Pdf9K/Fe+nXmXXyo5xAvQ/LkT5PheN6wzTdRtJfKq6bDdtPZtNlQkmlylhrWKaVUTqi2pmg6b4k92G+089vnQikgcjtm4dTkuL+JyI/VH041miAHIgtSyOYc66ciw5DzWTJzj0fpj1t14BZ30P+uSp1M9HKh0PpsKyYvBem5Awl/a0AAMAQYwkScEk1JnjocpuN7b0X3ZbG29Syi2bNyzzSE4V0iUn1D7soXdCD5/XtvYouW9KDtcao4yPCo6FcN0sI4oqG1DIiXVrSmL6iPVb8kVw5uejIEi8NWHQphk7G0QM8H0gcabqpBzm6dEuXCTWWB3U8iG2ZwKN8+PND47Q+L42+FoEJ4x4O/vnq2F9En09/HZcs/3J6Puux6WYZm16uy060Z8hpqiCSgK6QnC0c14MoSzUKm5fctJGMso7pa0iX1fhgK55q5J+Ph8f1mtHHXCdk6WOe1Wsk5g/Y98PodbfLVpIJSW0r+bSxrySPjzZobrecqiFeRlefWrST3J/Vbt9jreLntXWZjz/fy/Otfxe0x44uIdLXaLuliTq9LfUcNi1hjAM2Ez7wgdeTTq/bBr2scbl/XzaaZ6/4MGY+Hb6sb318G/c/8dt1uVHjOvp+N/71oO9nfV83ft9GvxR/ci44pul11xOtzJEQtrCZvB70ddHptQEAAL4eVMAAl1B6god+tu8PmqalFs75g4DZ48btJssAjrLu59ZNx00UypJM6NEDpDF/sNap8mlMD2AaY6Ib1RH+wK3j5JMR/2l16zIiG0XxJ9HJcpPGgW/m45AcpD1Pb9OfrQ2OwyB8e+vGX1+m9mt7Ow313gzZFRbpqpGm6zhZ8geRr7OWKfnf/1lr41E9f+VLoM/PovRZ/T7qWGCjB5BlY4LFxmPQotByvpierNQNHTmeqwbldNVHlsYoa739ZFx7vL8PZn5OH5i3paHY4ZSn7CDE3wcNaTRM8EHBsg9jMscAJ5UtT6QmC/o063I9HwLdb32f6evlYEmLfw36oGDuuOVoccXIRmVGm7/W/pDVIw2w/XNTq/nLcv6yltvQUEofF39fHuvtaJgTSL0ypT5K3jxt3H/93ul50n1MzTSFgmG9OXBWhUdToJKEZSU9ffBaTwqb9HXrH7uiD0gXJaz+2LTEUftLJUscDx//60caUNff0019mxphV/z7aAPx1uv4wLiYmopV7KUSqB1jo9c+XEq/lkr6tyt5j7/VDe8/7D7t6vUJ4KLR5X8l6Z+ynBP/yfxOP38X/3e+60meg9Dn5+Vc1SL5KXfCFgtZwhMOq8DpEcAAQ0orWGqRnTp2nHSL+j/4JSvYGPOf9uqnwzOdDra0qWVgTLF1exAGPVc0ZAms9Z+kBz8kB9ntqwD8J/QTqYPYpKIiDm40oPDfMwMYK65oWgIPZ+JPz/1/iKOdxpKExvISnX7j6hUzYz5cWG4NF+ojrbU6RSeuWHm/vVe8ndG0uB1trHq1GjxKhwoHS1vqQUAh42pjf6nG2zPCHX1uji7NMc3Ng/um0bsmOauPwbIPxn6aaA3yMkZopw+EVdwDJQqf+dfYtL+dh2HUXIXU6AficuEL/5z8aOo9UJorJPzromV50cHlxtmu/jFxa+L68vrmrl7vUcewJ6nkSIICPX0kAKhPzWp67Av+ffbGvw9nWt+3/vd50HJeG/3O+/e6i9/rqYDv4L4e7QcUi1+XPpD0r+axMGMsdhJKFX1Qoo/hw0aY0xjnrmGOhnlxcCT14CiS6GHr0igNJ3QUthyVuYTJ1KIZFwZvGo+rCe3h68Q/kHJkHHj9NeUD4pIkSxzjCpXUtDF9/P3rRk8eed+l39PJzsdW9uiULuMO/gaVThq+pHvdaNDzy3ZlRwMnbeDbeBw1IAu1+igO/OyqALh0vrm/syiXxNX7Oz1/sDbMrsztnGpZ/jD5F/d3FgSXAgEMMAQa/RWSg6ZVk4ue25pb8kGIBg+6RKKr/4DocgynSwAku6mobs/qP5JWHbEZvSfc88ljemp07Zr/qnWO8LW55pc/bPN/aLTE3x3s0PZA+0gFj7Wv79yshwV6UPRuszKTC4Mfvv376EtdAuF/1vzhz7XF1oBlRIOQVEjiP02Z9wHE89YAot7LRu+zWZkcv37QSyUJu6Y2Nivz1gWF+OAsaTDaqTrms2m3FCd7upU9XFrVZ0fG8WbeN13u4X/HnUiC6VDMqE6xaT2w1XHRukxEAzIThG/8ae0TspR+vNJ9jPxzVdZlWYd3xcXTehpn9bF9t7n7UseuxxvCUCdWLUkXtGmp/9m6fyG1uRQEbsVarTAyraHDXLoiS8VBQXbwpaHdCx9QHAYGYVh0Ge9Lf9+fWeskfq9rwPdhd6rrKonGUh//uGiFTPoi7e2TNLY+2J48tst6Og5fmpssF7RRbzo40mWCep9zWa142gQdybapxnj69D6R8aFbvQony3SjYsrFz6dr+XFxWHskgNH3tA8+7udcoKGzhjnH9jHSMGptrTIz8hcpHFcR2M5BvyLtdbO9tzJ54/r9rIpAvX/6s/T0eU+HAwAA548ABhgCcXWHORivWvT/sJ9PXTrWzW0kBwTJEoP20v1HsjSqEKIwWIinwDj3+s7EyZrhZkmmmRQ67RM5u3JtrLl6oibRS3+QNa15hR7Itb39lgoeE+rymUPJAddqPKLWHW38aepjcl82PsGujkj5ai21gz/w/GOkuSIhveTLW/AHrpIOFVTWUoi4OqaW0YPC/4y7E22atGZUmrQ2C+4zfbyKqfM7yUjmI7J+x7TIhxVBI3A67BOy4B/v11lNaf1ztexfiyVzJbhXi+xuo3IjvY9pnnrW23KSVKjng5TV2+OjcbizvrmrGVFzsOKfk9Zmyy6Qe9l9guv3RXv0SCdxZYQpNG0yx/fA0ddu8CUo+l9+1Yr8qL1hWh+XdNjSRtYnaWP6/vTfF5PGvYXUPdvxOdFLDddM6Fb/3LMvO9x25lSlerPkymPJ7rsSNyn2750VyQy1MkZVJ06yFDJ5vE5ckdI0lcmHQ51edwQvAACggQAGGA6FpnOpRqTGmK4OEnz48qybBqYincMPdZIRxN3S5UCmvixirHFQZ3T5j0hjSYBoI83WSTrdHmTVR3EHP8S37+T5rfHRzAPFwAbFdm3IjQsLjdMaSOk0F0lCCH9Q+uM1aQ6HWnpKqAX/af7T4/qf1Cs4Kg+bqjz8Y9LpU3ytNHm/tTvmg4cHjSUU1u9/p49jhNN0fHUocSPhBj1Q1lBrtt4bR4r+OdxpNCqNp+DUdLna0Z4xh89Nc3VJPC64zXShrJ48TYJUGObcai/LSUw1euyDxp8b962xvV4ds/sgdT9LJrIPj9x2d++3jPvsFiJrf/KvmB0dy9x0k8lyuU7iKpLktetfdqu9HuDHfV9q2ZcFYb2/zv412bnaGLnugyIf9LzudTlklrhSaqOycjB22rlCKoTS75l/d7ImQCX9VXS52ph/PJ9+d7M/U4DiajbnFpPnN3OktFay+eehvtSzx4bGrQb1ewAAgOHTx1Y+wMn8u/+yuDgsY6j7ScdQ/5f/zzdT3ezrD6gX4+acR29lJ2sSTxadBCLd9QFpGg17HvTT4nQvCt32/sPusgmae2To0qc7E6MDCYK0iqDdcggfOhwZE+xDmIocVheV/UHZQTiUdd+zbqMdfTy0ykNPa2VBuwNqPXAeqYou4yl3e9tZ9HfPuVADnLKO6K4vxdIg5WjzWKVTmqS5Cqbkf99Suk+HFzef1T5D0hLyfc5F+XQY1fJYxtft0Ny3q99Hv5/mMWl3uz7o2mm3TOXd5u7SwfKnHqRfG++2/G3Ue90cGa2cJa5Maams8e9nk77PIy73/bcTf3ve6XYyntODJV4H04L8z7JBMB9Yu+x/5lux9sfJm2Nz0kfrm7sL/nWYWQWWCmZKnz9F91vfF7pESlKvtePec/HrPiflTiGSNvXNOXnVsjnzb6Y+PnGD5E+9h2BprY+B/9sy1e4+rm/vvdLlTgIAAC4kKmCAIfAlZ5euVIOC/0S4fhBvZMXa6KkPKMrd/sPe6SfqgTk2gDloANtHyYFqIRyRUjefkGctjzChGW1dzuEPbjWUGEgAowdqB1Np0pxbbV3+kyzHSAcGhcZSjfh+WrtoTaCPrfbrGfP7vuwmDNBP2v0n3vP78SSc0efH7R83fDX1kE2bpvpv5ZqNnvfyiXk8XcYHJ/VJUU4nzBQaS7ECZxalpTFy0tS52HIzRX8brdu0+ezbrJ/Z2ozXBzWzgQSv0pUP2oh1Y/uTZDVBjitudElQvSJhxR+gPk6/zvodvHR7u0ZOVgFz1dUfi/gAXuyKqdX71ky2BK1ZjbiTypTD+5B6PzeeW+vfjOu/7ZrJb9svHdTpSNosWFK/g05GSldSJe/TxeS+zuzvn35iQutSncjY1TDdRFf58OXzH3Ym91eZbheA1fvvNAd9cVVbRiXV+w97cyaUF/r68a/lHf+ammpXnRbo6/poo+DMiV7tGiT3ov7+ag7x3Oe4IizzuSN8AQDgYgsEwLnTf9jfnhid10+y4y//j2w96OjlU1Ub2OVjd9JPlavRkVJ+Pbh4t1mZ9wfAD6RHetCnlSS6jMbVwjV/4HeiwMQ591PGRhmk2+Oji/qpuaRH8Rkz1hjN26AHWk7c0/S2MDRv05fXn7/RGf81pbcrXahZO+UDoHISUHShqflwwX8VdblWowJE6WmtzNCvuLlzSjw5p7lqRerhi1vVHhv+wH3xyE+sBqereMhYnqGv7cmJ0SmtjElvb4wLT7tan35VTC33mdOR4HIK+ppNKkBOfhv+sfWB572jl8TPUSl+XfmQo/VSrerSRr7687WSRd87+t2NhG+1EqnxnOnzqH2FtMJGxxi3jIsuJTdX2v94+DNcehxzKAfv5V+2K3O/fKg0PY/6HMQTi5zTwGtF7++dievLra/9Bn0OG3+PdB8Nh1pv8zhapae/q1auNH5OEnKV0vv512RcBaaXtas+su5oc+is/jnxCO1AXqVeP/HkImkjEFvO2LzTyzj1buljmDTyLaS3d9MHCAAAXEwEMMAFpwcYerCmBytWXLsqipL/xPuhfqrcejCs01D8QW4lDlCcXU6mo3T9s1sP6CU82XIyDS3q978eBsT3Wez9rJ+pBy7+E/AX/r6+OklolKaPm/8d0hOeClmBiN4/4x9D/4n8sj9CfPztjeunngp1Z3x0wQdu97vtH6GTbZID5lJ6u46+1e+NZVV60J4cuL9JH1DHB5HuaDPTzzk7q8HRSSfCHKNtZU888SYOtvQ5l9KXf25uJOxDQf29jhzkJ5VRJxfVftbm0nIKcQiU7gHjH9cgcAufP9kpXa6iryvtd+LfdzOpx7ykDXN1mYscWf4Tj1ef17Al+b3Tml6Pevv+tRD/nHRIa2108Ds1eqbUl9SErzSo22y53cPg8Pr9kSD3/frW7pr+LfDvK6dhULswRiuxNBzS2zwucG38faqHhIfjzL+JwoNm4Pq6lvg17eKgs5spUMYcrcbxr4sHraFjPThxTa9rH8CU292uPmetYav/+3BsdVqvDhp3Z/QRSoe7AADgcqEHDM4dPWBO7mAUqv4jPnKPdclBvZ+MPPJv77jJrb/s6WSbKUZxGb+RF63bW3t2tP35Gf0ovB1/QBdXNvS7N0fc4FUnPbUctBgxi9rLRE4o+T3ikbLd9OFoRysCTtNAM2nGqZUZBdE+KyZYbtcXpaXnTzmSSEf8vpDWT9Nbfp+4r0e9AeqDehNk81grH9rcpcYSIH2Ou/pUXpfEVCV6raFQPHL7lL1q2vTpOXiNNaRGue+0TqDqVSMA6RRINfVtaumdkiW99KZt35NDO/49OHWlFiz49/IDZ+Vlt6/JtbXKWOt4ZR+svNWGwu16pOjvm7V8TJ/LW6mR7CqjR0p8Xxt/L+IeND7M+VKr/azfnXGNoKos9dfQWDePVzd0tLuT4EnLJKlyay8jfQ3XH0vzgwZvk11MddPnqzpSXwI1iCVu2stF3NFwUQNWDcUEAABcSvSAAc5Bo2dKenrMSURVGQtaytWT5S+L3Yzj9QermdUjrT072tHb9weTTaN0G58WN/pR6On323vLt1sO5HqVhBN64HckCPCfWC/6g6znraFRcp1nyXV2fKCxkhVomCu5e06XOzlZ+XKl/ThnPZDT5QtZB2T1y+JP9ds+nxtb/jFJHZD6A8LldHAUL/cxBwFK0TlbfP9hd6r14FuDKKk1NVwutGsoHOikmZTkNTGffMXiscY2KAZX7HJrD59kUtPj4OiBblrJPwc/+vtbrn46aKwcPw5ZvTO6pQe/2R8THK3iScYCz+vp37b3Slqh1Hi+svqItHt/pMMInX7VrmG19m26GoU6pr2olVrtplDpz5Fr/nHPH9P3pNnYSDWcuz1xfVGSHixZ6hOnwidxNUgYPdWfkTVeWSucvrHBg8m/twsS4n5GR7h6QND0vg0j/7oLmp6U+DH277WyS5aLWf+HLReE+r6Uw75OcUPx2dbm253o0qkRG97zf6eK6abXDcnY8+V0I2OvkEzVOngMktffovTgtP1dNNz2336wzv2c9b7yj9HPQUuvmUE2HQcAAMOBJUjAGUv3TNESfh9OvDjhTdX7OCTLYoxrHl/b1afLGWX8vY5U1U+yaya6r8sv9BP2Rljgw5f5g33ckSauRzSWKrTdoRqPQi60u1gPWFu32WqwKPUlLHrdOV1i1fp4N3ptJKHIXNbtNO7f1Vr4Vp+7dA+LBj3I61R5UW8aejDaVhX0fMff2TOB+aF1W1DLdfmacTsSRR0rgxqvR/9znqR7jaT519ly43nWpWz6PCdLoRoKQc4u637pA2tdxpIsaVlrt5ylkyQ0KbVuN8YcCcn8wWw5PuFfv64a/aRBiv7s5L32VsOvxr6N/it6v1qXrCQH7w1FaSN+vm9cvz85PppvVymjlS5xf5eW3kjxsreWZS5Hfx958tvmx44TloJ6IDmXLF16k/UYJ5OzCt/+ffQky2iO3J5ORJKWcNY/xo+Syq1iuxvS50z/rrS+RjrJufCFD1/m/clCp74/upRPDl4nbie5jx3p+1FfB++3dt/qssuTvD7b0dvTykK978n76k3r6ywee36wNE0rFd1jwhcAAC4/KmBw/gL/D2fbv2arzpgHpsOBesfrijw3zp3o0/pWWT0K6hUZzT1TfDgx7w/CX560zL3xKbCcgLHRa2eaAwcfUmSGCHrfo6qOKm6u2unwSbFuK6ROH9BPtrXiojpiFxvVEdfi8crhC/9YZC6TcIHckw4vk8C6IwdQ/qDvSHihj/fGRuVpI2Sq5WQ1rDaNvM2kVUEud/D7NHpYdN1HpN39Ny4sNE5/HrHLV6vBo+PuS9tx4/6ATpvbNpbQdDNFq6lx62GD0lLrfunnOa7gMk1jtwtJ9cNBtYguVWlMV9LLk2BrWXqk/UHqS6Yk7vviX38v/QH3kSqm/ZFo5WoteORfv091mpCOBk9Xz8Thl8jTJPAqNu5XeppVfPuBLflAoRHWdKxOq78ngoUwCN/uh9XXRyp9NDxrPOdh3LfmIDjSSjX/Olz26UXRv+4fyNHwomCNW/L396es90PcR8Y1/Z3zj3EcOB4cxMfTfyJ54R+HMZ2aVbPR41COLg3TMMAHRXofWt9DOxpQ+HDtfqOCQ18HOhEpCoMFH3p9n9zvzNCyQZfBTd4cPcmI8Z3GffKfFt3zj8VKu7+T8eskCOadsSt3jgmQ09V5pv4i0bBOX/ezna6nIU34RYojV2T1mGlv8y3n4+VxkqomSt5PU1ohpdOlTjPGGgAAXBz0gMGl8+/++7MdP4ntJGfc1D/9U6ksA5JMXim2bvefds/1o6lrQ7I0QZfeFOMxtcnyBMGlEC9raeO0fTW6oX1Grl07Wh1xFj8bAAAAuKiogAHOndtxVftTu0sb/Tm6bcKZNObVoCc+QK4vT4in5MwILoXzDjqST+v5xB4AAADoAQEMcIasi7SZ6avDJSY6hcbOdiqZzzkpJM1yF9PbdQSz/zbWOiknWQrSOiVoWgAAQEyXlCUN53tSy51sifMgOHu0Ef8wMi4oCC6UMBdUalFtV4ZAOCIlqrhxmRDAAGcoadY5pT1Q9Hz0UUrHrf3P6vGS9DCIb0Mn5WxsfSykpukUBQCAIdFYNtkIL0yqf1EuzI1GNXswVr51cpty5mjo4cSNGWkTPhgzlmp4nq3mb+ME/woOZYhclFEaNDy4cHSaXWCG49UeVeP+WcsCXBIEMMA5+O7GyUdPq0YDyYPzzWOYDxpXAgBwlrSy5Bube+AiN+2MK2oY4pIw5OBwLnVArgd6JjXavNuW/KbTUX3/+voDANBXBDDABROPS60d3d6YXuPDmOf+H6ZPmi/tz2QnAACy1Kf8hS/8f5+KVhOQOB8xhCEAAKRclOJFAImkyqXUtNG5so5T1pM63taHME/9Rn/elXVf7TMjAAAMiKsGuiy2KAAAoC0qYIAhpFUuSdCSydSihzYMFo0x/zBOypHY5+n9NYSRlqa9AAAMyucRu3ylGkwbI/f8f6VYBgsAQAYCGKAPNrY+PomczVdH7GKn4KQb7zZ3l4Ka0alH+Xb7JGOI5wUAgCGQ/LdvXk//ulUpjgTB9y4y0/UGus5/mYIAAPCVI4ABTml9a++ZE7cQ+I/9rtbC7/2mI8t9tKLlypdgIQjDtfTI6Cw2sKXABmUBAOACujueL0nrUtlEYyJSFMqYS41QTk9Gah1b3DoZKWsqUj3kaWUytgG4SJyJygJcIgQwQAcanIRfpBhdkVJWZUu96aAspDYVs5YPXakGSyYwD5yzGtgsmlw0eysfV7EckTUh6V2lMm2+BHOR2NXvbp5ughIAAOclqeA8N2trlbFr145OCmyMyM6SDoeOXha0vUxpyBSKGZVjJGFUD0u3sgKnjsZYGgYA548ABujgai18K4EUwpo2tJWZIztUw2KnSZhKAxlTX1LUoJMi3vjvU9KFOOSJ/P6BjOUk1ACn3CnAAQAA2aam4g9IdjIuKgvaahdcnVZrJRTOTq42mNd8ryGr/3cts9LwVSGAATqL/1FgxExnXbg/Eq1crQZPxJhCPOrZydMue8A0/WNDQ5pr+zKW9R+tahRO51zT/vVRnxlLnVpvc6Qqc/4fNuWkHBwAAKBnHYIrAEAPGEMNdFAz0UPjZNnZ6H7W5Rq2fP7DzlgXzXz+ZKcmJ0aXsvaRlrXw1rmDPjAbv398crUWVlwuXPOfAqxpcJLe17go4x88ruOnRdoU+GoUrgUmfBFK+EbPCwAAAADg3FABA3SQ9GNp6rnSqCwJR6Sky4CST4VWO91Oamz0qDGycmd89CCAcdbNp3YtjFSDRf/9oK+MVq/4YKbkTxbjKhsxq6ZmH7b7WeubuwtO3KKkCjr1/MZG5eV5r70HAAAAgK8VAQzQo7ihrjEPXE123m1WZu9M5FePu07nsdFxqHJwLjDm+9Y9Jsevz+rkiP192UkCn/YC84OwmhYAAAAAhgoBDNCDloa6Y4Ezi/77XHqf9a3dtzppwIcmXTXZrRn7NOfCV43zxshy1n7dVq9Y637WkdgAAADA1+rPV2NF6aNv7u+U5Jx8eTU2HUn/GlZfE1k193fo63QOCGCA3ukfq3pz3jB4dfTiesPeX7cqxW6a3+oyp43NykNnwgfi3OtbqeVJJ2EDWwpc+Kh1+/41mucBAADg6xAE8kb66/w+4QzlWeC0HUF/7Nt4mEdJcOZowgv0QBvqmlo0Y517bozM37pxvW1YknPhg25v99ZEflmXGWU18e2VBjpW3PP0Nmddt9OZAAAAgLPCv0/xVaECBpdOLXSPc7a3Er3/3n//fzD9f/2//NvVf/qnUvm4fZOlQAtZl/2yvTfX6L/iTP9S6l7dGR9deLdZWfYntRpn9c7N4/vUAAAAAGfsoLIc+BoQwODSWf1PS12HDbpMKJTwhT9Z+J/9z/8ns3fH83IaURiVctWgLMYUjDnfsr6kOTDBCwAAAAAMAQIYfNV8+KI9XOLUPWfCf8gp6TKftbXKzMhfpHBnvHPViU416tRYd6NSKUTVIK60CUfsko68ztxv6+MTJ04rXcaMCZZv3fjrqXrIAAAAAAD6jwAGXzXt5+Jy4TPjZGf/U/S6l+vqRKSRqsyFwYiTsPpjIyBJxkS3DV9++/3jI+vconMy9n57b/n2jesPs/bT8CUwJm6m62pxP5kj5TnrW3vPfPhysBzKOVv0gUzh1vjfngoAAAAAYGgQwOCrllSg3JceaXWKi8K3YmTMhx7aeKbsA5mZ4xrdvtusTFvrDhrtGhdXrmQKxJa1Rifm3JHb1eVTktGLxgcyixubewUJghLVMAAAAAAwHJiCBJxENSz6pCPdMKzQzdW0L0t6QpExpu3Uo8mJ/JJzLg5QnJMjQUpgg2K76zoj8z4YWn6/vfdCAAAAAADnjgAGOIH9kWjFpyLl1KaVbsc864SimonuHzfGWt2eGJ2PJJq9fXN0sfUyf/1jf55xMq9LpQQAAAAAcK4IYIAT0LDFRHbWn1zRKpXPn6KHvVz/uxv5lePCl4a74/lS1vbPI3a5JQTKlKvJtAAAAAAAzhU9YIATOmn/mH7REGhjozLrcvEY7WK7/XwAUxYAAAAAwLmiAgYYYu8/7M0lzXYzaQg0OX591tSiKX/2yJIkY2S506hrAAAA4ByVBfiKEMAAA6Ljpte39t6sb+2ubWzvvdDJSb1cX/c3gbwKJXzzy4fKXKd9NWTRkdr+ZKm+xe04cU/3P0aP49vSn7/R288HAAAAAPQPS5CAAdj4/eMTa91i/ZzRKUbzUguL/sxUt7fhqsGcv2psxIT3/LeVTvsnlS6zR+7L5t68/nx/U08FAAAAAHAuCGCAAXDWzWdsLuhyonZNdVtpk90r1WDaGPOPSKKD0dVaWRNZOx9IsHJr/G/HhiqRuOmgkeRcQlrZU8s1jwE3TnZ05LcAAADgwqKXIS4bAhhgMApZG0dMOCpdSsZaz6e3vdusTFvrloxW1fhgxYcPLzv1eNER1EHNfC+XiAYuNpd74Jwr+odhOnIy5gOXI95t7um3kg/DfjKBXSaQAQAAAHCe6AEDDID2Xzm60ZVdNfpJTqE60vwpQGvlR4M2713f3qtcrYUV6TAh6SLR6iEfqryJwnDNhy+Lor+XD1+OuVrRBOaRSPj23ebu243tTw8EAAAAAM4BAQwwALfHRxeNix5KvSluyTr33ER29rQTibQqJrndFR/oPG63nMmHDk+6CCcuBK140eDFuPCNnCpMMtORtcu/bu6t0ZAYAAAAwFljCRIwILcm8sv+27L0SJcN6fdkCdLJbte4sg9gpuWCW4/73bjFfoZJRqSgVTTvtz4u3u6ihw4AAAAA9AMBDDBEdPS0i8K3Gjhs+ICgU5Nd7QfjjIxlVcFYGz0NJJgWYwrJppX9a7IjF8i7rb1nNnILMiC6jOn9h73pL/8cPZyayl+oxwYAAACdGdf7B6HDqhbJ65zpX0PiUC7WccFlcnlHowBDRnuYOCtjI1dk9VY+eylSPDLayIvG+c+5KN9aCfOuUpkOauErSRr9OnGrX3J2tnW/uFltGCwaY+K+J6YWTZ12CdRZebe5p4/BvJwJt1r9wz9+hDAAAABnan1775X/x+xcu8sv0r9fgW7QAwYYMF1StL61txZK+CYXhK9cLVzb2N570VhqlLY/Emlvl3J8xn/PWoaUDl+UETP9l+rRZrz6H6tATEkuGK18kTMLX5SZHvlL/JgCAADgDLnI7QrwFSGAAQbsWjXUVL+Q3uaczF+Jwmet+8ZNdiM7G0k0+/kPO9PmJgutGz6b7B4pTtyFasSrPV/8nR7YsqMOiu+3Pj4RAAAAABgQAhjgFHQ50PrW3iv9ajfi2AVyL2u7cdlVHlq5on1dOiyJKbVuqOVkNWvHzyN2WZfY6DKlYe8BEy+ZsvF46XOhPWF0mZgAAAAAwAAQwAAJ7b/igxTX7UG4LiFKlgNphcucc3bZX/9N6379Lq2MJGpqzOuse9puYpJunxwfnbntv9rtMyyqQbB43qOzjQupggEAAAAwEAQwQEMUlayLHmZNFcqSq8Vjngstm4u/bf/RVPFiTHZ1it++LCeg98/fzxnr3HN/G/O3b44uygX360alGCTNgs9ZkSoYAAAAAIPAGGp8tbSCRUOURuCSdFhf7vb6uuwnrB3dXnVfmipedBnQ1WrwKDUSOm6wKzXbdsT0ce5M5DXUiXul6NIduebvf/7idoh3QTA/LCPZkiqYkgAAAABAH1EBg6/W1Vr4QicTnbTiQZf0OHFHlgO1VtA0Gus65176syW9jjbYbR2pp4HQb79/fNSul4zaqFQK7zZ3lzY2917ofnre5cI1naykl9d70uy+fe+/Ni5IU1kNkIak+qWBKhgAAAAAfUcFDL5aphY9rgby8rub3S05ynJ7fFQbt5YCGxRtYEt329xWErbMd7otHwi9teIKOrvI3+bPrUHO+w97cy6SF4GRMacbnJ2XarAqRkSXI8VhTBRqD5oxrSbxQY82CJ43Jli8deOvL2VIRWFYlGHjn0+hCgYAAABAHxHA4KuVhCJlOaUkKCnJ6R00oA0yAgATyLMjTWqNKZhcNCVVH8rU6uFLy20WnLNL/vvQBjDGyD3nZKgYY34QAAAAAOgjliABw8Il042cKwdWx0cfivu8HG34qzR4WQtM+LbN5Xp7Qz39yDlTkOEzLQAAAADQRwQwwJCYnMgvTY5fN5MTo1Ot/WHi89q4t2duxzn7WIaaG8awYywJvQAAADAgzshQf1AI9BsBDHBBaCPfIHALWUGMNvY1Lnp4eFlc9bJianbm9s38igyptSEOOWq5NhVFAAAA6AvjCGDwdaEHDNAjrYxorVBROjlHe7c4Y1eSMdFHLg8leOb/UzNtjCzfunH9Ybvb1++ZVTAiz99/2M3766cmHLlVbQacnFnWn1P7JKtTU3n+gwYAAAAAQ4IKGKAHG79/fKJjn9e39tbebVYOls7oCGkdaW0C8yRwZvHI9SqVgl6u4Yued07m323uzR/Zz2+Lx0onPyNrHLIzTY12S6Zm76cv16bAhC8AAAAAMFwIYIAuacjirFtMzhaOBC2N5T9BMNp6XfslmG/dlguk0rrNBXIvdVZDm1f6c9P7hJFd8vfjaSTR7OT49dmsahwNfNa39yrrv+0uCAAAAADg3BHAAL05qCwxYXAQoEzl8zvao8U699y66EjTW12W1Ny7xe24avSTHK91rHS8FOn2zdHFZPx1JlsNFuOR1aF5IkNsKiM8Gha52ulHlAMAAABAAz1ggC5pyLKxUZkxV4J7tcjuVj9JU3PbpBIls+JEe8L4685GYbAQihmNxD6/kxE+GBu9diaca5zXShf9udIjI3ZVJHzgT5RkyDmRspGha3i7c2uIwyEAAAAAF48RAH2hy35cLXhjjCnth9HjkwQn8e1sVuYjCaa1aqZTlctl8cuH3eXAmAcyXEp3Jq7PCgAAAAbm/YfdRe2h2O5yU4um+FAMlwkVMEC/VMOijzQL2mD3myjU6pjXcgK3JvLLcgLaKyZXk+laTlZPGv6cBx++lPy34QpgrDvRcwcAAAAA7dADBuiXKCr5AGZF+8B8e+P6mR7Aa/XN1Vr4Vict6ff0hKZhVx2JNKwaqsAodHZFAAAAAKCPCGCAPtHyyMkb1+/fmRg988lDcdPdwz4qhaxR2MNKq3WcuJcyPEqUugIAAAyeMcP1IRwwaAQwwBnQ5UG//f7xka5z1WqVTvtubFQKraOnf92qFNe39t7oV1Z1izHmh6YNQfC9XCC5yC7JkHAmeioAAAAYOCOGAAZfFXrAAGfgWjWcs8YtmcCIqwX3/KaZ1n1+2d6byzl55fzpqzVZ8UHLa2eknDMj/3DOLjf2C0z4xgc0U+k+L1bc60DMo9TNleUC0YqTXzd3n5vm3+HMGScrdyYuf+NjAAAAAGePChjgDDhxSUWL24nEPs7ax7go/QnAnA9aXmhPl3T4khj7S7V5bPOd8dEFf/2H/vZX/VfZ2ei5XDC1Ebso59wLJrDRYwEAAACAASCAAc7A5MToUs1E9z9/slPtRkvrdg1RjJF5OaaCJYqOBhU6PWlyfHTGf03dvpmPm8i+q1Sm17f2XrUuaRpGcS+YKLov58W6x/R+AQAAADAoLEECMmiflqgaLIRiRiUISrdu/PXUTWK/u5E/drJOYwT1+63dKSPmSZvdum4SG1Sl6IwrXNsXDWCGfo3t3Vv50q8fdp8a0/Z3Hwjn3NO7344OTR8aAAAAAJePEQBHaLNb/63YOJ9z0czERH5VztD7zd1lH0Q8aNlcMrXo4WWv1PAhzOJZhTDWuZff3RydFwAAAJypjc29eWfkRbvLP+eifLrvIXDRsQQJOI5z5X6HL/ofm3ebu0udJiL5dHQ1fR8+f4ryk+PXZ7+GZTJ3b44ualWKDJiz7jnhCwAAwHAifMFlwxIkIIN10eNAgldiTNlE9qH00cb23gvnZD4QnYgUPnq3WZm50xLwaDDjaocTgazI66mpr+s/QBrC/PKhsmokeGaMKUhfuR3/oA7tsqNPn75MB6E8EwAAcKZsKI//euXKmVY9A/h6EMAAGZJAZEr6TEdNa/jSvDXQ8wvpLbYaLBpzOOkoMOaRDyNK3908vo/MZaK/78ZGZbUaBIvB0eVYJ1UKfag2zJVELjRjTlxRAADAmXKfo6EfXHCZ1ExUDiUU4GvBEiSgj3Rp0cb2p7ZBQc66gnTBGHPvyHWD8IV8hTQo0WVCYRRNab+WuHqlZ27HOFlxUTR7Z+LrWMYFAAAAYLhQAQP0SX3ZkLwQZ+XXrcrPWeOmP4/Y5avV4JGkltTkAvOm6XY2/O2IZH36MqbjpL/WtbBJaDKvp3/5UJnz+fFcYOR7H1dNZ+3vxJUDMSUn0Y/VP2Tla1vCBQAAAGC4EMAA/VINi425YqGEOsGnpBUxWlrZCGM0PPEBy6wNdYmR+Yc49/rb8dHXXd2+c+Xjwpf3H/bmTCBx7xhjguV+jM8eRslSrIPlWGtrlbFr1w5DKypcAAAAAAwbAhigTyKJVgMJVuPGvdXosW67NXF9uXW/dCVHFr18fWuvJKkx2Mo5OTZM8eGLNm4t1Pe3xY2tj4Vb438b+DSh85ZUt1DhAgAAAGBoEcAAfZI07p2RPjC16OFBlYxy7vXtm50n9iRLlwrpbU7cot/+kooQAAAAADhfBDDACWgvllxNprP6vPTDcVUy7a6zvrlbTveX0WVL+9eoDAEAAACA88YUJOAERqpSCCV8s7lZme7letqod31rd+3XrUpR+uSX7crcu83KvN62FXtfQ5fkopKe/1qb9gIAAGC4GccHhfi6UAEDnIAuN/LBx/3Pn6Tcy/X2RXau+q+RIPjeny112rdRZVPLyWq7EGV9a++ZOFnQ5r+uJuVwJJq9lR+dEgAAAGDIhZHsOI5I8RXh5Q6c0Hc38iu9XicJUo7tE/OuUpkOauEr0Z4utWh2o1Ipu1r4wokb+5Kzs6lAZiF1tYLu47/PCgAAAABgqLAECRhCQRSPsS7ociKtgImqgQYtRSNmeqQazuk+2nT36DXdmAAAAAAAhg4BDDCErI2e+jBlVUdPa7WLDWypcVkYRfHprOa6xpglAQAAAC6+sgCXDEuQgCHUOtJalzttbFTi3i6NkdIazGxsVh46Ez4wTso1E728e2MwU5kAAAAAAKdDAAMMqfebu8vGmB9qNnr83c38SiN4Sbs1kV/235bT23RpUi0nhUGNyAYAAAAA9I4lSMCQ8uHLA/+tkAvixrry2+8fH61v7b355UNlrnVfnZi0sfXxyfrW7luXC9d0RPb6b7sLAgAAAAAYCgQwwBn7datSzApRWjlx2gdmxzp5vLG5N2+t0/4uxUYgk769q7Xwrd9/0cc20wcXhOaRAAAAAACGAgEMcIZ+2d6b0+oUH6K80uCk0763x0cXJ8dH83cmri9b59L7Hkw6ev+hfnuiE5OOivdLKmdeZU9NAgAAAM5H1hJ74DIjgAHOUBRGJR+mPBfnHvfSo8UZu6QjqePTVitj6kwgzzpcbVUDn6Ry5tiKGwAAAADA4NCEFzhDOrnIf+vYm+X9h93lL1fsQrJvLJmKNJWx+1j2rbgdU7MPo2uyk6uFO+33AwAAAACcBSpggCFz++bofDp86cSKe9m6zRhZ9uHLjJZ06u3UTPTQby7t+zBGAAAAgAvB8W9XXDpUwAB9oP1Vul3D+q5SmTZfgrkvV+xSt0FLmk48GqlKQati7oyPLmxsVlZFwh9M6Fb/3LMvp6aab/O7G/kV/21FAAAAgAvDEMDg0qECBjglnVCko5/f+e/H7auNd4Na+NYE5smVL8GJxkTr9QITvt3Y/qRjquXWRH751sT1h9/+ffR5a/hC410AAAAAGA4EMMBpRfXGuqH/ftyuxgUHzXADY/4hJ6CVM0HgFvY/Vl932m99a++NBkP++9pGhSAGAAAAAM4TS5CAU0qWHnVVzRJGdsmFwT0xMmadfS0nkCxbet5pn7gqR6SYnC24WvjCf58VAAAAAMC5IIABzlAS1mRNMxKtUnG14JUYUzDOLN0a/9tTOSHrXMEYk95U7KVPDQAAAHBGmNiJrwZLkIAhUa9SMdPiZMyJW9Rmu+nLW8+30gDn3ebuUrz0yPj/iDlXTl1cInwBAADAEKLZLr4aBDDAgGmz3PXtvYoPRtz7rd23HYKUQvrMtf36JwG6v7/+q6u1sLL+YedgmtG7zcq0fjXOu1ruVWDMI0mWHk1OjE6ZWjT1+VOUnxy/zvIjAAAAXBjGSVmAS4YABjiGLt05rvqk7XV1WZGzy1rVoueNmOl204+cuJeHZ1y5UbESRmHRXxg37zVhUNHb1Ma6OglJv/R0PYhxO43raq8ZPam30ToZCQAAAABw9ghggA42fv/4RCcJafWJjpCWHrnq4dSjhnbTj77k7JJzcQizEhn7sLE9CqNSYzlRZKPntVpcKVNIXbXgg5g3kUTaM6Zkxd5nuREAAAAADBea8AJtaFWJs26xcT6wQdF/K0kPjJgd17oxyL6NZLrRfNb2tbXKzMhfpHBnIr8aV7uYI1ePK2xYagQAAAAAw4kKGKANDTskFbg4Y1ekR/sj0YoPS9LXK+1/jHoeP63LiJL7I9WReD1s67Ki0t3xfEkAAACASyAStyvAJUMFDNCBqUUPo1CKzkj5bhKA9CKparm/tlYZu3ZNxk67NEj7v0TVYEFMY1Sf0wqb57fHRxcF6KNw838vuZ3/mwDDpvb3/5FEf/8fCgDgcjOO6Ui4fAhggA6SwGRZTilphHvq/4jUJx25xuSjncnx0bwAAxD8+f+W4NN/JsCwMX/71wIAuEzMjo6jAL4GBDDAkNFmv6GET/x/iArGmJKE0dNb+UbljDuYxmSalzYBAAAAF5Cj0gVfDXrAAEMkCV/e+JNFH7EUnJN5V4vPx6yLntYnIvn/UFXjqUdNNrY/PVjf3qvoaOr133YPxl3rNCcBAAAAAJwbAhhgiNQrX44oNEZg35nIL09OjE59/mSnsvrJOGcXxcX9YQoSmmcawqxVKmPpaU4AAADAsHPGlAW4ZAhggB7FY6AHYGNzb17iypejjAsL6fNJT5ksTfv5ROdBriYDub8AAAAAgO4RwAA90GqSwIRvf9veuyd9F7W9xJmoLMfQCUlHt5rpUMIXAgAAAAwjkz2oIhdIRYBLhgAG6FHNRPe/vXH9tfTZrYn8srjo8ZELnCvfHc+Xjr2Balhsc0lBAAAAgCHkIrebtb3qol0BLhkCGKAHU/n8znc38gObPjQ5kV8yLnpYb7SrXNk5+7ib69a6qJIBAAAALoKrTpiOhEuHMdTAAGjTXOOCOeP/w3H75uhiL9eNK2FElrvdX5dFaTCkVTLvN3dfGmMeNO2gYY4xYwIAAAAMn3LWxigigMHlQwUM0Gfai0VHSQfGPDKBDKBXTOpnbe7NX62Flffbe3Gfly8jdsGKe57eJzL2oalFMwIAAAAMGdOmB0zWxE/goiOAAfosqspBtYmz0lWvGJ2slN1EtzPnQx79bpzMb2xUCloJE+bskqQ+SfBh0KtqwCQkAAAADB8jJiuAKQtwCRHAAH12ZyK/Gkk066x7+uWf4zCko/XN3QWdrORq4RtdTiQ9qJnaU/+tJM49bnxKEFWDBWluvDuWC5iEBAAAgOHj/928mrG5LMAlRA8YYACSqUWl7va2Ii7QPi2FkWo4Jz30f0kaAjc1BQ6M+T5jV3rAtFFxbuza/nA9PlX7Zcw/kQIAAHDZVUekfLXWvM0695MAlxABDHDOdPLRxkZlxf/HZzr61G1o04k23HWC7oR/7M/ZcLgqhELCFwAA8JXQJfTrW3tlSVVw+38LvRXgEiKAAVroMiCtiDjLxl/Jzyo3zr/b3F0KAvPAOVcOJFi5Nf63p93fmjtSzWGdPBQAAABgCFnnXgdJb0MV2ogKGFxK9IABUt5VKtNXo3DN5cI1n8SvbWzvPZAz9sv23lz8HyAnY0bMtBO3uP7b7kI31016yDQFMNqL5s7E9WUBAAAAhpAz9nBJvf8AcmIivyrAJUQAA6QEtfCZBh/J2YJzstRrY9zTCiN3ZGKRCTL7ujR5/2FvTsMjaQ1gDP1fAAAAMLzS/RP9v3sXBbikCGCAZoWW82O5WucRzhvbey/Wt3a1WuZFP8KawJjykY1R1HEJkoYvJpBXqfAofXv3BAAAABhik+PXZ62LZm7duP5SgEuKAAZIbFQqBWkNYJwrJ4l89nU2KlolM++z+vj7N1H4g5zS/ki04n9wUnbpdrR/y3H9aHz48qzDxYVftypFAQAAAIbYHZYe4ZIjgAESUfVI9UjJRHa203X2r8mOhjSN81UX7copaSf4yfHRmc+forz/nu+yf0uh04WBDYoCAAAAADg3BDBAQhN3K+65de55Pfy4Pntc5YmGJRrSBIFbiCSa7VQt06upqfxOD7uXOl1ogsOu8gAAAACAs8cYaiDlzvhoV9OG0pKQ5rmcIx/+PA0lLHbYhUa8AAAAAHCOqIABzpk27v3t94+PNrY/PThpE1+tvLEuepheDgUAAAAAGB4EMMA5u1oLX1jrlpyzy1c/B/PH7a+Nf7O235nIL+tyqJqJ7jvrnmogYwhlAAAAAGAosAQJOH/FxgkTmO877aijrnXa0vrWXtnkotlb+eYeNclyKP1aObjORqVkrgSMogYAAACAc0QFDHAGdAz0u83KfDLqupmLnuq46frI6eh1p9uoj7yOFdwXsyRd0FDm27+PnmuPGgAAAAD42lEBAwzYxu8fnzjrFsX4iKUWTytqGm09OZHXIKWrMCXNiVkVAAAAAMCFQAADtHhXqUybL8FccMUuty7xOYk4fDlUkBPSRrsbm5WHIuEPEkhp8uboy/TlWl1jbO5e1dZ+6uc4bAAAAADA6RHAACkaYrha+FYX5/nvj9YqlampfH5HTqckh31eyu12erdZmQ5HZKdT6HNrIr/svy23bn//YW/ORfLCOTcWSqjLlWYJYQAAAABgeNADBkiJqpIeAz12bV9ONBY6zdSih9a558bJsp7O2md9a+9ZYMK3PvRZW/9td0F6oKOrTSDPxB3e11ByzwQAAAAAMDSogAFS7kzkV9c3dx+LMffEudfJVKFTSW7juFBl/uBUKA/kmJ4wOoo6CmVM7+9IVQpiWpc2uWndpx/3HwAAAABwegQwQIvJidETNcU9JW2oW9QT1smPnXb87fePj6x1S1q+trG9t1yNoteBEV0m1VSts39NTrt0CgAAAADQJwQwwCno8p9vbO5BVLN5G9jSSfuuTI5fn/1luzInkch3N/Mr7fbTUdQavjTO61jqXBDON+/ldsTJ0z70rvkqXP/rN8uS0VfnPH38s1oMxL0RAAAAAJcGAQxwCldr4SsrrmgCI6GETza2Pi7eGv/bUzmB7260D14aAhsUO3ZuCtzC5z37cmqK8AUAAAAAhglNeIHTKaTPOHGLWhUjAxIYU+54uTNlwhcAAAAAGD4EMMDplJvPur6FHxtbH5+sb+292dj+9KCxbX8k6lglY12qmS8AAAAAYGgQwACnYF30WJwrx2f8d+vsbD96r2xs7s1rNY0/WXTOLm9s78UhjN62c+5lh6vO+dBmbZBVOAAAAMBFN/2vigX9EuAMEcAAp6BjoCcnRqdMLZrS73q+2+vqmGhtqpt1mQvkXtN5dziV6cuIXRAjnSphCrmaTAsAAACAIzR4CZ15o1+EMDhLBDBAH9y6lS93u+9GpVLQpUUuF66FEr7RihVdbtS0k5PWCpaxRlWLVsFM3rh+//OnKB9JNOv3LYtpHjntA5iyAAAAAGjSCF+M/9BSvwhhcJaYggScMVsNFo2RYmpTQZcb/bpV+bExxto691NgzME+/vzz1qVN2mx3fXvvkV7fhzBaJvPY+eAmHofdQyAEAACAS+7Nv3UycMmy/CZG//3aujx/J9leZ6PdI/sE6cETUbnl+ofnZ++3XtZROnw5uIeHIczs6j+VygIMEAEMcMaMMfeytscjpkVKevrOxOjCxmZlVST8QQIp3Rkfzez7UpPoZU7COe0/MzkxuiQAAADAuTCF7vdN5UHBcYsyOhyyvvm3jVM7h8MwDsKbetBjo5/9z6j8/T/7f/0cvv6/PzMtU0zjaxDC4IwYAXCm1rf2Kv7bkSa5xsj8rRvXX0qP1tYqY4yevlw+/lktBuLeCAAAOFO2Fs3+7W/flOSyOZMKmOF1pbIr/9X/3f9Zrlb2Ou7nH6RyZBwhDAaGHjDAGbNZU4ycWz1J+KIIXwAAAIBs3YYvip4wGDQCGOCMhZFdapliVPr8h52VPtAGv+8/7C7qdwEAAAC+Yr2ELw2EMBgkAhjgGL/9/vHRu83dpcYUotPSiUmNKUb6NTl+fbYfVSx6/1wtfGMC88R/f9uv+wsAAABcNCcJXxoIYTAoBDCAHIyGfvVuszLdepm1bjEw5lGuJtPSRxq69HP50Eg1bihWSM6OXdsXAhgAAABcWjlj5FoQHHyNjeTir7/v/XHi8KWBEAaDwBQkwKtGMp0TV/Qnn7ZeVjPRwxEJR+/eqI+IHlbVESlfrbqyGFPQLvC3GEUNAACAY2iIcfebazIIOR+K5LoY+/JNGGZuv5ax/doxU5PsdkX++X/7fxJ7ivClgelI6DemIAGXzMZGpbC/Lzs05724mIIEAMD5+BqnIF0LA/nX/05eLoM4fPnf/B/E/l6RfmI6EvqFJUjACb3/sDe3sf3pgZyhd5XKtC6V8l9v2v1srXwhfAEAAEDszauCfAUGFb4oliOhXwhggBMyxhWcs8tacSJ98m6zMt9ugpFuD2rhK39yzn8V9Wf/ulUpCgAAAPAVG2T40nAQwhSL9FnEiRHAACc0OTG6FEk0269eKxvbey8CE75wtfCFTl5a39pde7+1+/aXDxUNXKQahdoEuJC+Ts6FB1UwOvVIAxlGUAMAAOBrcRbhS4Nx5uVqqUSlOU6MJrzAKdwd709j3voI6biyRRWt1YbAJm7SlAvCF/7y0khVxlxL16ZI3G7j9NVa+NZ/K/jb2fH7T03lWYYEAACAy+sswxdx5ul/8Z//J4sCnAIVMMAZaPRu0SqXrAoVDUtMLZrxJ0s6wajl4rjMcX8kWhHnyvVNbsc697z6h13Uc8lSpMbtjl39HMwLAAAAcEkRvuAiogIGGDANXFwU6kSbMaf952thca1SmWmtUEmWMs1ubFbmnQlfNLZr0JLadyrrZ9RyshrWRPeJw5ogZ9YEAAAAuIQIX3BREcAAA6J9XPS7rbkFSYKRROFqLXzx/sPuT87YlTsT+dX09W5N5LW5btm4uKJltfXyLBrQbGxUZsyV4F4tsruT4/nXuqxppCpz1snOyBVZvZXvT68aAAAA4LwQvuAiMwLg1HQJUM6M/OPWjb++1PPrW3vP/LeF7L11iZFpBDI7n3NR3/u1JFU3b8XJQH8OBuPjn9ViIO6NAACAM2Vr0ezf/vZNSS6TeAx1rm119LUwkH/97+SlXz6//o/j71fv/bel3whfcNHRAwY4JQ07Qgnf6Fjod5t788nmuax9dTnR5092yol7Gm9wrjyIUEQnKaXCFzV2bV8YmQcAAICB0fDl87/5T+pfSRDTL4QvuAxYggScUlSVsUBcWYwpOBOVdZsPWF4aMU8OdvJBS2Tsw7sTB1OTFn/ZrqxGn6QkJ6DLi76xuQcuctM6CSkcsUstS4wKAgAAAJyRRvhycD453Y9KGMIXXBZUwACnpD1aPv9hZ0wtmmqMpb49PrpoxT1vTCvSy1tHVn93I78yNXWy6hcdOW2tW3JG5gNjHrlauLax9fFJapeyAAAAAGegNXw52N6HSpizDF/W/4P/hvwX/+v/5bIAA0IFDNAHSZDSFKbcGR/VHjAL0me/bO/NiTta4eLELa5VKvHEpEiip6GERQEAAAAGqF34cnD5KSphzjp80S+RmgCDQgUMcEFoo9/1rb03PjV90W6fkWoY957RsdQCAAAADNBx4cvBfieohDmf8CVG30QMDAEMcAE0Gv36k8WW5rpNcoHE/4VKGvuWBAAAAF+7ggxAt+HLwf49hDDnGL54OQIYDAwBDHABaKPfY3dyrvztjeuvG2etix7rNgEAAAD6qNfw5eB6XYQw5xu+AINFAANcANroVzpXtJRMZGdbrzM5MToVSTSrX7duNU1JAgAAAHp20vDl4PodQhjCF1x2NOEFhoQuM3K18JmImxYxqyYXPU6Plja16KHLhdr/pajTlSKx952RMeNkp3XCUlqnywAAAIBunTZ8ObidjMa8Zxm+7P13/5uyXvyXApw1AhhgCMThSxS+lbjpl9FNGsYU/faZRgiTVLDMrq1Vxk46vhoAAAA4iX6FLwe3lwphzjJ80Z8X/nf+tcjHP7J3sK4gwIAQwABDIKoGC4E50udlTLdLyyhrwhcAAAD0S826Y/fpd/hycLv+Nt0/70vt7f/nzMKXq//hf0tkf1+A80AAA5yxZKlRspRIysYEizaKxuqFL/2xVqmMfWNzD1zkpvdHosfJVCQAAACgSc11DmAGFb40fPmP/lM5CwfhC3COaMILnLFU+KIKztnlIDQZ/+VzO2Fkl+QErlSDJWvdkjMyf+VLsCAAAABAj7Q6pfr/eCsXXWv4sh9ZAc4DAQwwQFqJsrFRKej31OZi635GZMWKe57aVLLO9jS5SH/Gb79/fLSxuffCGPPDwW0Hh6cBAACAbpl/cU3+xf/qfyrB3/NyUVH5gmHCEiRgQBqNdV1Oxq7WRJcANf7LVZJ0CONc+dvx0df+1Ou1tcritWsy1uvIaA1frtbCtz7EKTQvZXI7ztrnAgAAAJxAcCMfhzBn1SS3nwhfMGwIYIA+0+DFfgnmxQbOhyuNypcxDUniXizOvRZjio39TWRnG6eTBrtN/Vr0eiNVmbNOdkauyGp6NHXDNZt75ORIx/bS5PjorAAAAACncBFDmJOHL0xBwuCwBAnoM1fLvTKBeeKsW/TnyrrNGFluNMI1I3YltfuOM8Fcu9vSMEcrWwITvsgF4SvnT7/brEy37lP/WS2i6LUAAAAAfdAIYS7CciQqXzCsqIAB+s7VK1icK09OjE6trVXGmkZH29wDf2Hj3JiE5tn7rd0Ht8dHZ1pvyVaDRR/eFFKbxgJnFv33g9AmqvptRycolSa/zZ+ogS/OnwndjovipWoAAOAMmavh5ZscGYX+35vSFxehEobwBcOMAAbos8+fovu5v8p07Q9Z1fNN4YvnrBypeDFiptd/212Y/Ha0KTQxxvxDjlEdkfLVqiv7nQupzTtaKXNnIr8quHD+euWKPm8sHwMAAKdnZEz6aJhDmG7Dl+NGbwODwhIkoM80cLk7ni+1Bi+HXOZ/BE1gvm/dZp37qXVbFLimkEaXNmkfGefcS626STbPBSZ80zJ9CQAAADi1YVyO1EvlS80SwOB8EMAAZ8xZ92PW9kjcbuu26ohdbNlU0nCndT+dmnR7YnTen0xPPBq7ti8EMAAAAOi7YQphWHaEi4IABjhjgfWhymGlSsLthJE90rPlWjVsXa5U/HWrUpQ2Po/YZamPudbqmee9jrMGAAAAujUMIcwAwhc+wMTAEMAAZ0xDEW3Oa1z00Fn3NAjcgqnZmaywxIcoxdZtIyYcbXfb1/Q/GEbiKUmBMY/Wt/aeCQAAADAg5xnCDKTyJWj/b23gtGjCC5yTWxP55eP2MSZu5PvgYINz5T9z9sd2+ydTk9Kp/cL7D7u7t2+OLgoAAAAwAOfRmJdlR7iICGCAIaZLiq5Wg0cHE47896u18Ik/9ThrfxOYUXFHtv0guFAqf/5ZyNlgXgAAwJnKBXb5m2++KQt6dpYhDOELLioCGGCI6YQj/baxuTfvjLxINi9sbFQy+7s4534yYpr6xhgjZcGFkpNcIQjcEwEAAGeqVot76ZUFJ3IWIQzhCy4yesAA50DHQ7//sDfng5UXG9ufHhy3//5ItOK/1cdaO1du11z3S84uxeOoxe3olxP3dP9j9FgAAACAMzDInjCEL7joqIABzlhczVKTFxp/xquFnJ1f/203P/nt6FK762glzK9blfsjQfD9n3v2pW7TEOdaLffIBzIFHWHtjF25m49HVM8LAAAAcE4GUQnTz/Cl2rpmHzgjBDDAGdPJRsaY5o2huef/f6nT9e6Ox+GKfslGpVJwUfjWidOpRz7L0dsLderRislFj2/lGT8NAACA89PPEKbflS81a9tf6Oz5zdTGpccSJGAAfvv94yMNSbIuM8au+r/sq81b3Zj0wH4J5n1wn3WdOVsLXgkAAABwzvqxHOnMlx0ZwxhqDAwBDDAA1tp598VkVrRMTuSXJsdHZ7Q/Sz2IcWUfpryUHnSabGTETL//sLsoAAAAwDk7TQhDzxdcNgQwwABowPL5n918p31uj48u6n7+a2pyYnRJupRU1hQ77dMIaDY2sqtwAAAAgLNykhCG8AWXEQEMMCBTU/kdGQBXC990sdv0+tbemsuFa+vbe5WNrY+MNAYAAMC56SWEIXzBZUUAA1wgv25Viv5boYtdxw72czLmxC0KAAAAcI66CWEIX3CZEcAAF0jOhQUBAAAALqhOIQzhCy47AhjgHK1VKmPxxKTtTw+62b9morIAAAAAF1hWCEP4gq8BAQxwjq5UgyVr3ZJzdjlZXtTR3fF8yX8rSa+cKwsAAAAwJNIhDOELvhY5AXCmtOrlG5t78KVW+9kY84/G9sAGRekiXPmci+5rcOOvm1E143ZETMmfmEtv8wHPYwEAAACGiIYwf1n8X4j5F9dkiBQEGBACGOAMvf+wN2cieWGdG8sFYdNlzsSNc481UpVCMGIXazVZNi6YC5IQJwhc6c89+1KnL+n46eqITAdWxqp/yMqgJjIBAAAApzFk4QswUAQwwJlycz5pyQxajLOlY64sG79/fOKsW3Q1Kd0dvz4rbSpmbt3Kl/23sgAAAAAAhgIBDHCWgoxQxLny5z/sTDdVKs7aOR/V6Mli1uXaR8Y4KTgj5aRfDAAAAABgCBDAAF3SaUUuctMSBCUJqz/eyufL2s9lKt/98p7b46OL77Z2xwIxj5JNJRPZh90uETI1ez8KgwVj5Mj+jeqYej7jz2/vLe+H0eNe7h8AAAAAYDAIYIAubFQqBVtzS3G44ey81MLy+63dHVMz0+tbe0uT49e7bnJ7Z3x0YW2tsnjtmowlS4W6luy/0LpdK1/i8CXFOZm/8iX42Z9cFAAAAADAuWIMNdCFfYkrTtKVJAUjZjo5vdDNCOk0rXjpNXzpJJmgdIQJDiptAAAAAADniAAG6EK8jMdFT9tdHkr4RM5Xoc32riYrAQAAAAAGiwAG6NLkRH7p86cor1+mFk05514eXOhcQc6A9px5t1mZT74aFThijKy2uUpJAAAAAHSLDzAxMAQwQA906VBj+dDtidF5DWKsc88jYx9Kn2nY0rrtajWYD0z4Ivl6u76190y3T06MLjUFQsq5sr9/fb9fAAAAwCVGAIOBoQkvcArtmuJm0T4xoQQ+MIl7x5RNLprVSUrt9r9ay71Z/7Dz8+TNsbmDjYH5QVzTbgsb259Wb93460sNhPzPWD4YQz3BGGoAAAAAGBYEMEAbG5t781UX7Xx3M78ip6RTlFwUvvLhSSNRL7ha+MJ/n213nZqpPQ18kNK00WUk8tYW/f/H1S93xwldAAAAAGAYsQQJyBAHJkZe5ILwVa8TjjJVw2JGeFLsdJXvbuRX7kzkm3q7OHE/tu7nbPSTAAAAAACGGhUwQAb7JZg3STyZc+EDSZrZal+W8IsUe62KicRNB2KaNzpXlh59ydmlK9WgYIzx98ntOJHnt7/NLwkAAABwQpUv1YPT34ShDNK1kBoAfL0IYIAMNrClxmhpZ9zBtKGRarAYBOaRD2Ly8WjqLhmtfmnJX0xgFqVHyc+cT74AAACAU3u7uyeXxbXg+ICn5lznHd68Ksjs/bIAfUYAA2TQXiobG5UpGwTzGsYcXmKXjQnf9hK+qMDaRWsCHRf9ffzn3tqnk33oLXOcd5XKtFSDeT1dHbGLvd5vAGfD/f/+WeT/uy0A0CvzX7sl8s2IAKjbt1aAYUUAA7SRTDhaTG9LerKsSo+S25qXM6S9a4Ja+KZReXNtX3SpEgEMMIx8AOP+j28FAHpl/is3CGAA4IJgAR4wZLQB8LvN3cy+LhsblYJ+HXcbca8aiacsAQAAAACGAAEMMGRcNZgLjHnUGrSsb+29cblwTb/86bVfPlTm2t1Gribat6YgAAAAAHo1JsAAEMAAQ2ZyYnTJumgmWbYUe7dZ0UClmNqtkAvaV7jUcvEyKZYbAQAAAD3LEcBgIAhggCGU9Jo5UB2RcsZubXvRxM12XfRUAAAAAABDgQAGuAA0UHHiDgMV58qmFj3sdJ3JifxS03UAAAAAAOeGKUjAGYonE9mgGOaCSi2q/dha6dLJ7fHRxY3NStmEweife/bl1NTxI6X1Ov7b4tpaZayb/QEAAHDJBPGy9JJcDP6+mt7/zWqjXTnJ8nv/b3KxbvfoBVFZgAEggAHOUDyZKJCCtU4CE8rG1sfFW+N/O6hS+e33j4+stQvO/wckkGAlfZm6NZFflhMgfAEAAPhKzf6HK/7/VwTAuWMJEtBHGqBsbH96kHVZMtWokN7mxC00TmujXR/MLPnUv2DETPvLFnWctAAAAAAALjwCGKBPNjb35jVAcc4u68jo1sv3r8Vlkc2VKM51rExJxkn37Jftypy/Py/ef9hd3Kg0j7MGAAAAAJw9AhigT5yRdOVLUfu9pC/Pmkzkw5rHjdPaD8Y59zJ9eTJOuicb23svci585e/PvAnME1cL13RbUoEDAAAAADgH9IAB+qeQPjNiwtHWHXQy0cZmZce6oGADW7p7M19KX357YnTeX15yJrzn05kf49CmBxr6OCfzrdt1mxFhIlKGvT8+z4WBPJOhYv2XEQAAAACXBwEM0C9GVsUdhDClb29cf52123GNdJPLO+7Tjk5Yoq6tR86OiYQFAQAAAIABIoAB+sRUo8c2CH6KxK5+dzM/kE7z2s/F1cIXPjUoSCTPJ78dXWq6D+YE4/cAAAAAAAPHZ+VAl95VKtPrW7tr61t7r7KmE926lS/fvjm62Bq+6LKgdpORelUPX6Sok5IkNE9aL/88YpdFCGEAAAAAYNgQwABdCqLwSRx8iMyNVMO5bq8XSu5ZPBnpt90FOS0XpZc1HQmBtGeMddGsOFcWAAAAAMDQIIABumWjH+PvPtwIo6jU2KzLgnTstH5lVbo4sfXQJDRPjhsJrZU1WdU1DdrE19SiKevcc38/Hmfto9OUJidGpz5/ivL65cQ99fei52lKAAAAAID+IYABuqThRxxq/GFndLlRY7v9EsxLvCxIilrp0hqgWLGl5OSY+2KW2t2+LlW6Wgvf+q9KpyVL+rPvTIwu+JCl7W2pqan8jn7dHh9dnBwfndm/xtIkAAAAADgvNOEFeqCBRuu24xrfGucvb0wUDoLRrH2S5rpvDjZYW/T//1L6pFNVDQAAAABg8KiAAU6p3vhWl/i4HV0WpH1Y0pfrkiDjoodB4BY+f4rud7ipw+sFUpJjaKiiVTPSBb1PrfcLAAAAAHB2qIABTikJNmY67XNrIr/c8fJ8vryxUZkxV4J7ev7bv48eW/1ypRosGWMerG/tlT/noplGwPL+w95cYOSeBEHp1o2/9q2KBgAAAABwcgQwwJBI+so873Z/H778kJws5Goy7b+X4u2BPHN+mzg7/+tW5ee74/mSAAAAAADOFQEMMAC6POgbm3tQi+yUdbb03c38ivRZzUSPcy544qy8vnuzKWQ56PcSRsFBMAMAAAAAOD8EMECfNRrqWnGFwBgJTKgTjfoewHx3Iw51jtyuddGs/5lv4zOheeTDoGX6vwAAAHzF3rwqyPnYkdn7/DsUSBDAAP1WDYtipJDacp4TiApXvgQL/vuiAAAA4CuVW5Pz8ubfdrvnTjzUIpPZEcmaPGrKBydttNu0T9C4LCon28uEQThvBDBAG+nR0Okmt8fZH4lWrtaCR/4/CLr8R8dUL3faXycZGScFZ6Tcj34tuTD3g7Xu4LwJzJP1rb0nphZNJX1mAAAAgGHjP7Q0PX5wefhvXgnaDfhNHfK++bf67/lVsfYnCeyKD2RKApwhxlADbfjw5YVIXMlS+Eu1qaKlIw1qJsdHZxqjp/c/Ro/b7euDkWehhG8CE77Q7xtbH5/IKWxs773w4cuSAAAAAGilAU/RhzX+w9LcGx/IrMmbfzMnwBkhgAHaca6QnCpNTORXpUc6evrbv48+n5rKrpzZ2Nyb998Wmn6kuMXftv+4J13QRr/vNivzWqmj57WSxjmZFwAAAADdKIiYF/Lm1Xm2DMBXhAAGaGNyYnRqcvy68V+zMgDOyIOs7TVbO/bnafhytRa+1coZVwvXNHyp5aTnkAgAAAD4yvnwJVeR//jfLAgwYAQwwHkxklkZEwbm7XFXvbYfl08WGudHTDiqS59qJrov8dhpV7bOPRfnygIAAACgydhITu5+c+1wQ2CeUAmDQaMJL3BOIhc9DyVsWnPqrHs6eXP05XHX1Wa677d2nxoRbfa76qrRT7q9dTT1xkZlSUIp+ljnh/1rQtf3DCOhlGoSDaTK6aSMM9PGBM8EAAAAXbnW0oQ3FxjJGROf/iYM49PX/PdrYSD53Eh8+a9/7qevMiY2/rf5sgADQgADnBOdeOQDkikNSEwYjFat/enuze6nIN0eH12UY8ZLJ1OPloX/kLT1zTfflEXHEg6Rj39WxaS7+gMAAAyQhhONsKKVBhYNIz7kaLtfmylE6etn0XAk+z4FcUjSy8/qVaVabd4QBD8I/27GABHAAOcoFZAc0c/x1Nozptsx2gAAAPi66FKcqb/8C/na7EdRyxY3LcAA0QMGGDI61Wh9a28tPZ5az29s7r1oTDzqxW+/f3x0NQrXNjZ6vy4AAABwWX2qtQYwhz0WgUEggAGGjK0Gi3L0j79Wwsy7z8Gc9EBHXVvrlsQJDcUAAACAxH5kszbzb2YMFAEMMGSMMf9od9nnq3ZZetBu1DUAAADwNas6m33Bm1cFAQaEHjDAkHHW/WzaNBxrpUuSXC18oadNLnp4Kx/3lEkxPsWnmSsAAACQFln+jYyzRwUMMGRs0LbKpdTaSDcJX4r65b6YpSPXcLVjR1oDAAAAOMAyJAwMAQxwTrQprk4nat2uE4+cuKfNW92OqUUPj9yIkY6TjSYn8ks1E90XAAAAAAf+tFGbS3IEMBgYliABZ+z9h705E8oL52Tsak1kfWuvFEn0tJaT1UaFy+3x0cWNzUpZJPwhErcbRnYpGVndxFSjxzYMdgMxTmxraFP33Y38iv8ZjKAGAAAAgHNEAAOcMROYJ+JcOlkvhhIWQx/GbGzvLe+H0WMNYm5N5Jf9ZcudbisJZeblGE7c8+66ygAAAACXX5spSOI/1CwIMCAEMMCZc23LGp2T+VxNtG9LSU7g3WZlOhfmfohqNu+MXbkzkV/V7VpRIwCGlrk9KvI/nhEA6Nk3IwIAuBgIYIAz5sS9NGKepLdZF83YQAoSiXx3M1+SHiXTkN74kwVrnVbZiJHwyfpvu48nvx1dEgDDzR9AmX/5nQAAgLNRc0xBwtkjgAHOmFajvNvaHQtEHvizO9aZp0mlyupx19Wmvdf2Zay1H4z9EswbDXBaheae/38CGAAAACCl1n4MNU14MTAEMMAp/bpV0R4ujz7nooetY6LbuTM+uuC/LUgPGlUuLieF9a29sv95M42fF1i7bE1QMEZ84GIO/6MRRa8FAAAAQJccAQwGhjHUwCnlnBSMk51uw5eTaiwxSs4Wrn4O5huXaUXM7YnR+Uisjpxu3I/S5Ld5ql8AAACAFu3HUAODQwUMcErdTCs6rY2NSsFJ8xIjZ46WR94dz5f8vjNRKGONBrwAAAAAgPNHAAMMibi/Sy33SKtpvp342/P0ZfvXZOdqLa5sOQhdwtC8zbqd1v4wAAAAAIDzxxIk4AS0H8v61t4rHfssfTJSDRaduEVr3JJWvKQv0+VNphbNBIFbcNY91a8ocjN6PwQAAABAT9pOQQrCfwgwIAQwwAlE1WBBxBXDSPrW9yUQW26cdrnwTWu4o5Ut3/599HlwxS6bwDzRL1cL32rlTHo/Pe+vO084AwAAAGTrMAUJGBiWIAEncGei9ylGDe8/7M2ZQB7paZOLHt7K15cMGQl3Uv8ZKAQmfONDlJnG5QeqYdHv3BCPpZbDxrty1Ycy/vKCq8UTmmZHgtz31toFU7OzLE8CAAAAgPNBBQxwxnz48sx/K+qXq+VeNbZH4lqXM425z8Fc6/X3R6IVca6cnC2lQ5Vk6VKhcT7nwgfWuiX/UwsCAAAAINZ2CRIwQAQwwNlLLRmyB6f8m7HcuqMNzJElTtoPZnJidMrUoqnJ8euz6cuSMKaUulE9PdDx2AAAAMBFQwCD80AAA5wxJ04nHJWsc89Nzd5vbP88YpelJSxxJiq3Xl97vGxsfXxic8Gr9d92jyyD0lCmZqL7NRvdv3Xj+kvroscCAAAAADhX9IAB+kSb3la/yPR3N/Mrnfa7PT66mLVdK1s2NiozUShFG/ggJhLxt1Vq3e9aNZxzxi0a8f/LyWrWbX134/A+3JnIL/vbLdH/BQAAADiGs3kBBoQABugTVwvf5AIpvP+w+/T2zeyQ5ThJSLLcaZ+aicqhhPoTd6Rqn0r3twsAAAB89fYj2/5CY0YFGBCWIAF9kG5+G4TmHzJAd8fzpUiiWVOzMwQrAAAA6OjNqzEBMBSogAH6QIOQd5uVGX9yuvpJVrq5ji5Ziqoydmcivyo90hCmddu7SmVaqjIdjkjpyOhqAAAAfK0IYIAhQQAD9EkSpHQdpmj4Ekb9mVCkYY6rhW/F6FIokV8+VO4f14sGAAAA+BpVnRXgPBDAAOfkJJUv7fjw5UX6fC4In/lvBDAAAABAi8gyghrngx4wwOVQOOY8AAAAAOAcEcAAl4B17nXrtvWtvTe/blWKAgAAAAA4dyxBAoaQTlXqZsLRxtbHJ05c0eaix7YWaKL6g4jRvjLT/qsYSljw36cEAAAAQKwqLEHC+aACBjhjGq6826xMZ1322+8fH61v71VcLlxb39pzG9t7L9pVseht+PBl0Z8sBp+D4p3x0YXJ8dGZyfHrs+Kip/FOrv4fFyphAAAAgLqapQkvzgcBDHCGfKjyTMOVwIRv323uLqUv29jcm7fWLflA/mBUoM9P5kMJ3/jrvdIlRVrx0rgsF+Z+EFNvtBvkzFr6tiYn8kumFk19/sPO6O3qbQgAAAAA4NywBAnoIx0HbWzunnNm59aNv77M2GWhcSIMzGj6AmfkQYebnov3EVd8v7k7dXtidN59qb2evJV/rtUtkzfypdYrNJYw+eCm0+0CAAAAAM4AAQzQR64WvvEhSUGjkvcffFByc3SxZZeS/yrqiZqLXsoJBIGJq1kaAcvd8aPhS4uCAAAAAIjVaAGDc0IAA/RJ0mel0DhvAvND6z6fc9H9b2zwoGrtT63BiXXR48AEL5Imuvo1l77cGFnW0ObujWMDl1ZlIYS5UEzodiRyZQEAAEDf0QMG54UABuiTWk5Ww6o/aDamoOc1MGndZyqf12Dledb170zkV/23mcZ5bdbrcqEPZFzBh/QvJ28cqabpinPuZ+PvDC6Ov165oq8FplcBAAAAlwgBDNAnGq740GS2OiLTxsnOCSpVmiRLjGblFLQB7zG9ZQAAAAAcKggwIAQwQB8loUlZBkyXO4USPnHixgJjVvfD6HFSXdPEOlek+gUAAAAAzh8BDHAB+fDlhf9WMGJ0VPX01VpYkKxqmWDwYRAAAABwkdQcXXhxPgIBcBEVWs4XNzcr0607fcnZJak39AUAAAAg2oSXAAbngwAGuJDcauuWKGoOWjYqlcLVWvjKnxwTAAAAAMC5YgkScAHVjH2ac3G4EnPWPZ2s9585YL8E8yaQouDCqfz5ZyFng3kBAABnKhfY5W+++aYsADAABDDAkPhle28u50RDlaXJ8euPO+373Y38ysZGZcoGwbwNbOnuzaMTl4xJV8QcrZjB8MpJrhAE7okAAIAzVatJSYQeegAGgwAGGBLGRTvaXtdb8OHK81stFS2tkssX210+OTG69Mt2pRxYGav+ISsCAAAAQKpCDxicDwIYYEjcHc+X3m3tPtf/Htw5JnzpllbKCAAAAIADNWsFOA8EMMAQuTM+uiADsFapxI14p/J5JiIBAAAAwDlgChIwRN5VKtMbm3svNrY/PZA+iachReHatX2mIQEAAADAeaECBjgD7zYr0+GI7NzKd15aFNTCV85IQZydf7+9V7x94/pDOYGNrY9PnLhpPe1qcfBC+AIAAAAA54gKGOCEtLLkt98/Pvp1q1LsuN/vH58EJnzrauEbvU67/TSk8d8OLjdO5tO33VhGdOz92tyb9+HLoj85l3wVBQAAAABwrghggBPSQMVatxRK+KZdCKOhibNxGKIK7nMwJz0YMeGofn//YW9OlxGtb+2tdQpx4vslrjmoca5cM9H9/WtC/xcAAAAAOCcEMMAJbGzEIUihcT6wQTFrv7jprQ9ADvbLmTVp485EfjW9r57+9sb113rSBPLIJytj8c+shk/i+7C992L9t90jTXs/j9hl59zL5EY0dHmu05BowAsAAAAA54ceMMAJ3LqVL7/f3H1pjNFmuaXA2uV2+5rIzlZHZNo42Zm8kS91ul3d1wbBfJiTyp979mVju7PuZxOY+HQkbjfZVrSB7LbeRhK0zK+tVeJwZmqK4AUAAAAAzhsBDHBCtydG5/23+eP207DGfytLF5J9F1u3+4Bn0UpQ1mDmcxLMTE6MTnW6LYIXAAAAiFwZE7GCQ/sRjwfOBwEMcE60b4yzMjZyRVaPm47ULpgBAAAAOvsyxmEfMBx4JwLnYH1r75n/tqBdmGzNrfrTM3JCGuTkXPigvjTJLse9ZAAAAAAAQ4UmvMAZ+2V7TychHTTPNWKmjxtl3Y6OrtYpTM7IfGDMo8CEb7odVw0AAAAAODsEMMAZy1lXaN1mXFiQEwiC+kSklLGRatjTqGsAAAAAwOARwABnzER2pXWbM1FZ+sS4owHPxvanB8nobAAAAADAOaAHDHDGtKHuL9uV+zkbPBMjY9bJy7sTR8dT67Ik46TgjJTvjmePrzY2eu1Mc8WLDWzTvrokydXsohGZFQAAAKBFzTkmAwFngAAG6OD9h705Z1wxDMK3t2789aX0yXc38loFs9Lu8oMmvebgfGly/PqRAOXWRH75/dZuwe92z58dc+LDnJawJleTaf+tIAAAAECGX//cj78ADBYBDNCBCeSREVN0zsrG9l7x1o3rD+VszLecL7Tb8fb46KJ0GFHtA5iy450OAAAAAOeKHjBAB07cjwenncyddsKQXl8nF0mPjJGSnJAueXLO9a16BwAAAADQOwIYoIMvObvkk5dy/Zw7dv+NSqXw/sPuoja9bb1MlzNdjcK1wIRv17f23nS6HR/8PE+d25Fq9FRO4fbE6LwGMQIAAAAAOBcsTAA6mMrnd/SbNsStfZLVqan4fFuuFr4wgcRLljY3Kz9NTORXG5fpciafrDQqaDpWweiyoo3NStm6oOCMXblDeAIAAAAAFxoBDNCFdlOIjnDRazFhUatmokh2Mi+TeEnRynE3pQ12BQCAU3r/z05m/6OaAMPu9r8w8uY/4PAEwOXFXzigjyYn8ksbm5WdSGS1tWpFL/tlu1IOrIxVPx0fwHTjt98/PnKRm44ken4nVW3TsLH18YkTp9U25cnx648FAAAAAHAuCGCAPutUuZKMn+6Ljc29eWvdko6qDiSc85vy6cvXN3cXfPiymNpEAAMAAIAh0+i3OGim3N/9gN4RwAAXlDOSbvQ7phOWkp41MStSoMs2AADAV272fknevJqSk5i9XxYAfUMAA1xQ1kWPAwleiTEFZ93TdPiiwsguuVzwg0/xex57DQAAgEuEIAUYCgQwwAWV9HyZ2tioFCYzpiQlY6dnftmuzEkkAAAAAIBzRAADXHC3jhlR3c++MwAAAACAk6FFBHABaJVL1nbt+/Jus8ISIwAAAAAYcgQwwDnSAOXXrUpxo5IdsKiN3z8+cblwbX1r71nTdn+dq1G4Fpjwrb9srdNtAAAAAADOFwEMcE4aAUoo4RtXC9c2tj4+ad1HAxpnD0ZJL/y2/ce9gwurYVGcjCXnClE1WBAAAAAAwFAigAF6oNUq/VryEwcmhwGKP+kWNXBJ76OTjZxzLxvna/bLzwenTVRO7xsG5q0AAAAAAIYSTXiBHmi1ihgp+ZOzckpGwxfTvK11lLS6PTE6/8t2ZcXvv3O3Pvkodnc8X9rYrDy0LiiEOal8+/fRg6BGe8bUclLI5aR8K9+5SS8AAAAAYPAIYIAe1Ex0P/oYBzCnFhhbchI+qJ9zO+Lkabt9200yujXx/2/v7mLjOs/8gD/vzFCWHdsiu5ZdOU48WuxVt6hpoECBfiDUXYEFGqUXLbY3lgt0m8SbWrpYFGj8QSfxFu0mFd3EyQJb1HILtMUWqJXtor2rmIvdi37ATJEt0I+FxnYs2ZYTUrJs62POeXvOiFQoipRIaYYczvx+9vCcM3M4/BDJOed/nvd5p06sve/shxdeyzmONOtn7cbS6cXFg3WwU1fXrBfwjLsLFz890mw2X4uhkgMAABgtAhjYgn5O6VyHJ29/uLjUKGPy6sdxskpJ7jocqYdI1eHLqrsm77ncqLfnhC8AAAA7RwADO6ifgU6t24qFZjfqoGUyAAAAGBqa8MIIqatcUrd4MnLu9O6olimXfQ15AAAA2DoVMDBiDhzoNd09WDfiXV4HAABgh6mAgQF49/0Lh89+cOG1t99fPBw7RPgCAAAwPAQw0Gc//WBxOjXijZziSKvRfK2efWgr71/vv9X3qZ398OJTZz68sHjm3IXT9UxI9ecRAAAADAUBDPRZM5qrg4/JvZe21hD3nm7zzeq2uNXqmZzz0ci9j9WuZ0JqpOab7547/+bZxcV2AAAAsKMEMNAHdcXKStBxaaI4WcUhC70Hcu5sZShQPY10tWjX661G86nYknzTNNMp0nTuNl8LAAAAdpQABvpgb8RkeSV6lS/1TESP7t/3ZBHFoVSUh7byPJ/bPzXfTcWXylw8ffli8fRW3jd1i6dzzq+v89BMAAAAsKPMggR9cGCqV+XSWX1fHaasrL/3s4+eLcvcfnT/g8du91yff2jqjqaNXq60OfLTDxbnGtF4I1Jq96picrwUAAAA7CgVMLANqvBltsw5RZ/cqknvYw9PLTz68L6DqVscvHyxPFitzwUAAAA7SgUMbINH9z84FX3y08XF6UbRPHXm/aUfPfrI5IaNek1DDQAAMDxUwMBdeufcRzP1tM/RZ2fOXTjem8Xo3EcvrtxXN/qtw5febEc5zwcAAIyA+ji3Ov5dNIMno0wAA3etW08BPXOrYUF36GhvFqPIR1fuuBRR93RZqD7gsUf/7NT1oUX1xx7AxwcAgG2Rrzbqyu7J8krjSMCIMgQJ7tJys92D0Xf1VNZpOqW43pS3nmGpWtw0s9I93eab1aJ95r3zVTDzi54vdWVOznGkWp2/3Cq+tPz+AAAwXFL6Ym/RSF8IGFECGBhSly+WhyY+E+3H9k8t3Gq/s2cX27kKX+r1snFt2bv/Zx+9mMt8ZHlzZu+lqCtkBDAAAAyj6TVLGDmGIMGQOnhwaqme0eh2+9XNdsvIr1SrJ5tF2at+qcfOVuHLbAAAwJBbHkq/Mpx+sr7AGDCCVMDACHhs/76jq7evFs1pv9wAAOwGre6NVS9povlEtegEjBjnaDAE6tR/M/1Zzn5w4UhOUY+PnUypceLAQ/e/vt5+E1eLhdxqBrf3wGf2nrx06dJ8DJGrRcw0m82+z6wFADCMcmpORv7FdtnNA+ivCDtPAAM7qDdUqNt4I7qpXYUwB28VwiyHL9dPynMuZ86cuzD96P4Hj63dtx6W9O658y+lSC8Gt5RSqr/nQ9Ub56NPr3Zi9VEIAMAIa5W5XR2UXd9e3dcQRokeMLCDctE8Xs90VK1Ori29vGnfFOuFKUfPfnjxqfX2/+z+fbMpF09Xqyer17MjdSgTAAAwZHK+3v+lpxlpX8AIUgEDO6gsi5ca0ZiuEv/O8nTWt9Le4ElmqrfrDkU68PDUiWpxIgAAYHi1V29UFx7bASNIAAM7aHmWo82Oca2HyUyuvbOIfD4AAGCXSs2078bR13kyYAQZggR99tPFxekz5y68cfbDC68tT6nXF/naVNPrKE8EAADsVnntRcYkgGEkqYCBPqoDl0a3+Ua12s5Vin/P5caPq/W56IO6p8uZD84vRYq650u7emFayGXxymOP9KpoAABgVAhgGEkCGOi/6y8YqZUWo48efXhfHeb0JdABAIAh0V6zLYBhJBmCBH1UTyNd5uJQtTqfI7904KEHX7/T56qraeppqgMAAMZMP4fyw7BQAQN9ttxY91DcpT1XGnO5kZ6qXnym6mAnAABgNN0Utuy91LvPMTAjRQADQ6pRlrORmjkA4C79pV9KAcPus/cF40u1C2NBAAND6sCBqU61eDr6oC7hVEUDMJ4+e1+Kf/1XHPIBwE7TAwbGwMTVaJ89q58MAAC7Q7d1U2Ne2PVcDoER8865xZlmNF+s11OrePrA1FTn6kTUNwAAGCr1RUJj7hkXAhgYIe++f+FwinhjZTt3m6dOLy4+afgRAADAzjIECUZIasSza+5q31s0vxAAAADsKAEMjJJkqj4AAIBhJICBPnv7wwuHz5y7kM+8d/5obLOyLF6KnDur7prPV4sfBwAA7CIpN9sBI0YPGOizlIuliGb1f6qHA83FNnrs4amFanHw9OnFyXr74EG9XwAAGF71bEfNgPEggIE++9z+qfmzZxcPFs2YjB0ieAEAABguAhgYgAMHpjoBAAAAy/SAAQAAABgwAQwAAADAgAlgAAAAAAZMAAMj6J1zizP1LQAAYIjl1Fx34oqUcztgxAhgYAQ1o/lGdTt15tyF06cXF3dsNiYAALiViTIcqzI2BDAwgnLkV5ZX23sveVEDAADYaaahhhF0pVXO7bnaaKeIBVNiAwAA7DwBDAyh93720bPdojzYnCjnDkxtPUA5ODW1VC2OBAAAAEPBECQYQkW3fLKR0rO52zz9wQeL0wEAAMCuJoCBIZRSLFxby0tFEUsBAADAriaAgSH06MP75oooDl2+WB7UwwUAgFFVbjDddCOlxwNGjB4wMKQ+t39qPgAAABgJKmAAAAAABkwFDMCQSc28FEXuBAAAMDIEMDBi3jm3OJPLmPz8I1Mng13p/j176ibMBwMAABgZhiDBiGlG81Sr0Xw2AAAAGBoqYGDEdFPxpYmrK9NYAwAAMAwEMDBiPv+QoUcAAADDxhAkAAAAdko7YEwIYAAAABgqOQlmGD0CGAAAAIABE8AAAAAADJgABgAAAGDAzIIEDEw+PjsZe2Myut3paDQejygPRqR9kar7cnVbK8VSdf9SlOVbkXMnUupEa6KTvjLbCQAAgF1MAAP0Tf7BbLsKT75YrU1XmzMRRbVdrTVS/WjUCcu1HTd6guVlY1VxXllE/t7zS9W7LlQ7/Lh6vvnotubTsdmlAAAA2CVSANyhXoVL6+p0FbAcjpye6lW2bN9HX4gy/zAa+WR65rcXAgCAXefd98+fSI3qOPJm84/uf/BQwAgRwABblr/79ZmdCV021Kn+nM3FlcYP0zHDlQAAdosz5y6cil7l9E0EMIwcAQywKdf6uZTPRhmHl4cYDacUJ6MoX0lfe3k+AAAYagIYxokABkbQ2bOL7dgbcWBqqhN36XrwUuSjQ1Ltsll1E9/Z9NVvvB4AAAwlAQzjxDTUMGLe/vDC4dxqni6vNI7EXaiDl/yDF16MieJ0lHl2l4UvtXbkfCK/+vzp/P0XngoAAIAdJICBEVM0i/lGIx+98kk5F3cof/+5w7GneHOXBi9rrQQxr1WhUjsAANgN2gEjxhAk4LpeQLGneC3WLwMdDY00m77yjZcCAIAdd4shSJ1H9z94MGCEqIABevKrLzwbE8WbMcrhS63Ms71hSaphAACAbSSAgTHX6/Xy6vNvVGtzIzDcaLPqSp/T+fvPHw0AAIBtIICBMVaFL9O9Xi9RTy09hnIcr0KY4/n40XEJngAAgB0igIEx1ZsZaKKox9y2Y5zlOBp7HnjTkCQAgJ2QXAhjbAhgYAzlV597sZ4ZaIyGHN1OPSTplBAGAGC7ZcejjA0BDIyZXvgSaTZY61oI8+o/mg4AAIA+E8DAGBG+3FY7onnqyuzfEcIAAAB9JYCBMSF82Zzi3DuT6ZNPhTAAAEBfCWBgDAhfNqcKX6K8+PPIZTEZH11849N/eLgdAAAAfSCAgRHXm+1I+HJbK+HLdSnazUin8uyX2wEAAHCXBDAwwnqz+pR5Lrilm8KX6w8U7e7ln70WAAAAd0kAAyOqF77sKU6ZavrWNgxfluWrl2eKr//t4wEAAHAXWgGMponubERqx7DIsVS96URKC9XyfJR56aZ9Go3HI+d29XlPb0dwdLvw5fp+lz89evm5v/Wje771+ycDAADgDqQARk5+9YVnq7c7O/SoDlxSnIyi+FFM7JlPX5ntbOndfzDbjm63DmIOV6HNF6I3RXT/bDZ8WZEazaXWfY88mWZ/txMAAPTFmXMXFqvFehfeOo/uf/BgwAgRwDBwpxcXJ/deWr+aoWjGZF5T6ZDLmGzcovoh5UY7tqB+/makfZvdv4h8PvWqNbYmp7Kz0WNl9Xypsf5z1h+rWaz/2IEDU53Y6udRDz2aKN7csaFHOc9Xt5fS116ejz7K3/36TBXEHKluT8Vd2mr4siLt/cz8xLf+7aEAAKAvqgAmb/CQAIaRI4Bh01aClG4r2lVo0G41W/u6RXmwDjeWQ5TqVg8fqaQ0GVnvkb5KVUiT81L1CrWUItWBzVId3pQ5v1WHP9W/QafVis6f/Tf/rG4aOxPbqQ6scvlK3D8xl56e3XJ4taUP1auMuXokGo06iGnHFt1p+HLdgw8d2/PCv9TYGACgDwQwjBMBDLfUC126rWdzykcFKsPv3s5PYvK//ufYZifivuaxQQcva/WCmKI7u5WKmLsOX2J5KNKVxYNpbn5bv14AgFEkgGGcaMLLLe252pirwpenIgdDrnH1cjzwkz+ObdSJsny630ONNmu5p8yRKoiZjbI4FbephulH+FLLZTHZveehF6vVYwEAALBJpqFmQz/9YHE69aHfBtvjM//nv0fzk/OxPfIrcV/zyZ0KX1arg5j0zDcPVmHQSxvt06/wZUXOxdE8++V2AAAAbJIKGDaUkyFHu0Xz4/NVAPM/Ylvk8lj6zZeHrgdKFQbN5u8+txCNVPfAuf6z2+/wpacsosgf1x9HQ1627OzZxfbt9ql7bd1un9s1LF9rqw3Mex9ji03MN/F87RgPS3fSzH2tusfXVvZvthqL3aJ72yS+7hl2u31a3Y33uZMG8QCAHjDcQt3/5Z5uczEYenXfl7r/y0Bda7T7pWGoermVXm+Y5SFJAwlfVjSaMbH/lw+l3/rOfLAjVoKMtbOprRdM1E3Di245tfY5Gik9vt5z/6Kx+DqPRZ5McavgI7UDxlLu3LD1i6bxq90QTq2deXB1iLR2BsHVoZAQCEaHHjCMExUwbOjg1NTSu+fOv1QdPL0YDK26+mXPB+/EQNUHx6l5KP3mNxdiyNVDkqoQ5lBx7u1TVfjSjkGpq2CW3q2H6M0HA1WHwRNX43AVl0ynFF+4Fn6k9srR2k1jadcZXFtWZ3KpcfM1hztpb5Vcu4ANpPYNWxvslVc90Kj3WrVd/642UvPaY2ueIK86aq1O2FY+yNoZAqMKdDorwU4R5UL1PJ3HHp4a+tcvAEafo0hu6+wHi0eK6sSnulL8RHX4M1392BiaNEQGPvPRSvjyzOyuOnj99B9/ud1cfP/NKigZ3M9rXQVzZXHKjEiD897PPnq2zHnWLGzAXepUAe58NIuXDkypnoFhogKGcSKAYctOn16cbN0f073eAEWjt1wOZ+oTpLaApt9yfXK/fIKfOr23+VoZdt0f4JH/9HsvDrj57tPpmW+eiF3oyuyR6bh08c3oXolByTleuuc7fzAb9N3ZDy4cqf6+vBYAfZMWHt3/wJMBDA0BDOPEECS27ODBqToMmF/ePLnePnVvhpW+DL2ApozJVrOxr+hGrwfD6saONzdlzKu3J3dHoLM6JOmp1q+Pe79hvPtKU8VmKxa7RXltnHvj2j71rVlc23cz49vzd587HI2B5qgv7dbwpbZn9sTClW/83WNx4cPjMSCNPXuerRazwQAU1a0ZAH2TSxeJANgxKmDYdeoKnL171x+OsLYZ551aHYSsZ1ia/+XvPXciBjZVeF5Iz3xrJK4SdmePvFFe/PnhGJAil4fu/c4fzgd9Vw+BzKlZ/4zPBMAd6/WJeeXKxXJu+UISMARuM+mHChhGjgoYdp3lA6exP3jKx2cnIxWDCV/qip1m60sxIpr72k/nK5/OVLeBXPlstu7RjHdADjw8daJanFgZ+tgoGzP1zEXXKucMewRqN1Sh9ipQVxrxtppx+mpZ/vhz+6fmAxg6ey9VF083PiP1+s7IUQEDu1R+9fkj1WJQ/THqoUezMUK6L/+9I+Xi+4P6fi1NfPaXD6Zjc66q7qDV1XHrVcNVJ2Ttte+TcqO90fOtHiq5Fbeawnrrch+fa7XUDobYjdM5371r/cPu0g3DabdiZejtelYPx73hfRo3fry1lamXLsWSShbY/eq2BbnVPL3R44/uf9D5KiNFBQzsXl+MweiMWvhSa339905cfe7Xn8qXPp6J/pu89NP/Nx2qYHaU6rjdrT4Ijx3khB4AGDQBDOxeMzEIKc3GiGrte+Slq1femomyiH5rTkzUPWbmA7gjw9JbCwBgUBoB7Dr5u1+ficGMi+2kr37j9RhR6bfm5hv33j8fA9EaVEUSAAAwAgQwsBulxnQMwghXv6zIrXteikHoXm7nozOaxQEAAOsSwMBulOILMQip8aMYcRPP/4v5tOfegfR5KD7zyGD+XQAAgF1PAAO70yAqYH6YvjLbiTGQG42BDLMqcxwKAACAdQhgYJfJx2frYS7t6LeU3ogxMbHvkZMxALnotgMAAGAdAhjYbVpXB9T/ZfSHH13XmlwYxDCkFOUTAQAAsA4BDOw6aQCNXvPCuAw/qqVjs0up0ViIfssDqEwCAABGggAGdp08gAqY9FaMmTxx34+j38oi8uyX2wEAwG0VzTCDJGNFAAO7TUrt6LdczseYSXvu6X8FTOXqx+85kAAA2IScBDCMFwEM7DYp7Yt+azVPx5hpPvjwQAKYxp57Hg8AAIA1BDCw2+Tc/ysFV4vzMW4asZRae6LfyiufTAUAAMAaAhggojXRiTHTazrcaAYAAMB2EMDArtPofwXMpaW+T8m8KwwggEl7HmgHAADAGgIY2G1S/4cgpWNz4xnAAAAAbBMBDOw2OfU9LMk/mG0HAAAAAyOAgV2nVK0yxPKVjzoBAACwhgAGqKfu6X9fmSHXq/rpXom+m9gbAAAAawlgYPd5K/qtaE7HuOlebecBBDDF5U87AQAAsIYABnabHP0fgtQox64C5srSuwP5mlt77w8AAIC1WsHYO3t2sX27fYpmTOYUmz5hzWVMNraw/3apvoZO3IFUhR7NYnPBx4EDU50YpJQ60W+p8USMmUbZnMnRf62P31sIAABuK6fmZNzigKw+Txn4sTVsIwHMEDi9uDi591JMroQc1cl+u74/5UZvWd/XjLRvZf9qu319PfJkis0EHam90SObOQndcqnUqNVWVd/kvMnfljPnLmxir9zZ+LGbApaltFz1UkQ+/8n//NHj9/3v/xZ9NhPj5uon/Q+dGtVv6ty8JskAAJswUfbOf2BsCGC2WR223Fu2nirLPFOdhE9HSpPRrf7wtFZlFunGZb3YKCRJ4S/W7pTat3jwpsdWXpga1b/3J4//uRhAANOum9Kmr8x2Ymykmeg/1S8AAMC6BDDb6OziYjt3m6fKyO1r96TNlZ/AKsVn9sVAFFcPV2/nYgx0/8lXDpfn3o1+K8ui/w2SAQCAkaAJ7zaqw5dYp7oBtqKcuCeK+x6MvkuNL8aYKC99ejgGIs8HAADAOgQw22S50W07oA8uP/y5GICZfPzoWMyGlC5/OpCwKedsCBIAALAuAcw2We7erTknfdGdfCQGYs8DR2PEdf/p147kK58OJGja+9ivCGAAAIB1CWC2UZmLQ9Ul8k7AXbr02V+JAXl25KtgLv78xRiIPJ+OzQlZAQCAdQlgttFjD08tpKI8lHLxdLU5X52wuVrOHakb8Q6kD0w9pfkIV8HU1S/lJx+1YwByTj8KAACADZgFaZstD0U6sXzrqfvDdFvRzikm96TG40U3phopPV5vR31CHHl5mdrBmMp1ZcVKdUW1TEtXHnqsfe/b/6sd/VdXwcyNZDXHwKpfqjR7733zAQAAsAEBzBBYDmU6m91/uaFv1KFNvayDmkbZC2si5cb1+5qR9q2sR8SaYSUrU2FfVwc8Y9GA9c6tO3ysF4as3k75xl4/Zc43TE2cU9m5cfsX//at7o0/B8s/G+t/Nt/9+kw0Gqei/1aqYGZjhORvH3v26nt/2o5ByNGZePnfzQcAAMAGUsAtrIQ961kJgDajCiU2ve+dKBs3Bx8bWRtyrHWr0GPY5FefX4ybwrV+KZ5Mz/z2SAyTy8dn292zP34zl8Vgvlc5ndjznR8+HQAAbNrZDy4cqS5GvrbR46lbHNxNx+ZwOypguKXb/MG71WNshzK/Ho30bAxE8418/OiTozAUqVj609cGFr7UGumVAABgS3Kv1YKaAMaHJrywq+WTMTjtuOeBgfVM2S7Ft37jxfLj8zMxKDk6e37npIbaAABblHNogcBYUQEDu1j62svz+XvPzUdKMzEIOY7m7z//VvrqN+diF8rf/gdPdT88MxsD1BixXjnArZ1eXJzce8kJA/1liAXAeBDAwG6X0uvV25kYlBzH8/dfWExf/cbrsYtcmT0y3f3gnblcFjEwOTrN4sIP197djxO0rfRYWk+/+y6tNPjeDvUscLED1m9YvgOfR+TJNASfx+akdoybbvVv5OiJPjtz7kKMrBRLkfOQDWdOndh+m+5XeKfWTvzQL2snkOin1EhPVC98G1o+HuoEjAgD7mAEDLYZ77KUjuyWECYfn50uLrx1qvzoZwP9nlz6838tLv7a3w8AAPqviOLQ5/ZPzQeMCD1gYBSU5eCbwOZ8In//+aMx5HrTc08Up5oPPTbZeODPxCB98lf/ZgAAAGyGAAZGQXei7tHSiUGrhyP94IWhbcybX33h2Wg0TsW1oSTRfOhzMagQpq5+KfftDwAAgM0wBAlGRH71+SPV4rXYDilOxuXmsXRsthNDIB+fnYw9xfFq9ch6jxcfvhPlRz+Pfin2PRTnf/3rAhgAgAEyBIlRowIGRkR65psnIuf52A45DleBx6n8/Reeih3WG3K0p3gzNghfav2uhLn0F/+68AUAANgSffxhlOT80sCmpL5Zu9cXpq68udJ8erurYfLx2XYVvNQVPzOb2b8OYWp3WwlTV798WgUwAAAAW2EIEoyY/N3n5qKRno3tdyLK8vX0tZfnY4B6FS8pHalud1R9c7fDkZaOvBzdR3ZklmQAgLFiCBKjRgADI2a5H0o9JKcdOyIvRGrMxeXGj/pVFXPtayqrwCUfjk1WvNzKHYcwqXxlz+/84R3NBHX69OLk3r0Dnip8A93WTv0s9E9OMdkod+b7t5Nazca+ohtTQV/VP0/NSPsCdrki8vmUYynYtGYrFrtFeT5GRNmIpVH+GehejIWDB6f8jDMyBDAwgnpVIvVsQDtvPsryR71ld2KhCmQ29QLaC1xaV6ej0XyiF7rkmF6Z2ahfthzC5OhMFI0n09xJBwEAAMCWCWBgRO3gUKSN1VdoUixUt6XeenXl7toD169Et1fdBm4rIUzRbRy8d+5kJwAAAO6AAAZGWP7ec6e2sSnvrrSZEKaMfGzvt//jXAAAANwh01DDKLva+lL1thNs6LZTVKfyFeELAABwt1TAwIjLP5htR9lryjt2DUy3YoNKmIU93/6DJwMAAOAuqYCBEZe+Us9E1DxUrWoeews3VcLUTXe7jUMBAADQBwIYGAPpmdmFanEsuKXrIUwVvhRF45AZjwAAgH4xBAnGSH71+SPV4rXgVjpx7tyhNPu7nQAAAOgTFTAwRtIz3zwRZa4b86rsWF8nGk3hCwAA0HcqYBhrpxcXY++liKIZVS5RJZLLvxGtZiuKbnnDvjlFaq75lcnr/Abl6r/b/mKlVO/YJ3lTe6RVn9WBf398OnL3P1Sr7eCanOfjM60vpadnhVMAAEDfCWAYC++cW4yJRitykdO10CT3QpDLzWKyCmAmqwBmsgpg2lUA05spqApg9lUBzA2zBlXvN1kFMPvW3hdrZheqApjJdLsZh1KarHbs06xEuXPbPSKWqgDmhmCheXGx/Uvzv99ufnIhyK+kZ751NAAAAAZEAMPIO3PuQiqimKkCmCeqAOaJa6FJnu5vCLI7Na5ejgfe/C9xX+cnMbZyeSz95stzAQAAMEACGEba2Q8u1FUqp6rVmWBD9//JH8cDf/JHMWY6Ec0vLc8QBQAAMFCa8DLqjoTw5bYu/upfjg9+7TeiuO/BGA/5lbiv+aTwBQAA2C4qYBhp775//kRqpKeCTRvxaphOlOXT6WsvzwcAAMA2agXAKnU1zKftX+0FMSPTGybHYuT8z+P+1lx6+ptmOQIAALadChhG2tsfLh5u5eYbwR3Zc+6duP8nfxT3VMtdqp6B+0Q0mt9IX5ntBAAAwA4RwDDy3j13fjZFemF508/8Hdh1QUxd8ZLipOAFAAAYFk5GGQtnzy62r07EdLNoTKdG+gvVGXq7uru6pdXTUPt9uI3mx+froUn53nf/b6Srl+u7hul7lqv/ln4x1GjWUCMAAGBoOOFkrJ0+vTjZuj+mc4rJOpyplvsaKT1ePVQFM3ny2jK1t/CUw/o7lbewa2d5pQow0lLK0dsuIp+v1s83W7HYWDx3/pf+6A/2NT76+RcjpZnl/Xfia78WutTVLmX+V+lr35oPAACAISSAgU2qw5q9e2OyaMZkHdjU99XLRnltvdVs7Cu6MbWyfxXkfH7tc1T7t2MAVkKS1cqc315Zr0OTblGeX/V5dJbfb6lZRK9S5MCBqU7cgfyD2XaUxUy1+jeq23TE9a9xEH9fVoKkTrX6wyjjh3F/a0G1CwAAMOwEMEBf5VdfrEKYsrrlJ6q45Inqz8x0LAdWa6z392e9Sp1OdVuoHnorivLHMbFnXl8XAABgtxHAAAOXX5udjE9yXSkzGblsR7O1L8py6qYdG43FKLrnIzWWotVaiL2xpLoFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgDvz/wHaUs/NB+bvawAAAABJRU5ErkJggg=="/>
+</defs>
+</svg>
diff --git a/packages/kbn-test-eui-helpers/src/rtl_helpers.tsx b/packages/kbn-test-eui-helpers/src/rtl_helpers.tsx
index e55b61a380bbf..58f0444f8b63f 100644
--- a/packages/kbn-test-eui-helpers/src/rtl_helpers.tsx
+++ b/packages/kbn-test-eui-helpers/src/rtl_helpers.tsx
@@ -53,7 +53,7 @@ export class EuiButtonGroupTestHarness {
   }
 
   /**
-   * Returns selected value of button group
+   * Returns selected option of button group
    */
   public get selected() {
     return within(this.#buttonGroup).getByRole('button', { pressed: true });
@@ -136,3 +136,59 @@ export class EuiSuperDatePickerTestHarness {
     userEvent.click(screen.getByRole('button', { name: 'Refresh' }));
   }
 }
+
+export class EuiSelectTestHarness {
+  #testId: string;
+
+  /**
+   * Returns select or throws
+   */
+  get #selectEl() {
+    return screen.getByTestId(this.#testId);
+  }
+
+  constructor(testId: string) {
+    this.#testId = testId;
+  }
+
+  /**
+   * Returns `data-test-subj` of select
+   */
+  public get testId() {
+    return this.#testId;
+  }
+
+  /**
+   * Returns button select if found, otherwise `null`
+   */
+  public get self() {
+    return screen.queryByTestId(this.#testId);
+  }
+
+  /**
+   * Returns all options of select
+   */
+  public get options(): HTMLOptionElement[] {
+    return within(this.#selectEl).getAllByRole('option');
+  }
+
+  /**
+   * Returns selected option
+   */
+  public get selected() {
+    return (this.#selectEl as HTMLSelectElement).value;
+  }
+
+  /**
+   * Select option by value
+   */
+  public select(optionName: string | RegExp) {
+    const option = this.options.find((o) => o.value === optionName)?.value;
+
+    if (!option) {
+      throw new Error(`Option [${optionName}] not found`);
+    }
+
+    fireEvent.change(this.#selectEl, { target: { value: option } });
+  }
+}
diff --git a/packages/kbn-test/src/mocha/junit_report_generation.js b/packages/kbn-test/src/mocha/junit_report_generation.js
index fcf31672d7996..99a5079e7b26e 100644
--- a/packages/kbn-test/src/mocha/junit_report_generation.js
+++ b/packages/kbn-test/src/mocha/junit_report_generation.js
@@ -94,7 +94,12 @@ export function setupJUnitReportGeneration(runner, options = {}) {
       .map((node) => ({ skipped: true, node }));
 
     // cache codeowners for quicker lookup
-    const reversedCodeowners = getPathsWithOwnersReversed();
+    let reversedCodeowners = [];
+    try {
+      reversedCodeowners = getPathsWithOwnersReversed();
+    } catch {
+      /* no-op */
+    }
 
     const commandLine = prettifyCommandLine(process.argv);
 
diff --git a/packages/kbn-text-based-editor/src/esql_documentation_sections.tsx b/packages/kbn-text-based-editor/src/esql_documentation_sections.tsx
index df32875a33665..fae00e8e8d1b0 100644
--- a/packages/kbn-text-based-editor/src/esql_documentation_sections.tsx
+++ b/packages/kbn-text-based-editor/src/esql_documentation_sections.tsx
@@ -3755,26 +3755,26 @@ export const functions = {
     // Do not edit manually... automatically generated by scripts/generate_esql_docs.ts
     {
       label: i18n.translate(
-        'textBasedEditor.query.textBasedLanguagesEditor.documentationESQL.top_list',
+        'textBasedEditor.query.textBasedLanguagesEditor.documentationESQL.top',
         {
-          defaultMessage: 'TOP_LIST',
+          defaultMessage: 'TOP',
         }
       ),
       description: (
         <Markdown
           markdownContent={i18n.translate(
-            'textBasedEditor.query.textBasedLanguagesEditor.documentationESQL.top_list.markdown',
+            'textBasedEditor.query.textBasedLanguagesEditor.documentationESQL.top.markdown',
             {
               defaultMessage: `<!--
   This is generated by ESQL's AbstractFunctionTestCase. Do no edit it. See ../README.md for how to regenerate it.
   -->
 
-  ### TOP_LIST
+  ### TOP
   Collects the top values for a field. Includes repeated values.
 
   \`\`\`
   FROM employees
-  | STATS top_salaries = TOP_LIST(salary, 3, "desc"), top_salary = MAX(salary)
+  | STATS top_salaries = TOP(salary, 3, "desc"), top_salary = MAX(salary)
   \`\`\`
   `,
               description:
diff --git a/packages/kbn-ui-shared-deps-npm/BUILD.bazel b/packages/kbn-ui-shared-deps-npm/BUILD.bazel
index f2ff64942a993..937cbe0c2a8ef 100644
--- a/packages/kbn-ui-shared-deps-npm/BUILD.bazel
+++ b/packages/kbn-ui-shared-deps-npm/BUILD.bazel
@@ -47,6 +47,7 @@ RUNTIME_DEPS = [
   "@npm//@tanstack/react-query-devtools",
   "@npm//classnames",
   "@npm//fflate",
+  "@npm//fastest-levenshtein",
   "@npm//history",
   "@npm//jquery",
   "@npm//lodash",
diff --git a/packages/kbn-ui-shared-deps-npm/webpack.config.js b/packages/kbn-ui-shared-deps-npm/webpack.config.js
index 24085109d0d56..294bffdaaa833 100644
--- a/packages/kbn-ui-shared-deps-npm/webpack.config.js
+++ b/packages/kbn-ui-shared-deps-npm/webpack.config.js
@@ -77,6 +77,7 @@ module.exports = (_, argv) => {
         '@tanstack/react-query-devtools',
         'classnames',
         'fflate',
+        'fastest-levenshtein',
         'history',
         'io-ts',
         'jquery',
diff --git a/packages/kbn-ui-shared-deps-src/BUILD.bazel b/packages/kbn-ui-shared-deps-src/BUILD.bazel
index 3d7dd87020047..cd723a8ed6401 100644
--- a/packages/kbn-ui-shared-deps-src/BUILD.bazel
+++ b/packages/kbn-ui-shared-deps-src/BUILD.bazel
@@ -28,6 +28,7 @@ webpack_cli(
     "//packages/kbn-monaco",
     "//packages/kbn-datemath",
     "//packages/kbn-analytics",
+    "//packages/kbn-crypto-browser",
     "//packages/kbn-es-query",
     "//packages/kbn-search-errors",
     "//packages/kbn-std",
diff --git a/packages/kbn-ui-shared-deps-src/src/definitions.js b/packages/kbn-ui-shared-deps-src/src/definitions.js
index b2b38e131fb80..6f7bff397d320 100644
--- a/packages/kbn-ui-shared-deps-src/src/definitions.js
+++ b/packages/kbn-ui-shared-deps-src/src/definitions.js
@@ -61,6 +61,7 @@ const externals = {
   redux: '__kbnSharedDeps__.Redux',
   immer: '__kbnSharedDeps__.Immer',
   reselect: '__kbnSharedDeps__.Reselect',
+  'fastest-levenshtein': '__kbnSharedDeps__.FastestLevenshtein',
 
   /**
    * big deps which are locked to a single version
@@ -88,6 +89,7 @@ const externals = {
   tslib: '__kbnSharedDeps__.TsLib',
   uuid: '__kbnSharedDeps__.Uuid',
   '@kbn/analytics': '__kbnSharedDeps__.KbnAnalytics',
+  '@kbn/crypto-browser': '__kbnSharedDeps__.KbnCryptoBrowser',
   '@kbn/es-query': '__kbnSharedDeps__.KbnEsQuery',
   '@kbn/search-errors': '__kbnSharedDeps__.KbnSearchErrors',
   '@kbn/std': '__kbnSharedDeps__.KbnStd',
diff --git a/packages/kbn-ui-shared-deps-src/src/entry.js b/packages/kbn-ui-shared-deps-src/src/entry.js
index 1d0e88ef0efd8..5347952978780 100644
--- a/packages/kbn-ui-shared-deps-src/src/entry.js
+++ b/packages/kbn-ui-shared-deps-src/src/entry.js
@@ -31,6 +31,7 @@ export const ReactRouter = require('react-router');
 export const ReactRouterDom = require('react-router-dom');
 export const ReactRouterDomV5Compat = require('react-router-dom-v5-compat');
 export const StyledComponents = require('styled-components');
+export const FastestLevenshtein = require('fastest-levenshtein');
 
 Moment.tz.load(require('moment-timezone/data/packed/latest.json'));
 
@@ -60,6 +61,7 @@ export const Fflate = { unzlibSync, strFromU8 };
 export const TsLib = require('tslib');
 export const Uuid = require('uuid');
 export const KbnAnalytics = require('@kbn/analytics');
+export const KbnCryptoBrowser = require('@kbn/crypto-browser');
 export const KbnEsQuery = require('@kbn/es-query');
 export const KbnSearchErrors = require('@kbn/search-errors');
 export const KbnStd = require('@kbn/std');
diff --git a/packages/kbn-unified-data-table/src/components/compare_documents/hooks/use_comparison_fields.ts b/packages/kbn-unified-data-table/src/components/compare_documents/hooks/use_comparison_fields.ts
index 611397145b555..b1653c8e26336 100644
--- a/packages/kbn-unified-data-table/src/components/compare_documents/hooks/use_comparison_fields.ts
+++ b/packages/kbn-unified-data-table/src/components/compare_documents/hooks/use_comparison_fields.ts
@@ -12,7 +12,7 @@ import { AdditionalFieldGroups, convertFieldsToFallbackFields } from '@kbn/unifi
 import { isEqual } from 'lodash';
 import { useMemo } from 'react';
 
-export const MAX_COMPARISON_FIELDS = 100;
+export const MAX_COMPARISON_FIELDS = 250;
 
 export interface UseComparisonFieldsProps {
   dataView: DataView;
diff --git a/packages/kbn-unified-data-table/src/components/data_table.tsx b/packages/kbn-unified-data-table/src/components/data_table.tsx
index 1262619401ab6..07755e0e65769 100644
--- a/packages/kbn-unified-data-table/src/components/data_table.tsx
+++ b/packages/kbn-unified-data-table/src/components/data_table.tsx
@@ -828,6 +828,12 @@ export const UnifiedDataTable = ({
 
   const sorting = useMemo(() => {
     if (isSortEnabled) {
+      // in ES|QL mode, sorting is disabled when in Document view
+      // ideally we want the @timestamp column to be sortable server side
+      // but it needs discussion before moving forward like this
+      if (isPlainRecord && !columns.length) {
+        return undefined;
+      }
       return {
         columns: sortingColumns,
         onSort: onTableSort,
@@ -837,7 +843,7 @@ export const UnifiedDataTable = ({
       columns: sortingColumns,
       onSort: () => {},
     };
-  }, [isSortEnabled, sortingColumns, onTableSort]);
+  }, [isSortEnabled, sortingColumns, isPlainRecord, columns.length, onTableSort]);
 
   const canSetExpandedDoc = Boolean(setExpandedDoc && !!renderDocumentView);
 
diff --git a/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.test.tsx b/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.test.tsx
index 12780a111fae0..52858ba292812 100644
--- a/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.test.tsx
+++ b/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.test.tsx
@@ -6,48 +6,55 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
-import { mountWithIntl } from '@kbn/test-jest-helpers';
-import { act } from 'react-dom/test-utils';
+import React, { useState } from 'react';
+import userEvent from '@testing-library/user-event';
+import { render, screen } from '@testing-library/react';
 import { FieldNameSearch, type FieldNameSearchProps } from './field_name_search';
 
 describe('UnifiedFieldList <FieldNameSearch />', () => {
-  it('should render correctly', async () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  it('should render correctly', () => {
     const props: FieldNameSearchProps = {
       nameFilter: '',
       onChange: jest.fn(),
       screenReaderDescriptionId: 'htmlId',
       'data-test-subj': 'searchInput',
     };
-    const wrapper = mountWithIntl(<FieldNameSearch {...props} />);
-    expect(wrapper.find('input').prop('aria-describedby')).toBe('htmlId');
-
-    act(() => {
-      wrapper.find('input').simulate('change', {
-        target: { value: 'hi' },
-      });
-    });
-
-    expect(props.onChange).toBeCalledWith('hi');
+    render(<FieldNameSearch {...props} />);
+    const input = screen.getByRole('searchbox', { name: 'Search field names' });
+    expect(input).toHaveAttribute('aria-describedby', 'htmlId');
+    userEvent.type(input, 'hey');
+    jest.advanceTimersByTime(256);
+    expect(props.onChange).toHaveBeenCalledWith('hey');
+    expect(props.onChange).toBeCalledTimes(1);
   });
 
-  it('should update correctly', async () => {
-    const props: FieldNameSearchProps = {
-      nameFilter: 'this',
-      onChange: jest.fn(),
-      screenReaderDescriptionId: 'htmlId',
-      'data-test-subj': 'searchInput',
+  it('should accept the updates from the top', () => {
+    const FieldNameSearchWithWrapper = ({ defaultNameFilter = '' }) => {
+      const [nameFilter, setNameFilter] = useState(defaultNameFilter);
+      const props: FieldNameSearchProps = {
+        nameFilter,
+        onChange: jest.fn(),
+        screenReaderDescriptionId: 'htmlId',
+        'data-test-subj': 'searchInput',
+      };
+      return (
+        <div>
+          <button onClick={() => setNameFilter('that')}>update nameFilter</button>
+          <FieldNameSearch {...props} />
+        </div>
+      );
     };
-    const wrapper = mountWithIntl(<FieldNameSearch {...props} />);
-
-    expect(wrapper.find('input').prop('value')).toBe('this');
-
-    wrapper.setProps({
-      nameFilter: 'that',
-    });
-
-    expect(wrapper.find('input').prop('value')).toBe('that');
-
-    expect(props.onChange).not.toBeCalled();
+    render(<FieldNameSearchWithWrapper defaultNameFilter="this" />);
+    expect(screen.getByRole('searchbox')).toHaveValue('this');
+    const button = screen.getByRole('button', { name: 'update nameFilter' });
+    userEvent.click(button);
+    expect(screen.getByRole('searchbox')).toHaveValue('that');
   });
 });
diff --git a/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.tsx b/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.tsx
index faf146adfd831..02ea451e5276c 100644
--- a/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.tsx
+++ b/packages/kbn-unified-field-list/src/components/field_list_filters/field_name_search.tsx
@@ -9,6 +9,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldSearch, type EuiFieldSearchProps } from '@elastic/eui';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 /**
  * Props for FieldNameSearch component
@@ -45,15 +46,22 @@ export const FieldNameSearch: React.FC<FieldNameSearchProps> = ({
     description: 'Search the list of fields in the data view for the provided text',
   });
 
+  const { inputValue, handleInputChange } = useDebouncedValue({
+    onChange,
+    value: nameFilter,
+  });
+
   return (
     <EuiFieldSearch
       aria-describedby={screenReaderDescriptionId}
       aria-label={searchPlaceholder}
       data-test-subj={`${dataTestSubject}FieldSearch`}
       fullWidth
-      onChange={(event) => onChange(event.target.value)}
+      onChange={(e) => {
+        handleInputChange(e.target.value);
+      }}
       placeholder={searchPlaceholder}
-      value={nameFilter}
+      value={inputValue}
       append={append}
       compressed={compressed}
     />
diff --git a/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.test.tsx b/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.test.tsx
index 6744fb92db152..60076ece91c7b 100644
--- a/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.test.tsx
+++ b/packages/kbn-unified-field-list/src/components/field_list_grouped/field_list_grouped.test.tsx
@@ -22,6 +22,15 @@ import { FieldsAccordion } from './fields_accordion';
 import { NoFieldsCallout } from './no_fields_callout';
 import { useGroupedFields, type GroupedFieldsParams } from '../../hooks/use_grouped_fields';
 
+jest.mock('lodash', () => {
+  const original = jest.requireActual('lodash');
+
+  return {
+    ...original,
+    debounce: (fn: unknown) => fn,
+  };
+});
+
 describe('UnifiedFieldList FieldListGrouped + useGroupedFields()', () => {
   let defaultProps: FieldListGroupedProps<DataViewField>;
   let mockedServices: GroupedFieldsParams<DataViewField>['services'];
diff --git a/packages/kbn-unified-field-list/src/hooks/use_field_filters.test.tsx b/packages/kbn-unified-field-list/src/hooks/use_field_filters.test.tsx
index 8e86535f0bb85..17d937b270d86 100644
--- a/packages/kbn-unified-field-list/src/hooks/use_field_filters.test.tsx
+++ b/packages/kbn-unified-field-list/src/hooks/use_field_filters.test.tsx
@@ -63,7 +63,9 @@ describe('UnifiedFieldList useFieldFilters()', () => {
 
     expect(result.current.fieldSearchHighlight).toBe('time');
     expect(result.current.onFilterField).toBeDefined();
-    expect(result.current.onFilterField!({ displayName: 'time test' } as DataViewField)).toBe(true);
+    expect(
+      result.current.onFilterField!({ displayName: 'time test', name: '' } as DataViewField)
+    ).toBe(true);
     expect(result.current.onFilterField!(dataView.getFieldByName('@timestamp')!)).toBe(true);
     expect(result.current.onFilterField!(dataView.getFieldByName('bytes')!)).toBe(false);
   });
@@ -86,14 +88,46 @@ describe('UnifiedFieldList useFieldFilters()', () => {
 
     expect(result.current.fieldSearchHighlight).toBe('message*me1');
     expect(result.current.onFilterField).toBeDefined();
-    expect(result.current.onFilterField!({ displayName: 'test' } as DataViewField)).toBe(false);
-    expect(result.current.onFilterField!({ displayName: 'message' } as DataViewField)).toBe(false);
-    expect(result.current.onFilterField!({ displayName: 'message.name1' } as DataViewField)).toBe(
-      true
+    expect(result.current.onFilterField!({ displayName: 'test', name: '' } as DataViewField)).toBe(
+      false
     );
+    expect(
+      result.current.onFilterField!({ displayName: 'message', name: '' } as DataViewField)
+    ).toBe(false);
+    expect(
+      result.current.onFilterField!({ displayName: 'message.name1', name: '' } as DataViewField)
+    ).toBe(true);
     expect(result.current.onFilterField!({ name: 'messagename10' } as DataViewField)).toBe(false);
     expect(result.current.onFilterField!({ name: 'message.test' } as DataViewField)).toBe(false);
   });
+  it('should update correctly on search by name with a typo', async () => {
+    const props: FieldFiltersParams<DataViewField> = {
+      allFields: dataView.fields,
+      services: mockedServices,
+    };
+    const { result } = renderHook(useFieldFilters, {
+      initialProps: props,
+    });
+
+    expect(result.current.fieldSearchHighlight).toBe('');
+    expect(result.current.onFilterField).toBeUndefined();
+
+    act(() => {
+      result.current.fieldListFiltersProps.onChangeNameFilter('messsge');
+    });
+
+    expect(result.current.fieldSearchHighlight).toBe('messsge');
+    expect(result.current.onFilterField).toBeDefined();
+    expect(result.current.onFilterField!({ displayName: 'test', name: '' } as DataViewField)).toBe(
+      false
+    );
+    expect(
+      result.current.onFilterField!({ displayName: 'message', name: '' } as DataViewField)
+    ).toBe(true);
+    expect(
+      result.current.onFilterField!({ displayName: 'message.name1', name: '' } as DataViewField)
+    ).toBe(true);
+  });
 
   it('should update correctly on filter by type', async () => {
     const props: FieldFiltersParams<DataViewField> = {
diff --git a/packages/kbn-visualization-ui-components/components/debounced_input.tsx b/packages/kbn-visualization-ui-components/components/debounced_input.tsx
index e892cba9e8022..2a21513dc2c0b 100644
--- a/packages/kbn-visualization-ui-components/components/debounced_input.tsx
+++ b/packages/kbn-visualization-ui-components/components/debounced_input.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { EuiFieldText, EuiFieldTextProps } from '@elastic/eui';
-import { useDebouncedValue } from './debounced_value';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 type Props = {
   value: string;
diff --git a/packages/kbn-visualization-ui-components/components/index.ts b/packages/kbn-visualization-ui-components/components/index.ts
index bdd2c4aa3504b..d92d30659d0b8 100644
--- a/packages/kbn-visualization-ui-components/components/index.ts
+++ b/packages/kbn-visualization-ui-components/components/index.ts
@@ -12,8 +12,6 @@ export * from './name_input';
 
 export * from './debounced_input';
 
-export * from './debounced_value';
-
 export * from './color_picker';
 
 export * from './icon_select';
diff --git a/packages/kbn-visualization-ui-components/components/query_input/query_input.tsx b/packages/kbn-visualization-ui-components/components/query_input/query_input.tsx
index 72acfe40b5a64..e1f5046c2f51e 100644
--- a/packages/kbn-visualization-ui-components/components/query_input/query_input.tsx
+++ b/packages/kbn-visualization-ui-components/components/query_input/query_input.tsx
@@ -21,7 +21,7 @@ import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
 import type { NotificationsStart } from '@kbn/core-notifications-browser';
 import type { DocLinksStart } from '@kbn/core-doc-links-browser';
-import { useDebouncedValue } from '../debounced_value';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 export interface QueryInputServices {
   http: HttpStart;
diff --git a/packages/kbn-visualization-ui-components/index.ts b/packages/kbn-visualization-ui-components/index.ts
index 5a51c27af5e7b..239849da05a50 100644
--- a/packages/kbn-visualization-ui-components/index.ts
+++ b/packages/kbn-visualization-ui-components/index.ts
@@ -10,7 +10,6 @@ export {
   FieldPicker,
   NameInput,
   DebouncedInput,
-  useDebouncedValue,
   ColorPicker,
   IconSelect,
   IconSelectSetting,
diff --git a/packages/kbn-visualization-utils/index.ts b/packages/kbn-visualization-utils/index.ts
index 8298260320564..8de992247fe79 100644
--- a/packages/kbn-visualization-utils/index.ts
+++ b/packages/kbn-visualization-utils/index.ts
@@ -9,3 +9,4 @@
 export { getTimeZone } from './src/get_timezone';
 export { getLensAttributesFromSuggestion } from './src/get_lens_attributes';
 export { TooltipWrapper } from './src/tooltip_wrapper';
+export { useDebouncedValue } from './src/debounced_value';
diff --git a/packages/kbn-visualization-ui-components/components/debounced_value.test.ts b/packages/kbn-visualization-utils/src/debounced_value.test.ts
similarity index 63%
rename from packages/kbn-visualization-ui-components/components/debounced_value.test.ts
rename to packages/kbn-visualization-utils/src/debounced_value.test.ts
index ddff83ea66157..8ec60010f84c6 100644
--- a/packages/kbn-visualization-ui-components/components/debounced_value.test.ts
+++ b/packages/kbn-visualization-utils/src/debounced_value.test.ts
@@ -9,16 +9,15 @@
 import { act, renderHook } from '@testing-library/react-hooks';
 import { useDebouncedValue } from './debounced_value';
 
-jest.mock('lodash', () => {
-  const original = jest.requireActual('lodash');
+describe('useDebouncedValue', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
 
-  return {
-    ...original,
-    debounce: (fn: unknown) => fn,
-  };
-});
+  afterAll(() => {
+    jest.useRealTimers();
+  });
 
-describe('useDebouncedValue', () => {
   it('should update upstream value changes', () => {
     const onChangeMock = jest.fn();
     const { result } = renderHook(() => useDebouncedValue({ value: 'a', onChange: onChangeMock }));
@@ -26,6 +25,8 @@ describe('useDebouncedValue', () => {
     act(() => {
       result.current.handleInputChange('b');
     });
+    expect(onChangeMock).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(256);
 
     expect(onChangeMock).toHaveBeenCalledWith('b');
   });
@@ -37,7 +38,8 @@ describe('useDebouncedValue', () => {
     act(() => {
       result.current.handleInputChange('');
     });
-
+    expect(onChangeMock).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(256);
     expect(onChangeMock).toHaveBeenCalledWith('a');
   });
 
@@ -50,7 +52,23 @@ describe('useDebouncedValue', () => {
     act(() => {
       result.current.handleInputChange('');
     });
-
+    expect(onChangeMock).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(256);
     expect(onChangeMock).toHaveBeenCalledWith('');
   });
+  it('custom wait time is respected', () => {
+    const onChangeMock = jest.fn();
+    const { result } = renderHook(() =>
+      useDebouncedValue({ value: 'a', onChange: onChangeMock }, { wait: 500 })
+    );
+
+    act(() => {
+      result.current.handleInputChange('b');
+    });
+    expect(onChangeMock).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(256);
+    expect(onChangeMock).not.toHaveBeenCalled();
+    jest.advanceTimersByTime(244); // sums to 500
+    expect(onChangeMock).toHaveBeenCalledWith('b');
+  });
 });
diff --git a/packages/kbn-visualization-ui-components/components/debounced_value.ts b/packages/kbn-visualization-utils/src/debounced_value.ts
similarity index 90%
rename from packages/kbn-visualization-ui-components/components/debounced_value.ts
rename to packages/kbn-visualization-utils/src/debounced_value.ts
index 2321ee72817f3..8fce0ffbdaeb6 100644
--- a/packages/kbn-visualization-ui-components/components/debounced_value.ts
+++ b/packages/kbn-visualization-utils/src/debounced_value.ts
@@ -9,13 +9,13 @@
 import { useState, useMemo, useEffect, useRef } from 'react';
 import { debounce } from 'lodash';
 
+const DEFAULT_TIMEOUT = 256;
 /**
  * Debounces value changes and updates inputValue on root state changes if no debounced changes
  * are in flight because the user is currently modifying the value.
  *
  * * allowFalsyValue: update upstream with all falsy values but null or undefined
- *
- * When testing this function mock the "debounce" function in lodash (see this module test for an example)
+ * * wait: debounce timeout
  */
 
 export const useDebouncedValue = <T>(
@@ -28,7 +28,9 @@ export const useDebouncedValue = <T>(
     value: T;
     defaultValue?: T;
   },
-  { allowFalsyValue }: { allowFalsyValue?: boolean } = {}
+  { allowFalsyValue, wait = DEFAULT_TIMEOUT }: { allowFalsyValue?: boolean; wait?: number } = {
+    wait: DEFAULT_TIMEOUT,
+  }
 ) => {
   const [inputValue, setInputValue] = useState(value);
   const unflushedChanges = useRef(false);
@@ -45,8 +47,8 @@ export const useDebouncedValue = <T>(
       // do not reset unflushed flag right away, wait a bit for upstream to pick it up
       flushChangesTimeout.current = setTimeout(() => {
         unflushedChanges.current = false;
-      }, 256);
-    }, 256);
+      }, wait);
+    }, wait);
     return (val: T) => {
       if (flushChangesTimeout.current) {
         clearTimeout(flushChangesTimeout.current);
@@ -54,7 +56,7 @@ export const useDebouncedValue = <T>(
       unflushedChanges.current = true;
       callback(val);
     };
-  }, [onChange]);
+  }, [onChange, wait]);
 
   useEffect(() => {
     if (!unflushedChanges.current && value !== inputValue) {
diff --git a/packages/presentation/presentation_publishing/index.ts b/packages/presentation/presentation_publishing/index.ts
index 669baa06f677f..8d90462c8a1bd 100644
--- a/packages/presentation/presentation_publishing/index.ts
+++ b/packages/presentation/presentation_publishing/index.ts
@@ -85,6 +85,7 @@ export {
 export { apiHasUniqueId, type HasUniqueId } from './interfaces/has_uuid';
 export {
   apiPublishesBlockingError,
+  hasBlockingError,
   type PublishesBlockingError,
 } from './interfaces/publishes_blocking_error';
 export {
diff --git a/packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts b/packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts
index 68bea175bce8c..90a86b20c9566 100644
--- a/packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts
+++ b/packages/presentation/presentation_publishing/interfaces/publishes_blocking_error.ts
@@ -17,3 +17,7 @@ export const apiPublishesBlockingError = (
 ): unknownApi is PublishesBlockingError => {
   return Boolean(unknownApi && (unknownApi as PublishesBlockingError)?.blockingError !== undefined);
 };
+
+export function hasBlockingError(api: unknown) {
+  return apiPublishesBlockingError(api) && api.blockingError?.value !== undefined;
+}
diff --git a/scripts/dev_docs.sh b/scripts/dev_docs.sh
index 202d3d84df5ff..17ccd0287f09b 100755
--- a/scripts/dev_docs.sh
+++ b/scripts/dev_docs.sh
@@ -88,9 +88,12 @@ module.exports = {
     ],
     "nav": {
       "structure": [
-        "nav-elastic-developer-guide",
-        "nav-kibana-team",
-        "nav-kibana-dev"
+        {
+          collection: 'Elastic Developer Guide',
+          navs: ['nav-elastic-developer-guide'],
+        },
+        { collection: 'Kibana Team', navs: ['nav-kibana-team'] },
+        { collection: 'Kibana Developer Guide', navs: ['nav-kibana-dev'] },
       ],
       "default": "nav-kibana-dev"
     }
diff --git a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
index 732685c732ff7..51c06947d224b 100644
--- a/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
+++ b/src/core/server/integration_tests/ci_checks/saved_objects/check_registered_types.test.ts
@@ -88,7 +88,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "endpoint:unified-user-artifact-manifest": "71c7fcb52c658b21ea2800a6b6a76972ae1c776e",
         "endpoint:user-artifact-manifest": "1c3533161811a58772e30cdc77bac4631da3ef2b",
         "enterprise_search_telemetry": "9ac912e1417fc8681e0cd383775382117c9e3d3d",
-        "entity-definition": "33fe0194bd896f0bfe479d55f6de20f8ba1d7713",
+        "entity-definition": "331a2ba0ee9f24936ef049683549c8af7e46f03a",
         "entity-discovery-api-key": "c267a65c69171d1804362155c1378365f5acef88",
         "epm-packages": "8042d4a1522f6c4e6f5486e791b3ffe3a22f88fd",
         "epm-packages-assets": "7a3e58efd9a14191d0d1a00b8aaed30a145fd0b1",
@@ -168,6 +168,7 @@ describe('checking migration metadata changes on all registered SO types', () =>
         "uptime-dynamic-settings": "b6756ff71d6b5258971b1c8fd433d167affbde52",
         "uptime-synthetics-api-key": "7ae976a461248f9dbd8442af14a179bdbc229eca",
         "url": "c923a4a5002a09c0080c9095e958f07d518e6704",
+        "usage-counter": "1690e9b642393c467e560fd14dd317dea24a14ee",
         "usage-counters": "48782b3bcb6b5a23ba6f2bfe3a380d835e68890a",
         "visualization": "93a3e73994ad836fe2b1dccbe208238f41f63da0",
         "workplace_search_telemetry": "52b32b47ee576f554ac77cb1d5896dfbcfe9a1fb",
diff --git a/src/core/server/integration_tests/elasticsearch/user_agent.test.ts b/src/core/server/integration_tests/elasticsearch/user_agent.test.ts
new file mode 100644
index 0000000000000..b864e3f330308
--- /dev/null
+++ b/src/core/server/integration_tests/elasticsearch/user_agent.test.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { esTestConfig } from '@kbn/test';
+import * as http from 'http';
+import { loggerMock } from '@kbn/logging-mocks';
+import { Root } from '@kbn/core-root-server-internal';
+import {
+  PRODUCT_RESPONSE_HEADER,
+  USER_AGENT_HEADER,
+  configureClient,
+  AgentManager,
+} from '@kbn/core-elasticsearch-client-server-internal';
+import { configSchema, ElasticsearchConfig } from '@kbn/core-elasticsearch-server-internal';
+
+function createFakeElasticsearchServer(hook: (req: http.IncomingMessage) => void) {
+  const server = http.createServer((req, res) => {
+    hook(req);
+    res.writeHead(200, undefined, { [PRODUCT_RESPONSE_HEADER]: 'Elasticsearch' });
+    res.write('{}');
+    res.end();
+  });
+  server.listen(esTestConfig.getPort());
+
+  return server;
+}
+
+describe('ES Client - custom user-agent', () => {
+  let esServer: http.Server;
+  let kibanaServer: Root;
+
+  afterAll(async () => {
+    try {
+      await kibanaServer?.shutdown();
+    } catch (e) {
+      // trap
+    }
+    try {
+      await new Promise<void>((resolve, reject) =>
+        esServer.close((err) => (err ? reject(err) : resolve()))
+      );
+    } catch (e) {
+      // trap
+    }
+  });
+
+  test('should send a custom user-agent header matching the expected format', async () => {
+    const kibanaVersion = '8.42.9';
+    const logger = loggerMock.create();
+    const rawConfig = configSchema.validate({
+      hosts: [`${esTestConfig.getUrl()}`],
+    });
+    const config = new ElasticsearchConfig(rawConfig);
+    const agentFactoryProvider = new AgentManager(logger, { dnsCacheTtlInSeconds: 0 });
+    const esClient = configureClient(config, {
+      type: 'foo',
+      logger,
+      kibanaVersion,
+      agentFactoryProvider,
+    });
+
+    let userAgentHeader: string | undefined;
+    esServer = createFakeElasticsearchServer((res) => {
+      userAgentHeader = res.headers[USER_AGENT_HEADER];
+    });
+
+    await esClient.ping();
+
+    expect(userAgentHeader).toEqual(`Kibana/${kibanaVersion}`);
+  });
+});
diff --git a/src/core/server/integration_tests/elasticsearch/version_compatibility.test.ts b/src/core/server/integration_tests/elasticsearch/version_compatibility.test.ts
index eb6cc767d5817..bfd7575d58283 100644
--- a/src/core/server/integration_tests/elasticsearch/version_compatibility.test.ts
+++ b/src/core/server/integration_tests/elasticsearch/version_compatibility.test.ts
@@ -91,7 +91,8 @@ describe('Version Compatibility', () => {
     await expect(startServers({ customKibanaVersion: previousMinor() })).resolves.toBeUndefined();
   });
 
-  it('should flag the incompatibility on version mismatch (ES is previous minor)', async () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/171289
+  it.skip('should flag the incompatibility on version mismatch (ES is previous minor)', async () => {
     const found$ = new Subject<void>();
     consoleSpy.mockImplementation((str) => {
       if (str.includes('is incompatible')) {
diff --git a/src/core/server/integration_tests/http/http2_protocol.test.ts b/src/core/server/integration_tests/http/http2_protocol.test.ts
index f76076de81d43..b1db89a023230 100644
--- a/src/core/server/integration_tests/http/http2_protocol.test.ts
+++ b/src/core/server/integration_tests/http/http2_protocol.test.ts
@@ -17,12 +17,14 @@ import {
   config as httpConfig,
   cspConfig,
   externalUrlConfig,
+  permissionsPolicyConfig,
 } from '@kbn/core-http-server-internal';
 import { mockCoreContext } from '@kbn/core-base-server-mocks';
 import type { Logger } from '@kbn/logging';
 
 const CSP_CONFIG = cspConfig.schema.validate({});
 const EXTERNAL_URL_CONFIG = externalUrlConfig.schema.validate({});
+const PERMISSIONS_POLICY_CONFIG = permissionsPolicyConfig.schema.validate({});
 
 describe('Http2 - Smoke tests', () => {
   let server: HttpServer;
@@ -56,7 +58,7 @@ describe('Http2 - Smoke tests', () => {
       },
       shutdownTimeout: '5s',
     });
-    config = new HttpConfig(rawConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG);
+    config = new HttpConfig(rawConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG, PERMISSIONS_POLICY_CONFIG);
     server = new HttpServer(coreContext, 'tests', of(config.shutdownTimeout));
   });
 
diff --git a/src/core/server/integration_tests/http/set_tls_config.test.ts b/src/core/server/integration_tests/http/set_tls_config.test.ts
index 4966ecafce411..e0c30efafc109 100644
--- a/src/core/server/integration_tests/http/set_tls_config.test.ts
+++ b/src/core/server/integration_tests/http/set_tls_config.test.ts
@@ -14,12 +14,14 @@ import {
   config as httpConfig,
   cspConfig,
   externalUrlConfig,
+  permissionsPolicyConfig,
 } from '@kbn/core-http-server-internal';
 import { flattenCertificateChain, fetchPeerCertificate, isServerTLS } from './tls_utils';
 
 describe('setTlsConfig', () => {
   const CSP_CONFIG = cspConfig.schema.validate({});
   const EXTERNAL_URL_CONFIG = externalUrlConfig.schema.validate({});
+  const PERMISSIONS_POLICY_CONFIG = permissionsPolicyConfig.schema.validate({});
 
   beforeAll(() => {
     process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
@@ -39,7 +41,12 @@ describe('setTlsConfig', () => {
       },
       shutdownTimeout: '1s',
     });
-    const firstConfig = new HttpConfig(rawHttpConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG);
+    const firstConfig = new HttpConfig(
+      rawHttpConfig,
+      CSP_CONFIG,
+      EXTERNAL_URL_CONFIG,
+      PERMISSIONS_POLICY_CONFIG
+    );
 
     const serverOptions = getServerOptions(firstConfig);
     const server = createServer(serverOptions);
@@ -85,7 +92,12 @@ describe('setTlsConfig', () => {
       shutdownTimeout: '1s',
     });
 
-    const secondConfig = new HttpConfig(secondRawConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG);
+    const secondConfig = new HttpConfig(
+      secondRawConfig,
+      CSP_CONFIG,
+      EXTERNAL_URL_CONFIG,
+      PERMISSIONS_POLICY_CONFIG
+    );
 
     setTlsConfig(server, secondConfig.ssl);
 
diff --git a/src/core/server/integration_tests/http/tls_config_reload.test.ts b/src/core/server/integration_tests/http/tls_config_reload.test.ts
index ad2c530faae52..030b22e2f497c 100644
--- a/src/core/server/integration_tests/http/tls_config_reload.test.ts
+++ b/src/core/server/integration_tests/http/tls_config_reload.test.ts
@@ -17,6 +17,7 @@ import {
   config as httpConfig,
   cspConfig,
   externalUrlConfig,
+  permissionsPolicyConfig,
 } from '@kbn/core-http-server-internal';
 import { isServerTLS, flattenCertificateChain, fetchPeerCertificate } from './tls_utils';
 import { mockCoreContext } from '@kbn/core-base-server-mocks';
@@ -24,6 +25,7 @@ import type { Logger } from '@kbn/logging';
 
 const CSP_CONFIG = cspConfig.schema.validate({});
 const EXTERNAL_URL_CONFIG = externalUrlConfig.schema.validate({});
+const PERMISSIONS_POLICY_CONFIG = permissionsPolicyConfig.schema.validate({});
 const enhanceWithContext = (fn: (...args: any[]) => any) => fn.bind(null, {});
 
 describe('HttpServer - TLS config', () => {
@@ -54,7 +56,12 @@ describe('HttpServer - TLS config', () => {
       },
       shutdownTimeout: '1s',
     });
-    const firstConfig = new HttpConfig(rawHttpConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG);
+    const firstConfig = new HttpConfig(
+      rawHttpConfig,
+      CSP_CONFIG,
+      EXTERNAL_URL_CONFIG,
+      PERMISSIONS_POLICY_CONFIG
+    );
 
     const config$ = new BehaviorSubject(firstConfig);
 
@@ -109,7 +116,12 @@ describe('HttpServer - TLS config', () => {
       shutdownTimeout: '1s',
     });
 
-    const secondConfig = new HttpConfig(secondRawConfig, CSP_CONFIG, EXTERNAL_URL_CONFIG);
+    const secondConfig = new HttpConfig(
+      secondRawConfig,
+      CSP_CONFIG,
+      EXTERNAL_URL_CONFIG,
+      PERMISSIONS_POLICY_CONFIG
+    );
     config$.next(secondConfig);
 
     const secondCertificate = await fetchPeerCertificate(firstConfig.host, firstConfig.port);
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
index 89478ea377f6c..16e0043062a63 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_failed_action_tasks.test.ts
@@ -57,8 +57,6 @@ describe('migration from 7.13 to 7.14+ with many failed action_tasks', () => {
       if (esServer) {
         await esServer.stop();
       }
-
-      await new Promise((resolve) => setTimeout(resolve, 10000));
     });
 
     const getCounts = async (
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
index 6b06337a367db..d9c4f0d7f33ae 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group1/7_13_0_unknown_types.test.ts
@@ -58,8 +58,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   describe('when `discardUnknownObjects` does not match current kibana version', () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
index bea50cf32ce35..e6c3ad412e746 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes.test.ts
@@ -89,8 +89,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('completes the migration even when a full batch would exceed ES http.max_content_length', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
index 95baed313bd8c..4cdc89006c983 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/batch_size_bytes_exceeds_es_content_length.test.ts
@@ -58,8 +58,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('fails with a descriptive message when maxBatchSizeBytes exceeds ES http.max_content_length', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
index 9a89ecb13d71b..600a00e24e9fd 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/check_target_mappings.test.ts
@@ -17,7 +17,6 @@ import {
   createTestServers,
   type TestElasticsearchUtils,
 } from '@kbn/core-test-helpers-kbn-server';
-import { delay } from '../test_utils';
 
 const logFilePath = Path.join(__dirname, 'check_target_mappings.log');
 
@@ -33,7 +32,6 @@ describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
   afterEach(async () => {
     await root?.shutdown();
     await esServer?.stop();
-    await delay(10);
   });
 
   it('is not run for new installations', async () => {
@@ -80,7 +78,6 @@ describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
 
       // stop Kibana and remove logs
       await root.shutdown();
-      await delay(10);
       await fs.unlink(logFilePath).catch(() => {});
 
       root = createRoot();
@@ -122,7 +119,7 @@ describe('migration v2 - CHECK_TARGET_MAPPINGS', () => {
 
       // Check for migration steps present in the logs
       logs = await fs.readFile(logFilePath, 'utf-8');
-      expect(logs).not.toMatch('CREATE_NEW_TARGET');
+      expect(logs).not.toMatch('[.kibana] CREATE_NEW_TARGET');
       expect(logs).toMatch('CHECK_TARGET_MAPPINGS -> UPDATE_TARGET_MAPPINGS_PROPERTIES');
       expect(logs).toMatch(
         'UPDATE_TARGET_MAPPINGS_PROPERTIES -> UPDATE_TARGET_MAPPINGS_PROPERTIES_WAIT_FOR_TASK'
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
index 7f04f37589f69..7c93c1477cf4a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/cleanup.test.ts
@@ -13,7 +13,7 @@ import JSON5 from 'json5';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsType } from '@kbn/core-saved-objects-server';
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
-import { getMigrationDocLink, delay } from '../test_utils';
+import { getMigrationDocLink } from '../test_utils';
 import {
   clearLog,
   currentVersion,
@@ -71,7 +71,6 @@ describe('migration v2', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
index 45b28e8ac3082..dbc5ea193ad56 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/collects_corrupt_docs.test.ts
@@ -42,8 +42,6 @@ describe('migration v2 with corrupt saved object documents', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('collects corrupt saved object documents across batches', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
index 384cdcbfa8abd..728625003637e 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/corrupt_outdated_docs.test.ts
@@ -40,8 +40,6 @@ describe('migration v2 with corrupt saved object documents', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it.skip('collects corrupt saved object documents across batches', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
index 65fc3830ae069..d82863f01928c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/multiple_kibana_nodes.test.ts
@@ -106,7 +106,8 @@ async function createRoot({ logFileName }: CreateRootConfig) {
 // suite is very long, the 10mins default can cause timeouts
 jest.setTimeout(15 * 60 * 1000);
 
-describe('migration v2', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/156117
+describe.skip('migration v2', () => {
   let esServer: TestElasticsearchUtils;
   let rootA: Root;
   let rootB: Root;
@@ -170,7 +171,6 @@ describe('migration v2', () => {
 
     if (esServer) {
       await esServer.stop();
-      await delay(10000);
     }
   });
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
index 79a76c72adefc..e7579a7ce4a91 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group2/outdated_docs.test.ts
@@ -41,8 +41,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('migrates the documents to the highest version', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
index 8a40466ee2588..41c9501d7e6b2 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/deferred_migrations.test.ts
@@ -12,7 +12,6 @@ import type {
   SavedObjectsType,
   SavedObjectUnsanitizedDoc,
 } from '@kbn/core-saved-objects-server';
-import { delay } from '../test_utils';
 
 import '../jest_matchers';
 import {
@@ -36,7 +35,6 @@ describe('deferred migrations', () => {
 
   afterAll(async () => {
     await server?.stop();
-    await delay(10);
   });
 
   beforeEach(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
index d32c2f0902b4e..45ffbb709854c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/migration_from_older_v1.test.ts
@@ -170,8 +170,6 @@ describe('migrating from 7.3.0-xpack which used v1 migrations', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   };
 
   beforeAll(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
index e4350c431977b..73e31881b0a91 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/multiple_es_nodes.test.ts
@@ -103,10 +103,6 @@ describe('migration v2', () => {
     await removeLogFile();
   });
 
-  afterAll(async () => {
-    await new Promise((resolve) => setTimeout(resolve, 10000));
-  });
-
   afterEach(async () => {
     if (root) {
       await root.shutdown();
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
index 0fce643975c53..3a91a8477d4e5 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/read_batch_size.test.ts
@@ -13,7 +13,6 @@ import {
   createRootWithCorePlugins,
   type TestElasticsearchUtils,
 } from '@kbn/core-test-helpers-kbn-server';
-import { delay } from '../test_utils';
 import { startElasticsearch } from '../kibana_migrator_test_kit';
 
 const logFilePath = Path.join(__dirname, 'read_batch_size.log');
@@ -33,7 +32,6 @@ describe('migration v2 - read batch size', () => {
   afterEach(async () => {
     await root?.shutdown();
     await esServer?.stop();
-    await delay(10);
   });
 
   it('reduces the read batchSize in half if a batch exceeds maxReadBatchSizeBytes', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
index 6079469cf4982..70768bd3f7009 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/rewriting_id.test.ts
@@ -108,8 +108,6 @@ describe('migration v2', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('rewrites id deterministically for SO with namespaceType: "multiple" and "multiple-isolated"', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
index e24c50d2cb4c9..54ac46754acc4 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/skip_migration.test.ts
@@ -71,8 +71,6 @@ describe('starting with `migration.skip: true` when indices are up to date', ()
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('starts and display the correct service status', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/type_registrations.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/type_registrations.test.ts
index a137b905f07a7..2228b19956bb3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/type_registrations.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/type_registrations.test.ts
@@ -146,7 +146,8 @@ const previouslyRegisteredTypes = [
   'synthetics-dynamic-settings',
   'uptime-synthetics-api-key',
   'url',
-  'usage-counters',
+  'usage-counter', // added in 8.16.0: richer mappings, located in .kibana_usage_counters
+  'usage-counters', // deprecated in favor of 'usage-counter'
   'visualization',
   'workplace_search_telemetry',
 ].sort();
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
index 459cfc921badf..266e821abf7e3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group3/wait_for_migration_completion.test.ts
@@ -40,8 +40,6 @@ describe('migration with waitForCompletion=true', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('waits for another instance to complete the migration', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
index 4e1cb4d06e38f..1277370f45835 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_md5_to_mv.test.ts
@@ -19,7 +19,7 @@ import {
   readLog,
   startElasticsearch,
 } from '../kibana_migrator_test_kit';
-import { delay, createType } from '../test_utils';
+import { createType } from '../test_utils';
 import '../jest_matchers';
 
 const logFilePath = Path.join(__dirname, 'v2_md5_to_mv.test.log');
@@ -270,6 +270,5 @@ describe('V2 algorithm', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
index bfc105ee7d160..ba4a19de81741 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_same_stack_version.test.ts
@@ -14,7 +14,7 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import { modelVersionToVirtualVersion } from '@kbn/core-saved-objects-base-server-internal';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType, parseLogFile } from '../test_utils';
+import { createType, parseLogFile } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_with_mv_same_stack_version.test.log');
@@ -31,7 +31,6 @@ describe('V2 algorithm - using model versions - upgrade without stack version in
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getTestModelVersionType = ({ beforeUpgrade }: { beforeUpgrade: boolean }) => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
index 7a5d8a686f084..f24dc6fd427fe 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group4/v2_with_mv_stack_version_bump.test.ts
@@ -14,7 +14,7 @@ import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server
 import { modelVersionToVirtualVersion } from '@kbn/core-saved-objects-base-server-internal';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType, parseLogFile } from '../test_utils';
+import { createType, parseLogFile } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_with_mv_stack_version_bump.test.log');
@@ -31,7 +31,6 @@ describe('V2 algorithm - using model versions - stack version bump scenario', ()
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getTestSwitchType = ({ beforeUpgrade }: { beforeUpgrade: boolean }) => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
index d950129dac69a..cd1a98fa3ee57 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete.test.ts
@@ -22,7 +22,6 @@ import {
   getIncompatibleMappingsMigrator,
   getNonDeprecatedMappingsMigrator,
 } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 
 describe('when upgrading to a new stack version', () => {
   let esServer: TestElasticsearchUtils['es'];
@@ -34,7 +33,6 @@ describe('when upgrading to a new stack version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   describe('if the mappings match (diffMappings() === false)', () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
index e297b39847f10..e0233cccb3fb7 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/active_delete_multiple_instances.test.ts
@@ -23,7 +23,6 @@ import {
   startElasticsearch,
 } from '../kibana_migrator_test_kit';
 import { baselineTypes } from './active_delete.fixtures';
-import { delay } from '../test_utils';
 import { createBaselineArchive } from '../kibana_migrator_archive_utils';
 
 const PARALLEL_MIGRATORS = 6;
@@ -146,7 +145,6 @@ describe('multiple migrator instances running in parallel', () => {
     afterAll(async () => {
       // await esClient?.indices.delete({ index: `${kibanaIndex}_${currentVersion}_001` });
       await esServer?.stop();
-      await delay(10);
     });
 
     const getAggregatedTypesCount = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/dot_kibana_split.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/dot_kibana_split.test.ts
index c4c56442c23f8..ba164e223be55 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/dot_kibana_split.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/dot_kibana_split.test.ts
@@ -173,135 +173,15 @@ describe('split .kibana index into multiple system indices', () => {
         })
       );
 
-      expect(indicesInfo[`.kibana_${currentVersion}_001`].mappings?._meta?.indexTypesMap)
-        .toMatchInlineSnapshot(`
-        Object {
-          ".kibana": Array [
-            "action",
-            "action_task_params",
-            "ad_hoc_run_params",
-            "alert",
-            "api_key_pending_invalidation",
-            "apm-custom-dashboards",
-            "apm-indices",
-            "apm-server-schema",
-            "apm-service-group",
-            "apm-telemetry",
-            "app_search_telemetry",
-            "application_usage_daily",
-            "application_usage_totals",
-            "canvas-element",
-            "canvas-workpad-template",
-            "cases",
-            "cases-comments",
-            "cases-configure",
-            "cases-connector-mappings",
-            "cases-rules",
-            "cases-telemetry",
-            "cases-user-actions",
-            "cloud-security-posture-settings",
-            "config",
-            "config-global",
-            "connector_token",
-            "core-usage-stats",
-            "csp-rule-template",
-            "endpoint:unified-user-artifact-manifest",
-            "endpoint:user-artifact-manifest",
-            "enterprise_search_telemetry",
-            "entity-definition",
-            "entity-discovery-api-key",
-            "epm-packages",
-            "epm-packages-assets",
-            "event-annotation-group",
-            "event_loop_delays_daily",
-            "exception-list",
-            "exception-list-agnostic",
-            "file",
-            "file-upload-usage-collection-telemetry",
-            "fileShare",
-            "fleet-fleet-server-host",
-            "fleet-message-signing-keys",
-            "fleet-preconfiguration-deletion-record",
-            "fleet-proxy",
-            "fleet-setup-lock",
-            "fleet-uninstall-tokens",
-            "graph-workspace",
-            "guided-onboarding-guide-state",
-            "guided-onboarding-plugin-state",
-            "index-pattern",
-            "infra-custom-dashboards",
-            "infrastructure-monitoring-log-view",
-            "infrastructure-ui-source",
-            "ingest-agent-policies",
-            "ingest-download-sources",
-            "ingest-outputs",
-            "ingest-package-policies",
-            "ingest_manager_settings",
-            "inventory-view",
-            "kql-telemetry",
-            "legacy-url-alias",
-            "lens",
-            "lens-ui-telemetry",
-            "links",
-            "maintenance-window",
-            "map",
-            "metrics-data-source",
-            "metrics-explorer-view",
-            "ml-job",
-            "ml-module",
-            "ml-trained-model",
-            "monitoring-telemetry",
-            "observability-onboarding-state",
-            "osquery-manager-usage-metric",
-            "osquery-pack",
-            "osquery-pack-asset",
-            "osquery-saved-query",
-            "policy-settings-protection-updates-note",
-            "query",
-            "risk-engine-configuration",
-            "rules-settings",
-            "sample-data-telemetry",
-            "search-session",
-            "search-telemetry",
-            "security-rule",
-            "security-solution-signals-migration",
-            "siem-detection-engine-rule-actions",
-            "siem-ui-timeline",
-            "siem-ui-timeline-note",
-            "siem-ui-timeline-pinned-event",
-            "slo",
-            "slo-settings",
-            "space",
-            "spaces-usage-stats",
-            "synthetics-dynamic-settings",
-            "synthetics-monitor",
-            "synthetics-param",
-            "synthetics-privates-locations",
-            "tag",
-            "telemetry",
-            "threshold-explorer-view",
-            "ui-metric",
-            "upgrade-assistant-ml-upgrade-operation",
-            "upgrade-assistant-reindex-operation",
-            "uptime-dynamic-settings",
-            "uptime-synthetics-api-key",
-            "url",
-            "usage-counters",
-            "workplace_search_telemetry",
-          ],
-          ".kibana_so_search": Array [
-            "search",
-          ],
-          ".kibana_so_ui": Array [
-            "canvas-workpad",
-            "dashboard",
-            "visualization",
-          ],
-          ".kibana_task_manager": Array [
-            "task",
-          ],
-        }
-      `);
+      const typesMap = indicesInfo[`.kibana_${currentVersion}_001`].mappings?._meta?.indexTypesMap;
+
+      expect(Array.isArray(typesMap['.kibana'])).toEqual(true);
+      expect(typesMap['.kibana'].length > 50).toEqual(true);
+      expect(typesMap['.kibana'].includes('action')).toEqual(true);
+      expect(typesMap['.kibana'].includes('cases')).toEqual(true);
+      expect(typesMap['.kibana_so_search']).toEqual(['search']);
+      expect(typesMap['.kibana_so_ui']).toEqual(['canvas-workpad', 'dashboard', 'visualization']);
+      expect(typesMap['.kibana_task_manager']).toEqual(['task']);
 
       const logs = await parseLogFile(logFilePathFirstRun);
 
@@ -506,6 +386,7 @@ describe('split .kibana index into multiple system indices', () => {
         '.kibana_task_manager': {
           task: 5,
         },
+        '.kibana_usage_counters': {},
       });
     });
 
diff --git a/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts b/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
index 4d244314d3acb..b93f96671d96f 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/group5/skip_reindex.test.ts
@@ -20,7 +20,6 @@ import {
   startElasticsearch,
   KibanaMigratorTestKit,
 } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 
 describe('when migrating to a new version', () => {
   let esServer: TestElasticsearchUtils['es'];
@@ -144,6 +143,5 @@ describe('when migrating to a new version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 });
diff --git a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
index 0c43a40478d03..9e3d01dd0ecec 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/basic_document_migration.ts
@@ -11,7 +11,7 @@ import { range, sortBy } from 'lodash';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../../jest_matchers';
 import { getKibanaMigratorTestKit } from '../../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../../test_utils';
+import { parseLogFile } from '../../test_utils';
 import { EsRunner, EsServer } from '../../test_types';
 import {
   getBaseMigratorParams,
@@ -35,7 +35,6 @@ export function createBasicDocumentsMigrationTest({
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
index b22e522d1d2c1..f0709e8720ce7 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/shared_suites/zdt/standard_workflow.ts
@@ -11,7 +11,7 @@ import { range } from 'lodash';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../../jest_matchers';
 import { getKibanaMigratorTestKit } from '../../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../../test_utils';
+import { parseLogFile } from '../../test_utils';
 import { EsRunner, EsServer } from '../../test_types';
 import {
   getBaseMigratorParams,
@@ -36,7 +36,6 @@ export function createStandardWorkflowTest({
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
index 8968fe7bac408..c541f57a6111a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/basic_downgrade.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'basic_downgrade.test.log');
@@ -28,7 +28,6 @@ describe('ZDT upgrades - basic downgrade', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeV1 = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
index 05f8f30edacc6..b9821dc62442b 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/conversion_failures.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getSampleAType,
@@ -31,7 +31,6 @@ describe('ZDT upgrades - encountering conversion failures', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   beforeEach(async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
index f0b049b8307db..6f12311009e21 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/create_index.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import '../jest_matchers';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'create_index.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - running on a fresh cluster', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('create the index with the correct mappings and meta', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
index ab707f792fbe9..e0341915c7dd3 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/document_cleanup.test.ts
@@ -13,7 +13,6 @@ import { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay } from '../test_utils';
 import {
   getBaseMigratorParams,
   getDeletedType,
@@ -35,7 +34,6 @@ describe('ZDT upgrades - document cleanup', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
index 7b0658fbd977e..a19db9811462c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/mapping_version_conflict.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -33,7 +33,6 @@ describe('ZDT upgrades - mapping model version conflict', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
index 398a133bf990a..6c4d8688450bf 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/rerun_same_version.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'rerun_same_version.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - rerun migration on same version', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
index c51c712f34452..82ff0a1c0d5ec 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_1/update_mappings.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -31,7 +31,6 @@ describe('ZDT upgrades - basic mapping update', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
index cc901b56f3818..f403fe6c3579a 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/outdated_doc_query.test.ts
@@ -12,7 +12,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { SavedObjectsModelVersionMap, SavedObject } from '@kbn/core-saved-objects-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, createType } from '../test_utils';
+import { createType } from '../test_utils';
 import { getBaseMigratorParams } from '../fixtures/zdt_base.fixtures';
 import {
   SavedObjectsSerializer,
@@ -114,7 +114,6 @@ describe('getOutdatedDocumentsQuery', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('creates a query returning the expected documents', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
index 47f853187b18f..1ce530a9c46c1 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/root_field_addition.test.ts
@@ -27,7 +27,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'root_field_addition.test.log');
@@ -42,7 +42,6 @@ describe('ZDT upgrades - introducing new root fields', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const baseMappings = {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
index 61697df6ecef6..770fade1d436c 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/type_addition.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getBarType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'type_addition.test.log');
@@ -26,7 +26,6 @@ describe('ZDT upgrades - introducing a new SO type', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
index 0cfebd3d8514b..fb3c11e68299f 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_partial_failure.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams, noopMigration } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'v2_to_zdt_partial_failure.test.log');
@@ -28,7 +28,6 @@ describe('ZDT with v2 compat - recovering from partially migrated state', () =>
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeBefore = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
index 4a92a9d14eef4..dfbe0aeba8866 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_2/v2_to_zdt_switch.test.ts
@@ -18,7 +18,7 @@ import {
   startElasticsearch,
   currentVersion,
 } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getSampleAType } from '../fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'v2_to_zdt_switch.test.log');
@@ -35,7 +35,6 @@ describe('ZDT upgrades - switching from v2 algorithm', () => {
 
   afterEach(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async ({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
index c71ca527f1270..5bd16f0110c63 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/basic_document_migration.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getSampleAType,
@@ -32,7 +32,6 @@ describe('ZDT with v2 compat - basic document migration', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
index 6f1b8257ddb26..d9f76907087be 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/create_index.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import '../jest_matchers';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import { getBaseMigratorParams, getFooType, getLegacyType } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'create_index.test.log');
@@ -26,7 +26,6 @@ describe('ZDT with v2 compat - running on a fresh cluster', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   it('create the index with the correct mappings and meta', async () => {
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
index 1aa65bc1cdd02..fa72c8f1edae8 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/switch_to_model_version.test.ts
@@ -13,7 +13,7 @@ import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import { SavedObjectsBulkCreateObject } from '@kbn/core-saved-objects-api-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile, createType } from '../test_utils';
+import { parseLogFile, createType } from '../test_utils';
 import { getBaseMigratorParams, noopMigration } from '../fixtures/zdt_base.fixtures';
 
 const logFilePath = Path.join(__dirname, 'switch_to_model_version.test.log');
@@ -28,7 +28,6 @@ describe('ZDT with v2 compat - type switching from migration to model version',
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const typeBefore = createType({
diff --git a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
index 0c4956105fc78..9f3e58d6812fa 100644
--- a/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
+++ b/src/core/server/integration_tests/saved_objects/migrations/zdt_v2_compat/update_mappings.test.ts
@@ -11,7 +11,7 @@ import fs from 'fs/promises';
 import { type TestElasticsearchUtils } from '@kbn/core-test-helpers-kbn-server';
 import '../jest_matchers';
 import { getKibanaMigratorTestKit, startElasticsearch } from '../kibana_migrator_test_kit';
-import { delay, parseLogFile } from '../test_utils';
+import { parseLogFile } from '../test_utils';
 import {
   getBaseMigratorParams,
   getFooType,
@@ -32,7 +32,6 @@ describe('ZDT with v2 compat - basic mapping update', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const createBaseline = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
index 98af19ec5c9d0..4cd661add5053 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/bulk_update.test.ts
@@ -17,7 +17,6 @@ import {
   getKibanaMigratorTestKit,
   startElasticsearch,
 } from '../../migrations/kibana_migrator_test_kit';
-import { delay } from '../../migrations/test_utils';
 import { getBaseMigratorParams } from '../../migrations/fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'bulk_update.test.log');
@@ -32,7 +31,6 @@ describe('SOR - bulk_update API', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const getCrossVersionType = (version: 'v1' | 'v2'): SavedObjectsType => {
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
index 035da58c60fa1..0a75e27da0830 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy.test.ts
@@ -9,7 +9,7 @@
 import Hapi from '@hapi/hapi';
 import h2o2 from '@hapi/h2o2';
 import { URL } from 'url';
-import { SavedObject, ALL_SAVED_OBJECT_INDICES } from '@kbn/core-saved-objects-server';
+import type { SavedObject } from '@kbn/core-saved-objects-server';
 import type { ISavedObjectsRepository } from '@kbn/core-saved-objects-api-server';
 import type { InternalCoreSetup, InternalCoreStart } from '@kbn/core-lifecycle-server-internal';
 import { Root } from '@kbn/core-root-server-internal';
@@ -18,7 +18,6 @@ import {
   createTestServers,
   type TestElasticsearchUtils,
 } from '@kbn/core-test-helpers-kbn-server';
-import { kibanaPackageJson as pkg } from '@kbn/repo-info';
 import {
   declareGetRoute,
   declareDeleteRoute,
@@ -32,7 +31,8 @@ import {
   declarePassthroughRoute,
   declareIndexRoute,
   setProxyInterrupt,
-  allCombinationsPermutations,
+  getVersionedKibanaIndex,
+  getIndicesWithNamespaceAwareTypes,
 } from './repository_with_proxy_utils';
 
 let esServer: TestElasticsearchUtils;
@@ -93,29 +93,40 @@ describe('404s from proxies', () => {
       ? parseInt(process.env.TEST_PROXY_SERVER_PORT, 10)
       : 5698;
 
+    // Setup kibana configured to use proxy as ES backend
+    root = createRootWithCorePlugins({
+      elasticsearch: {
+        hosts: [`http://${esHostname}:${proxyPort}`],
+      },
+      migrations: {
+        skip: false,
+      },
+    });
+    await root.preboot();
+    const setup = await root.setup();
+    registerSOTypes(setup);
+
     // Setup custom hapi hapiServer with h2o2 plugin for proxying
     hapiServer = Hapi.server({
       port: proxyPort,
     });
 
+    const mainIndex = getVersionedKibanaIndex();
     await hapiServer.register(h2o2);
     // register specific routes to modify the response and a catch-all to relay the request/response as-is
+    declareGetRoute(hapiServer, esHostname, esPort, mainIndex);
+    declareDeleteRoute(hapiServer, esHostname, esPort, mainIndex);
+    declarePostUpdateRoute(hapiServer, esHostname, esPort, mainIndex);
 
-    allCombinationsPermutations(
-      ALL_SAVED_OBJECT_INDICES.map((indexPattern) => `${indexPattern}_${pkg.version}`)
-    )
-      .map((indices) => indices.join(','))
-      .forEach((kbnIndexPath) => {
-        declareGetRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declareDeleteRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declarePostUpdateRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-
-        declareGetSearchRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declarePostSearchRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declarePostPitRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declarePostUpdateByQueryRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-        declareIndexRoute(hapiServer, esHostname, esPort, kbnIndexPath);
-      });
+    declareGetSearchRoute(hapiServer, esHostname, esPort, mainIndex);
+    declarePostSearchRoute(hapiServer, esHostname, esPort, mainIndex);
+    declarePostPitRoute(hapiServer, esHostname, esPort, mainIndex);
+    declareIndexRoute(hapiServer, esHostname, esPort, mainIndex);
+
+    // the deleteByNamespace performs an updateByQuery under the hood.
+    // It targets all SO indices that have namespace-aware types
+    const nsIndices = getIndicesWithNamespaceAwareTypes(setup.savedObjects.getTypeRegistry());
+    declarePostUpdateByQueryRoute(hapiServer, esHostname, esPort, nsIndices);
 
     // register index-agnostic routes
     declarePostBulkRoute(hapiServer, esHostname, esPort);
@@ -124,19 +135,6 @@ describe('404s from proxies', () => {
 
     await hapiServer.start();
 
-    // Setup kibana configured to use proxy as ES backend
-    root = createRootWithCorePlugins({
-      elasticsearch: {
-        hosts: [`http://${esHostname}:${proxyPort}`],
-      },
-      migrations: {
-        skip: false,
-      },
-    });
-    await root.preboot();
-    const setup = await root.setup();
-    registerSOTypes(setup);
-
     start = await root.start();
   });
 
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy_utils.ts b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy_utils.ts
index 6f40d19f609d9..8419d4865c5c7 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy_utils.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/repository_with_proxy_utils.ts
@@ -6,7 +6,13 @@
  * Side Public License, v 1.
  */
 import Hapi from '@hapi/hapi';
-import { IncomingMessage } from 'http';
+import type { IncomingMessage } from 'http';
+import { LEGACY_URL_ALIAS_TYPE } from '@kbn/core-saved-objects-base-server-internal';
+import {
+  type ISavedObjectTypeRegistry,
+  MAIN_SAVED_OBJECT_INDEX,
+} from '@kbn/core-saved-objects-server';
+import { kibanaPackageJson as pkg } from '@kbn/repo-info';
 
 // proxy setup
 const defaultProxyOptions = (hostname: string, port: string) => ({
@@ -304,21 +310,32 @@ export const declarePassthroughRoute = (hapiServer: Hapi.Server, hostname: strin
     },
   });
 
-export function allCombinationsPermutations<T>(collection: T[]): T[][] {
-  const recur = (subcollection: T[], size: number): T[][] => {
-    if (size <= 0) {
-      return [[]];
-    }
-    const permutations: T[][] = [];
-    subcollection.forEach((value, index, array) => {
-      array = array.slice();
-      array.splice(index, 1);
-      recur(array, size - 1).forEach((permutation) => {
-        permutation.unshift(value);
-        permutations.push(permutation);
-      });
-    });
-    return permutations;
-  };
-  return collection.map((_, n) => recur(collection, n + 1)).flat();
-}
+/**
+ * Obtain the versioned Kibana index, tipically used by the Elasticsearch client
+ * e.g. .kibana_8.15.0
+ * @returns string
+ */
+export const getVersionedKibanaIndex = (): string => {
+  return `${MAIN_SAVED_OBJECT_INDEX}_${pkg.version}`;
+};
+
+/**
+ * Obtain a comma separated list of all SO indices that contain namespace-aware SO types
+ * inspired on delete_by_namespace.ts
+ *
+ * @param registry The SO type registry to query registered types
+ * @returns string
+ */
+export const getIndicesWithNamespaceAwareTypes = (registry: ISavedObjectTypeRegistry): string => {
+  const allTypes = registry.getAllTypes();
+  const unique = (array: string[]) => [...new Set(array)];
+
+  return unique(
+    [
+      ...allTypes
+        .filter((type) => !registry.isNamespaceAgnostic(type.name))
+        .map(({ name }) => name),
+      LEGACY_URL_ALIAS_TYPE,
+    ].map((type) => `${registry.getIndex(type) || MAIN_SAVED_OBJECT_INDEX}_${pkg.version}`)
+  ).join(',');
+};
diff --git a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
index f9205086ceb2e..b4c9c912f7331 100644
--- a/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
+++ b/src/core/server/integration_tests/saved_objects/service/lib/update.test.ts
@@ -17,7 +17,6 @@ import {
   getKibanaMigratorTestKit,
   startElasticsearch,
 } from '../../migrations/kibana_migrator_test_kit';
-import { delay } from '../../migrations/test_utils';
 import { getBaseMigratorParams } from '../../migrations/fixtures/zdt_base.fixtures';
 
 export const logFilePath = Path.join(__dirname, 'update.test.log');
@@ -93,7 +92,6 @@ describe('SOR - update API', () => {
 
   afterAll(async () => {
     await esServer?.stop();
-    await delay(10);
   });
 
   const setup = async () => {
diff --git a/src/core/server/integration_tests/saved_objects/validation/validator.test.ts b/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
index a0dc22440f1df..4f79a8618df02 100644
--- a/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
+++ b/src/core/server/integration_tests/saved_objects/validation/validator.test.ts
@@ -164,8 +164,6 @@ describe.skip('validates saved object types when a schema is provided', () => {
     if (esServer) {
       await esServer.stop();
     }
-
-    await new Promise((resolve) => setTimeout(resolve, 10000));
   });
 
   it('does nothing when no schema is provided', async () => {
diff --git a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
index 10fcbe6d06d6a..75237f0ea3594 100755
--- a/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
+++ b/src/dev/build/tasks/os_packages/docker_generator/resources/base/bin/kibana-docker
@@ -40,6 +40,7 @@ kibana_vars=(
     csp.report_uri
     csp.report_to
     csp.report_only.form_action
+    permissionsPolicy.report_to
     data.autocomplete.valueSuggestions.terminateAfter
     data.autocomplete.valueSuggestions.timeout
     data.search.asyncSearch.waitForCompletion
diff --git a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
index ecb93cfd50792..a8daba08d37b4 100644
--- a/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
+++ b/src/dev/build/tasks/os_packages/docker_generator/templates/base/Dockerfile
@@ -12,7 +12,7 @@
 FROM {{{baseImageName}}} AS builder
 
 {{#ubi}}
-RUN microdnf install -y findutils tar gzip
+RUN microdnf install -y findutils tar gzip{{#fips}} perl make gcc{{/fips}}
 {{/ubi}}
 {{#ubuntu}}
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y curl
@@ -37,6 +37,30 @@ WORKDIR /usr/share/kibana
 RUN tar \
   --strip-components=1 \
   -zxf /tmp/kibana.tar.gz
+
+{{#fips}}
+# OpenSSL requires specific versions that are FIPS certified.
+#
+# See:
+# https://github.com/openssl/openssl/blob/openssl-3.0/README-FIPS.md
+# https://www.openssl.org/docs/man3.0/man7/fips_module.html
+RUN set -e ; \
+ OPENSSL_VERSION='3.0.8'; \
+ OPENSSL_PATH=/usr/share/kibana/openssl ; \
+ mkdir "${OPENSSL_PATH}"; \
+ curl --retry 8 -S -L -O "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" ; \
+ curl --retry 8 -S -L -O "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz.sha256" ; \
+ echo "$(cat openssl-${OPENSSL_VERSION}.tar.gz.sha256) openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c ; \
+ tar -zxf "openssl-${OPENSSL_VERSION}.tar.gz" ; \
+ rm -rf openssl-${OPENSSL_VERSION}.tar* ; \
+ cd "/usr/share/kibana/openssl-${OPENSSL_VERSION}" ; \
+ ./Configure --prefix="${OPENSSL_PATH}" --openssldir="${OPENSSL_PATH}/ssl" --libdir="${OPENSSL_PATH}/lib" enable-fips; \
+ make -j $(nproc) > /dev/null ; \
+ make install > /dev/null ; \
+ rm -rf  "/usr/share/kibana/openssl-${OPENSSL_VERSION}" ; \
+ chown -R 1000:0 "${OPENSSL_PATH}";
+ 
+{{/fips}}
 # Ensure that group permissions are the same as user permissions.
 # This will help when relying on GID-0 to run Kibana, rather than UID-1000.
 # OpenShift does this, for example.
@@ -90,7 +114,7 @@ EXPOSE 5601
 RUN for iter in {1..10}; do \
       microdnf update --setopt=tsflags=nodocs -y && \
       microdnf install --setopt=tsflags=nodocs -y \
-        fontconfig freetype shadow-utils nss findutils {{#fips}}perl make gcc tar {{/fips}}&& \
+        fontconfig freetype shadow-utils nss findutils && \
       microdnf clean all && exit_code=0 && break || exit_code=$? && echo "microdnf error: retry $iter in 10s" && \
       sleep 10; \
     done; \
@@ -127,30 +151,6 @@ RUN fc-cache -v
 WORKDIR /usr/share/kibana
 {{#fips}}
 
-# OpenSSL requires specific versions that are FIPS certified. Further, the FIPS modules
-# need to be compiled on the machine to pass its own self validation on startup.
-#
-# See:
-# https://github.com/openssl/openssl/blob/openssl-3.0/README-FIPS.md
-# https://www.openssl.org/docs/man3.0/man7/fips_module.html
-
-# Ideally we would handle this in the builder step, but OpenSSL requires linking of many submodules.
-RUN set -e ; \
- OPENSSL_VERSION='3.0.8'; \
- OPENSSL_PATH=/usr/share/kibana/openssl ; \
- mkdir "${OPENSSL_PATH}"; \
- curl --retry 8 -S -L -O "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz" ; \
- curl --retry 8 -S -L -O "https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz.sha256" ; \
- echo "$(cat openssl-${OPENSSL_VERSION}.tar.gz.sha256) openssl-${OPENSSL_VERSION}.tar.gz" | sha256sum -c ; \
- tar -zxf "openssl-${OPENSSL_VERSION}.tar.gz" ; \
- rm -rf openssl-${OPENSSL_VERSION}.tar* ; \
- cd "/usr/share/kibana/openssl-${OPENSSL_VERSION}" ; \
- ./Configure --prefix="${OPENSSL_PATH}" --openssldir="${OPENSSL_PATH}/ssl" --libdir="${OPENSSL_PATH}/lib" enable-fips; \
- make -j $(nproc) > /dev/null ; \
- make install > /dev/null ; \
- rm -rf  "/usr/share/kibana/openssl-${OPENSSL_VERSION}" ; \
- chown -R 1000:0 "${OPENSSL_PATH}";
-
 # Enable FIPS for Kibana only. In the future we can override OS wide with ENV OPENSSL_CONF
 RUN /usr/bin/echo -e '\n--enable-fips' >> config/node.options
 RUN /usr/bin/echo '--openssl-config=/usr/share/kibana/config/nodejs.cnf' >> config/node.options
diff --git a/src/dev/license_checker/config.ts b/src/dev/license_checker/config.ts
index fabd250b29137..b4b215797aa24 100644
--- a/src/dev/license_checker/config.ts
+++ b/src/dev/license_checker/config.ts
@@ -85,7 +85,7 @@ export const PER_PACKAGE_ALLOWED_LICENSES = {
 export const LICENSE_OVERRIDES = {
   'jsts@1.6.2': ['Eclipse Distribution License - v 1.0'], // cf. https://github.com/bjornharrtell/jsts
   '@mapbox/jsonlint-lines-primitives@2.0.2': ['MIT'], // license in readme https://github.com/tmcw/jsonlint
-  '@elastic/ems-client@8.5.1': ['Elastic License 2.0'],
+  '@elastic/ems-client@8.5.3': ['Elastic License 2.0'],
   '@elastic/eui@95.2.0': ['SSPL-1.0 OR Elastic License 2.0'],
   'language-subtag-registry@0.3.21': ['CC-BY-4.0'], // retired ODC‑By license https://github.com/mattcg/language-subtag-registry
   'buffers@0.1.1': ['MIT'], // license in importing module https://www.npmjs.com/package/binary
diff --git a/src/plugins/bfetch/server/ui_settings.ts b/src/plugins/bfetch/server/ui_settings.ts
index 697864bec1c59..0dede79980d93 100644
--- a/src/plugins/bfetch/server/ui_settings.ts
+++ b/src/plugins/bfetch/server/ui_settings.ts
@@ -23,6 +23,12 @@ export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
           'Disables requests batching. This increases number of HTTP requests from Kibana, but allows to debug requests individually.',
       }),
       schema: schema.boolean(),
+      deprecation: {
+        message: i18n.translate('bfetch.advancedSettings.disableBfetchDeprecation', {
+          defaultMessage: 'This setting is deprecated and will be removed in Kibana 9.0.',
+        }),
+        docLinksKey: 'generalSettings',
+      },
       category: [],
       requiresPageReload: true,
     },
@@ -36,6 +42,12 @@ export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
           'Disable batch compression. This allows you to debug individual requests, but increases response size.',
       }),
       schema: schema.boolean(),
+      deprecation: {
+        message: i18n.translate('bfetch.advancedSettings.disableBfetchCompressionDeprecation', {
+          defaultMessage: 'This setting is deprecated and will be removed in Kibana 9.0.',
+        }),
+        docLinksKey: 'generalSettings',
+      },
       category: [],
       requiresPageReload: true,
     },
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
index abfa37dd8df6e..88568b1c231cb 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.test.ts
@@ -25,6 +25,10 @@ describe('interpreter/functions#metricVis', () => {
     progressDirection: 'horizontal',
     maxCols: 1,
     inspectorTableId: 'random-id',
+    titlesTextAlign: 'left',
+    valuesTextAlign: 'right',
+    iconAlign: 'left',
+    valueFontSize: 'default',
   };
 
   it('should pass over overrides from variables', async () => {
diff --git a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
index db1e0cf5cea5f..c40af033ceab9 100644
--- a/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/expression_functions/metric_vis_function.ts
@@ -77,6 +77,30 @@ export const metricVisFunction = (): MetricVisExpressionFunctionDefinition => ({
           'The direction the progress bar should grow. Must be provided to render a progress bar.',
       }),
     },
+    titlesTextAlign: {
+      types: ['string'],
+      help: i18n.translate('expressionMetricVis.function.titlesTextAlign.help', {
+        defaultMessage: 'The alignment of the Title and Subtitle.',
+      }),
+    },
+    valuesTextAlign: {
+      types: ['string'],
+      help: i18n.translate('expressionMetricVis.function.valuesTextAlign.help', {
+        defaultMessage: 'The alignment of the Primary and Secondary Metric.',
+      }),
+    },
+    iconAlign: {
+      types: ['string'],
+      help: i18n.translate('expressionMetricVis.function.iconAlign.help', {
+        defaultMessage: 'The alignment of icon.',
+      }),
+    },
+    valueFontSize: {
+      types: ['string', 'number'],
+      help: i18n.translate('expressionMetricVis.function.valueFontSize.help', {
+        defaultMessage: 'The value font size.',
+      }),
+    },
     color: {
       types: ['string'],
       help: i18n.translate('expressionMetricVis.function.color.help', {
@@ -189,6 +213,10 @@ export const metricVisFunction = (): MetricVisExpressionFunctionDefinition => ({
             icon: args.icon,
             palette: args.palette?.params,
             progressDirection: args.progressDirection,
+            titlesTextAlign: args.titlesTextAlign,
+            valuesTextAlign: args.valuesTextAlign,
+            iconAlign: args.iconAlign,
+            valueFontSize: args.valueFontSize,
             maxCols: args.maxCols,
             minTiles: args.minTiles,
             trends: args.trendline?.trends,
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
index 28199c684ea15..7e7438aa3d8ad 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_functions.ts
@@ -7,7 +7,7 @@
  */
 
 import type { PaletteOutput } from '@kbn/coloring';
-import { LayoutDirection, MetricWTrend } from '@elastic/charts';
+import { LayoutDirection, MetricStyle, MetricWTrend } from '@elastic/charts';
 import { $Values } from '@kbn/utility-types';
 import {
   Datatable,
@@ -38,6 +38,10 @@ export interface MetricArguments {
   subtitle?: string;
   secondaryPrefix?: string;
   progressDirection?: LayoutDirection;
+  titlesTextAlign: MetricStyle['titlesTextAlign'];
+  valuesTextAlign: MetricStyle['valuesTextAlign'];
+  iconAlign: MetricStyle['iconAlign'];
+  valueFontSize: MetricStyle['valueFontSize'];
   color?: string;
   icon?: string;
   palette?: PaletteOutput<CustomPaletteState>;
diff --git a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
index b9a43af0752b2..083f464670d89 100644
--- a/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
+++ b/src/plugins/chart_expressions/expression_metric/common/types/expression_renderers.ts
@@ -8,7 +8,7 @@
 
 import { ExpressionValueVisDimension } from '@kbn/visualizations-plugin/common';
 import { CustomPaletteState } from '@kbn/charts-plugin/common';
-import { LayoutDirection } from '@elastic/charts';
+import { LayoutDirection, MetricStyle } from '@elastic/charts';
 import { TrendlineResult } from './expression_functions';
 
 export const visType = 'metric';
@@ -27,6 +27,10 @@ export interface MetricVisParam {
   icon?: string;
   palette?: CustomPaletteState;
   progressDirection?: LayoutDirection;
+  titlesTextAlign: MetricStyle['titlesTextAlign'];
+  valuesTextAlign: MetricStyle['valuesTextAlign'];
+  iconAlign: MetricStyle['iconAlign'];
+  valueFontSize: MetricStyle['valueFontSize'];
   maxCols: number;
   minTiles?: number;
   trends?: TrendlineResult['trends'];
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.test.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.test.tsx
index ed57f38ec886f..3687113d9aee0 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.test.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.test.tsx
@@ -23,7 +23,7 @@ import { SerializedFieldFormat } from '@kbn/field-formats-plugin/common';
 import { SerializableRecord } from '@kbn/utility-types';
 import type { IUiSettingsClient } from '@kbn/core/public';
 import { CustomPaletteState } from '@kbn/charts-plugin/common/expressions/palette/types';
-import { DimensionsVisParam } from '../../common';
+import { DimensionsVisParam, MetricVisParam } from '../../common';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { DEFAULT_TRENDLINE_NAME } from '../../common/constants';
 import faker from 'faker';
@@ -73,6 +73,15 @@ const dayOfWeekColumnId = 'col-0-0';
 const basePriceColumnId = 'col-1-1';
 const minPriceColumnId = 'col-2-2';
 
+const defaultMetricParams: MetricVisParam = {
+  progressDirection: 'vertical',
+  maxCols: 5,
+  titlesTextAlign: 'left',
+  valuesTextAlign: 'right',
+  iconAlign: 'left',
+  valueFontSize: 'default',
+};
+
 const table: Datatable = {
   type: 'datatable',
   columns: [
@@ -217,8 +226,7 @@ describe('MetricVisComponent', function () {
   describe('single metric', () => {
     const config: Props['config'] = {
       metric: {
-        progressDirection: 'vertical',
-        maxCols: 5,
+        ...defaultMetricParams,
         icon: 'empty',
       },
       dimensions: {
@@ -397,13 +405,67 @@ describe('MetricVisComponent', function () {
       expect(tileConfig.trend).toEqual(trends[DEFAULT_TRENDLINE_NAME]);
       expect(tileConfig.trendShape).toEqual('area');
     });
+
+    it('should display multi-values non-numeric values formatted and without quotes', () => {
+      const newTable: Datatable = {
+        ...table,
+        // change the format id for the columns
+        columns: table.columns.map((column) =>
+          [basePriceColumnId, minPriceColumnId].includes(column.id)
+            ? {
+                ...column,
+                meta: { ...column.meta, params: { id: 'text' } },
+              }
+            : column
+        ),
+        rows: table.rows.map((row) => ({
+          ...row,
+          [basePriceColumnId]: [String(row[basePriceColumnId]), String(100)],
+          [minPriceColumnId]: [String(row[minPriceColumnId]), String(10)],
+        })),
+      };
+      const component = shallow(<MetricVis config={config} data={newTable} {...defaultProps} />);
+
+      const [[visConfig]] = component.find(Metric).props().data!;
+
+      expect(visConfig!.value).toMatchInlineSnapshot(
+        `
+        Array [
+          "text-28.984375",
+          "text-100",
+        ]
+      `
+      );
+    });
+
+    it('should display multi-values numeric values formatted and without quotes', () => {
+      const newTable = {
+        ...table,
+        rows: table.rows.map((row) => ({
+          ...row,
+          [basePriceColumnId]: [row[basePriceColumnId], 100],
+          [minPriceColumnId]: [row[minPriceColumnId], 10],
+        })),
+      };
+      const component = shallow(<MetricVis config={config} data={newTable} {...defaultProps} />);
+
+      const [[visConfig]] = component.find(Metric).props().data!;
+
+      expect(visConfig!.value).toMatchInlineSnapshot(
+        `
+        Array [
+          "number-28.984375",
+          "number-100",
+        ]
+      `
+      );
+    });
   });
 
   describe('metric grid', () => {
     const config: Props['config'] = {
       metric: {
-        progressDirection: 'vertical',
-        maxCols: 5,
+        ...defaultMetricParams,
       },
       dimensions: {
         metric: basePriceColumnId,
@@ -856,8 +918,7 @@ describe('MetricVisComponent', function () {
           data={table}
           config={{
             metric: {
-              progressDirection: 'vertical',
-              maxCols: 5,
+              ...defaultMetricParams,
             },
             dimensions: {
               metric: basePriceColumnId,
@@ -911,8 +972,7 @@ describe('MetricVisComponent', function () {
       <MetricVis
         config={{
           metric: {
-            progressDirection: 'vertical',
-            maxCols: 5,
+            ...defaultMetricParams,
           },
           dimensions: {
             metric: basePriceColumnId,
@@ -953,8 +1013,7 @@ describe('MetricVisComponent', function () {
       <MetricVis
         config={{
           metric: {
-            progressDirection: 'vertical',
-            maxCols: 5,
+            ...defaultMetricParams,
           },
           dimensions: {
             metric: metricId,
@@ -980,8 +1039,7 @@ describe('MetricVisComponent', function () {
         <MetricVis
           config={{
             metric: {
-              progressDirection: 'vertical',
-              maxCols: 5,
+              ...defaultMetricParams,
             },
             dimensions: {
               metric: basePriceColumnId,
@@ -1057,8 +1115,7 @@ describe('MetricVisComponent', function () {
         <MetricVis
           config={{
             metric: {
-              progressDirection: 'vertical',
-              maxCols: 5,
+              ...defaultMetricParams,
             },
             dimensions: {
               metric: basePriceColumnId,
@@ -1088,8 +1145,7 @@ describe('MetricVisComponent', function () {
                 metric: basePriceColumnId,
               },
               metric: {
-                progressDirection: 'vertical',
-                maxCols: 5,
+                ...defaultMetricParams,
                 // should be overridden
                 color: 'static-color',
                 palette: {
@@ -1141,9 +1197,8 @@ describe('MetricVisComponent', function () {
               config={{
                 dimensions,
                 metric: {
+                  ...defaultMetricParams,
                   palette,
-                  progressDirection: 'vertical',
-                  maxCols: 5,
                 },
               }}
               data={table}
@@ -1205,8 +1260,7 @@ describe('MetricVisComponent', function () {
                 metric: basePriceColumnId,
               },
               metric: {
-                progressDirection: 'vertical',
-                maxCols: 5,
+                ...defaultMetricParams,
                 color: staticColor,
                 palette: undefined,
               },
@@ -1230,8 +1284,7 @@ describe('MetricVisComponent', function () {
                 metric: basePriceColumnId,
               },
               metric: {
-                progressDirection: 'vertical',
-                maxCols: 5,
+                ...defaultMetricParams,
                 color: undefined,
                 palette: undefined,
               },
@@ -1260,8 +1313,7 @@ describe('MetricVisComponent', function () {
     ) => {
       const config: Props['config'] = {
         metric: {
-          progressDirection: 'vertical',
-          maxCols: 5,
+          ...defaultMetricParams,
         },
         dimensions: {
           metric: '1',
@@ -1416,8 +1468,7 @@ describe('MetricVisComponent', function () {
         <MetricVis
           config={{
             metric: {
-              progressDirection: 'vertical',
-              maxCols: 5,
+              ...defaultMetricParams,
             },
             dimensions: {
               metric: basePriceColumnId,
diff --git a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx b/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx
index fb1383ce98d48..4ed15f5f72554 100644
--- a/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx
+++ b/src/plugins/chart_expressions/expression_metric/public/components/metric_vis.tsx
@@ -208,15 +208,16 @@ export const MetricVis = ({
     const subtitle = breakdownByColumn ? primaryMetricColumn.name : config.metric.subtitle;
 
     if (typeof value !== 'number') {
-      const nonNumericMetric: MetricWText = {
-        value: formatPrimaryMetric(value),
+      const nonNumericMetricBase: Omit<MetricWText, 'value'> = {
         title: String(title),
         subtitle,
         icon: config.metric?.icon ? getIcon(config.metric?.icon) : undefined,
         extra: renderSecondaryMetric(data.columns, row, config),
         color: config.metric.color ?? defaultColor,
       };
-      return nonNumericMetric;
+      return Array.isArray(value)
+        ? { ...nonNumericMetricBase, value: value.map((v) => formatPrimaryMetric(v)) }
+        : { ...nonNumericMetricBase, value: formatPrimaryMetric(value) };
     }
 
     const baseMetric: MetricWNumber = {
@@ -335,6 +336,10 @@ export const MetricVis = ({
                   barBackground: euiThemeVars.euiColorLightShade,
                   emptyBackground: euiThemeVars.euiColorEmptyShade,
                   blendingBackground: euiThemeVars.euiColorEmptyShade,
+                  titlesTextAlign: config.metric.titlesTextAlign,
+                  valuesTextAlign: config.metric.valuesTextAlign,
+                  iconAlign: config.metric.iconAlign,
+                  valueFontSize: config.metric.valueFontSize,
                 },
               },
               ...(Array.isArray(settingsThemeOverrides)
diff --git a/src/plugins/console/server/routes/api/console/autocomplete_entities/index.ts b/src/plugins/console/server/routes/api/console/autocomplete_entities/index.ts
index 2d19de0a56e74..677e4b93797c6 100644
--- a/src/plugins/console/server/routes/api/console/autocomplete_entities/index.ts
+++ b/src/plugins/console/server/routes/api/console/autocomplete_entities/index.ts
@@ -16,7 +16,7 @@ const MAX_RESPONSE_SIZE = 10 * 1024 * 1024; // 10MB
 
 const getMappings = async (settings: SettingsToRetrieve, esClient: IScopedClusterClient) => {
   if (settings.fields && settings.fieldsIndices) {
-    const mappings = await esClient.asInternalUser.indices.getMapping(
+    const mappings = await esClient.asCurrentUser.indices.getMapping(
       {
         index: settings.fieldsIndices,
       },
@@ -33,7 +33,7 @@ const getMappings = async (settings: SettingsToRetrieve, esClient: IScopedCluste
 
 const getAliases = async (settings: SettingsToRetrieve, esClient: IScopedClusterClient) => {
   if (settings.indices) {
-    const aliases = await esClient.asInternalUser.indices.getAlias();
+    const aliases = await esClient.asCurrentUser.indices.getAlias();
     return aliases;
   }
   // If the user doesn't want autocomplete suggestions, then clear any that exist.
@@ -42,7 +42,7 @@ const getAliases = async (settings: SettingsToRetrieve, esClient: IScopedCluster
 
 const getDataStreams = async (settings: SettingsToRetrieve, esClient: IScopedClusterClient) => {
   if (settings.dataStreams) {
-    const dataStreams = await esClient.asInternalUser.indices.getDataStream();
+    const dataStreams = await esClient.asCurrentUser.indices.getDataStream();
     return dataStreams;
   }
   // If the user doesn't want autocomplete suggestions, then clear any that exist.
@@ -51,7 +51,7 @@ const getDataStreams = async (settings: SettingsToRetrieve, esClient: IScopedClu
 
 const getLegacyTemplates = async (settings: SettingsToRetrieve, esClient: IScopedClusterClient) => {
   if (settings.templates) {
-    const legacyTemplates = await esClient.asInternalUser.indices.getTemplate();
+    const legacyTemplates = await esClient.asCurrentUser.indices.getTemplate();
     return legacyTemplates;
   }
   // If the user doesn't want autocomplete suggestions, then clear any that exist.
@@ -60,7 +60,7 @@ const getLegacyTemplates = async (settings: SettingsToRetrieve, esClient: IScope
 
 const getIndexTemplates = async (settings: SettingsToRetrieve, esClient: IScopedClusterClient) => {
   if (settings.templates) {
-    const indexTemplates = await esClient.asInternalUser.indices.getIndexTemplate();
+    const indexTemplates = await esClient.asCurrentUser.indices.getIndexTemplate();
     return indexTemplates;
   }
   // If the user doesn't want autocomplete suggestions, then clear any that exist.
@@ -72,7 +72,7 @@ const getComponentTemplates = async (
   esClient: IScopedClusterClient
 ) => {
   if (settings.templates) {
-    const componentTemplates = await esClient.asInternalUser.cluster.getComponentTemplate();
+    const componentTemplates = await esClient.asCurrentUser.cluster.getComponentTemplate();
     return componentTemplates;
   }
   // If the user doesn't want autocomplete suggestions, then clear any that exist.
diff --git a/src/plugins/dashboard/kibana.jsonc b/src/plugins/dashboard/kibana.jsonc
index 1c7689e09cf9f..2bf60cde55ef0 100644
--- a/src/plugins/dashboard/kibana.jsonc
+++ b/src/plugins/dashboard/kibana.jsonc
@@ -34,7 +34,8 @@
       "usageCollection",
       "taskManager",
       "serverless",
-      "noDataPage"
+      "noDataPage",
+      "observabilityAIAssistant"
     ],
     "requiredBundles": [
       "kibanaReact",
diff --git a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
index 320887bbf551c..2fa3ad16f7823 100644
--- a/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/dashboard_app/dashboard_app.tsx
@@ -42,6 +42,7 @@ import { loadDashboardHistoryLocationState } from './locator/load_dashboard_hist
 import type { DashboardCreationOptions } from '../dashboard_container/embeddable/dashboard_container_factory';
 import { DashboardTopNav } from '../dashboard_top_nav';
 import { DashboardTabTitleSetter } from './tab_title_setter/dashboard_tab_title_setter';
+import { useObservabilityAIAssistantContext } from './hooks/use_observability_ai_assistant_context';
 
 export interface DashboardAppProps {
   history: History;
@@ -82,13 +83,21 @@ export function DashboardApp({
     embeddable: { getStateTransfer },
     notifications: { toasts },
     settings: { uiSettings },
-    data: { search },
+    data: { search, dataViews },
     customBranding,
     share: { url },
+    observabilityAIAssistant,
   } = pluginServices.getServices();
   const showPlainSpinner = useObservable(customBranding.hasCustomBranding$, false);
   const { scopedHistory: getScopedHistory } = useDashboardMountContext();
 
+  useObservabilityAIAssistantContext({
+    observabilityAIAssistant: observabilityAIAssistant.start,
+    dashboardAPI,
+    search,
+    dataViews,
+  });
+
   useExecutionContext(executionContext, {
     type: 'application',
     page: 'app',
diff --git a/src/plugins/dashboard/public/dashboard_app/hooks/use_observability_ai_assistant_context.tsx b/src/plugins/dashboard/public/dashboard_app/hooks/use_observability_ai_assistant_context.tsx
new file mode 100644
index 0000000000000..04340b040c5ca
--- /dev/null
+++ b/src/plugins/dashboard/public/dashboard_app/hooks/use_observability_ai_assistant_context.tsx
@@ -0,0 +1,386 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ObservabilityAIAssistantPublicStart } from '@kbn/observability-ai-assistant-plugin/public';
+import { useEffect } from 'react';
+import type { Embeddable } from '@kbn/embeddable-plugin/public';
+import { getESQLQueryColumns } from '@kbn/esql-utils';
+import type { ISearchStart } from '@kbn/data-plugin/public';
+import {
+  LensConfigBuilder,
+  type LensConfig,
+  type LensMetricConfig,
+  type LensPieConfig,
+  type LensGaugeConfig,
+  type LensXYConfig,
+  type LensHeatmapConfig,
+  type LensMosaicConfig,
+  type LensRegionMapConfig,
+  type LensTableConfig,
+  type LensTagCloudConfig,
+  type LensTreeMapConfig,
+  LensDataset,
+} from '@kbn/lens-embeddable-utils/config_builder';
+import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
+import { LensEmbeddableInput } from '@kbn/lens-plugin/public';
+import type { AwaitingDashboardAPI } from '../../dashboard_container';
+
+const chartTypes = [
+  'xy',
+  'pie',
+  'heatmap',
+  'metric',
+  'gauge',
+  'donut',
+  'mosaic',
+  'regionmap',
+  'table',
+  'tagcloud',
+  'treemap',
+] as const;
+
+export function useObservabilityAIAssistantContext({
+  observabilityAIAssistant,
+  dashboardAPI,
+  search,
+  dataViews,
+}: {
+  observabilityAIAssistant: ObservabilityAIAssistantPublicStart | undefined;
+  dashboardAPI: AwaitingDashboardAPI;
+  search: ISearchStart;
+  dataViews: DataViewsPublicPluginStart;
+}) {
+  useEffect(() => {
+    if (!observabilityAIAssistant) {
+      return;
+    }
+
+    const {
+      service: { setScreenContext },
+      createScreenContextAction,
+    } = observabilityAIAssistant;
+
+    return setScreenContext({
+      screenDescription:
+        'The user is looking at the dashboard app. Here they can add visualizations to a dashboard and save them',
+      actions: dashboardAPI
+        ? [
+            createScreenContextAction(
+              {
+                name: 'add_to_dashboard',
+                description:
+                  'Add an ES|QL visualization to the current dashboard. Pick a single chart type, and based on the chart type, the corresponding key for `layers`. E.g., when you select type:metric, fill in only layers.metric.',
+                parameters: {
+                  type: 'object',
+                  properties: {
+                    esql: {
+                      type: 'object',
+                      properties: {
+                        query: {
+                          type: 'string',
+                          description:
+                            'The ES|QL query for this visualization. Use the "query" function to generate ES|QL first and then add it here.',
+                        },
+                      },
+                      required: ['query'],
+                    },
+                    type: {
+                      type: 'string',
+                      description: 'The type of chart',
+                      enum: chartTypes,
+                    },
+                    layers: {
+                      type: 'object',
+                      properties: {
+                        xy: {
+                          type: 'object',
+                          properties: {
+                            xAxis: {
+                              type: 'string',
+                            },
+                            yAxis: {
+                              type: 'string',
+                            },
+                            type: {
+                              type: 'string',
+                              enum: ['line', 'bar', 'area'],
+                            },
+                          },
+                        },
+                        donut: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                        },
+                        metric: {
+                          type: 'object',
+                        },
+                        gauge: {
+                          type: 'object',
+                        },
+                        pie: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                        },
+                        heatmap: {
+                          type: 'object',
+                          properties: {
+                            xAxis: {
+                              type: 'string',
+                            },
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                          required: ['xAxis'],
+                        },
+                        mosaic: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                          required: ['breakdown'],
+                        },
+                        regionmap: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                          required: ['breakdown'],
+                        },
+                        table: {
+                          type: 'object',
+                        },
+                        tagcloud: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                          required: ['breakdown'],
+                        },
+                        treemap: {
+                          type: 'object',
+                          properties: {
+                            breakdown: {
+                              type: 'string',
+                            },
+                          },
+                        },
+                      },
+                    },
+                    title: {
+                      type: 'string',
+                      description: 'An optional title for the visualization.',
+                    },
+                  },
+                  required: ['esql', 'type'],
+                } as const,
+              },
+              async ({ args, signal }) => {
+                const {
+                  title = '',
+                  type: chartType = 'xy',
+                  layers,
+                  esql: { query },
+                } = args;
+
+                const [columns] = await Promise.all([
+                  getESQLQueryColumns({
+                    esqlQuery: query,
+                    search: search.search,
+                    signal,
+                  }),
+                ]);
+
+                const configBuilder = new LensConfigBuilder(dataViews);
+
+                let config: LensConfig;
+
+                const firstMetricColumn = columns.find(
+                  (column) => column.meta.type === 'number'
+                )?.id;
+
+                const dataset: LensDataset = {
+                  esql: query,
+                };
+
+                switch (chartType) {
+                  default:
+                  case 'xy':
+                    const xyConfig: LensXYConfig = {
+                      chartType: 'xy',
+                      layers: [
+                        {
+                          seriesType: layers?.xy?.type || 'line',
+                          type: 'series',
+                          xAxis: layers?.xy?.xAxis || '@timestamp',
+                          yAxis: [
+                            {
+                              value: layers?.xy?.yAxis || firstMetricColumn!,
+                            },
+                          ],
+                        },
+                      ],
+                      dataset,
+                      title,
+                    };
+                    config = xyConfig;
+                    break;
+
+                  case 'donut':
+                    const donutConfig: LensPieConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: [layers?.donut?.breakdown!],
+                      dataset,
+                    };
+                    config = donutConfig;
+                    break;
+
+                  case 'pie':
+                    const pieConfig: LensPieConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: [layers?.pie?.breakdown!],
+                      dataset,
+                    };
+                    config = pieConfig;
+                    break;
+
+                  case 'metric':
+                    const metricConfig: LensMetricConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      dataset,
+                    };
+                    config = metricConfig;
+                    break;
+
+                  case 'gauge':
+                    const gaugeConfig: LensGaugeConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      dataset,
+                    };
+                    config = gaugeConfig;
+
+                    break;
+
+                  case 'heatmap':
+                    const heatmapConfig: LensHeatmapConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: layers?.heatmap?.breakdown,
+                      xAxis: layers?.heatmap?.xAxis || '@timestamp',
+                      dataset,
+                    };
+                    config = heatmapConfig;
+                    break;
+
+                  case 'mosaic':
+                    const mosaicConfig: LensMosaicConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: [layers?.mosaic?.breakdown || '@timestamp'],
+                      dataset,
+                    };
+                    config = mosaicConfig;
+                    break;
+
+                  case 'regionmap':
+                    const regionMapConfig: LensRegionMapConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: layers?.regionmap?.breakdown!,
+                      dataset,
+                    };
+                    config = regionMapConfig;
+                    break;
+
+                  case 'table':
+                    const tableConfig: LensTableConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      dataset,
+                    };
+                    config = tableConfig;
+                    break;
+
+                  case 'tagcloud':
+                    const tagCloudConfig: LensTagCloudConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: layers?.tagcloud?.breakdown!,
+                      dataset,
+                    };
+                    config = tagCloudConfig;
+                    break;
+
+                  case 'treemap':
+                    const treeMapConfig: LensTreeMapConfig = {
+                      chartType,
+                      title,
+                      value: firstMetricColumn!,
+                      breakdown: [layers?.treemap?.breakdown || '@timestamp'],
+                      dataset,
+                    };
+                    config = treeMapConfig;
+                    break;
+                }
+
+                const embeddableInput = (await configBuilder.build(config, {
+                  embeddable: true,
+                  query: dataset,
+                })) as LensEmbeddableInput;
+
+                return dashboardAPI
+                  .addNewPanel<Embeddable>({
+                    panelType: 'lens',
+                    initialState: embeddableInput,
+                  })
+                  .then(() => {
+                    return {
+                      content: 'Visualization successfully added to dashboard',
+                    };
+                  })
+                  .catch((error) => {
+                    return {
+                      content: {
+                        error,
+                      },
+                    };
+                  });
+              }
+            ),
+          ]
+        : [],
+    });
+  }, [observabilityAIAssistant, dashboardAPI, search, dataViews]);
+}
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
index e3a321f2355df..b9d2ff286023d 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.test.ts
@@ -497,12 +497,11 @@ test('creates new embeddable with specified size if size is provided', async ()
   expect(dashboard!.getState().explicitInput.panels.new_panel.gridData.h).toBe(1);
 });
 
-test('creates a control group from the control group factory and waits for it to be initialized', async () => {
+test('creates a control group from the control group factory', async () => {
   const mockControlGroupContainer = {
     destroy: jest.fn(),
     render: jest.fn(),
     updateInput: jest.fn(),
-    untilInitialized: jest.fn(),
     getInput: jest.fn().mockReturnValue({}),
     getInput$: jest.fn().mockReturnValue(new Observable()),
     getOutput: jest.fn().mockReturnValue({}),
@@ -532,7 +531,6 @@ test('creates a control group from the control group factory and waits for it to
     undefined,
     { lastSavedInput: expect.objectContaining({ controlStyle: 'oneLine' }) }
   );
-  expect(mockControlGroupContainer.untilInitialized).toHaveBeenCalled();
 });
 
 /*
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
index 32b21f0cf1c1e..26435c31a0d2c 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/create/create_dashboard.ts
@@ -502,7 +502,6 @@ export const initializeDashboard = async ({
       dashboardContainer.controlGroup = controlGroup;
       startSyncingDashboardControlGroup.bind(dashboardContainer)();
     });
-    await controlGroup.untilInitialized();
   }
 
   // --------------------------------------------------------------------------------------
diff --git a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
index 45f3b2535ff6d..06e1039497f8b 100644
--- a/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/dashboard_container/embeddable/dashboard_container.tsx
@@ -498,11 +498,19 @@ export class DashboardContainer
     if (reactEmbeddableRegistryHasKey(panelPackage.panelType)) {
       const newId = v4();
 
+      const getCustomPlacementSettingFunc = await getDashboardPanelPlacementSetting(
+        panelPackage.panelType
+      );
+
+      const customPlacementSettings = getCustomPlacementSettingFunc
+        ? await getCustomPlacementSettingFunc(panelPackage.initialState)
+        : {};
+
       const placementSettings = {
         width: DEFAULT_PANEL_WIDTH,
         height: DEFAULT_PANEL_HEIGHT,
         strategy: PanelPlacementStrategy.findTopLeftMostOpenSpace,
-        ...getDashboardPanelPlacementSetting(panelPackage.panelType)?.(panelPackage.initialState),
+        ...customPlacementSettings,
       };
 
       const { width, height, strategy } = placementSettings;
diff --git a/src/plugins/dashboard/public/dashboard_container/panel_placement/panel_placement_registry.ts b/src/plugins/dashboard/public/dashboard_container/panel_placement/panel_placement_registry.ts
index 98fab7c662506..7e3036593f1d1 100644
--- a/src/plugins/dashboard/public/dashboard_container/panel_placement/panel_placement_registry.ts
+++ b/src/plugins/dashboard/public/dashboard_container/panel_placement/panel_placement_registry.ts
@@ -11,14 +11,14 @@ import { panelPlacementStrings } from '../_dashboard_container_strings';
 
 const registry = new Map<string, GetPanelPlacementSettings<object>>();
 
-export const registerDashboardPanelPlacementSetting = (
+export const registerDashboardPanelPlacementSetting = <SerializedState extends object = object>(
   embeddableType: string,
-  getPanelPlacementSettings: GetPanelPlacementSettings
+  getPanelPlacementSettings: GetPanelPlacementSettings<SerializedState>
 ) => {
   if (registry.has(embeddableType)) {
     throw new Error(panelPlacementStrings.getPanelPlacementSettingsExistsError(embeddableType));
   }
-  registry.set(embeddableType, getPanelPlacementSettings);
+  registry.set(embeddableType, getPanelPlacementSettings as GetPanelPlacementSettings<object>);
 };
 
 export const getDashboardPanelPlacementSetting = (embeddableType: string) => {
diff --git a/src/plugins/dashboard/public/dashboard_container/panel_placement/types.ts b/src/plugins/dashboard/public/dashboard_container/panel_placement/types.ts
index 54b490e004fac..0c70ba6c553a4 100644
--- a/src/plugins/dashboard/public/dashboard_container/panel_placement/types.ts
+++ b/src/plugins/dashboard/public/dashboard_container/panel_placement/types.ts
@@ -7,6 +7,7 @@
  */
 
 import { EmbeddableInput } from '@kbn/embeddable-plugin/public';
+import { MaybePromise } from '@kbn/utility-types';
 import { DashboardPanelState } from '../../../common';
 import { GridData } from '../../../common/content_management';
 import { PanelPlacementStrategy } from '../../dashboard_constants';
@@ -40,4 +41,4 @@ export interface IProvidesLegacyPanelPlacementSettings<
 
 export type GetPanelPlacementSettings<SerializedState extends object = object> = (
   serializedState?: SerializedState
-) => PanelPlacementSettings;
+) => MaybePromise<PanelPlacementSettings>;
diff --git a/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.test.tsx b/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.test.tsx
index b2493454d4da2..da9783676cba3 100644
--- a/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.test.tsx
+++ b/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.test.tsx
@@ -157,6 +157,7 @@ describe('useDashboardListingTable', () => {
         showActivityView: true,
       },
       createdByEnabled: true,
+      recentlyAccessed: expect.objectContaining({ get: expect.any(Function) }),
     };
 
     expect(tableListViewTableProps).toEqual(expectedProps);
diff --git a/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.tsx b/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.tsx
index 659e5e43930ea..097fc5ea6d866 100644
--- a/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.tsx
+++ b/src/plugins/dashboard/public/dashboard_listing/hooks/use_dashboard_listing_table.tsx
@@ -100,6 +100,7 @@ export const useDashboardListingTable = ({
       checkForDuplicateDashboardTitle,
     },
     notifications: { toasts },
+    dashboardRecentlyAccessed,
   } = pluginServices.getServices();
 
   const { getEntityName, getTableListTitle, getEntityNamePlural } = dashboardListingTableStrings;
@@ -302,6 +303,7 @@ export const useDashboardListingTable = ({
       title,
       urlStateEnabled,
       createdByEnabled: true,
+      recentlyAccessed: dashboardRecentlyAccessed,
     }),
     [
       contentEditorValidators,
@@ -324,6 +326,7 @@ export const useDashboardListingTable = ({
       title,
       updateItemMeta,
       urlStateEnabled,
+      dashboardRecentlyAccessed,
     ]
   );
 
diff --git a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
index d3e0ac3459049..6cef6ab1871f4 100644
--- a/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
+++ b/src/plugins/dashboard/public/dashboard_top_nav/internal_dashboard_top_nav.tsx
@@ -83,6 +83,7 @@ export function InternalDashboardTopNav({
     embeddable: { getStateTransfer },
     initializerContext: { allowByValueEmbeddables },
     dashboardCapabilities: { saveQuery: allowSaveQuery, showWriteControls },
+    dashboardRecentlyAccessed,
   } = pluginServices.getServices();
   const isLabsEnabled = uiSettings.get(UI_SETTINGS.ENABLE_LABS_UI);
   const { setHeaderActionMenu, onAppLeave } = useDashboardMountContext();
@@ -143,6 +144,11 @@ export function InternalDashboardTopNav({
         title,
         lastSavedId
       );
+      dashboardRecentlyAccessed.add(
+        getFullEditPath(lastSavedId, viewMode === ViewMode.EDIT),
+        title,
+        lastSavedId
+      );
     }
     return () => subscription.unsubscribe();
   }, [
@@ -152,6 +158,7 @@ export function InternalDashboardTopNav({
     lastSavedId,
     viewMode,
     title,
+    dashboardRecentlyAccessed,
   ]);
 
   /**
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index c2838187d5eca..a3e5d24b9b7f2 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -52,6 +52,10 @@ import type { UrlForwardingSetup, UrlForwardingStart } from '@kbn/url-forwarding
 import type { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import type { ServerlessPluginStart } from '@kbn/serverless/public';
 import type { NoDataPagePluginStart } from '@kbn/no-data-page-plugin/public';
+import type {
+  ObservabilityAIAssistantPublicSetup,
+  ObservabilityAIAssistantPublicStart,
+} from '@kbn/observability-ai-assistant-plugin/public';
 
 import { CustomBrandingStart } from '@kbn/core-custom-branding-browser';
 import { SavedObjectsManagementPluginStart } from '@kbn/saved-objects-management-plugin/public';
@@ -87,6 +91,7 @@ export interface DashboardSetupDependencies {
   uiActions: UiActionsSetup;
   urlForwarding: UrlForwardingSetup;
   unifiedSearch: UnifiedSearchPublicPluginStart;
+  observabilityAIAssistant?: ObservabilityAIAssistantPublicSetup;
 }
 
 export interface DashboardStartDependencies {
@@ -110,6 +115,7 @@ export interface DashboardStartDependencies {
   customBranding: CustomBrandingStart;
   serverless?: ServerlessPluginStart;
   noDataPage?: NoDataPagePluginStart;
+  observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
 }
 
 export interface DashboardSetup {
@@ -120,9 +126,9 @@ export interface DashboardStart {
   locator?: DashboardAppLocator;
   dashboardFeatureFlagConfig: DashboardFeatureFlagConfig;
   findDashboardsService: () => Promise<FindDashboardsService>;
-  registerDashboardPanelPlacementSetting: (
+  registerDashboardPanelPlacementSetting: <SerializedState extends object = object>(
     embeddableType: string,
-    getPanelPlacementSettings: GetPanelPlacementSettings
+    getPanelPlacementSettings: GetPanelPlacementSettings<SerializedState>
   ) => void;
 }
 
diff --git a/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.stub.ts b/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.stub.ts
new file mode 100644
index 0000000000000..32f17f01d0e06
--- /dev/null
+++ b/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.stub.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { DashboardRecentlyAccessedService } from './types';
+
+type DashboardRecentlyAccessedServiceFactory =
+  PluginServiceFactory<DashboardRecentlyAccessedService>;
+
+export const dashboardRecentlyAccessedServiceFactory: DashboardRecentlyAccessedServiceFactory =
+  () => {
+    return {
+      add: jest.fn(),
+      get: jest.fn(),
+      get$: jest.fn(),
+    };
+  };
diff --git a/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.ts b/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.ts
new file mode 100644
index 0000000000000..8a80544aacad4
--- /dev/null
+++ b/src/plugins/dashboard/public/services/dashboard_recently_accessed/dashboard_recently_accessed.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { RecentlyAccessedService } from '@kbn/recently-accessed';
+import type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+
+import { DashboardHTTPService } from '../http/types';
+import { DashboardStartDependencies } from '../../plugin';
+import { DashboardRecentlyAccessedService } from './types';
+
+interface DashboardRecentlyAccessedRequiredServices {
+  http: DashboardHTTPService;
+}
+
+export type DashboardBackupServiceFactory = KibanaPluginServiceFactory<
+  DashboardRecentlyAccessedService,
+  DashboardStartDependencies,
+  DashboardRecentlyAccessedRequiredServices
+>;
+
+export const dashboardRecentlyAccessedFactory: DashboardBackupServiceFactory = (
+  core,
+  requiredServices
+) => {
+  const { http } = requiredServices;
+  return new RecentlyAccessedService().start({ http, key: 'dashboardRecentlyAccessed' });
+};
diff --git a/src/plugins/dashboard/public/services/dashboard_recently_accessed/types.ts b/src/plugins/dashboard/public/services/dashboard_recently_accessed/types.ts
new file mode 100644
index 0000000000000..0b27bfe89aa63
--- /dev/null
+++ b/src/plugins/dashboard/public/services/dashboard_recently_accessed/types.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { RecentlyAccessed } from '@kbn/recently-accessed';
+
+export type DashboardRecentlyAccessedService = RecentlyAccessed;
diff --git a/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.stub.ts b/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.stub.ts
new file mode 100644
index 0000000000000..089ac9c6afc6b
--- /dev/null
+++ b/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.stub.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import { PluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import { observabilityAIAssistantPluginMock } from '@kbn/observability-ai-assistant-plugin/public/mock';
+import { ObservabilityAIAssistantService } from './types';
+
+type ObservabilityAIAssistantServiceFactory = PluginServiceFactory<ObservabilityAIAssistantService>;
+
+export const observabilityAIAssistantServiceStubFactory: ObservabilityAIAssistantServiceFactory =
+  () => {
+    const pluginMock = observabilityAIAssistantPluginMock.createStartContract();
+    return {
+      start: pluginMock,
+    };
+  };
diff --git a/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.ts b/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.ts
new file mode 100644
index 0000000000000..81d1a23854638
--- /dev/null
+++ b/src/plugins/dashboard/public/services/observability_ai_assistant/observability_ai_assistant_service.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { KibanaPluginServiceFactory } from '@kbn/presentation-util-plugin/public';
+import type { DashboardStartDependencies } from '../../plugin';
+import type { ObservabilityAIAssistantService } from './types';
+
+export type ObservabilityAIAssistantServiceFactory = KibanaPluginServiceFactory<
+  ObservabilityAIAssistantService,
+  DashboardStartDependencies
+>;
+export const observabilityAIAssistantServiceFactory: ObservabilityAIAssistantServiceFactory = ({
+  startPlugins,
+}) => {
+  return startPlugins.observabilityAIAssistant
+    ? { start: startPlugins.observabilityAIAssistant }
+    : {};
+};
diff --git a/src/plugins/dashboard/public/services/observability_ai_assistant/types.ts b/src/plugins/dashboard/public/services/observability_ai_assistant/types.ts
new file mode 100644
index 0000000000000..342f461024066
--- /dev/null
+++ b/src/plugins/dashboard/public/services/observability_ai_assistant/types.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { ObservabilityAIAssistantPublicStart } from '@kbn/observability-ai-assistant-plugin/public';
+
+export interface ObservabilityAIAssistantService {
+  start?: ObservabilityAIAssistantPublicStart;
+}
diff --git a/src/plugins/dashboard/public/services/plugin_services.stub.ts b/src/plugins/dashboard/public/services/plugin_services.stub.ts
index e6898ebe6e921..59c78ac9685b4 100644
--- a/src/plugins/dashboard/public/services/plugin_services.stub.ts
+++ b/src/plugins/dashboard/public/services/plugin_services.stub.ts
@@ -44,8 +44,10 @@ import { savedObjectsManagementServiceFactory } from './saved_objects_management
 import { contentManagementServiceFactory } from './content_management/content_management_service.stub';
 import { serverlessServiceFactory } from './serverless/serverless_service.stub';
 import { userProfileServiceFactory } from './user_profile/user_profile_service.stub';
+import { observabilityAIAssistantServiceStubFactory } from './observability_ai_assistant/observability_ai_assistant_service.stub';
 import { noDataPageServiceFactory } from './no_data_page/no_data_page_service.stub';
 import { uiActionsServiceFactory } from './ui_actions/ui_actions_service.stub';
+import { dashboardRecentlyAccessedServiceFactory } from './dashboard_recently_accessed/dashboard_recently_accessed.stub';
 
 export const providers: PluginServiceProviders<DashboardServices> = {
   dashboardContentManagement: new PluginServiceProvider(dashboardContentManagementServiceFactory),
@@ -80,6 +82,8 @@ export const providers: PluginServiceProviders<DashboardServices> = {
   noDataPage: new PluginServiceProvider(noDataPageServiceFactory),
   uiActions: new PluginServiceProvider(uiActionsServiceFactory),
   userProfile: new PluginServiceProvider(userProfileServiceFactory),
+  observabilityAIAssistant: new PluginServiceProvider(observabilityAIAssistantServiceStubFactory),
+  dashboardRecentlyAccessed: new PluginServiceProvider(dashboardRecentlyAccessedServiceFactory),
 };
 
 export const registry = new PluginServiceRegistry<DashboardServices>(providers);
diff --git a/src/plugins/dashboard/public/services/plugin_services.ts b/src/plugins/dashboard/public/services/plugin_services.ts
index ef9a195cfd7cf..b46c261fa6507 100644
--- a/src/plugins/dashboard/public/services/plugin_services.ts
+++ b/src/plugins/dashboard/public/services/plugin_services.ts
@@ -46,7 +46,9 @@ import { contentManagementServiceFactory } from './content_management/content_ma
 import { serverlessServiceFactory } from './serverless/serverless_service';
 import { noDataPageServiceFactory } from './no_data_page/no_data_page_service';
 import { uiActionsServiceFactory } from './ui_actions/ui_actions_service';
+import { observabilityAIAssistantServiceFactory } from './observability_ai_assistant/observability_ai_assistant_service';
 import { userProfileServiceFactory } from './user_profile/user_profile_service';
+import { dashboardRecentlyAccessedFactory } from './dashboard_recently_accessed/dashboard_recently_accessed';
 
 const providers: PluginServiceProviders<DashboardServices, DashboardPluginServiceParams> = {
   dashboardContentManagement: new PluginServiceProvider(dashboardContentManagementServiceFactory, [
@@ -93,7 +95,9 @@ const providers: PluginServiceProviders<DashboardServices, DashboardPluginServic
   serverless: new PluginServiceProvider(serverlessServiceFactory),
   noDataPage: new PluginServiceProvider(noDataPageServiceFactory),
   uiActions: new PluginServiceProvider(uiActionsServiceFactory),
+  observabilityAIAssistant: new PluginServiceProvider(observabilityAIAssistantServiceFactory),
   userProfile: new PluginServiceProvider(userProfileServiceFactory),
+  dashboardRecentlyAccessed: new PluginServiceProvider(dashboardRecentlyAccessedFactory, ['http']),
 };
 
 export const pluginServices = new PluginServices<DashboardServices>();
diff --git a/src/plugins/dashboard/public/services/types.ts b/src/plugins/dashboard/public/services/types.ts
index 8a44eef93a26a..bb0a8d8d6914d 100644
--- a/src/plugins/dashboard/public/services/types.ts
+++ b/src/plugins/dashboard/public/services/types.ts
@@ -41,7 +41,9 @@ import { DashboardVisualizationsService } from './visualizations/types';
 import { DashboardServerlessService } from './serverless/types';
 import { NoDataPageService } from './no_data_page/types';
 import { DashboardUiActionsService } from './ui_actions/types';
+import { ObservabilityAIAssistantService } from './observability_ai_assistant/types';
 import { DashboardUserProfileService } from './user_profile/types';
+import { DashboardRecentlyAccessedService } from './dashboard_recently_accessed/types';
 
 export type DashboardPluginServiceParams = KibanaPluginServiceParams<DashboardStartDependencies> & {
   initContext: PluginInitializerContext; // need a custom type so that initContext is a required parameter for initializerContext
@@ -79,5 +81,7 @@ export interface DashboardServices {
   serverless: DashboardServerlessService; // TODO: make this optional in follow up
   noDataPage: NoDataPageService;
   uiActions: DashboardUiActionsService;
+  observabilityAIAssistant: ObservabilityAIAssistantService; // TODO: make this optional in follow up
   userProfile: DashboardUserProfileService;
+  dashboardRecentlyAccessed: DashboardRecentlyAccessedService;
 }
diff --git a/src/plugins/dashboard/tsconfig.json b/src/plugins/dashboard/tsconfig.json
index f906809c7888e..a29aa10853035 100644
--- a/src/plugins/dashboard/tsconfig.json
+++ b/src/plugins/dashboard/tsconfig.json
@@ -79,6 +79,11 @@
     "@kbn/core-user-profile-browser-mocks",
     "@kbn/react-kibana-context-render",
     "@kbn/core-i18n-browser-mocks",
+    "@kbn/observability-ai-assistant-plugin",
+    "@kbn/esql-utils",
+    "@kbn/lens-embeddable-utils",
+    "@kbn/lens-plugin",
+    "@kbn/recently-accessed",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
index 5ad9d2a6617be..9db01189ff66d 100644
--- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts
@@ -44,7 +44,7 @@ export const eqlSearchStrategyProvider = (
     },
 
     search: ({ id, ...request }, options: IAsyncSearchOptions, { esClient, uiSettingsClient }) => {
-      logger.debug(`_eql/search ${JSON.stringify(request.params) || id}`);
+      logger.debug(() => `_eql/search ${JSON.stringify(request.params) || id}`);
 
       const client = esClient.asCurrentUser.eql;
 
diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
index bd7aaa4656737..8c5a8ad204a72 100644
--- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts
@@ -204,7 +204,7 @@ export const enhancedEsSearchStrategyProvider = (
      * @throws `KbnSearchError`
      */
     search: (request, options: IAsyncSearchOptions, deps) => {
-      logger.debug(`search ${JSON.stringify(request.params) || request.id}`);
+      logger.debug(() => `search ${JSON.stringify(request.params) || request.id}`);
 
       if (request.indexType === DataViewType.ROLLUP && deps.rollupsEnabled) {
         return from(rollupSearch(request, options, deps));
diff --git a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
index a58572f078bfc..a204b6ca69cca 100644
--- a/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/esql_async_search/esql_async_search_strategy.ts
@@ -134,7 +134,7 @@ export const esqlAsyncSearchStrategyProvider = (
      * @throws `KbnSearchError`
      */
     search: (request, options: IAsyncSearchOptions, deps) => {
-      logger.debug(`search ${JSON.stringify(request) || request.id}`);
+      logger.debug(() => `search ${JSON.stringify(request) || request.id}`);
 
       return asyncSearch(request, options, deps);
     },
diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
index bd4442afa1aba..55ed1bfecb995 100644
--- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
+++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts
@@ -120,7 +120,7 @@ export const sqlSearchStrategyProvider = (
      * @throws `KbnSearchError`
      */
     search: (request, options: IAsyncSearchOptions, deps) => {
-      logger.debug(`sql search: search request=${JSON.stringify(request)}`);
+      logger.debug(() => `sql search: search request=${JSON.stringify(request)}`);
 
       return asyncSearch(request, options, deps);
     },
diff --git a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
index 2f7e21bb3157f..98897ed4472de 100644
--- a/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
+++ b/src/plugins/data_view_editor/public/components/data_view_editor_flyout_content.tsx
@@ -53,7 +53,7 @@ import {
   SubmittingType,
   AdvancedParamsContent,
   PreviewPanel,
-  RollupBetaWarning,
+  RollupDeprecatedWarning,
 } from '.';
 import { editDataViewModal } from './confirm_modals/edit_data_view_changed_modal';
 import { DataViewEditorService } from '../data_view_editor_service';
@@ -92,7 +92,7 @@ const IndexPatternEditorFlyoutContentComponent = ({
   dataViewEditorService,
 }: Props) => {
   const {
-    services: { application, dataViews, uiSettings, overlays },
+    services: { application, dataViews, uiSettings, overlays, docLinks },
   } = useKibana<DataViewEditorContext>();
 
   const canSave = dataViews.getCanSaveSync();
@@ -227,7 +227,7 @@ const IndexPatternEditorFlyoutContentComponent = ({
       {type === INDEX_PATTERN_TYPE.ROLLUP ? (
         <EuiFlexGroup>
           <EuiFlexItem>
-            <RollupBetaWarning />
+            <RollupDeprecatedWarning docLinksService={docLinks} />
           </EuiFlexItem>
         </EuiFlexGroup>
       ) : (
diff --git a/src/plugins/data_view_editor/public/components/index.ts b/src/plugins/data_view_editor/public/components/index.ts
index 20bb30a3ed11f..dde1646662858 100644
--- a/src/plugins/data_view_editor/public/components/index.ts
+++ b/src/plugins/data_view_editor/public/components/index.ts
@@ -17,4 +17,4 @@ export { PreviewPanel } from './preview_panel';
 export { LoadingIndices } from './loading_indices';
 export { Footer, SubmittingType } from './footer';
 export { AdvancedParamsContent } from './advanced_params_content';
-export { RollupBetaWarning } from './rollup_beta_warning';
+export { RollupDeprecatedWarning } from './rollup_deprecated_warning';
diff --git a/src/plugins/data_view_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx b/src/plugins/data_view_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx
deleted file mode 100644
index 15fa8d626e4a1..0000000000000
--- a/src/plugins/data_view_editor/public/components/rollup_beta_warning/rollup_beta_warning.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-
-import { EuiCallOut } from '@elastic/eui';
-
-const rollupBetaWarningTitle = i18n.translate(
-  'indexPatternEditor.rollupIndexPattern.warning.title',
-  {
-    defaultMessage: 'Beta feature',
-  }
-);
-
-export const RollupBetaWarning = () => (
-  <EuiCallOut title={rollupBetaWarningTitle} color="warning" iconType="help">
-    <p>
-      <FormattedMessage
-        id="indexPatternEditor.rollupDataView.warning.textParagraphOne"
-        defaultMessage="Kibana has beta support for data views based on rollups. You might encounter
-issues using these in saved searches, visualizations, and dashboards. They
-are not supported in some advanced features, such as Timelion, and Machine Learning."
-      />
-    </p>
-    <p>
-      <FormattedMessage
-        id="indexPatternEditor.rollupDataView.warning.textParagraphTwo"
-        defaultMessage="You can match a rollup data view against one rollup index and zero or more
-regular indices. A rollup data view has limited metrics, fields, intervals, and
-aggregations. A rollup index is limited to indices that have one job configuration,
-or multiple jobs with compatible configurations."
-      />
-    </p>
-  </EuiCallOut>
-);
diff --git a/src/plugins/links/common/embeddable/index.ts b/src/plugins/data_view_editor/public/components/rollup_deprecated_warning/index.ts
similarity index 83%
rename from src/plugins/links/common/embeddable/index.ts
rename to src/plugins/data_view_editor/public/components/rollup_deprecated_warning/index.ts
index c526b0bf9bff8..b27a5f0e2ce1d 100644
--- a/src/plugins/links/common/embeddable/index.ts
+++ b/src/plugins/data_view_editor/public/components/rollup_deprecated_warning/index.ts
@@ -6,5 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { inject } from './inject';
-export { extract } from './extract';
+export { RollupDeprecatedWarning } from './rollup_deprecated_warning';
diff --git a/src/plugins/data_view_editor/public/components/rollup_deprecated_warning/rollup_deprecated_warning.tsx b/src/plugins/data_view_editor/public/components/rollup_deprecated_warning/rollup_deprecated_warning.tsx
new file mode 100644
index 0000000000000..c3cdb435556d8
--- /dev/null
+++ b/src/plugins/data_view_editor/public/components/rollup_deprecated_warning/rollup_deprecated_warning.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+
+import { EuiCallOut, EuiLink } from '@elastic/eui';
+import { DocLinksStart } from '@kbn/core/public';
+
+interface RollupDeprecatedWarningProps {
+  docLinksService: DocLinksStart;
+}
+
+const rollupBetaWarningTitle = i18n.translate(
+  'indexPatternEditor.rollupIndexPattern.deprecationWarning.title',
+  {
+    defaultMessage: 'Deprecated in 8.11.0',
+  }
+);
+
+export const RollupDeprecatedWarning = ({ docLinksService }: RollupDeprecatedWarningProps) => (
+  <EuiCallOut
+    title={rollupBetaWarningTitle}
+    color="warning"
+    iconType="help"
+    data-test-subj="rollupDeprecationCallout"
+  >
+    <FormattedMessage
+      id="indexPatternEditor.rollupDataView.deprecationWarning.textParagraphOne"
+      defaultMessage="Rollups are deprecated and will be removed in a future version. {downsamplingLink} can be used as an alternative."
+      values={{
+        downsamplingLink: (
+          <EuiLink
+            href={docLinksService.links.elasticsearch.rollupMigratingToDownsampling}
+            target="_blank"
+            data-test-subj="downsamplingLink"
+          >
+            {i18n.translate(
+              'indexPatternEditor.rollupDataView.deprecationWarning.downsamplingLink',
+              {
+                defaultMessage: 'Downsampling',
+              }
+            )}
+          </EuiLink>
+        ),
+      }}
+    />
+  </EuiCallOut>
+);
diff --git a/src/plugins/data_views/docs/openapi/bundled.json b/src/plugins/data_views/docs/openapi/bundled.json
index 28893b86cef3f..5f2506c46e609 100644
--- a/src/plugins/data_views/docs/openapi/bundled.json
+++ b/src/plugins/data_views/docs/openapi/bundled.json
@@ -1036,7 +1036,7 @@
       "post": {
         "summary": "Update data view fields metadata in the default space",
         "operationId": "updateFieldsMetadataDefault",
-        "description": "Update fields presentation metadata such as count, customLabel and format. This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. You can update multiple fields in one request. Updates are merged with persisted metadata. To remove existing metadata, specify null as the value.\n",
+        "description": "Update fields presentation metadata such as count, customLabel, customDescription, and format. This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. You can update multiple fields in one request. Updates are merged with persisted metadata. To remove existing metadata, specify null as the value.\n",
         "tags": [
           "data views"
         ],
@@ -2786,11 +2786,16 @@
         }
       },
       "update_field_metadata_request": {
-        "summary": "Set popularity count for field foo.",
+        "summary": "Update multiple metadata fields.",
         "value": {
           "fields": {
-            "foo": {
-              "count": 123
+            "field1": {
+              "count": 123,
+              "customLabel": "Field 1 label"
+            },
+            "field2": {
+              "customLabel": "Field 2 label",
+              "customDescription": "Field 2 description"
             }
           }
         }
@@ -3465,7 +3470,22 @@
       },
       "fieldattrs": {
         "type": "object",
-        "description": "A map of field attributes by field name."
+        "description": "A map of field attributes by field name.",
+        "properties": {
+          "count": {
+            "type": "integer",
+            "description": "Popularity count for the field."
+          },
+          "customDescription": {
+            "type": "string",
+            "description": "Custom description for the field.",
+            "maxLength": 300
+          },
+          "customLabel": {
+            "type": "string",
+            "description": "Custom label for the field."
+          }
+        }
       },
       "fieldformats": {
         "type": "object",
@@ -3532,7 +3552,10 @@
                 "$ref": "#/components/schemas/allownoindex"
               },
               "fieldAttrs": {
-                "$ref": "#/components/schemas/fieldattrs"
+                "type": "object",
+                "additionalProperties": {
+                  "$ref": "#/components/schemas/fieldattrs"
+                }
               },
               "fieldFormats": {
                 "$ref": "#/components/schemas/fieldformats"
@@ -3591,7 +3614,10 @@
                 "$ref": "#/components/schemas/allownoindex"
               },
               "fieldAttrs": {
-                "$ref": "#/components/schemas/fieldattrs"
+                "type": "object",
+                "additionalProperties": {
+                  "$ref": "#/components/schemas/fieldattrs"
+                }
               },
               "fieldFormats": {
                 "$ref": "#/components/schemas/fieldformats"
diff --git a/src/plugins/data_views/docs/openapi/bundled.yaml b/src/plugins/data_views/docs/openapi/bundled.yaml
index dee19e6b1d67b..810f379b272e6 100644
--- a/src/plugins/data_views/docs/openapi/bundled.yaml
+++ b/src/plugins/data_views/docs/openapi/bundled.yaml
@@ -646,7 +646,7 @@ paths:
       summary: Update data view fields metadata in the default space
       operationId: updateFieldsMetadataDefault
       description: |
-        Update fields presentation metadata such as count, customLabel and format. This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. You can update multiple fields in one request. Updates are merged with persisted metadata. To remove existing metadata, specify null as the value.
+        Update fields presentation metadata such as count, customLabel, customDescription, and format. This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. You can update multiple fields in one request. Updates are merged with persisted metadata. To remove existing metadata, specify null as the value.
       tags:
         - data views
       parameters:
@@ -1966,11 +1966,15 @@ components:
         data_view_id: ff959d40-b880-11e8-a6d9-e546fe2bba5f
         force: true
     update_field_metadata_request:
-      summary: Set popularity count for field foo.
+      summary: Update multiple metadata fields.
       value:
         fields:
-          foo:
+          field1:
             count: 123
+            customLabel: Field 1 label
+          field2:
+            customLabel: Field 2 label
+            customDescription: Field 2 description
     create_runtime_field_request:
       summary: Create a runtime field.
       value:
@@ -2507,6 +2511,17 @@ components:
     fieldattrs:
       type: object
       description: A map of field attributes by field name.
+      properties:
+        count:
+          type: integer
+          description: Popularity count for the field.
+        customDescription:
+          type: string
+          description: Custom description for the field.
+          maxLength: 300
+        customLabel:
+          type: string
+          description: Custom label for the field.
     fieldformats:
       type: object
       description: A map of field formats by field name.
@@ -2556,7 +2571,9 @@ components:
             allowNoIndex:
               $ref: '#/components/schemas/allownoindex'
             fieldAttrs:
-              $ref: '#/components/schemas/fieldattrs'
+              type: object
+              additionalProperties:
+                $ref: '#/components/schemas/fieldattrs'
             fieldFormats:
               $ref: '#/components/schemas/fieldformats'
             fields:
@@ -2596,7 +2613,9 @@ components:
             allowNoIndex:
               $ref: '#/components/schemas/allownoindex'
             fieldAttrs:
-              $ref: '#/components/schemas/fieldattrs'
+              type: object
+              additionalProperties:
+                $ref: '#/components/schemas/fieldattrs'
             fieldFormats:
               $ref: '#/components/schemas/fieldformats'
             fields:
diff --git a/src/plugins/data_views/docs/openapi/components/examples/update_field_metadata_request.yaml b/src/plugins/data_views/docs/openapi/components/examples/update_field_metadata_request.yaml
index ffa1eba13150f..e16e7e4d38dcb 100644
--- a/src/plugins/data_views/docs/openapi/components/examples/update_field_metadata_request.yaml
+++ b/src/plugins/data_views/docs/openapi/components/examples/update_field_metadata_request.yaml
@@ -1,9 +1,14 @@
-summary: Set popularity count for field foo.
+summary: Update metadata for multiple fields.
 value:
   {
     "fields": {
-        "foo": {
-            "count": 123
+        "field1": {
+            "count": 123,
+            "customLabel": "Field 1 label"
+        },
+        "field2": {
+            "customLabel": "Field 2 label",
+            "customDescription": "Field 2 description"
         }
     }
 }
\ No newline at end of file
diff --git a/src/plugins/data_views/docs/openapi/components/schemas/create_data_view_request_object.yaml b/src/plugins/data_views/docs/openapi/components/schemas/create_data_view_request_object.yaml
index ff2c34ed6d9ad..9ac5e0ddd796a 100644
--- a/src/plugins/data_views/docs/openapi/components/schemas/create_data_view_request_object.yaml
+++ b/src/plugins/data_views/docs/openapi/components/schemas/create_data_view_request_object.yaml
@@ -12,7 +12,9 @@ properties:
       allowNoIndex:
         $ref: 'allownoindex.yaml'
       fieldAttrs:
-        $ref: 'fieldattrs.yaml'
+        type: object
+        additionalProperties:
+          $ref: 'fieldattrs.yaml'
       fieldFormats:
         $ref: 'fieldformats.yaml'
       fields:
diff --git a/src/plugins/data_views/docs/openapi/components/schemas/data_view_response_object.yaml b/src/plugins/data_views/docs/openapi/components/schemas/data_view_response_object.yaml
index 9d3c67201896b..f850c2f7c565e 100644
--- a/src/plugins/data_views/docs/openapi/components/schemas/data_view_response_object.yaml
+++ b/src/plugins/data_views/docs/openapi/components/schemas/data_view_response_object.yaml
@@ -7,7 +7,9 @@ properties:
       allowNoIndex:
         $ref: 'allownoindex.yaml'
       fieldAttrs:
-        $ref: 'fieldattrs.yaml'
+        type: object
+        additionalProperties:
+          $ref: 'fieldattrs.yaml'
       fieldFormats:
         $ref: 'fieldformats.yaml'
       fields:
diff --git a/src/plugins/data_views/docs/openapi/components/schemas/fieldattrs.yaml b/src/plugins/data_views/docs/openapi/components/schemas/fieldattrs.yaml
index ede637d538a92..6d0cecd6b43b5 100644
--- a/src/plugins/data_views/docs/openapi/components/schemas/fieldattrs.yaml
+++ b/src/plugins/data_views/docs/openapi/components/schemas/fieldattrs.yaml
@@ -1,2 +1,13 @@
 type: object
-description: A map of field attributes by field name.
\ No newline at end of file
+description: A map of field attributes by field name.
+properties:
+  count:
+    type: integer
+    description: Popularity count for the field.
+  customDescription:
+    type: string
+    description: Custom description for the field.
+    maxLength: 300
+  customLabel:
+    type: string
+    description: Custom label for the field.
\ No newline at end of file
diff --git a/src/plugins/data_views/docs/openapi/paths/api@data_views@data_view@{viewid}@fields.yaml b/src/plugins/data_views/docs/openapi/paths/api@data_views@data_view@{viewid}@fields.yaml
index 58dd10b88b5d3..3c2526c073513 100644
--- a/src/plugins/data_views/docs/openapi/paths/api@data_views@data_view@{viewid}@fields.yaml
+++ b/src/plugins/data_views/docs/openapi/paths/api@data_views@data_view@{viewid}@fields.yaml
@@ -2,7 +2,7 @@ post:
   summary: Update data view fields metadata in the default space
   operationId: updateFieldsMetadataDefault
   description: >
-    Update fields presentation metadata such as count, customLabel and format.
+    Update fields presentation metadata such as count, customLabel, customDescription, and format.
     This functionality is in technical preview and may be changed or removed in a future release. Elastic will work to fix any issues, but features in technical preview are not subject to the support SLA of official GA features. You can update multiple fields in one request. Updates are merged with persisted metadata. To remove existing metadata, specify null as the value.
   tags:
     - data views
diff --git a/src/plugins/discover/public/application/context/services/__snapshots__/context.predecessors.test.ts.snap b/src/plugins/discover/public/application/context/services/__snapshots__/context.predecessors.test.ts.snap
new file mode 100644
index 0000000000000..972df33dfa37d
--- /dev/null
+++ b/src/plugins/discover/public/application/context/services/__snapshots__/context.predecessors.test.ts.snap
@@ -0,0 +1,274 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`context predecessors function fetchPredecessors should perform multiple queries until the expected hit count is returned 1`] = `
+Array [
+  Array [
+    "index",
+    Object {
+      "fields": Object {
+        "getByName": [MockFunction] {
+          "calls": Array [
+            Array [
+              "@timestamp",
+            ],
+          ],
+          "results": Array [
+            Object {
+              "type": "return",
+              "value": undefined,
+            },
+          ],
+        },
+      },
+      "id": "DATA_VIEW_ID",
+      "isTimeNanosBased": [Function],
+      "popularizeField": [Function],
+      "timeFieldName": "@timestamp",
+    },
+  ],
+  Array [
+    "filter",
+    Array [],
+  ],
+  Array [
+    "trackTotalHits",
+    false,
+  ],
+  Array [
+    "size",
+    3,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1972-09-27T00:00:00.000Z",
+                    "lte": "1972-09-28T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "test",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1972-09-27T00:00:00.000Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "asc",
+        },
+      },
+      Object {
+        "_doc": "asc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    2,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1972-09-28T00:00:00.000Z",
+                    "lte": "1972-10-04T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "test",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1972-09-27T00:00:00.000Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "asc",
+        },
+      },
+      Object {
+        "_doc": "asc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    2,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1972-10-04T00:00:00.000Z",
+                    "lte": "1972-10-27T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "test",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1972-09-27T00:00:00.000Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "asc",
+        },
+      },
+      Object {
+        "_doc": "asc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    2,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1972-10-27T00:00:00.000Z",
+                    "lte": "1973-09-27T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "test",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1972-09-27T00:00:00.000Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "asc",
+        },
+      },
+      Object {
+        "_doc": "asc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+]
+`;
diff --git a/src/plugins/discover/public/application/context/services/__snapshots__/context.successors.test.ts.snap b/src/plugins/discover/public/application/context/services/__snapshots__/context.successors.test.ts.snap
new file mode 100644
index 0000000000000..1f8623595b707
--- /dev/null
+++ b/src/plugins/discover/public/application/context/services/__snapshots__/context.successors.test.ts.snap
@@ -0,0 +1,274 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`context successors function fetchSuccessors should perform multiple queries until the expected hit count is returned 1`] = `
+Array [
+  Array [
+    "index",
+    Object {
+      "fields": Object {
+        "getByName": [MockFunction] {
+          "calls": Array [
+            Array [
+              "@timestamp",
+            ],
+          ],
+          "results": Array [
+            Object {
+              "type": "return",
+              "value": undefined,
+            },
+          ],
+        },
+      },
+      "id": "DATA_VIEW_ID",
+      "isTimeNanosBased": [Function],
+      "popularizeField": [Function],
+      "timeFieldName": "@timestamp",
+    },
+  ],
+  Array [
+    "filter",
+    Array [],
+  ],
+  Array [
+    "trackTotalHits",
+    false,
+  ],
+  Array [
+    "size",
+    4,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1978-03-19T00:00:00.000Z",
+                    "lte": "1978-03-20T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "1",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1978-03-20T00:00:00.000Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "desc",
+        },
+      },
+      Object {
+        "_doc": "desc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    1,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1978-03-13T00:00:00.000Z",
+                    "lte": "1978-03-19T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "1",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1978-03-19T23:59:59.998Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "desc",
+        },
+      },
+      Object {
+        "_doc": "desc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    1,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1978-02-18T00:00:00.000Z",
+                    "lte": "1978-03-13T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "1",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1978-03-19T23:59:59.998Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "desc",
+        },
+      },
+      Object {
+        "_doc": "desc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+  Array [
+    "size",
+    1,
+  ],
+  Array [
+    "query",
+    Object {
+      "language": "lucene",
+      "query": Object {
+        "bool": Object {
+          "must": Object {
+            "constant_score": Object {
+              "filter": Object {
+                "range": Object {
+                  "@timestamp": Object {
+                    "format": "strict_date_optional_time",
+                    "gte": "1977-03-20T00:00:00.000Z",
+                    "lte": "1978-02-18T00:00:00.000Z",
+                  },
+                },
+              },
+            },
+          },
+          "must_not": Object {
+            "ids": Object {
+              "values": Array [
+                "1",
+              ],
+            },
+          },
+        },
+      },
+    },
+  ],
+  Array [
+    "searchAfter",
+    Array [
+      "1978-03-19T23:59:59.998Z",
+      0,
+    ],
+  ],
+  Array [
+    "sort",
+    Array [
+      Object {
+        "@timestamp": Object {
+          "format": "strict_date_optional_time",
+          "order": "desc",
+        },
+      },
+      Object {
+        "_doc": "desc",
+      },
+    ],
+  ],
+  Array [
+    "version",
+    true,
+  ],
+]
+`;
diff --git a/src/plugins/discover/public/application/context/services/_stubs.ts b/src/plugins/discover/public/application/context/services/_stubs.ts
index 0122d325fd98d..8df5710f72020 100644
--- a/src/plugins/discover/public/application/context/services/_stubs.ts
+++ b/src/plugins/discover/public/application/context/services/_stubs.ts
@@ -44,10 +44,13 @@ export function createSearchSourceStub(hits: EsHitRecord[], timeField?: string)
   const searchSourceStub: any = {
     _stubHits: hits,
     _stubTimeField: timeField,
-    _createStubHit: (timestamp: number, tiebreaker = 0) => ({
-      [searchSourceStub._stubTimeField]: timestamp,
-      sort: [timestamp, tiebreaker],
-    }),
+    _createStubHit: (timestamp: number, tiebreaker = 0) => {
+      const value = new Date(timestamp).toISOString();
+      return {
+        [searchSourceStub._stubTimeField]: value,
+        sort: [value, tiebreaker],
+      };
+    },
     setParent: sinon.spy(() => searchSourceStub),
     setField: sinon.spy(() => searchSourceStub),
     removeField: sinon.spy(() => searchSourceStub),
@@ -74,13 +77,13 @@ export function createContextSearchSourceStub(timeFieldName: string) {
     const sortDirection = lastSort[0][timeField].order;
     const sortFunction =
       sortDirection === 'asc'
-        ? (first: SortHit, second: SortHit) => first[timeField] - second[timeField]
-        : (first: SortHit, second: SortHit) => second[timeField] - first[timeField];
+        ? (first: SortHit, second: SortHit) => (first[timeField] < second[timeField] ? -1 : 1)
+        : (first: SortHit, second: SortHit) => (second[timeField] < first[timeField] ? -1 : 1);
     const filteredHits = searchSourceStub._stubHits
       .filter(
         (hit: SortHit) =>
-          moment(hit[timeField]).isSameOrAfter(timeRange.gte) &&
-          moment(hit[timeField]).isSameOrBefore(timeRange.lte)
+          moment(hit[timeField]).isSameOrAfter(moment(timeRange.gte)) &&
+          moment(hit[timeField]).isSameOrBefore(moment(timeRange.lte))
       )
       .sort(sortFunction);
 
diff --git a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
index 6ade7624c2bf9..8e96d3807e7b5 100644
--- a/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.predecessors.test.ts
@@ -34,7 +34,6 @@ describe('context predecessors', function () {
   let dataPluginMock: DataPublicPluginStart;
   let fetchPredecessors: (
     timeValIso: string,
-    timeValNr: number,
     tieBreakerField: string,
     tieBreakerValue: number,
     size: number
@@ -42,18 +41,20 @@ describe('context predecessors', function () {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let mockSearchSource: any;
-  const dataView = {
-    id: 'DATA_VIEW_ID',
-    timeFieldName: '@timestamp',
-    isTimeNanosBased: () => false,
-    popularizeField: () => {},
-    fields: {
-      getByName: jest.fn(),
-    },
-  } as unknown as DataView;
+  let dataView: DataView;
 
   describe('function fetchPredecessors', function () {
     beforeEach(() => {
+      dataView = {
+        id: 'DATA_VIEW_ID',
+        timeFieldName: '@timestamp',
+        isTimeNanosBased: () => false,
+        popularizeField: () => {},
+        fields: {
+          getByName: jest.fn(),
+        },
+      } as unknown as DataView;
+
       mockSearchSource = createContextSearchSourceStub('@timestamp');
       dataPluginMock = {
         search: {
@@ -63,14 +64,14 @@ describe('context predecessors', function () {
         },
       } as unknown as DataPublicPluginStart;
 
-      fetchPredecessors = (timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size = 10) => {
+      fetchPredecessors = (timeValIso, tieBreakerField, tieBreakerValue, size = 10) => {
         const anchor = buildDataTableRecord(
           {
             _id: 'test',
             _source: {
               [dataView.timeFieldName!]: timeValIso,
             },
-            sort: [timeValNr, tieBreakerValue],
+            sort: [timeValIso, tieBreakerValue],
           } as EsHitRecord,
           dataView,
           true
@@ -100,17 +101,15 @@ describe('context predecessors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 1000),
       ];
 
-      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 3).then(
-        ({ rows }) => {
-          expect(mockSearchSource.fetch$.calledOnce).toBe(true);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(0, 3),
-              dataView,
-            })
-          );
-        }
-      );
+      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 3).then(({ rows }) => {
+        expect(mockSearchSource.fetch$.calledOnce).toBe(true);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(0, 3),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should perform multiple queries with the last being unrestricted when too few hits are returned', function () {
@@ -122,30 +121,28 @@ describe('context predecessors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 2990),
       ];
 
-      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 6).then(
-        ({ rows }) => {
-          const intervals: Timestamp[] = mockSearchSource.setField.args
-            .filter(([property]: string) => property === 'query')
-            .map(([, { query }]: [string, { query: Query }]) =>
-              get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
-            );
-
-          expect(
-            intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
-          ).toBe(true);
-          // should have started at the given time
-          expect(intervals[0].gte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
-          // should have ended with a half-open interval
-          expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'gte']);
-          expect(intervals.length).toBeGreaterThan(1);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(0, 3),
-              dataView,
-            })
+      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 6).then(({ rows }) => {
+        const intervals: Timestamp[] = mockSearchSource.setField.args
+          .filter(([property]: string) => property === 'query')
+          .map(([, { query }]: [string, { query: Query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
           );
-        }
-      );
+
+        expect(
+          intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
+        ).toBe(true);
+        // should have started at the given time
+        expect(intervals[0].gte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
+        // should have ended with a half-open interval
+        expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'gte']);
+        expect(intervals.length).toBeGreaterThan(1);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(0, 3),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should perform multiple queries until the expected hit count is returned', function () {
@@ -156,47 +153,38 @@ describe('context predecessors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 1000),
       ];
 
-      return fetchPredecessors(ANCHOR_TIMESTAMP_1000, MS_PER_DAY * 1000, '_doc', 0, 3).then(
-        ({ rows }) => {
-          const intervals: Timestamp[] = mockSearchSource.setField.args
-            .filter(([property]: string) => property === 'query')
-            .map(([, { query }]: [string, { query: Query }]) => {
-              return get(query, [
-                'bool',
-                'must',
-                'constant_score',
-                'filter',
-                'range',
-                '@timestamp',
-              ]);
-            });
+      return fetchPredecessors(ANCHOR_TIMESTAMP_1000, '_doc', 0, 3).then(({ rows }) => {
+        expect(mockSearchSource.setField.args).toMatchSnapshot();
 
-          // should have started at the given time
-          expect(intervals[0].gte).toEqual(moment(MS_PER_DAY * 1000).toISOString());
-          // should have stopped before reaching MS_PER_DAY * 1700
-          expect(moment(last(intervals)?.lte).valueOf()).toBeLessThan(MS_PER_DAY * 1700);
-          expect(intervals.length).toBeGreaterThan(1);
+        const intervals: Timestamp[] = mockSearchSource.setField.args
+          .filter(([property]: string) => property === 'query')
+          .map(([, { query }]: [string, { query: Query }]) => {
+            return get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp']);
+          });
 
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(-3),
-              dataView,
-            })
-          );
-        }
-      );
+        // should have started at the given time
+        expect(intervals[0].gte).toEqual(moment(MS_PER_DAY * 1000).toISOString());
+        // should have stopped before reaching MS_PER_DAY * 1700
+        expect(moment(last(intervals)?.lte).valueOf()).toBeLessThan(MS_PER_DAY * 1700);
+        expect(intervals.length).toBeGreaterThan(1);
+
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(-3),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should return an empty array when no hits were found', function () {
-      return fetchPredecessors(ANCHOR_TIMESTAMP_3, MS_PER_DAY * 3, '_doc', 0, 3).then(
-        ({ rows }) => {
-          expect(rows).toEqual([]);
-        }
-      );
+      return fetchPredecessors(ANCHOR_TIMESTAMP_3, '_doc', 0, 3).then(({ rows }) => {
+        expect(rows).toEqual([]);
+      });
     });
 
     it('should configure the SearchSource to not inherit from the implicit root', function () {
-      return fetchPredecessors(ANCHOR_TIMESTAMP_3, MS_PER_DAY * 3, '_doc', 0, 3).then(() => {
+      return fetchPredecessors(ANCHOR_TIMESTAMP_3, '_doc', 0, 3).then(() => {
         const setParentSpy = mockSearchSource.setParent;
         expect(setParentSpy.alwaysCalledWith(undefined)).toBe(true);
         expect(setParentSpy.called).toBe(true);
@@ -204,7 +192,7 @@ describe('context predecessors', function () {
     });
 
     it('should set the tiebreaker sort order to the opposite as the time field', function () {
-      return fetchPredecessors(ANCHOR_TIMESTAMP, MS_PER_DAY, '_doc', 0, 3).then(() => {
+      return fetchPredecessors(ANCHOR_TIMESTAMP, '_doc', 0, 3).then(() => {
         expect(
           mockSearchSource.setField.calledWith('sort', [
             { '@timestamp': { order: 'asc', format: 'strict_date_optional_time' } },
@@ -227,14 +215,14 @@ describe('context predecessors', function () {
         },
       } as unknown as DataPublicPluginStart;
 
-      fetchPredecessors = (timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size = 10) => {
+      fetchPredecessors = (timeValIso, tieBreakerField, tieBreakerValue, size = 10) => {
         const anchor = buildDataTableRecord(
           {
             _id: 'test',
             _source: {
               [dataView.timeFieldName!]: timeValIso,
             },
-            sort: [timeValNr, tieBreakerValue],
+            sort: [timeValIso, tieBreakerValue],
           } as EsHitRecord,
           dataView,
           true
@@ -264,21 +252,19 @@ describe('context predecessors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 1000),
       ];
 
-      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 3).then(
-        ({ rows }) => {
-          const setFieldsSpy = mockSearchSource.setField.withArgs('fields');
-          const removeFieldsSpy = mockSearchSource.removeField.withArgs('fieldsFromSource');
-          expect(mockSearchSource.fetch$.calledOnce).toBe(true);
-          expect(removeFieldsSpy.calledOnce).toBe(true);
-          expect(setFieldsSpy.calledOnce).toBe(true);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(0, 3),
-              dataView,
-            })
-          );
-        }
-      );
+      return fetchPredecessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 3).then(({ rows }) => {
+        const setFieldsSpy = mockSearchSource.setField.withArgs('fields');
+        const removeFieldsSpy = mockSearchSource.removeField.withArgs('fieldsFromSource');
+        expect(mockSearchSource.fetch$.calledOnce).toBe(true);
+        expect(removeFieldsSpy.calledOnce).toBe(true);
+        expect(setFieldsSpy.calledOnce).toBe(true);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(0, 3),
+            dataView,
+          })
+        );
+      });
     });
   });
 });
diff --git a/src/plugins/discover/public/application/context/services/context.successors.test.ts b/src/plugins/discover/public/application/context/services/context.successors.test.ts
index 39cc05bd76571..fb480c0b4e873 100644
--- a/src/plugins/discover/public/application/context/services/context.successors.test.ts
+++ b/src/plugins/discover/public/application/context/services/context.successors.test.ts
@@ -32,7 +32,6 @@ interface Timestamp {
 describe('context successors', function () {
   let fetchSuccessors: (
     timeValIso: string,
-    timeValNr: number,
     tieBreakerField: string,
     tieBreakerValue: number,
     size: number
@@ -40,18 +39,20 @@ describe('context successors', function () {
   let dataPluginMock: DataPublicPluginStart;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let mockSearchSource: any;
-  const dataView = {
-    id: 'DATA_VIEW_ID',
-    timeFieldName: '@timestamp',
-    isTimeNanosBased: () => false,
-    popularizeField: () => {},
-    fields: {
-      getByName: jest.fn(),
-    },
-  } as unknown as DataView;
+  let dataView: DataView;
 
   describe('function fetchSuccessors', function () {
     beforeEach(() => {
+      dataView = {
+        id: 'DATA_VIEW_ID',
+        timeFieldName: '@timestamp',
+        isTimeNanosBased: () => false,
+        popularizeField: () => {},
+        fields: {
+          getByName: jest.fn(),
+        },
+      } as unknown as DataView;
+
       mockSearchSource = createContextSearchSourceStub('@timestamp');
 
       dataPluginMock = {
@@ -62,7 +63,7 @@ describe('context successors', function () {
         },
       } as unknown as DataPublicPluginStart;
 
-      fetchSuccessors = (timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size) => {
+      fetchSuccessors = (timeValIso, tieBreakerField, tieBreakerValue, size) => {
         const anchor = buildDataTableRecord(
           {
             _index: 't',
@@ -70,7 +71,7 @@ describe('context successors', function () {
             _source: {
               [dataView.timeFieldName!]: timeValIso,
             },
-            sort: [timeValNr, tieBreakerValue],
+            sort: [timeValIso, tieBreakerValue],
           },
           dataView,
           true
@@ -100,17 +101,15 @@ describe('context successors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 3000 - 2),
       ];
 
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 3).then(
-        ({ rows }) => {
-          expect(mockSearchSource.fetch$.calledOnce).toBe(true);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(-3),
-              dataView,
-            })
-          );
-        }
-      );
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 3).then(({ rows }) => {
+        expect(mockSearchSource.fetch$.calledOnce).toBe(true);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(-3),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should perform multiple queries with the last being unrestricted when too few hits are returned', function () {
@@ -122,30 +121,28 @@ describe('context successors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 2990),
       ];
 
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 6).then(
-        ({ rows }) => {
-          const intervals: Timestamp[] = mockSearchSource.setField.args
-            .filter(([property]: [string]) => property === 'query')
-            .map(([, { query }]: [string, { query: Query }]) =>
-              get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
-            );
-
-          expect(
-            intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
-          ).toBe(true);
-          // should have started at the given time
-          expect(intervals[0].lte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
-          // should have ended with a half-open interval
-          expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'lte']);
-          expect(intervals.length).toBeGreaterThan(1);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(-3),
-              dataView,
-            })
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 6).then(({ rows }) => {
+        const intervals: Timestamp[] = mockSearchSource.setField.args
+          .filter(([property]: [string]) => property === 'query')
+          .map(([, { query }]: [string, { query: Query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
           );
-        }
-      );
+
+        expect(
+          intervals.every(({ gte, lte }) => (gte && lte ? moment(gte).isBefore(lte) : true))
+        ).toBe(true);
+        // should have started at the given time
+        expect(intervals[0].lte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
+        // should have ended with a half-open interval
+        expect(Object.keys(last(intervals) ?? {})).toEqual(['format', 'lte']);
+        expect(intervals.length).toBeGreaterThan(1);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(-3),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should perform multiple queries until the expected hit count is returned', function () {
@@ -158,37 +155,37 @@ describe('context successors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 1000),
       ];
 
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 4).then(
-        ({ rows }) => {
-          const intervals: Timestamp[] = mockSearchSource.setField.args
-            .filter(([property]: [string]) => property === 'query')
-            .map(([, { query }]: [string, { query: Query }]) =>
-              get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
-            );
-
-          // should have started at the given time
-          expect(intervals[0].lte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
-          // should have stopped before reaching MS_PER_DAY * 2200
-          expect(moment(last(intervals)?.gte).valueOf()).toBeGreaterThan(MS_PER_DAY * 2200);
-          expect(intervals.length).toBeGreaterThan(1);
-          expect(rows).toEqual(
-            buildDataTableRecordList({
-              records: mockSearchSource._stubHits.slice(0, 4),
-              dataView,
-            })
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 4).then(({ rows }) => {
+        expect(mockSearchSource.setField.args).toMatchSnapshot();
+
+        const intervals: Timestamp[] = mockSearchSource.setField.args
+          .filter(([property]: [string]) => property === 'query')
+          .map(([, { query }]: [string, { query: Query }]) =>
+            get(query, ['bool', 'must', 'constant_score', 'filter', 'range', '@timestamp'])
           );
-        }
-      );
+
+        // should have started at the given time
+        expect(intervals[0].lte).toEqual(moment(MS_PER_DAY * 3000).toISOString());
+        // should have stopped before reaching MS_PER_DAY * 2200
+        expect(moment(last(intervals)?.gte).valueOf()).toBeGreaterThan(MS_PER_DAY * 2200);
+        expect(intervals.length).toBeGreaterThan(1);
+        expect(rows).toEqual(
+          buildDataTableRecordList({
+            records: mockSearchSource._stubHits.slice(0, 4),
+            dataView,
+          })
+        );
+      });
     });
 
     it('should return an empty array when no hits were found', function () {
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3, MS_PER_DAY * 3, '_doc', 0, 3).then(({ rows }) => {
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3, '_doc', 0, 3).then(({ rows }) => {
         expect(rows).toEqual([]);
       });
     });
 
     it('should configure the SearchSource to not inherit from the implicit root', function () {
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3, MS_PER_DAY * 3, '_doc', 0, 3).then(() => {
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3, '_doc', 0, 3).then(() => {
         const setParentSpy = mockSearchSource.setParent;
         expect(setParentSpy.alwaysCalledWith(undefined)).toBe(true);
         expect(setParentSpy.called).toBe(true);
@@ -196,7 +193,7 @@ describe('context successors', function () {
     });
 
     it('should set the tiebreaker sort order to the same as the time field', function () {
-      return fetchSuccessors(ANCHOR_TIMESTAMP, MS_PER_DAY, '_doc', 0, 3).then(() => {
+      return fetchSuccessors(ANCHOR_TIMESTAMP, '_doc', 0, 3).then(() => {
         expect(
           mockSearchSource.setField.calledWith('sort', [
             { '@timestamp': { order: SortDirection.desc, format: 'strict_date_optional_time' } },
@@ -219,7 +216,7 @@ describe('context successors', function () {
         },
       } as unknown as DataPublicPluginStart;
 
-      fetchSuccessors = (timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size) => {
+      fetchSuccessors = (timeValIso, tieBreakerField, tieBreakerValue, size) => {
         const anchor = buildDataTableRecord(
           {
             _id: '1',
@@ -227,7 +224,7 @@ describe('context successors', function () {
             _source: {
               [dataView.timeFieldName!]: timeValIso,
             },
-            sort: [timeValNr, tieBreakerValue],
+            sort: [timeValIso, tieBreakerValue],
           },
           dataView,
           true
@@ -257,7 +254,7 @@ describe('context successors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 3000 - 2),
       ];
 
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 3).then(
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 3).then(
         ({ rows, interceptedWarnings }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
@@ -291,7 +288,7 @@ describe('context successors', function () {
         },
       } as unknown as DataPublicPluginStart;
 
-      fetchSuccessors = (timeValIso, timeValNr, tieBreakerField, tieBreakerValue, size) => {
+      fetchSuccessors = (timeValIso, tieBreakerField, tieBreakerValue, size) => {
         const anchor = buildDataTableRecord(
           {
             _id: '1',
@@ -299,7 +296,7 @@ describe('context successors', function () {
             _source: {
               [dataView.timeFieldName!]: timeValIso,
             },
-            sort: [timeValNr, tieBreakerValue],
+            sort: [timeValIso, tieBreakerValue],
           },
           dataView,
           true
@@ -332,7 +329,7 @@ describe('context successors', function () {
         mockSearchSource._createStubHit(MS_PER_DAY * 3000 - 2),
       ];
 
-      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, MS_PER_DAY * 3000, '_doc', 0, 3).then(
+      return fetchSuccessors(ANCHOR_TIMESTAMP_3000, '_doc', 0, 3).then(
         ({ rows, interceptedWarnings }) => {
           expect(mockSearchSource.fetch$.calledOnce).toBe(true);
           expect(rows).toEqual(
diff --git a/src/plugins/discover/public/application/context/services/context.ts b/src/plugins/discover/public/application/context/services/context.ts
index a4df96fe0bdbb..b375e3cce75f6 100644
--- a/src/plugins/discover/public/application/context/services/context.ts
+++ b/src/plugins/discover/public/application/context/services/context.ts
@@ -71,10 +71,11 @@ export async function fetchSurroundingDocs(
   const anchorRaw = anchor.raw!;
 
   const nanos = dataView.isTimeNanosBased() ? extractNanos(anchorRaw.fields?.[timeField][0]) : '';
-  const timeValueMillis =
-    nanos !== '' ? convertIsoToMillis(anchorRaw.fields?.[timeField][0]) : anchorRaw.sort?.[0];
+  const timeValueMillis = convertIsoToMillis(
+    nanos !== '' ? anchorRaw.fields?.[timeField][0] : anchorRaw.sort?.[0]
+  );
 
-  const intervals = generateIntervals(LOOKUP_OFFSETS, timeValueMillis as number, type, sortDir);
+  const intervals = generateIntervals(LOOKUP_OFFSETS, timeValueMillis, type, sortDir);
   let rows: DataTableRecord[] = [];
   let interceptedWarnings: SearchResponseWarning[] = [];
 
diff --git a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
index bf48c0bb83cf4..800b143213227 100644
--- a/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
+++ b/src/plugins/discover/public/application/main/components/field_stats_table/field_stats_table.tsx
@@ -56,7 +56,12 @@ export const FieldStatisticsTable = React.memo((props: FieldStatisticsTableProps
   } = props;
 
   const visibleFields = useMemo(
-    () => convertFieldsToFallbackFields({ fields: columns, additionalFieldGroups }),
+    () =>
+      convertFieldsToFallbackFields({
+        // `discover:searchFieldsFromSource` adds `_source` to the columns, but we should exclude it for Field Statistics
+        fields: columns.filter((col) => col !== '_source'),
+        additionalFieldGroups,
+      }),
     [additionalFieldGroups, columns]
   );
   const allFallbackFields = useMemo(
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
index caba229e9137a..9e061beffc4fc 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_documents.tsx
@@ -277,7 +277,8 @@ function DiscoverDocumentsComponent({
       <>
         <SelectedVSAvailableCallout
           esqlQueryColumns={documents?.esqlQueryColumns}
-          selectedColumns={currentColumns}
+          // `discover:searchFieldsFromSource` adds `_source` to the columns, but we should exclude it from the callout
+          selectedColumns={currentColumns.filter((col) => col !== '_source')}
         />
         <SearchResponseWarningsCallout warnings={documentState.interceptedWarnings ?? []} />
       </>
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_histogram_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_histogram_layout.test.tsx
index d23dfbe4359eb..646eb9171dd05 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_histogram_layout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_histogram_layout.test.tsx
@@ -13,7 +13,6 @@ import type { DataView } from '@kbn/data-views-plugin/common';
 import { esHitsMock } from '@kbn/discover-utils/src/__mocks__';
 import { savedSearchMockWithTimeField } from '../../../../__mocks__/saved_search';
 import {
-  AvailableFields$,
   DataDocuments$,
   DataMain$,
   DataTotalHits$,
@@ -93,11 +92,6 @@ const mountComponent = async ({
     result: esHitsMock.map((esHit) => buildDataTableRecord(esHit, dataView)),
   }) as DataDocuments$;
 
-  const availableFields$ = new BehaviorSubject({
-    fetchStatus: FetchStatus.COMPLETE,
-    fields: [] as string[],
-  }) as AvailableFields$;
-
   const totalHits$ = new BehaviorSubject({
     fetchStatus: FetchStatus.COMPLETE,
     result: Number(esHitsMock.length),
@@ -107,7 +101,6 @@ const mountComponent = async ({
     main$,
     documents$,
     totalHits$,
-    availableFields$,
   };
 
   const session = getSessionServiceMock();
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
index cf3fd26a10d66..b6bf9ba4f4a94 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.test.tsx
@@ -21,7 +21,6 @@ import {
 import type { DataView } from '@kbn/data-views-plugin/public';
 import { dataViewWithTimefieldMock } from '../../../../__mocks__/data_view_with_timefield';
 import {
-  AvailableFields$,
   DataDocuments$,
   DataMain$,
   DataTotalHits$,
@@ -83,11 +82,6 @@ async function mountComponent(
     result: esHitsMock.map((esHit) => buildDataTableRecord(esHit, dataView)),
   }) as DataDocuments$;
 
-  const availableFields$ = new BehaviorSubject({
-    fetchStatus: FetchStatus.COMPLETE,
-    fields: [] as string[],
-  }) as AvailableFields$;
-
   const totalHits$ = new BehaviorSubject({
     fetchStatus: FetchStatus.COMPLETE,
     result: Number(esHitsMock.length),
@@ -97,7 +91,6 @@ async function mountComponent(
     main$,
     documents$,
     totalHits$,
-    availableFields$,
   };
 
   const session = getSessionServiceMock();
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
index 0d94041738f54..d4798089e09ee 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_layout.tsx
@@ -389,7 +389,6 @@ export function DiscoverLayout({ stateContainer }: DiscoverLayoutProps) {
                 trackUiMetric={trackUiMetric}
                 onFieldEdited={onFieldEdited}
                 onDataViewCreated={stateContainer.actions.onDataViewCreated}
-                availableFields$={stateContainer.dataState.data$.availableFields$}
                 sidebarToggleState$={sidebarToggleState$}
               />
             }
diff --git a/src/plugins/discover/public/application/main/components/layout/discover_main_content.test.tsx b/src/plugins/discover/public/application/main/components/layout/discover_main_content.test.tsx
index 343ceae3ed995..43d8694bd4653 100644
--- a/src/plugins/discover/public/application/main/components/layout/discover_main_content.test.tsx
+++ b/src/plugins/discover/public/application/main/components/layout/discover_main_content.test.tsx
@@ -14,7 +14,6 @@ import { mountWithIntl } from '@kbn/test-jest-helpers';
 import { DataView } from '@kbn/data-plugin/common';
 import { dataViewMock, esHitsMock } from '@kbn/discover-utils/src/__mocks__';
 import {
-  AvailableFields$,
   DataDocuments$,
   DataMain$,
   DataTotalHits$,
@@ -75,11 +74,6 @@ const mountComponent = async ({
     result: esHitsMock.map((esHit) => buildDataTableRecord(esHit, dataViewMock)),
   }) as DataDocuments$;
 
-  const availableFields$ = new BehaviorSubject({
-    fetchStatus: FetchStatus.COMPLETE,
-    fields: [] as string[],
-  }) as AvailableFields$;
-
   const totalHits$ = new BehaviorSubject({
     fetchStatus: FetchStatus.COMPLETE,
     result: Number(esHitsMock.length),
@@ -90,7 +84,6 @@ const mountComponent = async ({
     main$,
     documents$,
     totalHits$,
-    availableFields$,
   };
   stateContainer.dataState.data$ = savedSearchData$;
   const dataView = stateContainer.savedSearchState
diff --git a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
index 385dd432dc3c1..3814bd93fa636 100644
--- a/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
+++ b/src/plugins/discover/public/application/main/components/layout/use_discover_histogram.ts
@@ -246,6 +246,7 @@ export const useDiscoverHistogram = ({
 
   useEffect(() => {
     if (!isEsqlMode) {
+      setIsSuggestionLoading(false);
       return;
     }
 
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
index e9c48128838fb..b7b52630f45d9 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -20,10 +20,7 @@ import {
 } from './discover_sidebar_responsive';
 import { DiscoverServices } from '../../../../build_services';
 import { FetchStatus, SidebarToggleState } from '../../../types';
-import {
-  AvailableFields$,
-  DataDocuments$,
-} from '../../state_management/discover_data_state_container';
+import { DataDocuments$ } from '../../state_management/discover_data_state_container';
 import { stubLogstashDataView } from '@kbn/data-plugin/common/stubs';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { getDiscoverStateMock } from '../../../../__mocks__/discover_state.mock';
@@ -69,6 +66,15 @@ jest.mock('../../../../customizations', () => ({
   }),
 }));
 
+jest.mock('lodash', () => {
+  const original = jest.requireActual('lodash');
+
+  return {
+    ...original,
+    debounce: (fn: unknown) => fn,
+  };
+});
+
 jest.mock('@kbn/unified-field-list/src/services/field_stats', () => ({
   loadFieldStats: jest.fn().mockResolvedValue({
     totalDocuments: 1624,
@@ -154,10 +160,6 @@ function getCompProps(options?: { hits?: DataTableRecord[] }): DiscoverSidebarRe
       fetchStatus: FetchStatus.COMPLETE,
       result: hits,
     }) as DataDocuments$,
-    availableFields$: new BehaviorSubject({
-      fetchStatus: FetchStatus.COMPLETE,
-      fields: [] as string[],
-    }) as AvailableFields$,
     onChangeDataView: jest.fn(),
     onAddFilter: jest.fn(),
     onAddField: jest.fn(),
@@ -311,11 +313,6 @@ describe('discover responsive sidebar', function () {
     expect(unmappedFieldsCount.exists()).toBe(false);
     expect(mockCalcFieldCounts.mock.calls.length).toBe(1);
 
-    expect(props.availableFields$.getValue()).toEqual({
-      fetchStatus: 'complete',
-      fields: ['extension'],
-    });
-
     expect(findTestSubject(comp, 'fieldListGrouped__ariaDescription').text()).toBe(
       '1 selected field. 4 popular fields. 3 available fields. 20 empty fields. 2 meta fields.'
     );
@@ -374,11 +371,6 @@ describe('discover responsive sidebar', function () {
     expect(metaFieldsCount.text()).toBe('2');
     expect(unmappedFieldsCount.exists()).toBe(false);
 
-    expect(propsWithoutColumns.availableFields$.getValue()).toEqual({
-      fetchStatus: 'complete',
-      fields: ['bytes', 'extension', '_id', 'phpmemory'],
-    });
-
     expect(findTestSubject(compWithoutSelected, 'fieldListGrouped__ariaDescription').text()).toBe(
       '4 popular fields. 3 available fields. 20 empty fields. 2 meta fields.'
     );
diff --git a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
index 23778ada7566a..187a946892d1f 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/main/components/sidebar/discover_sidebar_responsive.tsx
@@ -23,10 +23,7 @@ import {
 } from '@kbn/unified-field-list';
 import { PLUGIN_ID } from '../../../../../common';
 import { useDiscoverServices } from '../../../../hooks/use_discover_services';
-import {
-  AvailableFields$,
-  DataDocuments$,
-} from '../../state_management/discover_data_state_container';
+import { DataDocuments$ } from '../../state_management/discover_data_state_container';
 import { calcFieldCounts } from '../../utils/calc_field_counts';
 import { FetchStatus, SidebarToggleState } from '../../../types';
 import { DISCOVER_TOUR_STEP_ANCHOR_IDS } from '../../../../components/discover_tour';
@@ -129,10 +126,6 @@ export interface DiscoverSidebarResponsiveProps {
    * callback to execute on create dataview
    */
   onDataViewCreated: (dataView: DataView) => void;
-  /**
-   * list of available fields fetched from ES
-   */
-  availableFields$: AvailableFields$;
   /**
    * For customization and testing purposes
    */
@@ -291,20 +284,6 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
   }, []);
 
   const { dataViewEditor } = services;
-  const { availableFields$ } = props;
-
-  useEffect(() => {
-    // For an external embeddable like the Field stats
-    // it is useful to know what fields are populated in the docs fetched
-    // or what fields are selected by the user
-
-    const availableFields =
-      props.columns.length > 0 ? props.columns : Object.keys(sidebarState.fieldCounts || {});
-    availableFields$.next({
-      fetchStatus: FetchStatus.COMPLETE,
-      fields: availableFields,
-    });
-  }, [selectedDataView, sidebarState.fieldCounts, props.columns, availableFields$]);
 
   const canEditDataView =
     Boolean(dataViewEditor?.userPermissions.editDataView()) ||
diff --git a/src/plugins/discover/public/application/main/components/sidebar/lib/get_field_list.ts b/src/plugins/discover/public/application/main/components/sidebar/lib/get_field_list.ts
index 99d911dd14f61..36a07faaef80d 100644
--- a/src/plugins/discover/public/application/main/components/sidebar/lib/get_field_list.ts
+++ b/src/plugins/discover/public/application/main/components/sidebar/lib/get_field_list.ts
@@ -8,6 +8,7 @@
 
 import { difference } from 'lodash';
 import { type DataView, DataViewField } from '@kbn/data-views-plugin/public';
+import { convertDatatableColumnToDataViewFieldSpec } from '@kbn/data-view-utils';
 import type { DatatableColumn } from '@kbn/expressions-plugin/common';
 import { fieldWildcardFilter } from '@kbn/kibana-utils-plugin/public';
 import { isNestedFieldParent } from '@kbn/discover-utils';
@@ -66,14 +67,6 @@ export function getEsqlQueryFieldList(esqlQueryColumns?: DatatableColumn[]): Dat
     return [];
   }
   return esqlQueryColumns.map(
-    (column) =>
-      new DataViewField({
-        name: column.name,
-        type: column.meta?.type ?? 'unknown',
-        esTypes: column.meta?.esType ? [column.meta?.esType] : undefined,
-        searchable: true,
-        aggregatable: false,
-        isNull: Boolean(column?.isNull),
-      })
+    (column) => new DataViewField(convertDatatableColumnToDataViewFieldSpec(column))
   );
 }
diff --git a/src/plugins/discover/public/application/main/data_fetching/fetch_all.test.ts b/src/plugins/discover/public/application/main/data_fetching/fetch_all.test.ts
index d6999c2200436..864c44fd6ce09 100644
--- a/src/plugins/discover/public/application/main/data_fetching/fetch_all.test.ts
+++ b/src/plugins/discover/public/application/main/data_fetching/fetch_all.test.ts
@@ -14,7 +14,6 @@ import { savedSearchMock } from '../../../__mocks__/saved_search';
 import { discoverServiceMock } from '../../../__mocks__/services';
 import { fetchAll, fetchMoreDocuments } from './fetch_all';
 import {
-  DataAvailableFieldsMsg,
   DataDocumentsMsg,
   DataMainMsg,
   DataTotalHitsMsg,
@@ -59,9 +58,6 @@ describe('test fetchAll', () => {
       main$: new BehaviorSubject<DataMainMsg>({ fetchStatus: FetchStatus.UNINITIALIZED }),
       documents$: new BehaviorSubject<DataDocumentsMsg>({ fetchStatus: FetchStatus.UNINITIALIZED }),
       totalHits$: new BehaviorSubject<DataTotalHitsMsg>({ fetchStatus: FetchStatus.UNINITIALIZED }),
-      availableFields$: new BehaviorSubject<DataAvailableFieldsMsg>({
-        fetchStatus: FetchStatus.UNINITIALIZED,
-      }),
     };
     searchSource = savedSearchMock.searchSource.createChild();
 
diff --git a/src/plugins/discover/public/application/main/state_management/discover_data_state_container.ts b/src/plugins/discover/public/application/main/state_management/discover_data_state_container.ts
index aaa1f6c15c0f4..d467d965f012d 100644
--- a/src/plugins/discover/public/application/main/state_management/discover_data_state_container.ts
+++ b/src/plugins/discover/public/application/main/state_management/discover_data_state_container.ts
@@ -33,13 +33,11 @@ export interface SavedSearchData {
   main$: DataMain$;
   documents$: DataDocuments$;
   totalHits$: DataTotalHits$;
-  availableFields$: AvailableFields$;
 }
 
 export type DataMain$ = BehaviorSubject<DataMainMsg>;
 export type DataDocuments$ = BehaviorSubject<DataDocumentsMsg>;
 export type DataTotalHits$ = BehaviorSubject<DataTotalHitsMsg>;
-export type AvailableFields$ = BehaviorSubject<DataAvailableFieldsMsg>;
 export type DataFetch$ = Observable<{
   options: {
     reset: boolean;
@@ -180,7 +178,6 @@ export function getDataStateContainer({
     main$: new BehaviorSubject<DataMainMsg>(initialState),
     documents$: new BehaviorSubject<DataDocumentsMsg>(initialState),
     totalHits$: new BehaviorSubject<DataTotalHitsMsg>(initialState),
-    availableFields$: new BehaviorSubject<DataAvailableFieldsMsg>(initialState),
   };
 
   let autoRefreshDone: AutoRefreshDoneFn | undefined;
diff --git a/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.test.ts b/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.test.ts
index 3ce4c969bbd3f..927b9e60baf1e 100644
--- a/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.test.ts
+++ b/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.test.ts
@@ -14,6 +14,8 @@ import { dataViewMock } from '@kbn/discover-utils/src/__mocks__';
 import { dataViewComplexMock } from '../../../__mocks__/data_view_complex';
 import { getDiscoverGlobalStateContainer } from './discover_global_state_container';
 import { createKbnUrlStateStorage } from '@kbn/kibana-utils-plugin/public';
+import { VIEW_MODE } from '../../../../common/constants';
+import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_source/mocks';
 
 describe('DiscoverSavedSearchContainer', () => {
   const savedSearch = savedSearchMock;
@@ -232,4 +234,57 @@ describe('DiscoverSavedSearchContainer', () => {
       expect(savedSearchContainer.getHasChanged$().getValue()).toBe(false);
     });
   });
+
+  describe('isEqualSavedSearch', () => {
+    it('should return true for equal saved searches', () => {
+      const savedSearch1 = savedSearchMock;
+      const savedSearch2 = { ...savedSearchMock };
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(true);
+    });
+
+    it('should return false for different saved searches', () => {
+      const savedSearch1 = savedSearchMock;
+      const savedSearch2 = { ...savedSearchMock, title: 'New title' };
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(false);
+    });
+
+    it('should return true for saved searches with equal default values of viewMode and false otherwise', () => {
+      const savedSearch1 = { ...savedSearchMock, viewMode: undefined };
+      const savedSearch2 = { ...savedSearchMock, viewMode: VIEW_MODE.DOCUMENT_LEVEL };
+      const savedSearch3 = { ...savedSearchMock, viewMode: VIEW_MODE.AGGREGATED_LEVEL };
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(true);
+      expect(isEqualSavedSearch(savedSearch2, savedSearch1)).toBe(true);
+      expect(isEqualSavedSearch(savedSearch1, savedSearch3)).toBe(false);
+      expect(isEqualSavedSearch(savedSearch2, savedSearch3)).toBe(false);
+    });
+
+    it('should return true for saved searches with equal default values of breakdownField and false otherwise', () => {
+      const savedSearch1 = { ...savedSearchMock, breakdownField: undefined };
+      const savedSearch2 = { ...savedSearchMock, breakdownField: '' };
+      const savedSearch3 = { ...savedSearchMock, breakdownField: 'test' };
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(true);
+      expect(isEqualSavedSearch(savedSearch2, savedSearch1)).toBe(true);
+      expect(isEqualSavedSearch(savedSearch1, savedSearch3)).toBe(false);
+      expect(isEqualSavedSearch(savedSearch2, savedSearch3)).toBe(false);
+    });
+
+    it('should check searchSource fields', () => {
+      const savedSearch1 = {
+        ...savedSearchMock,
+        searchSource: createSearchSourceMock({
+          index: savedSearchMock.searchSource.getField('index'),
+        }),
+      };
+      const savedSearch2 = {
+        ...savedSearchMock,
+        searchSource: createSearchSourceMock({
+          index: savedSearchMock.searchSource.getField('index'),
+        }),
+      };
+      expect(isEqualSavedSearch(savedSearch1, savedSearch1)).toBe(true);
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(true);
+      savedSearch2.searchSource.setField('query', { language: 'lucene', query: 'test' });
+      expect(isEqualSavedSearch(savedSearch1, savedSearch2)).toBe(false);
+    });
+  });
 });
diff --git a/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.ts b/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.ts
index c6a380cad98e2..8d3975b5bfef5 100644
--- a/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.ts
+++ b/src/plugins/discover/public/application/main/state_management/discover_saved_search_container.ts
@@ -341,12 +341,7 @@ export function isEqualSavedSearch(savedSearchPrev: SavedSearch, savedSearchNext
     const prevValue = getSavedSearchFieldForComparison(prevSavedSearch, key);
     const nextValue = getSavedSearchFieldForComparison(nextSavedSearchWithoutSearchSource, key);
 
-    const isSame =
-      isEqual(prevValue, nextValue) ||
-      // By default, viewMode: undefined is equivalent to documents view
-      // So they should be treated as same
-      (key === 'viewMode' &&
-        (prevValue ?? VIEW_MODE.DOCUMENT_LEVEL) === (nextValue ?? VIEW_MODE.DOCUMENT_LEVEL));
+    const isSame = isEqual(prevValue, nextValue);
 
     if (!isSame) {
       addLog('[savedSearch] difference between initial and changed version', {
@@ -412,6 +407,12 @@ function getSavedSearchFieldForComparison(
     return savedSearch.breakdownField || ''; // ignore the difference between an empty string and undefined
   }
 
+  if (fieldName === 'viewMode') {
+    // By default, viewMode: undefined is equivalent to documents view
+    // So they should be treated as same
+    return savedSearch.viewMode ?? VIEW_MODE.DOCUMENT_LEVEL;
+  }
+
   return savedSearch[fieldName];
 }
 
diff --git a/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.test.ts b/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.test.ts
index 1a487c5bb3bcb..50ee8b0c74fe7 100644
--- a/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.test.ts
+++ b/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.test.ts
@@ -11,7 +11,8 @@ import { FetchStatus } from '../../../types';
 import { dataViewComplexMock } from '../../../../__mocks__/data_view_complex';
 import { getDiscoverStateMock } from '../../../../__mocks__/discover_state.mock';
 import { discoverServiceMock } from '../../../../__mocks__/services';
-import { createDataViewDataSource } from '../../../../../common/data_sources';
+import { createDataViewDataSource, DataSourceType } from '../../../../../common/data_sources';
+import { VIEW_MODE } from '@kbn/saved-search-plugin/common';
 
 describe('buildStateSubscribe', () => {
   const savedSearch = savedSearchMock;
@@ -19,6 +20,7 @@ describe('buildStateSubscribe', () => {
   stateContainer.dataState.refetch$.next = jest.fn();
   stateContainer.dataState.reset = jest.fn();
   stateContainer.actions.setDataView = jest.fn();
+  stateContainer.savedSearchState.update = jest.fn();
 
   const getSubscribeFn = () => {
     return buildStateSubscribe({
@@ -51,6 +53,20 @@ describe('buildStateSubscribe', () => {
     expect(stateContainer.dataState.refetch$.next).not.toHaveBeenCalled();
   });
 
+  it('should not call refetch$ if viewMode changes', async () => {
+    await getSubscribeFn()({
+      ...stateContainer.appState.getState(),
+      dataSource: {
+        type: DataSourceType.Esql,
+      },
+      viewMode: VIEW_MODE.AGGREGATED_LEVEL,
+    });
+
+    expect(stateContainer.dataState.refetch$.next).not.toHaveBeenCalled();
+    expect(stateContainer.dataState.reset).not.toHaveBeenCalled();
+    expect(stateContainer.savedSearchState.update).toHaveBeenCalled();
+  });
+
   it('should call refetch$ if the chart is hidden', async () => {
     await getSubscribeFn()({ hideChart: true });
 
diff --git a/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.ts b/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.ts
index 5c71311377595..865992187089a 100644
--- a/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.ts
+++ b/src/plugins/discover/public/application/main/state_management/utils/build_state_subscribe.ts
@@ -55,12 +55,14 @@ export const buildStateSubscribe =
     const isEsqlMode = isDataSourceType(nextState.dataSource, DataSourceType.Esql);
     const queryChanged = !isEqual(nextQuery, prevQuery) || !isEqual(nextQuery, prevState.query);
 
-    if (
-      isEsqlMode &&
-      isEqualState(prevState, nextState, ['dataSource', 'viewMode']) &&
-      !queryChanged
-    ) {
-      // When there's a switch from data view to es|ql, this just leads to a cleanup of index and viewMode
+    if (isEsqlMode && prevState.viewMode !== nextState.viewMode && !queryChanged) {
+      savedSearchState.update({ nextState });
+      addLog('[appstate] subscribe $fetch ignored for es|ql', { prevState, nextState });
+      return;
+    }
+
+    if (isEsqlMode && isEqualState(prevState, nextState, ['dataSource']) && !queryChanged) {
+      // When there's a switch from data view to es|ql, this just leads to a cleanup of index
       // And there's no subsequent action in this function required
       addLog('[appstate] subscribe update ignored for es|ql', { prevState, nextState });
       return;
diff --git a/src/plugins/discover/public/context_awareness/profile_providers/example_data_source_profile/profile.tsx b/src/plugins/discover/public/context_awareness/profile_providers/example_data_source_profile/profile.tsx
index 080c2ffed222b..6b705b00c1ba1 100644
--- a/src/plugins/discover/public/context_awareness/profile_providers/example_data_source_profile/profile.tsx
+++ b/src/plugins/discover/public/context_awareness/profile_providers/example_data_source_profile/profile.tsx
@@ -52,6 +52,17 @@ export const exampleDataSourceProfileProvider: DataSourceProfileProvider = {
         );
       },
     }),
+    getDocViewer: (prev) => (params) => {
+      const recordId = params.record.id;
+      const prevValue = prev(params);
+      return {
+        title: `Record #${recordId}`,
+        docViewsRegistry: (registry) => {
+          registry.enableById('doc_view_logs_overview');
+          return prevValue.docViewsRegistry(registry);
+        },
+      };
+    },
   },
   resolve: (params) => {
     let indexPattern: string | undefined;
diff --git a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
index d71410d884d27..e754975ecd543 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
@@ -20,7 +20,6 @@ import {
   EmbeddableInput,
   SavedObjectEmbeddableInput,
   isSavedObjectEmbeddableInput,
-  EmbeddableFactoryNotFoundError,
   EmbeddableFactory,
 } from '..';
 
@@ -74,9 +73,7 @@ export class AttributeService<
   ) {
     if (getEmbeddableFactory) {
       const factory = getEmbeddableFactory(this.type);
-      if (!factory) {
-        throw new EmbeddableFactoryNotFoundError(this.type);
-      }
+
       this.embeddableFactory = factory;
     }
   }
diff --git a/src/plugins/embeddable/public/lib/embeddable_placement/embeddable_placement_registry.ts b/src/plugins/embeddable/public/lib/embeddable_placement/embeddable_placement_registry.ts
new file mode 100644
index 0000000000000..82891d2c982b7
--- /dev/null
+++ b/src/plugins/embeddable/public/lib/embeddable_placement/embeddable_placement_registry.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+type GetPanelPlacementSettings<StateType> = (serializedState: StateType) => {
+  width?: number;
+  height?: number;
+  strategy?: string;
+};
+
+const registry: Map<string, GetPanelPlacementSettings<any>> = new Map();
+
+export const registerEmbeddablePlacementStrategy = <StateType>(
+  panelType: string,
+  getPanelPlacementSettings: GetPanelPlacementSettings<StateType>
+) => {
+  if (registry.has(panelType)) {
+    throw new Error(`Embeddable placement for embeddable type ${panelType} already exists`);
+  }
+
+  registry.set(panelType, getPanelPlacementSettings);
+};
+
+export const getEmbeddablePlacementStrategy = (panelType: string) => {
+  return registry.get(panelType);
+};
diff --git a/src/plugins/esql/.i18nrc.json b/src/plugins/esql/.i18nrc.json
new file mode 100755
index 0000000000000..fce2490c832cf
--- /dev/null
+++ b/src/plugins/esql/.i18nrc.json
@@ -0,0 +1,6 @@
+{
+  "prefix": "esql",
+  "paths": {
+    "esql": "."
+  }
+}
diff --git a/src/plugins/text_based_languages/README.md b/src/plugins/esql/README.md
similarity index 86%
rename from src/plugins/text_based_languages/README.md
rename to src/plugins/esql/README.md
index 42d3375220682..05a7406e06a3b 100644
--- a/src/plugins/text_based_languages/README.md
+++ b/src/plugins/esql/README.md
@@ -1,4 +1,4 @@
-# @kbn/text-based-languages
+# @kbn/esql
 
 ## Component properties
 The editor accepts the following properties:
@@ -11,8 +11,8 @@ The editor accepts the following properties:
 - isLoading: As the editor is not responsible for the data fetching request, the consumer could update this property when the data are being fetched. If this property is defined, the query history component will be rendered
 ```
 
-To use it on your application, you need to add the textBasedLanguages to your requiredBundles and the @kbn/text-based-languages to your tsconfig.json and use the component like that:
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+To use it on your application, you need to add the textBasedLanguages to your requiredBundles and the @kbn/esql to your tsconfig.json and use the component like that:
+import { TextBasedLangEditor } from '@kbn/esql/public';
 
  <TextBasedLangEditor
   query={query}
diff --git a/src/plugins/text_based_languages/jest.config.js b/src/plugins/esql/jest.config.js
similarity index 72%
rename from src/plugins/text_based_languages/jest.config.js
rename to src/plugins/esql/jest.config.js
index a5ee4c0f463a4..7e853067b8b3b 100644
--- a/src/plugins/text_based_languages/jest.config.js
+++ b/src/plugins/esql/jest.config.js
@@ -9,11 +9,9 @@
 module.exports = {
   preset: '@kbn/test',
   rootDir: '../../..',
-  roots: ['<rootDir>/src/plugins/text_based_languages'],
-  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/text_based_languages',
+  roots: ['<rootDir>/src/plugins/esql'],
+  coverageDirectory: '<rootDir>/target/kibana-coverage/jest/src/plugins/esql',
   coverageReporters: ['text', 'html'],
-  collectCoverageFrom: [
-    '<rootDir>/src/plugins/text_based_languages/{common,public,server}/**/*.{js,ts,tsx}',
-  ],
+  collectCoverageFrom: ['<rootDir>/src/plugins/esql/{common,public,server}/**/*.{js,ts,tsx}'],
   setupFiles: ['jest-canvas-mock'],
 };
diff --git a/src/plugins/text_based_languages/kibana.jsonc b/src/plugins/esql/kibana.jsonc
similarity index 82%
rename from src/plugins/text_based_languages/kibana.jsonc
rename to src/plugins/esql/kibana.jsonc
index 5bed408add15a..797b9066e46ae 100644
--- a/src/plugins/text_based_languages/kibana.jsonc
+++ b/src/plugins/esql/kibana.jsonc
@@ -1,9 +1,9 @@
 {
   "type": "plugin",
-  "id": "@kbn/text-based-languages",
+  "id": "@kbn/esql",
   "owner": "@elastic/kibana-esql",
   "plugin": {
-    "id": "textBasedLanguages",
+    "id": "esql",
     "server": true,
     "browser": true,
     "optionalPlugins": [
diff --git a/src/plugins/text_based_languages/package.json b/src/plugins/esql/package.json
similarity index 70%
rename from src/plugins/text_based_languages/package.json
rename to src/plugins/esql/package.json
index a13edb1990192..fe166ce25a71b 100644
--- a/src/plugins/text_based_languages/package.json
+++ b/src/plugins/esql/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "@kbn/text-based-languages",
+  "name": "@kbn/esql",
   "private": true,
   "version": "1.0.0",
   "license": "SSPL-1.0 OR Elastic License 2.0"
diff --git a/src/plugins/text_based_languages/public/create_editor.tsx b/src/plugins/esql/public/create_editor.tsx
similarity index 100%
rename from src/plugins/text_based_languages/public/create_editor.tsx
rename to src/plugins/esql/public/create_editor.tsx
diff --git a/src/plugins/text_based_languages/public/index.ts b/src/plugins/esql/public/index.ts
similarity index 76%
rename from src/plugins/text_based_languages/public/index.ts
rename to src/plugins/esql/public/index.ts
index 697e1d0e1d319..8e797ed591fca 100644
--- a/src/plugins/text_based_languages/public/index.ts
+++ b/src/plugins/esql/public/index.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { TextBasedLanguagesPlugin } from './plugin';
+import { EsqlPlugin } from './plugin';
 export type { TextBasedLanguagesEditorProps } from '@kbn/text-based-editor';
-export type { TextBasedLanguagesPluginStart } from './types';
+export type { EsqlPluginStart } from './types';
 export { TextBasedLangEditor } from './create_editor';
 
 export function plugin() {
-  return new TextBasedLanguagesPlugin();
+  return new EsqlPlugin();
 }
diff --git a/src/plugins/text_based_languages/public/kibana_services.ts b/src/plugins/esql/public/kibana_services.ts
similarity index 100%
rename from src/plugins/text_based_languages/public/kibana_services.ts
rename to src/plugins/esql/public/kibana_services.ts
diff --git a/src/plugins/text_based_languages/public/plugin.ts b/src/plugins/esql/public/plugin.ts
similarity index 83%
rename from src/plugins/text_based_languages/public/plugin.ts
rename to src/plugins/esql/public/plugin.ts
index 841641c8fce25..5b78a0b48dc2b 100755
--- a/src/plugins/text_based_languages/public/plugin.ts
+++ b/src/plugins/esql/public/plugin.ts
@@ -19,22 +19,22 @@ import {
 } from './triggers';
 import { setKibanaServices } from './kibana_services';
 
-interface TextBasedLanguagesPluginStart {
+interface EsqlPluginStart {
   dataViews: DataViewsPublicPluginStart;
   expressions: ExpressionsStart;
   uiActions: UiActionsStart;
   data: DataPublicPluginStart;
 }
 
-interface TextBasedLanguagesPluginSetup {
+interface EsqlPluginSetup {
   indexManagement: IndexManagementPluginSetup;
   uiActions: UiActionsSetup;
 }
 
-export class TextBasedLanguagesPlugin implements Plugin<{}, void> {
+export class EsqlPlugin implements Plugin<{}, void> {
   private indexManagement?: IndexManagementPluginSetup;
 
-  public setup(_: CoreSetup, { indexManagement, uiActions }: TextBasedLanguagesPluginSetup) {
+  public setup(_: CoreSetup, { indexManagement, uiActions }: EsqlPluginSetup) {
     this.indexManagement = indexManagement;
 
     uiActions.registerTrigger(updateESQLQueryTrigger);
@@ -44,7 +44,7 @@ export class TextBasedLanguagesPlugin implements Plugin<{}, void> {
 
   public start(
     core: CoreStart,
-    { dataViews, expressions, data, uiActions }: TextBasedLanguagesPluginStart
+    { dataViews, expressions, data, uiActions }: EsqlPluginStart
   ): void {
     const appendESQLAction = new UpdateESQLQueryAction(data);
     uiActions.addTriggerAction(UPDATE_ESQL_QUERY_TRIGGER, appendESQLAction);
diff --git a/src/plugins/text_based_languages/public/triggers/index.ts b/src/plugins/esql/public/triggers/index.ts
similarity index 100%
rename from src/plugins/text_based_languages/public/triggers/index.ts
rename to src/plugins/esql/public/triggers/index.ts
diff --git a/src/plugins/text_based_languages/public/triggers/update_esql_query_actions.test.ts b/src/plugins/esql/public/triggers/update_esql_query_actions.test.ts
similarity index 100%
rename from src/plugins/text_based_languages/public/triggers/update_esql_query_actions.test.ts
rename to src/plugins/esql/public/triggers/update_esql_query_actions.test.ts
diff --git a/src/plugins/text_based_languages/public/triggers/update_esql_query_actions.ts b/src/plugins/esql/public/triggers/update_esql_query_actions.ts
similarity index 95%
rename from src/plugins/text_based_languages/public/triggers/update_esql_query_actions.ts
rename to src/plugins/esql/public/triggers/update_esql_query_actions.ts
index 4aa7b015b366b..798ac803d3e3b 100644
--- a/src/plugins/text_based_languages/public/triggers/update_esql_query_actions.ts
+++ b/src/plugins/esql/public/triggers/update_esql_query_actions.ts
@@ -25,7 +25,7 @@ export class UpdateESQLQueryAction implements Action<Context> {
   constructor(protected readonly data: DataPublicPluginStart) {}
 
   public getDisplayName(): string {
-    return i18n.translate('textBasedLanguages.updateESQLQueryLabel', {
+    return i18n.translate('esql.updateESQLQueryLabel', {
       defaultMessage: 'Update the ES|QL query in the editor',
     });
   }
diff --git a/src/plugins/text_based_languages/public/triggers/update_esql_query_helpers.ts b/src/plugins/esql/public/triggers/update_esql_query_helpers.ts
similarity index 100%
rename from src/plugins/text_based_languages/public/triggers/update_esql_query_helpers.ts
rename to src/plugins/esql/public/triggers/update_esql_query_helpers.ts
diff --git a/src/plugins/text_based_languages/public/triggers/update_esql_query_trigger.ts b/src/plugins/esql/public/triggers/update_esql_query_trigger.ts
similarity index 80%
rename from src/plugins/text_based_languages/public/triggers/update_esql_query_trigger.ts
rename to src/plugins/esql/public/triggers/update_esql_query_trigger.ts
index 13164647607ef..79feddcd42c0c 100644
--- a/src/plugins/text_based_languages/public/triggers/update_esql_query_trigger.ts
+++ b/src/plugins/esql/public/triggers/update_esql_query_trigger.ts
@@ -13,10 +13,10 @@ export const UPDATE_ESQL_QUERY_TRIGGER = 'UPDATE_ESQL_QUERY_TRIGGER';
 
 export const updateESQLQueryTrigger: Trigger = {
   id: UPDATE_ESQL_QUERY_TRIGGER,
-  title: i18n.translate('textBasedLanguages.triggers.updateEsqlQueryTrigger', {
+  title: i18n.translate('esql.triggers.updateEsqlQueryTrigger', {
     defaultMessage: 'Update ES|QL query',
   }),
-  description: i18n.translate('textBasedLanguages.triggers.updateEsqlQueryTriggerDescription', {
+  description: i18n.translate('esql.triggers.updateEsqlQueryTriggerDescription', {
     defaultMessage: 'Update ES|QL query with a new one',
   }),
 };
diff --git a/src/plugins/text_based_languages/public/types.ts b/src/plugins/esql/public/types.ts
similarity index 90%
rename from src/plugins/text_based_languages/public/types.ts
rename to src/plugins/esql/public/types.ts
index c2dd5249d3d19..ef28bddc3c458 100644
--- a/src/plugins/text_based_languages/public/types.ts
+++ b/src/plugins/esql/public/types.ts
@@ -7,6 +7,6 @@
  */
 import { TextBasedLanguagesEditorProps } from '@kbn/text-based-editor';
 
-export interface TextBasedLanguagesPluginStart {
+export interface EsqlPluginStart {
   Editor: React.ComponentType<TextBasedLanguagesEditorProps>;
 }
diff --git a/src/plugins/text_based_languages/server/index.ts b/src/plugins/esql/server/index.ts
similarity index 76%
rename from src/plugins/text_based_languages/server/index.ts
rename to src/plugins/esql/server/index.ts
index bca404b161bf8..fa0a0cec5bdbe 100644
--- a/src/plugins/text_based_languages/server/index.ts
+++ b/src/plugins/esql/server/index.ts
@@ -7,6 +7,6 @@
  */
 
 export const plugin = async () => {
-  const { TextBasedLanguagesServerPlugin } = await import('./plugin');
-  return new TextBasedLanguagesServerPlugin();
+  const { EsqlServerPlugin } = await import('./plugin');
+  return new EsqlServerPlugin();
 };
diff --git a/src/plugins/text_based_languages/server/plugin.ts b/src/plugins/esql/server/plugin.ts
similarity index 91%
rename from src/plugins/text_based_languages/server/plugin.ts
rename to src/plugins/esql/server/plugin.ts
index 95a341a467cc5..416c1dacc04e5 100644
--- a/src/plugins/text_based_languages/server/plugin.ts
+++ b/src/plugins/esql/server/plugin.ts
@@ -9,7 +9,7 @@
 import type { CoreSetup, CoreStart, Plugin } from '@kbn/core/server';
 import { getUiSettings } from './ui_settings';
 
-export class TextBasedLanguagesServerPlugin implements Plugin {
+export class EsqlServerPlugin implements Plugin {
   public setup(core: CoreSetup) {
     core.uiSettings.register(getUiSettings());
     return {};
diff --git a/src/plugins/text_based_languages/server/ui_settings.ts b/src/plugins/esql/server/ui_settings.ts
similarity index 82%
rename from src/plugins/text_based_languages/server/ui_settings.ts
rename to src/plugins/esql/server/ui_settings.ts
index 32717b0d2cb8c..9c43fdf55cc25 100644
--- a/src/plugins/text_based_languages/server/ui_settings.ts
+++ b/src/plugins/esql/server/ui_settings.ts
@@ -14,17 +14,17 @@ import { ENABLE_ESQL } from '@kbn/esql-utils';
 
 export const getUiSettings: () => Record<string, UiSettingsParams> = () => ({
   [ENABLE_ESQL]: {
-    name: i18n.translate('textBasedLanguages.advancedSettings.enableESQLTitle', {
+    name: i18n.translate('esql.advancedSettings.enableESQLTitle', {
       defaultMessage: 'Enable ES|QL',
     }),
     value: true,
-    description: i18n.translate('textBasedLanguages.advancedSettings.enableESQLDescription', {
+    description: i18n.translate('esql.advancedSettings.enableESQLDescription', {
       defaultMessage:
         'This setting enables ES|QL in Kibana. By switching it off you will hide the ES|QL user interface from various applications. However, users will be able to access existing ES|QL saved searches, visualizations, etc. If you have feedback on this experience please reach out to us on {link}',
       values: {
         link:
           `<a href="https://ela.st/esql-feedback" target="_blank" rel="noopener">` +
-          i18n.translate('textBasedLanguages.advancedSettings.enableESQL.discussLinkText', {
+          i18n.translate('esql.advancedSettings.enableESQL.discussLinkText', {
             defaultMessage: 'https://ela.st/esql-feedback',
           }) +
           '</a>',
diff --git a/src/plugins/text_based_languages/tsconfig.json b/src/plugins/esql/tsconfig.json
similarity index 100%
rename from src/plugins/text_based_languages/tsconfig.json
rename to src/plugins/esql/tsconfig.json
diff --git a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
index 4ffe9d483a1a4..8d6343337f152 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/application_usage/schema.ts
@@ -135,7 +135,7 @@ export const applicationUsageSchema = {
   canvas: commonSchema,
   enterpriseSearch: commonSchema,
   enterpriseSearchContent: commonSchema,
-  enterpriseSearchInferenceEndpoints: commonSchema,
+  enterpriseSearchRelevance: commonSchema,
   enterpriseSearchAnalytics: commonSchema,
   enterpriseSearchApplications: commonSchema,
   enterpriseSearchAISearch: commonSchema,
diff --git a/src/plugins/kibana_usage_collection/server/collectors/common/__fixtures__/counters_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/common/__fixtures__/counters_saved_objects.ts
new file mode 100644
index 0000000000000..cf9e9c361117a
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/common/__fixtures__/counters_saved_objects.ts
@@ -0,0 +1,166 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
+
+export const rawServerCounters: UsageCountersSavedObject[] = [
+  {
+    type: 'usage-counter',
+    id: 'myApp:my_event:count:server:20210409',
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'my_event',
+      counterType: 'count',
+      source: 'server',
+      count: 1,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2021-04-09T08:17:57.693Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'Kibana_home:intersecting_event:loaded:server:20201023',
+    attributes: {
+      domainId: 'Kibana_home',
+      counterName: 'intersecting_event',
+      counterType: 'loaded',
+      source: 'server',
+      count: 60,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2020-10-23T11:27:57.067Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:my_event_4457914848544:count:server:20210409',
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'my_event_4457914848544',
+      counterType: 'count',
+      source: 'server',
+      count: 0,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2021-04-09T08:18:03.030Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:my_event_malformed:count:server:20210409',
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'my_event_malformed',
+      counterType: 'count',
+      source: 'server',
+      // @ts-expect-error
+      count: 'malformed',
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2021-04-09T08:18:03.030Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:my_event_4457914848544_2:count:server:20210409',
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'my_event_4457914848544_2',
+      counterType: 'count',
+      source: 'server',
+      count: 8,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2021-04-09T08:18:03.031Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:only_reported_in_usage_counters:count:server:20210409',
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'only_reported_in_usage_counters',
+      counterType: 'count',
+      source: 'server',
+      count: 1,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2021-04-09T08:18:03.031Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:namespaced_counter:count:server:20240627:first',
+    namespaces: ['first'],
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'namespaced_counter',
+      counterType: 'count',
+      source: 'server',
+      count: 1,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2024-06-27T08:18:03.031Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:namespaced_counter:count:server:20240627:second',
+    namespaces: ['second'],
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'namespaced_counter',
+      counterType: 'count',
+      source: 'server',
+      count: 2,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2024-06-27T09:18:03.031Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:namespaced_counter:count:server:20240627:third',
+    namespaces: ['third'],
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'namespaced_counter',
+      counterType: 'count',
+      source: 'server',
+      count: 3,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2024-06-27T10:18:03.031Z',
+  },
+  {
+    type: 'usage-counter',
+    id: 'myApp:namespaced_counter:count:server:20240627:default',
+    namespaces: ['default'],
+    attributes: {
+      domainId: 'myApp',
+      counterName: 'namespaced_counter',
+      counterType: 'count',
+      source: 'server',
+      count: 10,
+    },
+    references: [],
+    coreMigrationVersion: '8.0.0',
+    updated_at: '2024-06-27T11:18:03.031Z',
+  },
+];
+
+export const rawUiCounters: UsageCountersSavedObject[] = rawServerCounters.map((counter) => ({
+  ...counter,
+  id: counter.id.replace(':server:', ':ui:'),
+  attributes: {
+    ...counter.attributes,
+    source: 'ui',
+  },
+}));
diff --git a/src/plugins/kibana_usage_collection/server/collectors/common/counters.test.ts b/src/plugins/kibana_usage_collection/server/collectors/common/counters.test.ts
new file mode 100644
index 0000000000000..dfc701cfa555a
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/common/counters.test.ts
@@ -0,0 +1,188 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loggingSystemMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
+import { transformRawCounter, createCounterFetcher } from './counters';
+import { rawServerCounters, rawUiCounters } from './__fixtures__/counters_saved_objects';
+
+const mockLogger = loggingSystemMock.create();
+
+describe('transformRawCounter', () => {
+  it('transforms usage counters savedObject raw entries', () => {
+    const result = rawServerCounters.map(transformRawCounter);
+    expect(result).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "counterName": "my_event",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2021-04-09T00:00:00Z",
+          "lastUpdatedAt": "2021-04-09T08:17:57.693Z",
+          "total": 1,
+        },
+        Object {
+          "counterName": "intersecting_event",
+          "counterType": "loaded",
+          "domainId": "Kibana_home",
+          "fromTimestamp": "2020-10-23T00:00:00Z",
+          "lastUpdatedAt": "2020-10-23T11:27:57.067Z",
+          "total": 60,
+        },
+        undefined,
+        undefined,
+        Object {
+          "counterName": "my_event_4457914848544_2",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2021-04-09T00:00:00Z",
+          "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
+          "total": 8,
+        },
+        Object {
+          "counterName": "only_reported_in_usage_counters",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2021-04-09T00:00:00Z",
+          "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
+          "total": 1,
+        },
+        Object {
+          "counterName": "namespaced_counter",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2024-06-27T00:00:00Z",
+          "lastUpdatedAt": "2024-06-27T08:18:03.031Z",
+          "total": 1,
+        },
+        Object {
+          "counterName": "namespaced_counter",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2024-06-27T00:00:00Z",
+          "lastUpdatedAt": "2024-06-27T09:18:03.031Z",
+          "total": 2,
+        },
+        Object {
+          "counterName": "namespaced_counter",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2024-06-27T00:00:00Z",
+          "lastUpdatedAt": "2024-06-27T10:18:03.031Z",
+          "total": 3,
+        },
+        Object {
+          "counterName": "namespaced_counter",
+          "counterType": "count",
+          "domainId": "myApp",
+          "fromTimestamp": "2024-06-27T00:00:00Z",
+          "lastUpdatedAt": "2024-06-27T11:18:03.031Z",
+          "total": 10,
+        },
+      ]
+    `);
+  });
+});
+
+describe('createCounterFetcher', () => {
+  const soClientMock = savedObjectsClientMock.create();
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns saved objects only from a given source', async () => {
+    // @ts-expect-error incomplete mock implementation
+    soClientMock.find.mockImplementation(async ({ type, filter }) => {
+      if (type !== 'usage-counter') {
+        throw new Error(`unexpected type ${type}`);
+      }
+
+      if (filter === 'counter.attributes.source: server') {
+        return { saved_objects: rawServerCounters };
+      } else if (filter === 'counter.attributes.source: ui') {
+        return { saved_objects: rawUiCounters };
+      }
+
+      throw new Error(`unexpected filter ${filter}`);
+    });
+
+    const fetch = createCounterFetcher(
+      mockLogger.get(),
+      'counter.attributes.source: server',
+      (dailyEvents) => ({
+        dailyEvents,
+      })
+    );
+    // @ts-expect-error incomplete mock implementation
+    const { dailyEvents } = await fetch({ soClient: soClientMock });
+    expect(dailyEvents).toHaveLength(5);
+    const intersectingEntry = dailyEvents.find(
+      ({ counterName, fromTimestamp }) =>
+        counterName === 'intersecting_event' && fromTimestamp === '2020-10-23T00:00:00Z'
+    );
+
+    const onlyFromUICountersEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'only_reported_in_ui_counters'
+    );
+
+    const onlyFromUsageCountersEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'only_reported_in_usage_counters'
+    );
+
+    const invalidCountEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'my_event_malformed'
+    );
+
+    const zeroCountEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'my_event_4457914848544'
+    );
+
+    const nonUiCountersEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'some_event_name'
+    );
+
+    const namespacedCounterEntry = dailyEvents.find(
+      ({ counterName }) => counterName === 'namespaced_counter'
+    );
+
+    expect(invalidCountEntry).toBe(undefined);
+    expect(nonUiCountersEntry).toBe(undefined);
+    expect(zeroCountEntry).toBe(undefined);
+    expect(onlyFromUICountersEntry).toBe(undefined);
+    expect(onlyFromUsageCountersEntry).toMatchInlineSnapshot(`
+      Object {
+        "counterName": "only_reported_in_usage_counters",
+        "counterType": "count",
+        "domainId": "myApp",
+        "fromTimestamp": "2021-04-09T00:00:00Z",
+        "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
+        "total": 1,
+      }
+    `);
+    expect(intersectingEntry).toMatchInlineSnapshot(`
+      Object {
+        "counterName": "intersecting_event",
+        "counterType": "loaded",
+        "domainId": "Kibana_home",
+        "fromTimestamp": "2020-10-23T00:00:00Z",
+        "lastUpdatedAt": "2020-10-23T11:27:57.067Z",
+        "total": 60,
+      }
+    `);
+    // we sum counters from all namespaces: 1 + 2 + 3 + 10
+    expect(namespacedCounterEntry).toMatchInlineSnapshot(`
+      Object {
+        "counterName": "namespaced_counter",
+        "counterType": "count",
+        "domainId": "myApp",
+        "fromTimestamp": "2024-06-27T00:00:00Z",
+        "lastUpdatedAt": "2024-06-27T11:18:03.031Z",
+        "total": 16,
+      }
+    `);
+  });
+});
diff --git a/src/plugins/kibana_usage_collection/server/collectors/common/counters.ts b/src/plugins/kibana_usage_collection/server/collectors/common/counters.ts
new file mode 100644
index 0000000000000..f20e57ab47664
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/common/counters.ts
@@ -0,0 +1,102 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+import { Logger } from '@kbn/logging';
+import {
+  CollectorFetchContext,
+  UsageCountersSavedObject,
+  UsageCountersSavedObjectAttributes,
+  USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+} from '@kbn/usage-collection-plugin/server';
+
+export interface CounterEvent {
+  domainId: string;
+  counterName: string;
+  counterType: string;
+  lastUpdatedAt: string;
+  fromTimestamp: string;
+  total: number;
+}
+
+export function createCounterFetcher<T>(
+  logger: Logger,
+  filter: string,
+  transform: (counters: CounterEvent[]) => T
+) {
+  return async ({ soClient }: CollectorFetchContext) => {
+    const finder = soClient.createPointInTimeFinder<UsageCountersSavedObjectAttributes>({
+      type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+      namespaces: ['*'],
+      fields: ['count', 'counterName', 'counterType', 'domainId'],
+      filter,
+      perPage: 100,
+    });
+
+    const dailyEvents: CounterEvent[] = [];
+
+    for await (const { saved_objects: rawUsageCounters } of finder.find()) {
+      rawUsageCounters.forEach((raw) => {
+        try {
+          const event = transformRawCounter(raw);
+          if (event) {
+            dailyEvents.push(event);
+          }
+        } catch (err) {
+          // swallow error; allows sending successfully transformed objects.
+          logger.debug('Error collecting usage-counter details: ' + err.message);
+        }
+      });
+    }
+
+    return transform(mergeCounters(dailyEvents));
+  };
+}
+
+export function transformRawCounter(
+  rawCounter: UsageCountersSavedObject
+): CounterEvent | undefined {
+  const {
+    attributes: { domainId, counterType, counterName, count },
+    updated_at: lastUpdatedAt,
+  } = rawCounter;
+
+  if (typeof count !== 'number' || count < 1) {
+    return;
+  }
+
+  const fromTimestamp = moment(lastUpdatedAt).utc().startOf('day').format();
+
+  return {
+    domainId,
+    counterType,
+    counterName,
+    lastUpdatedAt: lastUpdatedAt!,
+    fromTimestamp,
+    total: count,
+  };
+}
+
+function mergeCounters(counters: CounterEvent[]): CounterEvent[] {
+  const mergedCounters = counters.reduce((acc, counter) => {
+    const { domainId, counterType, counterName, fromTimestamp } = counter;
+    const key = `${domainId}:${counterType}:${counterName}:${fromTimestamp}`;
+
+    const existingCounter = acc[key];
+    if (!existingCounter) {
+      acc[key] = counter;
+      return acc;
+    } else {
+      acc[key].total = existingCounter.total + counter.total;
+      acc[key].lastUpdatedAt = counter.lastUpdatedAt;
+    }
+    return acc;
+  }, {} as Record<string, CounterEvent>);
+
+  return Object.values(mergedCounters);
+}
diff --git a/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.test.ts b/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.test.ts
new file mode 100644
index 0000000000000..173f332c9f391
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.test.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+import type { SavedObjectsFindResult } from '@kbn/core/server';
+import {
+  type UsageCountersSavedObjectAttributes,
+  USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+} from '@kbn/usage-collection-plugin/server';
+
+import { isSavedObjectOlderThan } from './saved_objects';
+
+export const createMockSavedObjectDoc = (
+  updatedAt: moment.Moment,
+  id: string,
+  namespace?: string
+) =>
+  ({
+    id,
+    type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+    ...(namespace && { namespaces: [namespace] }),
+    attributes: {
+      count: 3,
+      counterName: 'testName',
+      counterType: 'count',
+      domainId: 'testDomain',
+      source: 'server',
+    },
+    references: [],
+    updated_at: updatedAt.format(),
+    version: 'WzI5LDFd',
+    score: 0,
+  } as SavedObjectsFindResult<UsageCountersSavedObjectAttributes>);
+
+describe('isSavedObjectOlderThan', () => {
+  it(`returns true if doc is older than x days`, () => {
+    const numberOfDays = 1;
+    const startDate = moment().format();
+    const doc = createMockSavedObjectDoc(moment().subtract(2, 'days'), 'some-id');
+    const result = isSavedObjectOlderThan({
+      numberOfDays,
+      startDate,
+      doc,
+    });
+    expect(result).toBe(true);
+  });
+
+  it(`returns false if doc is exactly x days old`, () => {
+    const numberOfDays = 1;
+    const startDate = moment().format();
+    const doc = createMockSavedObjectDoc(moment().subtract(1, 'days'), 'some-id');
+    const result = isSavedObjectOlderThan({
+      numberOfDays,
+      startDate,
+      doc,
+    });
+    expect(result).toBe(false);
+  });
+
+  it(`returns false if doc is younger than x days`, () => {
+    const numberOfDays = 2;
+    const startDate = moment().format();
+    const doc = createMockSavedObjectDoc(moment().subtract(1, 'days'), 'some-id');
+    const result = isSavedObjectOlderThan({
+      numberOfDays,
+      startDate,
+      doc,
+    });
+    expect(result).toBe(false);
+  });
+});
diff --git a/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.ts
new file mode 100644
index 0000000000000..7b42b528b266b
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/common/saved_objects.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+import { SavedObject } from '@kbn/core-saved-objects-api-server';
+
+export function isSavedObjectOlderThan({
+  numberOfDays,
+  startDate,
+  doc,
+}: {
+  numberOfDays: number;
+  startDate: moment.Moment | string | number;
+  doc: Pick<SavedObject, 'updated_at'>;
+}): boolean {
+  const { updated_at: updatedAt } = doc;
+  const today = moment(startDate).startOf('day');
+  const updateDay = moment(updatedAt).startOf('day');
+
+  const diffInDays = today.diff(updateDay, 'days');
+  if (diffInDays > numberOfDays) {
+    return true;
+  }
+
+  return false;
+}
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
deleted file mode 100644
index 4516e5174d402..0000000000000
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/__fixtures__/usage_counter_saved_objects.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
-
-export const rawUsageCounters: UsageCountersSavedObject[] = [
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:my_event',
-    attributes: {
-      count: 1,
-      counterName: 'myApp:my_event',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:17:57.693Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:23102020:loaded:Kibana_home:intersecting_event',
-    attributes: {
-      count: 60,
-      counterName: 'Kibana_home:intersecting_event',
-      counterType: 'loaded',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2020-10-23T11:27:57.067Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:my_event_4457914848544',
-    attributes: {
-      count: 0,
-      counterName: 'myApp:my_event_4457914848544',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:my_event_malformed',
-    attributes: {
-      // @ts-expect-error
-      count: 'malformed',
-      counterName: 'myApp:my_event_malformed',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId:09042021:count:some_event_name',
-    attributes: {
-      count: 4,
-      counterName: 'some_event_name',
-      counterType: 'count',
-      domainId: 'anotherDomainId',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:my_event_4457914848544_2',
-    attributes: {
-      count: 8,
-      counterName: 'myApp:my_event_4457914848544_2',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.031Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:only_reported_in_usage_counters',
-    attributes: {
-      count: 1,
-      counterName: 'myApp:only_reported_in_usage_counters',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.031Z',
-  },
-];
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
index 0e84df3325d3d..6d35f5baf4046 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.test.ts
@@ -6,124 +6,49 @@
  * Side Public License, v 1.
  */
 
-import { transformRawUsageCounterObject, fetchUiCounters } from './register_ui_counters_collector';
-import { rawUsageCounters } from './__fixtures__/usage_counter_saved_objects';
-import { savedObjectsClientMock } from '@kbn/core/server/mocks';
-import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '@kbn/usage-collection-plugin/server';
-
-describe('transformRawUsageCounterObject', () => {
-  it('transforms usage counters savedObject raw entries', () => {
-    const result = rawUsageCounters.map(transformRawUsageCounterObject);
-    expect(result).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "appName": "myApp",
-          "counterType": "count",
-          "eventName": "my_event",
-          "fromTimestamp": "2021-04-09T00:00:00Z",
-          "lastUpdatedAt": "2021-04-09T08:17:57.693Z",
-          "total": 1,
-        },
-        Object {
-          "appName": "Kibana_home",
-          "counterType": "loaded",
-          "eventName": "intersecting_event",
-          "fromTimestamp": "2020-10-23T00:00:00Z",
-          "lastUpdatedAt": "2020-10-23T11:27:57.067Z",
-          "total": 60,
+import type { CounterEvent } from '../common/counters';
+import { toDailyEvents } from './register_ui_counters_collector';
+
+describe('toDailyEvents', () => {
+  it('adapts counter events to have the expected UI properties', () => {
+    const counters: CounterEvent[] = [
+      {
+        domainId: 'dashboards',
+        counterType: 'loaded',
+        counterName: 'lens',
+        lastUpdatedAt: '2024-06-19T12:03:25.795Z',
+        fromTimestamp: '2024-06-19T00:00:00Z',
+        total: 18,
+      },
+      {
+        domainId: 'dashboards',
+        counterType: 'updated',
+        counterName: 'lens',
+        lastUpdatedAt: '2024-06-19T14:13:25.795Z',
+        fromTimestamp: '2024-06-19T00:00:00Z',
+        total: 4,
+      },
+    ];
+
+    expect(toDailyEvents(counters)).toEqual({
+      dailyEvents: [
+        {
+          appName: 'dashboards',
+          counterType: 'loaded',
+          eventName: 'lens',
+          lastUpdatedAt: '2024-06-19T12:03:25.795Z',
+          fromTimestamp: '2024-06-19T00:00:00Z',
+          total: 18,
         },
-        undefined,
-        undefined,
-        undefined,
-        Object {
-          "appName": "myApp",
-          "counterType": "count",
-          "eventName": "my_event_4457914848544_2",
-          "fromTimestamp": "2021-04-09T00:00:00Z",
-          "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
-          "total": 8,
+        {
+          appName: 'dashboards',
+          counterType: 'updated',
+          eventName: 'lens',
+          lastUpdatedAt: '2024-06-19T14:13:25.795Z',
+          fromTimestamp: '2024-06-19T00:00:00Z',
+          total: 4,
         },
-        Object {
-          "appName": "myApp",
-          "counterType": "count",
-          "eventName": "only_reported_in_usage_counters",
-          "fromTimestamp": "2021-04-09T00:00:00Z",
-          "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
-          "total": 1,
-        },
-      ]
-    `);
-  });
-});
-
-describe('fetchUiCounters', () => {
-  const soClientMock = savedObjectsClientMock.create();
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns saved objects only from usage_counters saved objects', async () => {
-    // @ts-expect-error incomplete mock implementation
-    soClientMock.find.mockImplementation(async ({ type }) => {
-      switch (type) {
-        case USAGE_COUNTERS_SAVED_OBJECT_TYPE:
-          return { saved_objects: rawUsageCounters };
-        default:
-          throw new Error(`unexpected type ${type}`);
-      }
+      ],
     });
-
-    // @ts-expect-error incomplete mock implementation
-    const { dailyEvents } = await fetchUiCounters({
-      soClient: soClientMock,
-    });
-    expect(dailyEvents).toHaveLength(4);
-    const intersectingEntry = dailyEvents.find(
-      ({ eventName, fromTimestamp }) =>
-        eventName === 'intersecting_event' && fromTimestamp === '2020-10-23T00:00:00Z'
-    );
-
-    const onlyFromUICountersEntry = dailyEvents.find(
-      ({ eventName }) => eventName === 'only_reported_in_ui_counters'
-    );
-
-    const onlyFromUsageCountersEntry = dailyEvents.find(
-      ({ eventName }) => eventName === 'only_reported_in_usage_counters'
-    );
-
-    const invalidCountEntry = dailyEvents.find(
-      ({ eventName }) => eventName === 'my_event_malformed'
-    );
-
-    const zeroCountEntry = dailyEvents.find(
-      ({ eventName }) => eventName === 'my_event_4457914848544'
-    );
-
-    const nonUiCountersEntry = dailyEvents.find(({ eventName }) => eventName === 'some_event_name');
-
-    expect(invalidCountEntry).toBe(undefined);
-    expect(nonUiCountersEntry).toBe(undefined);
-    expect(zeroCountEntry).toBe(undefined);
-    expect(onlyFromUICountersEntry).toBe(undefined);
-    expect(onlyFromUsageCountersEntry).toMatchInlineSnapshot(`
-      Object {
-        "appName": "myApp",
-        "counterType": "count",
-        "eventName": "only_reported_in_usage_counters",
-        "fromTimestamp": "2021-04-09T00:00:00Z",
-        "lastUpdatedAt": "2021-04-09T08:18:03.031Z",
-        "total": 1,
-      }
-    `);
-    expect(intersectingEntry).toMatchInlineSnapshot(`
-      Object {
-        "appName": "Kibana_home",
-        "counterType": "loaded",
-        "eventName": "intersecting_event",
-        "fromTimestamp": "2020-10-23T00:00:00Z",
-        "lastUpdatedAt": "2020-10-23T11:27:57.067Z",
-        "total": 60,
-      }
-    `);
   });
 });
diff --git a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
index 77212225cc14c..024d3b7a9f562 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/ui_counters/register_ui_counters_collector.ts
@@ -6,24 +6,20 @@
  * Side Public License, v 1.
  */
 
-import moment from 'moment';
-
+import type { Logger } from '@kbn/logging';
+import { UsageCounters } from '@kbn/usage-collection-plugin/common';
 import {
-  CollectorFetchContext,
-  UsageCollectionSetup,
+  type UsageCollectionSetup,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-  UsageCountersSavedObject,
-  UsageCountersSavedObjectAttributes,
 } from '@kbn/usage-collection-plugin/server';
-
-import { deserializeUiCounterName } from '@kbn/usage-collection-plugin/common/ui_counters';
+import { type CounterEvent, createCounterFetcher } from '../common/counters';
 
 interface UiCounterEvent {
   appName: string;
   eventName: string;
-  lastUpdatedAt?: string;
-  fromTimestamp?: string;
   counterType: string;
+  lastUpdatedAt: string;
+  fromTimestamp: string;
   total: number;
 }
 
@@ -31,58 +27,13 @@ export interface UiUsageCounters {
   dailyEvents: UiCounterEvent[];
 }
 
-export function transformRawUsageCounterObject(
-  rawUsageCounter: UsageCountersSavedObject
-): UiCounterEvent | undefined {
-  const {
-    attributes: { count, counterName, counterType, domainId },
-    updated_at: lastUpdatedAt,
-  } = rawUsageCounter;
-
-  if (domainId !== 'uiCounter' || typeof count !== 'number' || count < 1) {
-    return;
-  }
-
-  const fromTimestamp = moment(lastUpdatedAt).utc().startOf('day').format();
-  const { appName, eventName } = deserializeUiCounterName(counterName);
-
-  return {
-    appName,
-    eventName,
-    lastUpdatedAt,
-    fromTimestamp,
-    counterType,
-    total: count,
-  };
-}
-
-export async function fetchUiCounters({ soClient }: CollectorFetchContext) {
-  const finder = soClient.createPointInTimeFinder<UsageCountersSavedObjectAttributes>({
-    type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-    fields: ['count', 'counterName', 'counterType', 'domainId'],
-    filter: `${USAGE_COUNTERS_SAVED_OBJECT_TYPE}.attributes.domainId: uiCounter`,
-    perPage: 1000,
-  });
-
-  const dailyEvents: UiCounterEvent[] = [];
-
-  for await (const { saved_objects: rawUsageCounters } of finder.find()) {
-    rawUsageCounters.forEach((raw) => {
-      try {
-        const event = transformRawUsageCounterObject(raw);
-        if (event) {
-          dailyEvents.push(event);
-        }
-      } catch (_) {
-        // swallow error; allows sending successfully transformed objects.
-      }
-    });
-  }
+const UI: UsageCounters.v1.CounterEventSource = 'ui';
+const UI_COUNTERS_FILTER = `${USAGE_COUNTERS_SAVED_OBJECT_TYPE}.attributes.source: ${UI}`;
 
-  return { dailyEvents };
-}
-
-export function registerUiCountersUsageCollector(usageCollection: UsageCollectionSetup) {
+export function registerUiCountersUsageCollector(
+  usageCollection: UsageCollectionSetup,
+  logger: Logger
+) {
   const collector = usageCollection.makeUsageCollector<UiUsageCounters>({
     type: 'ui_counters',
     schema: {
@@ -105,7 +56,10 @@ export function registerUiCountersUsageCollector(usageCollection: UsageCollectio
             type: 'date',
             _meta: { description: 'Time at which the metric was captured.' },
           },
-          counterType: { type: 'keyword', _meta: { description: 'The type of counter used.' } },
+          counterType: {
+            type: 'keyword',
+            _meta: { description: 'The type of counter used.' },
+          },
           total: {
             type: 'integer',
             _meta: { description: 'The total number of times the event happened.' },
@@ -113,9 +67,24 @@ export function registerUiCountersUsageCollector(usageCollection: UsageCollectio
         },
       },
     },
-    fetch: fetchUiCounters,
+    fetch: createCounterFetcher(logger, UI_COUNTERS_FILTER, toDailyEvents),
     isReady: () => true,
   });
 
   usageCollection.registerCollector(collector);
 }
+
+export function toDailyEvents(counters: CounterEvent[]) {
+  return {
+    dailyEvents: counters.map(toUiCounter),
+  };
+}
+
+function toUiCounter(counter: CounterEvent): UiCounterEvent {
+  const { domainId: appName, counterName: eventName, ...props } = counter;
+  return {
+    appName,
+    eventName,
+    ...props,
+  };
+}
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
deleted file mode 100644
index 344d36542646d..0000000000000
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/__fixtures__/usage_counter_saved_objects.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import type { UsageCountersSavedObject } from '@kbn/usage-collection-plugin/server';
-
-export const rawUsageCounters: UsageCountersSavedObject[] = [
-  {
-    type: 'usage-counters',
-    id: 'uiCounter:09042021:count:myApp:my_event',
-    attributes: {
-      count: 13,
-      counterName: 'my_event',
-      counterType: 'count',
-      domainId: 'uiCounter',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId:09042021:count:some_event_name',
-    attributes: {
-      count: 4,
-      counterName: 'some_event_name',
-      counterType: 'count',
-      domainId: 'anotherDomainId',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-09T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId:09042021:count:some_event_name',
-    attributes: {
-      count: 4,
-      counterName: 'some_event_name',
-      counterType: 'count',
-      domainId: 'anotherDomainId',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-11T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId2:09042021:count:some_event_name',
-    attributes: {
-      count: 1,
-      counterName: 'some_event_name',
-      counterType: 'count',
-      domainId: 'anotherDomainId2',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-20T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId2:09042021:count:malformed_event',
-    attributes: {
-      // @ts-expect-error
-      count: 'malformed',
-      counterName: 'malformed_event',
-      counterType: 'count',
-      domainId: 'anotherDomainId2',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-20T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId2:09042021:custom_type:some_event_name',
-    attributes: {
-      count: 3,
-      counterName: 'some_event_name',
-      counterType: 'custom_type',
-      domainId: 'anotherDomainId2',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-20T08:18:03.030Z',
-  },
-  {
-    type: 'usage-counters',
-    id: 'anotherDomainId3:09042021:custom_type:zero_count',
-    attributes: {
-      count: 0,
-      counterName: 'zero_count',
-      counterType: 'custom_type',
-      domainId: 'anotherDomainId3',
-    },
-    references: [],
-    coreMigrationVersion: '8.0.0',
-    updated_at: '2021-04-20T08:18:03.030Z',
-  },
-];
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/integration_tests/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/integration_tests/rollups.test.ts
new file mode 100644
index 0000000000000..bde078e234fb3
--- /dev/null
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/integration_tests/rollups.test.ts
@@ -0,0 +1,226 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import moment from 'moment';
+
+/**
+ * Mocking methods that are used to retrieve current time. This allows:
+ * 1) introducing OLD counters that can be rolled up
+ * 2) Removing flakiness for tests that are executed on a 2 day span (close to midnight)
+ * getCurrentTime => used by `SOR.incrementCounter` to determine 'updated_at'
+ * isSavedObjectOlderThan => used by `rollUsageCountersIndices` to determine if a counter is beyond the retention period
+ */
+jest.mock('@kbn/core-saved-objects-api-server-internal/src/lib/apis/utils', () => ({
+  ...jest.requireActual('@kbn/core-saved-objects-api-server-internal/src/lib/apis/utils'),
+  getCurrentTime: jest.fn(),
+}));
+
+jest.mock('../../common/saved_objects', () => ({
+  ...jest.requireActual('../../common/saved_objects'),
+  isSavedObjectOlderThan: jest.fn(),
+}));
+
+import { getCurrentTime } from '@kbn/core-saved-objects-api-server-internal/src/lib/apis/utils';
+import type { Logger, ISavedObjectsRepository, SavedObject } from '@kbn/core/server';
+import {
+  type TestElasticsearchUtils,
+  type TestKibanaUtils,
+  createTestServers,
+  createRootWithCorePlugins,
+} from '@kbn/core-test-helpers-kbn-server';
+
+import {
+  serializeCounterKey,
+  type UsageCountersSavedObjectAttributes,
+  USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+} from '@kbn/usage-collection-plugin/server';
+import { rollUsageCountersIndices } from '../rollups/rollups';
+import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from '../rollups/constants';
+import { isSavedObjectOlderThan } from '../../common/saved_objects';
+
+const getCurrentTimeMock = getCurrentTime as jest.MockedFunction<typeof getCurrentTime>;
+const isSavedObjectOlderThanMock = isSavedObjectOlderThan as jest.MockedFunction<
+  typeof isSavedObjectOlderThan
+>;
+
+const NOW = '2024-06-30T10:00:00.000Z';
+const OLD = moment(NOW).subtract(USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS + 1, 'days');
+const RECENT = moment(NOW).subtract(USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS - 1, 'days');
+const OLD_YMD = OLD.format('YYYYMMDD');
+const RECENT_YMD = RECENT.format('YYYYMMDD');
+const OLD_ISO = OLD.toISOString();
+const RECENT_ISO = RECENT.toISOString();
+
+const ALL_COUNTERS = [
+  `domain1:a:count:server:${OLD_YMD}:default`,
+  `domain1:a:count:server:${RECENT_YMD}:default`,
+  `domain1:b:count:server:${OLD_YMD}:one`,
+  `domain1:b:count:server:${OLD_YMD}:two`,
+  `domain1:b:count:server:${RECENT_YMD}:one`,
+  `domain1:b:count:server:${RECENT_YMD}:two`,
+  `domain2:a:count:server:${OLD_YMD}:default`,
+  `domain2:a:count:server:${RECENT_YMD}:default`,
+  `domain2:c:count:server:${RECENT_YMD}:default`,
+];
+
+const RECENT_COUNTERS = ALL_COUNTERS.filter((key) => key.includes(RECENT_YMD));
+
+describe('usage-counters', () => {
+  let esServer: TestElasticsearchUtils;
+  let root: TestKibanaUtils['root'];
+  let internalRepository: ISavedObjectsRepository;
+  let logger: Logger;
+
+  beforeAll(async () => {
+    const { startES } = createTestServers({
+      adjustTimeout: (t: number) => jest.setTimeout(t),
+    });
+
+    esServer = await startES();
+    root = createRootWithCorePlugins();
+
+    await root.preboot();
+    await root.setup();
+    const start = await root.start();
+
+    logger = root.logger.get('test daily rollups');
+    internalRepository = start.savedObjects.createInternalRepository([
+      USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+    ]);
+
+    // insert a bunch of usage counters in multiple namespaces
+    await createTestCounters(internalRepository);
+  });
+
+  it('deletes documents older that the retention period, from all namespaces', async () => {
+    // check that all documents are there
+    const beforeRollup = await internalRepository.find<UsageCountersSavedObjectAttributes>({
+      type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+      namespaces: ['*'],
+    });
+    expect(
+      beforeRollup.saved_objects
+        .map(({ attributes, updated_at: updatedAt, namespaces }) =>
+          serializeCounterKey({ ...attributes, date: updatedAt, namespace: namespaces?.[0] })
+        )
+        .sort()
+    ).toEqual(ALL_COUNTERS);
+
+    // run the rollup logic
+    isSavedObjectOlderThanMock.mockImplementation(({ doc }) => doc.updated_at === OLD_ISO);
+    await rollUsageCountersIndices(logger, internalRepository);
+
+    // check only recent counters are present
+    const afterRollup = await internalRepository.find<UsageCountersSavedObjectAttributes>({
+      type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+      namespaces: ['*'],
+    });
+    expect(
+      afterRollup.saved_objects
+        .map(({ attributes, updated_at: updatedAt, namespaces }) =>
+          serializeCounterKey({ ...attributes, date: updatedAt, namespace: namespaces?.[0] })
+        )
+        .sort()
+    ).toEqual(RECENT_COUNTERS);
+  });
+
+  afterAll(async () => {
+    await esServer.stop();
+    await root.shutdown();
+  });
+});
+
+async function createTestCounters(internalRepository: ISavedObjectsRepository) {
+  await createCounters(internalRepository, OLD_ISO, [
+    // domainId, counterName, counterType, source, count, namespace?
+    ['domain1', 'a', 'count', 'server', 28],
+    ['domain1', 'b', 'count', 'server', 29, 'one'],
+    ['domain1', 'b', 'count', 'server', 30, 'two'],
+    ['domain2', 'a', 'count', 'server', 31],
+  ]);
+
+  await createCounters(internalRepository, RECENT_ISO, [
+    // domainId, counterName, counterType, source, count, namespace?
+    ['domain1', 'a', 'count', 'server', 32],
+    ['domain1', 'b', 'count', 'server', 33, 'one'],
+    ['domain1', 'b', 'count', 'server', 34, 'two'],
+    ['domain2', 'a', 'count', 'server', 35],
+    ['domain2', 'c', 'count', 'server', 36],
+  ]);
+}
+
+// domainId, counterName, counterType, source, count, namespace?
+type CounterAttributes = [string, string, string, 'ui' | 'server', number, string?];
+
+async function createCounters(
+  internalRepository: ISavedObjectsRepository,
+  isoDate: string,
+  countersAttributes: CounterAttributes[]
+) {
+  // tamper SO `updated_at`
+  getCurrentTimeMock.mockReturnValue(isoDate);
+
+  await Promise.all(
+    countersAttributes
+      .map((attrs) => createCounter(isoDate, ...attrs))
+      .map((counter) => incrementCounter(internalRepository, counter))
+  );
+}
+
+function createCounter(
+  date: string,
+  domainId: string,
+  counterName: string,
+  counterType: string,
+  source: 'server' | 'ui',
+  count: number,
+  namespace?: string
+): SavedObject<UsageCountersSavedObjectAttributes> {
+  const id = serializeCounterKey({
+    domainId,
+    counterName,
+    counterType,
+    namespace,
+    source,
+    date,
+  });
+  return {
+    type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+    id,
+    ...(namespace && { namespaces: [namespace] }),
+    attributes: {
+      domainId,
+      counterName,
+      counterType,
+      source,
+      count,
+    },
+    references: [],
+  };
+}
+
+async function incrementCounter(
+  internalRepository: ISavedObjectsRepository,
+  counter: SavedObject<UsageCountersSavedObjectAttributes>
+) {
+  const namespace = counter.namespaces?.[0];
+  return await internalRepository.incrementCounter(
+    USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+    counter.id,
+    [{ fieldName: 'count', incrementBy: counter.attributes.count }],
+    {
+      ...(namespace && { namespace }),
+      upsertAttributes: {
+        domainId: counter.attributes.domainId,
+        counterName: counter.attributes.counterName,
+        counterType: counter.attributes.counterType,
+        source: counter.attributes.source,
+      },
+    }
+  );
+}
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.test.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.test.ts
index 945eb007fe23f..2412fbe2a9279 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.test.ts
@@ -6,50 +6,49 @@
  * Side Public License, v 1.
  */
 
-import { transformRawCounter } from './register_usage_counters_collector';
-import { rawUsageCounters } from './__fixtures__/usage_counter_saved_objects';
+import type { CounterEvent } from '../common/counters';
+import { toDailyEvents } from './register_usage_counters_collector';
 
-describe('transformRawCounter', () => {
-  it('transforms saved object raw entries', () => {
-    const result = rawUsageCounters.map(transformRawCounter);
-    expect(result).toMatchInlineSnapshot(`
-      Array [
-        undefined,
-        Object {
-          "counterName": "some_event_name",
-          "counterType": "count",
-          "domainId": "anotherDomainId",
-          "fromTimestamp": "2021-04-09T00:00:00Z",
-          "lastUpdatedAt": "2021-04-09T08:18:03.030Z",
-          "total": 4,
-        },
-        Object {
-          "counterName": "some_event_name",
-          "counterType": "count",
-          "domainId": "anotherDomainId",
-          "fromTimestamp": "2021-04-11T00:00:00Z",
-          "lastUpdatedAt": "2021-04-11T08:18:03.030Z",
-          "total": 4,
-        },
-        Object {
-          "counterName": "some_event_name",
-          "counterType": "count",
-          "domainId": "anotherDomainId2",
-          "fromTimestamp": "2021-04-20T00:00:00Z",
-          "lastUpdatedAt": "2021-04-20T08:18:03.030Z",
-          "total": 1,
+describe('toDailyEvents', () => {
+  it('adapts counter events to have the expected UI properties', () => {
+    const counters: CounterEvent[] = [
+      {
+        domainId: 'foo',
+        counterType: 'bar',
+        counterName: 'count',
+        lastUpdatedAt: '2024-06-19T12:03:25.795Z',
+        fromTimestamp: '2024-06-19T00:00:00Z',
+        total: 18,
+      },
+      {
+        domainId: 'foo',
+        counterType: 'baz',
+        counterName: 'count',
+        lastUpdatedAt: '2024-06-19T14:13:25.795Z',
+        fromTimestamp: '2024-06-19T00:00:00Z',
+        total: 4,
+      },
+    ];
+
+    expect(toDailyEvents(counters)).toEqual({
+      dailyEvents: [
+        {
+          domainId: 'foo',
+          counterType: 'bar',
+          counterName: 'count',
+          lastUpdatedAt: '2024-06-19T12:03:25.795Z',
+          fromTimestamp: '2024-06-19T00:00:00Z',
+          total: 18,
         },
-        undefined,
-        Object {
-          "counterName": "some_event_name",
-          "counterType": "custom_type",
-          "domainId": "anotherDomainId2",
-          "fromTimestamp": "2021-04-20T00:00:00Z",
-          "lastUpdatedAt": "2021-04-20T08:18:03.030Z",
-          "total": 3,
+        {
+          domainId: 'foo',
+          counterType: 'baz',
+          counterName: 'count',
+          lastUpdatedAt: '2024-06-19T14:13:25.795Z',
+          fromTimestamp: '2024-06-19T00:00:00Z',
+          total: 4,
         },
-        undefined,
-      ]
-    `);
+      ],
+    });
   });
 });
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
index 807f0189a4dd0..bd06615e8eb30 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/register_usage_counters_collector.ts
@@ -6,52 +6,25 @@
  * Side Public License, v 1.
  */
 
-import moment from 'moment';
+import type { Logger } from '@kbn/logging';
+import { UsageCounters } from '@kbn/usage-collection-plugin/common';
 import {
-  CollectorFetchContext,
-  UsageCollectionSetup,
+  type UsageCollectionSetup,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-  UsageCountersSavedObject,
-  UsageCountersSavedObjectAttributes,
 } from '@kbn/usage-collection-plugin/server';
-
-interface UsageCounterEvent {
-  domainId: string;
-  counterName: string;
-  counterType: string;
-  lastUpdatedAt?: string;
-  fromTimestamp?: string;
-  total: number;
-}
+import { type CounterEvent, createCounterFetcher } from '../common/counters';
 
 export interface UsageCounters {
-  dailyEvents: UsageCounterEvent[];
+  dailyEvents: CounterEvent[];
 }
 
-export function transformRawCounter(
-  rawUsageCounter: UsageCountersSavedObject
-): UsageCounterEvent | undefined {
-  const {
-    attributes: { count, counterName, counterType, domainId },
-    updated_at: lastUpdatedAt,
-  } = rawUsageCounter;
-  const fromTimestamp = moment(lastUpdatedAt).utc().startOf('day').format();
-
-  if (domainId === 'uiCounter' || typeof count !== 'number' || count < 1) {
-    return;
-  }
-
-  return {
-    domainId,
-    counterName,
-    counterType,
-    lastUpdatedAt,
-    fromTimestamp,
-    total: count,
-  };
-}
+const SERVER: UsageCounters.v1.CounterEventSource = 'server';
+const SERVER_COUNTERS_FILTER = `${USAGE_COUNTERS_SAVED_OBJECT_TYPE}.attributes.source: ${SERVER}`;
 
-export function registerUsageCountersUsageCollector(usageCollection: UsageCollectionSetup) {
+export function registerUsageCountersUsageCollector(
+  usageCollection: UsageCollectionSetup,
+  logger: Logger
+) {
   const collector = usageCollection.makeUsageCollector<UsageCounters>({
     type: 'usage_counters',
     schema: {
@@ -85,33 +58,15 @@ export function registerUsageCountersUsageCollector(usageCollection: UsageCollec
         },
       },
     },
-    fetch: async ({ soClient }: CollectorFetchContext) => {
-      const finder = soClient.createPointInTimeFinder<UsageCountersSavedObjectAttributes>({
-        type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-        fields: ['count', 'counterName', 'counterType', 'domainId'],
-        filter: `NOT ${USAGE_COUNTERS_SAVED_OBJECT_TYPE}.attributes.domainId: uiCounter`,
-        perPage: 1000,
-      });
-
-      const dailyEvents: UsageCounterEvent[] = [];
-
-      for await (const { saved_objects: rawUsageCounters } of finder.find()) {
-        rawUsageCounters.forEach((rawUsageCounter) => {
-          try {
-            const event = transformRawCounter(rawUsageCounter);
-            if (event) {
-              dailyEvents.push(event);
-            }
-          } catch (_) {
-            // swallow error; allows sending successfully transformed objects.
-          }
-        });
-      }
-
-      return { dailyEvents };
-    },
+    fetch: createCounterFetcher(logger, SERVER_COUNTERS_FILTER, toDailyEvents),
     isReady: () => true,
   });
 
   usageCollection.registerCollector(collector);
 }
+
+export function toDailyEvents(counters: CounterEvent[]) {
+  return {
+    dailyEvents: counters,
+  };
+}
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
index 4397468244a1f..37c68021c9c73 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.test.ts
@@ -7,70 +7,11 @@
  */
 
 import moment from 'moment';
-import { isSavedObjectOlderThan, rollUsageCountersIndices } from './rollups';
 import { savedObjectsRepositoryMock, loggingSystemMock } from '@kbn/core/server/mocks';
-import { SavedObjectsFindResult } from '@kbn/core/server';
-
-import {
-  UsageCountersSavedObjectAttributes,
-  USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-} from '@kbn/usage-collection-plugin/server';
-
+import { USAGE_COUNTERS_SAVED_OBJECT_TYPE } from '@kbn/usage-collection-plugin/server';
 import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
-
-const createMockSavedObjectDoc = (updatedAt: moment.Moment, id: string) =>
-  ({
-    id,
-    type: 'usage-counter',
-    attributes: {
-      count: 3,
-      counterName: 'testName',
-      counterType: 'count',
-      domainId: 'testDomain',
-    },
-    references: [],
-    updated_at: updatedAt.format(),
-    version: 'WzI5LDFd',
-    score: 0,
-  } as SavedObjectsFindResult<UsageCountersSavedObjectAttributes>);
-
-describe('isSavedObjectOlderThan', () => {
-  it(`returns true if doc is older than x days`, () => {
-    const numberOfDays = 1;
-    const startDate = moment().format();
-    const doc = createMockSavedObjectDoc(moment().subtract(2, 'days'), 'some-id');
-    const result = isSavedObjectOlderThan({
-      numberOfDays,
-      startDate,
-      doc,
-    });
-    expect(result).toBe(true);
-  });
-
-  it(`returns false if doc is exactly x days old`, () => {
-    const numberOfDays = 1;
-    const startDate = moment().format();
-    const doc = createMockSavedObjectDoc(moment().subtract(1, 'days'), 'some-id');
-    const result = isSavedObjectOlderThan({
-      numberOfDays,
-      startDate,
-      doc,
-    });
-    expect(result).toBe(false);
-  });
-
-  it(`returns false if doc is younger than x days`, () => {
-    const numberOfDays = 2;
-    const startDate = moment().format();
-    const doc = createMockSavedObjectDoc(moment().subtract(1, 'days'), 'some-id');
-    const result = isSavedObjectOlderThan({
-      numberOfDays,
-      startDate,
-      doc,
-    });
-    expect(result).toBe(false);
-  });
-});
+import { createMockSavedObjectDoc } from '../../common/saved_objects.test';
+import { rollUsageCountersIndices } from './rollups';
 
 describe('rollUsageCountersIndices', () => {
   let logger: ReturnType<typeof loggingSystemMock.createLogger>;
@@ -106,7 +47,7 @@ describe('rollUsageCountersIndices', () => {
       createMockSavedObjectDoc(moment().subtract(5, 'days'), 'doc-id-1'),
       createMockSavedObjectDoc(moment().subtract(9, 'days'), 'doc-id-1'),
       createMockSavedObjectDoc(moment().subtract(1, 'days'), 'doc-id-2'),
-      createMockSavedObjectDoc(moment().subtract(6, 'days'), 'doc-id-3'),
+      createMockSavedObjectDoc(moment().subtract(6, 'days'), 'doc-id-3', 'secondary'),
     ];
 
     savedObjectClient.find.mockImplementation(async ({ type, page = 1, perPage = 10 }) => {
@@ -128,7 +69,8 @@ describe('rollUsageCountersIndices', () => {
     expect(savedObjectClient.delete).toHaveBeenNthCalledWith(
       2,
       USAGE_COUNTERS_SAVED_OBJECT_TYPE,
-      'doc-id-3'
+      'doc-id-3',
+      { namespace: 'secondary' }
     );
     expect(logger.warn).toHaveBeenCalledTimes(0);
   });
diff --git a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
index 621b40fb21e9c..a8cdfd92372d7 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/usage_counters/rollups/rollups.ts
@@ -6,35 +6,15 @@
  * Side Public License, v 1.
  */
 
-import type { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 import moment from 'moment';
+import type { ISavedObjectsRepository, Logger } from '@kbn/core/server';
 
 import {
-  UsageCountersSavedObject,
+  type UsageCountersSavedObject,
   USAGE_COUNTERS_SAVED_OBJECT_TYPE,
 } from '@kbn/usage-collection-plugin/server';
 import { USAGE_COUNTERS_KEEP_DOCS_FOR_DAYS } from './constants';
-
-export function isSavedObjectOlderThan({
-  numberOfDays,
-  startDate,
-  doc,
-}: {
-  numberOfDays: number;
-  startDate: moment.Moment | string | number;
-  doc: Pick<UsageCountersSavedObject, 'updated_at'>;
-}): boolean {
-  const { updated_at: updatedAt } = doc;
-  const today = moment(startDate).startOf('day');
-  const updateDay = moment(updatedAt).startOf('day');
-
-  const diffInDays = today.diff(updateDay, 'days');
-  if (diffInDays > numberOfDays) {
-    return true;
-  }
-
-  return false;
-}
+import { isSavedObjectOlderThan } from '../../common/saved_objects';
 
 export async function rollUsageCountersIndices(
   logger: Logger,
@@ -50,6 +30,7 @@ export async function rollUsageCountersIndices(
     const { saved_objects: rawUiCounterDocs } =
       await savedObjectsClient.find<UsageCountersSavedObject>({
         type: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+        namespaces: ['*'],
         perPage: 1000, // Process 1000 at a time as a compromise of speed and overload
       });
 
@@ -62,7 +43,11 @@ export async function rollUsageCountersIndices(
     );
 
     return await Promise.all(
-      docsToDelete.map(({ id }) => savedObjectsClient.delete(USAGE_COUNTERS_SAVED_OBJECT_TYPE, id))
+      docsToDelete.map(({ id, type, namespaces }) =>
+        namespaces?.[0]
+          ? savedObjectsClient.delete(type, id, { namespace: namespaces[0] })
+          : savedObjectsClient.delete(type, id)
+      )
     );
   } catch (err) {
     logger.warn(`Failed to rollup Usage Counters saved objects.`);
diff --git a/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.test.ts b/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.test.ts
index a2ac2366c0b3e..018e179042254 100644
--- a/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.test.ts
+++ b/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.test.ts
@@ -42,15 +42,17 @@ describe('registerEbtCounters', () => {
       code: 'test-code',
       count: 1,
     });
-    expect(usageCollection.getUsageCounterByType).toHaveBeenCalledTimes(1);
-    expect(usageCollection.getUsageCounterByType).toHaveBeenCalledWith('ebt_counters.test-shipper');
+    expect(usageCollection.getUsageCounterByDomainId).toHaveBeenCalledTimes(1);
+    expect(usageCollection.getUsageCounterByDomainId).toHaveBeenCalledWith(
+      'ebt_counters.test-shipper'
+    );
     expect(usageCollection.createUsageCounter).toHaveBeenCalledTimes(1);
     expect(usageCollection.createUsageCounter).toHaveBeenCalledWith('ebt_counters.test-shipper');
   });
 
   test('it reuses the usageCounter when it already exists', () => {
     const incrementCounterMock = jest.fn();
-    usageCollection.getUsageCounterByType.mockReturnValue({
+    usageCollection.getUsageCounterByDomainId.mockReturnValue({
       incrementCounter: incrementCounterMock,
     });
     registerEbtCounters(core.analytics, usageCollection);
@@ -62,8 +64,10 @@ describe('registerEbtCounters', () => {
       code: 'test-code',
       count: 1,
     });
-    expect(usageCollection.getUsageCounterByType).toHaveBeenCalledTimes(1);
-    expect(usageCollection.getUsageCounterByType).toHaveBeenCalledWith('ebt_counters.test-shipper');
+    expect(usageCollection.getUsageCounterByDomainId).toHaveBeenCalledTimes(1);
+    expect(usageCollection.getUsageCounterByDomainId).toHaveBeenCalledWith(
+      'ebt_counters.test-shipper'
+    );
     expect(usageCollection.createUsageCounter).toHaveBeenCalledTimes(0);
     expect(incrementCounterMock).toHaveBeenCalledTimes(1);
     expect(incrementCounterMock).toHaveBeenCalledWith({
diff --git a/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.ts b/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.ts
index ed2100dccf929..b075b198ce496 100644
--- a/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.ts
+++ b/src/plugins/kibana_usage_collection/server/ebt_counters/register_ebt_counters.ts
@@ -18,7 +18,7 @@ export function registerEbtCounters(
     // We create one counter per source ('client'|<shipper_name>).
     const domainId = `ebt_counters.${source}`;
     const usageCounter =
-      usageCollection.getUsageCounterByType(domainId) ??
+      usageCollection.getUsageCounterByDomainId(domainId) ??
       usageCollection.createUsageCounter(domainId);
 
     usageCounter.incrementCounter({
diff --git a/src/plugins/kibana_usage_collection/server/plugin.ts b/src/plugins/kibana_usage_collection/server/plugin.ts
index ff38116c1de44..e2b88b8881f66 100644
--- a/src/plugins/kibana_usage_collection/server/plugin.ts
+++ b/src/plugins/kibana_usage_collection/server/plugin.ts
@@ -72,7 +72,6 @@ export class KibanaUsageCollectionPlugin implements Plugin {
 
   public setup(coreSetup: CoreSetup, { usageCollection }: KibanaUsageCollectionPluginsDepsSetup) {
     registerEbtCounters(coreSetup.analytics, usageCollection);
-    usageCollection.createUsageCounter('uiCounters');
     this.eventLoopUsageCounter = usageCollection.createUsageCounter('eventLoop');
     coreSetup.coreUsageData.registerUsageCounter(usageCollection.createUsageCounter('core'));
     this.registerUsageCollectors(
@@ -127,14 +126,14 @@ export class KibanaUsageCollectionPlugin implements Plugin {
     const getUiSettingsClient = () => this.uiSettingsClient;
     const getCoreUsageDataService = () => this.coreUsageData!;
 
-    registerUiCountersUsageCollector(usageCollection);
+    registerUiCountersUsageCollector(usageCollection, this.logger);
 
     registerUsageCountersRollups(
       this.logger.get('usage-counters-rollup'),
       getSavedObjectsClient,
       pluginStop$
     );
-    registerUsageCountersUsageCollector(usageCollection);
+    registerUsageCountersUsageCollector(usageCollection, this.logger);
 
     registerOpsStatsCollector(usageCollection, metric$);
 
diff --git a/src/plugins/kibana_usage_collection/tsconfig.json b/src/plugins/kibana_usage_collection/tsconfig.json
index 2fb915d541052..84e9a38f3e970 100644
--- a/src/plugins/kibana_usage_collection/tsconfig.json
+++ b/src/plugins/kibana_usage_collection/tsconfig.json
@@ -18,6 +18,7 @@
     "@kbn/core-test-helpers-kbn-server",
     "@kbn/core-usage-data-server",
     "@kbn/core-saved-objects-api-server",
+    "@kbn/core-saved-objects-api-server-internal",
   ],
   "exclude": [
     "target/**/*",
diff --git a/src/plugins/links/common/constants.ts b/src/plugins/links/common/constants.ts
index eeba785bf21cd..fa3eadce5a456 100644
--- a/src/plugins/links/common/constants.ts
+++ b/src/plugins/links/common/constants.ts
@@ -17,3 +17,7 @@ export const APP_ICON = 'link';
 export const APP_NAME = i18n.translate('links.visTypeAlias.title', {
   defaultMessage: 'Links',
 });
+
+export const DISPLAY_NAME = i18n.translate('links.displayName', {
+  defaultMessage: 'links',
+});
diff --git a/src/plugins/links/common/content_management/v1/types.ts b/src/plugins/links/common/content_management/v1/types.ts
index 880bcbc67dd1d..774d76a6553bd 100644
--- a/src/plugins/links/common/content_management/v1/types.ts
+++ b/src/plugins/links/common/content_management/v1/types.ts
@@ -24,7 +24,7 @@ import {
 
 export type LinksCrudTypes = ContentManagementCrudTypes<
   LinksContentType,
-  LinksAttributes,
+  Omit<LinksAttributes, 'title'> & { title: string }, // saved object attributes always have a title
   Pick<SavedObjectCreateOptions, 'references'>,
   Pick<SavedObjectUpdateOptions, 'references'>,
   {
@@ -60,7 +60,7 @@ export type LinksLayoutType = typeof LINKS_HORIZONTAL_LAYOUT | typeof LINKS_VERT
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type LinksAttributes = {
-  title: string;
+  title?: string;
   description?: string;
   links?: Link[];
   layout?: LinksLayoutType;
diff --git a/src/plugins/links/common/embeddable/extract.test.ts b/src/plugins/links/common/embeddable/extract.test.ts
deleted file mode 100644
index 8653a3d650d70..0000000000000
--- a/src/plugins/links/common/embeddable/extract.test.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { extract } from './extract';
-
-test('Should return original state and empty references with by-reference embeddable state', () => {
-  const linksByReferenceInput = {
-    id: '2192e502-0ec7-4316-82fb-c9bbf78525c4',
-    type: 'links',
-  };
-
-  expect(extract!(linksByReferenceInput)).toEqual({
-    state: linksByReferenceInput,
-    references: [],
-  });
-});
-
-test('Should update state with refNames with by-value embeddable state', () => {
-  const linksByValueInput = {
-    id: '8d62c3f0-c61f-4c09-ac24-9b8ee4320e20',
-    attributes: {
-      links: [
-        {
-          type: 'dashboardLink',
-          id: 'fc7b8c70-2eb9-40b2-936d-457d1721a438',
-          destination: 'elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824',
-          order: 0,
-        },
-      ],
-      layout: 'horizontal',
-    },
-    type: 'links',
-  };
-
-  expect(extract!(linksByValueInput)).toEqual({
-    references: [
-      {
-        name: 'link_fc7b8c70-2eb9-40b2-936d-457d1721a438_dashboard',
-        type: 'dashboard',
-        id: 'elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824',
-      },
-    ],
-    state: {
-      id: '8d62c3f0-c61f-4c09-ac24-9b8ee4320e20',
-      attributes: {
-        links: [
-          {
-            type: 'dashboardLink',
-            id: 'fc7b8c70-2eb9-40b2-936d-457d1721a438',
-            destinationRefName: 'link_fc7b8c70-2eb9-40b2-936d-457d1721a438_dashboard',
-            order: 0,
-          },
-        ],
-        layout: 'horizontal',
-      },
-      type: 'links',
-    },
-  });
-});
diff --git a/src/plugins/links/common/embeddable/extract.ts b/src/plugins/links/common/embeddable/extract.ts
deleted file mode 100644
index 5fe842e4316b1..0000000000000
--- a/src/plugins/links/common/embeddable/extract.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/common';
-import type { LinksAttributes } from '../content_management';
-import { extractReferences } from '../persistable_state';
-import { LinksPersistableState } from './types';
-
-export const extract: EmbeddableRegistryDefinition['extract'] = (state) => {
-  const typedState = state as LinksPersistableState;
-
-  // by-reference embeddable
-  if (!('attributes' in typedState) || typedState.attributes === undefined) {
-    // No references to extract for by-reference embeddable since all references are stored with by-reference saved object
-    return { state, references: [] };
-  }
-
-  // by-value embeddable
-  const { attributes, references } = extractReferences({
-    attributes: typedState.attributes as unknown as LinksAttributes,
-  });
-
-  return {
-    state: {
-      ...state,
-      attributes,
-    },
-    references,
-  };
-};
diff --git a/src/plugins/links/common/embeddable/inject.test.ts b/src/plugins/links/common/embeddable/inject.test.ts
deleted file mode 100644
index 4fdef93f8e3a9..0000000000000
--- a/src/plugins/links/common/embeddable/inject.test.ts
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { inject } from './inject';
-
-test('Should return original state with by-reference embeddable state', () => {
-  const linksByReferenceInput = {
-    id: 'ea40fd4e-216c-49a7-917f-f733c8a2c817',
-    type: 'links',
-  };
-
-  const references = [
-    {
-      name: 'panel_ea40fd4e-216c-49a7-917f-f733c8a2c817',
-      type: 'links',
-      id: '7f92d7d0-8e5f-11ec-9477-312c8a6de896',
-    },
-  ];
-
-  expect(inject!(linksByReferenceInput, references)).toEqual(linksByReferenceInput);
-});
-
-test('Should inject refNames with by-value embeddable state', () => {
-  const linksByValueInput = {
-    id: 'c3937cf9-29be-43df-a4af-a4df742d7d35',
-    attributes: {
-      links: [
-        {
-          type: 'dashboardLink',
-          id: 'fc7b8c70-2eb9-40b2-936d-457d1721a438',
-          destinationRefName: 'link_fc7b8c70-2eb9-40b2-936d-457d1721a438_dashboard',
-          order: 0,
-        },
-      ],
-      layout: 'horizontal',
-    },
-    type: 'links',
-  };
-  const references = [
-    {
-      name: 'link_fc7b8c70-2eb9-40b2-936d-457d1721a438_dashboard',
-      type: 'dashboard',
-      id: 'elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824',
-    },
-  ];
-
-  expect(inject!(linksByValueInput, references)).toEqual({
-    id: 'c3937cf9-29be-43df-a4af-a4df742d7d35',
-    attributes: {
-      links: [
-        {
-          type: 'dashboardLink',
-          id: 'fc7b8c70-2eb9-40b2-936d-457d1721a438',
-          destination: 'elastic_agent-1a4e7280-6b5e-11ed-98de-67bdecd21824',
-          order: 0,
-        },
-      ],
-      layout: 'horizontal',
-    },
-    type: 'links',
-  });
-});
diff --git a/src/plugins/links/common/embeddable/inject.ts b/src/plugins/links/common/embeddable/inject.ts
deleted file mode 100644
index 134a508406361..0000000000000
--- a/src/plugins/links/common/embeddable/inject.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EmbeddableRegistryDefinition } from '@kbn/embeddable-plugin/common';
-import { LinksAttributes } from '../content_management';
-import { injectReferences } from '../persistable_state';
-import { LinksPersistableState } from './types';
-
-export const inject: EmbeddableRegistryDefinition['inject'] = (state, references) => {
-  const typedState = state as LinksPersistableState;
-
-  // by-reference embeddable
-  if (!('attributes' in typedState) || typedState.attributes === undefined) {
-    return typedState;
-  }
-
-  // by-value embeddable
-  try {
-    const { attributes: attributesWithInjectedIds } = injectReferences({
-      attributes: typedState.attributes as unknown as LinksAttributes,
-      references,
-    });
-
-    return {
-      ...typedState,
-      attributes: attributesWithInjectedIds,
-    };
-  } catch (error) {
-    // inject exception prevents entire dashboard from display
-    // Instead of throwing, swallow error and let dashboard display
-    // Errors will surface in links panel.
-    // Users can then manually edit links to resolve any problems.
-    return typedState;
-  }
-};
diff --git a/src/plugins/links/common/index.ts b/src/plugins/links/common/index.ts
index 9cb4fc42124aa..85bb10e1da790 100644
--- a/src/plugins/links/common/index.ts
+++ b/src/plugins/links/common/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { APP_ICON, APP_NAME, CONTENT_ID, LATEST_VERSION } from './constants';
+export { APP_ICON, APP_NAME, CONTENT_ID, DISPLAY_NAME, LATEST_VERSION } from './constants';
diff --git a/src/plugins/links/common/mocks.tsx b/src/plugins/links/common/mocks.tsx
deleted file mode 100644
index 299f9edcacdc4..0000000000000
--- a/src/plugins/links/common/mocks.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { buildMockDashboard } from '@kbn/dashboard-plugin/public/mocks';
-import { DashboardContainerInput } from '@kbn/dashboard-plugin/common';
-import { LinksByValueInput } from '../public/embeddable/types';
-import { LinksFactoryDefinition } from '../public';
-import { LinksAttributes } from './content_management';
-
-jest.mock('../public/services/attribute_service', () => {
-  return {
-    getLinksAttributeService: jest.fn(() => {
-      return {
-        saveMethod: jest.fn(),
-        unwrapMethod: jest.fn(),
-        checkForDuplicateTitle: jest.fn(),
-        unwrapAttributes: jest.fn((attributes: LinksByValueInput) => Promise.resolve(attributes)),
-        wrapAttributes: jest.fn((attributes: LinksAttributes) => Promise.resolve(attributes)),
-      };
-    }),
-  };
-});
-
-export const mockLinksInput = (partial?: Partial<LinksByValueInput>): LinksByValueInput => ({
-  id: 'mocked_links_panel',
-  attributes: {
-    title: 'mocked_links',
-  },
-  ...(partial ?? {}),
-});
-
-export const mockLinksPanel = async ({
-  explicitInput,
-  dashboardExplicitInput,
-}: {
-  explicitInput?: Partial<LinksByValueInput>;
-  dashboardExplicitInput?: Partial<DashboardContainerInput>;
-}) => {
-  const dashboardContainer = buildMockDashboard({
-    overrides: dashboardExplicitInput,
-    savedObjectId: '123',
-  });
-  const linksFactoryStub = new LinksFactoryDefinition();
-
-  const links = await linksFactoryStub.create(mockLinksInput(explicitInput), dashboardContainer);
-
-  return links;
-};
diff --git a/src/plugins/links/kibana.jsonc b/src/plugins/links/kibana.jsonc
index a058db8a03ce2..4aed94ab56751 100644
--- a/src/plugins/links/kibana.jsonc
+++ b/src/plugins/links/kibana.jsonc
@@ -14,6 +14,7 @@
       "kibanaReact",
       "kibanaUtils",
       "presentationUtil",
+      "uiActions",
       "uiActionsEnhanced",
       "visualizations"
     ],
diff --git a/src/plugins/links/public/actions/create_links_panel_action.ts b/src/plugins/links/public/actions/create_links_panel_action.ts
new file mode 100644
index 0000000000000..c5b78fe1e318b
--- /dev/null
+++ b/src/plugins/links/public/actions/create_links_panel_action.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { apiIsPresentationContainer } from '@kbn/presentation-containers';
+import { EmbeddableApiContext } from '@kbn/presentation-publishing';
+import { ADD_PANEL_TRIGGER, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
+import { COMMON_EMBEDDABLE_GROUPING } from '@kbn/embeddable-plugin/public';
+import { APP_ICON, APP_NAME, CONTENT_ID } from '../../common';
+import { uiActions } from '../services/kibana_services';
+import { serializeLinksAttributes } from '../lib/serialize_attributes';
+import { LinksSerializedState } from '../types';
+
+const ADD_LINKS_PANEL_ACTION_ID = 'create_links_panel';
+
+export const registerCreateLinksPanelAction = () => {
+  uiActions.registerAction<EmbeddableApiContext>({
+    id: ADD_LINKS_PANEL_ACTION_ID,
+    getIconType: () => APP_ICON,
+    order: 10,
+    isCompatible: async ({ embeddable }) => {
+      return apiIsPresentationContainer(embeddable);
+    },
+    execute: async ({ embeddable }) => {
+      if (!apiIsPresentationContainer(embeddable)) {
+        throw new IncompatibleActionError();
+      }
+      const { openEditorFlyout } = await import('../editor/open_editor_flyout');
+      const runtimeState = await openEditorFlyout({
+        parentDashboard: embeddable,
+      });
+      if (!runtimeState) return;
+
+      const initialState: LinksSerializedState = runtimeState.savedObjectId
+        ? { savedObjectId: runtimeState.savedObjectId }
+        : // We should not extract the references when passing initialState to addNewPanel
+          serializeLinksAttributes(runtimeState, false);
+
+      await embeddable.addNewPanel({
+        panelType: CONTENT_ID,
+        initialState,
+      });
+    },
+    grouping: [COMMON_EMBEDDABLE_GROUPING.annotation],
+    getDisplayName: () => APP_NAME,
+  });
+  uiActions.attachAction(ADD_PANEL_TRIGGER, ADD_LINKS_PANEL_ACTION_ID);
+};
diff --git a/src/plugins/links/public/components/dashboard_link/dashboard_link_component.test.tsx b/src/plugins/links/public/components/dashboard_link/dashboard_link_component.test.tsx
index 84e358fdb381c..1ce99eeaf7e1e 100644
--- a/src/plugins/links/public/components/dashboard_link/dashboard_link_component.test.tsx
+++ b/src/plugins/links/public/components/dashboard_link/dashboard_link_component.test.tsx
@@ -8,79 +8,51 @@
 
 import React from 'react';
 
-import { getDashboardLocatorParamsFromEmbeddable } from '@kbn/dashboard-plugin/public';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 import { DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS } from '@kbn/presentation-util-plugin/public';
-import { createEvent, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { createEvent, fireEvent, render, screen, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import { LINKS_VERTICAL_LAYOUT } from '../../../common/content_management';
-import { mockLinksPanel } from '../../../common/mocks';
-import { LinksContext, LinksEmbeddable } from '../../embeddable/links_embeddable';
 import { DashboardLinkComponent } from './dashboard_link_component';
 import { DashboardLinkStrings } from './dashboard_link_strings';
-import { fetchDashboard } from './dashboard_link_tools';
+import { getMockLinksParentApi } from '../../mocks';
+import { ResolvedLink } from '../../types';
+import { BehaviorSubject } from 'rxjs';
+import { AggregateQuery, Filter, Query, TimeRange } from '@kbn/es-query';
 
-jest.mock('./dashboard_link_tools');
-
-jest.mock('@kbn/dashboard-plugin/public', () => {
-  const originalModule = jest.requireActual('@kbn/dashboard-plugin/public');
-  return {
-    __esModule: true,
-    ...originalModule,
-    getDashboardLocatorParamsFromEmbeddable: jest.fn(),
+function createMockLinksParent({
+  initialQuery,
+  initialFilters,
+}: {
+  initialQuery?: Query | AggregateQuery;
+  initialFilters?: Filter[];
+}) {
+  const parent = {
+    ...getMockLinksParentApi({ savedObjectId: '456' }),
+    locator: {
+      getRedirectUrl: jest.fn().mockReturnValue('https://my-kibana.com/dashboard/123'),
+      navigate: jest.fn(),
+    },
+    getSerializedStateForChild: jest.fn(),
+    query$: new BehaviorSubject<Query | AggregateQuery | undefined>(initialQuery),
+    filters$: new BehaviorSubject<Filter[] | undefined>(initialFilters ?? []),
   };
-});
+  return parent;
+}
 
 describe('Dashboard link component', () => {
-  const mockDashboards = [
-    {
-      id: '456',
-      status: 'success',
-      attributes: {
-        title: 'another dashboard',
-        description: 'something awesome',
-        panelsJSON: [],
-        timeRestore: false,
-        version: '1',
-      },
-    },
-    {
-      id: '123',
-      status: 'success',
-      attributes: {
-        title: 'current dashboard',
-        description: '',
-        panelsJSON: [],
-        timeRestore: false,
-        version: '1',
-      },
-    },
-  ];
-
-  const defaultLinkInfo = {
-    destination: '456',
-    order: 1,
+  const resolvedLink: ResolvedLink = {
     id: 'foo',
-    type: 'dashboardLink' as const,
+    order: 0,
+    type: 'dashboardLink',
+    label: '',
+    destination: '456',
+    title: 'Dashboard 1',
+    description: 'Dashboard 1 description',
   };
 
-  const onLoading = jest.fn();
-  const onRender = jest.fn();
-
-  let linksEmbeddable: LinksEmbeddable;
-  let dashboardContainer: DashboardContainer;
   beforeEach(async () => {
     window.open = jest.fn();
-    (fetchDashboard as jest.Mock).mockResolvedValue(mockDashboards[0]);
-    linksEmbeddable = await mockLinksPanel({
-      dashboardExplicitInput: mockDashboards[1].attributes,
-    });
-    dashboardContainer = linksEmbeddable.parent as DashboardContainer;
-    dashboardContainer.locator = {
-      getRedirectUrl: jest.fn().mockReturnValue('https://my-kibana.com/dashboard/123'),
-      navigate: jest.fn(),
-    };
   });
 
   afterEach(() => {
@@ -88,25 +60,18 @@ describe('Dashboard link component', () => {
   });
 
   test('by default uses navigate to open in same tab', async () => {
+    const parentApi = createMockLinksParent({});
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={defaultLinkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={resolvedLink}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
 
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    expect(fetchDashboard).toHaveBeenCalledWith(defaultLinkInfo.destination);
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-
     // renders dashboard title
-    const link = await screen.findByTestId('dashboardLink--foo');
-    expect(link).toHaveTextContent('another dashboard');
+    const link = screen.getByTestId('dashboardLink--foo');
+    expect(link).toHaveTextContent('Dashboard 1');
 
     // does not render external link icon
     const externalIcon = within(link).queryByText('External link');
@@ -114,27 +79,27 @@ describe('Dashboard link component', () => {
 
     // calls `navigate` on click
     userEvent.click(link);
-    expect(dashboardContainer.locator?.getRedirectUrl).toBeCalledWith({
+    expect(parentApi.locator?.getRedirectUrl).toBeCalledWith({
       dashboardId: '456',
+      filters: [],
+      timeRange: {
+        from: 'now-15m',
+        to: 'now',
+      },
     });
-    expect(dashboardContainer.locator?.navigate).toBeCalledTimes(1);
+    expect(parentApi.locator?.navigate).toBeCalledTimes(1);
   });
 
   test('modified click does not trigger event.preventDefault', async () => {
+    const parentApi = createMockLinksParent({});
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={defaultLinkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={resolvedLink}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--foo');
+    const link = screen.getByTestId('dashboardLink--foo');
     const clickEvent = createEvent.click(link, { ctrlKey: true });
     const preventDefault = jest.spyOn(clickEvent, 'preventDefault');
     fireEvent(link, clickEvent);
@@ -142,159 +107,281 @@ describe('Dashboard link component', () => {
   });
 
   test('openInNewTab uses window.open, not navigateToApp, and renders external icon', async () => {
-    const linkInfo = {
-      ...defaultLinkInfo,
-      options: { ...DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS, openInNewTab: true },
-    };
+    const parentApi = createMockLinksParent({});
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={linkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          options: { ...DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS, openInNewTab: true },
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    expect(fetchDashboard).toHaveBeenCalledWith(linkInfo.destination);
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--foo');
+    const link = screen.getByTestId('dashboardLink--foo');
     expect(link).toBeInTheDocument();
-
     // external link icon is rendered
     const externalIcon = within(link).getByText('External link');
     expect(externalIcon?.getAttribute('data-euiicon-type')).toBe('popout');
 
     // calls `window.open`
     userEvent.click(link);
-    expect(dashboardContainer.locator?.navigate).toBeCalledTimes(0);
+    expect(parentApi.locator?.navigate).toBeCalledTimes(0);
     expect(window.open).toHaveBeenCalledWith('https://my-kibana.com/dashboard/123', '_blank');
   });
 
-  test('passes linkOptions to getDashboardLocatorParamsFromEmbeddable', async () => {
-    const linkInfo = {
-      ...defaultLinkInfo,
-      options: {
-        ...DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS,
-        useCurrentFilters: false,
-        useCurrentTimeRange: false,
-        useCurrentDateRange: false,
+  test('passes query, filters, and timeRange to locator.getRedirectUrl by default', async () => {
+    const initialFilters = [
+      {
+        query: { match_phrase: { foo: 'bar' } },
+        meta: { alias: null, disabled: false, negate: false },
       },
-    };
+    ];
+    const initialQuery = { query: 'fiddlesticks: "*"', language: 'lucene' };
+    const parentApi = createMockLinksParent({
+      initialQuery,
+      initialFilters,
+    });
+
+    parentApi.timeRange$ = new BehaviorSubject<TimeRange | undefined>({
+      from: 'now-7d',
+      to: 'now',
+    });
+
+    render(
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          options: DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS,
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
+    );
+    expect(parentApi.locator?.getRedirectUrl).toBeCalledWith({
+      dashboardId: '456',
+      timeRange: { from: 'now-7d', to: 'now' },
+      filters: initialFilters,
+      query: initialQuery,
+    });
+  });
+
+  test('does not pass timeRange to locator.getRedirectUrl if useCurrentDateRange is false', async () => {
+    const initialFilters = [
+      {
+        query: { match_phrase: { foo: 'bar' } },
+        meta: { alias: null, disabled: false, negate: false },
+      },
+    ];
+    const initialQuery = { query: 'fiddlesticks: "*"', language: 'lucene' };
+    const parentApi = createMockLinksParent({
+      initialQuery,
+      initialFilters,
+    });
+
+    parentApi.timeRange$ = new BehaviorSubject<TimeRange | undefined>({
+      from: 'now-7d',
+      to: 'now',
+    });
+
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={linkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          options: {
+            ...DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS,
+            useCurrentDateRange: false,
+          },
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    expect(getDashboardLocatorParamsFromEmbeddable).toHaveBeenCalledWith(
-      linksEmbeddable,
-      linkInfo.options
+    expect(parentApi.locator?.getRedirectUrl).toBeCalledWith({
+      dashboardId: '456',
+      filters: initialFilters,
+      query: initialQuery,
+    });
+  });
+
+  test('does not pass filters or query to locator.getRedirectUrl if useCurrentFilters is false', async () => {
+    const initialFilters = [
+      {
+        query: { match_phrase: { foo: 'bar' } },
+        meta: { alias: null, disabled: false, negate: false },
+      },
+    ];
+    const initialQuery = { query: 'fiddlesticks: "*"', language: 'lucene' };
+    const parentApi = createMockLinksParent({
+      initialQuery,
+      initialFilters,
+    });
+
+    parentApi.timeRange$ = new BehaviorSubject<TimeRange | undefined>({
+      from: 'now-7d',
+      to: 'now',
+    });
+
+    render(
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          options: {
+            ...DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS,
+            useCurrentFilters: false,
+          },
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
+    expect(parentApi.locator?.getRedirectUrl).toBeCalledWith({
+      dashboardId: '456',
+      timeRange: { from: 'now-7d', to: 'now' },
+      filters: [],
+    });
   });
 
   test('shows an error when fetchDashboard fails', async () => {
-    (fetchDashboard as jest.Mock).mockRejectedValue(new Error('some error'));
-    const linkInfo = {
-      ...defaultLinkInfo,
-      id: 'notfound',
-    };
+    const parentApi = createMockLinksParent({});
+
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={linkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          title: 'Error fetching dashboard',
+          error: new Error('not found'),
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--notfound--error');
+    const link = await screen.findByTestId('dashboardLink--foo--error');
     expect(link).toHaveTextContent(DashboardLinkStrings.getDashboardErrorLabel());
   });
 
   test('current dashboard is not a clickable href', async () => {
-    const linkInfo = {
-      ...defaultLinkInfo,
-      destination: '123',
-      id: 'bar',
-    };
+    const parentApi = createMockLinksParent({});
+    parentApi.savedObjectId = new BehaviorSubject<string | undefined>('123');
+    parentApi.panelTitle = new BehaviorSubject<string | undefined>('current dashboard');
+
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={linkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          destination: '123',
+          id: 'bar',
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--bar');
+
+    const link = screen.getByTestId('dashboardLink--bar');
     expect(link).toHaveTextContent('current dashboard');
     userEvent.click(link);
-    expect(dashboardContainer.locator?.navigate).toBeCalledTimes(0);
+    expect(parentApi.locator?.navigate).toBeCalledTimes(0);
     expect(window.open).toBeCalledTimes(0);
   });
 
   test('shows dashboard title and description in tooltip', async () => {
+    const parentApi = createMockLinksParent({});
+
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={defaultLinkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          title: 'another dashboard',
+          description: 'something awesome',
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--foo');
+
+    const link = screen.getByTestId('dashboardLink--foo');
     userEvent.hover(link);
     const tooltip = await screen.findByTestId('dashboardLink--foo--tooltip');
     expect(tooltip).toHaveTextContent('another dashboard'); // title
     expect(tooltip).toHaveTextContent('something awesome'); // description
   });
 
+  test('current dashboard title updates when parent changes', async () => {
+    const parentApi = {
+      ...createMockLinksParent({}),
+      panelTitle: new BehaviorSubject<string | undefined>('old title'),
+      panelDescription: new BehaviorSubject<string | undefined>('old description'),
+      savedObjectId: new BehaviorSubject<string | undefined>('123'),
+    };
+
+    const { rerender } = render(
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          destination: '123',
+          id: 'bar',
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
+    );
+    expect(await screen.findByTestId('dashboardLink--bar')).toHaveTextContent('old title');
+
+    parentApi.panelTitle.next('new title');
+    rerender(
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          destination: '123',
+          id: 'bar',
+          label: undefined,
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
+    );
+    expect(await screen.findByTestId('dashboardLink--bar')).toHaveTextContent('new title');
+  });
+
   test('can override link label', async () => {
     const label = 'my custom label';
-    const linkInfo = {
-      ...defaultLinkInfo,
-      label,
-    };
+    const parentApi = createMockLinksParent({});
     render(
-      <LinksContext.Provider value={linksEmbeddable}>
-        <DashboardLinkComponent
-          link={linkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onLoading={onLoading}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          label,
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
     );
-    await waitFor(() => expect(onLoading).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(1));
-    await waitFor(() => expect(onRender).toHaveBeenCalledTimes(1));
-    const link = await screen.findByTestId('dashboardLink--foo');
+    const link = screen.getByTestId('dashboardLink--foo');
     expect(link).toHaveTextContent(label);
     userEvent.hover(link);
     const tooltip = await screen.findByTestId('dashboardLink--foo--tooltip');
     expect(tooltip).toHaveTextContent(label);
   });
+
+  test('can override link label for the current dashboard', async () => {
+    const customLabel = 'my new label for the current dashboard';
+    const parentApi = createMockLinksParent({});
+    parentApi.savedObjectId = new BehaviorSubject<string | undefined>('123');
+
+    render(
+      <DashboardLinkComponent
+        link={{
+          ...resolvedLink,
+          destination: '123',
+          id: 'bar',
+          label: customLabel,
+        }}
+        layout={LINKS_VERTICAL_LAYOUT}
+        parentApi={parentApi}
+      />
+    );
+
+    const link = screen.getByTestId('dashboardLink--bar');
+    expect(link).toHaveTextContent(customLabel);
+  });
 });
diff --git a/src/plugins/links/public/components/dashboard_link/dashboard_link_component.tsx b/src/plugins/links/public/components/dashboard_link/dashboard_link_component.tsx
index 202a697cd7160..39e91bfa4c34b 100644
--- a/src/plugins/links/public/components/dashboard_link/dashboard_link_component.tsx
+++ b/src/plugins/links/public/components/dashboard_link/dashboard_link_component.tsx
@@ -7,69 +7,51 @@
  */
 
 import classNames from 'classnames';
-import React, { useEffect, useMemo, useState } from 'react';
-import useAsync from 'react-use/lib/useAsync';
-import useObservable from 'react-use/lib/useObservable';
+import React, { useMemo } from 'react';
 
-import { EuiButtonEmpty, EuiListGroupItem } from '@elastic/eui';
+import { EuiListGroupItem } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
-import {
-  DashboardLocatorParams,
-  getDashboardLocatorParamsFromEmbeddable,
-} from '@kbn/dashboard-plugin/public';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
+import { DashboardLocatorParams } from '@kbn/dashboard-plugin/public';
 import {
   DashboardDrilldownOptions,
   DEFAULT_DASHBOARD_DRILLDOWN_OPTIONS,
 } from '@kbn/presentation-util-plugin/public';
-import type { HasParentApi, PublishesUnifiedSearch } from '@kbn/presentation-publishing';
+import { useBatchedPublishingSubjects } from '@kbn/presentation-publishing';
 
+import { isFilterPinned, Query } from '@kbn/es-query';
 import {
   DASHBOARD_LINK_TYPE,
-  Link,
   LinksLayoutType,
   LINKS_VERTICAL_LAYOUT,
 } from '../../../common/content_management';
 import { trackUiMetric } from '../../services/kibana_services';
-import { useLinks } from '../links_hooks';
 import { DashboardLinkStrings } from './dashboard_link_strings';
-import { fetchDashboard } from './dashboard_link_tools';
+import { LinksParentApi, ResolvedLink } from '../../types';
 
 export const DashboardLinkComponent = ({
   link,
   layout,
-  onLoading,
-  onRender,
+  parentApi,
 }: {
-  link: Link;
+  link: ResolvedLink;
   layout: LinksLayoutType;
-  onLoading: () => void;
-  onRender: () => void;
+  parentApi: LinksParentApi;
 }) => {
-  const linksEmbeddable = useLinks();
-  const [error, setError] = useState<Error | undefined>();
-
-  const dashboardContainer = linksEmbeddable.parent as DashboardContainer;
-  const parentDashboardInput = useObservable(dashboardContainer.getInput$());
-  const parentDashboardId = dashboardContainer.select((state) => state.componentState.lastSavedId);
-
-  /** Fetch the dashboard that the link is pointing to */
-  const { loading: loadingDestinationDashboard, value: destinationDashboard } =
-    useAsync(async () => {
-      if (link.id !== parentDashboardId && link.destination) {
-        /**
-         * only fetch the dashboard if it's not the current dashboard - if it is the current dashboard,
-         * use `dashboardContainer` and its corresponding state (title, description, etc.) instead.
-         */
-        const dashboard = await fetchDashboard(link.destination)
-          .then((result) => {
-            setError(undefined);
-            return result;
-          })
-          .catch((e) => setError(e));
-        return dashboard;
-      }
-    }, [link, parentDashboardId]);
+  const [
+    parentDashboardId,
+    parentDashboardTitle,
+    parentDashboardDescription,
+    timeRange,
+    filters,
+    query,
+  ] = useBatchedPublishingSubjects(
+    parentApi.savedObjectId,
+    parentApi.panelTitle,
+    parentApi.panelDescription,
+    parentApi.timeRange$,
+    parentApi.filters$,
+    parentApi.query$
+  );
 
   /**
    * Returns the title and description of the dashboard that the link points to; note that, if the link points to
@@ -78,9 +60,9 @@ export const DashboardLinkComponent = ({
    */
   const [dashboardTitle, dashboardDescription] = useMemo(() => {
     return link.destination === parentDashboardId
-      ? [parentDashboardInput?.title, parentDashboardInput?.description]
-      : [destinationDashboard?.attributes.title, destinationDashboard?.attributes.description];
-  }, [link.destination, parentDashboardId, parentDashboardInput, destinationDashboard]);
+      ? [parentDashboardTitle, parentDashboardDescription]
+      : [link.title, link.description];
+  }, [link, parentDashboardId, parentDashboardTitle, parentDashboardDescription]);
 
   /**
    * Memoized link information
@@ -90,17 +72,17 @@ export const DashboardLinkComponent = ({
   }, [link, dashboardTitle]);
 
   const { tooltipTitle, tooltipMessage } = useMemo(() => {
-    if (error) {
+    if (link.error) {
       return {
         tooltipTitle: DashboardLinkStrings.getDashboardErrorLabel(),
-        tooltipMessage: error.message,
+        tooltipMessage: link.error.message,
       };
     }
     return {
       tooltipTitle: Boolean(dashboardDescription) ? linkLabel : undefined,
       tooltipMessage: dashboardDescription || linkLabel,
     };
-  }, [error, linkLabel, dashboardDescription]);
+  }, [link, linkLabel, dashboardDescription]);
 
   /**
    * Dashboard-to-dashboard navigation
@@ -116,15 +98,18 @@ export const DashboardLinkComponent = ({
 
     const params: DashboardLocatorParams = {
       dashboardId: link.destination,
-      ...getDashboardLocatorParamsFromEmbeddable(
-        linksEmbeddable as Partial<
-          PublishesUnifiedSearch & HasParentApi<Partial<PublishesUnifiedSearch>>
-        >,
-        linkOptions
-      ),
     };
+    if (linkOptions.useCurrentFilters && query) {
+      params.query = query as Query;
+    }
+
+    if (linkOptions.useCurrentDateRange && timeRange) {
+      params.timeRange = timeRange;
+    }
 
-    const locator = dashboardContainer.locator;
+    params.filters = linkOptions.useCurrentFilters ? filters : filters?.filter(isFilterPinned);
+
+    const locator = parentApi.locator;
     if (!locator) return;
 
     const href = locator.getRedirectUrl(params);
@@ -151,30 +136,24 @@ export const DashboardLinkComponent = ({
         }
       },
     };
-  }, [link, dashboardContainer.locator, linksEmbeddable, parentDashboardId]);
-
-  useEffect(() => {
-    if (loadingDestinationDashboard) {
-      onLoading();
-    } else {
-      onRender();
-    }
-  }, [link, linksEmbeddable, loadingDestinationDashboard, onLoading, onRender]);
+  }, [
+    link.destination,
+    link.options,
+    parentDashboardId,
+    filters,
+    parentApi.locator,
+    query,
+    timeRange,
+  ]);
 
   const id = `dashboardLink--${link.id}`;
 
-  return loadingDestinationDashboard ? (
-    <li id={`${id}--loading`}>
-      <EuiButtonEmpty size="s" isLoading={true} data-test-subj={`${id}--loading`}>
-        {DashboardLinkStrings.getLoadingDashboardLabel()}
-      </EuiButtonEmpty>
-    </li>
-  ) : (
+  return (
     <EuiListGroupItem
       size="s"
       color="text"
       {...onClickProps}
-      id={`dashboardLink--${link.id}`}
+      id={id}
       showToolTip={true}
       toolTipProps={{
         title: tooltipTitle,
@@ -184,17 +163,17 @@ export const DashboardLinkComponent = ({
         delay: 'long',
         'data-test-subj': `${id}--tooltip`,
       }}
-      iconType={error ? 'warning' : undefined}
+      iconType={link.error ? 'warning' : undefined}
       iconProps={{ className: 'dashboardLinkIcon' }}
-      isDisabled={Boolean(error)}
+      isDisabled={Boolean(link.error)}
       className={classNames('linksPanelLink', {
         linkCurrent: link.destination === parentDashboardId,
-        dashboardLinkError: Boolean(error),
+        dashboardLinkError: Boolean(link.error),
         'dashboardLinkError--noLabel': !link.label,
       })}
       label={linkLabel}
       external={link.options?.openInNewTab}
-      data-test-subj={error ? `${id}--error` : `${id}`}
+      data-test-subj={link.error ? `${id}--error` : `${id}`}
       aria-current={link.destination === parentDashboardId}
     />
   );
diff --git a/src/plugins/links/public/components/dashboard_link/dashboard_link_destination_picker.tsx b/src/plugins/links/public/components/dashboard_link/dashboard_link_destination_picker.tsx
index fea0a5239ba0d..8868dd1a2776a 100644
--- a/src/plugins/links/public/components/dashboard_link/dashboard_link_destination_picker.tsx
+++ b/src/plugins/links/public/components/dashboard_link/dashboard_link_destination_picker.tsx
@@ -20,9 +20,8 @@ import {
   EuiFlexGroup,
   EuiComboBoxOptionOption,
 } from '@elastic/eui';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 
-import { DashboardItem } from '../../embeddable/types';
+import { DashboardItem } from '../../types';
 import { DashboardLinkStrings } from './dashboard_link_strings';
 import { fetchDashboard, fetchDashboards } from './dashboard_link_tools';
 
@@ -31,20 +30,18 @@ type DashboardComboBoxOption = EuiComboBoxOptionOption<DashboardItem>;
 export const DashboardLinkDestinationPicker = ({
   onDestinationPicked,
   initialSelection,
-  parentDashboard,
+  parentDashboardId,
   onUnmount,
   ...other
 }: {
   initialSelection?: string;
-  parentDashboard?: DashboardContainer;
+  parentDashboardId?: string;
   onUnmount: (dashboardId?: string) => void;
   onDestinationPicked: (selectedDashboard?: DashboardItem) => void;
 }) => {
   const [searchString, setSearchString] = useState<string>('');
   const [selectedOption, setSelectedOption] = useState<DashboardComboBoxOption[]>([]);
 
-  const parentDashboardId = parentDashboard?.select((state) => state.componentState.lastSavedId);
-
   const getDashboardItem = useCallback((dashboard: DashboardItem) => {
     return {
       key: dashboard.id,
@@ -106,7 +103,7 @@ export const DashboardLinkDestinationPicker = ({
               <EuiBadge>{DashboardLinkStrings.getCurrentDashboardLabel()}</EuiBadge>
             </EuiFlexItem>
           )}
-          <EuiFlexItem className={'linksPanelLinkText'}>
+          <EuiFlexItem className={'linksPanelEditorLinkText'}>
             <EuiHighlight search={searchValue} className={'wrapText'}>
               {label}
             </EuiHighlight>
diff --git a/src/plugins/links/public/components/dashboard_link/dashboard_link_tools.ts b/src/plugins/links/public/components/dashboard_link/dashboard_link_tools.ts
index 9081b17815320..fc9d3f893ade6 100644
--- a/src/plugins/links/public/components/dashboard_link/dashboard_link_tools.ts
+++ b/src/plugins/links/public/components/dashboard_link/dashboard_link_tools.ts
@@ -8,7 +8,7 @@
 
 import { isEmpty, filter } from 'lodash';
 
-import { DashboardItem } from '../../embeddable/types';
+import { DashboardItem } from '../../types';
 import { dashboardServices } from '../../services/kibana_services';
 
 /**
diff --git a/src/plugins/links/public/components/editor/constants.ts b/src/plugins/links/public/components/editor/constants.ts
new file mode 100644
index 0000000000000..a1ce4d742364b
--- /dev/null
+++ b/src/plugins/links/public/components/editor/constants.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import {
+  DASHBOARD_LINK_TYPE,
+  EXTERNAL_LINK_TYPE,
+  LinkType,
+} from '../../../common/content_management';
+import { DashboardLinkStrings } from '../dashboard_link/dashboard_link_strings';
+import { ExternalLinkStrings } from '../external_link/external_link_strings';
+
+export const LinkInfo: {
+  [id in LinkType]: {
+    icon: string;
+    type: string;
+    displayName: string;
+    description: string;
+  };
+} = {
+  [DASHBOARD_LINK_TYPE]: {
+    icon: 'dashboardApp',
+    type: DashboardLinkStrings.getType(),
+    displayName: DashboardLinkStrings.getDisplayName(),
+    description: DashboardLinkStrings.getDescription(),
+  },
+  [EXTERNAL_LINK_TYPE]: {
+    icon: 'link',
+    type: ExternalLinkStrings.getType(),
+    displayName: ExternalLinkStrings.getDisplayName(),
+    description: ExternalLinkStrings.getDescription(),
+  },
+};
diff --git a/src/plugins/links/public/components/editor/link_destination.tsx b/src/plugins/links/public/components/editor/link_destination.tsx
index 5eb2d67a0d882..3337a6c4b2862 100644
--- a/src/plugins/links/public/components/editor/link_destination.tsx
+++ b/src/plugins/links/public/components/editor/link_destination.tsx
@@ -8,8 +8,6 @@
 
 import React, { useState } from 'react';
 
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
-
 import { EuiFormRow } from '@elastic/eui';
 import {
   LinkType,
@@ -24,13 +22,17 @@ import { LinksStrings } from '../links_strings';
 export const LinkDestination = ({
   link,
   setDestination,
-  parentDashboard,
+  parentDashboardId,
   selectedLinkType,
 }: {
   selectedLinkType: LinkType;
-  parentDashboard?: DashboardContainer;
+  parentDashboardId?: string;
   link?: UnorderedLink;
-  setDestination: (destination?: string, defaultLabel?: string) => void;
+  setDestination: (
+    destination?: string,
+    defaultLabel?: string,
+    defaultDescription?: string
+  ) => void;
 }) => {
   const [destinationError, setDestinationError] = useState<string | undefined>();
 
@@ -60,10 +62,14 @@ export const LinkDestination = ({
             setDestination(undefined, undefined);
             if (selectedDashboardId) setDashboardLinkDestination(selectedDashboardId);
           }}
-          parentDashboard={parentDashboard}
+          parentDashboardId={parentDashboardId}
           initialSelection={dashboardLinkDestination}
           onDestinationPicked={(dashboard) =>
-            setDestination(dashboard?.id, dashboard?.attributes.title)
+            setDestination(
+              dashboard?.id,
+              dashboard?.attributes.title,
+              dashboard?.attributes.description
+            )
           }
         />
       ) : (
diff --git a/src/plugins/links/public/components/editor/link_editor.tsx b/src/plugins/links/public/components/editor/link_editor.tsx
index ca3aeda7224bb..47a5d6155d055 100644
--- a/src/plugins/links/public/components/editor/link_editor.tsx
+++ b/src/plugins/links/public/components/editor/link_editor.tsx
@@ -26,17 +26,15 @@ import {
   EuiFlyoutHeader,
   EuiRadioGroupOption,
 } from '@elastic/eui';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 
 import {
   LinkType,
   EXTERNAL_LINK_TYPE,
   DASHBOARD_LINK_TYPE,
   LinkOptions,
-  Link,
 } from '../../../common/content_management';
 import { LinksStrings } from '../links_strings';
-import { LinkInfo } from '../../embeddable/types';
+import { LinkInfo } from './constants';
 import { LinkOptionsComponent } from './link_options';
 import { UnorderedLink } from '../../editor/open_link_editor_flyout';
 import { LinkDestination } from './link_destination';
@@ -45,18 +43,19 @@ export const LinkEditor = ({
   link,
   onSave,
   onClose,
-  parentDashboard,
+  parentDashboardId,
 }: {
   onClose: () => void;
-  parentDashboard?: DashboardContainer;
+  parentDashboardId?: string;
   link?: UnorderedLink; // will only be defined if **editing** a link; otherwise, creating a new link
-  onSave: (newLink: Omit<Link, 'order'>) => void;
+  onSave: (newLink: UnorderedLink) => void;
 }) => {
   const [selectedLinkType, setSelectedLinkType] = useState<LinkType>(
     link?.type ?? DASHBOARD_LINK_TYPE
   );
   const [defaultLinkLabel, setDefaultLinkLabel] = useState<string | undefined>();
   const [currentLinkLabel, setCurrentLinkLabel] = useState<string>(link?.label ?? '');
+  const [linkDescription, setLinkDescription] = useState<string | undefined>();
   const [linkOptions, setLinkOptions] = useState<LinkOptions | undefined>();
   const [linkDestination, setLinkDestination] = useState<string | undefined>(link?.destination);
 
@@ -79,12 +78,13 @@ export const LinkEditor = ({
 
   /** When a new destination is picked, handle the logic for what to display as the current + default labels */
   const handleDestinationPicked = useCallback(
-    (destination?: string, label?: string) => {
+    (destination?: string, label?: string, description?: string) => {
       setLinkDestination(destination);
       if (!currentLinkLabel || defaultLinkLabel === currentLinkLabel) {
         setCurrentLinkLabel(label ?? '');
       }
       setDefaultLinkLabel(label);
+      setLinkDescription(description);
     },
     [defaultLinkLabel, currentLinkLabel]
   );
@@ -124,7 +124,7 @@ export const LinkEditor = ({
           </EuiFormRow>
           <LinkDestination
             link={link}
-            parentDashboard={parentDashboard}
+            parentDashboardId={parentDashboardId}
             selectedLinkType={selectedLinkType}
             setDestination={handleDestinationPicked}
           />
@@ -169,6 +169,8 @@ export const LinkEditor = ({
                     id: link?.id ?? uuidv4(),
                     destination: linkDestination,
                     options: linkOptions,
+                    title: defaultLinkLabel ?? '',
+                    description: linkDescription,
                   });
 
                   onClose();
diff --git a/src/plugins/links/public/components/editor/links_editor.scss b/src/plugins/links/public/components/editor/links_editor.scss
index 3eb0d574ddf27..02961c7d5f5cb 100644
--- a/src/plugins/links/public/components/editor/links_editor.scss
+++ b/src/plugins/links/public/components/editor/links_editor.scss
@@ -30,18 +30,18 @@
     text-decoration: none;
   }
 
-  .linksPanelLinkText {
+  .linksPanelEditorLinkText {
     &:hover {
       text-decoration: underline !important;
     }
   }
 }
 
-.linksPanelLink {
+.linksPanelEditorLink {
   padding: $euiSizeXS $euiSizeS;
   color: $euiTextColor;
 
-  .linksPanelLinkText {
+  .linksPanelEditorLinkText {
     flex: 1;
     min-width: 0;
   }
@@ -49,11 +49,11 @@
   &.linkError {
     border: 1px solid transparentize($euiColorWarningText, .7);
 
-    .linksPanelLinkText {
+    .linksPanelEditorLinkText {
       color: $euiColorWarningText;
     }
 
-    .linksPanelLinkText--noLabel {
+    .linksPanelEditorLinkText--noLabel {
       font-style: italic;
     }
   }
diff --git a/src/plugins/links/public/components/editor/links_editor.test.tsx b/src/plugins/links/public/components/editor/links_editor.test.tsx
index b7c85099cf516..28a76d24471f3 100644
--- a/src/plugins/links/public/components/editor/links_editor.test.tsx
+++ b/src/plugins/links/public/components/editor/links_editor.test.tsx
@@ -11,27 +11,8 @@ import userEvent from '@testing-library/user-event';
 import { render, screen, waitFor } from '@testing-library/react';
 import LinksEditor from './links_editor';
 import { LinksStrings } from '../links_strings';
-import { Link, LINKS_VERTICAL_LAYOUT } from '../../../common/content_management';
-import { fetchDashboard } from '../dashboard_link/dashboard_link_tools';
-
-jest.mock('../dashboard_link/dashboard_link_tools', () => {
-  return {
-    fetchDashboard: jest.fn().mockImplementation((id: string) =>
-      Promise.resolve({
-        id,
-        status: 'success',
-        attributes: {
-          title: `dashboard #${id}`,
-          description: '',
-          panelsJSON: [],
-          timeRestore: false,
-          version: '1',
-        },
-        references: [],
-      })
-    ),
-  };
-});
+import { LINKS_VERTICAL_LAYOUT } from '../../../common/content_management';
+import { ResolvedLink } from '../../types';
 
 describe('LinksEditor', () => {
   const defaultProps = {
@@ -42,30 +23,35 @@ describe('LinksEditor', () => {
     flyoutId: 'test-id',
   };
 
-  const someLinks: Link[] = [
+  const someLinks: ResolvedLink[] = [
     {
       id: 'foo',
       type: 'dashboardLink' as const,
       order: 1,
       destination: '123',
+      title: 'dashboard 01',
     },
     {
       id: 'bar',
       type: 'dashboardLink' as const,
       order: 4,
       destination: '456',
+      title: 'dashboard 02',
+      description: 'awesome dashboard if you ask me',
     },
     {
       id: 'bizz',
       type: 'externalLink' as const,
       order: 3,
       destination: 'http://example.com',
+      title: 'http://example.com',
     },
     {
       id: 'buzz',
       type: 'externalLink' as const,
       order: 2,
       destination: 'http://elastic.co',
+      title: 'Elastic website',
     },
   ];
 
@@ -88,7 +74,6 @@ describe('LinksEditor', () => {
   test('shows links in order', async () => {
     const expectedLinkIds = [...someLinks].sort((a, b) => a.order - b.order).map(({ id }) => id);
     render(<LinksEditor {...defaultProps} initialLinks={someLinks} />);
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(2));
     expect(screen.getByTestId('links--panelEditor--title')).toHaveTextContent(
       LinksStrings.editor.panelEditor.getEditFlyoutTitle()
     );
@@ -103,9 +88,8 @@ describe('LinksEditor', () => {
   test('saving by reference panels calls onSaveToLibrary', async () => {
     const orderedLinks = [...someLinks].sort((a, b) => a.order - b.order);
     render(<LinksEditor {...defaultProps} initialLinks={someLinks} isByReference />);
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(2));
     const saveButton = screen.getByTestId('links--panelEditor--saveBtn');
-    await userEvent.click(saveButton);
+    userEvent.click(saveButton);
     await waitFor(() => expect(defaultProps.onSaveToLibrary).toHaveBeenCalledTimes(1));
     expect(defaultProps.onSaveToLibrary).toHaveBeenCalledWith(orderedLinks, LINKS_VERTICAL_LAYOUT);
   });
@@ -113,9 +97,8 @@ describe('LinksEditor', () => {
   test('saving by value panel calls onAddToDashboard', async () => {
     const orderedLinks = [...someLinks].sort((a, b) => a.order - b.order);
     render(<LinksEditor {...defaultProps} initialLinks={someLinks} isByReference={false} />);
-    await waitFor(() => expect(fetchDashboard).toHaveBeenCalledTimes(2));
     const saveButton = screen.getByTestId('links--panelEditor--saveBtn');
-    await userEvent.click(saveButton);
+    userEvent.click(saveButton);
     expect(defaultProps.onAddToDashboard).toHaveBeenCalledTimes(1);
     expect(defaultProps.onAddToDashboard).toHaveBeenCalledWith(orderedLinks, LINKS_VERTICAL_LAYOUT);
   });
diff --git a/src/plugins/links/public/components/editor/links_editor.tsx b/src/plugins/links/public/components/editor/links_editor.tsx
index bd2da0041499d..736c510c17571 100644
--- a/src/plugins/links/public/components/editor/links_editor.tsx
+++ b/src/plugins/links/public/components/editor/links_editor.tsx
@@ -28,17 +28,14 @@ import {
   EuiSwitch,
   EuiTitle,
 } from '@elastic/eui';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 
 import {
-  Link,
   LinksLayoutType,
   LINKS_HORIZONTAL_LAYOUT,
   LINKS_VERTICAL_LAYOUT,
 } from '../../../common/content_management';
-import { focusMainFlyout, memoizedGetOrderedLinkList } from '../../editor/links_editor_tools';
+import { focusMainFlyout } from '../../editor/links_editor_tools';
 import { openLinkEditorFlyout } from '../../editor/open_link_editor_flyout';
-import { LinksLayoutInfo } from '../../embeddable/types';
 import { coreServices } from '../../services/kibana_services';
 import { LinksStrings } from '../links_strings';
 import { LinksEditorEmptyPrompt } from './links_editor_empty_prompt';
@@ -47,16 +44,18 @@ import { LinksEditorSingleLink } from './links_editor_single_link';
 import { TooltipWrapper } from '../tooltip_wrapper';
 
 import './links_editor.scss';
+import { ResolvedLink } from '../../types';
+import { getOrderedLinkList } from '../../lib/resolve_links';
 
 const layoutOptions: EuiButtonGroupOptionProps[] = [
   {
     id: LINKS_VERTICAL_LAYOUT,
-    label: LinksLayoutInfo[LINKS_VERTICAL_LAYOUT].displayName,
+    label: LinksStrings.editor.panelEditor.getVerticalLayoutLabel(),
     'data-test-subj': `links--panelEditor--${LINKS_VERTICAL_LAYOUT}LayoutBtn`,
   },
   {
     id: LINKS_HORIZONTAL_LAYOUT,
-    label: LinksLayoutInfo[LINKS_HORIZONTAL_LAYOUT].displayName,
+    label: LinksStrings.editor.panelEditor.getHorizontalLayoutLabel(),
     'data-test-subj': `links--panelEditor--${LINKS_HORIZONTAL_LAYOUT}LayoutBtn`,
   },
 ];
@@ -67,16 +66,16 @@ const LinksEditor = ({
   onClose,
   initialLinks,
   initialLayout,
-  parentDashboard,
+  parentDashboardId,
   isByReference,
   flyoutId,
 }: {
-  onSaveToLibrary: (newLinks: Link[], newLayout: LinksLayoutType) => Promise<void>;
-  onAddToDashboard: (newLinks: Link[], newLayout: LinksLayoutType) => void;
+  onSaveToLibrary: (newLinks: ResolvedLink[], newLayout: LinksLayoutType) => Promise<void>;
+  onAddToDashboard: (newLinks: ResolvedLink[], newLayout: LinksLayoutType) => void;
   onClose: () => void;
-  initialLinks?: Link[];
+  initialLinks?: ResolvedLink[];
   initialLayout?: LinksLayoutType;
-  parentDashboard?: DashboardContainer;
+  parentDashboardId?: string;
   isByReference: boolean;
   flyoutId: string; // used to manage the focus of this flyout after individual link editor flyout is closed
 }) => {
@@ -88,8 +87,8 @@ const LinksEditor = ({
     initialLayout ?? LINKS_VERTICAL_LAYOUT
   );
   const [isSaving, setIsSaving] = useState(false);
-  const [orderedLinks, setOrderedLinks] = useState<Link[]>([]);
-  const [saveByReference, setSaveByReference] = useState(!initialLinks ? false : isByReference);
+  const [orderedLinks, setOrderedLinks] = useState<ResolvedLink[]>([]);
+  const [saveByReference, setSaveByReference] = useState(isByReference);
 
   const isEditingExisting = initialLinks || isByReference;
 
@@ -98,7 +97,7 @@ const LinksEditor = ({
       setOrderedLinks([]);
       return;
     }
-    setOrderedLinks(memoizedGetOrderedLinkList(initialLinks));
+    setOrderedLinks(getOrderedLinkList(initialLinks));
   }, [initialLinks]);
 
   const onDragEnd = useCallback(
@@ -116,9 +115,9 @@ const LinksEditor = ({
   );
 
   const addOrEditLink = useCallback(
-    async (linkToEdit?: Link) => {
+    async (linkToEdit?: ResolvedLink) => {
       const newLink = await openLinkEditorFlyout({
-        parentDashboard,
+        parentDashboardId,
         link: linkToEdit,
         mainFlyoutId: flyoutId,
         ref: editLinkFlyoutRef,
@@ -128,17 +127,20 @@ const LinksEditor = ({
           setOrderedLinks(
             orderedLinks.map((link) => {
               if (link.id === linkToEdit.id) {
-                return { ...newLink, order: linkToEdit.order } as Link;
+                return { ...newLink, order: linkToEdit.order } as ResolvedLink;
               }
               return link;
             })
           );
         } else {
-          setOrderedLinks([...orderedLinks, { ...newLink, order: orderedLinks.length } as Link]);
+          setOrderedLinks([
+            ...orderedLinks,
+            { ...newLink, order: orderedLinks.length } as ResolvedLink,
+          ]);
         }
       }
     },
-    [editLinkFlyoutRef, orderedLinks, parentDashboard, flyoutId]
+    [editLinkFlyoutRef, orderedLinks, parentDashboardId, flyoutId]
   );
 
   const hasZeroLinks = useMemo(() => {
@@ -213,7 +215,6 @@ const LinksEditor = ({
                           {(provided) => (
                             <LinksEditorSingleLink
                               link={link}
-                              parentDashboard={parentDashboard}
                               editLink={() => addOrEditLink(link)}
                               deleteLink={() => deleteLink(link.id)}
                               dragHandleProps={provided.dragHandleProps ?? undefined} // casting `null` to `undefined`
diff --git a/src/plugins/links/public/components/editor/links_editor_single_link.tsx b/src/plugins/links/public/components/editor/links_editor_single_link.tsx
index c69c33662c014..e030881334cb0 100644
--- a/src/plugins/links/public/components/editor/links_editor_single_link.tsx
+++ b/src/plugins/links/public/components/editor/links_editor_single_link.tsx
@@ -7,8 +7,7 @@
  */
 
 import classNames from 'classnames';
-import React, { useMemo, useState } from 'react';
-import useAsync from 'react-use/lib/useAsync';
+import React, { useMemo } from 'react';
 
 import {
   EuiText,
@@ -18,74 +17,35 @@ import {
   EuiFlexItem,
   EuiFlexGroup,
   EuiButtonIcon,
-  EuiSkeletonTitle,
   DraggableProvidedDragHandleProps,
 } from '@elastic/eui';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 
-import { LinkInfo } from '../../embeddable/types';
-import { validateUrl } from '../external_link/external_link_tools';
-import { fetchDashboard } from '../dashboard_link/dashboard_link_tools';
+import { LinkInfo } from './constants';
 import { LinksStrings } from '../links_strings';
 import { DashboardLinkStrings } from '../dashboard_link/dashboard_link_strings';
-import { DASHBOARD_LINK_TYPE, Link } from '../../../common/content_management';
+import { DASHBOARD_LINK_TYPE } from '../../../common/content_management';
+import { ResolvedLink } from '../../types';
 
 export const LinksEditorSingleLink = ({
   link,
   editLink,
   deleteLink,
-  parentDashboard,
   dragHandleProps,
 }: {
   editLink: () => void;
   deleteLink: () => void;
-  link: Link;
-  parentDashboard?: DashboardContainer;
+  link: ResolvedLink;
   dragHandleProps?: DraggableProvidedDragHandleProps;
 }) => {
-  const [destinationError, setDestinationError] = useState<Error | undefined>();
-  const parentDashboardTitle = parentDashboard?.select((state) => state.explicitInput.title);
-  const parentDashboardId = parentDashboard?.select((state) => state.componentState.lastSavedId);
-
-  const { value: linkLabel, loading: linkLabelLoading } = useAsync(async () => {
-    if (!link.destination) {
-      setDestinationError(new Error(DashboardLinkStrings.getDashboardErrorLabel()));
-      return;
-    }
-
-    if (link.type === DASHBOARD_LINK_TYPE) {
-      if (parentDashboardId === link.destination) {
-        return link.label || parentDashboardTitle;
-      } else {
-        const dashboard = await fetchDashboard(link.destination)
-          .then((result) => {
-            setDestinationError(undefined);
-            return result;
-          })
-          .catch((error) => setDestinationError(error));
-        return (
-          link.label ||
-          (dashboard ? dashboard.attributes.title : DashboardLinkStrings.getDashboardErrorLabel())
-        );
-      }
-    } else {
-      const { valid, message } = validateUrl(link.destination);
-      if (!valid && message) {
-        setDestinationError(new Error(message));
-      }
-      return link.label || link.destination;
-    }
-  }, [link]);
-
   const LinkLabel = useMemo(() => {
     const labelText = (
       <EuiFlexGroup tabIndex={0} gutterSize="s" responsive={false} wrap={false} alignItems="center">
         <EuiFlexItem grow={false}>
           <EuiIcon
-            type={destinationError ? 'warning' : LinkInfo[link.type].icon}
-            color={destinationError ? 'warning' : 'text'}
+            type={link.error ? 'warning' : LinkInfo[link.type].icon}
+            color={link.error ? 'warning' : 'text'}
             aria-label={
-              destinationError
+              link.error
                 ? LinksStrings.editor.panelEditor.getBrokenDashboardLinkAriaLabel()
                 : LinkInfo[link.type].type
             }
@@ -93,28 +53,21 @@ export const LinksEditorSingleLink = ({
         </EuiFlexItem>
 
         <EuiFlexItem
-          className={classNames('linksPanelLinkText', {
-            'linksPanelLinkText--noLabel': !link.label,
+          className={classNames('linksPanelEditorLinkText', {
+            'linksPanelEditorLinkText--noLabel': !link.label,
           })}
         >
-          <EuiSkeletonTitle
-            size="xxxs"
-            isLoading={linkLabelLoading}
-            announceLoadedStatus={false}
-            announceLoadingStatus={false}
-          >
-            <EuiText size="s" color={'default'} className="eui-textTruncate">
-              {linkLabel}
-            </EuiText>
-          </EuiSkeletonTitle>
+          <EuiText size="s" color={'default'} className="eui-textTruncate">
+            {link.label || link.title}
+          </EuiText>
         </EuiFlexItem>
       </EuiFlexGroup>
     );
 
     return () =>
-      destinationError ? (
+      link.error ? (
         <EuiToolTip
-          content={destinationError.message}
+          content={link.error.message}
           title={
             link.type === DASHBOARD_LINK_TYPE
               ? DashboardLinkStrings.getDashboardErrorLabel()
@@ -126,15 +79,15 @@ export const LinksEditorSingleLink = ({
       ) : (
         labelText
       );
-  }, [linkLabel, linkLabelLoading, destinationError, link.label, link.type]);
+  }, [link]);
 
   return (
     <EuiPanel
       hasBorder
       hasShadow={false}
-      color={destinationError ? 'warning' : 'plain'}
-      className={`linksPanelLink ${destinationError ? 'linkError' : ''}`}
-      data-test-subj={`panelEditorLink${linkLabelLoading ? '--loading' : ''}`}
+      color={link.error ? 'warning' : 'plain'}
+      className={`linksPanelEditorLink ${link.error ? 'linkError' : ''}`}
+      data-test-subj={`panelEditorLink''}`}
     >
       <EuiFlexGroup gutterSize="s" responsive={false} wrap={false} alignItems="center">
         <EuiFlexItem grow={false}>
@@ -148,7 +101,7 @@ export const LinksEditorSingleLink = ({
             <EuiIcon type="grab" />
           </EuiPanel>
         </EuiFlexItem>
-        <EuiFlexItem className="linksPanelLinkText">
+        <EuiFlexItem className="linksPanelEditorLinkText">
           <LinkLabel />
         </EuiFlexItem>
 
@@ -160,7 +113,7 @@ export const LinksEditorSingleLink = ({
                   size="xs"
                   iconType="pencil"
                   onClick={editLink}
-                  aria-label={LinksStrings.editor.getEditLinkTitle(linkLabel)}
+                  aria-label={LinksStrings.editor.getEditLinkTitle(link.title)}
                   data-test-subj="panelEditorLink--editBtn"
                 />
               </EuiToolTip>
@@ -170,7 +123,7 @@ export const LinksEditorSingleLink = ({
                 <EuiButtonIcon
                   size="xs"
                   iconType="trash"
-                  aria-label={LinksStrings.editor.getDeleteLinkTitle(linkLabel)}
+                  aria-label={LinksStrings.editor.getDeleteLinkTitle(link.title)}
                   color="danger"
                   onClick={deleteLink}
                   data-test-subj="panelEditorLink--deleteBtn"
diff --git a/src/plugins/links/public/components/external_link/external_link_component.test.tsx b/src/plugins/links/public/components/external_link/external_link_component.test.tsx
index e0eb0686144b1..9539c5b228295 100644
--- a/src/plugins/links/public/components/external_link/external_link_component.test.tsx
+++ b/src/plugins/links/public/components/external_link/external_link_component.test.tsx
@@ -10,27 +10,23 @@ import React from 'react';
 
 import userEvent from '@testing-library/user-event';
 import { createEvent, fireEvent, render, screen, within } from '@testing-library/react';
-import { LinksEmbeddable, LinksContext } from '../../embeddable/links_embeddable';
-import { mockLinksPanel } from '../../../common/mocks';
 import { LINKS_VERTICAL_LAYOUT } from '../../../common/content_management';
 import { ExternalLinkComponent } from './external_link_component';
 import { coreServices } from '../../services/kibana_services';
 import { DEFAULT_URL_DRILLDOWN_OPTIONS } from '@kbn/ui-actions-enhanced-plugin/public';
-
-const onRender = jest.fn();
+import { ResolvedLink } from '../../types';
 
 describe('external link component', () => {
-  const defaultLinkInfo = {
+  const defaultLinkInfo: ResolvedLink = {
     destination: 'https://example.com',
     order: 1,
     id: 'foo',
     type: 'externalLink' as const,
+    title: 'https://example.com',
   };
 
-  let links: LinksEmbeddable;
   beforeEach(async () => {
     window.open = jest.fn();
-    links = await mockLinksPanel({});
   });
 
   afterEach(() => {
@@ -38,17 +34,8 @@ describe('external link component', () => {
   });
 
   test('by default opens in new tab and renders external icon', async () => {
-    render(
-      <LinksContext.Provider value={links}>
-        <ExternalLinkComponent
-          link={defaultLinkInfo}
-          layout={LINKS_VERTICAL_LAYOUT}
-          onRender={onRender}
-        />
-      </LinksContext.Provider>
-    );
+    render(<ExternalLinkComponent link={defaultLinkInfo} layout={LINKS_VERTICAL_LAYOUT} />);
 
-    expect(onRender).toBeCalledTimes(1);
     const link = await screen.findByTestId('externalLink--foo');
     expect(link).toBeInTheDocument();
     const externalIcon = within(link).getByText('External link');
@@ -62,11 +49,7 @@ describe('external link component', () => {
       ...defaultLinkInfo,
       options: { ...DEFAULT_URL_DRILLDOWN_OPTIONS, openInNewTab: false },
     };
-    render(
-      <LinksContext.Provider value={links}>
-        <ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} onRender={onRender} />
-      </LinksContext.Provider>
-    );
+    render(<ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} />);
     const link = await screen.findByTestId('externalLink--foo');
     const externalIcon = within(link).getByText('External link');
     expect(externalIcon?.getAttribute('data-euiicon-type')).toBe('popout');
@@ -77,12 +60,8 @@ describe('external link component', () => {
       ...defaultLinkInfo,
       options: { ...DEFAULT_URL_DRILLDOWN_OPTIONS, openInNewTab: false },
     };
-    render(
-      <LinksContext.Provider value={links}>
-        <ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} onRender={onRender} />
-      </LinksContext.Provider>
-    );
-    expect(onRender).toBeCalledTimes(1);
+    render(<ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} />);
+
     const link = await screen.findByTestId('externalLink--foo');
     expect(link).toHaveTextContent('https://example.com');
     const clickEvent = createEvent.click(link, { ctrlKey: true });
@@ -96,12 +75,8 @@ describe('external link component', () => {
       ...defaultLinkInfo,
       options: { ...DEFAULT_URL_DRILLDOWN_OPTIONS, openInNewTab: false },
     };
-    render(
-      <LinksContext.Provider value={links}>
-        <ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} onRender={onRender} />
-      </LinksContext.Provider>
-    );
-    expect(onRender).toBeCalledTimes(1);
+    render(<ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} />);
+
     const link = await screen.findByTestId('externalLink--foo');
     userEvent.click(link);
     expect(coreServices.application.navigateToUrl).toBeCalledTimes(1);
@@ -112,14 +87,11 @@ describe('external link component', () => {
     const linkInfo = {
       ...defaultLinkInfo,
       destination: 'file://buzz',
+      error: new Error('URL not supported'),
     };
-    render(
-      <LinksContext.Provider value={links}>
-        <ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} onRender={onRender} />
-      </LinksContext.Provider>
-    );
-    expect(onRender).toBeCalledTimes(1);
-    const link = await screen.findByTestId('externalLink--foo--error');
+    render(<ExternalLinkComponent link={linkInfo} layout={LINKS_VERTICAL_LAYOUT} />);
+
+    const link = screen.getByTestId('externalLink--foo--error');
     expect(link).toBeDisabled();
     /**
      * TODO: We should test the tooltip content, but the component is disabled
diff --git a/src/plugins/links/public/components/external_link/external_link_component.tsx b/src/plugins/links/public/components/external_link/external_link_component.tsx
index d2209efb8f100..c60b97115fbf3 100644
--- a/src/plugins/links/public/components/external_link/external_link_component.tsx
+++ b/src/plugins/links/public/components/external_link/external_link_component.tsx
@@ -6,9 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React, { useMemo, useState } from 'react';
-import useMount from 'react-use/lib/useMount';
-
+import React, { useMemo } from 'react';
 import { EuiListGroupItem } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import {
@@ -18,28 +16,19 @@ import {
 
 import {
   EXTERNAL_LINK_TYPE,
-  Link,
   LinksLayoutType,
   LINKS_VERTICAL_LAYOUT,
 } from '../../../common/content_management';
 import { coreServices, trackUiMetric } from '../../services/kibana_services';
-import { validateUrl } from './external_link_tools';
+import { ResolvedLink } from '../../types';
 
 export const ExternalLinkComponent = ({
   link,
   layout,
-  onRender,
 }: {
-  link: Link;
+  link: ResolvedLink;
   layout: LinksLayoutType;
-  onRender: () => void;
 }) => {
-  const [error, setError] = useState<string | undefined>();
-
-  useMount(() => {
-    onRender();
-  });
-
   const linkOptions = useMemo(() => {
     return {
       ...DEFAULT_URL_DRILLDOWN_OPTIONS,
@@ -47,13 +36,6 @@ export const ExternalLinkComponent = ({
     } as UrlDrilldownOptions;
   }, [link.options]);
 
-  const isValidUrl = useMemo(() => {
-    if (!link.destination) return false;
-    const { valid, message } = validateUrl(link.destination);
-    if (!valid) setError(message);
-    return valid;
-  }, [link.destination]);
-
   const destination = useMemo(() => {
     return link.destination && linkOptions.encodeUrl
       ? encodeURI(link.destination)
@@ -67,20 +49,20 @@ export const ExternalLinkComponent = ({
       size="s"
       external
       color="text"
-      isDisabled={!link.destination || !isValidUrl}
+      isDisabled={Boolean(link.error)}
       className={'linksPanelLink'}
-      showToolTip={!isValidUrl}
+      showToolTip={Boolean(link.error)}
       toolTipProps={{
-        content: error,
+        content: link.error?.message,
         position: layout === LINKS_VERTICAL_LAYOUT ? 'right' : 'bottom',
         repositionOnScroll: true,
         delay: 'long',
         'data-test-subj': `${id}--tooltip`,
       }}
-      iconType={error ? 'warning' : undefined}
+      iconType={link.error ? 'warning' : undefined}
       id={id}
       label={link.label || link.destination}
-      data-test-subj={error ? `${id}--error` : `${id}`}
+      data-test-subj={link.error ? `${id}--error` : `${id}`}
       href={destination}
       onClick={async (event) => {
         if (!destination) return;
diff --git a/src/plugins/links/public/components/links_component.tsx b/src/plugins/links/public/components/links_component.tsx
deleted file mode 100644
index 0da40365abad0..0000000000000
--- a/src/plugins/links/public/components/links_component.tsx
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { EuiListGroup, EuiPanel } from '@elastic/eui';
-import React, { useEffect, useMemo } from 'react';
-import useMap from 'react-use/lib/useMap';
-import {
-  DASHBOARD_LINK_TYPE,
-  LINKS_HORIZONTAL_LAYOUT,
-  LINKS_VERTICAL_LAYOUT,
-} from '../../common/content_management';
-import { memoizedGetOrderedLinkList } from '../editor/links_editor_tools';
-import { DashboardLinkComponent } from './dashboard_link/dashboard_link_component';
-import { ExternalLinkComponent } from './external_link/external_link_component';
-
-import './links_component.scss';
-import { useLinks, useLinksAttributes } from './links_hooks';
-
-export const LinksComponent = () => {
-  const linksEmbeddable = useLinks();
-  const linksAttributes = useLinksAttributes();
-
-  const [linksLoading, { set: setLinkIsLoading }] = useMap(
-    Object.fromEntries(
-      (linksAttributes?.links ?? []).map((link) => {
-        return [link.id, true];
-      })
-    )
-  );
-
-  useEffect(() => {
-    if (Object.values(linksLoading).includes(true)) {
-      linksEmbeddable.onLoading();
-    } else {
-      linksEmbeddable.onRender();
-    }
-  }, [linksLoading, linksEmbeddable]);
-
-  const orderedLinks = useMemo(() => {
-    if (!linksAttributes?.links) return [];
-    return memoizedGetOrderedLinkList(linksAttributes?.links);
-  }, [linksAttributes]);
-
-  const linkItems: { [id: string]: { id: string; content: JSX.Element } } = useMemo(() => {
-    return (linksAttributes?.links ?? []).reduce((prev, currentLink) => {
-      return {
-        ...prev,
-        [currentLink.id]: {
-          id: currentLink.id,
-          content:
-            currentLink.type === DASHBOARD_LINK_TYPE ? (
-              <DashboardLinkComponent
-                key={currentLink.id}
-                link={currentLink}
-                layout={linksAttributes?.layout ?? LINKS_VERTICAL_LAYOUT}
-                onLoading={() => setLinkIsLoading(currentLink.id, true)}
-                onRender={() => setLinkIsLoading(currentLink.id, false)}
-              />
-            ) : (
-              <ExternalLinkComponent
-                key={currentLink.id}
-                link={currentLink}
-                layout={linksAttributes?.layout ?? LINKS_VERTICAL_LAYOUT}
-                onRender={() => setLinkIsLoading(currentLink.id, false)}
-              />
-            ),
-        },
-      };
-    }, {});
-  }, [linksAttributes?.links, linksAttributes?.layout, setLinkIsLoading]);
-
-  return (
-    <EuiPanel
-      className={`linksComponent ${
-        linksAttributes?.layout === LINKS_HORIZONTAL_LAYOUT ? 'eui-xScroll' : 'eui-yScroll'
-      }`}
-      paddingSize="xs"
-      data-test-subj="links--component"
-    >
-      <EuiListGroup
-        maxWidth={false}
-        className={`${linksAttributes?.layout ?? LINKS_VERTICAL_LAYOUT}LayoutWrapper`}
-        data-test-subj="links--component--listGroup"
-      >
-        {orderedLinks.map((link) => linkItems[link.id].content)}
-      </EuiListGroup>
-    </EuiPanel>
-  );
-};
diff --git a/src/plugins/links/public/components/links_hooks.tsx b/src/plugins/links/public/components/links_hooks.tsx
deleted file mode 100644
index aa33c9d0f3ac1..0000000000000
--- a/src/plugins/links/public/components/links_hooks.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { useContext, useEffect, useState } from 'react';
-
-import { LinksAttributes } from '../../common/content_management';
-import { LinksContext, LinksEmbeddable } from '../embeddable/links_embeddable';
-
-export const useLinks = (): LinksEmbeddable => {
-  const linksEmbeddable = useContext<LinksEmbeddable | null>(LinksContext);
-  if (linksEmbeddable == null) {
-    throw new Error('useLinks must be used inside LinksContext.');
-  }
-  return linksEmbeddable!;
-};
-
-export const useLinksAttributes = (): LinksAttributes | undefined => {
-  const linksEmbeddable = useLinks();
-  const [attributes, setAttributes] = useState<LinksAttributes | undefined>(
-    linksEmbeddable.attributes
-  );
-
-  useEffect(() => {
-    const attributesSubscription = linksEmbeddable.attributes$.subscribe((newAttributes) => {
-      setAttributes(newAttributes);
-    });
-    return () => {
-      attributesSubscription.unsubscribe();
-    };
-  }, [linksEmbeddable.attributes$]);
-
-  return attributes;
-};
diff --git a/src/plugins/links/public/components/links_strings.ts b/src/plugins/links/public/components/links_strings.ts
index 8c6f1c888fb12..52b91a81d0054 100644
--- a/src/plugins/links/public/components/links_strings.ts
+++ b/src/plugins/links/public/components/links_strings.ts
@@ -13,6 +13,12 @@ export const LinksStrings = {
     i18n.translate('links.description', {
       defaultMessage: 'Use links to navigate to commonly used dashboards and websites.',
     }),
+  embeddable: {
+    getUnsupportedLinkTypeError: () =>
+      i18n.translate('links.embeddable.unsupportedLinkTypeError', {
+        defaultMessage: 'Unsupported link type',
+      }),
+  },
   editor: {
     getAddButtonLabel: () =>
       i18n.translate('links.editor.addButtonLabel', {
@@ -100,7 +106,7 @@ export const LinksStrings = {
         }),
       getErrorDuringSaveToastTitle: () =>
         i18n.translate('links.editor.unableToSaveToastTitle', {
-          defaultMessage: 'Error saving Link panel',
+          defaultMessage: 'Error saving links panel',
         }),
     },
     linkEditor: {
diff --git a/src/plugins/links/public/content_management/index.ts b/src/plugins/links/public/content_management/index.ts
index c7bc84b8f6b80..42e25c5465256 100644
--- a/src/plugins/links/public/content_management/index.ts
+++ b/src/plugins/links/public/content_management/index.ts
@@ -8,3 +8,5 @@
 
 export { linksClient } from './links_content_management_client';
 export { checkForDuplicateTitle } from './duplicate_title_check';
+export { runSaveToLibrary } from './save_to_library';
+export { loadFromLibrary } from './load_from_library';
diff --git a/src/plugins/links/public/content_management/load_from_library.ts b/src/plugins/links/public/content_management/load_from_library.ts
new file mode 100644
index 0000000000000..5c6e54bb702de
--- /dev/null
+++ b/src/plugins/links/public/content_management/load_from_library.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { injectReferences } from '../../common/persistable_state';
+import { linksClient } from './links_content_management_client';
+
+export async function loadFromLibrary(savedObjectId: string) {
+  const {
+    item: savedObject,
+    meta: { outcome, aliasPurpose, aliasTargetId },
+  } = await linksClient.get(savedObjectId);
+  if (savedObject.error) throw savedObject.error;
+  const { attributes } = injectReferences(savedObject);
+  return {
+    attributes,
+    metaInfo: {
+      sharingSavedObjectProps: {
+        aliasTargetId,
+        outcome,
+        aliasPurpose,
+        sourceId: savedObjectId,
+      },
+    },
+  };
+}
diff --git a/src/plugins/links/public/content_management/save_to_library.tsx b/src/plugins/links/public/content_management/save_to_library.tsx
index e9dba65a532f5..ea731681a7a1a 100644
--- a/src/plugins/links/public/content_management/save_to_library.tsx
+++ b/src/plugins/links/public/content_management/save_to_library.tsx
@@ -14,12 +14,11 @@ import {
   SavedObjectSaveModal,
   SaveResult,
 } from '@kbn/saved-objects-plugin/public';
-
 import { CONTENT_ID } from '../../common';
-import { LinksAttributes } from '../../common/content_management';
-import { LinksByReferenceInput, LinksInput } from '../embeddable/types';
 import { checkForDuplicateTitle } from './duplicate_title_check';
-import { getLinksAttributeService } from '../services/attribute_service';
+import { linksClient } from './links_content_management_client';
+import { LinksRuntimeState } from '../types';
+import { serializeLinksAttributes } from '../lib/serialize_attributes';
 
 const modalTitle = i18n.translate('links.contentManagement.saveModalTitle', {
   defaultMessage: `Save {contentId} panel to library`,
@@ -29,10 +28,9 @@ const modalTitle = i18n.translate('links.contentManagement.saveModalTitle', {
 });
 
 export const runSaveToLibrary = async (
-  newAttributes: LinksAttributes,
-  initialInput: LinksInput
-): Promise<LinksByReferenceInput | undefined> => {
-  return new Promise<LinksByReferenceInput | undefined>((resolve) => {
+  newState: LinksRuntimeState
+): Promise<LinksRuntimeState | undefined> => {
+  return new Promise<LinksRuntimeState | undefined>((resolve, reject) => {
     const onSave = async ({
       newTitle,
       newDescription,
@@ -47,7 +45,7 @@ export const runSaveToLibrary = async (
       if (
         !(await checkForDuplicateTitle({
           title: newTitle,
-          lastSavedTitle: newAttributes.title,
+          lastSavedTitle: newState.title ?? '',
           copyOnSave: false,
           onTitleDuplicate,
           isTitleDuplicateConfirmed,
@@ -56,28 +54,40 @@ export const runSaveToLibrary = async (
         return {};
       }
 
-      const stateToSave = {
-        ...newAttributes,
+      const { attributes, references } = serializeLinksAttributes(newState);
+
+      const newAttributes = {
+        ...attributes,
         ...stateFromSaveModal,
       };
 
-      const updatedInput = (await getLinksAttributeService().wrapAttributes(
-        stateToSave,
-        true,
-        initialInput
-      )) as unknown as LinksByReferenceInput;
-
-      resolve(updatedInput);
-      return { id: updatedInput.savedObjectId };
+      try {
+        const {
+          item: { id },
+        } = await linksClient.create({
+          data: { ...newAttributes, title: newTitle },
+          options: { references },
+        });
+        resolve({
+          ...newState,
+          defaultPanelTitle: newTitle,
+          defaultPanelDescription: newDescription,
+          savedObjectId: id,
+        });
+        return { id };
+      } catch (error) {
+        reject();
+        return { error };
+      }
     };
 
     const saveModal = (
       <SavedObjectSaveModal
         onSave={onSave}
         onClose={() => resolve(undefined)}
-        title={newAttributes.title ?? ''}
+        title={newState.title ?? ''}
         customModalTitle={modalTitle}
-        description={newAttributes.description}
+        description={newState.description}
         showDescription
         showCopyOnSave={false}
         objectType={CONTENT_ID}
diff --git a/src/plugins/links/public/editor/links_editor_tools.tsx b/src/plugins/links/public/editor/links_editor_tools.tsx
index 543d08a48ea91..e89bd2ca18f82 100644
--- a/src/plugins/links/public/editor/links_editor_tools.tsx
+++ b/src/plugins/links/public/editor/links_editor_tools.tsx
@@ -6,29 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { memoize } from 'lodash';
-import { Link } from '../../common/content_management';
-
-const getOrderedLinkList = (links: Link[]): Link[] => {
-  return [...links].sort((linkA, linkB) => {
-    return linkA.order - linkB.order;
-  });
-};
-
-/**
- * Memoizing this prevents the links panel editor from having to unnecessarily calculate this
- * a second time once the embeddable exists - after all, the links component should have already
- * calculated this so, we can get away with using the cached version in the editor
- */
-export const memoizedGetOrderedLinkList = memoize(
-  (links: Link[]) => {
-    return getOrderedLinkList(links);
-  },
-  (links: Link[]) => {
-    return links;
-  }
-);
-
 /**
  * Return focus to the main flyout div to align with a11y standards
  * @param flyoutId ID of the main flyout div element
diff --git a/src/plugins/links/public/editor/open_editor_flyout.tsx b/src/plugins/links/public/editor/open_editor_flyout.tsx
index 8455ca16e604b..7d1a1adf9c478 100644
--- a/src/plugins/links/public/editor/open_editor_flyout.tsx
+++ b/src/plugins/links/public/editor/open_editor_flyout.tsx
@@ -11,17 +11,17 @@ import { skip, take } from 'rxjs';
 import { v4 as uuidv4 } from 'uuid';
 
 import { EuiLoadingSpinner, EuiPanel } from '@elastic/eui';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
 import { toMountPoint } from '@kbn/react-kibana-mount';
 import { withSuspense } from '@kbn/shared-ux-utility';
 
 import { OverlayRef } from '@kbn/core-mount-utils-browser';
 import { tracksOverlays } from '@kbn/presentation-containers';
-import { Link, LinksLayoutType } from '../../common/content_management';
-import { runSaveToLibrary } from '../content_management/save_to_library';
-import { LinksByReferenceInput, LinksEditorFlyoutReturn, LinksInput } from '../embeddable/types';
-import { getLinksAttributeService } from '../services/attribute_service';
+import { apiPublishesSavedObjectId } from '@kbn/presentation-publishing';
+import { LinksLayoutType } from '../../common/content_management';
+import { linksClient, runSaveToLibrary } from '../content_management';
 import { coreServices } from '../services/kibana_services';
+import { LinksRuntimeState, ResolvedLink } from '../types';
+import { serializeLinksAttributes } from '../lib/serialize_attributes';
 
 const LazyLinksEditor = React.lazy(() => import('../components/editor/links_editor'));
 
@@ -35,18 +35,14 @@ const LinksEditor = withSuspense(
 /**
  * @throws in case user cancels
  */
-export async function openEditorFlyout(
-  initialInput: LinksInput,
-  parentDashboard?: DashboardContainer
-): Promise<LinksEditorFlyoutReturn> {
-  const attributeService = getLinksAttributeService();
-  const { attributes } = await attributeService.unwrapAttributes(initialInput);
-  const isByReference = attributeService.inputIsRefType(initialInput);
-  const initialLinks = attributes?.links;
-  const overlayTracker =
-    parentDashboard && tracksOverlays(parentDashboard) ? parentDashboard : undefined;
-
-  if (!initialLinks) {
+export async function openEditorFlyout({
+  initialState,
+  parentDashboard,
+}: {
+  initialState?: LinksRuntimeState;
+  parentDashboard?: unknown;
+}): Promise<LinksRuntimeState | undefined> {
+  if (!initialState) {
     /**
      * When creating a new links panel, the tooltip from the "Add panel" popover interacts badly with the flyout
      * and can cause a "double opening" animation if the flyout opens before the tooltip has time to unmount; so,
@@ -58,6 +54,14 @@ export async function openEditorFlyout(
     await new Promise((resolve) => setTimeout(resolve, 50));
   }
 
+  const overlayTracker =
+    parentDashboard && tracksOverlays(parentDashboard) ? parentDashboard : undefined;
+
+  const parentDashboardId =
+    parentDashboard && apiPublishesSavedObjectId(parentDashboard)
+      ? parentDashboard.savedObjectId.value
+      : undefined;
+
   return new Promise((resolve, reject) => {
     const flyoutId = `linksEditorFlyout-${uuidv4()}`;
 
@@ -77,45 +81,35 @@ export async function openEditorFlyout(
       if (!overlayTracker) editorFlyout.close();
     });
 
-    const onSaveToLibrary = async (newLinks: Link[], newLayout: LinksLayoutType) => {
-      const newAttributes = {
-        ...attributes,
+    const onSaveToLibrary = async (newLinks: ResolvedLink[], newLayout: LinksLayoutType) => {
+      const newState: LinksRuntimeState = {
+        ...initialState,
         links: newLinks,
         layout: newLayout,
       };
-      const updatedInput = (initialInput as LinksByReferenceInput).savedObjectId
-        ? await attributeService.wrapAttributes(newAttributes, true, initialInput)
-        : await runSaveToLibrary(newAttributes, initialInput);
-      if (!updatedInput) {
-        return;
-      }
-      resolve({
-        newInput: updatedInput,
 
-        // pass attributes via attributes so that the Dashboard can choose the right panel size.
-        attributes: newAttributes,
-      });
-      parentDashboard?.reload();
+      if (initialState?.savedObjectId) {
+        const { attributes, references } = serializeLinksAttributes(newState);
+        await linksClient.update({
+          id: initialState.savedObjectId,
+          data: attributes,
+          options: { references },
+        });
+        resolve(newState);
+      } else {
+        const saveResult = await runSaveToLibrary(newState);
+        resolve(saveResult);
+      }
       closeEditorFlyout(editorFlyout);
     };
 
-    const onAddToDashboard = (newLinks: Link[], newLayout: LinksLayoutType) => {
-      const newAttributes = {
-        ...attributes,
+    const onAddToDashboard = (newLinks: ResolvedLink[], newLayout: LinksLayoutType) => {
+      const newState = {
+        ...initialState,
         links: newLinks,
         layout: newLayout,
       };
-      const newInput: LinksInput = {
-        ...initialInput,
-        attributes: newAttributes,
-      };
-      resolve({
-        newInput,
-
-        // pass attributes so that the Dashboard can choose the right panel size.
-        attributes: newAttributes,
-      });
-      parentDashboard?.reload();
+      resolve(newState);
       closeEditorFlyout(editorFlyout);
     };
 
@@ -128,13 +122,13 @@ export async function openEditorFlyout(
       toMountPoint(
         <LinksEditor
           flyoutId={flyoutId}
-          initialLinks={initialLinks}
-          initialLayout={attributes?.layout}
+          initialLinks={initialState?.links}
+          initialLayout={initialState?.layout}
           onClose={onCancel}
           onSaveToLibrary={onSaveToLibrary}
           onAddToDashboard={onAddToDashboard}
-          parentDashboard={parentDashboard}
-          isByReference={isByReference}
+          parentDashboardId={parentDashboardId}
+          isByReference={Boolean(initialState?.savedObjectId)}
         />,
         { theme: coreServices.theme, i18n: coreServices.i18n }
       ),
diff --git a/src/plugins/links/public/editor/open_link_editor_flyout.tsx b/src/plugins/links/public/editor/open_link_editor_flyout.tsx
index d3406264db4ad..e6c931be5aee0 100644
--- a/src/plugins/links/public/editor/open_link_editor_flyout.tsx
+++ b/src/plugins/links/public/editor/open_link_editor_flyout.tsx
@@ -8,18 +8,15 @@
 
 import React from 'react';
 import ReactDOM from 'react-dom';
-
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
-
 import { coreServices } from '../services/kibana_services';
-import { Link } from '../../common/content_management';
 import { LinkEditor } from '../components/editor/link_editor';
 import { focusMainFlyout } from './links_editor_tools';
+import { ResolvedLink } from '../types';
 
 export interface LinksEditorProps {
-  link?: Link;
-  parentDashboard?: DashboardContainer;
+  link?: ResolvedLink;
+  parentDashboardId?: string;
   mainFlyoutId: string;
   ref: React.RefObject<HTMLDivElement>;
 }
@@ -28,7 +25,7 @@ export interface LinksEditorProps {
  * This editor has no context about other links, so it cannot determine order; order will be determined
  * by the **caller** (i.e. the panel editor, which contains the context about **all links**)
  */
-export type UnorderedLink = Omit<Link, 'order'>;
+export type UnorderedLink = Omit<ResolvedLink, 'order'>;
 
 /**
  * @throws in case user cancels
@@ -37,8 +34,8 @@ export async function openLinkEditorFlyout({
   ref,
   link,
   mainFlyoutId, // used to manage the focus of this flyout after inidividual link editor flyout is closed
-  parentDashboard,
-}: LinksEditorProps): Promise<UnorderedLink | undefined> {
+  parentDashboardId,
+}: LinksEditorProps) {
   const unmountFlyout = async () => {
     if (ref.current) {
       ref.current.children[1].className = 'linkEditor out';
@@ -69,7 +66,7 @@ export async function openLinkEditorFlyout({
           link={link}
           onSave={onSave}
           onClose={onCancel}
-          parentDashboard={parentDashboard}
+          parentDashboardId={parentDashboardId}
         />
       </KibanaRenderContextProvider>,
       ref.current
diff --git a/src/plugins/links/public/embeddable/index.ts b/src/plugins/links/public/embeddable/index.ts
deleted file mode 100644
index ab89b768f1285..0000000000000
--- a/src/plugins/links/public/embeddable/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export { LinksEmbeddable } from './links_embeddable';
-export type { LinksFactory } from './links_embeddable_factory';
-export { LinksFactoryDefinition } from './links_embeddable_factory';
diff --git a/src/plugins/links/public/embeddable/links_embeddable.test.tsx b/src/plugins/links/public/embeddable/links_embeddable.test.tsx
new file mode 100644
index 0000000000000..73de5b8237df5
--- /dev/null
+++ b/src/plugins/links/public/embeddable/links_embeddable.test.tsx
@@ -0,0 +1,364 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import React from 'react';
+import { render, screen, waitFor } from '@testing-library/react';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { setStubKibanaServices } from '@kbn/presentation-panel-plugin/public/mocks';
+import { getLinksEmbeddableFactory } from './links_embeddable';
+import { Link } from '../../common/content_management';
+import { CONTENT_ID } from '../../common';
+import { ReactEmbeddableRenderer } from '@kbn/embeddable-plugin/public';
+import {
+  LinksApi,
+  LinksParentApi,
+  LinksRuntimeState,
+  LinksSerializedState,
+  ResolvedLink,
+} from '../types';
+import { linksClient } from '../content_management';
+import { getMockLinksParentApi } from '../mocks';
+
+const links: Link[] = [
+  {
+    id: '001',
+    order: 0,
+    type: 'dashboardLink',
+    label: '',
+    destinationRefName: 'link_001_dashboard',
+  },
+  {
+    id: '002',
+    order: 1,
+    type: 'dashboardLink',
+    label: 'Dashboard 2',
+    destinationRefName: 'link_002_dashboard',
+  },
+  {
+    id: '003',
+    order: 2,
+    type: 'externalLink',
+    label: 'Example homepage',
+    destination: 'https://example.com',
+  },
+  {
+    id: '004',
+    order: 3,
+    type: 'externalLink',
+    destination: 'https://elastic.co',
+  },
+];
+
+const resolvedLinks: ResolvedLink[] = [
+  {
+    id: '001',
+    order: 0,
+    type: 'dashboardLink',
+    label: '',
+    destination: '999',
+    title: 'Dashboard 1',
+    description: 'Dashboard 1 description',
+  },
+  {
+    id: '002',
+    order: 1,
+    type: 'dashboardLink',
+    label: 'Dashboard 2',
+    destination: '888',
+    title: 'Dashboard 2',
+    description: 'Dashboard 2 description',
+  },
+  {
+    id: '003',
+    order: 2,
+    type: 'externalLink',
+    label: 'Example homepage',
+    destination: 'https://example.com',
+    title: 'Example homepage',
+  },
+  {
+    id: '004',
+    order: 3,
+    type: 'externalLink',
+    destination: 'https://elastic.co',
+    title: 'https://elastic.co',
+  },
+];
+
+const references = [
+  {
+    id: '999',
+    name: 'link_001_dashboard',
+    type: 'dashboard',
+  },
+  {
+    id: '888',
+    name: 'link_002_dashboard',
+    type: 'dashboard',
+  },
+];
+
+jest.mock('../lib/resolve_links', () => {
+  return {
+    resolveLinks: jest.fn().mockResolvedValue(resolvedLinks),
+  };
+});
+
+jest.mock('../content_management', () => {
+  return {
+    loadFromLibrary: jest.fn((savedObjectId) => {
+      return Promise.resolve({
+        attributes: {
+          title: 'links 001',
+          description: 'some links',
+          links,
+          layout: 'vertical',
+        },
+        metaInfo: {
+          sharingSavedObjectProps: {
+            aliasTargetId: '123',
+            outcome: 'exactMatch',
+            aliasPurpose: 'sharing',
+            sourceId: savedObjectId,
+          },
+        },
+      });
+    }),
+    linksClient: {
+      create: jest.fn().mockResolvedValue({ item: { id: '333' } }),
+      update: jest.fn().mockResolvedValue({ item: { id: '123' } }),
+    },
+  };
+});
+
+describe('getLinksEmbeddableFactory', () => {
+  const factory = getLinksEmbeddableFactory();
+  beforeAll(() => {
+    const embeddable = embeddablePluginMock.createSetupContract();
+    embeddable.registerReactEmbeddableFactory(CONTENT_ID, async () => {
+      return factory;
+    });
+    setStubKibanaServices();
+  });
+
+  describe('by reference embeddable', () => {
+    const rawState = {
+      savedObjectId: '123',
+      title: 'my links',
+      description: 'just a few links',
+    } as LinksSerializedState;
+
+    const expectedRuntimeState = {
+      defaultPanelTitle: 'links 001',
+      defaultPanelDescription: 'some links',
+      layout: 'vertical',
+      links: resolvedLinks,
+      description: 'just a few links',
+      title: 'my links',
+      savedObjectId: '123',
+    };
+
+    let parent: LinksParentApi;
+
+    beforeEach(() => {
+      parent = getMockLinksParentApi(rawState, references);
+    });
+
+    test('deserializeState', async () => {
+      const deserializedState = await factory.deserializeState({
+        rawState,
+        references,
+      });
+      expect(deserializedState).toEqual({
+        ...expectedRuntimeState,
+      });
+    });
+
+    test('component renders', async () => {
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksApi>
+          type={CONTENT_ID}
+          getParentApi={() => parent}
+        />
+      );
+
+      expect(await screen.findByTestId('links--component')).toBeInTheDocument();
+    });
+
+    test('api methods', async () => {
+      const onApiAvailable = jest.fn() as jest.MockedFunction<(api: LinksApi) => void>;
+
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksRuntimeState, LinksApi>
+          type={CONTENT_ID}
+          onApiAvailable={onApiAvailable}
+          getParentApi={() => parent}
+        />
+      );
+
+      await waitFor(async () => {
+        const api = onApiAvailable.mock.calls[0][0];
+        expect(await api.serializeState()).toEqual({
+          rawState: {
+            savedObjectId: '123',
+            title: 'my links',
+            description: 'just a few links',
+            hidePanelTitles: undefined,
+          },
+          references: [],
+        });
+        expect(api.libraryId$.value).toBe('123');
+        expect(api.defaultPanelTitle!.value).toBe('links 001');
+        expect(api.defaultPanelDescription!.value).toBe('some links');
+      });
+    });
+
+    test('unlink from library', async () => {
+      const onApiAvailable = jest.fn() as jest.MockedFunction<(api: LinksApi) => void>;
+
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksRuntimeState, LinksApi>
+          type={CONTENT_ID}
+          onApiAvailable={onApiAvailable}
+          getParentApi={() => parent}
+        />
+      );
+
+      await waitFor(async () => {
+        const api = onApiAvailable.mock.calls[0][0];
+        api.unlinkFromLibrary();
+        expect(await api.serializeState()).toEqual({
+          rawState: {
+            title: 'my links',
+            description: 'just a few links',
+            hidePanelTitles: undefined,
+            attributes: {
+              description: 'some links',
+              title: 'links 001',
+              links,
+              layout: 'vertical',
+            },
+          },
+          references,
+        });
+        expect(api.libraryId$.value).toBeUndefined();
+      });
+    });
+  });
+
+  describe('by value embeddable', () => {
+    const rawState = {
+      attributes: {
+        links,
+        layout: 'horizontal',
+      },
+      description: 'just a few links',
+      title: 'my links',
+    } as LinksSerializedState;
+
+    const expectedRuntimeState = {
+      defaultPanelTitle: undefined,
+      defaultPanelDescription: undefined,
+      layout: 'horizontal',
+      links: resolvedLinks,
+      description: 'just a few links',
+      title: 'my links',
+      savedObjectId: undefined,
+    };
+
+    let parent: LinksParentApi;
+
+    beforeEach(() => {
+      parent = getMockLinksParentApi(rawState, references);
+    });
+
+    test('deserializeState', async () => {
+      const deserializedState = await factory.deserializeState({
+        rawState,
+        references,
+      });
+      expect(deserializedState).toEqual({ ...expectedRuntimeState, layout: 'horizontal' });
+    });
+
+    test('component renders', async () => {
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksApi>
+          type={CONTENT_ID}
+          getParentApi={() => parent}
+        />
+      );
+
+      expect(await screen.findByTestId('links--component')).toBeInTheDocument();
+    });
+
+    test('api methods', async () => {
+      const onApiAvailable = jest.fn() as jest.MockedFunction<(api: LinksApi) => void>;
+
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksRuntimeState, LinksApi>
+          type={CONTENT_ID}
+          onApiAvailable={onApiAvailable}
+          getParentApi={() => parent}
+        />
+      );
+
+      await waitFor(async () => {
+        const api = onApiAvailable.mock.calls[0][0];
+        expect(await api.serializeState()).toEqual({
+          rawState: {
+            title: 'my links',
+            description: 'just a few links',
+            hidePanelTitles: undefined,
+            attributes: {
+              links,
+              layout: 'horizontal',
+            },
+          },
+          references,
+        });
+
+        expect(api.libraryId$.value).toBeUndefined();
+      });
+    });
+    test('save to library', async () => {
+      const onApiAvailable = jest.fn() as jest.MockedFunction<(api: LinksApi) => void>;
+
+      render(
+        <ReactEmbeddableRenderer<LinksSerializedState, LinksRuntimeState, LinksApi>
+          type={CONTENT_ID}
+          onApiAvailable={onApiAvailable}
+          getParentApi={() => parent}
+        />
+      );
+
+      await waitFor(async () => {
+        const api = onApiAvailable.mock.calls[0][0];
+        const newId = await api.saveToLibrary('some new title');
+        expect(linksClient.create).toHaveBeenCalledWith({
+          data: {
+            title: 'some new title',
+            links,
+            layout: 'horizontal',
+          },
+          options: { references },
+        });
+        expect(newId).toBe('333');
+        expect(api.libraryId$.value).toBe('333');
+        expect(await api.serializeState()).toEqual({
+          rawState: {
+            savedObjectId: '333',
+            title: 'my links',
+            description: 'just a few links',
+            hidePanelTitles: undefined,
+          },
+          references: [],
+        });
+      });
+    });
+  });
+});
diff --git a/src/plugins/links/public/embeddable/links_embeddable.tsx b/src/plugins/links/public/embeddable/links_embeddable.tsx
index 523d8706b2b86..0a5b98a7ce3be 100644
--- a/src/plugins/links/public/embeddable/links_embeddable.tsx
+++ b/src/plugins/links/public/embeddable/links_embeddable.tsx
@@ -6,155 +6,271 @@
  * Side Public License, v 1.
  */
 
-import deepEqual from 'fast-deep-equal';
-import React, { createContext } from 'react';
-import { unmountComponentAtNode } from 'react-dom';
-import { distinctUntilChanged, skip, Subject, Subscription, switchMap } from 'rxjs';
+import React, { createContext, useMemo } from 'react';
+import { cloneDeep } from 'lodash';
+import { BehaviorSubject } from 'rxjs';
+import fastIsEqual from 'fast-deep-equal';
+import { EuiListGroup, EuiPanel } from '@elastic/eui';
 
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
+import { PanelIncompatibleError, ReactEmbeddableFactory } from '@kbn/embeddable-plugin/public';
 import {
-  AttributeService,
-  Embeddable,
-  ReferenceOrValueEmbeddable,
-  SavedObjectEmbeddableInput,
-  COMMON_EMBEDDABLE_GROUPING,
-} from '@kbn/embeddable-plugin/public';
-
-import { CONTENT_ID } from '../../common';
-import { LinksAttributes } from '../../common/content_management';
-import { LinksComponent } from '../components/links_component';
-import { LinksByReferenceInput, LinksByValueInput, LinksInput, LinksOutput } from './types';
-
-export const LinksContext = createContext<LinksEmbeddable | null>(null);
-
-export interface LinksConfig {
-  editable: boolean;
-}
-
-export class LinksEmbeddable
-  extends Embeddable<LinksInput, LinksOutput>
-  implements ReferenceOrValueEmbeddable<LinksByValueInput, LinksByReferenceInput>
-{
-  public readonly type = CONTENT_ID;
-  deferEmbeddableLoad = true;
-
-  private domNode?: HTMLElement;
-  private isDestroyed?: boolean;
-  private subscriptions: Subscription = new Subscription();
-
-  public attributes?: LinksAttributes;
-  public attributes$ = new Subject<LinksAttributes>();
-
-  public grouping = [COMMON_EMBEDDABLE_GROUPING.annotation];
-
-  constructor(
-    config: LinksConfig,
-    initialInput: LinksInput,
-    private attributeService: AttributeService<LinksAttributes>,
-    parent?: DashboardContainer
-  ) {
-    super(
-      initialInput,
-      {
-        editable: config.editable,
-        editableWithExplicitInput: true,
-      },
-      parent
-    );
-
-    this.initializeSavedLinks()
-      .then(() => this.setInitializationFinished())
-      .catch((e: Error) => this.onFatalError(e));
-
-    // By-value panels should update the links attributes when input changes
-    this.subscriptions.add(
-      this.getInput$()
-        .pipe(
-          distinctUntilChanged(deepEqual),
-          skip(1),
-          switchMap(async () => await this.initializeSavedLinks())
-        )
-        .subscribe()
-    );
-
-    // Keep attributes in sync with subject value so it can be used in output
-    this.subscriptions.add(
-      this.attributes$.pipe(distinctUntilChanged(deepEqual)).subscribe((attributes) => {
-        this.attributes = attributes;
-      })
-    );
-  }
-
-  private async initializeSavedLinks() {
-    const { attributes } = await this.attributeService.unwrapAttributes(this.getInput());
-    this.attributes$.next(attributes);
-    await this.initializeOutput();
-  }
-
-  private async initializeOutput() {
-    const { title, description } = this.getInput();
-    this.updateOutput({
-      defaultTitle: this.attributes?.title,
-      defaultDescription: this.attributes?.description,
-      title: title ?? this.attributes?.title,
-      description: description ?? this.attributes?.description,
-    });
-  }
-
-  public onRender() {
-    this.renderComplete.dispatchComplete();
-  }
-
-  public onLoading() {
-    this.renderComplete.dispatchInProgress();
-  }
-
-  public inputIsRefType(
-    input: LinksByValueInput | LinksByReferenceInput
-  ): input is LinksByReferenceInput {
-    return this.attributeService.inputIsRefType(input);
-  }
-
-  public async getInputAsRefType(): Promise<SavedObjectEmbeddableInput> {
-    return this.attributeService.getInputAsRefType(this.getExplicitInput(), {
-      showSaveModal: true,
-      saveModalTitle: this.getTitle(),
-    });
-  }
-
-  public async getInputAsValueType(): Promise<LinksByValueInput> {
-    return this.attributeService.getInputAsValueType(this.getExplicitInput());
-  }
-
-  public async reload() {
-    if (this.isDestroyed) return;
-    // By-reference embeddable panels are reloaded when changed, so update the attributes
-    this.initializeSavedLinks();
-    if (this.domNode) {
-      this.render(this.domNode);
-    }
-  }
-
-  public destroy() {
-    this.isDestroyed = true;
-    super.destroy();
-    this.subscriptions.unsubscribe();
-    if (this.domNode) {
-      unmountComponentAtNode(this.domNode);
-    }
-  }
-
-  public render(domNode: HTMLElement) {
-    this.domNode = domNode;
-    if (this.isDestroyed) return;
-    super.render(domNode);
-
-    this.domNode.setAttribute('data-shared-item', '');
-
-    return (
-      <LinksContext.Provider value={this}>
-        <LinksComponent />
-      </LinksContext.Provider>
-    );
-  }
-}
+  apiPublishesPanelDescription,
+  apiPublishesPanelTitle,
+  apiPublishesSavedObjectId,
+  initializeTitles,
+  useBatchedOptionalPublishingSubjects,
+} from '@kbn/presentation-publishing';
+
+import { apiIsPresentationContainer, SerializedPanelState } from '@kbn/presentation-containers';
+
+import {
+  CONTENT_ID,
+  DASHBOARD_LINK_TYPE,
+  LinksLayoutType,
+  LINKS_HORIZONTAL_LAYOUT,
+  LINKS_VERTICAL_LAYOUT,
+} from '../../common/content_management';
+import { DashboardLinkComponent } from '../components/dashboard_link/dashboard_link_component';
+import { ExternalLinkComponent } from '../components/external_link/external_link_component';
+import {
+  LinksApi,
+  LinksByReferenceSerializedState,
+  LinksByValueSerializedState,
+  LinksParentApi,
+  LinksRuntimeState,
+  LinksSerializedState,
+  ResolvedLink,
+} from '../types';
+import { DISPLAY_NAME } from '../../common';
+import { injectReferences } from '../../common/persistable_state';
+
+import '../components/links_component.scss';
+import { checkForDuplicateTitle, linksClient } from '../content_management';
+import { resolveLinks } from '../lib/resolve_links';
+import {
+  deserializeLinksSavedObject,
+  linksSerializeStateIsByReference,
+} from '../lib/deserialize_from_library';
+import { serializeLinksAttributes } from '../lib/serialize_attributes';
+
+export const LinksContext = createContext<LinksApi | null>(null);
+
+const isParentApiCompatible = (parentApi: unknown): parentApi is LinksParentApi =>
+  apiIsPresentationContainer(parentApi) &&
+  apiPublishesSavedObjectId(parentApi) &&
+  apiPublishesPanelTitle(parentApi) &&
+  apiPublishesPanelDescription(parentApi);
+
+export const getLinksEmbeddableFactory = () => {
+  const linksEmbeddableFactory: ReactEmbeddableFactory<
+    LinksSerializedState,
+    LinksRuntimeState,
+    LinksApi
+  > = {
+    type: CONTENT_ID,
+    deserializeState: async (serializedState) => {
+      // Clone the state to avoid an object not extensible error when injecting references
+      const state = cloneDeep(serializedState.rawState);
+      const { title, description } = serializedState.rawState;
+
+      if (linksSerializeStateIsByReference(state)) {
+        const attributes = await deserializeLinksSavedObject(state);
+        return {
+          ...attributes,
+          title,
+          description,
+        };
+      }
+
+      const { attributes: attributesWithInjectedIds } = injectReferences({
+        attributes: state.attributes,
+        references: serializedState.references ?? [],
+      });
+
+      const resolvedLinks = await resolveLinks(attributesWithInjectedIds.links ?? []);
+
+      return {
+        title,
+        description,
+        links: resolvedLinks,
+        layout: attributesWithInjectedIds.layout,
+        defaultPanelTitle: attributesWithInjectedIds.title,
+        defaultPanelDescription: attributesWithInjectedIds.description,
+      };
+    },
+    buildEmbeddable: async (state, buildApi, uuid, parentApi) => {
+      const error$ = new BehaviorSubject<Error | undefined>(state.error);
+      if (!isParentApiCompatible(parentApi)) error$.next(new PanelIncompatibleError());
+
+      const links$ = new BehaviorSubject<ResolvedLink[] | undefined>(state.links);
+      const layout$ = new BehaviorSubject<LinksLayoutType | undefined>(state.layout);
+      const defaultPanelTitle = new BehaviorSubject<string | undefined>(state.defaultPanelTitle);
+      const defaultPanelDescription = new BehaviorSubject<string | undefined>(
+        state.defaultPanelDescription
+      );
+      const savedObjectId$ = new BehaviorSubject(state.savedObjectId);
+      const { titlesApi, titleComparators, serializeTitles } = initializeTitles(state);
+
+      const api = buildApi(
+        {
+          ...titlesApi,
+          blockingError: error$,
+          defaultPanelTitle,
+          defaultPanelDescription,
+          isEditingEnabled: () => Boolean(error$.value === undefined),
+          libraryId$: savedObjectId$,
+          getTypeDisplayName: () => DISPLAY_NAME,
+          getByValueRuntimeSnapshot: () => {
+            const snapshot = api.snapshotRuntimeState();
+            delete snapshot.savedObjectId;
+            return snapshot;
+          },
+          serializeState: async (): Promise<SerializedPanelState<LinksSerializedState>> => {
+            if (savedObjectId$.value !== undefined) {
+              const linksByReferenceState: LinksByReferenceSerializedState = {
+                savedObjectId: savedObjectId$.value,
+                ...serializeTitles(),
+              };
+              return { rawState: linksByReferenceState, references: [] };
+            }
+            const runtimeState = api.snapshotRuntimeState();
+            const { attributes, references } = serializeLinksAttributes(runtimeState);
+            const linksByValueState: LinksByValueSerializedState = {
+              attributes,
+              ...serializeTitles(),
+            };
+            return { rawState: linksByValueState, references };
+          },
+          saveToLibrary: async (newTitle: string) => {
+            defaultPanelTitle.next(newTitle);
+            const runtimeState = api.snapshotRuntimeState();
+            const { attributes, references } = serializeLinksAttributes(runtimeState);
+            const {
+              item: { id },
+            } = await linksClient.create({
+              data: {
+                ...attributes,
+                title: newTitle,
+              },
+              options: { references },
+            });
+            savedObjectId$.next(id);
+            return id;
+          },
+          checkForDuplicateTitle: async (
+            newTitle: string,
+            isTitleDuplicateConfirmed: boolean,
+            onTitleDuplicate: () => void
+          ) => {
+            await checkForDuplicateTitle({
+              title: newTitle,
+              copyOnSave: false,
+              lastSavedTitle: '',
+              isTitleDuplicateConfirmed,
+              onTitleDuplicate,
+            });
+          },
+          unlinkFromLibrary: () => {
+            savedObjectId$.next(undefined);
+          },
+          onEdit: async () => {
+            try {
+              const { openEditorFlyout } = await import('../editor/open_editor_flyout');
+              const newState = await openEditorFlyout({
+                initialState: api.snapshotRuntimeState(),
+                parentDashboard: parentApi,
+              });
+              if (newState) {
+                links$.next(newState.links);
+                layout$.next(newState.layout);
+                defaultPanelTitle.next(newState.defaultPanelTitle);
+                defaultPanelDescription.next(newState.defaultPanelDescription);
+                savedObjectId$.next(newState.savedObjectId);
+              }
+            } catch {
+              // do nothing, user cancelled
+            }
+          },
+        },
+        {
+          ...titleComparators,
+          links: [
+            links$,
+            (nextLinks?: ResolvedLink[]) => links$.next(nextLinks ?? []),
+            (a, b) => Boolean(savedObjectId$.value) || fastIsEqual(a, b), // Editing attributes in a by-reference panel should not trigger unsaved changes.
+          ],
+          layout: [
+            layout$,
+            (nextLayout?: LinksLayoutType) => layout$.next(nextLayout ?? LINKS_VERTICAL_LAYOUT),
+            (a, b) => Boolean(savedObjectId$.value) || a === b,
+          ],
+          error: [error$, (nextError?: Error) => error$.next(nextError)],
+          defaultPanelDescription: [
+            defaultPanelDescription,
+            (nextDescription?: string) => defaultPanelDescription.next(nextDescription),
+          ],
+          defaultPanelTitle: [
+            defaultPanelTitle,
+            (nextTitle?: string) => defaultPanelTitle.next(nextTitle),
+          ],
+          savedObjectId: [savedObjectId$, (val) => savedObjectId$.next(val)],
+        }
+      );
+
+      const Component = () => {
+        const [links, layout] = useBatchedOptionalPublishingSubjects(links$, layout$);
+
+        const linkItems: { [id: string]: { id: string; content: JSX.Element } } = useMemo(() => {
+          if (!links) return {};
+          return links.reduce((prev, currentLink) => {
+            return {
+              ...prev,
+              [currentLink.id]: {
+                id: currentLink.id,
+                content:
+                  currentLink.type === DASHBOARD_LINK_TYPE ? (
+                    <DashboardLinkComponent
+                      key={currentLink.id}
+                      link={currentLink}
+                      layout={layout ?? LINKS_VERTICAL_LAYOUT}
+                      parentApi={parentApi as LinksParentApi}
+                    />
+                  ) : (
+                    <ExternalLinkComponent
+                      key={currentLink.id}
+                      link={currentLink}
+                      layout={layout ?? LINKS_VERTICAL_LAYOUT}
+                    />
+                  ),
+              },
+            };
+          }, {});
+        }, [links, layout]);
+        return (
+          <EuiPanel
+            className={`linksComponent ${
+              layout === LINKS_HORIZONTAL_LAYOUT ? 'eui-xScroll' : 'eui-yScroll'
+            }`}
+            paddingSize="xs"
+            data-shared-item
+            data-rendering-count={1}
+            data-test-subj="links--component"
+          >
+            <EuiListGroup
+              maxWidth={false}
+              className={`${layout ?? LINKS_VERTICAL_LAYOUT}LayoutWrapper`}
+              data-test-subj="links--component--listGroup"
+            >
+              {links?.map((link) => linkItems[link.id].content)}
+            </EuiListGroup>
+          </EuiPanel>
+        );
+      };
+      return {
+        api,
+        Component,
+      };
+    },
+  };
+  return linksEmbeddableFactory;
+};
diff --git a/src/plugins/links/public/embeddable/links_embeddable_factory.test.ts b/src/plugins/links/public/embeddable/links_embeddable_factory.test.ts
deleted file mode 100644
index d575c975e0295..0000000000000
--- a/src/plugins/links/public/embeddable/links_embeddable_factory.test.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { LinksFactoryDefinition } from './links_embeddable_factory';
-import { LinksInput } from './types';
-
-describe('linksFactory', () => {
-  test('returns an empty object when not given proper meta information', () => {
-    const linksFactory = new LinksFactoryDefinition();
-    const settings = linksFactory.getLegacyPanelPlacementSettings({} as unknown as LinksInput, {});
-    expect(settings.height).toBeUndefined();
-    expect(settings.width).toBeUndefined();
-    expect(settings.strategy).toBeUndefined();
-  });
-
-  test('returns a horizontal layout', () => {
-    const linksFactory = new LinksFactoryDefinition();
-    const settings = linksFactory.getLegacyPanelPlacementSettings({} as unknown as LinksInput, {
-      layout: 'horizontal',
-      links: [],
-    });
-    expect(settings.height).toBe(4);
-    expect(settings.width).toBe(48);
-    expect(settings.strategy).toBe('placeAtTop');
-  });
-
-  test('returns a vertical layout with the appropriate height', () => {
-    const linksFactory = new LinksFactoryDefinition();
-    const settings = linksFactory.getLegacyPanelPlacementSettings({} as unknown as LinksInput, {
-      layout: 'vertical',
-      links: [
-        { type: 'dashboardLink', destination: 'superDashboard1' },
-        { type: 'dashboardLink', destination: 'superDashboard2' },
-        { type: 'dashboardLink', destination: 'superDashboard3' },
-      ],
-    });
-    expect(settings.height).toBe(7); // 4 base plus 3 for each link.
-    expect(settings.width).toBe(8);
-    expect(settings.strategy).toBe('placeAtTop');
-  });
-});
diff --git a/src/plugins/links/public/embeddable/links_embeddable_factory.ts b/src/plugins/links/public/embeddable/links_embeddable_factory.ts
deleted file mode 100644
index 40d377345e4f2..0000000000000
--- a/src/plugins/links/public/embeddable/links_embeddable_factory.ts
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { DASHBOARD_GRID_COLUMN_COUNT, PanelPlacementStrategy } from '@kbn/dashboard-plugin/public';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
-import { IProvidesLegacyPanelPlacementSettings } from '@kbn/dashboard-plugin/public';
-import { EmbeddableStateWithType } from '@kbn/embeddable-plugin/common';
-import {
-  EmbeddableFactory,
-  EmbeddableFactoryDefinition,
-  ErrorEmbeddable,
-  COMMON_EMBEDDABLE_GROUPING,
-} from '@kbn/embeddable-plugin/public';
-import {
-  GetMigrationFunctionObjectFn,
-  MigrateFunctionsObject,
-} from '@kbn/kibana-utils-plugin/common';
-import { UiActionsPresentableGrouping } from '@kbn/ui-actions-plugin/public';
-
-import { APP_ICON, APP_NAME, CONTENT_ID } from '../../common';
-import { LinksAttributes } from '../../common/content_management';
-import { extract, inject } from '../../common/embeddable';
-import { LinksStrings } from '../components/links_strings';
-import { getLinksAttributeService } from '../services/attribute_service';
-import { coreServices, untilPluginStartServicesReady } from '../services/kibana_services';
-import type { LinksEmbeddable } from './links_embeddable';
-import { LinksByReferenceInput, LinksEditorFlyoutReturn, LinksInput } from './types';
-
-export type LinksFactory = EmbeddableFactory;
-
-// TODO: Replace string 'OPEN_FLYOUT_ADD_DRILLDOWN' with constant once the dashboardEnhanced plugin is removed
-// and it is no longer locked behind `x-pack`
-const getDefaultLinksInput = (): Partial<LinksInput> => ({
-  disabledActions: ['OPEN_FLYOUT_ADD_DRILLDOWN'],
-});
-
-const isLinksAttributes = (attributes?: unknown): attributes is LinksAttributes => {
-  return (
-    attributes !== undefined &&
-    Boolean((attributes as LinksAttributes).layout || (attributes as LinksAttributes).links)
-  );
-};
-
-export class LinksFactoryDefinition
-  implements
-    EmbeddableFactoryDefinition<LinksInput>,
-    IProvidesLegacyPanelPlacementSettings<LinksInput>
-{
-  latestVersion?: string | undefined;
-  telemetry?:
-    | ((state: EmbeddableStateWithType, stats: Record<string, any>) => Record<string, any>)
-    | undefined;
-  migrations?: MigrateFunctionsObject | GetMigrationFunctionObjectFn | undefined;
-  grouping: UiActionsPresentableGrouping<unknown> = [COMMON_EMBEDDABLE_GROUPING.annotation];
-
-  public readonly type = CONTENT_ID;
-
-  public readonly isContainerType = false;
-
-  public readonly savedObjectMetaData = {
-    name: APP_NAME,
-    type: CONTENT_ID,
-    getIconForSavedObject: () => APP_ICON,
-  };
-
-  public getLegacyPanelPlacementSettings: IProvidesLegacyPanelPlacementSettings<
-    LinksInput,
-    LinksAttributes | unknown
-  >['getLegacyPanelPlacementSettings'] = (input, attributes) => {
-    if (!isLinksAttributes(attributes) || !attributes.layout) {
-      // if we have no information about the layout of this links panel defer to default panel size and placement.
-      return {};
-    }
-
-    const isHorizontal = attributes.layout === 'horizontal';
-    const width = isHorizontal ? DASHBOARD_GRID_COLUMN_COUNT : 8;
-    const height = isHorizontal ? 4 : (attributes.links?.length ?? 1 * 3) + 4;
-    return { width, height, strategy: PanelPlacementStrategy.placeAtTop };
-  };
-
-  public async isEditable() {
-    await untilPluginStartServicesReady();
-    return Boolean(coreServices.application.capabilities.dashboard?.showWriteControls);
-  }
-
-  public canCreateNew() {
-    return true;
-  }
-
-  public getDefaultInput(): Partial<LinksInput> {
-    return getDefaultLinksInput();
-  }
-
-  public async createFromSavedObject(
-    savedObjectId: string,
-    input: LinksInput,
-    parent: DashboardContainer
-  ): Promise<LinksEmbeddable | ErrorEmbeddable> {
-    if (!(input as LinksByReferenceInput).savedObjectId) {
-      (input as LinksByReferenceInput).savedObjectId = savedObjectId;
-    }
-    return this.create(input, parent);
-  }
-
-  public async create(initialInput: LinksInput, parent: DashboardContainer) {
-    await untilPluginStartServicesReady();
-
-    const { LinksEmbeddable } = await import('./links_embeddable');
-    const editable = await this.isEditable();
-
-    return new LinksEmbeddable(
-      { editable },
-      { ...getDefaultLinksInput(), ...initialInput },
-      getLinksAttributeService(),
-      parent
-    );
-  }
-
-  public async getExplicitInput(
-    initialInput: LinksInput,
-    parent?: DashboardContainer
-  ): Promise<LinksEditorFlyoutReturn> {
-    const { openEditorFlyout } = await import('../editor/open_editor_flyout');
-
-    const { newInput, attributes } = await openEditorFlyout(
-      {
-        ...getDefaultLinksInput(),
-        ...initialInput,
-      },
-      parent
-    );
-
-    return { newInput, attributes };
-  }
-
-  public getDisplayName() {
-    return APP_NAME;
-  }
-
-  public getIconType() {
-    return 'link';
-  }
-
-  public getDescription() {
-    return LinksStrings.getDescription();
-  }
-
-  inject = inject;
-
-  extract = extract;
-}
diff --git a/src/plugins/links/public/embeddable/types.ts b/src/plugins/links/public/embeddable/types.ts
deleted file mode 100644
index d16d8431a5601..0000000000000
--- a/src/plugins/links/public/embeddable/types.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { ReduxEmbeddableState } from '@kbn/presentation-util-plugin/public';
-import {
-  EmbeddableInput,
-  EmbeddableOutput,
-  SavedObjectEmbeddableInput,
-} from '@kbn/embeddable-plugin/public';
-
-import { DashboardAttributes } from '@kbn/dashboard-plugin/common';
-import {
-  LinkType,
-  EXTERNAL_LINK_TYPE,
-  DASHBOARD_LINK_TYPE,
-  LINKS_VERTICAL_LAYOUT,
-  LinksLayoutType,
-  LINKS_HORIZONTAL_LAYOUT,
-  LinksAttributes,
-} from '../../common/content_management';
-import { DashboardLinkStrings } from '../components/dashboard_link/dashboard_link_strings';
-import { ExternalLinkStrings } from '../components/external_link/external_link_strings';
-import { LinksStrings } from '../components/links_strings';
-
-export const LinksLayoutInfo: {
-  [id in LinksLayoutType]: { displayName: string };
-} = {
-  [LINKS_HORIZONTAL_LAYOUT]: {
-    displayName: LinksStrings.editor.panelEditor.getHorizontalLayoutLabel(),
-  },
-  [LINKS_VERTICAL_LAYOUT]: {
-    displayName: LinksStrings.editor.panelEditor.getVerticalLayoutLabel(),
-  },
-};
-
-export interface DashboardItem {
-  id: string;
-  attributes: DashboardAttributes;
-}
-
-export const LinkInfo: {
-  [id in LinkType]: {
-    icon: string;
-    type: string;
-    displayName: string;
-    description: string;
-  };
-} = {
-  [DASHBOARD_LINK_TYPE]: {
-    icon: 'dashboardApp',
-    type: DashboardLinkStrings.getType(),
-    displayName: DashboardLinkStrings.getDisplayName(),
-    description: DashboardLinkStrings.getDescription(),
-  },
-  [EXTERNAL_LINK_TYPE]: {
-    icon: 'link',
-    type: ExternalLinkStrings.getType(),
-    displayName: ExternalLinkStrings.getDisplayName(),
-    description: ExternalLinkStrings.getDescription(),
-  },
-};
-
-export interface LinksEditorFlyoutReturn {
-  attributes?: unknown;
-  newInput: Partial<LinksInput>;
-}
-
-export type LinksByValueInput = {
-  attributes: LinksAttributes;
-} & EmbeddableInput;
-
-export type LinksByReferenceInput = SavedObjectEmbeddableInput;
-
-export type LinksInput = LinksByValueInput | LinksByReferenceInput;
-
-export type LinksOutput = EmbeddableOutput & {
-  attributes?: LinksAttributes;
-};
-
-/**
- *  Links embeddable redux state
- */
-export type LinksComponentState = LinksAttributes;
-
-export type LinksReduxState = ReduxEmbeddableState<LinksInput, LinksOutput, LinksComponentState>;
diff --git a/src/plugins/links/public/index.ts b/src/plugins/links/public/index.ts
index 3389cd48f4b67..ce842fc4f1f6d 100644
--- a/src/plugins/links/public/index.ts
+++ b/src/plugins/links/public/index.ts
@@ -6,9 +6,6 @@
  * Side Public License, v 1.
  */
 
-export type { LinksFactory } from './embeddable';
-export { LinksFactoryDefinition, LinksEmbeddable } from './embeddable';
-
 import { LinksPlugin } from './plugin';
 
 export function plugin() {
diff --git a/src/plugins/links/public/lib/deserialize_from_library.ts b/src/plugins/links/public/lib/deserialize_from_library.ts
new file mode 100644
index 0000000000000..a35be4f408554
--- /dev/null
+++ b/src/plugins/links/public/lib/deserialize_from_library.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { loadFromLibrary } from '../content_management';
+import { LinksByReferenceSerializedState, LinksSerializedState } from '../types';
+import { resolveLinks } from './resolve_links';
+
+export const linksSerializeStateIsByReference = (
+  state?: LinksSerializedState
+): state is LinksByReferenceSerializedState => {
+  return Boolean(state && (state as LinksByReferenceSerializedState).savedObjectId !== undefined);
+};
+
+export const deserializeLinksSavedObject = async (state: LinksByReferenceSerializedState) => {
+  const { attributes } = await loadFromLibrary(state.savedObjectId);
+
+  const links = await resolveLinks(attributes.links ?? []);
+
+  const { title: defaultPanelTitle, description: defaultPanelDescription, layout } = attributes;
+
+  return {
+    links,
+    layout,
+    savedObjectId: state.savedObjectId,
+    defaultPanelTitle,
+    defaultPanelDescription,
+  };
+};
diff --git a/src/plugins/links/public/lib/resolve_links.test.ts b/src/plugins/links/public/lib/resolve_links.test.ts
new file mode 100644
index 0000000000000..e56c28324b6f7
--- /dev/null
+++ b/src/plugins/links/public/lib/resolve_links.test.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { resolveLinkInfo } from './resolve_links';
+import { Link, DASHBOARD_LINK_TYPE } from '../../common/content_management';
+
+jest.mock('../components/dashboard_link/dashboard_link_tools', () => ({
+  fetchDashboard: async (id: string) => {
+    if (id === '404') {
+      const error = new Error('Dashboard not found');
+      throw error;
+    }
+    return {
+      attributes: {
+        title: `Dashboard ${id}`,
+        description: 'Some descriptive text.',
+      },
+    };
+  },
+}));
+
+describe('resolveLinkInfo', () => {
+  it('resolves a dashboard link with no label', async () => {
+    const link: Link = {
+      id: '1',
+      type: DASHBOARD_LINK_TYPE,
+      order: 0,
+      destination: '001',
+    };
+    const resolvedLink = await resolveLinkInfo(link);
+    expect(resolvedLink).toEqual({
+      title: 'Dashboard 001',
+      description: 'Some descriptive text.',
+      label: undefined,
+    });
+  });
+
+  it('resolves a dashboard link with a label', async () => {
+    const link: Link = {
+      id: '1',
+      type: DASHBOARD_LINK_TYPE,
+      order: 0,
+      destination: '001',
+      label: 'My Dashboard',
+    };
+    const resolvedLink = await resolveLinkInfo(link);
+    expect(resolvedLink).toEqual({
+      title: 'Dashboard 001',
+      description: 'Some descriptive text.',
+      label: 'My Dashboard',
+    });
+  });
+
+  it('adds an error for missing dashboard', async () => {
+    const link: Link = {
+      id: '1',
+      type: DASHBOARD_LINK_TYPE,
+      order: 0,
+      destination: '404',
+    };
+    const resolvedLink = await resolveLinkInfo(link);
+    expect(resolvedLink).toEqual({
+      title: 'Error fetching dashboard',
+      description: 'Dashboard not found',
+      error: new Error('Dashboard not found'),
+    });
+  });
+});
diff --git a/src/plugins/links/public/lib/resolve_links.ts b/src/plugins/links/public/lib/resolve_links.ts
new file mode 100644
index 0000000000000..c3ae15ef5393b
--- /dev/null
+++ b/src/plugins/links/public/lib/resolve_links.ts
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { memoize } from 'lodash';
+import { ResolvedLink } from '../types';
+import { DASHBOARD_LINK_TYPE, EXTERNAL_LINK_TYPE, Link } from '../../common/content_management';
+import { validateUrl } from '../components/external_link/external_link_tools';
+import { fetchDashboard } from '../components/dashboard_link/dashboard_link_tools';
+import { DashboardLinkStrings } from '../components/dashboard_link/dashboard_link_strings';
+import { LinksStrings } from '../components/links_strings';
+
+export const getOrderedLinkList = (links: ResolvedLink[]): ResolvedLink[] => {
+  return [...links].sort((linkA, linkB) => {
+    return linkA.order - linkB.order;
+  });
+};
+
+/**
+ * Memoizing this prevents the links panel editor from having to unnecessarily calculate this
+ * a second time once the embeddable exists - after all, the links component should have already
+ * calculated this so, we can get away with using the cached version in the editor
+ */
+export const memoizedGetOrderedLinkList = memoize(
+  (links: ResolvedLink[]) => {
+    return getOrderedLinkList(links);
+  },
+  (links: ResolvedLink[]) => {
+    return links;
+  }
+);
+
+export async function resolveLinks(links: Link[] = []) {
+  const resolvedLinkInfos = await Promise.all(
+    links.map(async (link) => {
+      return { ...link, ...(await resolveLinkInfo(link)) };
+    })
+  );
+  return getOrderedLinkList(resolvedLinkInfos);
+}
+
+export async function resolveLinkInfo(
+  link: Link
+): Promise<{ title: string; label?: string; description?: string; error?: Error }> {
+  if (link.type === EXTERNAL_LINK_TYPE) {
+    const info = { title: link.label ?? link.destination };
+    const { valid, message } = validateUrl(link.destination);
+    if (valid) {
+      return info;
+    }
+    return { ...info, error: new Error(message) };
+  }
+  if (link.type === DASHBOARD_LINK_TYPE) {
+    if (!link.destination) return { title: '' };
+    try {
+      const {
+        attributes: { title, description },
+      } = await fetchDashboard(link.destination);
+      return { label: link.label, title, description };
+    } catch (error) {
+      return {
+        title: DashboardLinkStrings.getDashboardErrorLabel(),
+        description: error.message,
+        error,
+      };
+    }
+  }
+  throw new Error(LinksStrings.embeddable.getUnsupportedLinkTypeError());
+}
diff --git a/src/plugins/links/public/lib/serialize_attributes.ts b/src/plugins/links/public/lib/serialize_attributes.ts
new file mode 100644
index 0000000000000..d9e8d1de148bb
--- /dev/null
+++ b/src/plugins/links/public/lib/serialize_attributes.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { Link } from '../../common/content_management';
+import { extractReferences } from '../../common/persistable_state';
+import { LinksRuntimeState } from '../types';
+
+export const serializeLinksAttributes = (
+  state: LinksRuntimeState,
+  shouldExtractReferences: boolean = true
+) => {
+  const linksToSave: Link[] | undefined = state.links?.map(
+    ({ title, description, error, ...linkToSave }) => linkToSave
+  );
+  const attributes = {
+    title: state.defaultPanelTitle,
+    description: state.defaultPanelDescription,
+    layout: state.layout,
+    links: linksToSave,
+  };
+
+  const serializedState = shouldExtractReferences
+    ? extractReferences({ attributes })
+    : { attributes, references: [] };
+
+  return serializedState;
+};
diff --git a/src/plugins/links/public/mocks.ts b/src/plugins/links/public/mocks.ts
new file mode 100644
index 0000000000000..89f15ef9ea205
--- /dev/null
+++ b/src/plugins/links/public/mocks.ts
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { coreMock } from '@kbn/core/public/mocks';
+import { dashboardPluginMock } from '@kbn/dashboard-plugin/public/mocks';
+import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
+import { contentManagementMock } from '@kbn/content-management-plugin/public/mocks';
+import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
+import { uiActionsPluginMock } from '@kbn/ui-actions-plugin/public/mocks';
+import { BehaviorSubject } from 'rxjs';
+import { getMockPresentationContainer } from '@kbn/presentation-containers/mocks';
+import { AggregateQuery, Filter, Query, TimeRange } from '@kbn/es-query';
+import { Reference } from '@kbn/content-management-utils';
+import { setKibanaServices } from './services/kibana_services';
+import { LinksParentApi, LinksSerializedState } from './types';
+
+export const setStubKibanaServices = () => {
+  const mockCore = coreMock.createStart();
+
+  const core = {
+    ...mockCore,
+    application: {
+      ...mockCore.application,
+      capabilities: {
+        ...mockCore.application.capabilities,
+        visualize: {
+          save: true,
+        },
+      },
+    },
+  };
+
+  setKibanaServices(core, {
+    dashboard: dashboardPluginMock.createStartContract(),
+    embeddable: embeddablePluginMock.createStartContract(),
+    contentManagement: contentManagementMock.createStartContract(),
+    presentationUtil: presentationUtilPluginMock.createStartContract(core),
+    uiActions: uiActionsPluginMock.createStartContract(),
+  });
+};
+
+export const getMockLinksParentApi = (
+  serializedState: LinksSerializedState,
+  references?: Reference[]
+): LinksParentApi => ({
+  ...getMockPresentationContainer(),
+  type: 'dashboard',
+  filters$: new BehaviorSubject<Filter[] | undefined>(undefined),
+  query$: new BehaviorSubject<Query | AggregateQuery | undefined>(undefined),
+  timeRange$: new BehaviorSubject<TimeRange | undefined>({
+    from: 'now-15m',
+    to: 'now',
+  }),
+  timeslice$: new BehaviorSubject<[number, number] | undefined>(undefined),
+  savedObjectId: new BehaviorSubject<string | undefined>('999'),
+  hidePanelTitle: new BehaviorSubject<boolean | undefined>(false),
+  panelTitle: new BehaviorSubject<string | undefined>('My Dashboard'),
+  panelDescription: new BehaviorSubject<string | undefined>(''),
+  getSerializedStateForChild: () => ({ rawState: serializedState, references }),
+});
diff --git a/src/plugins/links/public/mocks.tsx b/src/plugins/links/public/mocks.tsx
deleted file mode 100644
index 6a27185c9b09a..0000000000000
--- a/src/plugins/links/public/mocks.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { coreMock } from '@kbn/core/public/mocks';
-import { dashboardPluginMock } from '@kbn/dashboard-plugin/public/mocks';
-import { embeddablePluginMock } from '@kbn/embeddable-plugin/public/mocks';
-import { contentManagementMock } from '@kbn/content-management-plugin/public/mocks';
-import { presentationUtilPluginMock } from '@kbn/presentation-util-plugin/public/mocks';
-import { setKibanaServices } from './services/kibana_services';
-
-export const setStubKibanaServices = () => {
-  const core = coreMock.createStart();
-
-  setKibanaServices(core, {
-    dashboard: dashboardPluginMock.createStartContract(),
-    embeddable: embeddablePluginMock.createStartContract(),
-    contentManagement: contentManagementMock.createStartContract(),
-    presentationUtil: presentationUtilPluginMock.createStartContract(core),
-  });
-};
diff --git a/src/plugins/links/public/plugin.ts b/src/plugins/links/public/plugin.ts
index 32788a2a283c1..f5ac0dd5f1d20 100644
--- a/src/plugins/links/public/plugin.ts
+++ b/src/plugins/links/public/plugin.ts
@@ -11,21 +11,28 @@ import {
   ContentManagementPublicStart,
 } from '@kbn/content-management-plugin/public';
 import { CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
-import { DashboardStart } from '@kbn/dashboard-plugin/public';
-import type { DashboardContainer } from '@kbn/dashboard-plugin/public/dashboard_container';
+import {
+  DashboardStart,
+  DASHBOARD_GRID_COLUMN_COUNT,
+  PanelPlacementStrategy,
+} from '@kbn/dashboard-plugin/public';
 import { EmbeddableSetup, EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 import { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 import { VisualizationsSetup } from '@kbn/visualizations-plugin/public';
 
+import { UiActionsPublicStart } from '@kbn/ui-actions-plugin/public/plugin';
+import { LinksSerializedState } from './types';
 import { APP_ICON, APP_NAME, CONTENT_ID, LATEST_VERSION } from '../common';
 import { LinksCrudTypes } from '../common/content_management';
 import { LinksStrings } from './components/links_strings';
 import { getLinksClient } from './content_management/links_content_management_client';
-import { LinksFactoryDefinition } from './embeddable';
-import { LinksByReferenceInput } from './embeddable/types';
-import { setKibanaServices } from './services/kibana_services';
-
+import { setKibanaServices, untilPluginStartServicesReady } from './services/kibana_services';
+import { registerCreateLinksPanelAction } from './actions/create_links_panel_action';
+import {
+  deserializeLinksSavedObject,
+  linksSerializeStateIsByReference,
+} from './lib/deserialize_from_library';
 export interface LinksSetupDependencies {
   embeddable: EmbeddableSetup;
   visualizations: VisualizationsSetup;
@@ -37,6 +44,7 @@ export interface LinksStartDependencies {
   dashboard: DashboardStart;
   presentationUtil: PresentationUtilPluginStart;
   contentManagement: ContentManagementPublicStart;
+  uiActions: UiActionsPublicStart;
   usageCollection?: UsageCollectionStart;
 }
 
@@ -47,10 +55,6 @@ export class LinksPlugin
 
   public setup(core: CoreSetup<LinksStartDependencies>, plugins: LinksSetupDependencies) {
     core.getStartServices().then(([_, deps]) => {
-      const linksFactory = new LinksFactoryDefinition();
-
-      plugins.embeddable.registerEmbeddableFactory(CONTENT_ID, linksFactory);
-
       plugins.contentManagement.registry.register({
         id: CONTENT_ID,
         version: {
@@ -59,20 +63,23 @@ export class LinksPlugin
         name: APP_NAME,
       });
 
-      const getExplicitInput = async ({
-        savedObjectId,
-        parent,
-      }: {
-        savedObjectId?: string;
-        parent?: DashboardContainer;
-      }) => {
-        try {
-          await linksFactory.getExplicitInput({ savedObjectId } as LinksByReferenceInput, parent);
-        } catch {
-          // swallow any errors - this just means that the user cancelled editing
-        }
-        return;
-      };
+      plugins.embeddable.registerReactEmbeddableSavedObject({
+        onAdd: (container, savedObject) => {
+          container.addNewPanel({
+            panelType: CONTENT_ID,
+            initialState: { savedObjectId: savedObject.id },
+          });
+        },
+        embeddableType: CONTENT_ID,
+        savedObjectType: CONTENT_ID,
+        savedObjectName: APP_NAME,
+        getIconForSavedObject: () => APP_ICON,
+      });
+
+      plugins.embeddable.registerReactEmbeddableFactory(CONTENT_ID, async () => {
+        const { getLinksEmbeddableFactory } = await import('./embeddable/links_embeddable');
+        return getLinksEmbeddableFactory();
+      });
 
       plugins.visualizations.registerAlias({
         disableCreate: true, // do not allow creation through visualization listing page
@@ -93,7 +100,13 @@ export class LinksPlugin
               return {
                 id,
                 title,
-                editor: { onEdit: (savedObjectId: string) => getExplicitInput({ savedObjectId }) },
+                editor: {
+                  onEdit: async (savedObjectId: string) => {
+                    const { openEditorFlyout } = await import('./editor/open_editor_flyout');
+                    const initialState = await deserializeLinksSavedObject({ savedObjectId });
+                    await openEditorFlyout({ initialState });
+                  },
+                },
                 description,
                 updatedAt,
                 icon: APP_ICON,
@@ -110,6 +123,24 @@ export class LinksPlugin
 
   public start(core: CoreStart, plugins: LinksStartDependencies) {
     setKibanaServices(core, plugins);
+    untilPluginStartServicesReady().then(() => {
+      registerCreateLinksPanelAction();
+
+      plugins.dashboard.registerDashboardPanelPlacementSetting(
+        CONTENT_ID,
+        async (serializedState?: LinksSerializedState) => {
+          if (!serializedState) return {};
+          const { links, layout } = linksSerializeStateIsByReference(serializedState)
+            ? await deserializeLinksSavedObject(serializedState)
+            : serializedState.attributes;
+          const isHorizontal = layout === 'horizontal';
+          const width = isHorizontal ? DASHBOARD_GRID_COLUMN_COUNT : 8;
+          const height = isHorizontal ? 4 : (links?.length ?? 1 * 3) + 4;
+          return { width, height, strategy: PanelPlacementStrategy.placeAtTop };
+        }
+      );
+    });
+
     return {};
   }
 
diff --git a/src/plugins/links/public/services/attribute_service.ts b/src/plugins/links/public/services/attribute_service.ts
deleted file mode 100644
index bde2ab27c1d15..0000000000000
--- a/src/plugins/links/public/services/attribute_service.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-import { Reference } from '@kbn/content-management-utils';
-import { AttributeService } from '@kbn/embeddable-plugin/public';
-import type { OnSaveProps } from '@kbn/saved-objects-plugin/public';
-import { SharingSavedObjectProps } from '../../common/types';
-import { LinksAttributes } from '../../common/content_management';
-import { extractReferences, injectReferences } from '../../common/persistable_state';
-import { LinksByReferenceInput, LinksByValueInput } from '../embeddable/types';
-import { embeddableService } from './kibana_services';
-import { checkForDuplicateTitle, linksClient } from '../content_management';
-import { CONTENT_ID } from '../../common';
-
-export type LinksDocument = LinksAttributes & {
-  references?: Reference[];
-};
-
-export interface LinksUnwrapMetaInfo {
-  sharingSavedObjectProps?: SharingSavedObjectProps;
-}
-
-export type LinksAttributeService = AttributeService<
-  LinksDocument,
-  LinksByValueInput,
-  LinksByReferenceInput,
-  LinksUnwrapMetaInfo
->;
-
-let linksAttributeService: LinksAttributeService | null = null;
-export function getLinksAttributeService(): LinksAttributeService {
-  if (linksAttributeService) return linksAttributeService;
-
-  linksAttributeService = embeddableService.getAttributeService<
-    LinksDocument,
-    LinksByValueInput,
-    LinksByReferenceInput,
-    LinksUnwrapMetaInfo
-  >(CONTENT_ID, {
-    saveMethod: async (attributes: LinksDocument, savedObjectId?: string) => {
-      const { attributes: updatedAttributes, references } = extractReferences({
-        attributes,
-        references: attributes.references,
-      });
-      const {
-        item: { id },
-      } = await (savedObjectId
-        ? linksClient.update({
-            id: savedObjectId,
-            data: updatedAttributes,
-            options: { references },
-          })
-        : linksClient.create({ data: updatedAttributes, options: { references } }));
-      return { id };
-    },
-    unwrapMethod: async (
-      savedObjectId: string
-    ): Promise<{
-      attributes: LinksDocument;
-      metaInfo: LinksUnwrapMetaInfo;
-    }> => {
-      const {
-        item: savedObject,
-        meta: { outcome, aliasPurpose, aliasTargetId },
-      } = await linksClient.get(savedObjectId);
-      if (savedObject.error) throw savedObject.error;
-
-      const { attributes } = injectReferences(savedObject);
-      return {
-        attributes,
-        metaInfo: {
-          sharingSavedObjectProps: {
-            aliasTargetId,
-            outcome,
-            aliasPurpose,
-            sourceId: savedObjectId,
-          },
-        },
-      };
-    },
-    checkForDuplicateTitle: (props: OnSaveProps) => {
-      return checkForDuplicateTitle({
-        title: props.newTitle,
-        copyOnSave: false,
-        lastSavedTitle: '',
-        isTitleDuplicateConfirmed: props.isTitleDuplicateConfirmed,
-        onTitleDuplicate: props.onTitleDuplicate,
-      });
-    },
-  });
-  return linksAttributeService;
-}
diff --git a/src/plugins/links/public/services/kibana_services.ts b/src/plugins/links/public/services/kibana_services.ts
index 7536c12262792..f25ecdd4c3f16 100644
--- a/src/plugins/links/public/services/kibana_services.ts
+++ b/src/plugins/links/public/services/kibana_services.ts
@@ -14,6 +14,7 @@ import { DashboardStart } from '@kbn/dashboard-plugin/public';
 import { EmbeddableStart } from '@kbn/embeddable-plugin/public';
 import { PresentationUtilPluginStart } from '@kbn/presentation-util-plugin/public';
 
+import { UiActionsPublicStart } from '@kbn/ui-actions-plugin/public/plugin';
 import { CONTENT_ID } from '../../common';
 import { LinksStartDependencies } from '../plugin';
 
@@ -22,6 +23,7 @@ export let dashboardServices: DashboardStart;
 export let embeddableService: EmbeddableStart;
 export let presentationUtil: PresentationUtilPluginStart;
 export let contentManagement: ContentManagementPublicStart;
+export let uiActions: UiActionsPublicStart;
 export let trackUiMetric: (
   type: string,
   eventNames: string | string[],
@@ -48,6 +50,7 @@ export const setKibanaServices = (kibanaCore: CoreStart, deps: LinksStartDepende
   embeddableService = deps.embeddable;
   presentationUtil = deps.presentationUtil;
   contentManagement = deps.contentManagement;
+  uiActions = deps.uiActions;
   if (deps.usageCollection)
     trackUiMetric = deps.usageCollection.reportUiCounter.bind(deps.usageCollection, CONTENT_ID);
 
diff --git a/src/plugins/links/public/types.ts b/src/plugins/links/public/types.ts
new file mode 100644
index 0000000000000..e88c6e5d51c84
--- /dev/null
+++ b/src/plugins/links/public/types.ts
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import {
+  HasEditCapabilities,
+  HasInPlaceLibraryTransforms,
+  HasType,
+  PublishesPanelDescription,
+  PublishesPanelTitle,
+  PublishesSavedObjectId,
+  PublishesUnifiedSearch,
+  SerializedTitles,
+} from '@kbn/presentation-publishing';
+import { DefaultEmbeddableApi } from '@kbn/embeddable-plugin/public';
+import { DynamicActionsSerializedState } from '@kbn/embeddable-enhanced-plugin/public/plugin';
+import { HasSerializedChildState, PresentationContainer } from '@kbn/presentation-containers';
+import { LocatorPublic } from '@kbn/share-plugin/common';
+import { DashboardLocatorParams, DASHBOARD_CONTAINER_TYPE } from '@kbn/dashboard-plugin/public';
+import { DashboardAttributes } from '@kbn/dashboard-plugin/common';
+
+import { CONTENT_ID } from '../common';
+import { Link, LinksAttributes, LinksLayoutType } from '../common/content_management';
+
+export type LinksParentApi = PresentationContainer &
+  HasType<typeof DASHBOARD_CONTAINER_TYPE> &
+  HasSerializedChildState<LinksSerializedState> &
+  PublishesSavedObjectId &
+  PublishesPanelTitle &
+  PublishesPanelDescription &
+  PublishesUnifiedSearch & {
+    locator?: Pick<LocatorPublic<DashboardLocatorParams>, 'navigate' | 'getRedirectUrl'>;
+  };
+
+export type LinksApi = HasType<typeof CONTENT_ID> &
+  DefaultEmbeddableApi<LinksSerializedState, LinksRuntimeState> &
+  HasEditCapabilities &
+  HasInPlaceLibraryTransforms<LinksRuntimeState>;
+
+export interface LinksByReferenceSerializedState {
+  savedObjectId: string;
+}
+
+export interface LinksByValueSerializedState {
+  attributes: LinksAttributes;
+}
+
+export type LinksSerializedState = SerializedTitles &
+  Partial<DynamicActionsSerializedState> &
+  (LinksByReferenceSerializedState | LinksByValueSerializedState);
+
+export interface LinksRuntimeState
+  extends Partial<LinksByReferenceSerializedState>,
+    SerializedTitles {
+  error?: Error;
+  links?: ResolvedLink[];
+  layout?: LinksLayoutType;
+  defaultPanelTitle?: string;
+  defaultPanelDescription?: string;
+}
+
+export type ResolvedLink = Link & {
+  title: string;
+  label?: string;
+  description?: string;
+  error?: Error;
+};
+
+export interface DashboardItem {
+  id: string;
+  attributes: DashboardAttributes;
+}
diff --git a/src/plugins/links/tsconfig.json b/src/plugins/links/tsconfig.json
index e0a5a1b1d4221..321809cb507d0 100644
--- a/src/plugins/links/tsconfig.json
+++ b/src/plugins/links/tsconfig.json
@@ -19,9 +19,8 @@
     "@kbn/saved-objects-plugin",
     "@kbn/core-saved-objects-server",
     "@kbn/saved-objects-plugin",
+    "@kbn/ui-actions-plugin",
     "@kbn/ui-actions-enhanced-plugin",
-    "@kbn/kibana-utils-plugin",
-    "@kbn/utility-types",
     "@kbn/ui-actions-plugin",
     "@kbn/logging",
     "@kbn/core-plugins-server",
@@ -32,7 +31,11 @@
     "@kbn/core-mount-utils-browser",
     "@kbn/presentation-containers",
     "@kbn/presentation-publishing",
-    "@kbn/react-kibana-context-render"
+    "@kbn/react-kibana-context-render",
+    "@kbn/presentation-panel-plugin",
+    "@kbn/embeddable-enhanced-plugin",
+    "@kbn/share-plugin",
+    "@kbn/es-query",
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/src/plugins/saved_objects_management/public/index.ts b/src/plugins/saved_objects_management/public/index.ts
index 6df2288d110b5..37ed13ea749e8 100644
--- a/src/plugins/saved_objects_management/public/index.ts
+++ b/src/plugins/saved_objects_management/public/index.ts
@@ -13,14 +13,7 @@ export type {
   SavedObjectsManagementPluginSetup,
   SavedObjectsManagementPluginStart,
 } from './plugin';
-export type {
-  SavedObjectsManagementActionServiceSetup,
-  SavedObjectsManagementActionServiceStart,
-  SavedObjectsManagementColumnServiceSetup,
-  SavedObjectsManagementColumnServiceStart,
-  SavedObjectsManagementColumn,
-  SavedObjectsManagementRecord,
-} from './services';
+export type { SavedObjectsManagementColumn, SavedObjectsManagementRecord } from './services';
 export { SavedObjectsManagementAction } from './services';
 export type { ProcessedImportResponse, FailedImport } from './lib';
 export { processImportResponse, getTagFindReferences, parseQuery } from './lib';
diff --git a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
index 57103921c909a..66bd4f6e9542f 100644
--- a/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/mount_section.tsx
@@ -17,10 +17,16 @@ import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 import type { SavedObjectManagementTypeInfo } from '../../common/types';
 import { StartDependencies, SavedObjectsManagementPluginStart } from '../plugin';
 import { getAllowedTypes } from '../lib';
+import {
+  SavedObjectsManagementActionServiceStart,
+  SavedObjectsManagementColumnServiceStart,
+} from '../services';
 
 interface MountParams {
   core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>;
   mountParams: ManagementAppMountParams;
+  getActionServiceStart: () => SavedObjectsManagementActionServiceStart;
+  getColumnServiceStart: () => SavedObjectsManagementColumnServiceStart;
 }
 
 let allowedObjectTypes: SavedObjectManagementTypeInfo[] | undefined;
@@ -31,8 +37,13 @@ const title = i18n.translate('savedObjectsManagement.objects.savedObjectsTitle',
 
 const SavedObjectsEditionPage = lazy(() => import('./saved_objects_edition_page'));
 const SavedObjectsTablePage = lazy(() => import('./saved_objects_table_page'));
-export const mountManagementSection = async ({ core, mountParams }: MountParams) => {
-  const [coreStart, { data, dataViews, savedObjectsTaggingOss, spaces: spacesApi }, pluginStart] =
+export const mountManagementSection = async ({
+  core,
+  mountParams,
+  getColumnServiceStart,
+  getActionServiceStart,
+}: MountParams) => {
+  const [coreStart, { data, dataViews, savedObjectsTaggingOss, spaces: spacesApi }] =
     await core.getStartServices();
   const { capabilities } = coreStart.application;
   const { element, history, setBreadcrumbs } = mountParams;
@@ -77,8 +88,8 @@ export const mountManagementSection = async ({ core, mountParams }: MountParams)
                   spacesApi={spacesApi}
                   dataStart={data}
                   dataViewsApi={dataViews}
-                  actionRegistry={pluginStart.actions}
-                  columnRegistry={pluginStart.columns}
+                  actionRegistry={getActionServiceStart()}
+                  columnRegistry={getColumnServiceStart()}
                   allowedTypes={allowedObjectTypes}
                   setBreadcrumbs={setBreadcrumbs}
                 />
diff --git a/src/plugins/saved_objects_management/public/mocks.ts b/src/plugins/saved_objects_management/public/mocks.ts
index 82fe0d419855c..51b93f04c5826 100644
--- a/src/plugins/saved_objects_management/public/mocks.ts
+++ b/src/plugins/saved_objects_management/public/mocks.ts
@@ -6,22 +6,18 @@
  * Side Public License, v 1.
  */
 
-import { actionServiceMock } from './services/action_service.mock';
-import { columnServiceMock } from './services/column_service.mock';
-import { SavedObjectsManagementPluginSetup, SavedObjectsManagementPluginStart } from './plugin';
+import type {
+  SavedObjectsManagementPluginSetup,
+  SavedObjectsManagementPluginStart,
+} from './plugin';
 
 const createSetupContractMock = (): jest.Mocked<SavedObjectsManagementPluginSetup> => {
-  const mock = {
-    actions: actionServiceMock.createSetup(),
-    columns: columnServiceMock.createSetup(),
-  };
+  const mock = {};
   return mock;
 };
 
 const createStartContractMock = (): jest.Mocked<SavedObjectsManagementPluginStart> => {
   const mock = {
-    actions: actionServiceMock.createStart(),
-    columns: columnServiceMock.createStart(),
     getAllowedTypes: jest.fn(),
     getRelationships: jest.fn(),
     getSavedObjectLabel: jest.fn(),
diff --git a/src/plugins/saved_objects_management/public/plugin.ts b/src/plugins/saved_objects_management/public/plugin.ts
index eaefe96a0916a..855ea9dd7c91e 100644
--- a/src/plugins/saved_objects_management/public/plugin.ts
+++ b/src/plugins/saved_objects_management/public/plugin.ts
@@ -16,10 +16,8 @@ import { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { SavedObjectTaggingOssPluginStart } from '@kbn/saved-objects-tagging-oss-plugin/public';
 import {
   SavedObjectsManagementActionService,
-  SavedObjectsManagementActionServiceSetup,
   SavedObjectsManagementActionServiceStart,
   SavedObjectsManagementColumnService,
-  SavedObjectsManagementColumnServiceSetup,
   SavedObjectsManagementColumnServiceStart,
 } from './services';
 
@@ -28,21 +26,18 @@ import type { v1 } from '../common';
 import { SavedObjectManagementTypeInfo } from './types';
 import {
   getAllowedTypes,
+  getDefaultTitle,
   getRelationships,
   getSavedObjectLabel,
-  getDefaultTitle,
-  parseQuery,
   getTagFindReferences,
+  parseQuery,
 } from './lib';
 
-export interface SavedObjectsManagementPluginSetup {
-  actions: SavedObjectsManagementActionServiceSetup;
-  columns: SavedObjectsManagementColumnServiceSetup;
-}
+// keeping the interface to reduce work if we want to add back APIs later
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface SavedObjectsManagementPluginSetup {}
 
 export interface SavedObjectsManagementPluginStart {
-  actions: SavedObjectsManagementActionServiceStart;
-  columns: SavedObjectsManagementColumnServiceStart;
   getAllowedTypes: () => Promise<SavedObjectManagementTypeInfo[]>;
   getRelationships: (
     type: string,
@@ -79,6 +74,9 @@ export class SavedObjectsManagementPlugin
   private actionService = new SavedObjectsManagementActionService();
   private columnService = new SavedObjectsManagementColumnService();
 
+  private actionServiceStart?: SavedObjectsManagementActionServiceStart;
+  private columnServiceStart?: SavedObjectsManagementColumnServiceStart;
+
   public setup(
     core: CoreSetup<StartDependencies, SavedObjectsManagementPluginStart>,
     { home, management }: SetupDependencies
@@ -114,6 +112,8 @@ export class SavedObjectsManagementPlugin
         return mountManagementSection({
           core,
           mountParams,
+          getColumnServiceStart: () => this.columnServiceStart!,
+          getActionServiceStart: () => this.actionServiceStart!,
         });
       },
     });
@@ -125,12 +125,10 @@ export class SavedObjectsManagementPlugin
   }
 
   public start(_core: CoreStart, { spaces: spacesApi }: StartDependencies) {
-    const actionStart = this.actionService.start(spacesApi);
-    const columnStart = this.columnService.start(spacesApi);
+    this.actionServiceStart = this.actionService.start(spacesApi);
+    this.columnServiceStart = this.columnService.start(spacesApi);
 
     return {
-      actions: actionStart,
-      columns: columnStart,
       getAllowedTypes: () => getAllowedTypes(_core.http),
       getRelationships: (type: string, id: string, savedObjectTypes: string[]) =>
         getRelationships(_core.http, type, id, savedObjectTypes),
diff --git a/src/plugins/saved_objects_management/public/services/action_service.ts b/src/plugins/saved_objects_management/public/services/action_service.ts
index b255ee9a7fa80..83f968a846113 100644
--- a/src/plugins/saved_objects_management/public/services/action_service.ts
+++ b/src/plugins/saved_objects_management/public/services/action_service.ts
@@ -36,30 +36,25 @@ export class SavedObjectsManagementActionService {
 
   setup(): SavedObjectsManagementActionServiceSetup {
     return {
-      register: (action) => {
-        if (this.actions.has(action.id)) {
-          throw new Error(`Saved Objects Management Action with id '${action.id}' already exists`);
-        }
-        this.actions.set(action.id, action);
-      },
+      register: (action) => this.register(action),
     };
   }
 
   start(spacesApi?: SpacesApi): SavedObjectsManagementActionServiceStart {
     if (spacesApi && !spacesApi.hasOnlyDefaultSpace) {
-      registerSpacesApiActions(this, spacesApi);
+      this.register(new ShareToSpaceSavedObjectsManagementAction(spacesApi.ui));
+      this.register(new CopyToSpaceSavedObjectsManagementAction(spacesApi.ui));
     }
     return {
       has: (actionId) => this.actions.has(actionId),
       getAll: () => [...this.actions.values()],
     };
   }
-}
 
-function registerSpacesApiActions(
-  service: SavedObjectsManagementActionService,
-  spacesApi: SpacesApi
-) {
-  service.setup().register(new ShareToSpaceSavedObjectsManagementAction(spacesApi.ui));
-  service.setup().register(new CopyToSpaceSavedObjectsManagementAction(spacesApi.ui));
+  private register(action: SavedObjectsManagementAction) {
+    if (this.actions.has(action.id)) {
+      throw new Error(`Saved Objects Management Action with id '${action.id}' already exists`);
+    }
+    this.actions.set(action.id, action);
+  }
 }
diff --git a/src/plugins/saved_objects_management/public/services/column_service.ts b/src/plugins/saved_objects_management/public/services/column_service.ts
index 665866df1b4b0..519704d258c49 100644
--- a/src/plugins/saved_objects_management/public/services/column_service.ts
+++ b/src/plugins/saved_objects_management/public/services/column_service.ts
@@ -29,28 +29,23 @@ export class SavedObjectsManagementColumnService {
 
   setup(): SavedObjectsManagementColumnServiceSetup {
     return {
-      register: (column) => {
-        if (this.columns.has(column.id)) {
-          throw new Error(`Saved Objects Management Column with id '${column.id}' already exists`);
-        }
-        this.columns.set(column.id, column);
-      },
+      register: (column) => this.register(column),
     };
   }
 
   start(spacesApi?: SpacesApi): SavedObjectsManagementColumnServiceStart {
     if (spacesApi && !spacesApi.hasOnlyDefaultSpace) {
-      registerSpacesApiColumns(this, spacesApi);
+      this.register(new ShareToSpaceSavedObjectsManagementColumn(spacesApi.ui));
     }
     return {
       getAll: () => [...this.columns.values()],
     };
   }
-}
 
-function registerSpacesApiColumns(
-  service: SavedObjectsManagementColumnService,
-  spacesApi: SpacesApi
-) {
-  service.setup().register(new ShareToSpaceSavedObjectsManagementColumn(spacesApi.ui));
+  private register(column: SavedObjectsManagementColumn) {
+    if (this.columns.has(column.id)) {
+      throw new Error(`Saved Objects Management Column with id '${column.id}' already exists`);
+    }
+    this.columns.set(column.id, column);
+  }
 }
diff --git a/src/plugins/saved_objects_management/public/services/index.ts b/src/plugins/saved_objects_management/public/services/index.ts
index 997a1b96b418f..9d6f96cee0cfb 100644
--- a/src/plugins/saved_objects_management/public/services/index.ts
+++ b/src/plugins/saved_objects_management/public/services/index.ts
@@ -6,15 +6,9 @@
  * Side Public License, v 1.
  */
 
-export type {
-  SavedObjectsManagementActionServiceStart,
-  SavedObjectsManagementActionServiceSetup,
-} from './action_service';
+export type { SavedObjectsManagementActionServiceStart } from './action_service';
 export { SavedObjectsManagementActionService } from './action_service';
-export type {
-  SavedObjectsManagementColumnServiceStart,
-  SavedObjectsManagementColumnServiceSetup,
-} from './column_service';
+export type { SavedObjectsManagementColumnServiceStart } from './column_service';
 export { SavedObjectsManagementColumnService } from './column_service';
 export type { SavedObjectsManagementRecord } from './types';
 export { SavedObjectsManagementColumn, SavedObjectsManagementAction } from './types';
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 22e75e5d4b658..00c4a48da72fa 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -2098,7 +2098,7 @@
             }
           }
         },
-        "enterpriseSearchInferenceEndpoints": {
+        "enterpriseSearchRelevance": {
           "properties": {
             "appId": {
               "type": "keyword",
diff --git a/src/plugins/text_based_languages/.i18nrc.json b/src/plugins/text_based_languages/.i18nrc.json
deleted file mode 100755
index d5a020d5dd392..0000000000000
--- a/src/plugins/text_based_languages/.i18nrc.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "prefix": "textBasedLanguages",
-  "paths": {
-    "textBasedLanguages": "."
-  }
-}
diff --git a/src/plugins/unified_doc_viewer/kibana.jsonc b/src/plugins/unified_doc_viewer/kibana.jsonc
index 2361a10120e9b..e2febffda4df6 100644
--- a/src/plugins/unified_doc_viewer/kibana.jsonc
+++ b/src/plugins/unified_doc_viewer/kibana.jsonc
@@ -8,7 +8,7 @@
     "server": false,
     "browser": true,
     "requiredBundles": ["kibanaUtils"],
-    "requiredPlugins": ["data", "discoverShared", "fieldFormats"],
+    "requiredPlugins": ["data", "discoverShared", "fieldFormats", "share"],
     "optionalPlugins": ["fieldsMetadata"]
   }
 }
diff --git a/src/plugins/unified_doc_viewer/public/__mocks__/services.ts b/src/plugins/unified_doc_viewer/public/__mocks__/services.ts
index 8496b919b38f0..29ae5f2981a6e 100644
--- a/src/plugins/unified_doc_viewer/public/__mocks__/services.ts
+++ b/src/plugins/unified_doc_viewer/public/__mocks__/services.ts
@@ -12,6 +12,7 @@ import { discoverSharedPluginMock } from '@kbn/discover-shared-plugin/public/moc
 import { fieldFormatsMock } from '@kbn/field-formats-plugin/common/mocks';
 import { fieldsMetadataPluginPublicMock } from '@kbn/fields-metadata-plugin/public/mocks';
 import { uiSettingsServiceMock } from '@kbn/core-ui-settings-browser-mocks';
+import { sharePluginMock } from '@kbn/share-plugin/public/mocks';
 import type { UnifiedDocViewerServices, UnifiedDocViewerStart } from '../types';
 import { Storage } from '@kbn/kibana-utils-plugin/public';
 import { DocViewsRegistry } from '@kbn/unified-doc-viewer';
@@ -29,4 +30,5 @@ export const mockUnifiedDocViewerServices: jest.Mocked<UnifiedDocViewerServices>
   storage: new Storage(localStorage),
   uiSettings: uiSettingsServiceMock.createStartContract(),
   unifiedDocViewer: mockUnifiedDocViewer,
+  share: sharePluginMock.createStartContract(),
 };
diff --git a/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.test.tsx b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.test.tsx
index 7b9379654cec1..a0f4ba8e993ff 100644
--- a/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.test.tsx
+++ b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.test.tsx
@@ -18,6 +18,8 @@ const DATASET_NAME = 'logs.overview';
 const NAMESPACE = 'default';
 const DATA_STREAM_NAME = `logs-${DATASET_NAME}-${NAMESPACE}`;
 const NOW = Date.now();
+const MORE_THAN_1024_CHARS =
+  'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium, totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit, sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?';
 
 const dataView = {
   fields: {
@@ -82,7 +84,7 @@ const fullHit = buildDataTableRecord(
       cloud: {
         provider: ['gcp'],
         region: 'us-central-1',
-        availability_zone: 'us-central-1a',
+        availability_zone: MORE_THAN_1024_CHARS,
         project: {
           id: 'elastic-project',
         },
@@ -92,6 +94,9 @@ const fullHit = buildDataTableRecord(
       },
       'agent.name': 'node',
     },
+    ignored_field_values: {
+      'cloud.availability_zone': [MORE_THAN_1024_CHARS],
+    },
   },
   dataView
 );
@@ -159,4 +164,37 @@ describe('LogsOverview', () => {
       expect(screen.queryByTestId('unifiedDocViewLogsOverviewLogShipper')).toBeInTheDocument();
     });
   });
+  describe('Degraded Fields section', () => {
+    it('should load the degraded fields container when present', async () => {
+      expect(
+        screen.queryByTestId('unifiedDocViewLogsOverviewDegradedFieldsAccordion')
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByTestId('unifiedDocViewLogsOverviewDegradedFieldsTechPreview')
+      ).toBeInTheDocument();
+      expect(
+        screen.queryByTestId('unifiedDocViewLogsOverviewDegradedFieldTitleCount')
+      ).toBeInTheDocument();
+
+      // The accordion must be closed by default
+      const accordion = screen.queryByTestId('unifiedDocViewLogsOverviewDegradedFieldsAccordion1');
+
+      if (accordion === null) {
+        return;
+      }
+      const button = accordion.querySelector('button');
+
+      if (button === null) {
+        return;
+      }
+      // Check the aria-expanded property of the button
+      const isExpanded = button.getAttribute('aria-expanded');
+      expect(isExpanded).toBe('false');
+
+      button.click();
+      expect(
+        screen.queryByTestId('unifiedDocViewLogsOverviewDegradedFieldsQualityIssuesTable')
+      ).toBeInTheDocument();
+    });
+  });
 });
diff --git a/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.tsx b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.tsx
index c0161d112e955..b46570f4f0d37 100644
--- a/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.tsx
+++ b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview.tsx
@@ -15,6 +15,7 @@ import { LogsOverviewHighlights } from './logs_overview_highlights';
 import { FieldActionsProvider } from '../../hooks/use_field_actions';
 import { getUnifiedDocViewerServices } from '../../plugin';
 import { LogsOverviewAIAssistant } from './logs_overview_ai_assistant';
+import { LogsOverviewDegradedFields } from './logs_overview_degraded_fields';
 
 export function LogsOverview({
   columns,
@@ -38,6 +39,7 @@ export function LogsOverview({
       <LogsOverviewHeader doc={parsedDoc} />
       <EuiHorizontalRule margin="xs" />
       <LogsOverviewHighlights formattedDoc={parsedDoc} flattenedDoc={hit.flattened} />
+      <LogsOverviewDegradedFields rawDoc={hit.raw} />
       <LogsOverviewAIAssistant doc={hit} />
     </FieldActionsProvider>
   );
diff --git a/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview_degraded_fields.tsx b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview_degraded_fields.tsx
new file mode 100644
index 0000000000000..976ef71c6b647
--- /dev/null
+++ b/src/plugins/unified_doc_viewer/public/components/doc_viewer_logs_overview/logs_overview_degraded_fields.tsx
@@ -0,0 +1,321 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+import React, { useMemo, useState } from 'react';
+import { DataTableRecord } from '@kbn/discover-utils';
+import {
+  EuiAccordion,
+  EuiBadge,
+  EuiBetaBadge,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHorizontalRule,
+  EuiTitle,
+  EuiBasicTable,
+  useGeneratedHtmlId,
+  EuiBasicTableColumn,
+  EuiHeaderLink,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { orderBy } from 'lodash';
+import { getRouterLinkProps } from '@kbn/router-utils';
+import { DATA_QUALITY_LOCATOR_ID, DataQualityLocatorParams } from '@kbn/deeplinks-observability';
+import { BrowserUrlService } from '@kbn/share-plugin/public';
+import { getUnifiedDocViewerServices } from '../../plugin';
+
+type Direction = 'asc' | 'desc';
+type SortField = 'issue' | 'values';
+
+const DEFAULT_SORT_FIELD = 'issue';
+const DEFAULT_SORT_DIRECTION = 'asc';
+const DEFAULT_ROWS_PER_PAGE = 5;
+
+interface DegradedField {
+  issue: string;
+  values: string[];
+}
+
+interface ParamsForLocator {
+  dataStreamType: string;
+  dataStreamName: string;
+  dataStreamNamespace: string;
+  rawName: string;
+}
+
+interface TableOptions {
+  page: {
+    index: number;
+    size: number;
+  };
+  sort: {
+    field: SortField;
+    direction: Direction;
+  };
+}
+
+const DEFAULT_TABLE_OPTIONS: TableOptions = {
+  page: {
+    index: 0,
+    size: 0,
+  },
+  sort: {
+    field: DEFAULT_SORT_FIELD,
+    direction: DEFAULT_SORT_DIRECTION,
+  },
+};
+
+const qualityIssuesAccordionTitle = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.title.qualityIssues',
+  {
+    defaultMessage: 'Quality Issues',
+  }
+);
+
+const qualityIssuesAccordionTechPreviewBadge = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.title.techPreview',
+  {
+    defaultMessage: 'TECH PREVIEW',
+  }
+);
+
+const issueColumnName = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.qualityIssues.table.field',
+  {
+    defaultMessage: 'Issue',
+  }
+);
+
+const valuesColumnName = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.qualityIssues.table.values',
+  {
+    defaultMessage: 'Values',
+  }
+);
+
+const textFieldIgnored = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.qualityIssues.table.textIgnored',
+  {
+    defaultMessage: 'field ignored',
+  }
+);
+
+export const datasetQualityLinkTitle = i18n.translate(
+  'unifiedDocViewer.docView.logsOverview.accordion.qualityIssues.table.datasetQualityLinkTitle',
+  {
+    defaultMessage: 'Data set details',
+  }
+);
+
+export const LogsOverviewDegradedFields = ({ rawDoc }: { rawDoc: DataTableRecord['raw'] }) => {
+  const { ignored_field_values: ignoredFieldValues = {}, fields: sourceFields = {} } = rawDoc;
+  const countOfDegradedFields = Object.keys(ignoredFieldValues)?.length;
+
+  const columns = getDegradedFieldsColumns();
+  const tableData = getDataFormattedForTable(ignoredFieldValues);
+
+  const paramsForLocator = getParamsForLocator(sourceFields);
+
+  const accordionId = useGeneratedHtmlId({
+    prefix: qualityIssuesAccordionTitle,
+  });
+
+  const [tableOptions, setTableOptions] = useState<TableOptions>(DEFAULT_TABLE_OPTIONS);
+
+  const onTableChange = (options: {
+    page: { index: number; size: number };
+    sort?: { field: SortField; direction: Direction };
+  }) => {
+    setTableOptions({
+      page: {
+        index: options.page.index,
+        size: options.page.size,
+      },
+      sort: {
+        field: options.sort?.field ?? DEFAULT_SORT_FIELD,
+        direction: options.sort?.direction ?? DEFAULT_SORT_DIRECTION,
+      },
+    });
+  };
+
+  const pagination = useMemo(
+    () => ({
+      pageIndex: tableOptions.page.index,
+      pageSize: DEFAULT_ROWS_PER_PAGE,
+      totalItemCount: tableData?.length ?? 0,
+      hidePerPageOptions: true,
+    }),
+    [tableData, tableOptions]
+  );
+
+  const renderedItems = useMemo(() => {
+    const sortedItems = orderBy(tableData, tableOptions.sort.field, tableOptions.sort.direction);
+    return sortedItems.slice(
+      tableOptions.page.index * DEFAULT_ROWS_PER_PAGE,
+      (tableOptions.page.index + 1) * DEFAULT_ROWS_PER_PAGE
+    );
+  }, [tableData, tableOptions]);
+
+  const { share } = getUnifiedDocViewerServices();
+  const { url: urlService } = share;
+
+  const accordionTitle = (
+    <EuiFlexGroup alignItems="center" gutterSize="s" direction="row">
+      <EuiFlexItem grow={false}>
+        <EuiTitle size="xs">
+          <p>{qualityIssuesAccordionTitle}</p>
+        </EuiTitle>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiBadge
+          color="default"
+          data-test-subj="unifiedDocViewLogsOverviewDegradedFieldTitleCount"
+        >
+          {countOfDegradedFields}
+        </EuiBadge>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiBetaBadge
+          label={qualityIssuesAccordionTechPreviewBadge}
+          color="hollow"
+          data-test-subj="unifiedDocViewLogsOverviewDegradedFieldsTechPreview"
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+
+  return countOfDegradedFields > 0 ? (
+    <>
+      <EuiAccordion
+        id={accordionId}
+        buttonContent={accordionTitle}
+        paddingSize="m"
+        initialIsOpen={false}
+        extraAction={
+          <DatasetQualityLink urlService={urlService} paramsForLocator={paramsForLocator} />
+        }
+        data-test-subj="unifiedDocViewLogsOverviewDegradedFieldsAccordion"
+      >
+        <EuiBasicTable
+          tableLayout="fixed"
+          columns={columns}
+          items={renderedItems ?? []}
+          sorting={{ sort: tableOptions.sort }}
+          onChange={onTableChange}
+          pagination={pagination}
+          data-test-subj="unifiedDocViewLogsOverviewDegradedFieldsQualityIssuesTable"
+        />
+      </EuiAccordion>
+      <EuiHorizontalRule margin="xs" />
+    </>
+  ) : null;
+};
+
+const getDegradedFieldsColumns = (): Array<EuiBasicTableColumn<DegradedField>> => [
+  {
+    name: issueColumnName,
+    sortable: true,
+    field: 'issue',
+    render: (issue: string) => {
+      return (
+        <>
+          <b>{issue}</b>&nbsp;{textFieldIgnored}
+        </>
+      );
+    },
+  },
+  {
+    name: valuesColumnName,
+    sortable: true,
+    field: 'values',
+    render: (values: string[]) => {
+      return values.map((value, idx) => <EuiBadge key={idx}>{value}</EuiBadge>);
+    },
+  },
+];
+
+const getDataFormattedForTable = (
+  ignoredFieldValues: Record<string, string[]>
+): DegradedField[] => {
+  return Object.entries(ignoredFieldValues).map(([field, values]) => ({
+    issue: field,
+    values,
+  }));
+};
+
+const getParamsForLocator = (
+  sourceFields: DataTableRecord['raw']['fields']
+): ParamsForLocator | undefined => {
+  if (sourceFields) {
+    const dataStreamTypeArr = sourceFields['data_stream.type'];
+    const dataStreamType = dataStreamTypeArr ? dataStreamTypeArr[0] : undefined;
+    const dataStreamNameArr = sourceFields['data_stream.dataset'];
+    const dataStreamName = dataStreamNameArr ? dataStreamNameArr[0] : undefined;
+    const dataStreamNamespaceArr = sourceFields['data_stream.namespace'];
+    const dataStreamNamespace = dataStreamNamespaceArr ? dataStreamNamespaceArr[0] : undefined;
+    let rawName;
+
+    if (dataStreamType && dataStreamName && dataStreamNamespace) {
+      rawName = `${dataStreamType}-${dataStreamName}-${dataStreamNamespace}`;
+    }
+
+    if (rawName) {
+      return {
+        dataStreamType,
+        dataStreamName,
+        dataStreamNamespace,
+        rawName,
+      };
+    }
+  }
+};
+
+const DatasetQualityLink = React.memo(
+  ({
+    urlService,
+    paramsForLocator,
+  }: {
+    urlService: BrowserUrlService;
+    paramsForLocator?: ParamsForLocator;
+  }) => {
+    const locator = urlService.locators.get<DataQualityLocatorParams>(DATA_QUALITY_LOCATOR_ID);
+    const locatorParams: DataQualityLocatorParams = paramsForLocator
+      ? {
+          flyout: {
+            dataset: {
+              rawName: paramsForLocator.rawName,
+              type: paramsForLocator.dataStreamType,
+              name: paramsForLocator.dataStreamName,
+              namespace: paramsForLocator.dataStreamNamespace,
+            },
+          },
+        }
+      : {};
+
+    const datasetQualityUrl = locator?.getRedirectUrl(locatorParams);
+
+    const navigateToDatasetQuality = () => {
+      locator?.navigate(locatorParams);
+    };
+
+    const datasetQualityLinkProps = getRouterLinkProps({
+      href: datasetQualityUrl,
+      onClick: navigateToDatasetQuality,
+    });
+
+    return paramsForLocator ? (
+      <EuiHeaderLink
+        {...datasetQualityLinkProps}
+        color="primary"
+        data-test-subj="unifiedDocViewLogsOverviewDegradedFieldDatasetLink"
+        iconType="popout"
+        target="_blank"
+      >
+        {datasetQualityLinkTitle}
+      </EuiHeaderLink>
+    ) : null;
+  }
+);
diff --git a/src/plugins/unified_doc_viewer/public/plugin.tsx b/src/plugins/unified_doc_viewer/public/plugin.tsx
index 13027a2541084..9c4d7117c37dd 100644
--- a/src/plugins/unified_doc_viewer/public/plugin.tsx
+++ b/src/plugins/unified_doc_viewer/public/plugin.tsx
@@ -19,6 +19,7 @@ import { CoreStart } from '@kbn/core/public';
 import { dynamic } from '@kbn/shared-ux-utility';
 import { DiscoverSharedPublicStart } from '@kbn/discover-shared-plugin/public';
 import { FieldsMetadataPublicStart } from '@kbn/fields-metadata-plugin/public';
+import { SharePluginStart } from '@kbn/share-plugin/public';
 import type { UnifiedDocViewerServices } from './types';
 
 export const [getUnifiedDocViewerServices, setUnifiedDocViewerServices] =
@@ -52,6 +53,7 @@ export interface UnifiedDocViewerStartDeps {
   discoverShared: DiscoverSharedPublicStart;
   fieldFormats: FieldFormatsStart;
   fieldsMetadata: FieldsMetadataPublicStart;
+  share: SharePluginStart;
 }
 
 export class UnifiedDocViewerPublicPlugin
@@ -121,7 +123,7 @@ export class UnifiedDocViewerPublicPlugin
 
   public start(core: CoreStart, deps: UnifiedDocViewerStartDeps) {
     const { analytics, uiSettings } = core;
-    const { data, discoverShared, fieldFormats, fieldsMetadata } = deps;
+    const { data, discoverShared, fieldFormats, fieldsMetadata, share } = deps;
     const storage = new Storage(localStorage);
     const unifiedDocViewer = {
       registry: this.docViewsRegistry,
@@ -135,6 +137,7 @@ export class UnifiedDocViewerPublicPlugin
       storage,
       uiSettings,
       unifiedDocViewer,
+      share,
     };
     setUnifiedDocViewerServices(services);
     return unifiedDocViewer;
diff --git a/src/plugins/unified_doc_viewer/public/types.ts b/src/plugins/unified_doc_viewer/public/types.ts
index c19c60da72b13..e471fa87b85c1 100644
--- a/src/plugins/unified_doc_viewer/public/types.ts
+++ b/src/plugins/unified_doc_viewer/public/types.ts
@@ -5,7 +5,6 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
 export type { JsonCodeEditorProps } from './components';
 export type { EsDocSearchProps } from './hooks';
 export type { UnifiedDocViewerSetup, UnifiedDocViewerStart } from './plugin';
@@ -17,6 +16,7 @@ import type { FieldFormatsStart } from '@kbn/field-formats-plugin/public';
 import type { FieldsMetadataPublicStart } from '@kbn/fields-metadata-plugin/public';
 import type { Storage } from '@kbn/kibana-utils-plugin/public';
 import type { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
+import type { SharePluginStart } from '@kbn/share-plugin/public';
 import type { UnifiedDocViewerStart } from './plugin';
 
 export interface UnifiedDocViewerServices {
@@ -28,4 +28,5 @@ export interface UnifiedDocViewerServices {
   storage: Storage;
   uiSettings: IUiSettingsClient;
   unifiedDocViewer: UnifiedDocViewerStart;
+  share: SharePluginStart;
 }
diff --git a/src/plugins/unified_doc_viewer/tsconfig.json b/src/plugins/unified_doc_viewer/tsconfig.json
index fbe2ac83c5f1a..3b271744ed4af 100644
--- a/src/plugins/unified_doc_viewer/tsconfig.json
+++ b/src/plugins/unified_doc_viewer/tsconfig.json
@@ -32,7 +32,10 @@
     "@kbn/discover-shared-plugin",
     "@kbn/fields-metadata-plugin",
     "@kbn/unified-data-table",
-    "@kbn/core-notifications-browser"
+    "@kbn/core-notifications-browser",
+    "@kbn/deeplinks-observability",
+    "@kbn/share-plugin",
+    "@kbn/router-utils"
   ],
   "exclude": [
     "target/**/*",
diff --git a/src/plugins/unified_histogram/public/chart/histogram.tsx b/src/plugins/unified_histogram/public/chart/histogram.tsx
index 50c8f7242c589..aab4757706bd1 100644
--- a/src/plugins/unified_histogram/public/chart/histogram.tsx
+++ b/src/plugins/unified_histogram/public/chart/histogram.tsx
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { useEuiTheme, useResizeObserver } from '@elastic/eui';
+import { useEuiTheme } from '@elastic/eui';
 import { css } from '@emotion/react';
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState } from 'react';
 import type { DataView } from '@kbn/data-views-plugin/public';
 import type { DefaultInspectorAdapters, Datatable } from '@kbn/expressions-plugin/common';
 import type { IKibanaSearchResponse } from '@kbn/search-types';
@@ -106,7 +106,6 @@ export function Histogram({
   abortController,
 }: HistogramProps) {
   const [bucketInterval, setBucketInterval] = useState<UnifiedHistogramBucketInterval>();
-  const [chartSize, setChartSize] = useState('100%');
   const { timeRangeText, timeRangeDisplay } = useTimeRange({
     uiSettings,
     bucketInterval,
@@ -115,19 +114,8 @@ export function Histogram({
     isPlainRecord,
     timeField: dataView.timeFieldName,
   });
-  const chartRef = useRef<HTMLDivElement | null>(null);
-  const { height: containerHeight, width: containerWidth } = useResizeObserver(chartRef.current);
   const { attributes } = visContext;
 
-  useEffect(() => {
-    if (attributes.visualizationType === 'lnsMetric') {
-      const size = containerHeight < containerWidth ? containerHeight : containerWidth;
-      setChartSize(`${size}px`);
-    } else {
-      setChartSize('100%');
-    }
-  }, [attributes, containerHeight, containerWidth]);
-
   const onLoad = useStableCallback(
     (
       isLoading: boolean,
@@ -197,7 +185,7 @@ export function Histogram({
     }
 
     & .lnsExpressionRenderer {
-      width: ${chartSize};
+      width: ${attributes.visualizationType === 'lnsMetric' ? '90%' : '100%'};
       margin: auto;
       box-shadow: ${attributes.visualizationType === 'lnsMetric' ? boxShadow : 'none'};
     }
@@ -222,7 +210,6 @@ export function Histogram({
         data-request-data={requestData}
         data-suggestion-type={visContext.suggestionType}
         css={chartCss}
-        ref={chartRef}
       >
         <lens.EmbeddableComponent
           {...lensProps}
diff --git a/src/plugins/unified_search/.storybook/main.js b/src/plugins/unified_search/.storybook/main.js
index f0e135be6d8a2..3c5919edc3e53 100644
--- a/src/plugins/unified_search/.storybook/main.js
+++ b/src/plugins/unified_search/.storybook/main.js
@@ -12,10 +12,7 @@ import { resolve } from 'path';
 const mockConfig = {
   resolve: {
     alias: {
-      '@kbn/text-based-languages/public': resolve(
-        __dirname,
-        '../public/mocks/text_based_languages_editor.tsx'
-      ),
+      '@kbn/esql/public': resolve(__dirname, '../public/mocks/text_based_languages_editor.tsx'),
     },
   },
 };
diff --git a/src/plugins/unified_search/kibana.jsonc b/src/plugins/unified_search/kibana.jsonc
index 9311d6cece2e2..ad7f73a608857 100644
--- a/src/plugins/unified_search/kibana.jsonc
+++ b/src/plugins/unified_search/kibana.jsonc
@@ -27,7 +27,7 @@
       "kibanaUtils",
       "kibanaReact",
       "data",
-      "textBasedLanguages"
+      "esql"
     ]
   }
 }
diff --git a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
index 941040dfd30f8..1ef6086640200 100644
--- a/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
+++ b/src/plugins/unified_search/public/query_string_input/query_bar_top_row.tsx
@@ -18,7 +18,7 @@ import {
   isOfAggregateQueryType,
   getLanguageDisplayName,
 } from '@kbn/es-query';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import { EMPTY } from 'rxjs';
 import { map } from 'rxjs';
 import { throttle } from 'lodash';
diff --git a/src/plugins/unified_search/tsconfig.json b/src/plugins/unified_search/tsconfig.json
index 82df1ffe507cf..fc830033a69b7 100644
--- a/src/plugins/unified_search/tsconfig.json
+++ b/src/plugins/unified_search/tsconfig.json
@@ -37,7 +37,7 @@
     "@kbn/react-field",
     "@kbn/ui-theme",
     "@kbn/saved-objects-management-plugin",
-    "@kbn/text-based-languages",
+    "@kbn/esql",
     "@kbn/text-based-editor",
     "@kbn/core-doc-links-browser",
     "@kbn/core-lifecycle-browser",
diff --git a/src/plugins/data_view_editor/public/components/rollup_beta_warning/index.ts b/src/plugins/usage_collection/common/index.ts
similarity index 85%
rename from src/plugins/data_view_editor/public/components/rollup_beta_warning/index.ts
rename to src/plugins/usage_collection/common/index.ts
index 4c72c12312855..3f0a94c72671f 100644
--- a/src/plugins/data_view_editor/public/components/rollup_beta_warning/index.ts
+++ b/src/plugins/usage_collection/common/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { RollupBetaWarning } from './rollup_beta_warning';
+export type { UsageCounters } from './types';
diff --git a/src/plugins/usage_collection/common/types/usage_counters/v1.ts b/src/plugins/usage_collection/common/types/usage_counters/v1.ts
index fa53a9d9e93b0..c18af503d06e0 100644
--- a/src/plugins/usage_collection/common/types/usage_counters/v1.ts
+++ b/src/plugins/usage_collection/common/types/usage_counters/v1.ts
@@ -6,10 +6,14 @@
  * Side Public License, v 1.
  */
 
+export type CounterEventSource = 'server' | 'ui';
+
 export interface CounterMetric {
   domainId: string;
+  namespace?: string;
   counterName: string;
   counterType: string;
+  source: CounterEventSource;
   incrementBy: number;
 }
 
@@ -17,10 +21,14 @@ export interface CounterMetric {
  * Details about the counter to be incremented
  */
 export interface IncrementCounterParams {
+  /** The namespace to increment this counter on */
+  namespace?: string;
   /** The name of the counter **/
   counterName: string;
   /** The counter type ("count" by default) **/
   counterType?: string;
+  /** The source of the event we are counting */
+  source?: CounterEventSource;
   /** Increment the counter by this number (1 if not specified) **/
   incrementBy?: number;
 }
diff --git a/src/plugins/usage_collection/common/ui_counters.ts b/src/plugins/usage_collection/common/ui_counters.ts
deleted file mode 100644
index 3ed6e44aee419..0000000000000
--- a/src/plugins/usage_collection/common/ui_counters.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0 and the Server Side Public License, v 1; you may not use this file except
- * in compliance with, at your election, the Elastic License 2.0 or the Server
- * Side Public License, v 1.
- */
-
-export const serializeUiCounterName = ({
-  appName,
-  eventName,
-}: {
-  appName: string;
-  eventName: string;
-}) => {
-  return `${appName}:${eventName}`;
-};
-
-export const deserializeUiCounterName = (key: string) => {
-  const [appName, ...restKey] = key.split(':');
-  const eventName = restKey.join(':');
-  return { appName, eventName };
-};
diff --git a/src/plugins/usage_collection/server/index.ts b/src/plugins/usage_collection/server/index.ts
index 38298b42ed9c1..fb2894d7f3903 100644
--- a/src/plugins/usage_collection/server/index.ts
+++ b/src/plugins/usage_collection/server/index.ts
@@ -23,10 +23,9 @@ export type {
   UsageCountersSavedObjectAttributes,
   IncrementCounterParams,
   UsageCounter,
-  SerializeCounterParams,
 } from './usage_counters';
 
-export { USAGE_COUNTERS_SAVED_OBJECT_TYPE, serializeCounterKey } from './usage_counters';
+export { serializeCounterKey, USAGE_COUNTERS_SAVED_OBJECT_TYPE } from './usage_counters';
 
 export type { UsageCollectionSetup } from './plugin';
 export { config } from './config';
diff --git a/src/plugins/usage_collection/server/mocks.ts b/src/plugins/usage_collection/server/mocks.ts
index bc59cf3cbef22..36f30357f6207 100644
--- a/src/plugins/usage_collection/server/mocks.ts
+++ b/src/plugins/usage_collection/server/mocks.ts
@@ -26,12 +26,12 @@ export const createUsageCollectionSetupMock = () => {
     executionContext: executionContextServiceMock.createSetupContract(),
     maximumWaitTimeForAllCollectorsInS: 1,
   });
-  const { createUsageCounter, getUsageCounterByType } =
+  const { createUsageCounter, getUsageCounterByDomainId } =
     usageCountersServiceMock.createSetupContract();
 
   const usageCollectionSetupMock: jest.Mocked<UsageCollectionSetup> = {
     createUsageCounter,
-    getUsageCounterByType,
+    getUsageCounterByDomainId,
     bulkFetch: jest.fn().mockImplementation(collectorSet.bulkFetch),
     getCollectorByType: jest.fn().mockImplementation(collectorSet.getCollectorByType),
     toApiFieldNames: jest.fn().mockImplementation(collectorSet.toApiFieldNames),
diff --git a/src/plugins/usage_collection/server/plugin.ts b/src/plugins/usage_collection/server/plugin.ts
index 7139de5091b50..ca551c129d84e 100644
--- a/src/plugins/usage_collection/server/plugin.ts
+++ b/src/plugins/usage_collection/server/plugin.ts
@@ -33,7 +33,7 @@ export interface UsageCollectionSetup {
   /**
    * Returns a usage counter by type
    */
-  getUsageCounterByType: (type: string) => UsageCounter | undefined;
+  getUsageCounterByDomainId: (type: string) => UsageCounter | undefined;
   /**
    * Creates a usage collector to collect plugin telemetry data.
    * registerCollector must be called to connect the created collector with the service.
@@ -112,13 +112,13 @@ export class UsageCollectionPlugin implements Plugin<UsageCollectionSetup> {
       bufferDurationMs: config.usageCounters.bufferDuration.asMilliseconds(),
     });
 
-    const { createUsageCounter, getUsageCounterByType } = this.usageCountersService.setup(core);
+    const usageCountersServiceSetup = this.usageCountersService.setup(core);
+    const { createUsageCounter, getUsageCounterByDomainId } = usageCountersServiceSetup;
 
-    const uiCountersUsageCounter = createUsageCounter('uiCounter');
     const router = core.http.createRouter();
     setupRoutes({
       router,
-      uiCountersUsageCounter,
+      usageCountersServiceSetup,
       getSavedObjects: () => this.savedObjects,
       collectorSet,
       config: {
@@ -141,7 +141,7 @@ export class UsageCollectionPlugin implements Plugin<UsageCollectionSetup> {
       toApiFieldNames: collectorSet.toApiFieldNames,
       toObject: collectorSet.toObject,
       createUsageCounter,
-      getUsageCounterByType,
+      getUsageCounterByDomainId,
     };
   }
 
diff --git a/src/plugins/usage_collection/server/report/index.ts b/src/plugins/usage_collection/server/report/index.ts
index 1a4cbd0e209a0..38df62c7e2f07 100644
--- a/src/plugins/usage_collection/server/report/index.ts
+++ b/src/plugins/usage_collection/server/report/index.ts
@@ -6,5 +6,5 @@
  * Side Public License, v 1.
  */
 
-export { storeReport } from './store_report';
+export { storeUiReport } from './store_ui_report';
 export { reportSchema } from './schema';
diff --git a/src/plugins/usage_collection/server/report/schema.ts b/src/plugins/usage_collection/server/report/schema.ts
index 1f76d3a4db76d..9f4e65c224e08 100644
--- a/src/plugins/usage_collection/server/report/schema.ts
+++ b/src/plugins/usage_collection/server/report/schema.ts
@@ -36,6 +36,7 @@ export const reportSchema = schema.object({
         type: schema.string(),
         appName: schema.string(),
         eventName: schema.string(),
+        namespace: schema.maybe(schema.string()),
         total: schema.number(),
       })
     )
diff --git a/src/plugins/usage_collection/server/report/store_report.test.mocks.ts b/src/plugins/usage_collection/server/report/store_ui_report.test.mocks.ts
similarity index 100%
rename from src/plugins/usage_collection/server/report/store_report.test.mocks.ts
rename to src/plugins/usage_collection/server/report/store_ui_report.test.mocks.ts
diff --git a/src/plugins/usage_collection/server/report/store_report.test.ts b/src/plugins/usage_collection/server/report/store_ui_report.test.ts
similarity index 70%
rename from src/plugins/usage_collection/server/report/store_report.test.ts
rename to src/plugins/usage_collection/server/report/store_ui_report.test.ts
index e1c33197142d9..4fb98c8897f0a 100644
--- a/src/plugins/usage_collection/server/report/store_report.test.ts
+++ b/src/plugins/usage_collection/server/report/store_ui_report.test.ts
@@ -6,22 +6,24 @@
  * Side Public License, v 1.
  */
 
-import { storeApplicationUsageMock } from './store_report.test.mocks';
+import { storeApplicationUsageMock } from './store_ui_report.test.mocks';
 
 import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
-import { storeReport } from './store_report';
-import { ReportSchemaType } from './schema';
 import { METRIC_TYPE } from '@kbn/analytics';
+import type { ReportSchemaType } from './schema';
+import { storeUiReport } from './store_ui_report';
 import { usageCountersServiceMock } from '../usage_counters/usage_counters_service.mock';
 
-describe('store_report', () => {
-  const usageCountersServiceSetup = usageCountersServiceMock.createSetupContract();
-  const uiCountersUsageCounter = usageCountersServiceSetup.createUsageCounter('uiCounter');
-
+describe('store_ui_report', () => {
   let repository: ReturnType<typeof savedObjectsRepositoryMock.create>;
+  let usageCountersServiceSetup: ReturnType<typeof usageCountersServiceMock.createSetupContract>;
+  let usageCounterMock: ReturnType<typeof usageCountersServiceSetup.createUsageCounter>;
 
   beforeEach(() => {
+    usageCountersServiceSetup = usageCountersServiceMock.createSetupContract();
     repository = savedObjectsRepositoryMock.create();
+    usageCounterMock = usageCountersServiceSetup.createUsageCounter('dashboards');
+    usageCountersServiceSetup.createUsageCounter.mockReturnValue(usageCounterMock);
   });
 
   afterEach(() => {
@@ -64,8 +66,22 @@ describe('store_report', () => {
         },
       },
     };
-    await storeReport(repository, uiCountersUsageCounter, report);
+    await storeUiReport(repository, usageCountersServiceSetup, report);
+    await new Promise((resolve) => setTimeout(resolve, 4000));
 
+    expect(usageCountersServiceSetup.createUsageCounter.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "dashboards",
+        ],
+        Array [
+          "test-app-name",
+        ],
+        Array [
+          "test-app-name",
+        ],
+      ]
+    `);
     expect(repository.create.mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
@@ -96,21 +112,22 @@ describe('store_report', () => {
         ],
       ]
     `);
-    expect((uiCountersUsageCounter.incrementCounter as jest.Mock).mock.calls)
-      .toMatchInlineSnapshot(`
+    expect((usageCounterMock.incrementCounter as jest.Mock).mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
           Object {
-            "counterName": "test-app-name:test-event-name",
+            "counterName": "test-event-name",
             "counterType": "loaded",
             "incrementBy": 1,
+            "source": "ui",
           },
         ],
         Array [
           Object {
-            "counterName": "test-app-name:test-event-name",
+            "counterName": "test-event-name",
             "counterType": "click",
             "incrementBy": 2,
+            "source": "ui",
           },
         ],
       ]
@@ -131,7 +148,7 @@ describe('store_report', () => {
       uiCounter: void 0,
       application_usage: void 0,
     };
-    await storeReport(repository, uiCountersUsageCounter, report);
+    await storeUiReport(repository, usageCountersServiceSetup, report);
 
     expect(repository.bulkCreate).not.toHaveBeenCalled();
     expect(repository.incrementCounter).not.toHaveBeenCalled();
diff --git a/src/plugins/usage_collection/server/report/store_report.ts b/src/plugins/usage_collection/server/report/store_ui_report.ts
similarity index 86%
rename from src/plugins/usage_collection/server/report/store_report.ts
rename to src/plugins/usage_collection/server/report/store_ui_report.ts
index 40ea5cbf414a8..1cf966e3466e8 100644
--- a/src/plugins/usage_collection/server/report/store_report.ts
+++ b/src/plugins/usage_collection/server/report/store_ui_report.ts
@@ -11,12 +11,11 @@ import moment from 'moment';
 import { chain, sumBy } from 'lodash';
 import { ReportSchemaType } from './schema';
 import { storeApplicationUsage } from './store_application_usage';
-import { UsageCounter } from '../usage_counters';
-import { serializeUiCounterName } from '../../common/ui_counters';
+import { type UsageCountersServiceSetup } from '../usage_counters';
 
-export async function storeReport(
+export async function storeUiReport(
   internalRepository: ISavedObjectsRepository,
-  uiCountersUsageCounter: UsageCounter,
+  counters: UsageCountersServiceSetup,
   report: ReportSchemaType
 ) {
   const uiCounters = report.uiCounter ? Object.entries(report.uiCounter) : [];
@@ -60,11 +59,15 @@ export async function storeReport(
     // UI Counters
     ...uiCounters.map(async ([, metric]) => {
       const { appName, eventName, total, type } = metric;
-      const counterName = serializeUiCounterName({ appName, eventName });
-      uiCountersUsageCounter.incrementCounter({
-        counterName,
+
+      const counter =
+        counters.getUsageCounterByDomainId(appName) ?? counters.createUsageCounter(appName);
+
+      counter.incrementCounter({
+        counterName: eventName,
         counterType: type,
         incrementBy: total,
+        source: 'ui',
       });
     }),
     // Application Usage
diff --git a/src/plugins/usage_collection/server/routes/index.ts b/src/plugins/usage_collection/server/routes/index.ts
index 01d26b177218c..3bb42cf4865ce 100644
--- a/src/plugins/usage_collection/server/routes/index.ts
+++ b/src/plugins/usage_collection/server/routes/index.ts
@@ -16,16 +16,16 @@ import { Observable } from 'rxjs';
 import { CollectorSet } from '../collector';
 import { registerUiCountersRoute } from './ui_counters';
 import { registerStatsRoute } from './stats';
-import type { UsageCounter } from '../usage_counters';
+import type { UsageCountersServiceSetup } from '../usage_counters';
 export function setupRoutes({
   router,
-  uiCountersUsageCounter,
+  usageCountersServiceSetup,
   getSavedObjects,
   ...rest
 }: {
   router: IRouter;
   getSavedObjects: () => ISavedObjectsRepository | undefined;
-  uiCountersUsageCounter: UsageCounter;
+  usageCountersServiceSetup: UsageCountersServiceSetup;
   config: {
     allowAnonymous: boolean;
     kibanaIndex: string;
@@ -41,6 +41,6 @@ export function setupRoutes({
   metrics: MetricsServiceSetup;
   overallStatus$: Observable<ServiceStatus>;
 }) {
-  registerUiCountersRoute(router, getSavedObjects, uiCountersUsageCounter);
+  registerUiCountersRoute(router, getSavedObjects, usageCountersServiceSetup);
   registerStatsRoute({ router, ...rest });
 }
diff --git a/src/plugins/usage_collection/server/routes/ui_counters.ts b/src/plugins/usage_collection/server/routes/ui_counters.ts
index 9752afeae3ef9..e19dd7c57ca6d 100644
--- a/src/plugins/usage_collection/server/routes/ui_counters.ts
+++ b/src/plugins/usage_collection/server/routes/ui_counters.ts
@@ -7,15 +7,15 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { IRouter, ISavedObjectsRepository } from '@kbn/core/server';
-import { storeReport, reportSchema } from '../report';
-import { UsageCounter } from '../usage_counters';
-import { UiCounters } from '../../common/types';
+import type { IRouter, ISavedObjectsRepository } from '@kbn/core/server';
+import { storeUiReport, reportSchema } from '../report';
+import type { UsageCountersServiceSetup } from '../usage_counters';
+import type { UiCounters } from '../../common/types';
 
 export function registerUiCountersRoute(
   router: IRouter,
   getSavedObjects: () => ISavedObjectsRepository | undefined,
-  uiCountersUsageCounter: UsageCounter
+  usageCountersServiceSetup: UsageCountersServiceSetup
 ) {
   router.post(
     {
@@ -33,7 +33,8 @@ export function registerUiCountersRoute(
         if (!internalRepository) {
           throw Error(`The saved objects client hasn't been initialised yet`);
         }
-        await storeReport(internalRepository, uiCountersUsageCounter, requestBody.report);
+        // we pass the whole usageCountersServiceSetup, so that we can create UI counters dynamically
+        await storeUiReport(internalRepository, usageCountersServiceSetup, requestBody.report);
         const bodyOk: UiCounters.v1.UiCountersResponseOk = {
           status: 'ok',
         };
diff --git a/src/plugins/usage_collection/server/usage_counters/index.ts b/src/plugins/usage_collection/server/usage_counters/index.ts
index 05d36aaef502f..fcbcf9f02e681 100644
--- a/src/plugins/usage_collection/server/usage_counters/index.ts
+++ b/src/plugins/usage_collection/server/usage_counters/index.ts
@@ -5,7 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { UsageCounters } from '../../common/types';
+import { UsageCounters } from '../../common';
 export type IncrementCounterParams = UsageCounters.v1.IncrementCounterParams;
 
 export type { UsageCountersServiceSetup } from './usage_counters_service';
@@ -13,5 +13,4 @@ export type { UsageCountersSavedObjectAttributes, UsageCountersSavedObject } fro
 export type { IUsageCounter as UsageCounter } from './usage_counter';
 
 export { UsageCountersService } from './usage_counters_service';
-export type { SerializeCounterParams } from './saved_objects';
-export { USAGE_COUNTERS_SAVED_OBJECT_TYPE, serializeCounterKey } from './saved_objects';
+export { serializeCounterKey, USAGE_COUNTERS_SAVED_OBJECT_TYPE } from './saved_objects';
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
index fa40fd5a8d2be..7a8934e4559fa 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.test.ts
@@ -9,7 +9,7 @@
 import { serializeCounterKey, storeCounter } from './saved_objects';
 import { savedObjectsRepositoryMock } from '@kbn/core/server/mocks';
 
-import { UsageCounters } from '../../common/types';
+import { UsageCounters } from '../../common';
 
 import moment from 'moment';
 
@@ -19,10 +19,12 @@ describe('counterKey', () => {
       domainId: 'a',
       counterName: 'b',
       counterType: 'c',
+      namespace: 'default',
+      source: 'ui',
       date: moment('09042021', 'DDMMYYYY'),
     });
 
-    expect(result).toMatchInlineSnapshot(`"a:09042021:c:b"`);
+    expect(result).toEqual('a:b:c:ui:20210409:default');
   });
 });
 
@@ -40,20 +42,22 @@ describe('storeCounter', () => {
   });
 
   it('stores counter in a saved object', async () => {
-    const counterMetric: UsageCounters.v1.CounterMetric = {
+    const metric: UsageCounters.v1.CounterMetric = {
       domainId: 'a',
       counterName: 'b',
       counterType: 'c',
+      namespace: 'default',
+      source: 'ui',
       incrementBy: 13,
     };
 
-    await storeCounter(counterMetric, internalRepository);
+    await storeCounter({ metric, soRepository: internalRepository });
 
     expect(internalRepository.incrementCounter).toBeCalledTimes(1);
     expect(internalRepository.incrementCounter.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
-        "usage-counters",
-        "a:09042021:c:b",
+        "usage-counter",
+        "a:b:c:ui:20210409",
         Array [
           Object {
             "fieldName": "count",
@@ -61,10 +65,12 @@ describe('storeCounter', () => {
           },
         ],
         Object {
+          "namespace": "default",
           "upsertAttributes": Object {
             "counterName": "b",
             "counterType": "c",
             "domainId": "a",
+            "source": "ui",
           },
         },
       ]
diff --git a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
index 402dabb62b96b..ab8bc6620ac87 100644
--- a/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
+++ b/src/plugins/usage_collection/server/usage_counters/saved_objects.ts
@@ -6,13 +6,14 @@
  * Side Public License, v 1.
  */
 
+import moment from 'moment';
+import { USAGE_COUNTERS_SAVED_OBJECT_INDEX } from '@kbn/core-saved-objects-server';
 import type {
   SavedObject,
   SavedObjectsRepository,
   SavedObjectsServiceSetup,
 } from '@kbn/core/server';
-import moment from 'moment';
-import { UsageCounters } from '../../common/types';
+import { UsageCounters } from '../../common';
 
 /**
  * The attributes stored in the UsageCounters' SavedObjects
@@ -24,6 +25,8 @@ export interface UsageCountersSavedObjectAttributes {
   counterName: string;
   /** The counter type **/
   counterType: string;
+  /** The source of the event that is being counted: 'server' | 'ui' **/
+  source: string;
   /** Number of times the event has occurred **/
   count: number;
 }
@@ -34,13 +37,31 @@ export interface UsageCountersSavedObjectAttributes {
 export type UsageCountersSavedObject = SavedObject<UsageCountersSavedObjectAttributes>;
 
 /** The Saved Objects type for Usage Counters **/
-export const USAGE_COUNTERS_SAVED_OBJECT_TYPE = 'usage-counters';
+export const USAGE_COUNTERS_SAVED_OBJECT_TYPE = 'usage-counter';
 
-export const registerUsageCountersSavedObjectType = (
+export const registerUsageCountersSavedObjectTypes = (
   savedObjectsSetup: SavedObjectsServiceSetup
 ) => {
   savedObjectsSetup.registerType({
     name: USAGE_COUNTERS_SAVED_OBJECT_TYPE,
+    indexPattern: USAGE_COUNTERS_SAVED_OBJECT_INDEX,
+    hidden: false,
+    namespaceType: 'single',
+    mappings: {
+      dynamic: false,
+      properties: {
+        domainId: { type: 'keyword' },
+        counterName: { type: 'keyword' },
+        counterType: { type: 'keyword' },
+        source: { type: 'keyword' },
+        count: { type: 'integer' },
+      },
+    },
+  });
+
+  // DEPRECATED: we keep it just to ensure non-reindex migrations (serverless)
+  savedObjectsSetup.registerType({
+    name: 'usage-counters',
     hidden: false,
     namespaceType: 'agnostic',
     mappings: {
@@ -56,53 +77,68 @@ export const registerUsageCountersSavedObjectType = (
  * Parameters to the `serializeCounterKey` method
  * @internal used in kibana_usage_collectors
  */
-export interface SerializeCounterParams {
+export interface SerializeCounterKeyParams {
   /** The domain ID registered in the UsageCounter **/
   domainId: string;
   /** The counter name **/
   counterName: string;
   /** The counter type **/
   counterType: string;
-  /** The date to which serialize the key **/
-  date: moment.MomentInput;
+  /** The namespace of this counter */
+  namespace?: string;
+  /** The source of the event we are counting */
+  source: string;
+  /** The date to which serialize the key (defaults to 'now') **/
+  date?: moment.MomentInput;
 }
 
 /**
  * Generates a key based on the UsageCounter details
  * @internal used in kibana_usage_collectors
- * @param opts {@link SerializeCounterParams}
+ * @param opts {@link SerializeCounterKeyParams}
  */
 export const serializeCounterKey = ({
   domainId,
   counterName,
   counterType,
+  namespace,
+  source,
   date,
-}: SerializeCounterParams) => {
-  const dayDate = moment(date).format('DDMMYYYY');
-  return `${domainId}:${dayDate}:${counterType}:${counterName}`;
+}: SerializeCounterKeyParams) => {
+  const dayDate = moment(date).format('YYYYMMDD');
+  // e.g. 'dashboards:viewed:total:ui:20240628'          // namespace-agnostic counters
+  // e.g. 'dashboards:viewed:total:ui:20240628:default'  // namespaced counters
+  const namespaceSuffix = namespace ? `:${namespace}` : '';
+  return `${domainId}:${counterName}:${counterType}:${source}:${dayDate}${namespaceSuffix}`;
 };
 
-export const storeCounter = async (
-  counterMetric: UsageCounters.v1.CounterMetric,
-  internalRepository: Pick<SavedObjectsRepository, 'incrementCounter'>
-) => {
-  const { counterName, counterType, domainId, incrementBy } = counterMetric;
+export interface StoreCounterParams {
+  metric: UsageCounters.v1.CounterMetric;
+  soRepository: Pick<SavedObjectsRepository, 'incrementCounter'>;
+}
+
+export const storeCounter = async ({ metric, soRepository }: StoreCounterParams) => {
+  const { namespace, counterName, counterType, domainId, source, incrementBy } = metric;
+  // same counter key can be used in different namespaces (no need to make namespace part of the key)
   const key = serializeCounterKey({
-    date: moment.now(),
     domainId,
     counterName,
     counterType,
+    source,
+    date: moment.now(),
   });
 
-  return await internalRepository.incrementCounter(
+  return await soRepository.incrementCounter(
     USAGE_COUNTERS_SAVED_OBJECT_TYPE,
     key,
     [{ fieldName: 'count', incrementBy }],
     {
+      ...(namespace && { namespace }),
       upsertAttributes: {
         domainId,
         counterName,
         counterType,
+        source,
       },
     }
   );
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
index f3f6c2870ce25..aea0ab44f6cdd 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counter.test.ts
@@ -5,10 +5,9 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import { UsageCounter } from './usage_counter';
-import type { UsageCounters } from '../../common/types';
 import * as Rx from 'rxjs';
-import * as rxOp from 'rxjs';
+import { UsageCounter } from './usage_counter';
+import type { UsageCounters } from '../../common';
 
 describe('UsageCounter', () => {
   const domainId = 'test-domain-id';
@@ -21,18 +20,37 @@ describe('UsageCounter', () => {
 
   describe('#incrementCounter', () => {
     it('#incrementCounter calls counter$.next', async () => {
-      const result = counter$.pipe(rxOp.take(1), rxOp.toArray()).toPromise();
-      usageCounter.incrementCounter({ counterName: 'test', counterType: 'type', incrementBy: 13 });
+      const result = Rx.firstValueFrom(counter$.pipe(Rx.take(1), Rx.toArray()));
+      usageCounter.incrementCounter({
+        counterName: 'test',
+        counterType: 'type',
+        incrementBy: 13,
+        source: 'ui',
+        namespace: 'second',
+      });
       await expect(result).resolves.toEqual([
-        { counterName: 'test', counterType: 'type', domainId: 'test-domain-id', incrementBy: 13 },
+        {
+          domainId: 'test-domain-id',
+          counterType: 'type',
+          counterName: 'test',
+          source: 'ui',
+          namespace: 'second',
+          incrementBy: 13,
+        },
       ]);
     });
 
     it('passes default configs to counter$', async () => {
-      const result = counter$.pipe(rxOp.take(1), rxOp.toArray()).toPromise();
+      const result = Rx.firstValueFrom(counter$.pipe(Rx.take(1), Rx.toArray()));
       usageCounter.incrementCounter({ counterName: 'test' });
       await expect(result).resolves.toEqual([
-        { counterName: 'test', counterType: 'count', domainId: 'test-domain-id', incrementBy: 1 },
+        {
+          domainId: 'test-domain-id',
+          counterType: 'count',
+          counterName: 'test',
+          source: 'server',
+          incrementBy: 1,
+        },
       ]);
     });
   });
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counter.ts b/src/plugins/usage_collection/server/usage_counters/usage_counter.ts
index 80bd32ae4d1db..6f8c892f2627a 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counter.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counter.ts
@@ -7,9 +7,9 @@
  */
 
 import * as Rx from 'rxjs';
-import { UsageCounters } from '../../common/types';
+import type { UsageCounters } from '../../common';
 
-export interface UsageCounterDeps {
+export interface UsageCounterParams {
   domainId: string;
   counter$: Rx.Subject<UsageCounters.v1.CounterMetric>;
 }
@@ -31,19 +31,27 @@ export class UsageCounter implements IUsageCounter {
   private domainId: string;
   private counter$: Rx.Subject<UsageCounters.v1.CounterMetric>;
 
-  constructor({ domainId, counter$ }: UsageCounterDeps) {
+  constructor({ domainId, counter$ }: UsageCounterParams) {
     this.domainId = domainId;
     this.counter$ = counter$;
   }
 
   public incrementCounter = (params: UsageCounters.v1.IncrementCounterParams) => {
-    const { counterName, counterType = 'count', incrementBy = 1 } = params;
+    const {
+      counterName,
+      counterType = 'count',
+      source = 'server', // default behavior before introducing the property
+      incrementBy = 1,
+      namespace,
+    } = params;
 
     this.counter$.next({
-      counterName,
       domainId: this.domainId,
+      counterName,
       counterType,
+      source,
       incrementBy,
+      ...(namespace && { namespace }),
     });
   };
 }
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock.ts
index 0d96def540540..8e8627c5aea2d 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.mock.ts
@@ -13,7 +13,7 @@ import type { UsageCounter } from './usage_counter';
 const createSetupContractMock = () => {
   const setupContract: jest.Mocked<UsageCountersServiceSetup> = {
     createUsageCounter: jest.fn(),
-    getUsageCounterByType: jest.fn(),
+    getUsageCounterByDomainId: jest.fn(),
   };
 
   setupContract.createUsageCounter.mockReturnValue({
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
index 1222924b6ec94..1350c8b706b87 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.test.ts
@@ -40,7 +40,7 @@ describe('UsageCountersService', () => {
     const usageCounter = createUsageCounter('test-counter');
 
     usageCounter.incrementCounter({ counterName: 'counterA' });
-    usageCounter.incrementCounter({ counterName: 'counterA' });
+    usageCounter.incrementCounter({ counterName: 'counterA', namespace: 'second', source: 'ui' });
 
     const dataInSourcePromise = usageCountersService['source$'].pipe(rxOp.toArray()).toPromise();
     usageCountersService['flushCache$'].next();
@@ -48,10 +48,10 @@ describe('UsageCountersService', () => {
     await expect(dataInSourcePromise).resolves.toHaveLength(2);
   });
 
-  it('registers savedObject type during setup', () => {
+  it('registers savedObject types during setup', () => {
     const usageCountersService = new UsageCountersService({ logger, retryCount, bufferDurationMs });
     usageCountersService.setup(coreSetup);
-    expect(coreSetup.savedObjects.registerType).toBeCalledTimes(1);
+    expect(coreSetup.savedObjects.registerType).toBeCalledTimes(2);
   });
 
   it('flushes cached data on start', async () => {
@@ -67,28 +67,31 @@ describe('UsageCountersService', () => {
     const usageCounter = createUsageCounter('test-counter');
 
     usageCounter.incrementCounter({ counterName: 'counterA' });
-    usageCounter.incrementCounter({ counterName: 'counterA' });
+    usageCounter.incrementCounter({ counterName: 'counterA', namespace: 'second', source: 'ui' });
 
     const dataInSourcePromise = usageCountersService['source$'].pipe(rxOp.toArray()).toPromise();
     usageCountersService.start(coreStart);
     usageCountersService['source$'].complete();
 
     await expect(dataInSourcePromise).resolves.toMatchInlineSnapshot(`
-                  Array [
-                    Object {
-                      "counterName": "counterA",
-                      "counterType": "count",
-                      "domainId": "test-counter",
-                      "incrementBy": 1,
-                    },
-                    Object {
-                      "counterName": "counterA",
-                      "counterType": "count",
-                      "domainId": "test-counter",
-                      "incrementBy": 1,
-                    },
-                  ]
-              `);
+      Array [
+        Object {
+          "counterName": "counterA",
+          "counterType": "count",
+          "domainId": "test-counter",
+          "incrementBy": 1,
+          "source": "server",
+        },
+        Object {
+          "counterName": "counterA",
+          "counterType": "count",
+          "domainId": "test-counter",
+          "incrementBy": 1,
+          "namespace": "second",
+          "source": "ui",
+        },
+      ]
+    `);
   });
 
   it('buffers data into savedObject', async () => {
@@ -114,8 +117,8 @@ describe('UsageCountersService', () => {
     expect(mockIncrementCounter.mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
-          "usage-counters",
-          "test-counter:09042021:count:counterA",
+          "usage-counter",
+          "test-counter:counterA:count:server:20210409",
           Array [
             Object {
               "fieldName": "count",
@@ -127,12 +130,13 @@ describe('UsageCountersService', () => {
               "counterName": "counterA",
               "counterType": "count",
               "domainId": "test-counter",
+              "source": "server",
             },
           },
         ],
         Array [
-          "usage-counters",
-          "test-counter:09042021:count:counterB",
+          "usage-counter",
+          "test-counter:counterB:count:server:20210409",
           Array [
             Object {
               "fieldName": "count",
@@ -144,6 +148,7 @@ describe('UsageCountersService', () => {
               "counterName": "counterB",
               "counterType": "count",
               "domainId": "test-counter",
+              "source": "server",
             },
           },
         ],
@@ -162,9 +167,9 @@ describe('UsageCountersService', () => {
     const mockError = new Error('failed.');
     const mockIncrementCounter = jest.fn().mockImplementation((_, key) => {
       switch (key) {
-        case 'test-counter:09042021:count:counterA':
+        case 'test-counter:counterA:count:server:20210409':
           throw mockError;
-        case 'test-counter:09042021:count:counterB':
+        case 'test-counter:counterB:count:server:20210409':
           return 'pass';
         default:
           throw new Error(`unknown key ${key}`);
@@ -232,11 +237,11 @@ describe('UsageCountersService', () => {
       Array [
         Object {
           "incrementBy": 2,
-          "key": "test-counter:09042021:count:counterA",
+          "key": "test-counter:counterA:count:server:20210409",
         },
         Object {
           "incrementBy": 1,
-          "key": "test-counter:09042021:count:counterA",
+          "key": "test-counter:counterA:count:server:20210409",
         },
       ]
     `);
diff --git a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
index c0e71bdd28dbf..28c3aaf2be148 100644
--- a/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
+++ b/src/plugins/usage_collection/server/usage_counters/usage_counters_service.ts
@@ -8,18 +8,18 @@
 
 import * as Rx from 'rxjs';
 import * as rxOp from 'rxjs';
-import {
+import moment from 'moment';
+import type {
   SavedObjectsRepository,
   SavedObjectsServiceSetup,
   SavedObjectsServiceStart,
 } from '@kbn/core/server';
 import type { Logger, LogMeta } from '@kbn/core/server';
 
-import moment from 'moment';
-import { UsageCounter } from './usage_counter';
-import { UsageCounters } from '../../common/types';
+import { type IUsageCounter, UsageCounter } from './usage_counter';
+import type { UsageCounters } from '../../common';
 import {
-  registerUsageCountersSavedObjectType,
+  registerUsageCountersSavedObjectTypes,
   storeCounter,
   serializeCounterKey,
 } from './saved_objects';
@@ -35,8 +35,8 @@ export interface UsageCountersServiceDeps {
 }
 
 export interface UsageCountersServiceSetup {
-  createUsageCounter: (type: string) => UsageCounter;
-  getUsageCounterByType: (type: string) => UsageCounter | undefined;
+  createUsageCounter: (domainId: string) => IUsageCounter;
+  getUsageCounterByDomainId: (domainId: string) => IUsageCounter | undefined;
 }
 
 /* internal */
@@ -95,11 +95,11 @@ export class UsageCountersService {
         storingCache$.next(false);
       });
 
-    registerUsageCountersSavedObjectType(core.savedObjects);
+    registerUsageCountersSavedObjectTypes(core.savedObjects);
 
     return {
       createUsageCounter: this.createUsageCounter,
-      getUsageCounterByType: this.getUsageCounterByType,
+      getUsageCounterByDomainId: this.getUsageCounterByDomainId,
     };
   };
 
@@ -137,11 +137,11 @@ export class UsageCountersService {
 
   private storeDate$(
     counters: UsageCounters.v1.CounterMetric[],
-    internalRepository: Pick<SavedObjectsRepository, 'incrementCounter'>
+    soRepository: Pick<SavedObjectsRepository, 'incrementCounter'>
   ) {
     return Rx.forkJoin(
-      counters.map((counter) =>
-        Rx.defer(() => storeCounter(counter, internalRepository)).pipe(
+      counters.map((metric) =>
+        Rx.defer(() => storeCounter({ metric, soRepository })).pipe(
           rxOp.retry(this.retryCount),
           rxOp.catchError((error) => {
             this.logger.warn(error);
@@ -152,22 +152,17 @@ export class UsageCountersService {
     );
   }
 
-  private createUsageCounter = (type: string): UsageCounter => {
-    if (this.counterSets.get(type)) {
-      throw new Error(`Usage counter set "${type}" already exists.`);
+  private createUsageCounter = (domainId: string): IUsageCounter => {
+    if (this.counterSets.get(domainId)) {
+      throw new Error(`Usage counter set "${domainId}" already exists.`);
     }
 
-    const counterSet = new UsageCounter({
-      domainId: type,
-      counter$: this.source$,
-    });
-
-    this.counterSets.set(type, counterSet);
-
+    const counterSet = new UsageCounter({ domainId, counter$: this.source$ });
+    this.counterSets.set(domainId, counterSet);
     return counterSet;
   };
 
-  private getUsageCounterByType = (type: string): UsageCounter | undefined => {
+  private getUsageCounterByDomainId = (type: string): IUsageCounter | undefined => {
     return this.counterSets.get(type);
   };
 
@@ -176,8 +171,15 @@ export class UsageCountersService {
   ): Record<string, UsageCounters.v1.CounterMetric> => {
     const date = moment.now();
     return counters.reduce((acc, counter) => {
-      const { counterName, domainId, counterType } = counter;
-      const key = serializeCounterKey({ domainId, counterName, counterType, date });
+      const { domainId, counterName, counterType, namespace, source } = counter;
+      const key = serializeCounterKey({
+        domainId,
+        counterName,
+        counterType,
+        namespace,
+        source,
+        date,
+      });
       const existingCounter = acc[key];
       if (!existingCounter) {
         acc[key] = counter;
diff --git a/src/plugins/usage_collection/tsconfig.json b/src/plugins/usage_collection/tsconfig.json
index e7c24d604be96..53fba66071c5e 100644
--- a/src/plugins/usage_collection/tsconfig.json
+++ b/src/plugins/usage_collection/tsconfig.json
@@ -23,6 +23,7 @@
     "@kbn/analytics-collection-utils",
     "@kbn/logging",
     "@kbn/ebt",
+    "@kbn/core-saved-objects-server",
   ],
   "exclude": [
     "target/**/*",
diff --git a/src/plugins/visualizations/public/actions/add_agg_vis_action.test.ts b/src/plugins/visualizations/public/actions/add_agg_vis_action.test.ts
new file mode 100644
index 0000000000000..15003c4b04566
--- /dev/null
+++ b/src/plugins/visualizations/public/actions/add_agg_vis_action.test.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import {
+  AddAggVisualizationPanelAction,
+  ADD_AGG_VIS_ACTION_ID,
+  type AddAggVisualizationPanelActionApi,
+} from './add_agg_vis_action';
+import type { BaseVisType } from '../vis_types/base_vis_type';
+import { VisGroups } from '../vis_types/vis_groups_enum';
+import { TypesService, type TypesStart } from '../vis_types/types_service';
+
+const mockCompatibleEmbeddableAPI: AddAggVisualizationPanelActionApi = {
+  type: ADD_AGG_VIS_ACTION_ID,
+  addNewPanel: jest.fn(),
+  getAppContext: jest.fn(),
+};
+
+describe('AddAggVisualizationPanelAction', () => {
+  let typeServiceStart: TypesStart;
+
+  beforeEach(() => {
+    const typeService = new TypesService();
+
+    typeServiceStart = typeService.start();
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  test('invoking the compatibility function returns false when initialized with types that are not grouped as agg visualizations', async () => {
+    jest.spyOn(typeServiceStart, 'all').mockReturnValue([]);
+
+    const addAggVisualizationPanelAction = new AddAggVisualizationPanelAction(typeServiceStart);
+
+    expect(
+      await addAggVisualizationPanelAction.isCompatible({ embeddable: mockCompatibleEmbeddableAPI })
+    ).toBe(false);
+  });
+
+  test('invoking the compatibility function returns true when the registered agg visualizations type does not have creation disabled', async () => {
+    jest.spyOn(typeServiceStart, 'all').mockReturnValue([
+      {
+        group: VisGroups.AGGBASED,
+        disableCreate: false,
+        name: 'test visualization',
+      } as BaseVisType,
+    ]);
+
+    const addAggVisualizationPanelAction = new AddAggVisualizationPanelAction(typeServiceStart);
+
+    expect(
+      await addAggVisualizationPanelAction.isCompatible({ embeddable: mockCompatibleEmbeddableAPI })
+    ).toBe(true);
+  });
+});
diff --git a/src/plugins/visualizations/public/actions/add_agg_vis_action.ts b/src/plugins/visualizations/public/actions/add_agg_vis_action.ts
index 62c8e3654db6e..d0b7b2d9a7f6d 100644
--- a/src/plugins/visualizations/public/actions/add_agg_vis_action.ts
+++ b/src/plugins/visualizations/public/actions/add_agg_vis_action.ts
@@ -17,11 +17,13 @@ import { COMMON_EMBEDDABLE_GROUPING } from '@kbn/embeddable-plugin/public';
 import { Action, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 import { apiHasType } from '@kbn/presentation-publishing';
 import { apiCanAddNewPanel, CanAddNewPanel } from '@kbn/presentation-containers';
+import { VisGroups } from '../vis_types/vis_groups_enum';
+import type { TypesStart } from '../vis_types/types_service';
 import { showNewVisModal } from '../wizard/show_new_vis';
 
-const ADD_AGG_VIS_ACTION_ID = 'ADD_AGG_VIS';
+export const ADD_AGG_VIS_ACTION_ID = 'ADD_AGG_VIS';
 
-type AddAggVisualizationPanelActionApi = HasType & CanAddNewPanel & HasAppContext;
+export type AddAggVisualizationPanelActionApi = HasType & CanAddNewPanel & HasAppContext;
 
 const isApiCompatible = (api: unknown | null): api is AddAggVisualizationPanelActionApi => {
   return apiHasType(api) && apiCanAddNewPanel(api) && apiHasAppContext(api);
@@ -31,10 +33,15 @@ export class AddAggVisualizationPanelAction implements Action<EmbeddableApiConte
   public readonly type = ADD_AGG_VIS_ACTION_ID;
   public readonly id = ADD_AGG_VIS_ACTION_ID;
   public readonly grouping = [COMMON_EMBEDDABLE_GROUPING.legacy];
+  private readonly aggVisualizationCreationEnabled: boolean;
 
   public readonly order = 20;
 
-  constructor() {}
+  constructor(visTypes: TypesStart) {
+    this.aggVisualizationCreationEnabled = visTypes.all().some((type) => {
+      return !type.disableCreate && type.group === VisGroups.AGGBASED;
+    });
+  }
 
   public getIconType() {
     return 'visualizeApp';
@@ -47,7 +54,8 @@ export class AddAggVisualizationPanelAction implements Action<EmbeddableApiConte
   }
 
   public async isCompatible({ embeddable }: EmbeddableApiContext) {
-    return isApiCompatible(embeddable);
+    // only mark this action as compatible in environments that have agg based visualizations creation enabled
+    return this.aggVisualizationCreationEnabled && isApiCompatible(embeddable);
   }
 
   public async execute({ embeddable }: EmbeddableApiContext): Promise<void> {
diff --git a/src/plugins/visualizations/public/plugin.ts b/src/plugins/visualizations/public/plugin.ts
index c97ff8f4eba45..bb931a072f192 100644
--- a/src/plugins/visualizations/public/plugin.ts
+++ b/src/plugins/visualizations/public/plugin.ts
@@ -400,8 +400,6 @@ export class VisualizationsPlugin
     uiActions.registerTrigger(dashboardVisualizationPanelTrigger);
     const editInLensAction = new EditInLensAction(data.query.timefilter.timefilter);
     uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, editInLensAction);
-    const addAggVisAction = new AddAggVisualizationPanelAction();
-    uiActions.addTriggerAction(ADD_PANEL_TRIGGER, addAggVisAction);
     const embeddableFactory = new VisualizeEmbeddableFactory({ start });
     embeddable.registerEmbeddableFactory(VISUALIZE_EMBEDDABLE_TYPE, embeddableFactory);
 
@@ -499,6 +497,9 @@ export class VisualizationsPlugin
       setSavedObjectTagging(savedObjectsTaggingOss);
     }
 
+    const addAggVisAction = new AddAggVisualizationPanelAction(types);
+    uiActions.addTriggerAction(ADD_PANEL_TRIGGER, addAggVisAction);
+
     return {
       ...types,
       showNewVisModal,
diff --git a/test/api_integration/apis/esql/errors.ts b/test/api_integration/apis/esql/errors.ts
index e74f86efcb44c..5dcc951e95484 100644
--- a/test/api_integration/apis/esql/errors.ts
+++ b/test/api_integration/apis/esql/errors.ts
@@ -237,7 +237,8 @@ export default function ({ getService }: FtrProviderContext) {
             await cleanup();
           });
 
-          it(`Checking error messages`, async () => {
+          // FAILING ES PROMOTION: https://github.com/elastic/kibana/issues/188109
+          it.skip(`Checking error messages`, async () => {
             for (const { query, error } of queryToErrors) {
               const jsonBody = await sendESQLQuery(query);
 
diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
index 3016af858d6be..cf6b6eee51d21 100644
--- a/test/api_integration/apis/ui_counters/ui_counters.ts
+++ b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -29,7 +29,7 @@ export default function ({ getService }: FtrProviderContext) {
     const {
       body: { saved_objects: savedObjects },
     } = await supertest
-      .get('/api/saved_objects/_find?type=usage-counters')
+      .get('/api/saved_objects/_find?type=usage-counter')
       .set('kbn-xsrf', 'kibana')
       .expect(200);
 
@@ -51,7 +51,8 @@ export default function ({ getService }: FtrProviderContext) {
     counterType: UiCounterMetricType
   ): UsageCountersSavedObject[] => {
     const matchingEventName = savedObjects.filter(
-      ({ attributes }) => attributes.counterName === `${APP_NAME}:${eventName}`
+      ({ attributes: { domainId, counterName } }) =>
+        domainId === APP_NAME && counterName === eventName
     );
     if (!matchingEventName.length) {
       throw new Error(
diff --git a/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts b/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts
index 1219fb03fd1c2..e1941ab08a850 100644
--- a/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts
+++ b/test/functional/apps/dashboard/group1/create_and_add_embeddables.ts
@@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.dashboard.clickNewDashboard();
       await PageObjects.dashboard.switchToEditMode();
       await dashboardAddPanel.clickEditorMenuButton();
-      await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Log stream');
+      await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Log stream (deprecated)');
       await dashboardAddPanel.expectEditorMenuClosed();
     });
 
diff --git a/test/functional/apps/dashboard_elements/links/links_create_edit.ts b/test/functional/apps/dashboard_elements/links/links_create_edit.ts
index 97e78ca2fb0a4..da67064602dad 100644
--- a/test/functional/apps/dashboard_elements/links/links_create_edit.ts
+++ b/test/functional/apps/dashboard_elements/links/links_create_edit.ts
@@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       it('can not add an external link that violates externalLinks.policy', async () => {
         await dashboardAddPanel.clickEditorMenuButton();
-        await dashboardAddPanel.clickAddNewEmbeddableLink('links');
+        await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Links');
 
         await dashboardLinks.setExternalUrlInput('https://danger.example.com');
         expect(await testSubjects.exists('links--linkDestination--error')).to.be(true);
@@ -64,7 +64,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       it('can create a new by-reference links panel', async () => {
         await dashboardAddPanel.clickEditorMenuButton();
-        await dashboardAddPanel.clickAddNewEmbeddableLink('links');
+        await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Links');
 
         await createSomeLinks();
         await dashboardLinks.toggleSaveByReference(true);
@@ -75,8 +75,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await testSubjects.click('confirmSaveSavedObjectButton');
         await common.waitForSaveModalToClose();
         await testSubjects.exists('addObjectToDashboardSuccess');
+        await testSubjects.existOrFail('links--component');
+        await testSubjects.existOrFail('embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION');
 
-        expect(await testSubjects.existOrFail('links--component'));
         expect(await dashboardLinks.getNumberOfLinksInPanel()).to.equal(4);
         await dashboard.clickDiscardChanges();
       });
@@ -84,14 +85,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       describe('by-value links panel', async () => {
         it('can create a new by-value links panel', async () => {
           await dashboardAddPanel.clickEditorMenuButton();
-          await dashboardAddPanel.clickAddNewEmbeddableLink('links');
+          await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Links');
           await dashboardLinks.setLayout('horizontal');
           await createSomeLinks();
           await dashboardLinks.toggleSaveByReference(false);
           await dashboardLinks.clickPanelEditorSaveButton();
           await testSubjects.exists('addObjectToDashboardSuccess');
+          await testSubjects.existOrFail('links--component');
+          await testSubjects.missingOrFail(
+            'embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION'
+          );
 
-          expect(await testSubjects.existOrFail('links--component'));
           expect(await dashboardLinks.getNumberOfLinksInPanel()).to.equal(4);
         });
 
@@ -101,10 +105,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await dashboard.clickUnsavedChangesContinueEditing(DASHBOARD_NAME);
 
           await dashboard.waitForRenderComplete();
-          await dashboardPanelActions.legacySaveToLibrary('Some more links');
+          await dashboardPanelActions.saveToLibrary('Some more links');
           await testSubjects.existOrFail('addPanelToLibrarySuccess');
         });
 
+        it('can unlink a panel from the library', async () => {
+          const panel = await testSubjects.find('embeddablePanelHeading-Somemorelinks');
+          await dashboardPanelActions.unlinkFromLibrary(panel);
+          await testSubjects.existOrFail('unlinkPanelSuccess');
+        });
+
         after(async () => {
           await dashboard.clickDiscardChanges();
         });
diff --git a/test/functional/apps/discover/classic/_doc_table.ts b/test/functional/apps/discover/classic/_doc_table.ts
index 7539cce991af8..0e5934a62f943 100644
--- a/test/functional/apps/discover/classic/_doc_table.ts
+++ b/test/functional/apps/discover/classic/_doc_table.ts
@@ -230,7 +230,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       describe('add and remove columns', async function () {
         const extraColumns = ['phpmemory', 'ip'];
-
+        const expectedFieldLength: Record<string, number> = {
+          phpmemory: 1,
+          ip: 4,
+        };
         afterEach(async function () {
           for (const column of extraColumns) {
             await PageObjects.unifiedFieldList.clickFieldListItemRemove(column);
@@ -242,6 +245,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           for (const column of extraColumns) {
             await PageObjects.unifiedFieldList.clearFieldSearchInput();
             await PageObjects.unifiedFieldList.findFieldByName(column);
+            await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+              expectedFieldLength[column]
+            );
             await retry.waitFor('field to appear', async function () {
               return await testSubjects.exists(`field-${column}`);
             });
@@ -258,9 +264,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           for (const column of extraColumns) {
             await PageObjects.unifiedFieldList.clearFieldSearchInput();
             await PageObjects.unifiedFieldList.findFieldByName(column);
-            await retry.waitFor('field to appear', async function () {
-              return await testSubjects.exists(`field-${column}`);
-            });
+            await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+              expectedFieldLength[column]
+            );
             await PageObjects.unifiedFieldList.clickFieldListItemAdd(column);
             await PageObjects.header.waitUntilLoadingHasFinished();
           }
diff --git a/test/functional/apps/discover/context_awareness/_data_source_profile.ts b/test/functional/apps/discover/context_awareness/_data_source_profile.ts
index d203f33c887e8..f3f7e35d7030b 100644
--- a/test/functional/apps/discover/context_awareness/_data_source_profile.ts
+++ b/test/functional/apps/discover/context_awareness/_data_source_profile.ts
@@ -14,6 +14,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'timePicker', 'discover', 'unifiedFieldList']);
   const testSubjects = getService('testSubjects');
   const dataViews = getService('dataViews');
+  const dataGrid = getService('dataGrid');
 
   describe('data source profile', () => {
     describe('ES|QL mode', () => {
@@ -58,6 +59,40 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await logLevels[2].getVisibleText()).to.be('Info');
         });
       });
+
+      describe('doc viewer extension', () => {
+        it('should not render custom doc viewer view', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-* | sort @timestamp desc' },
+          });
+          await PageObjects.common.navigateToApp('discover', {
+            hash: `/?_a=${state}`,
+          });
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Result');
+        });
+
+        it('should render custom doc viewer view', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-logs | sort @timestamp desc' },
+          });
+          await PageObjects.common.navigateToApp('discover', {
+            hash: `/?_a=${state}`,
+          });
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Record #0');
+        });
+      });
     });
 
     describe('data view mode', () => {
@@ -92,6 +127,32 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await logLevels[2].getVisibleText()).to.be('Info');
         });
       });
+
+      describe('doc viewer extension', () => {
+        it('should not render custom doc viewer view', async () => {
+          await PageObjects.common.navigateToApp('discover');
+          await dataViews.switchTo('my-example-*');
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Document');
+        });
+
+        it('should render custom doc viewer view', async () => {
+          await PageObjects.common.navigateToApp('discover');
+          await dataViews.switchTo('my-example-logs');
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be(
+            'Record #my-example-logs::XdQFDpABfGznVC1bCHLo::'
+          );
+        });
+      });
     });
   });
 }
diff --git a/test/functional/apps/discover/esql/_esql_columns.ts b/test/functional/apps/discover/esql/_esql_columns.ts
index d48ec83f6ba91..ad1fe5d31edc9 100644
--- a/test/functional/apps/discover/esql/_esql_columns.ts
+++ b/test/functional/apps/discover/esql/_esql_columns.ts
@@ -36,8 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     defaultIndex: 'logstash-*',
   };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/186416
-  describe.skip('discover esql columns', async function () {
+  describe('discover esql columns', async function () {
     before(async () => {
       await kibanaServer.savedObjects.cleanStandardList();
       await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
@@ -95,13 +94,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       const columns = ['@timestamp', 'Document'];
       expect(await dataGrid.getHeaderFields()).to.eql(columns);
 
-      await monacoEditor.setCodeEditorValue('from logstash-* | limit 1');
+      await monacoEditor.setCodeEditorValue('from logstash-* | limit 500');
       await testSubjects.click('querySubmitButton');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.discover.waitUntilSearchingHasFinished();
       expect(await dataGrid.getHeaderFields()).to.eql(columns);
 
-      await monacoEditor.setCodeEditorValue('from logs* | limit 1');
+      await monacoEditor.setCodeEditorValue('from logs* | limit 500');
       await testSubjects.click('querySubmitButton');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.discover.waitUntilSearchingHasFinished();
@@ -113,7 +112,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await dataGrid.getHeaderFields()).to.eql(['bytes']);
 
       // different index pattern => reset columns
-      await monacoEditor.setCodeEditorValue('from logstash-* | limit 1');
+      await monacoEditor.setCodeEditorValue('from logstash-* | limit 500');
       await testSubjects.click('querySubmitButton');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.discover.waitUntilSearchingHasFinished();
diff --git a/test/functional/apps/discover/esql/_esql_view.ts b/test/functional/apps/discover/esql/_esql_view.ts
index cea3b6ecce044..4bd351febc66c 100644
--- a/test/functional/apps/discover/esql/_esql_view.ts
+++ b/test/functional/apps/discover/esql/_esql_view.ts
@@ -85,7 +85,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(await testSubjects.exists('discoverQueryHits')).to.be(true);
         expect(await testSubjects.exists('discoverAlertsButton')).to.be(true);
         expect(await testSubjects.exists('shareTopNavButton')).to.be(true);
-        expect(await testSubjects.exists('dataGridColumnSortingButton')).to.be(true);
+        // we don't sort for the Document view
+        expect(await testSubjects.exists('dataGridColumnSortingButton')).to.be(false);
         expect(await testSubjects.exists('docTableExpandToggleColumn')).to.be(true);
         expect(await testSubjects.exists('fieldListFiltersFieldTypeFilterToggle')).to.be(true);
         await testSubjects.click('field-@message-showDetails');
diff --git a/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts b/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts
index ac77fe3f70714..24056a3986624 100644
--- a/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts
+++ b/test/functional/apps/discover/group2_data_grid1/_data_grid_doc_table.ts
@@ -220,6 +220,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('add and remove columns', function () {
       const extraColumns = ['phpmemory', 'ip'];
+      const expectedFieldLength: Record<string, number> = {
+        phpmemory: 1,
+        ip: 4,
+      };
 
       afterEach(async function () {
         for (const column of extraColumns) {
@@ -232,6 +236,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         for (const column of extraColumns) {
           await PageObjects.unifiedFieldList.clearFieldSearchInput();
           await PageObjects.unifiedFieldList.findFieldByName(column);
+          await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+            expectedFieldLength[column]
+          );
           await PageObjects.unifiedFieldList.clickFieldListItemAdd(column);
           await PageObjects.header.waitUntilLoadingHasFinished();
           // test the header now
@@ -244,6 +251,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         for (const column of extraColumns) {
           await PageObjects.unifiedFieldList.clearFieldSearchInput();
           await PageObjects.unifiedFieldList.findFieldByName(column);
+          await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+            expectedFieldLength[column]
+          );
           await PageObjects.unifiedFieldList.clickFieldListItemAdd(column);
           await PageObjects.header.waitUntilLoadingHasFinished();
         }
diff --git a/test/functional/apps/discover/group3/_doc_viewer.ts b/test/functional/apps/discover/group3/_doc_viewer.ts
index 140129c6a251f..ddcdf5c4e40b7 100644
--- a/test/functional/apps/discover/group3/_doc_viewer.ts
+++ b/test/functional/apps/discover/group3/_doc_viewer.ts
@@ -61,7 +61,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           return (await find.allByCssSelector('.kbnDocViewer__fieldName')).length === 4;
         });
 
-        await PageObjects.discover.findFieldByNameInDocViewer('.s');
+        await PageObjects.discover.findFieldByNameInDocViewer('.sr');
 
         await retry.waitFor('second updates', async () => {
           return (await find.allByCssSelector('.kbnDocViewer__fieldName')).length === 2;
@@ -70,7 +70,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       it('should be able to search by wildcard', async function () {
         await PageObjects.discover.findFieldByNameInDocViewer('relatedContent*image');
-
         await retry.waitFor('updates', async () => {
           return (await find.allByCssSelector('.kbnDocViewer__fieldName')).length === 2;
         });
@@ -78,12 +77,19 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       it('should be able to search with spaces as wildcard', async function () {
         await PageObjects.discover.findFieldByNameInDocViewer('relatedContent image');
-
         await retry.waitFor('updates', async () => {
           return (await find.allByCssSelector('.kbnDocViewer__fieldName')).length === 4;
         });
       });
 
+      it('should be able to search with fuzzy search (1 typo)', async function () {
+        await PageObjects.discover.findFieldByNameInDocViewer('rel4tedContent.art');
+
+        await retry.waitFor('updates', async () => {
+          return (await find.allByCssSelector('.kbnDocViewer__fieldName')).length === 3;
+        });
+      });
+
       it('should ignore empty search', async function () {
         await PageObjects.discover.findFieldByNameInDocViewer('   '); // only spaces
 
diff --git a/test/functional/apps/discover/group6/_field_stats_table.ts b/test/functional/apps/discover/group6/_field_stats_table.ts
new file mode 100644
index 0000000000000..45b05d7ddc4bf
--- /dev/null
+++ b/test/functional/apps/discover/group6/_field_stats_table.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0 and the Server Side Public License, v 1; you may not use this file except
+ * in compliance with, at your election, the Elastic License 2.0 or the Server
+ * Side Public License, v 1.
+ */
+
+import { FtrProviderContext } from '../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['common', 'discover', 'timePicker', 'header']);
+  const esArchiver = getService('esArchiver');
+  const testSubjects = getService('testSubjects');
+  const kibanaServer = getService('kibanaServer');
+  const security = getService('security');
+  const defaultSettings = {
+    defaultIndex: 'logstash-*',
+  };
+
+  describe('discover field statistics table', function () {
+    before(async () => {
+      await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader']);
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.importExport.load('test/functional/fixtures/kbn_archiver/discover');
+    });
+
+    after(async () => {
+      await kibanaServer.importExport.unload('test/functional/fixtures/kbn_archiver/discover');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+      await kibanaServer.savedObjects.cleanStandardList();
+    });
+
+    [true, false].forEach((shouldSearchFieldsFromSource) => {
+      describe(`discover:searchFieldsFromSource: ${shouldSearchFieldsFromSource}`, function () {
+        before(async function () {
+          await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
+          await kibanaServer.uiSettings.update({
+            ...defaultSettings,
+            'discover:searchFieldsFromSource': shouldSearchFieldsFromSource,
+          });
+          await PageObjects.common.navigateToApp('discover');
+          await PageObjects.header.waitUntilLoadingHasFinished();
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+        });
+
+        after(async () => {
+          await kibanaServer.uiSettings.replace({});
+        });
+
+        it('should show Field Statistics data in data view mode', async () => {
+          await testSubjects.click('dscViewModeFieldStatsButton');
+          await PageObjects.header.waitUntilLoadingHasFinished();
+          await testSubjects.existOrFail('dataVisualizerTableContainer');
+
+          await testSubjects.click('dscViewModeDocumentButton');
+          await PageObjects.header.waitUntilLoadingHasFinished();
+          await testSubjects.existOrFail('discoverDocTable');
+        });
+
+        it('should show Field Statistics data in ES|QL mode', async () => {
+          await PageObjects.discover.selectTextBaseLang();
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+
+          await testSubjects.click('dscViewModeFieldStatsButton');
+          await PageObjects.header.waitUntilLoadingHasFinished();
+          await testSubjects.existOrFail('dataVisualizerTableContainer');
+        });
+      });
+    });
+  });
+}
diff --git a/test/functional/apps/discover/group6/_sidebar.ts b/test/functional/apps/discover/group6/_sidebar.ts
index ab2dc70e9e782..a2841bddf8777 100644
--- a/test/functional/apps/discover/group6/_sidebar.ts
+++ b/test/functional/apps/discover/group6/_sidebar.ts
@@ -223,6 +223,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         );
       });
 
+      it('should be able to search with fuzzy search (1 typo)', async function () {
+        await PageObjects.unifiedFieldList.findFieldByName('rel4tedContent.art');
+
+        await retry.waitFor('updates', async () => {
+          return (
+            (await PageObjects.unifiedFieldList.getSidebarAriaDescription()) ===
+            '4 available fields. 0 meta fields.'
+          );
+        });
+
+        expect(
+          (await PageObjects.unifiedFieldList.getSidebarSectionFieldNames('available')).join(', ')
+        ).to.be(
+          'relatedContent.article:modified_time, relatedContent.article:published_time, relatedContent.article:section, relatedContent.article:tag'
+        );
+      });
+
       it('should ignore empty search', async function () {
         await PageObjects.unifiedFieldList.findFieldByName('   '); // only spaces
 
diff --git a/test/functional/apps/discover/group6/index.ts b/test/functional/apps/discover/group6/index.ts
index f71d96e63d2fd..6ed514463705f 100644
--- a/test/functional/apps/discover/group6/index.ts
+++ b/test/functional/apps/discover/group6/index.ts
@@ -25,5 +25,6 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./_time_field_column'));
     loadTestFile(require.resolve('./_unsaved_changes_badge'));
     loadTestFile(require.resolve('./_view_mode_toggle'));
+    loadTestFile(require.resolve('./_field_stats_table'));
   });
 }
diff --git a/test/functional/apps/home/_welcome.ts b/test/functional/apps/home/_welcome.ts
index d61afd879090e..6c8bda90de699 100644
--- a/test/functional/apps/home/_welcome.ts
+++ b/test/functional/apps/home/_welcome.ts
@@ -15,7 +15,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'home']);
   const deployment = getService('deployment');
 
-  describe('Welcome interstitial', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/186168
+  describe.skip('Welcome interstitial', () => {
     beforeEach(async () => {
       // Need to navigate to page first to clear storage before test can be run
       await PageObjects.common.navigateToUrl('home', undefined);
diff --git a/test/functional/apps/saved_objects_management/show_relationships.ts b/test/functional/apps/saved_objects_management/show_relationships.ts
index a48e8069fe436..5714fdac1faaa 100644
--- a/test/functional/apps/saved_objects_management/show_relationships.ts
+++ b/test/functional/apps/saved_objects_management/show_relationships.ts
@@ -36,18 +36,18 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       const invalidRelations = await PageObjects.savedObjects.getInvalidRelations();
 
       expect(invalidRelations).to.eql([
-        {
-          error: 'Saved object [visualization/missing-vis-ref] not found',
-          id: 'missing-vis-ref',
-          relationship: 'Child',
-          type: 'visualization',
-        },
         {
           error: 'Saved object [dashboard/missing-dashboard-ref] not found',
           id: 'missing-dashboard-ref',
           relationship: 'Child',
           type: 'dashboard',
         },
+        {
+          error: 'Saved object [visualization/missing-vis-ref] not found',
+          id: 'missing-vis-ref',
+          relationship: 'Child',
+          type: 'visualization',
+        },
       ]);
     });
   });
diff --git a/test/functional/page_objects/management/saved_objects_page.ts b/test/functional/page_objects/management/saved_objects_page.ts
index cbbb70587ea0e..5285836ccd85d 100644
--- a/test/functional/page_objects/management/saved_objects_page.ts
+++ b/test/functional/page_objects/management/saved_objects_page.ts
@@ -357,7 +357,7 @@ export class SavedObjectsPageObject extends FtrService {
           error: await error.getVisibleText(),
         };
       })
-    );
+    ).then((result) => result.sort((a, b) => a.id.localeCompare(b.id)));
   }
 
   async getTableSummary() {
diff --git a/test/functional/page_objects/unified_field_list.ts b/test/functional/page_objects/unified_field_list.ts
index 95644bf7483b1..a6cbaf81730df 100644
--- a/test/functional/page_objects/unified_field_list.ts
+++ b/test/functional/page_objects/unified_field_list.ts
@@ -53,6 +53,15 @@ export class UnifiedFieldListPageObject extends FtrService {
     });
   }
 
+  public async waitUntilFieldlistHasCountOfFields(count: number) {
+    await this.retry.waitFor('wait until fieldlist has updated number of fields', async () => {
+      return (
+        (await this.find.allByCssSelector('#fieldListGroupedAvailableFields .kbnFieldButton'))
+          .length === count
+      );
+    });
+  }
+
   public async doesSidebarShowFields() {
     return await this.testSubjects.exists('fieldListGroupedFieldGroups');
   }
diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts
index ffc62bdfdb68a..16b283f2b5c53 100644
--- a/test/functional/services/dashboard/add_panel.ts
+++ b/test/functional/services/dashboard/add_panel.ts
@@ -69,9 +69,14 @@ export class DashboardAddPanelService extends FtrService {
     await this.testSubjects.click(`visType-${visType}`);
   }
 
-  async verifyEmbeddableFactoryGroupExists(groupId: string) {
+  async verifyEmbeddableFactoryGroupExists(groupId: string, expectExist: boolean = true) {
     this.log.debug('DashboardAddPanel.verifyEmbeddableFactoryGroupExists');
-    await this.testSubjects.existOrFail(`dashboardEditorMenu-${groupId}Group`);
+    const testSubject = `dashboardEditorMenu-${groupId}Group`;
+    if (expectExist) {
+      await this.testSubjects.existOrFail(testSubject);
+    } else {
+      await this.testSubjects.missingOrFail(testSubject);
+    }
   }
 
   async clickAddNewEmbeddableLink(type: string) {
diff --git a/test/plugin_functional/test_suites/core_plugins/rendering.ts b/test/plugin_functional/test_suites/core_plugins/rendering.ts
index b9bb6183b22b0..a5b5cba1469ba 100644
--- a/test/plugin_functional/test_suites/core_plugins/rendering.ts
+++ b/test/plugin_functional/test_suites/core_plugins/rendering.ts
@@ -267,6 +267,7 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
         'xpack.fleet.internal.onlyAllowAgentUpgradeToKnownVersions (boolean)',
         'xpack.fleet.developer.maxAgentPoliciesWithInactivityTimeout (number)',
         'xpack.global_search.search_timeout (duration)',
+        'xpack.global_search_bar.input_max_limit (number)',
         'xpack.graph.canEditDrillDownUrls (boolean)',
         'xpack.graph.savePolicy (alternatives)',
         'xpack.ilm.ui.enabled (boolean)',
diff --git a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
index be4797b1cf61f..c7137470e0e7e 100644
--- a/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
+++ b/test/plugin_functional/test_suites/usage_collection/usage_counters.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
     await new Promise((res) => setTimeout(res, 10 * 1000));
 
     return await supertest
-      .get('/api/saved_objects/_find?type=usage-counters')
+      .get('/api/saved_objects/_find?type=usage-counter')
       .set('kbn-xsrf', 'true')
       .expect(200)
       .then(({ body }) => {
@@ -40,13 +40,13 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   describe('Usage Counters service', () => {
     before(async () => {
       const key = serializeCounterKey({
+        domainId: 'usageCollectionTestPlugin',
         counterName: 'routeAccessed',
         counterType: 'count',
-        domainId: 'usageCollectionTestPlugin',
-        date: Date.now(),
+        source: 'server',
       });
 
-      await supertest.delete(`/api/saved_objects/usage-counters/${key}`).set('kbn-xsrf', 'true');
+      await supertest.delete(`/api/saved_objects/counter/${key}`).set('kbn-xsrf', 'true');
     });
 
     it('stores usage counters sent during start and setup', async () => {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index 689df41bae17a..6d4637281115e 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -50,6 +50,8 @@
       "@kbn/alerting-types/*": ["packages/kbn-alerting-types/*"],
       "@kbn/alerts-as-data-utils": ["packages/kbn-alerts-as-data-utils"],
       "@kbn/alerts-as-data-utils/*": ["packages/kbn-alerts-as-data-utils/*"],
+      "@kbn/alerts-grouping": ["packages/kbn-alerts-grouping"],
+      "@kbn/alerts-grouping/*": ["packages/kbn-alerts-grouping/*"],
       "@kbn/alerts-restricted-fixtures-plugin": ["x-pack/test/alerting_api_integration/common/plugins/alerts_restricted"],
       "@kbn/alerts-restricted-fixtures-plugin/*": ["x-pack/test/alerting_api_integration/common/plugins/alerts_restricted/*"],
       "@kbn/alerts-ui-shared": ["packages/kbn-alerts-ui-shared"],
@@ -806,6 +808,8 @@
       "@kbn/eso-model-version-example/*": ["examples/eso_model_version_example/*"],
       "@kbn/eso-plugin": ["x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin"],
       "@kbn/eso-plugin/*": ["x-pack/test/encrypted_saved_objects_api_integration/plugins/api_consumer_plugin/*"],
+      "@kbn/esql": ["src/plugins/esql"],
+      "@kbn/esql/*": ["src/plugins/esql/*"],
       "@kbn/esql-ast": ["packages/kbn-esql-ast"],
       "@kbn/esql-ast/*": ["packages/kbn-esql-ast/*"],
       "@kbn/esql-ast-inspector-plugin": ["examples/esql_ast_inspector"],
@@ -1308,6 +1312,8 @@
       "@kbn/react-kibana-context-theme/*": ["packages/react/kibana_context/theme/*"],
       "@kbn/react-kibana-mount": ["packages/react/kibana_mount"],
       "@kbn/react-kibana-mount/*": ["packages/react/kibana_mount/*"],
+      "@kbn/recently-accessed": ["packages/kbn-recently-accessed"],
+      "@kbn/recently-accessed/*": ["packages/kbn-recently-accessed/*"],
       "@kbn/remote-clusters-plugin": ["x-pack/plugins/remote_clusters"],
       "@kbn/remote-clusters-plugin/*": ["x-pack/plugins/remote_clusters/*"],
       "@kbn/rendering-plugin": ["test/plugin_functional/plugins/rendering_plugin"],
@@ -1722,8 +1728,6 @@
       "@kbn/testing-embedded-lens-plugin/*": ["x-pack/examples/testing_embedded_lens/*"],
       "@kbn/text-based-editor": ["packages/kbn-text-based-editor"],
       "@kbn/text-based-editor/*": ["packages/kbn-text-based-editor/*"],
-      "@kbn/text-based-languages": ["src/plugins/text_based_languages"],
-      "@kbn/text-based-languages/*": ["src/plugins/text_based_languages/*"],
       "@kbn/third-party-lens-navigation-prompt-plugin": ["x-pack/examples/third_party_lens_navigation_prompt"],
       "@kbn/third-party-lens-navigation-prompt-plugin/*": ["x-pack/examples/third_party_lens_navigation_prompt/*"],
       "@kbn/third-party-vis-lens-example-plugin": ["x-pack/examples/third_party_vis_lens_example"],
diff --git a/versions.json b/versions.json
index f43e07cfdf2e2..3816626bb83ca 100644
--- a/versions.json
+++ b/versions.json
@@ -2,13 +2,19 @@
   "notice": "This file is not maintained outside of the main branch and should only be used for tooling.",
   "versions": [
     {
-      "version": "8.15.0",
+      "version": "8.16.0",
       "branch": "main",
       "currentMajor": true,
       "currentMinor": true
     },
     {
-      "version": "8.14.2",
+      "version": "8.15.0",
+      "branch": "8.15",
+      "currentMajor": true,
+      "previousMinor": true
+    },
+    {
+      "version": "8.14.4",
       "branch": "8.14",
       "currentMajor": true,
       "previousMinor": true
diff --git a/x-pack/package.json b/x-pack/package.json
index a65aaf142fd25..c4f8f4efe770d 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -1,6 +1,6 @@
 {
   "name": "x-pack",
-  "version": "8.15.0",
+  "version": "8.16.0",
   "author": "Elastic",
   "private": true,
   "license": "Elastic-License",
diff --git a/x-pack/packages/kbn-elastic-assistant-common/impl/mock/get_anonymized_value/index.ts b/x-pack/packages/kbn-elastic-assistant-common/impl/mock/get_anonymized_value/index.ts
index 3822c736b670e..256f9776c4563 100644
--- a/x-pack/packages/kbn-elastic-assistant-common/impl/mock/get_anonymized_value/index.ts
+++ b/x-pack/packages/kbn-elastic-assistant-common/impl/mock/get_anonymized_value/index.ts
@@ -5,13 +5,6 @@
  * 2.0.
  */
 
-import { Replacements } from '../../schemas';
-
 /** This mock returns the reverse of `value` */
-export const mockGetAnonymizedValue = ({
-  currentReplacements,
-  rawValue,
-}: {
-  currentReplacements: Replacements | undefined;
-  rawValue: string;
-}): string => rawValue.split('').reverse().join('');
+export const mockGetAnonymizedValue = ({ rawValue }: { rawValue: string }): string =>
+  rawValue.split('').reverse().join('');
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/assistant_header_flyout.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/assistant_header_flyout.tsx
deleted file mode 100644
index 5725d983eff33..0000000000000
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/assistant_header_flyout.tsx
+++ /dev/null
@@ -1,284 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState, useMemo, useCallback } from 'react';
-import { QueryObserverResult, RefetchOptions, RefetchQueryFilters } from '@tanstack/react-query';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPopover,
-  EuiContextMenu,
-  EuiButtonIcon,
-  EuiPanel,
-  EuiConfirmModal,
-  EuiToolTip,
-} from '@elastic/eui';
-import { css } from '@emotion/react';
-import { euiThemeVars } from '@kbn/ui-theme';
-import { DocLinksStart } from '@kbn/core-doc-links-browser';
-import { isEmpty } from 'lodash';
-import { Conversation } from '../../..';
-import { AssistantTitle } from '../assistant_title';
-import { ConnectorSelectorInline } from '../../connectorland/connector_selector_inline/connector_selector_inline';
-import { FlyoutNavigation } from '../assistant_overlay/flyout_navigation';
-import { AssistantSettingsButton } from '../settings/assistant_settings_button';
-import * as i18n from './translations';
-import { AIConnector } from '../../connectorland/connector_selector';
-
-interface OwnProps {
-  selectedConversation: Conversation | undefined;
-  defaultConnector?: AIConnector;
-  docLinks: Omit<DocLinksStart, 'links'>;
-  isDisabled: boolean;
-  isSettingsModalVisible: boolean;
-  onToggleShowAnonymizedValues: () => void;
-  setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  showAnonymizedValues: boolean;
-  onChatCleared: () => void;
-  onCloseFlyout?: () => void;
-  chatHistoryVisible?: boolean;
-  setChatHistoryVisible?: React.Dispatch<React.SetStateAction<boolean>>;
-  onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
-  conversations: Record<string, Conversation>;
-  conversationsLoaded: boolean;
-  refetchConversationsState: () => Promise<void>;
-  onConversationCreate: () => Promise<void>;
-  isAssistantEnabled: boolean;
-  refetchPrompts?: (
-    options?: RefetchOptions & RefetchQueryFilters<unknown>
-  ) => Promise<QueryObserverResult<unknown, unknown>>;
-}
-
-type Props = OwnProps;
-/**
- * Renders the header of the Elastic AI Assistant.
- * Provide a user interface for selecting and managing conversations,
- * toggling the display of anonymized values, and accessing the assistant settings.
- */
-export const AssistantHeaderFlyout: React.FC<Props> = ({
-  selectedConversation,
-  defaultConnector,
-  docLinks,
-  isDisabled,
-  isSettingsModalVisible,
-  onToggleShowAnonymizedValues,
-  setIsSettingsModalVisible,
-  showAnonymizedValues,
-  onChatCleared,
-  chatHistoryVisible,
-  setChatHistoryVisible,
-  onCloseFlyout,
-  onConversationSelected,
-  conversations,
-  conversationsLoaded,
-  refetchConversationsState,
-  onConversationCreate,
-  isAssistantEnabled,
-  refetchPrompts,
-}) => {
-  const showAnonymizedValuesChecked = useMemo(
-    () =>
-      selectedConversation?.replacements != null &&
-      Object.keys(selectedConversation?.replacements).length > 0 &&
-      showAnonymizedValues,
-    [selectedConversation?.replacements, showAnonymizedValues]
-  );
-
-  const selectedConnectorId = useMemo(
-    () => selectedConversation?.apiConfig?.connectorId,
-    [selectedConversation?.apiConfig?.connectorId]
-  );
-
-  const [isPopoverOpen, setPopover] = useState(false);
-
-  const onButtonClick = useCallback(() => {
-    setPopover(!isPopoverOpen);
-  }, [isPopoverOpen]);
-
-  const closePopover = useCallback(() => {
-    setPopover(false);
-  }, []);
-
-  const [isResetConversationModalVisible, setIsResetConversationModalVisible] = useState(false);
-
-  const closeDestroyModal = useCallback(() => setIsResetConversationModalVisible(false), []);
-  const showDestroyModal = useCallback(() => setIsResetConversationModalVisible(true), []);
-
-  const onConversationChange = useCallback(
-    (updatedConversation) => {
-      onConversationSelected({
-        cId: updatedConversation.id,
-        cTitle: updatedConversation.title,
-      });
-    },
-    [onConversationSelected]
-  );
-
-  const panels = useMemo(
-    () => [
-      {
-        id: 0,
-        items: [
-          {
-            name: i18n.RESET_CONVERSATION,
-            css: css`
-              color: ${euiThemeVars.euiColorDanger};
-            `,
-            onClick: showDestroyModal,
-            icon: 'refresh',
-            'data-test-subj': 'clear-chat',
-          },
-        ],
-      },
-    ],
-    [showDestroyModal]
-  );
-
-  const handleReset = useCallback(() => {
-    onChatCleared();
-    closeDestroyModal();
-    closePopover();
-  }, [onChatCleared, closeDestroyModal, closePopover]);
-
-  return (
-    <>
-      <FlyoutNavigation
-        isExpanded={!!chatHistoryVisible}
-        setIsExpanded={setChatHistoryVisible}
-        onConversationCreate={onConversationCreate}
-        isAssistantEnabled={isAssistantEnabled}
-      >
-        <EuiFlexGroup gutterSize="s">
-          <EuiFlexItem grow={false}>
-            <AssistantSettingsButton
-              defaultConnector={defaultConnector}
-              isDisabled={isDisabled}
-              isSettingsModalVisible={isSettingsModalVisible}
-              selectedConversationId={
-                !isEmpty(selectedConversation?.id)
-                  ? selectedConversation?.id
-                  : selectedConversation?.title
-              }
-              setIsSettingsModalVisible={setIsSettingsModalVisible}
-              onConversationSelected={onConversationSelected}
-              conversations={conversations}
-              conversationsLoaded={conversationsLoaded}
-              refetchConversationsState={refetchConversationsState}
-              isFlyoutMode={true}
-              refetchPrompts={refetchPrompts}
-            />
-          </EuiFlexItem>
-
-          {onCloseFlyout && (
-            <EuiFlexItem grow={false}>
-              <EuiButtonIcon
-                aria-label="xxx"
-                iconType="cross"
-                color="text"
-                size="xs"
-                onClick={onCloseFlyout}
-              />
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-      </FlyoutNavigation>
-      <EuiPanel
-        hasShadow={false}
-        paddingSize="m"
-        css={css`
-          padding-top: ${euiThemeVars.euiSizeS};
-          padding-bottom: ${euiThemeVars.euiSizeS};
-        `}
-      >
-        <EuiFlexGroup alignItems={'center'} justifyContent={'spaceBetween'} gutterSize="s">
-          <EuiFlexItem
-            css={css`
-              overflow: hidden;
-            `}
-          >
-            <AssistantTitle
-              docLinks={docLinks}
-              title={selectedConversation?.title}
-              selectedConversation={selectedConversation}
-              onChange={onConversationChange}
-              isFlyoutMode={true}
-              refetchConversationsState={refetchConversationsState}
-            />
-          </EuiFlexItem>
-
-          <EuiFlexItem grow={false}>
-            <EuiFlexGroup gutterSize="xs" alignItems={'center'}>
-              <EuiFlexItem>
-                <ConnectorSelectorInline
-                  isDisabled={isDisabled || selectedConversation === undefined}
-                  selectedConnectorId={selectedConnectorId}
-                  selectedConversation={selectedConversation}
-                  isFlyoutMode={true}
-                  onConnectorSelected={onConversationChange}
-                />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiToolTip
-                  content={
-                    showAnonymizedValuesChecked ? i18n.SHOW_REAL_VALUES : i18n.SHOW_ANONYMIZED
-                  }
-                >
-                  <EuiButtonIcon
-                    css={css`
-                      border-radius: 50%;
-                    `}
-                    display="base"
-                    data-test-subj="showAnonymizedValues"
-                    isSelected={showAnonymizedValuesChecked}
-                    aria-label={
-                      showAnonymizedValuesChecked ? i18n.SHOW_ANONYMIZED : i18n.SHOW_REAL_VALUES
-                    }
-                    iconType={showAnonymizedValuesChecked ? 'eye' : 'eyeClosed'}
-                    onClick={onToggleShowAnonymizedValues}
-                    isDisabled={isEmpty(selectedConversation?.replacements)}
-                  />
-                </EuiToolTip>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiPopover
-                  button={
-                    <EuiButtonIcon
-                      aria-label="test"
-                      iconType="boxesVertical"
-                      onClick={onButtonClick}
-                      data-test-subj="chat-context-menu"
-                    />
-                  }
-                  isOpen={isPopoverOpen}
-                  closePopover={closePopover}
-                  panelPaddingSize="none"
-                  anchorPosition="downLeft"
-                >
-                  <EuiContextMenu initialPanelId={0} panels={panels} />
-                </EuiPopover>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPanel>
-      {isResetConversationModalVisible && (
-        <EuiConfirmModal
-          title={i18n.RESET_CONVERSATION}
-          onCancel={closeDestroyModal}
-          onConfirm={handleReset}
-          cancelButtonText={i18n.CANCEL_BUTTON_TEXT}
-          confirmButtonText={i18n.RESET_BUTTON_TEXT}
-          buttonColor="danger"
-          defaultFocusedButton="confirm"
-          data-test-subj="reset-conversation-modal"
-        >
-          <p>{i18n.CLEAR_CHAT_CONFIRMATION}</p>
-        </EuiConfirmModal>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.test.tsx
index f806f5d1ef7c6..b4f4bd2c25384 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.test.tsx
@@ -20,7 +20,7 @@ const mockConversations = {
 };
 const testProps = {
   conversationsLoaded: true,
-  currentConversation: welcomeConvo,
+  selectedConversation: welcomeConvo,
   title: 'Test Title',
   docLinks: {
     ELASTIC_WEBSITE_URL: 'https://www.elastic.co/',
@@ -30,12 +30,13 @@ const testProps = {
   isSettingsModalVisible: false,
   onConversationSelected,
   onToggleShowAnonymizedValues: jest.fn(),
-  selectedConversationId: emptyWelcomeConvo.id,
   setIsSettingsModalVisible: jest.fn(),
-  onConversationDeleted: jest.fn(),
+  onConversationCreate: jest.fn(),
+  onChatCleared: jest.fn(),
   showAnonymizedValues: false,
   conversations: mockConversations,
   refetchConversationsState: jest.fn(),
+  isAssistantEnabled: true,
   anonymizationFields: { total: 0, page: 1, perPage: 1000, data: [] },
   refetchAnonymizationFieldsResults: jest.fn(),
   allPrompts: [],
@@ -69,53 +70,64 @@ describe('AssistantHeader', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-  it('showAnonymizedValues is not checked when currentConversation.replacements is null', () => {
+  it('showAnonymizedValues is not checked when selectedConversation.replacements is null', () => {
     const { getByText, getByTestId } = render(<AssistantHeader {...testProps} />, {
       wrapper: TestProviders,
     });
-    expect(getByText('Test Title')).toBeInTheDocument();
-    expect(getByTestId('showAnonymizedValues')).toHaveAttribute('aria-checked', 'false');
+    expect(getByText(welcomeConvo.title)).toBeInTheDocument();
+    expect(getByTestId('showAnonymizedValues').firstChild).toHaveAttribute(
+      'data-euiicon-type',
+      'eyeClosed'
+    );
   });
 
-  it('showAnonymizedValues is not checked when currentConversation.replacements is empty', () => {
+  it('showAnonymizedValues is not checked when selectedConversation.replacements is empty', () => {
     const { getByText, getByTestId } = render(
       <AssistantHeader
         {...testProps}
-        currentConversation={{ ...emptyWelcomeConvo, replacements: {} }}
+        selectedConversation={{ ...emptyWelcomeConvo, replacements: {} }}
       />,
       {
         wrapper: TestProviders,
       }
     );
-    expect(getByText('Test Title')).toBeInTheDocument();
-    expect(getByTestId('showAnonymizedValues')).toHaveAttribute('aria-checked', 'false');
+    expect(getByText(welcomeConvo.title)).toBeInTheDocument();
+    expect(getByTestId('showAnonymizedValues').firstChild).toHaveAttribute(
+      'data-euiicon-type',
+      'eyeClosed'
+    );
   });
 
-  it('showAnonymizedValues is not checked when currentConversation.replacements has values and showAnonymizedValues is false', () => {
+  it('showAnonymizedValues is not checked when selectedConversation.replacements has values and showAnonymizedValues is false', () => {
     const { getByTestId } = render(
-      <AssistantHeader {...testProps} currentConversation={alertConvo} />,
+      <AssistantHeader {...testProps} selectedConversation={alertConvo} />,
       {
         wrapper: TestProviders,
       }
     );
-    expect(getByTestId('showAnonymizedValues')).toHaveAttribute('aria-checked', 'false');
+    expect(getByTestId('showAnonymizedValues').firstChild).toHaveAttribute(
+      'data-euiicon-type',
+      'eyeClosed'
+    );
   });
 
-  it('showAnonymizedValues is checked when currentConversation.replacements has values and showAnonymizedValues is true', () => {
+  it('showAnonymizedValues is checked when selectedConversation.replacements has values and showAnonymizedValues is true', () => {
     const { getByTestId } = render(
-      <AssistantHeader {...testProps} currentConversation={alertConvo} showAnonymizedValues />,
+      <AssistantHeader {...testProps} selectedConversation={alertConvo} showAnonymizedValues />,
       {
         wrapper: TestProviders,
       }
     );
-    expect(getByTestId('showAnonymizedValues')).toHaveAttribute('aria-checked', 'true');
+    expect(getByTestId('showAnonymizedValues').firstChild).toHaveAttribute(
+      'data-euiicon-type',
+      'eye'
+    );
   });
 
   it('Conversation is updated when connector change occurs', async () => {
     const { getByTestId } = render(<AssistantHeader {...testProps} />, {
       wrapper: TestProviders,
     });
-    fireEvent.click(getByTestId('connectorSelectorPlaceholderButton'));
     fireEvent.click(getByTestId('connector-selector'));
 
     await act(async () => {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.tsx
index 7507c14648614..30e620ea38873 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_header/index.tsx
@@ -5,44 +5,47 @@
  * 2.0.
  */
 
-import React, { useCallback, useMemo } from 'react';
+import React, { useState, useMemo, useCallback } from 'react';
+import { QueryObserverResult, RefetchOptions, RefetchQueryFilters } from '@tanstack/react-query';
 import {
   EuiFlexGroup,
   EuiFlexItem,
-  EuiHorizontalRule,
-  EuiSpacer,
-  EuiSwitch,
+  EuiPopover,
+  EuiContextMenu,
+  EuiButtonIcon,
+  EuiPanel,
+  EuiConfirmModal,
   EuiToolTip,
 } from '@elastic/eui';
-import { QueryObserverResult, RefetchOptions, RefetchQueryFilters } from '@tanstack/react-query';
 import { css } from '@emotion/react';
-import { DocLinksStart } from '@kbn/core-doc-links-browser';
+import { euiThemeVars } from '@kbn/ui-theme';
 import { isEmpty } from 'lodash';
-import { PromptResponse } from '@kbn/elastic-assistant-common';
-import { AIConnector } from '../../connectorland/connector_selector';
 import { Conversation } from '../../..';
 import { AssistantTitle } from '../assistant_title';
-import { ConversationSelector } from '../conversations/conversation_selector';
+import { ConnectorSelectorInline } from '../../connectorland/connector_selector_inline/connector_selector_inline';
+import { FlyoutNavigation } from '../assistant_overlay/flyout_navigation';
 import { AssistantSettingsButton } from '../settings/assistant_settings_button';
 import * as i18n from './translations';
+import { AIConnector } from '../../connectorland/connector_selector';
 
 interface OwnProps {
-  currentConversation?: Conversation;
+  selectedConversation: Conversation | undefined;
   defaultConnector?: AIConnector;
-  docLinks: Omit<DocLinksStart, 'links'>;
   isDisabled: boolean;
   isSettingsModalVisible: boolean;
-  onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
-  onConversationDeleted: (conversationId: string) => void;
   onToggleShowAnonymizedValues: () => void;
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  shouldDisableKeyboardShortcut?: () => boolean;
   showAnonymizedValues: boolean;
-  title: string;
+  onChatCleared: () => void;
+  onCloseFlyout?: () => void;
+  chatHistoryVisible?: boolean;
+  setChatHistoryVisible?: React.Dispatch<React.SetStateAction<boolean>>;
+  onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
   conversations: Record<string, Conversation>;
   conversationsLoaded: boolean;
   refetchConversationsState: () => Promise<void>;
-  allPrompts: PromptResponse[];
+  onConversationCreate: () => Promise<void>;
+  isAssistantEnabled: boolean;
   refetchPrompts?: (
     options?: RefetchOptions & RefetchQueryFilters<unknown>
   ) => Promise<QueryObserverResult<unknown, unknown>>;
@@ -55,31 +58,53 @@ type Props = OwnProps;
  * toggling the display of anonymized values, and accessing the assistant settings.
  */
 export const AssistantHeader: React.FC<Props> = ({
-  currentConversation,
+  selectedConversation,
   defaultConnector,
-  docLinks,
   isDisabled,
   isSettingsModalVisible,
-  onConversationSelected,
-  onConversationDeleted,
   onToggleShowAnonymizedValues,
   setIsSettingsModalVisible,
-  shouldDisableKeyboardShortcut,
   showAnonymizedValues,
-  title,
+  onChatCleared,
+  chatHistoryVisible,
+  setChatHistoryVisible,
+  onCloseFlyout,
+  onConversationSelected,
   conversations,
   conversationsLoaded,
   refetchConversationsState,
-  allPrompts,
+  onConversationCreate,
+  isAssistantEnabled,
   refetchPrompts,
 }) => {
   const showAnonymizedValuesChecked = useMemo(
     () =>
-      currentConversation?.replacements != null &&
-      Object.keys(currentConversation?.replacements).length > 0 &&
+      selectedConversation?.replacements != null &&
+      Object.keys(selectedConversation?.replacements).length > 0 &&
       showAnonymizedValues,
-    [currentConversation?.replacements, showAnonymizedValues]
+    [selectedConversation?.replacements, showAnonymizedValues]
   );
+
+  const selectedConnectorId = useMemo(
+    () => selectedConversation?.apiConfig?.connectorId,
+    [selectedConversation?.apiConfig?.connectorId]
+  );
+
+  const [isPopoverOpen, setPopover] = useState(false);
+
+  const onButtonClick = useCallback(() => {
+    setPopover(!isPopoverOpen);
+  }, [isPopoverOpen]);
+
+  const closePopover = useCallback(() => {
+    setPopover(false);
+  }, []);
+
+  const [isResetConversationModalVisible, setIsResetConversationModalVisible] = useState(false);
+
+  const closeDestroyModal = useCallback(() => setIsResetConversationModalVisible(false), []);
+  const showDestroyModal = useCallback(() => setIsResetConversationModalVisible(true), []);
+
   const onConversationChange = useCallback(
     (updatedConversation) => {
       onConversationSelected({
@@ -89,90 +114,163 @@ export const AssistantHeader: React.FC<Props> = ({
     },
     [onConversationSelected]
   );
-  const selectedConversationId = useMemo(
-    () =>
-      !isEmpty(currentConversation?.id) ? currentConversation?.id : currentConversation?.title,
-    [currentConversation?.id, currentConversation?.title]
+
+  const panels = useMemo(
+    () => [
+      {
+        id: 0,
+        items: [
+          {
+            name: i18n.RESET_CONVERSATION,
+            css: css`
+              color: ${euiThemeVars.euiColorDanger};
+            `,
+            onClick: showDestroyModal,
+            icon: 'refresh',
+            'data-test-subj': 'clear-chat',
+          },
+        ],
+      },
+    ],
+    [showDestroyModal]
   );
 
+  const handleReset = useCallback(() => {
+    onChatCleared();
+    closeDestroyModal();
+    closePopover();
+  }, [onChatCleared, closeDestroyModal, closePopover]);
+
   return (
     <>
-      <EuiFlexGroup
+      <FlyoutNavigation
+        isExpanded={!!chatHistoryVisible}
+        setIsExpanded={setChatHistoryVisible}
+        onConversationCreate={onConversationCreate}
+        isAssistantEnabled={isAssistantEnabled}
+      >
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem grow={false}>
+            <AssistantSettingsButton
+              defaultConnector={defaultConnector}
+              isDisabled={isDisabled}
+              isSettingsModalVisible={isSettingsModalVisible}
+              selectedConversationId={
+                !isEmpty(selectedConversation?.id)
+                  ? selectedConversation?.id
+                  : selectedConversation?.title
+              }
+              setIsSettingsModalVisible={setIsSettingsModalVisible}
+              onConversationSelected={onConversationSelected}
+              conversations={conversations}
+              conversationsLoaded={conversationsLoaded}
+              refetchConversationsState={refetchConversationsState}
+              refetchPrompts={refetchPrompts}
+            />
+          </EuiFlexItem>
+
+          {onCloseFlyout && (
+            <EuiFlexItem grow={false}>
+              <EuiButtonIcon
+                data-test-subj="euiFlyoutCloseButton"
+                iconType="cross"
+                color="text"
+                size="xs"
+                onClick={onCloseFlyout}
+              />
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+      </FlyoutNavigation>
+      <EuiPanel
+        hasShadow={false}
+        paddingSize="m"
         css={css`
-          width: 100%;
+          padding-top: ${euiThemeVars.euiSizeS};
+          padding-bottom: ${euiThemeVars.euiSizeS};
         `}
-        alignItems={'center'}
-        justifyContent={'spaceBetween'}
       >
-        <EuiFlexItem grow={false}>
-          <AssistantTitle
-            isDisabled={isDisabled}
-            docLinks={docLinks}
-            selectedConversation={currentConversation}
-            onChange={onConversationChange}
-            title={title}
-            isFlyoutMode={false}
-            refetchConversationsState={refetchConversationsState}
-          />
-        </EuiFlexItem>
-
-        <EuiFlexItem
-          grow={false}
-          css={css`
-            width: 335px;
-          `}
-        >
-          <ConversationSelector
-            defaultConnector={defaultConnector}
-            selectedConversationId={selectedConversationId}
-            onConversationSelected={onConversationSelected}
-            shouldDisableKeyboardShortcut={shouldDisableKeyboardShortcut}
-            isDisabled={isDisabled}
-            conversations={conversations}
-            onConversationDeleted={onConversationDeleted}
-            allPrompts={allPrompts}
-          />
+        <EuiFlexGroup alignItems={'center'} justifyContent={'spaceBetween'} gutterSize="s">
+          <EuiFlexItem
+            css={css`
+              overflow: hidden;
+            `}
+          >
+            <AssistantTitle
+              title={selectedConversation?.title}
+              selectedConversation={selectedConversation}
+              refetchConversationsState={refetchConversationsState}
+            />
+          </EuiFlexItem>
 
-          <>
-            <EuiSpacer size={'s'} />
-            <EuiFlexGroup alignItems="center" gutterSize="none" justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup gutterSize="xs" alignItems={'center'}>
+              <EuiFlexItem>
+                <ConnectorSelectorInline
+                  isDisabled={isDisabled || selectedConversation === undefined}
+                  selectedConnectorId={selectedConnectorId}
+                  selectedConversation={selectedConversation}
+                  onConnectorSelected={onConversationChange}
+                />
+              </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 <EuiToolTip
-                  content={i18n.SHOW_ANONYMIZED_TOOLTIP}
-                  position="left"
-                  repositionOnScroll={true}
+                  content={
+                    showAnonymizedValuesChecked ? i18n.SHOW_REAL_VALUES : i18n.SHOW_ANONYMIZED
+                  }
                 >
-                  <EuiSwitch
+                  <EuiButtonIcon
+                    css={css`
+                      border-radius: 50%;
+                    `}
+                    display="base"
                     data-test-subj="showAnonymizedValues"
-                    checked={showAnonymizedValuesChecked}
-                    compressed={true}
-                    disabled={isEmpty(currentConversation?.replacements)}
-                    label={i18n.SHOW_ANONYMIZED}
-                    onChange={onToggleShowAnonymizedValues}
+                    isSelected={showAnonymizedValuesChecked}
+                    aria-label={
+                      showAnonymizedValuesChecked ? i18n.SHOW_ANONYMIZED : i18n.SHOW_REAL_VALUES
+                    }
+                    iconType={showAnonymizedValuesChecked ? 'eye' : 'eyeClosed'}
+                    onClick={onToggleShowAnonymizedValues}
+                    isDisabled={isEmpty(selectedConversation?.replacements)}
                   />
                 </EuiToolTip>
               </EuiFlexItem>
-
-              <EuiFlexItem grow={false}>
-                <AssistantSettingsButton
-                  defaultConnector={defaultConnector}
-                  isDisabled={isDisabled}
-                  isSettingsModalVisible={isSettingsModalVisible}
-                  selectedConversationId={selectedConversationId}
-                  setIsSettingsModalVisible={setIsSettingsModalVisible}
-                  onConversationSelected={onConversationSelected}
-                  conversations={conversations}
-                  conversationsLoaded={conversationsLoaded}
-                  refetchConversationsState={refetchConversationsState}
-                  isFlyoutMode={false}
-                  refetchPrompts={refetchPrompts}
-                />
+              <EuiFlexItem>
+                <EuiPopover
+                  button={
+                    <EuiButtonIcon
+                      aria-label="test"
+                      iconType="boxesVertical"
+                      onClick={onButtonClick}
+                      data-test-subj="chat-context-menu"
+                    />
+                  }
+                  isOpen={isPopoverOpen}
+                  closePopover={closePopover}
+                  panelPaddingSize="none"
+                  anchorPosition="downLeft"
+                >
+                  <EuiContextMenu initialPanelId={0} panels={panels} />
+                </EuiPopover>
               </EuiFlexItem>
             </EuiFlexGroup>
-          </>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiHorizontalRule margin={'m'} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiPanel>
+      {isResetConversationModalVisible && (
+        <EuiConfirmModal
+          title={i18n.RESET_CONVERSATION}
+          onCancel={closeDestroyModal}
+          onConfirm={handleReset}
+          cancelButtonText={i18n.CANCEL_BUTTON_TEXT}
+          confirmButtonText={i18n.RESET_BUTTON_TEXT}
+          buttonColor="danger"
+          defaultFocusedButton="confirm"
+          data-test-subj="reset-conversation-modal"
+        >
+          <p>{i18n.CLEAR_CHAT_CONFIRMATION}</p>
+        </EuiConfirmModal>
+      )}
     </>
   );
 };
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx
index 85d7360c2870a..3f7c3f7ea1bcb 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/flyout_navigation.tsx
@@ -48,6 +48,7 @@ export const FlyoutNavigation = memo<FlyoutNavigationProps>(
           onClick={onToggle}
           iconType={isExpanded ? 'arrowEnd' : 'arrowStart'}
           size="xs"
+          data-test-subj="aiAssistantFlyoutNavigationToggle"
           aria-label={
             isExpanded
               ? i18n.translate(
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.test.tsx
index 679901bc02748..9e6a9164607a3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.test.tsx
@@ -24,31 +24,33 @@ describe('AssistantOverlay', () => {
   it('renders when isAssistantEnabled prop is true and keyboard shortcut is pressed', () => {
     const { getByTestId } = render(
       <TestProviders providerContext={{ assistantTelemetry }}>
-        <AssistantOverlay isFlyoutMode={false} />
+        <AssistantOverlay />
       </TestProviders>
     );
     fireEvent.keyDown(document, { key: ';', ctrlKey: true });
-    const modal = getByTestId('ai-assistant-modal');
-    expect(modal).toBeInTheDocument();
+    const flyout = getByTestId('ai-assistant-flyout');
+    expect(flyout).toBeInTheDocument();
   });
 
-  it('modal closes when close button is clicked', () => {
-    const { getByLabelText, queryByTestId } = render(
+  it('flyout closes when close button is clicked', () => {
+    const { queryByTestId } = render(
       <TestProviders>
-        <AssistantOverlay isFlyoutMode={false} />
+        <AssistantOverlay />
       </TestProviders>
     );
     fireEvent.keyDown(document, { key: ';', ctrlKey: true });
-    const closeButton = getByLabelText('Closes this modal window');
-    fireEvent.click(closeButton);
-    const modal = queryByTestId('ai-assistant-modal');
-    expect(modal).not.toBeInTheDocument();
+    const closeButton = queryByTestId('euiFlyoutCloseButton');
+    if (closeButton) {
+      fireEvent.click(closeButton);
+    }
+    const flyout = queryByTestId('ai-assistant-flyout');
+    expect(flyout).not.toBeInTheDocument();
   });
 
-  it('Assistant invoked from shortcut tracking happens on modal open only (not close)', () => {
+  it('Assistant invoked from shortcut tracking happens on flyout open only (not close)', () => {
     render(
       <TestProviders providerContext={{ assistantTelemetry }}>
-        <AssistantOverlay isFlyoutMode={false} />
+        <AssistantOverlay />
       </TestProviders>
     );
     fireEvent.keyDown(document, { key: ';', ctrlKey: true });
@@ -61,26 +63,26 @@ describe('AssistantOverlay', () => {
     expect(reportAssistantInvoked).toHaveBeenCalledTimes(1);
   });
 
-  it('modal closes when shortcut is pressed and modal is already open', () => {
+  it('flyout closes when shortcut is pressed and flyout is already open', () => {
     const { queryByTestId } = render(
       <TestProviders>
-        <AssistantOverlay isFlyoutMode={false} />
+        <AssistantOverlay />
       </TestProviders>
     );
     fireEvent.keyDown(document, { key: ';', ctrlKey: true });
     fireEvent.keyDown(document, { key: ';', ctrlKey: true });
-    const modal = queryByTestId('ai-assistant-modal');
-    expect(modal).not.toBeInTheDocument();
+    const flyout = queryByTestId('ai-assistant-flyout');
+    expect(flyout).not.toBeInTheDocument();
   });
 
-  it('modal does not open when incorrect shortcut is pressed', () => {
+  it('flyout does not open when incorrect shortcut is pressed', () => {
     const { queryByTestId } = render(
       <TestProviders>
-        <AssistantOverlay isFlyoutMode={false} />
+        <AssistantOverlay />
       </TestProviders>
     );
     fireEvent.keyDown(document, { key: 'a', ctrlKey: true });
-    const modal = queryByTestId('ai-assistant-modal');
-    expect(modal).not.toBeInTheDocument();
+    const flyout = queryByTestId('ai-assistant-flyout');
+    expect(flyout).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.tsx
index 44907d8b1fd00..689f60f0a52d9 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_overlay/index.tsx
@@ -6,12 +6,12 @@
  */
 
 import React, { useCallback, useEffect, useRef, useState } from 'react';
-import { EuiModal, EuiFlyoutResizable, useEuiTheme } from '@elastic/eui';
+import { EuiFlyoutResizable } from '@elastic/eui';
 
 import useEvent from 'react-use/lib/useEvent';
-// eslint-disable-next-line @kbn/eslint/module_migration
-import styled from 'styled-components';
 import { css } from '@emotion/react';
+// eslint-disable-next-line @kbn/eslint/module_migration
+import { createGlobalStyle } from 'styled-components';
 import {
   ShowAssistantOverlayProps,
   useAssistantContext,
@@ -22,23 +22,21 @@ import { WELCOME_CONVERSATION_TITLE } from '../use_conversation/translations';
 
 const isMac = navigator.platform.toLowerCase().indexOf('mac') >= 0;
 
-const StyledEuiModal = styled(EuiModal)`
-  ${({ theme }) => `margin-top: ${theme.eui.euiSizeXXL};`}
-  min-width: 95vw;
-  min-height: 25vh;
-`;
-
 /**
  * Modal container for Elastic AI Assistant conversations, receiving the page contents as context, plus whatever
  * component currently has focus and any specific context it may provide through the SAssInterface.
  */
 export interface Props {
-  isFlyoutMode: boolean;
   currentUserAvatar?: UserAvatar;
 }
 
-export const AssistantOverlay = React.memo<Props>(({ isFlyoutMode, currentUserAvatar }) => {
-  const { euiTheme } = useEuiTheme();
+export const UnifiedTimelineGlobalStyles = createGlobalStyle`
+  body:has(.timeline-portal-overlay-mask) .euiOverlayMask {
+    z-index: 1003 !important;
+  }
+`;
+
+export const AssistantOverlay = React.memo<Props>(({ currentUserAvatar }) => {
   const [isModalVisible, setIsModalVisible] = useState(false);
   const [conversationTitle, setConversationTitle] = useState<string | undefined>(
     WELCOME_CONVERSATION_TITLE
@@ -130,8 +128,8 @@ export const AssistantOverlay = React.memo<Props>(({ isFlyoutMode, currentUserAv
 
   if (!isModalVisible) return null;
 
-  if (isFlyoutMode) {
-    return (
+  return (
+    <>
       <EuiFlyoutResizable
         ref={flyoutRef}
         css={css`
@@ -145,35 +143,17 @@ export const AssistantOverlay = React.memo<Props>(({ isFlyoutMode, currentUserAv
         data-test-subj="ai-assistant-flyout"
         paddingSize="none"
         hideCloseButton
-        // EUI TODO: This z-index override of EuiOverlayMask is a workaround, and ideally should be resolved with a cleaner UI/UX flow long-term
-        maskProps={{ style: `z-index: ${(euiTheme.levels.flyout as number) + 3}` }} // we need this flyout to be above the timeline flyout (which has a z-index of 1002)
       >
         <Assistant
           conversationTitle={conversationTitle}
           promptContextId={promptContextId}
           onCloseFlyout={handleCloseModal}
-          isFlyoutMode={isFlyoutMode}
           chatHistoryVisible={chatHistoryVisible}
           setChatHistoryVisible={toggleChatHistory}
           currentUserAvatar={currentUserAvatar}
         />
       </EuiFlyoutResizable>
-    );
-  }
-
-  return (
-    <>
-      {isModalVisible && (
-        <StyledEuiModal onClose={handleCloseModal} data-test-subj="ai-assistant-modal">
-          <Assistant
-            conversationTitle={conversationTitle}
-            promptContextId={promptContextId}
-            chatHistoryVisible={chatHistoryVisible}
-            setChatHistoryVisible={toggleChatHistory}
-            currentUserAvatar={currentUserAvatar}
-          />
-        </StyledEuiModal>
-      )}
+      <UnifiedTimelineGlobalStyles />
     </>
   );
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.test.tsx
index ee4a998a1439f..d9dd84cb0b51d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { render, fireEvent } from '@testing-library/react';
+import { render } from '@testing-library/react';
 import { AssistantTitle } from '.';
 import { TestProviders } from '../../mock/test_providers/test_providers';
 
@@ -14,7 +14,6 @@ const testProps = {
   title: 'Test Title',
   docLinks: { ELASTIC_WEBSITE_URL: 'https://www.elastic.co/', DOC_LINK_VERSION: '7.15' },
   selectedConversation: undefined,
-  isFlyoutMode: false,
   onChange: jest.fn(),
   refetchConversationsState: jest.fn(),
 };
@@ -28,22 +27,4 @@ describe('AssistantTitle', () => {
     );
     expect(getByText('Test Title')).toBeInTheDocument();
   });
-
-  it('clicking on the popover button opens the popover with the correct link', () => {
-    const { getByTestId, queryByTestId } = render(
-      <TestProviders>
-        <AssistantTitle {...testProps} />
-      </TestProviders>,
-      {
-        wrapper: TestProviders,
-      }
-    );
-    expect(queryByTestId('tooltipContent')).not.toBeInTheDocument();
-    fireEvent.click(getByTestId('tooltipIcon'));
-    expect(getByTestId('tooltipContent')).toBeInTheDocument();
-    expect(getByTestId('externalDocumentationLink')).toHaveAttribute(
-      'href',
-      'https://www.elastic.co/guide/en/security/7.15/security-assistant.html'
-    );
-  });
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx
index 7e9934afcaa90..2090a92645c65 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/assistant_title/index.tsx
@@ -5,24 +5,10 @@
  * 2.0.
  */
 
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import {
-  EuiButtonIcon,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiInlineEditTitle,
-  EuiLink,
-  EuiModalHeaderTitle,
-  EuiPopover,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import type { DocLinksStart } from '@kbn/core-doc-links-browser';
-import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useCallback, useEffect, useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiInlineEditTitle } from '@elastic/eui';
 import { css } from '@emotion/react';
-import * as i18n from '../translations';
 import type { Conversation } from '../../..';
-import { ConnectorSelectorInline } from '../../connectorland/connector_selector_inline/connector_selector_inline';
 import { AssistantAvatar } from '../assistant_avatar/assistant_avatar';
 import { useConversation } from '../use_conversation';
 import { NEW_CHAT } from '../conversations/conversation_sidepanel/translations';
@@ -32,63 +18,14 @@ import { NEW_CHAT } from '../conversations/conversation_sidepanel/translations';
  * information about the assistant feature and access to documentation.
  */
 export const AssistantTitle: React.FC<{
-  isDisabled?: boolean;
   title?: string;
-  docLinks: Omit<DocLinksStart, 'links'>;
   selectedConversation: Conversation | undefined;
-  isFlyoutMode: boolean;
-  onChange: (updatedConversation: Conversation) => void;
   refetchConversationsState: () => Promise<void>;
-}> = ({
-  isDisabled = false,
-  title,
-  docLinks,
-  selectedConversation,
-  isFlyoutMode,
-  onChange,
-  refetchConversationsState,
-}) => {
+}> = ({ title, selectedConversation, refetchConversationsState }) => {
   const [newTitle, setNewTitle] = useState(title);
   const [newTitleError, setNewTitleError] = useState(false);
   const { updateConversationTitle } = useConversation();
 
-  const selectedConnectorId = selectedConversation?.apiConfig?.connectorId;
-
-  const { ELASTIC_WEBSITE_URL, DOC_LINK_VERSION } = docLinks;
-  const url = `${ELASTIC_WEBSITE_URL}guide/en/security/${DOC_LINK_VERSION}/security-assistant.html`;
-
-  const documentationLink = useMemo(
-    () => (
-      <EuiLink
-        aria-label={i18n.TOOLTIP_ARIA_LABEL}
-        data-test-subj="externalDocumentationLink"
-        external
-        href={url}
-        target="_blank"
-      >
-        {i18n.DOCUMENTATION}
-      </EuiLink>
-    ),
-    [url]
-  );
-
-  const content = useMemo(
-    () => (
-      <FormattedMessage
-        defaultMessage="Responses from AI systems may not always be entirely accurate. For more information on the assistant feature and its usage, please reference the {documentationLink}."
-        id="xpack.elasticAssistant.assistant.technicalPreview.tooltipContent"
-        values={{
-          documentationLink,
-        }}
-      />
-    ),
-    [documentationLink]
-  );
-
-  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-  const onButtonClick = useCallback(() => setIsPopoverOpen((isOpen: boolean) => !isOpen), []);
-  const closePopover = useCallback(() => setIsPopoverOpen(false), []);
-
   const handleUpdateTitle = useCallback(
     async (updatedTitle: string) => {
       setNewTitleError(false);
@@ -109,108 +46,33 @@ export const AssistantTitle: React.FC<{
     setNewTitle(title);
   }, [title]);
 
-  if (isFlyoutMode) {
-    return (
-      <EuiFlexGroup gutterSize="m" alignItems="center">
-        <EuiFlexItem grow={false}>
-          <AssistantAvatar data-test-subj="titleIcon" size={isFlyoutMode ? 's' : 'm'} />
-        </EuiFlexItem>
-        <EuiFlexItem
-          css={css`
-            overflow: hidden;
-          `}
-        >
-          <EuiInlineEditTitle
-            heading="h2"
-            inputAriaLabel="Edit text inline"
-            value={newTitle ?? NEW_CHAT}
-            size="xs"
-            isInvalid={!!newTitleError}
-            isReadOnly={selectedConversation?.isDefault}
-            onChange={(e) => setNewTitle(e.currentTarget.nodeValue || '')}
-            onCancel={() => setNewTitle(title)}
-            onSave={handleUpdateTitle}
-            editModeProps={{
-              formRowProps: {
-                fullWidth: true,
-              },
-            }}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-
   return (
-    <EuiModalHeaderTitle>
-      <EuiFlexGroup gutterSize="m" alignItems="center">
-        <EuiFlexItem grow={false}>
-          <AssistantAvatar data-test-subj="titleIcon" size={isFlyoutMode ? 's' : 'm'} />
-        </EuiFlexItem>
-        <EuiFlexItem
-          css={css`
-            overflow: hidden;
-          `}
-        >
-          <EuiFlexGroup
-            direction={isFlyoutMode ? 'row' : 'column'}
-            gutterSize="none"
-            justifyContent={isFlyoutMode ? 'spaceBetween' : 'center'}
-          >
-            <EuiFlexItem grow={false}>
-              <EuiFlexGroup gutterSize="xs" alignItems="center">
-                <EuiFlexItem grow={false}>
-                  <EuiTitle size={'s'}>
-                    <h3>{title}</h3>
-                  </EuiTitle>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiPopover
-                    css={
-                      isFlyoutMode &&
-                      css`
-                        display: inline-flex;
-                      `
-                    }
-                    button={
-                      <EuiButtonIcon
-                        aria-label={i18n.TOOLTIP_ARIA_LABEL}
-                        data-test-subj="tooltipIcon"
-                        iconType="iInCircle"
-                        onClick={onButtonClick}
-                      />
-                    }
-                    isOpen={isPopoverOpen}
-                    closePopover={closePopover}
-                    anchorPosition="rightUp"
-                  >
-                    <EuiText
-                      data-test-subj="tooltipContent"
-                      grow={false}
-                      css={{ maxWidth: '400px' }}
-                    >
-                      <EuiText size={'s'}>
-                        <p>{content}</p>
-                      </EuiText>
-                    </EuiText>
-                  </EuiPopover>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-            {!isFlyoutMode && (
-              <EuiFlexItem grow={false}>
-                <ConnectorSelectorInline
-                  isDisabled={isDisabled || selectedConversation === undefined}
-                  selectedConnectorId={selectedConnectorId}
-                  selectedConversation={selectedConversation}
-                  isFlyoutMode={isFlyoutMode}
-                  onConnectorSelected={onChange}
-                />
-              </EuiFlexItem>
-            )}
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiModalHeaderTitle>
+    <EuiFlexGroup gutterSize="m" alignItems="center">
+      <EuiFlexItem grow={false}>
+        <AssistantAvatar data-test-subj="titleIcon" size={'s'} />
+      </EuiFlexItem>
+      <EuiFlexItem
+        css={css`
+          overflow: hidden;
+        `}
+      >
+        <EuiInlineEditTitle
+          heading="h2"
+          inputAriaLabel="Edit text inline"
+          value={newTitle ?? NEW_CHAT}
+          size="xs"
+          isInvalid={!!newTitleError}
+          isReadOnly={selectedConversation?.isDefault}
+          onChange={(e) => setNewTitle(e.currentTarget.nodeValue || '')}
+          onCancel={() => setNewTitle(title)}
+          onSave={handleUpdateTitle}
+          editModeProps={{
+            formRowProps: {
+              fullWidth: true,
+            },
+          }}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.test.tsx
index 36936c7565112..7fbd7e1a03366 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.test.tsx
@@ -9,14 +9,11 @@ import React from 'react';
 import { render, fireEvent, within } from '@testing-library/react';
 import { ChatActions } from '.';
 
-const onChatCleared = jest.fn();
 const onSendMessage = jest.fn();
 const testProps = {
   isDisabled: false,
   isLoading: false,
-  onChatCleared,
   onSendMessage,
-  isFlyoutMode: false,
   promptValue: 'prompt',
 };
 
@@ -26,16 +23,9 @@ describe('ChatActions', () => {
   });
   it('the component renders with all props', () => {
     const { getByTestId } = render(<ChatActions {...testProps} />);
-    expect(getByTestId('clear-chat')).toHaveAttribute('aria-label', 'Clear chat');
     expect(getByTestId('submit-chat')).toHaveAttribute('aria-label', 'Submit message');
   });
 
-  it('onChatCleared function is called when clear chat button is clicked', () => {
-    const { getByTestId } = render(<ChatActions {...testProps} />);
-    fireEvent.click(getByTestId('clear-chat'));
-    expect(onChatCleared).toHaveBeenCalled();
-  });
-
   it('onSendMessage function is called when send message button is clicked', () => {
     const { getByTestId } = render(<ChatActions {...testProps} />);
 
@@ -49,7 +39,6 @@ describe('ChatActions', () => {
       isDisabled: true,
     };
     const { getByTestId } = render(<ChatActions {...props} />);
-    expect(getByTestId('clear-chat')).toBeDisabled();
     expect(getByTestId('submit-chat')).toBeDisabled();
   });
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.tsx
index e7ff0922b30ae..ba980356351fd 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_actions/index.tsx
@@ -7,14 +7,12 @@
 
 import React, { useCallback, useRef } from 'react';
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
-import { CLEAR_CHAT, SUBMIT_MESSAGE } from '../translations';
+import { SUBMIT_MESSAGE } from '../translations';
 
 interface OwnProps {
   isDisabled: boolean;
   isLoading: boolean;
-  isFlyoutMode: boolean;
   promptValue?: string;
-  onChatCleared: () => void;
   onSendMessage: () => void;
 }
 
@@ -26,9 +24,7 @@ type Props = OwnProps;
 export const ChatActions: React.FC<Props> = ({
   isDisabled,
   isLoading,
-  onChatCleared,
   onSendMessage,
-  isFlyoutMode,
   promptValue,
 }) => {
   const submitTooltipRef = useRef<EuiToolTip | null>(null);
@@ -39,21 +35,6 @@ export const ChatActions: React.FC<Props> = ({
 
   return (
     <EuiFlexGroup direction="column" gutterSize="xs">
-      {!isFlyoutMode && (
-        <EuiFlexItem grow={false}>
-          <EuiToolTip position="right" content={CLEAR_CHAT}>
-            <EuiButtonIcon
-              aria-label={CLEAR_CHAT}
-              color="danger"
-              data-test-subj="clear-chat"
-              display="base"
-              iconType="cross"
-              isDisabled={isDisabled}
-              onClick={onChatCleared}
-            />
-          </EuiToolTip>
-        </EuiFlexItem>
-      )}
       <EuiFlexItem grow={false}>
         <EuiToolTip
           ref={submitTooltipRef}
@@ -66,9 +47,9 @@ export const ChatActions: React.FC<Props> = ({
             aria-label={SUBMIT_MESSAGE}
             data-test-subj="submit-chat"
             color="primary"
-            display={isFlyoutMode && promptValue?.length ? 'fill' : 'base'}
-            size={isFlyoutMode ? 'm' : 'xs'}
-            iconType={isFlyoutMode ? 'kqlFunction' : 'returnKey'}
+            display={promptValue?.length ? 'fill' : 'base'}
+            size={'m'}
+            iconType={'kqlFunction'}
             isDisabled={isDisabled || !promptValue?.length}
             isLoading={isLoading}
             onClick={onSendMessage}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.test.tsx
index ab7b942476f81..99f30cde68a82 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.test.tsx
@@ -12,12 +12,10 @@ import { TestProviders } from '../../mock/test_providers/test_providers';
 
 jest.mock('./use_chat_send');
 
-const handleOnChatCleared = jest.fn();
 const handlePromptChange = jest.fn();
 const handleSendMessage = jest.fn();
 const handleRegenerateResponse = jest.fn();
 const testProps: Props = {
-  handleOnChatCleared,
   handlePromptChange,
   handleSendMessage,
   handleRegenerateResponse,
@@ -25,7 +23,6 @@ const testProps: Props = {
   isDisabled: false,
   shouldRefocusPrompt: false,
   userPrompt: '',
-  isFlyoutMode: false,
 };
 describe('ChatSend', () => {
   beforeEach(() => {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.tsx
index 880d4d5f9f88f..c292a70252a03 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/index.tsx
@@ -14,11 +14,10 @@ import { ChatActions } from '../chat_actions';
 import { PromptTextArea } from '../prompt_textarea';
 import { useAutosizeTextArea } from './use_autosize_textarea';
 
-export interface Props extends Omit<UseChatSend, 'abortStream'> {
+export interface Props extends Omit<UseChatSend, 'abortStream' | 'handleOnChatCleared'> {
   isDisabled: boolean;
   shouldRefocusPrompt: boolean;
   userPrompt: string | null;
-  isFlyoutMode: boolean;
 }
 
 /**
@@ -26,12 +25,10 @@ export interface Props extends Omit<UseChatSend, 'abortStream'> {
  * Allows the user to clear the chat and switch between different system prompts.
  */
 export const ChatSend: React.FC<Props> = ({
-  handleOnChatCleared,
   handlePromptChange,
   handleSendMessage,
   isDisabled,
   isLoading,
-  isFlyoutMode,
   shouldRefocusPrompt,
   userPrompt,
 }) => {
@@ -58,7 +55,7 @@ export const ChatSend: React.FC<Props> = ({
   return (
     <EuiFlexGroup
       gutterSize="none"
-      alignItems={isFlyoutMode ? 'flexEnd' : 'flexStart'}
+      alignItems={'flexEnd'}
       css={css`
         position: relative;
       `}
@@ -74,32 +71,21 @@ export const ChatSend: React.FC<Props> = ({
           handlePromptChange={handlePromptChange}
           value={promptValue}
           isDisabled={isDisabled}
-          isFlyoutMode={isFlyoutMode}
         />
       </EuiFlexItem>
       <EuiFlexItem
-        css={
-          isFlyoutMode
-            ? css`
-                right: 0;
-                position: absolute;
-                margin-right: ${euiThemeVars.euiSizeS};
-                margin-bottom: ${euiThemeVars.euiSizeS};
-              `
-            : css`
-                left: -34px;
-                position: relative;
-                top: 11px;
-              `
-        }
+        css={css`
+          right: 0;
+          position: absolute;
+          margin-right: ${euiThemeVars.euiSizeS};
+          margin-bottom: ${euiThemeVars.euiSizeS};
+        `}
         grow={false}
       >
         <ChatActions
-          onChatCleared={handleOnChatCleared}
           isDisabled={isDisabled}
           isLoading={isLoading}
           onSendMessage={onSendMessage}
-          isFlyoutMode={isFlyoutMode}
           promptValue={promptValue}
         />
       </EuiFlexItem>
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.test.tsx
index 17a421313e3a4..a9231499570c7 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.test.tsx
@@ -21,7 +21,6 @@ jest.mock('../use_conversation');
 jest.mock('../../..');
 
 const setEditingSystemPromptId = jest.fn();
-const setPromptTextPreview = jest.fn();
 const setSelectedPromptContexts = jest.fn();
 const setUserPrompt = jest.fn();
 const sendMessage = jest.fn();
@@ -43,7 +42,6 @@ export const testProps: UseChatSendProps = {
   } as unknown as HttpSetup,
   editingSystemPromptId: defaultSystemPrompt.id,
   setEditingSystemPromptId,
-  setPromptTextPreview,
   setSelectedPromptContexts,
   setUserPrompt,
   setCurrentConversation,
@@ -75,7 +73,6 @@ describe('use chat send', () => {
     });
     result.current.handleOnChatCleared();
     expect(clearConversation).toHaveBeenCalled();
-    expect(setPromptTextPreview).toHaveBeenCalledWith('');
     expect(setUserPrompt).toHaveBeenCalledWith('');
     expect(setSelectedPromptContexts).toHaveBeenCalledWith({});
     await waitFor(() => {
@@ -89,7 +86,6 @@ describe('use chat send', () => {
       wrapper: TestProviders,
     });
     result.current.handlePromptChange('new prompt');
-    expect(setPromptTextPreview).toHaveBeenCalledWith('new prompt');
     expect(setUserPrompt).toHaveBeenCalledWith('new prompt');
   });
   it('handleSendMessage sends message with context prompt when a valid prompt text is provided', async () => {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.tsx
index 9d5e822fcdf55..5a70b6ad32cd8 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/chat_send/use_chat_send.tsx
@@ -25,7 +25,6 @@ export interface UseChatSendProps {
   http: HttpSetup;
   selectedPromptContexts: Record<string, SelectedPromptContext>;
   setEditingSystemPromptId: React.Dispatch<React.SetStateAction<string | undefined>>;
-  setPromptTextPreview: React.Dispatch<React.SetStateAction<string>>;
   setSelectedPromptContexts: React.Dispatch<
     React.SetStateAction<Record<string, SelectedPromptContext>>
   >;
@@ -54,7 +53,6 @@ export const useChatSend = ({
   http,
   selectedPromptContexts,
   setEditingSystemPromptId,
-  setPromptTextPreview,
   setSelectedPromptContexts,
   setUserPrompt,
   setCurrentConversation,
@@ -69,7 +67,6 @@ export const useChatSend = ({
   const { clearConversation, removeLastMessage } = useConversation();
 
   const handlePromptChange = (prompt: string) => {
-    setPromptTextPreview(prompt);
     setUserPrompt(prompt);
   };
 
@@ -120,7 +117,6 @@ export const useChatSend = ({
 
       // Reset prompt context selection and preview before sending:
       setSelectedPromptContexts({});
-      setPromptTextPreview('');
 
       const rawResponse = await sendMessage({
         apiConfig: currentConversation.apiConfig,
@@ -168,7 +164,6 @@ export const useChatSend = ({
       selectedPromptContexts,
       sendMessage,
       setCurrentConversation,
-      setPromptTextPreview,
       setSelectedPromptContexts,
       toasts,
     ]
@@ -214,7 +209,6 @@ export const useChatSend = ({
       conversation: currentConversation,
     })?.id;
 
-    setPromptTextPreview('');
     setUserPrompt('');
     setSelectedPromptContexts({});
     if (currentConversation) {
@@ -230,7 +224,6 @@ export const useChatSend = ({
     currentConversation,
     setCurrentConversation,
     setEditingSystemPromptId,
-    setPromptTextPreview,
     setSelectedPromptContexts,
     setUserPrompt,
   ]);
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.test.tsx
index 0168c27c7f548..da2dd3008a1b0 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.test.tsx
@@ -33,7 +33,6 @@ const mockPromptContexts: Record<string, PromptContext> = {
 const defaultProps = {
   anonymizationFields: { total: 0, page: 1, perPage: 1000, data: [] },
   promptContexts: mockPromptContexts,
-  isFlyoutMode: false,
 };
 
 describe('ContextPills', () => {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.tsx
index ce5a0cf59ca6a..d3ae29643804e 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/context_pills/index.tsx
@@ -5,20 +5,14 @@
  * 2.0.
  */
 
-import { EuiButton, EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { sortBy } from 'lodash/fp';
 import React, { useCallback, useMemo } from 'react';
-// eslint-disable-next-line @kbn/eslint/module_migration
-import styled from 'styled-components';
 
 import { FindAnonymizationFieldsResponse } from '@kbn/elastic-assistant-common/impl/schemas/anonymization_fields/find_anonymization_fields_route.gen';
 import { getNewSelectedPromptContext } from '../../data_anonymization/get_new_selected_prompt_context';
 import type { PromptContext, SelectedPromptContext } from '../prompt_context/types';
 
-const PillButton = styled(EuiButton)`
-  margin-right: ${({ theme }) => theme.eui.euiSizeXS};
-`;
-
 interface Props {
   anonymizationFields: FindAnonymizationFieldsResponse;
   promptContexts: Record<string, PromptContext>;
@@ -26,7 +20,6 @@ interface Props {
   setSelectedPromptContexts: React.Dispatch<
     React.SetStateAction<Record<string, SelectedPromptContext>>
   >;
-  isFlyoutMode: boolean;
 }
 
 const ContextPillsComponent: React.FC<Props> = ({
@@ -34,7 +27,6 @@ const ContextPillsComponent: React.FC<Props> = ({
   promptContexts,
   selectedPromptContexts,
   setSelectedPromptContexts,
-  isFlyoutMode,
 }) => {
   const sortedPromptContexts = useMemo(
     () => sortBy('description', Object.values(promptContexts)),
@@ -63,7 +55,7 @@ const ContextPillsComponent: React.FC<Props> = ({
       {sortedPromptContexts.map(({ description, id, tooltip }) => {
         // Workaround for known issue where tooltip won't dismiss after button state is changed once clicked
         // See: https://github.com/elastic/eui/issues/6488#issuecomment-1379656704
-        const button = isFlyoutMode ? (
+        const button = (
           <EuiButtonEmpty
             data-test-subj={`pillButton-${id}`}
             disabled={selectedPromptContexts[id] != null}
@@ -74,16 +66,6 @@ const ContextPillsComponent: React.FC<Props> = ({
           >
             {description}
           </EuiButtonEmpty>
-        ) : (
-          <PillButton
-            data-test-subj={`pillButton-${id}`}
-            disabled={selectedPromptContexts[id] != null}
-            iconSide="left"
-            iconType="plus"
-            onClick={() => selectPromptContext(id)}
-          >
-            {description}
-          </PillButton>
         );
         return (
           <EuiFlexItem grow={false} key={id}>
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector/index.tsx
index fd9cddc39dbbe..4ee8076c42a9d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector/index.tsx
@@ -35,7 +35,6 @@ interface Props {
   selectedConversationId: string | undefined;
   onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
   onConversationDeleted: (conversationId: string) => void;
-  shouldDisableKeyboardShortcut?: () => boolean;
   isDisabled?: boolean;
   conversations: Record<string, Conversation>;
   allPrompts: PromptResponse[];
@@ -65,7 +64,6 @@ export const ConversationSelector: React.FC<Props> = React.memo(
     defaultConnector,
     onConversationSelected,
     onConversationDeleted,
-    shouldDisableKeyboardShortcut = () => false,
     isDisabled = false,
     conversations,
     allPrompts,
@@ -199,9 +197,8 @@ export const ConversationSelector: React.FC<Props> = React.memo(
 
     const renderOption: (
       option: ConversationSelectorOption,
-      searchValue: string,
-      OPTION_CONTENT_CLASSNAME: string
-    ) => React.ReactNode = (option, searchValue, contentClassName) => {
+      searchValue: string
+    ) => React.ReactNode = (option, searchValue) => {
       const { label, id, value } = option;
 
       return (
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector_settings/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector_settings/index.tsx
index f4b8f9a79412f..f1edb5a9dc2a9 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector_settings/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_selector_settings/index.tsx
@@ -27,7 +27,6 @@ interface Props {
   onConversationDeleted: (conversationTitle: string) => void;
   onConversationSelectionChange: (conversation?: Conversation | string) => void;
   selectedConversationTitle: string;
-  shouldDisableKeyboardShortcut?: () => boolean;
   isDisabled?: boolean;
 }
 
@@ -62,7 +61,6 @@ export const ConversationSelectorSettings: React.FC<Props> = React.memo(
     onConversationSelectionChange,
     selectedConversationTitle,
     isDisabled,
-    shouldDisableKeyboardShortcut = () => false,
   }) => {
     const conversationTitles = useMemo(
       () => Object.values(conversations).map((c) => c.title),
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings.tsx
index cba17030e1577..1584a46ee687a 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings.tsx
@@ -49,7 +49,6 @@ export interface ConversationSettingsProps {
     React.SetStateAction<ConversationsBulkActions>
   >;
   isDisabled?: boolean;
-  isFlyoutMode: boolean;
 }
 
 /**
@@ -66,7 +65,6 @@ export const ConversationSettings: React.FC<ConversationSettingsProps> = React.m
     conversationSettings,
     http,
     isDisabled = false,
-    isFlyoutMode,
     setAssistantStreamingEnabled,
     setConversationSettings,
     conversationsSettingsBulkActions,
@@ -127,7 +125,6 @@ export const ConversationSettings: React.FC<ConversationSettingsProps> = React.m
           conversationsSettingsBulkActions={conversationsSettingsBulkActions}
           http={http}
           isDisabled={isDisabled}
-          isFlyoutMode={isFlyoutMode}
           selectedConversation={selectedConversationWithApiConfig}
           setConversationSettings={setConversationSettings}
           setConversationsSettingsBulkActions={setConversationsSettingsBulkActions}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings_editor.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings_editor.tsx
index 41da376d21b73..cf8275203090b 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings_editor.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings/conversation_settings_editor.tsx
@@ -31,7 +31,6 @@ export interface ConversationSettingsEditorProps {
   conversationsSettingsBulkActions: ConversationsBulkActions;
   http: HttpSetup;
   isDisabled?: boolean;
-  isFlyoutMode: boolean;
   selectedConversation?: Conversation;
   setConversationSettings: React.Dispatch<React.SetStateAction<Record<string, Conversation>>>;
   setConversationsSettingsBulkActions: React.Dispatch<
@@ -49,7 +48,6 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
     conversationSettings,
     http,
     isDisabled = false,
-    isFlyoutMode,
     setConversationSettings,
     conversationsSettingsBulkActions,
     setConversationsSettingsBulkActions,
@@ -272,14 +270,11 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
             allPrompts={allSystemPrompts}
             compressed
             conversation={selectedConversation}
-            isEditing={true}
             isDisabled={isDisabled}
             onSystemPromptSelectionChange={handleOnSystemPromptSelectionChange}
             selectedPrompt={selectedSystemPrompt}
-            showTitles={true}
             isSettingsModalVisible={true}
             setIsSettingsModalVisible={noop} // noop, already in settings
-            isFlyoutMode={isFlyoutMode}
           />
         </EuiFormRow>
 
@@ -304,7 +299,6 @@ export const ConversationSettingsEditor: React.FC<ConversationSettingsEditorProp
             isDisabled={isDisabled}
             onConnectorSelectionChange={handleOnConnectorSelectionChange}
             selectedConnectorId={selectedConnector?.id}
-            isFlyoutMode={isFlyoutMode}
           />
         </EuiFormRow>
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings_management/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings_management/index.tsx
index 485f89358f57a..10608502e70d3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings_management/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_settings_management/index.tsx
@@ -36,7 +36,6 @@ interface Props {
   defaultConnector?: AIConnector;
   handleSave: (shouldRefetchConversation?: boolean) => void;
   isDisabled?: boolean;
-  isFlyoutMode: boolean;
   onCancelClick: () => void;
   setAssistantStreamingEnabled: React.Dispatch<React.SetStateAction<boolean>>;
   setConversationSettings: React.Dispatch<React.SetStateAction<Record<string, Conversation>>>;
@@ -62,7 +61,6 @@ const ConversationSettingsManagementComponent: React.FC<Props> = ({
   conversationsLoaded,
   handleSave,
   isDisabled,
-  isFlyoutMode,
   onSelectedConversationChange,
   onCancelClick,
   selectedConversation,
@@ -221,7 +219,6 @@ const ConversationSettingsManagementComponent: React.FC<Props> = ({
             conversationsSettingsBulkActions={conversationsSettingsBulkActions}
             http={http}
             isDisabled={isDisabled}
-            isFlyoutMode={isFlyoutMode}
             selectedConversation={selectedConversation}
             setConversationSettings={setConversationSettings}
             setConversationsSettingsBulkActions={setConversationsSettingsBulkActions}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/title_field.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/title_field.tsx
index acbda15320277..373c052ede6e1 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/title_field.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/conversations/conversation_sidepanel/title_field.tsx
@@ -32,7 +32,7 @@ const TitleFieldComponent = ({ conversationIds, euiFieldProps }: TitleFieldProps
         ),
         value: true,
       },
-      validate: (text: string) => {
+      validate: () => {
         if (conversationIds?.includes(value)) {
           return i18n.translate(
             'xpack.elasticAssistant.conversationSidepanel.titleField.uniqueTitle',
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.test.ts b/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.test.ts
index 19d703a271edc..b4ed11a82df9e 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.test.ts
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.test.ts
@@ -22,12 +22,11 @@ const defaultConversation = {
   replacements: {},
   title: 'conversation_id',
 };
-const isFlyoutMode = false;
 describe('helpers', () => {
   describe('isAssistantEnabled = false', () => {
     const isAssistantEnabled = false;
     it('When no conversation history, return only enterprise messaging', () => {
-      const result = getBlockBotConversation(defaultConversation, isAssistantEnabled, isFlyoutMode);
+      const result = getBlockBotConversation(defaultConversation, isAssistantEnabled);
       expect(result.messages).toEqual(enterpriseMessaging);
       expect(result.messages.length).toEqual(1);
     });
@@ -47,7 +46,7 @@ describe('helpers', () => {
           },
         ],
       };
-      const result = getBlockBotConversation(conversation, isAssistantEnabled, isFlyoutMode);
+      const result = getBlockBotConversation(conversation, isAssistantEnabled);
       expect(result.messages.length).toEqual(2);
     });
 
@@ -56,7 +55,7 @@ describe('helpers', () => {
         ...defaultConversation,
         messages: enterpriseMessaging,
       };
-      const result = getBlockBotConversation(conversation, isAssistantEnabled, isFlyoutMode);
+      const result = getBlockBotConversation(conversation, isAssistantEnabled);
       expect(result.messages.length).toEqual(1);
       expect(result.messages).toEqual(enterpriseMessaging);
     });
@@ -77,7 +76,7 @@ describe('helpers', () => {
           },
         ],
       };
-      const result = getBlockBotConversation(conversation, isAssistantEnabled, isFlyoutMode);
+      const result = getBlockBotConversation(conversation, isAssistantEnabled);
       expect(result.messages.length).toEqual(3);
     });
   });
@@ -85,8 +84,8 @@ describe('helpers', () => {
   describe('isAssistantEnabled = true', () => {
     const isAssistantEnabled = true;
     it('when no conversation history, returns the welcome conversation', () => {
-      const result = getBlockBotConversation(defaultConversation, isAssistantEnabled, isFlyoutMode);
-      expect(result.messages.length).toEqual(3);
+      const result = getBlockBotConversation(defaultConversation, isAssistantEnabled);
+      expect(result.messages.length).toEqual(0);
     });
     it('returns a conversation history with the welcome conversation appended', () => {
       const conversation = {
@@ -103,8 +102,8 @@ describe('helpers', () => {
           },
         ],
       };
-      const result = getBlockBotConversation(conversation, isAssistantEnabled, isFlyoutMode);
-      expect(result.messages.length).toEqual(4);
+      const result = getBlockBotConversation(conversation, isAssistantEnabled);
+      expect(result.messages.length).toEqual(1);
     });
   });
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.ts b/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.ts
index e9a0599ca4fc2..f369bf430ea54 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.ts
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/helpers.ts
@@ -10,7 +10,7 @@ import { AIConnector } from '../connectorland/connector_selector';
 import { FetchConnectorExecuteResponse, FetchConversationsResponse } from './api';
 import { Conversation } from '../..';
 import type { ClientMessage } from '../assistant_context/types';
-import { enterpriseMessaging, WELCOME_CONVERSATION } from './use_conversation/sample_conversations';
+import { enterpriseMessaging } from './use_conversation/sample_conversations';
 
 export const getMessageFromRawResponse = (
   rawResponse: FetchConnectorExecuteResponse
@@ -57,8 +57,7 @@ export const mergeBaseWithPersistedConversations = (
 
 export const getBlockBotConversation = (
   conversation: Conversation,
-  isAssistantEnabled: boolean,
-  isFlyoutMode: boolean
+  isAssistantEnabled: boolean
 ): Conversation => {
   if (!isAssistantEnabled) {
     if (
@@ -76,7 +75,7 @@ export const getBlockBotConversation = (
 
   return {
     ...conversation,
-    messages: [...conversation.messages, ...(!isFlyoutMode ? WELCOME_CONVERSATION.messages : [])],
+    messages: conversation.messages,
   };
 };
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.test.tsx
index b25945dd247bf..cd0d53bd460c3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.test.tsx
@@ -7,12 +7,11 @@
 
 import React from 'react';
 
-import { act, fireEvent, render, screen, waitFor, within } from '@testing-library/react';
+import { act, fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { Assistant } from '.';
 import type { IHttpFetchError } from '@kbn/core/public';
 
 import { useLoadConnectors } from '../connectorland/use_load_connectors';
-import { useConnectorSetup } from '../connectorland/connector_setup';
 
 import { DefinedUseQueryResult, UseQueryResult } from '@tanstack/react-query';
 
@@ -40,7 +39,7 @@ jest.mock('./use_conversation');
 const renderAssistant = (extraProps = {}, providerProps = {}) =>
   render(
     <TestProviders>
-      <Assistant chatHistoryVisible={false} setChatHistoryVisible={jest.fn()} {...extraProps} />
+      <Assistant chatHistoryVisible={true} setChatHistoryVisible={jest.fn()} {...extraProps} />
     </TestProviders>
   );
 
@@ -63,11 +62,12 @@ const mockData = {
   },
 };
 const mockDeleteConvo = jest.fn();
+const mockGetDefaultConversation = jest.fn().mockReturnValue(mockData.welcome_id);
 const clearConversation = jest.fn();
 const mockUseConversation = {
   clearConversation: clearConversation.mockResolvedValue(mockData.welcome_id),
   getConversation: jest.fn(),
-  getDefaultConversation: jest.fn().mockReturnValue(mockData.welcome_id),
+  getDefaultConversation: mockGetDefaultConversation,
   deleteConversation: mockDeleteConvo,
   setApiConfig: jest.fn().mockResolvedValue({}),
 };
@@ -83,10 +83,6 @@ describe('Assistant', () => {
     persistToLocalStorage = jest.fn();
     persistToSessionStorage = jest.fn();
     (useConversation as jest.Mock).mockReturnValue(mockUseConversation);
-    jest.mocked(useConnectorSetup).mockReturnValue({
-      comments: [],
-      prompt: <></>,
-    });
 
     jest.mocked(PromptEditor).mockReturnValue(null);
     jest.mocked(QuickPrompts).mockReturnValue(null);
@@ -221,22 +217,21 @@ describe('Assistant', () => {
 
     it('should delete conversation when delete button is clicked', async () => {
       renderAssistant();
+      const deleteButton = screen.getAllByTestId('delete-option')[0];
       await act(async () => {
-        fireEvent.click(
-          within(screen.getByTestId('conversation-selector')).getByTestId(
-            'comboBoxToggleListButton'
-          )
-        );
+        fireEvent.click(deleteButton);
       });
 
-      const deleteButton = screen.getAllByTestId('delete-option')[0];
       await act(async () => {
-        fireEvent.click(deleteButton);
+        fireEvent.click(screen.getByTestId('confirmModalConfirmButton'));
+      });
+
+      await waitFor(() => {
+        expect(mockDeleteConvo).toHaveBeenCalledWith(mockData.electric_sheep_id.id);
       });
-      expect(mockDeleteConvo).toHaveBeenCalledWith(mockData.welcome_id.id);
     });
     it('should refetchConversationsState after clear chat history button click', async () => {
-      renderAssistant({ isFlyoutMode: true });
+      renderAssistant();
       fireEvent.click(screen.getByTestId('chat-context-menu'));
       fireEvent.click(screen.getByTestId('clear-chat'));
       fireEvent.click(screen.getByTestId('confirmModalConfirmButton'));
@@ -259,7 +254,7 @@ describe('Assistant', () => {
 
       expect(persistToLocalStorage).toHaveBeenLastCalledWith(mockData.welcome_id.id);
 
-      const previousConversationButton = screen.getByLabelText('Previous conversation');
+      const previousConversationButton = await screen.findByText(mockData.electric_sheep_id.title);
 
       expect(previousConversationButton).toBeInTheDocument();
       await act(async () => {
@@ -295,13 +290,13 @@ describe('Assistant', () => {
         isFetched: true,
       } as unknown as DefinedUseQueryResult<Record<string, Conversation>, unknown>);
 
-      const { getByLabelText } = renderAssistant();
+      const { findByText } = renderAssistant();
 
       expect(persistToLocalStorage).toHaveBeenCalled();
 
       expect(persistToLocalStorage).toHaveBeenLastCalledWith(mockData.welcome_id.id);
 
-      const previousConversationButton = getByLabelText('Previous conversation');
+      const previousConversationButton = await findByText(mockData.electric_sheep_id.title);
 
       expect(previousConversationButton).toBeInTheDocument();
 
@@ -321,7 +316,7 @@ describe('Assistant', () => {
       renderAssistant({ setConversationTitle });
 
       await act(async () => {
-        fireEvent.click(screen.getByLabelText('Previous conversation'));
+        fireEvent.click(await screen.findByText(mockData.electric_sheep_id.title));
       });
 
       expect(setConversationTitle).toHaveBeenLastCalledWith('electric sheep');
@@ -351,7 +346,7 @@ describe('Assistant', () => {
       } as unknown as DefinedUseQueryResult<Record<string, Conversation>, unknown>);
       renderAssistant();
 
-      const previousConversationButton = screen.getByLabelText('Previous conversation');
+      const previousConversationButton = await screen.findByText('updated title');
       await act(async () => {
         fireEvent.click(previousConversationButton);
       });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx
index 6892fdcaf48bd..3fe4e1586e239 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/index.tsx
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-/* eslint-disable complexity */
-
 import React, {
   Dispatch,
   SetStateAction,
@@ -26,9 +24,6 @@ import {
   EuiFlyoutFooter,
   EuiFlyoutHeader,
   EuiFlyoutBody,
-  EuiModalFooter,
-  EuiModalHeader,
-  EuiModalBody,
   EuiText,
 } from '@elastic/eui';
 import { euiThemeVars } from '@kbn/ui-theme';
@@ -43,7 +38,6 @@ import { PromptTypeEnum } from '@kbn/elastic-assistant-common/impl/schemas/promp
 import { useChatSend } from './chat_send/use_chat_send';
 import { ChatSend } from './chat_send';
 import { BlockBotCallToAction } from './block_bot/cta';
-import { AssistantHeader } from './assistant_header';
 import { WELCOME_CONVERSATION_TITLE } from './use_conversation/translations';
 import {
   getDefaultConnector,
@@ -57,16 +51,15 @@ import { getNewSelectedPromptContext } from '../data_anonymization/get_new_selec
 import type { PromptContext, SelectedPromptContext } from './prompt_context/types';
 import { useConversation } from './use_conversation';
 import { CodeBlockDetails, getDefaultSystemPrompt } from './use_conversation/helpers';
-import { PromptEditor } from './prompt_editor';
 import { QuickPrompts } from './quick_prompts/quick_prompts';
 import { useLoadConnectors } from '../connectorland/use_load_connectors';
-import { useConnectorSetup } from '../connectorland/connector_setup';
+import { ConnectorSetup } from '../connectorland/connector_setup';
 import { ConnectorMissingCallout } from '../connectorland/connector_missing_callout';
 import { ConversationSidePanel } from './conversations/conversation_sidepanel';
 import { NEW_CHAT } from './conversations/conversation_sidepanel/translations';
 import { SystemPrompt } from './prompt_editor/system_prompt';
 import { SelectedPromptContexts } from './prompt_editor/selected_prompt_contexts';
-import { AssistantHeaderFlyout } from './assistant_header/assistant_header_flyout';
+import { AssistantHeader } from './assistant_header';
 import * as i18n from './translations';
 
 export const CONVERSATION_SIDE_PANEL_WIDTH = 220;
@@ -77,17 +70,12 @@ const CommentContainer = styled('span')`
   overflow: hidden;
 `;
 
-const ModalPromptEditorWrapper = styled.div`
-  margin-right: 24px;
-`;
-
 import {
   FetchConversationsResponse,
   useFetchCurrentUserConversations,
   CONVERSATIONS_QUERY_KEYS,
 } from './api/conversations/use_fetch_current_user_conversations';
 import { Conversation } from '../assistant_context/types';
-import { clearPresentationData } from '../connectorland/connector_setup/helpers';
 import { getGenAiConfig } from '../connectorland/helpers';
 import { AssistantAnimatedIcon } from './assistant_animated_icon';
 import { useFetchAnonymizationFields } from './api/anonymization_fields/use_fetch_anonymization_fields';
@@ -102,7 +90,6 @@ export interface Props {
   showTitle?: boolean;
   setConversationTitle?: Dispatch<SetStateAction<string>>;
   onCloseFlyout?: () => void;
-  isFlyoutMode?: boolean;
   chatHistoryVisible?: boolean;
   setChatHistoryVisible?: Dispatch<SetStateAction<boolean>>;
   currentUserAvatar?: UserAvatar;
@@ -120,7 +107,6 @@ const AssistantComponent: React.FC<Props> = ({
   showTitle = true,
   setConversationTitle,
   onCloseFlyout,
-  isFlyoutMode = false,
   chatHistoryVisible,
   setChatHistoryVisible,
   currentUserAvatar,
@@ -129,14 +115,12 @@ const AssistantComponent: React.FC<Props> = ({
     assistantTelemetry,
     augmentMessageCodeBlocks,
     assistantAvailability: { isAssistantEnabled },
-    docLinks,
     getComments,
     http,
     knowledgeBase: { isEnabledKnowledgeBase, isEnabledRAGAlerts },
     promptContexts,
     setLastConversationId,
     getLastConversationId,
-    title,
     baseConversations,
   } = useAssistantContext();
 
@@ -251,7 +235,7 @@ const AssistantComponent: React.FC<Props> = ({
               nextConversation?.id !== '' ? nextConversation?.id : nextConversation?.title
             ]) ??
           conversations[WELCOME_CONVERSATION_TITLE] ??
-          getDefaultConversation({ cTitle: WELCOME_CONVERSATION_TITLE, isFlyoutMode });
+          getDefaultConversation({ cTitle: WELCOME_CONVERSATION_TITLE });
 
         if (
           prev &&
@@ -278,7 +262,6 @@ const AssistantComponent: React.FC<Props> = ({
     getDefaultConversation,
     getLastConversationId,
     isAssistantEnabled,
-    isFlyoutMode,
   ]);
 
   // Welcome setup state
@@ -295,10 +278,8 @@ const AssistantComponent: React.FC<Props> = ({
   // Welcome conversation is a special 'setup' case when no connector exists, mostly extracted to `ConnectorSetup` component,
   // but currently a bit of state is littered throughout the assistant component. TODO: clean up/isolate this state
   const blockBotConversation = useMemo(
-    () =>
-      currentConversation &&
-      getBlockBotConversation(currentConversation, isAssistantEnabled, isFlyoutMode),
-    [currentConversation, isAssistantEnabled, isFlyoutMode]
+    () => currentConversation && getBlockBotConversation(currentConversation, isAssistantEnabled),
+    [currentConversation, isAssistantEnabled]
   );
 
   // Settings modal state (so it isn't shared between assistant instances like Timeline)
@@ -325,7 +306,6 @@ const AssistantComponent: React.FC<Props> = ({
     setLastConversationId,
   ]);
 
-  const [promptTextPreview, setPromptTextPreview] = useState<string>('');
   const [autoPopulatedOnce, setAutoPopulatedOnce] = useState<boolean>(false);
   const [userPrompt, setUserPrompt] = useState<string | null>(null);
 
@@ -398,16 +378,10 @@ const AssistantComponent: React.FC<Props> = ({
     // when scrollHeight changes, parent is scrolled to bottom
     parent.scrollTop = parent.scrollHeight;
 
-    if (isFlyoutMode) {
-      (
-        commentsContainerRef.current?.childNodes[0].childNodes[0] as HTMLElement
-      ).lastElementChild?.scrollIntoView();
-    }
+    (
+      commentsContainerRef.current?.childNodes[0].childNodes[0] as HTMLElement
+    ).lastElementChild?.scrollIntoView();
   });
-
-  const getWrapper = (children: React.ReactNode, isCommentContainer: boolean) =>
-    isCommentContainer ? <span ref={commentsContainerRef}>{children}</span> : <>{children}</>;
-
   //  End Scrolling
 
   const selectedSystemPrompt = useMemo(
@@ -446,17 +420,6 @@ const AssistantComponent: React.FC<Props> = ({
     [allSystemPrompts, refetchCurrentConversation, refetchResults]
   );
 
-  const { comments: connectorComments, prompt: connectorPrompt } = useConnectorSetup({
-    isFlyoutMode,
-    conversation: blockBotConversation,
-    onConversationUpdate: handleOnConversationSelected,
-    onSetupComplete: () => {
-      if (currentConversation) {
-        setCurrentConversation(clearPresentationData(currentConversation));
-      }
-    },
-  });
-
   const handleOnConversationDeleted = useCallback(
     async (cTitle: string) => {
       await deleteConversation(conversations[cTitle].id);
@@ -538,14 +501,6 @@ const AssistantComponent: React.FC<Props> = ({
     isFetchedAnonymizationFields,
   ]);
 
-  useEffect(() => {}, [
-    areConnectorsFetched,
-    connectors,
-    conversationsLoaded,
-    currentConversation,
-    isLoading,
-  ]);
-
   const createCodeBlockPortals = useCallback(
     () =>
       messageCodeBlocks?.map((codeBlocks: CodeBlockDetails[], i: number) => {
@@ -576,7 +531,6 @@ const AssistantComponent: React.FC<Props> = ({
   } = useChatSend({
     allSystemPrompts,
     currentConversation,
-    setPromptTextPreview,
     setUserPrompt,
     editingSystemPromptId,
     http,
@@ -601,7 +555,7 @@ const AssistantComponent: React.FC<Props> = ({
     [currentConversation, handleSendMessage, refetchResults]
   );
 
-  const chatbotComments = useMemo(
+  const comments = useMemo(
     () => (
       <>
         <EuiCommentList
@@ -615,53 +569,20 @@ const AssistantComponent: React.FC<Props> = ({
             isFetchingResponse: isLoadingChatSend,
             setIsStreaming,
             currentUserAvatar,
-            isFlyoutMode,
           })}
-          {...(!isFlyoutMode
-            ? {
-                css: css`
-                  margin-right: ${euiThemeVars.euiSizeL};
+          // Avoid comments going off the flyout
+          css={css`
+            padding-bottom: ${euiThemeVars.euiSizeL};
 
-                  > li > div:nth-child(2) {
-                    overflow: hidden;
-                  }
-                `,
-              }
-            : {
-                // Avoid comments going off the flyout
-                css: css`
-                  padding-bottom: ${euiThemeVars.euiSizeL};
-
-                  > li > div:nth-child(2) {
-                    overflow: hidden;
-                  }
-                `,
-              })}
+            > li > div:nth-child(2) {
+              overflow: hidden;
+            }
+          `}
         />
 
         {currentConversation?.messages.length !== 0 && selectedPromptContextsCount > 0 && (
           <EuiSpacer size={'m'} />
         )}
-
-        {!isFlyoutMode &&
-          (currentConversation?.messages.length === 0 || selectedPromptContextsCount > 0) && (
-            <ModalPromptEditorWrapper>
-              <PromptEditor
-                conversation={currentConversation}
-                editingSystemPromptId={editingSystemPromptId}
-                isNewConversation={isNewConversation}
-                isSettingsModalVisible={isSettingsModalVisible}
-                promptContexts={promptContexts}
-                promptTextPreview={promptTextPreview}
-                onSystemPromptSelectionChange={handleOnSystemPromptSelectionChange}
-                selectedPromptContexts={selectedPromptContexts}
-                setIsSettingsModalVisible={setIsSettingsModalVisible}
-                setSelectedPromptContexts={setSelectedPromptContexts}
-                isFlyoutMode={isFlyoutMode}
-                allSystemPrompts={allSystemPrompts}
-              />
-            </ModalPromptEditorWrapper>
-          )}
       </>
     ),
     [
@@ -675,34 +596,10 @@ const AssistantComponent: React.FC<Props> = ({
       isEnabledRAGAlerts,
       isLoadingChatSend,
       currentUserAvatar,
-      isFlyoutMode,
       selectedPromptContextsCount,
-      editingSystemPromptId,
-      isNewConversation,
-      isSettingsModalVisible,
-      promptContexts,
-      promptTextPreview,
-      handleOnSystemPromptSelectionChange,
-      selectedPromptContexts,
-      allSystemPrompts,
     ]
   );
 
-  const comments = useMemo(() => {
-    if (isDisabled && !isFlyoutMode) {
-      return (
-        <EuiCommentList
-          comments={connectorComments}
-          css={css`
-            margin-right: 20px;
-          `}
-        />
-      );
-    }
-
-    return chatbotComments;
-  }, [isDisabled, isFlyoutMode, chatbotComments, connectorComments]);
-
   const trackPrompt = useCallback(
     (promptTitle: string) => {
       if (currentConversation?.title) {
@@ -800,19 +697,14 @@ const AssistantComponent: React.FC<Props> = ({
           textAlign="center"
           color={euiThemeVars.euiColorMediumShade}
           size="xs"
-          css={
-            isFlyoutMode
-              ? css`
-                  margin: 0 ${euiThemeVars.euiSizeL} ${euiThemeVars.euiSizeM}
-                    ${euiThemeVars.euiSizeL};
-                `
-              : {}
-          }
+          css={css`
+            margin: 0 ${euiThemeVars.euiSizeL} ${euiThemeVars.euiSizeM} ${euiThemeVars.euiSizeL};
+          `}
         >
           {i18n.DISCLAIMER}
         </EuiText>
       ),
-    [isFlyoutMode, isNewConversation]
+    [isNewConversation]
   );
 
   const flyoutBodyContent = useMemo(() => {
@@ -842,7 +734,10 @@ const AssistantComponent: React.FC<Props> = ({
                   </EuiText>
                 </EuiFlexItem>
                 <EuiFlexItem grow={false} data-test-subj="connector-prompt">
-                  {connectorPrompt}
+                  <ConnectorSetup
+                    conversation={blockBotConversation}
+                    onConversationUpdate={handleOnConversationSelected}
+                  />
                 </EuiFlexItem>
               </EuiFlexGroup>
             </EuiPanel>
@@ -879,7 +774,6 @@ const AssistantComponent: React.FC<Props> = ({
                     onSystemPromptSelectionChange={handleOnSystemPromptSelectionChange}
                     isSettingsModalVisible={isSettingsModalVisible}
                     setIsSettingsModalVisible={setIsSettingsModalVisible}
-                    isFlyoutMode
                     allSystemPrompts={allSystemPrompts}
                   />
                 </EuiFlexItem>
@@ -905,328 +799,212 @@ const AssistantComponent: React.FC<Props> = ({
     );
   }, [
     allSystemPrompts,
+    blockBotConversation,
     comments,
-    connectorPrompt,
     currentConversation,
     editingSystemPromptId,
+    handleOnConversationSelected,
     handleOnSystemPromptSelectionChange,
     isSettingsModalVisible,
     isWelcomeSetup,
   ]);
 
-  if (isFlyoutMode) {
-    return (
-      <EuiFlexGroup direction={'row'} wrap={false} gutterSize="none">
-        {chatHistoryVisible && (
-          <EuiFlexItem
-            grow={false}
-            css={css`
-              inline-size: ${CONVERSATION_SIDE_PANEL_WIDTH}px;
-              border-right: 1px solid ${euiThemeVars.euiColorLightShade};
-            `}
-          >
-            <ConversationSidePanel
-              currentConversation={currentConversation}
-              onConversationSelected={handleOnConversationSelected}
-              conversations={conversations}
-              onConversationDeleted={handleOnConversationDeleted}
-              onConversationCreate={handleCreateConversation}
-              refetchConversationsState={refetchConversationsState}
-            />
-          </EuiFlexItem>
-        )}
+  return (
+    <EuiFlexGroup direction={'row'} wrap={false} gutterSize="none">
+      {chatHistoryVisible && (
         <EuiFlexItem
+          grow={false}
           css={css`
-            overflow: hidden;
+            inline-size: ${CONVERSATION_SIDE_PANEL_WIDTH}px;
+            border-right: 1px solid ${euiThemeVars.euiColorLightShade};
           `}
         >
-          <CommentContainer>
-            <EuiFlexGroup
+          <ConversationSidePanel
+            currentConversation={currentConversation}
+            onConversationSelected={handleOnConversationSelected}
+            conversations={conversations}
+            onConversationDeleted={handleOnConversationDeleted}
+            onConversationCreate={handleCreateConversation}
+            refetchConversationsState={refetchConversationsState}
+          />
+        </EuiFlexItem>
+      )}
+      <EuiFlexItem
+        css={css`
+          overflow: hidden;
+        `}
+      >
+        <CommentContainer>
+          <EuiFlexGroup
+            css={css`
+              overflow: hidden;
+            `}
+          >
+            <EuiFlexItem
               css={css`
-                overflow: hidden;
+                max-width: 100%;
               `}
             >
-              <EuiFlexItem
+              <EuiFlyoutHeader hasBorder>
+                <AssistantHeader
+                  selectedConversation={currentConversation}
+                  defaultConnector={defaultConnector}
+                  isDisabled={isDisabled || isLoadingChatSend}
+                  isSettingsModalVisible={isSettingsModalVisible}
+                  onToggleShowAnonymizedValues={onToggleShowAnonymizedValues}
+                  setIsSettingsModalVisible={setIsSettingsModalVisible}
+                  showAnonymizedValues={showAnonymizedValues}
+                  onCloseFlyout={onCloseFlyout}
+                  onChatCleared={handleOnChatCleared}
+                  chatHistoryVisible={chatHistoryVisible}
+                  setChatHistoryVisible={setChatHistoryVisible}
+                  onConversationSelected={handleOnConversationSelected}
+                  conversations={conversations}
+                  conversationsLoaded={conversationsLoaded}
+                  refetchConversationsState={refetchConversationsState}
+                  onConversationCreate={handleCreateConversation}
+                  isAssistantEnabled={isAssistantEnabled}
+                  refetchPrompts={refetchPrompts}
+                />
+
+                {/* Create portals for each EuiCodeBlock to add the `Investigate in Timeline` action */}
+                {createCodeBlockPortals()}
+              </EuiFlyoutHeader>
+              <EuiFlyoutBody
                 css={css`
-                  max-width: 100%;
-                `}
-              >
-                <EuiFlyoutHeader hasBorder>
-                  <AssistantHeaderFlyout
-                    selectedConversation={currentConversation}
-                    defaultConnector={defaultConnector}
-                    docLinks={docLinks}
-                    isDisabled={isDisabled || isLoadingChatSend}
-                    isSettingsModalVisible={isSettingsModalVisible}
-                    onToggleShowAnonymizedValues={onToggleShowAnonymizedValues}
-                    setIsSettingsModalVisible={setIsSettingsModalVisible}
-                    showAnonymizedValues={showAnonymizedValues}
-                    onCloseFlyout={onCloseFlyout}
-                    onChatCleared={handleOnChatCleared}
-                    chatHistoryVisible={chatHistoryVisible}
-                    setChatHistoryVisible={setChatHistoryVisible}
-                    onConversationSelected={handleOnConversationSelected}
-                    conversations={conversations}
-                    conversationsLoaded={conversationsLoaded}
-                    refetchConversationsState={refetchConversationsState}
-                    onConversationCreate={handleCreateConversation}
-                    isAssistantEnabled={isAssistantEnabled}
-                    refetchPrompts={refetchPrompts}
-                  />
+                  min-height: 100px;
+                  flex: 1;
 
-                  {/* Create portals for each EuiCodeBlock to add the `Investigate in Timeline` action */}
-                  {createCodeBlockPortals()}
-                </EuiFlyoutHeader>
-                <EuiFlyoutBody
-                  css={css`
-                    min-height: 100px;
-                    flex: 1;
+                  > div {
+                    display: flex;
+                    flex-direction: column;
+                    align-items: stretch;
+
+                    > .euiFlyoutBody__banner {
+                      overflow-x: unset;
+                    }
 
-                    > div {
+                    > .euiFlyoutBody__overflowContent {
                       display: flex;
-                      flex-direction: column;
-                      align-items: stretch;
-
-                      > .euiFlyoutBody__banner {
-                        overflow-x: unset;
-                      }
-
-                      > .euiFlyoutBody__overflowContent {
-                        display: flex;
-                        flex: 1;
-                        overflow: auto;
-                      }
+                      flex: 1;
+                      overflow: auto;
                     }
-                  `}
-                  banner={
-                    !isDisabled &&
-                    showMissingConnectorCallout &&
-                    areConnectorsFetched && (
-                      <ConnectorMissingCallout
-                        isConnectorConfigured={(connectors?.length ?? 0) > 0}
-                        isSettingsModalVisible={isSettingsModalVisible}
-                        setIsSettingsModalVisible={setIsSettingsModalVisible}
-                        isFlyoutMode={isFlyoutMode}
-                      />
-                    )
                   }
-                >
-                  {!isAssistantEnabled ? (
-                    <BlockBotCallToAction
-                      connectorPrompt={connectorPrompt}
-                      http={http}
-                      isAssistantEnabled={isAssistantEnabled}
-                      isWelcomeSetup={isWelcomeSetup}
+                `}
+                banner={
+                  !isDisabled &&
+                  showMissingConnectorCallout &&
+                  areConnectorsFetched && (
+                    <ConnectorMissingCallout
+                      isConnectorConfigured={(connectors?.length ?? 0) > 0}
+                      isSettingsModalVisible={isSettingsModalVisible}
+                      setIsSettingsModalVisible={setIsSettingsModalVisible}
                     />
-                  ) : (
-                    <EuiFlexGroup direction="column" justifyContent="spaceBetween">
-                      <EuiFlexItem grow={false}>{flyoutBodyContent}</EuiFlexItem>
-                      <EuiFlexItem grow={false}>{disclaimer}</EuiFlexItem>
-                    </EuiFlexGroup>
-                  )}
-                </EuiFlyoutBody>
-                <EuiFlyoutFooter
+                  )
+                }
+              >
+                {!isAssistantEnabled ? (
+                  <BlockBotCallToAction
+                    connectorPrompt={
+                      <ConnectorSetup
+                        conversation={blockBotConversation}
+                        onConversationUpdate={handleOnConversationSelected}
+                      />
+                    }
+                    http={http}
+                    isAssistantEnabled={isAssistantEnabled}
+                    isWelcomeSetup={isWelcomeSetup}
+                  />
+                ) : (
+                  <EuiFlexGroup direction="column" justifyContent="spaceBetween">
+                    <EuiFlexItem grow={false}>{flyoutBodyContent}</EuiFlexItem>
+                    <EuiFlexItem grow={false}>{disclaimer}</EuiFlexItem>
+                  </EuiFlexGroup>
+                )}
+              </EuiFlyoutBody>
+              <EuiFlyoutFooter
+                css={css`
+                  background: none;
+                  border-top: 1px solid ${euiThemeVars.euiColorLightShade};
+                  overflow: hidden;
+                  max-height: 60%;
+                  display: flex;
+                  flex-direction: column;
+                `}
+              >
+                <EuiPanel
+                  paddingSize="m"
+                  hasShadow={false}
                   css={css`
-                    background: none;
-                    border-top: 1px solid ${euiThemeVars.euiColorLightShade};
-                    overflow: hidden;
-                    max-height: 60%;
-                    display: flex;
-                    flex-direction: column;
+                    overflow: auto;
                   `}
                 >
-                  <EuiPanel
-                    paddingSize="m"
-                    hasShadow={false}
-                    css={css`
-                      overflow: auto;
-                    `}
-                  >
-                    {!isDisabled &&
-                      Object.keys(promptContexts).length !== selectedPromptContextsCount && (
-                        <EuiFlexGroup>
-                          <EuiFlexItem>
-                            <>
-                              <ContextPills
-                                anonymizationFields={anonymizationFields}
-                                promptContexts={promptContexts}
-                                selectedPromptContexts={selectedPromptContexts}
-                                setSelectedPromptContexts={setSelectedPromptContexts}
-                                isFlyoutMode={isFlyoutMode}
-                              />
-                              {Object.keys(promptContexts).length > 0 && <EuiSpacer size={'s'} />}
-                            </>
-                          </EuiFlexItem>
-                        </EuiFlexGroup>
-                      )}
-
-                    <EuiFlexGroup direction="column" gutterSize="s">
-                      {Object.keys(selectedPromptContexts).length ? (
-                        <EuiFlexItem grow={false}>
-                          <SelectedPromptContexts
-                            isNewConversation={isNewConversation}
-                            promptContexts={promptContexts}
-                            selectedPromptContexts={selectedPromptContexts}
-                            setSelectedPromptContexts={setSelectedPromptContexts}
-                            currentReplacements={currentConversation?.replacements}
-                            isFlyoutMode={isFlyoutMode}
-                          />
+                  {!isDisabled &&
+                    Object.keys(promptContexts).length !== selectedPromptContextsCount && (
+                      <EuiFlexGroup>
+                        <EuiFlexItem>
+                          <>
+                            <ContextPills
+                              anonymizationFields={anonymizationFields}
+                              promptContexts={promptContexts}
+                              selectedPromptContexts={selectedPromptContexts}
+                              setSelectedPromptContexts={setSelectedPromptContexts}
+                            />
+                            {Object.keys(promptContexts).length > 0 && <EuiSpacer size={'s'} />}
+                          </>
                         </EuiFlexItem>
-                      ) : null}
+                      </EuiFlexGroup>
+                    )}
 
+                  <EuiFlexGroup direction="column" gutterSize="s">
+                    {Object.keys(selectedPromptContexts).length ? (
                       <EuiFlexItem grow={false}>
-                        <ChatSend
-                          isDisabled={isSendingDisabled}
-                          shouldRefocusPrompt={shouldRefocusPrompt}
-                          userPrompt={userPrompt}
-                          handleOnChatCleared={handleOnChatCleared}
-                          handlePromptChange={handlePromptChange}
-                          handleSendMessage={handleChatSend}
-                          handleRegenerateResponse={handleRegenerateResponse}
-                          isLoading={isLoadingChatSend}
-                          isFlyoutMode={isFlyoutMode}
+                        <SelectedPromptContexts
+                          promptContexts={promptContexts}
+                          selectedPromptContexts={selectedPromptContexts}
+                          setSelectedPromptContexts={setSelectedPromptContexts}
+                          currentReplacements={currentConversation?.replacements}
                         />
                       </EuiFlexItem>
-                    </EuiFlexGroup>
-                  </EuiPanel>
-
-                  {!isDisabled && (
-                    <EuiPanel
-                      css={css`
-                        background: ${euiThemeVars.euiColorLightestShade};
-                      `}
-                      hasShadow={false}
-                      paddingSize="m"
-                      borderRadius="none"
-                    >
-                      <QuickPrompts
-                        setInput={setUserPrompt}
-                        setIsSettingsModalVisible={setIsSettingsModalVisible}
-                        trackPrompt={trackPrompt}
-                        isFlyoutMode={isFlyoutMode}
-                        allPrompts={allPrompts}
+                    ) : null}
+
+                    <EuiFlexItem grow={false}>
+                      <ChatSend
+                        isDisabled={isSendingDisabled}
+                        shouldRefocusPrompt={shouldRefocusPrompt}
+                        userPrompt={userPrompt}
+                        handlePromptChange={handlePromptChange}
+                        handleSendMessage={handleChatSend}
+                        handleRegenerateResponse={handleRegenerateResponse}
+                        isLoading={isLoadingChatSend}
                       />
-                    </EuiPanel>
-                  )}
-                </EuiFlyoutFooter>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </CommentContainer>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    );
-  }
-
-  return getWrapper(
-    <>
-      <EuiModalHeader
-        css={css`
-          align-items: flex-start;
-          flex-direction: column;
-        `}
-      >
-        {showTitle && (
-          <AssistantHeader
-            currentConversation={currentConversation}
-            defaultConnector={defaultConnector}
-            docLinks={docLinks}
-            isDisabled={isDisabled}
-            isSettingsModalVisible={isSettingsModalVisible}
-            onConversationSelected={handleOnConversationSelected}
-            onToggleShowAnonymizedValues={onToggleShowAnonymizedValues}
-            setIsSettingsModalVisible={setIsSettingsModalVisible}
-            showAnonymizedValues={showAnonymizedValues}
-            title={title}
-            conversations={conversations}
-            conversationsLoaded={conversationsLoaded}
-            onConversationDeleted={handleOnConversationDeleted}
-            refetchConversationsState={refetchConversationsState}
-            allPrompts={allPrompts}
-            refetchPrompts={refetchPrompts}
-          />
-        )}
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </EuiPanel>
 
-        {/* Create portals for each EuiCodeBlock to add the `Investigate in Timeline` action */}
-        {createCodeBlockPortals()}
-
-        {!isDisabled && !isLoadingAnonymizationFields && !isErrorAnonymizationFields && (
-          <>
-            <ContextPills
-              anonymizationFields={anonymizationFields}
-              promptContexts={promptContexts}
-              selectedPromptContexts={selectedPromptContexts}
-              setSelectedPromptContexts={setSelectedPromptContexts}
-              isFlyoutMode={isFlyoutMode}
-            />
-            {Object.keys(promptContexts).length > 0 && <EuiSpacer size={'s'} />}
-          </>
-        )}
-      </EuiModalHeader>
-      <EuiModalBody>
-        <EuiFlexGroup direction="column" justifyContent="spaceBetween">
-          <EuiFlexItem grow={false}>
-            {' '}
-            {getWrapper(
-              <>
-                {comments}
-
-                {!isDisabled && showMissingConnectorCallout && areConnectorsFetched && (
-                  <>
-                    <EuiSpacer />
-                    <EuiFlexGroup justifyContent="spaceAround">
-                      <EuiFlexItem grow={false}>
-                        <ConnectorMissingCallout
-                          isConnectorConfigured={(connectors?.length ?? 0) > 0}
-                          isSettingsModalVisible={isSettingsModalVisible}
-                          setIsSettingsModalVisible={setIsSettingsModalVisible}
-                          isFlyoutMode={isFlyoutMode}
-                        />
-                      </EuiFlexItem>
-                    </EuiFlexGroup>
-                  </>
+                {!isDisabled && (
+                  <EuiPanel
+                    css={css`
+                      background: ${euiThemeVars.euiColorLightestShade};
+                    `}
+                    hasShadow={false}
+                    paddingSize="m"
+                    borderRadius="none"
+                  >
+                    <QuickPrompts
+                      setInput={setUserPrompt}
+                      setIsSettingsModalVisible={setIsSettingsModalVisible}
+                      trackPrompt={trackPrompt}
+                      allPrompts={allPrompts}
+                    />
+                  </EuiPanel>
                 )}
-              </>,
-              !embeddedLayout
-            )}
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>{disclaimer}</EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiModalBody>
-      <EuiModalFooter
-        css={css`
-          align-items: stretch;
-          flex-direction: column;
-        `}
-      >
-        <BlockBotCallToAction
-          connectorPrompt={connectorPrompt}
-          http={http}
-          isAssistantEnabled={isAssistantEnabled}
-          isWelcomeSetup={isWelcomeSetup}
-        />
-        <ChatSend
-          isDisabled={isSendingDisabled}
-          shouldRefocusPrompt={shouldRefocusPrompt}
-          userPrompt={userPrompt}
-          handleOnChatCleared={handleOnChatCleared}
-          handlePromptChange={handlePromptChange}
-          handleSendMessage={handleChatSend}
-          handleRegenerateResponse={handleRegenerateResponse}
-          isLoading={isLoadingChatSend}
-          isFlyoutMode={isFlyoutMode}
-        />
-        {!isDisabled && (
-          <QuickPrompts
-            setInput={setUserPrompt}
-            setIsSettingsModalVisible={setIsSettingsModalVisible}
-            trackPrompt={trackPrompt}
-            isFlyoutMode={isFlyoutMode}
-            allPrompts={allPrompts}
-          />
-        )}
-      </EuiModalFooter>
-    </>,
-    embeddedLayout
+              </EuiFlyoutFooter>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </CommentContainer>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.test.tsx
index 6d421b649a380..e2f55ee89202e 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.test.tsx
@@ -39,7 +39,6 @@ const defaultProps: Props = {
   selectedPromptContexts: {},
   setIsSettingsModalVisible: jest.fn(),
   setSelectedPromptContexts: jest.fn(),
-  isFlyoutMode: false,
   allSystemPrompts: [],
 };
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.tsx
index 1528435764acd..adf9b7d4aa658 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/index.tsx
@@ -31,7 +31,6 @@ export interface Props {
   setSelectedPromptContexts: React.Dispatch<
     React.SetStateAction<Record<string, SelectedPromptContext>>
   >;
-  isFlyoutMode: boolean;
   allSystemPrompts: PromptResponse[];
 }
 
@@ -50,7 +49,6 @@ const PromptEditorComponent: React.FC<Props> = ({
   selectedPromptContexts,
   setIsSettingsModalVisible,
   setSelectedPromptContexts,
-  isFlyoutMode,
   allSystemPrompts,
 }) => {
   const commentBody = useMemo(
@@ -64,17 +62,14 @@ const PromptEditorComponent: React.FC<Props> = ({
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             isSettingsModalVisible={isSettingsModalVisible}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={isFlyoutMode}
           />
         )}
 
         <SelectedPromptContexts
-          isNewConversation={isNewConversation}
           promptContexts={promptContexts}
           selectedPromptContexts={selectedPromptContexts}
           setSelectedPromptContexts={setSelectedPromptContexts}
           currentReplacements={conversation?.replacements}
-          isFlyoutMode={isFlyoutMode}
         />
 
         <PreviewText color="subdued" data-test-subj="previewText">
@@ -90,7 +85,6 @@ const PromptEditorComponent: React.FC<Props> = ({
       onSystemPromptSelectionChange,
       isSettingsModalVisible,
       setIsSettingsModalVisible,
-      isFlyoutMode,
       promptContexts,
       selectedPromptContexts,
       setSelectedPromptContexts,
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.test.tsx
index 899ee5ed7488c..873c41731bd20 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.test.tsx
@@ -15,7 +15,6 @@ import type { SelectedPromptContext } from '../../prompt_context/types';
 import { Props, SelectedPromptContexts } from '.';
 
 const defaultProps: Props = {
-  isNewConversation: false,
   promptContexts: {
     [mockAlertPromptContext.id]: mockAlertPromptContext,
     [mockEventPromptContext.id]: mockEventPromptContext,
@@ -23,7 +22,6 @@ const defaultProps: Props = {
   selectedPromptContexts: {},
   setSelectedPromptContexts: jest.fn(),
   currentReplacements: {},
-  isFlyoutMode: false,
 };
 
 const mockSelectedAlertPromptContext: SelectedPromptContext = {
@@ -53,61 +51,6 @@ describe('SelectedPromptContexts', () => {
     });
   });
 
-  it('it does NOT render a spacer when isNewConversation is false and selectedPromptContextIds.length is 1', async () => {
-    render(
-      <TestProviders>
-        <SelectedPromptContexts
-          {...defaultProps}
-          isNewConversation={false} // <--
-          selectedPromptContexts={{
-            [mockAlertPromptContext.id]: mockSelectedAlertPromptContext,
-          }} // <-- length 1
-        />
-      </TestProviders>
-    );
-
-    await waitFor(() => {
-      expect(screen.queryByTestId('spacer')).not.toBeInTheDocument();
-    });
-  });
-
-  it('it renders a spacer when isNewConversation is true and selectedPromptContextIds.length is 1', async () => {
-    render(
-      <TestProviders>
-        <SelectedPromptContexts
-          {...defaultProps}
-          isNewConversation={true} // <--
-          selectedPromptContexts={{
-            [mockAlertPromptContext.id]: mockSelectedAlertPromptContext,
-          }} // <-- length 1
-        />
-      </TestProviders>
-    );
-
-    await waitFor(() => {
-      expect(screen.getByTestId('spacer')).toBeInTheDocument();
-    });
-  });
-
-  it('it renders a spacer for each selected prompt context when isNewConversation is false and selectedPromptContextIds.length is 2', async () => {
-    render(
-      <TestProviders>
-        <SelectedPromptContexts
-          {...defaultProps}
-          isNewConversation={false} // <--
-          selectedPromptContexts={{
-            [mockAlertPromptContext.id]: mockSelectedAlertPromptContext,
-            [mockEventPromptContext.id]: mockSelectedEventPromptContext,
-          }} // <-- length 2
-        />
-      </TestProviders>
-    );
-
-    await waitFor(() => {
-      expect(screen.getAllByTestId('spacer')).toHaveLength(2);
-    });
-  });
-
   it('renders the selected prompt contexts', async () => {
     const selectedPromptContexts = {
       [mockAlertPromptContext.id]: mockSelectedAlertPromptContext,
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx
index d3555b2e2ac86..3a0e6f3ce87d2 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/selected_prompt_contexts/index.tsx
@@ -5,19 +5,10 @@
  * 2.0.
  */
 
-import {
-  EuiAccordion,
-  EuiButtonIcon,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiToolTip,
-} from '@elastic/eui';
+import { EuiAccordion, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { isEmpty, omit } from 'lodash/fp';
 import React, { useCallback } from 'react';
-// eslint-disable-next-line @kbn/eslint/module_migration
-import styled from 'styled-components';
-
+import styled from '@emotion/styled';
 import { css } from '@emotion/react';
 import { euiThemeVars } from '@kbn/ui-theme';
 import { Conversation } from '../../../assistant_context/types';
@@ -26,14 +17,12 @@ import type { PromptContext, SelectedPromptContext } from '../../prompt_context/
 import * as i18n from './translations';
 
 export interface Props {
-  isNewConversation: boolean;
   promptContexts: Record<string, PromptContext>;
   selectedPromptContexts: Record<string, SelectedPromptContext>;
   setSelectedPromptContexts: React.Dispatch<
     React.SetStateAction<Record<string, SelectedPromptContext>>
   >;
   currentReplacements: Conversation['replacements'] | undefined;
-  isFlyoutMode: boolean;
 }
 
 export const EditorContainer = styled.div<{
@@ -45,20 +34,11 @@ export const EditorContainer = styled.div<{
 `;
 
 const SelectedPromptContextsComponent: React.FC<Props> = ({
-  isNewConversation,
   promptContexts,
   selectedPromptContexts,
   setSelectedPromptContexts,
   currentReplacements,
-  isFlyoutMode,
 }) => {
-  const [accordionState, setAccordionState] = React.useState<'closed' | 'open'>('closed');
-
-  const onToggle = useCallback(
-    () => setAccordionState((prev) => (prev === 'open' ? 'closed' : 'open')),
-    []
-  );
-
   const unselectPromptContext = useCallback(
     (unselectedId: string) => {
       setSelectedPromptContexts((prev) => omit(unselectedId, prev));
@@ -71,22 +51,13 @@ const SelectedPromptContextsComponent: React.FC<Props> = ({
   }
 
   return (
-    <EuiFlexGroup
-      data-test-subj="selectedPromptContexts"
-      direction="column"
-      gutterSize={isFlyoutMode ? 's' : 'none'}
-    >
+    <EuiFlexGroup data-test-subj="selectedPromptContexts" direction="column" gutterSize={'s'}>
       {Object.keys(selectedPromptContexts)
         .sort()
         .map((id) => (
           <EuiFlexItem data-test-subj={`selectedPromptContext-${id}`} grow={false} key={id}>
-            {!isFlyoutMode &&
-            (isNewConversation || Object.keys(selectedPromptContexts).length > 1) ? (
-              <EuiSpacer data-test-subj="spacer" />
-            ) : null}
             <EuiAccordion
               buttonContent={promptContexts[id]?.description}
-              {...(!isFlyoutMode && { forceState: accordionState })}
               extraAction={
                 <EuiToolTip content={i18n.REMOVE_CONTEXT}>
                   <EuiButtonIcon
@@ -98,43 +69,26 @@ const SelectedPromptContextsComponent: React.FC<Props> = ({
                 </EuiToolTip>
               }
               id={id}
-              {...(!isFlyoutMode && { onToggle })}
               paddingSize="s"
-              {...(isFlyoutMode
-                ? {
-                    css: css`
-                      background: ${euiThemeVars.euiPageBackgroundColor};
-                      border-radius: ${euiThemeVars.euiBorderRadius};
+              css={css`
+                background: ${euiThemeVars.euiPageBackgroundColor};
+                border-radius: ${euiThemeVars.euiBorderRadius};
 
-                      > div:first-child {
-                        color: ${euiThemeVars.euiColorPrimary};
-                        padding: ${euiThemeVars.euiFormControlPadding};
-                      }
-                    `,
-                    borders: 'all',
-                    arrowProps: {
-                      color: 'primary',
-                    },
-                  }
-                : {})}
+                > div:first-child {
+                  color: ${euiThemeVars.euiColorPrimary};
+                  padding: ${euiThemeVars.euiFormControlPadding};
+                }
+              `}
+              borders={'all'}
+              arrowProps={{
+                color: 'primary',
+              }}
             >
-              {isFlyoutMode ? (
-                <DataAnonymizationEditor
-                  currentReplacements={currentReplacements}
-                  selectedPromptContext={selectedPromptContexts[id]}
-                  setSelectedPromptContexts={setSelectedPromptContexts}
-                  isFlyoutMode={isFlyoutMode}
-                />
-              ) : (
-                <EditorContainer $accordionState={accordionState}>
-                  <DataAnonymizationEditor
-                    currentReplacements={currentReplacements}
-                    selectedPromptContext={selectedPromptContexts[id]}
-                    setSelectedPromptContexts={setSelectedPromptContexts}
-                    isFlyoutMode={isFlyoutMode}
-                  />
-                </EditorContainer>
-              )}
+              <DataAnonymizationEditor
+                currentReplacements={currentReplacements}
+                selectedPromptContext={selectedPromptContexts[id]}
+                setSelectedPromptContexts={setSelectedPromptContexts}
+              />
             </EuiAccordion>
           </EuiFlexItem>
         ))}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx
index 82b04c60a569c..f13441a3102f9 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.test.tsx
@@ -16,21 +16,21 @@ import { getOptions, getOptionFromPrompt } from './helpers';
 describe('helpers', () => {
   describe('getOptionFromPrompt', () => {
     it('returns an EuiSuperSelectOption with the correct value', () => {
-      const option = getOptionFromPrompt({ ...mockSystemPrompt, isFlyoutMode: true });
+      const option = getOptionFromPrompt({ ...mockSystemPrompt });
 
       expect(option.value).toBe(mockSystemPrompt.id);
     });
 
     it('returns an EuiSuperSelectOption with the correct inputDisplay', () => {
-      const option = getOptionFromPrompt({ ...mockSystemPrompt, isFlyoutMode: false });
+      const option = getOptionFromPrompt({ ...mockSystemPrompt });
 
       render(<>{option.inputDisplay}</>);
 
-      expect(screen.getByTestId('systemPromptText')).toHaveTextContent(mockSystemPrompt.content);
+      expect(screen.getByTestId('systemPromptText')).toHaveTextContent(mockSystemPrompt.name);
     });
 
     it('shows the expected name in the dropdownDisplay', () => {
-      const option = getOptionFromPrompt({ ...mockSystemPrompt, isFlyoutMode: true });
+      const option = getOptionFromPrompt({ ...mockSystemPrompt });
 
       render(<TestProviders>{option.dropdownDisplay}</TestProviders>);
 
@@ -38,7 +38,7 @@ describe('helpers', () => {
     });
 
     it('shows the expected prompt content in the dropdownDisplay', () => {
-      const option = getOptionFromPrompt({ ...mockSystemPrompt, isFlyoutMode: true });
+      const option = getOptionFromPrompt({ ...mockSystemPrompt });
 
       render(<TestProviders>{option.dropdownDisplay}</TestProviders>);
 
@@ -51,7 +51,7 @@ describe('helpers', () => {
       const prompts = [mockSystemPrompt, mockSuperheroSystemPrompt];
       const promptIds = prompts.map(({ id }) => id);
 
-      const options = getOptions({ prompts, isFlyoutMode: false });
+      const options = getOptions({ prompts });
       const optionValues = options.map(({ value }) => value);
 
       expect(optionValues).toEqual(promptIds);
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.tsx
index bd217bb54e9f6..92814927f980a 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/helpers.tsx
@@ -8,46 +8,23 @@
 import { EuiText, EuiToolTip } from '@elastic/eui';
 import type { EuiSuperSelectOption } from '@elastic/eui';
 import React from 'react';
-// eslint-disable-next-line @kbn/eslint/module_migration
-import styled from 'styled-components';
-
-import { css } from '@emotion/react';
+import styled from '@emotion/styled';
 import { isEmpty } from 'lodash/fp';
+import { euiThemeVars } from '@kbn/ui-theme';
 import { PromptResponse } from '@kbn/elastic-assistant-common';
 import { EMPTY_PROMPT } from './translations';
 
 const Strong = styled.strong`
-  margin-right: ${({ theme }) => theme.eui.euiSizeS};
+  margin-right: ${euiThemeVars.euiSizeS};
 `;
 
 export const getOptionFromPrompt = ({
   content,
   id,
   name,
-  showTitles = false,
-  isFlyoutMode,
-}: PromptResponse & {
-  showTitles?: boolean;
-  isFlyoutMode: boolean;
-}): EuiSuperSelectOption<string> => ({
+}: PromptResponse): EuiSuperSelectOption<string> => ({
   value: id,
-  inputDisplay: isFlyoutMode ? (
-    name
-  ) : (
-    <EuiText
-      color="subdued"
-      data-test-subj="systemPromptText"
-      css={css`
-        overflow: hidden;
-        &:hover {
-          cursor: pointer;
-          text-decoration: underline;
-        }
-      `}
-    >
-      {showTitles ? name : content}
-    </EuiText>
-  ),
+  inputDisplay: <span data-test-subj="systemPromptText">{name}</span>,
   dropdownDisplay: (
     <>
       <Strong data-test-subj="name">{name}</Strong>
@@ -64,12 +41,6 @@ export const getOptionFromPrompt = ({
 
 interface GetOptionsProps {
   prompts: PromptResponse[] | undefined;
-  showTitles?: boolean;
-  isFlyoutMode: boolean;
 }
-export const getOptions = ({
-  prompts,
-  showTitles = false,
-  isFlyoutMode,
-}: GetOptionsProps): Array<EuiSuperSelectOption<string>> =>
-  prompts?.map((p) => getOptionFromPrompt({ ...p, showTitles, isFlyoutMode })) ?? [];
+export const getOptions = ({ prompts }: GetOptionsProps): Array<EuiSuperSelectOption<string>> =>
+  prompts?.map(getOptionFromPrompt) ?? [];
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.test.tsx
index 34d40852ba505..3b82b1fd0fbe5 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.test.tsx
@@ -90,7 +90,6 @@ describe('SystemPrompt', () => {
           isSettingsModalVisible={isSettingsModalVisible}
           onSystemPromptSelectionChange={onSystemPromptSelectionChange}
           setIsSettingsModalVisible={setIsSettingsModalVisible}
-          isFlyoutMode={false}
           allSystemPrompts={mockSystemPrompts}
         />
       );
@@ -100,10 +99,6 @@ describe('SystemPrompt', () => {
       expect(screen.getByTestId('selectSystemPrompt')).toBeInTheDocument();
     });
 
-    it('does NOT render the system prompt text', () => {
-      expect(screen.queryByTestId('systemPromptText')).not.toBeInTheDocument();
-    });
-
     it('does NOT render the edit button', () => {
       expect(screen.queryByTestId('edit')).not.toBeInTheDocument();
     });
@@ -122,26 +117,21 @@ describe('SystemPrompt', () => {
           isSettingsModalVisible={isSettingsModalVisible}
           onSystemPromptSelectionChange={onSystemPromptSelectionChange}
           setIsSettingsModalVisible={setIsSettingsModalVisible}
-          isFlyoutMode={false}
           allSystemPrompts={mockSystemPrompts}
         />
       );
     });
 
-    it('does NOT render the system prompt select', () => {
-      expect(screen.queryByTestId('selectSystemPrompt')).not.toBeInTheDocument();
+    it('does render the system prompt select', () => {
+      expect(screen.queryByTestId('selectSystemPrompt')).toBeInTheDocument();
     });
 
     it('renders the system prompt text', () => {
-      expect(screen.getByTestId('systemPromptText')).toHaveTextContent(mockSystemPrompt.content);
-    });
-
-    it('renders the edit button', () => {
-      expect(screen.getByTestId('edit')).toBeInTheDocument();
+      expect(screen.getByTestId('systemPromptText')).toHaveTextContent(mockSystemPrompt.name);
     });
 
     it('renders the clear button', () => {
-      expect(screen.getByTestId('clear')).toBeInTheDocument();
+      expect(screen.getByTestId('clearSystemPrompt')).toBeInTheDocument();
     });
   });
 
@@ -158,7 +148,6 @@ describe('SystemPrompt', () => {
             isSettingsModalVisible={isSettingsModalVisible}
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={false}
             allSystemPrompts={mockSystemPrompts}
           />
         </TestProviders>
@@ -206,7 +195,6 @@ describe('SystemPrompt', () => {
             isSettingsModalVisible={isSettingsModalVisible}
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={false}
             allSystemPrompts={mockSystemPrompts}
           />
         </TestProviders>
@@ -268,7 +256,6 @@ describe('SystemPrompt', () => {
             isSettingsModalVisible={isSettingsModalVisible}
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={false}
             allSystemPrompts={mockSystemPrompts}
           />
         </TestProviders>
@@ -337,7 +324,6 @@ describe('SystemPrompt', () => {
             isSettingsModalVisible={isSettingsModalVisible}
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={false}
             allSystemPrompts={mockSystemPrompts}
           />
         </TestProviders>
@@ -421,7 +407,6 @@ describe('SystemPrompt', () => {
             isSettingsModalVisible={isSettingsModalVisible}
             onSystemPromptSelectionChange={onSystemPromptSelectionChange}
             setIsSettingsModalVisible={setIsSettingsModalVisible}
-            isFlyoutMode={false}
             allSystemPrompts={mockSystemPrompts}
           />
         </TestProviders>
@@ -483,26 +468,6 @@ describe('SystemPrompt', () => {
     });
   });
 
-  it('shows the system prompt select when the edit button is clicked', () => {
-    render(
-      <TestProviders>
-        <SystemPrompt
-          conversation={BASE_CONVERSATION}
-          editingSystemPromptId={mockSystemPrompt.id}
-          isSettingsModalVisible={isSettingsModalVisible}
-          onSystemPromptSelectionChange={onSystemPromptSelectionChange}
-          setIsSettingsModalVisible={setIsSettingsModalVisible}
-          isFlyoutMode={false}
-          allSystemPrompts={mockSystemPrompts}
-        />
-      </TestProviders>
-    );
-
-    userEvent.click(screen.getByTestId('edit'));
-
-    expect(screen.getByTestId('selectSystemPrompt')).toBeInTheDocument();
-  });
-
   it('shows the system prompt select when system prompt text is clicked', () => {
     render(
       <TestProviders>
@@ -512,7 +477,6 @@ describe('SystemPrompt', () => {
           isSettingsModalVisible={isSettingsModalVisible}
           onSystemPromptSelectionChange={onSystemPromptSelectionChange}
           setIsSettingsModalVisible={setIsSettingsModalVisible}
-          isFlyoutMode={false}
           allSystemPrompts={mockSystemPrompts}
         />
       </TestProviders>
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.tsx
index f2808c3e204f1..01fe334eb1f7d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/index.tsx
@@ -5,14 +5,9 @@
  * 2.0.
  */
 
-import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
-
-import { css } from '@emotion/react';
-import { isEmpty } from 'lodash/fp';
 import { PromptResponse } from '@kbn/elastic-assistant-common';
 import { Conversation } from '../../../..';
-import * as i18n from './translations';
 import { SelectSystemPrompt } from './select_system_prompt';
 
 interface Props {
@@ -21,7 +16,6 @@ interface Props {
   isSettingsModalVisible: boolean;
   onSystemPromptSelectionChange: (systemPromptId: string | undefined) => void;
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  isFlyoutMode: boolean;
   allSystemPrompts: PromptResponse[];
 }
 
@@ -31,7 +25,6 @@ const SystemPromptComponent: React.FC<Props> = ({
   isSettingsModalVisible,
   onSystemPromptSelectionChange,
   setIsSettingsModalVisible,
-  isFlyoutMode,
   allSystemPrompts,
 }) => {
   const selectedPrompt = useMemo(() => {
@@ -42,99 +35,24 @@ const SystemPromptComponent: React.FC<Props> = ({
     }
   }, [allSystemPrompts, conversation?.apiConfig?.defaultSystemPromptId, editingSystemPromptId]);
 
-  const [isEditing, setIsEditing] = React.useState<boolean>(false);
-
   const handleClearSystemPrompt = useCallback(() => {
     if (conversation) {
       onSystemPromptSelectionChange(undefined);
     }
   }, [conversation, onSystemPromptSelectionChange]);
 
-  const handleEditSystemPrompt = useCallback(() => setIsEditing(true), []);
-
-  if (isFlyoutMode) {
-    return (
-      <SelectSystemPrompt
-        allPrompts={allSystemPrompts}
-        clearSelectedSystemPrompt={handleClearSystemPrompt}
-        conversation={conversation}
-        data-test-subj="systemPrompt"
-        isClearable={true}
-        isEditing={true}
-        setIsEditing={setIsEditing}
-        isSettingsModalVisible={isSettingsModalVisible}
-        onSystemPromptSelectionChange={onSystemPromptSelectionChange}
-        selectedPrompt={selectedPrompt}
-        setIsSettingsModalVisible={setIsSettingsModalVisible}
-        isFlyoutMode={isFlyoutMode}
-      />
-    );
-  }
-
   return (
-    <div>
-      {selectedPrompt == null || isEditing ? (
-        <SelectSystemPrompt
-          allPrompts={allSystemPrompts}
-          clearSelectedSystemPrompt={handleClearSystemPrompt}
-          conversation={conversation}
-          data-test-subj="systemPrompt"
-          isClearable={true}
-          isEditing={isEditing}
-          isOpen={isEditing}
-          isSettingsModalVisible={isSettingsModalVisible}
-          onSystemPromptSelectionChange={onSystemPromptSelectionChange}
-          selectedPrompt={selectedPrompt}
-          setIsEditing={setIsEditing}
-          setIsSettingsModalVisible={setIsSettingsModalVisible}
-          isFlyoutMode={isFlyoutMode}
-        />
-      ) : (
-        <EuiFlexGroup alignItems="flexStart" gutterSize="none">
-          <EuiFlexItem grow>
-            <EuiText
-              color="subdued"
-              data-test-subj="systemPromptText"
-              onClick={handleEditSystemPrompt}
-              css={css`
-                white-space: pre-line;
-                &:hover {
-                  cursor: pointer;
-                  text-decoration: underline;
-                }
-              `}
-            >
-              {isEmpty(selectedPrompt?.content) ? i18n.EMPTY_PROMPT : selectedPrompt?.content}
-            </EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiFlexGroup gutterSize="none">
-              <EuiFlexItem grow={false}>
-                <EuiToolTip content={i18n.SELECT_A_SYSTEM_PROMPT}>
-                  <EuiButtonIcon
-                    aria-label={i18n.SELECT_A_SYSTEM_PROMPT}
-                    data-test-subj="edit"
-                    iconType="documentEdit"
-                    onClick={handleEditSystemPrompt}
-                  />
-                </EuiToolTip>
-              </EuiFlexItem>
-
-              <EuiFlexItem grow={false}>
-                <EuiToolTip content={i18n.CLEAR_SYSTEM_PROMPT}>
-                  <EuiButtonIcon
-                    aria-label={i18n.CLEAR_SYSTEM_PROMPT}
-                    data-test-subj="clear"
-                    iconType="cross"
-                    onClick={handleClearSystemPrompt}
-                  />
-                </EuiToolTip>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
-    </div>
+    <SelectSystemPrompt
+      allPrompts={allSystemPrompts}
+      clearSelectedSystemPrompt={handleClearSystemPrompt}
+      conversation={conversation}
+      data-test-subj="systemPrompt"
+      isClearable={true}
+      isSettingsModalVisible={isSettingsModalVisible}
+      onSystemPromptSelectionChange={onSystemPromptSelectionChange}
+      selectedPrompt={selectedPrompt}
+      setIsSettingsModalVisible={setIsSettingsModalVisible}
+    />
   );
 };
 
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.test.tsx
index 3796e5b4a81eb..7c8f575cd49d7 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.test.tsx
@@ -48,9 +48,9 @@ const props: Props = {
   ],
   conversation: undefined,
   isSettingsModalVisible: false,
+  isClearable: true,
   selectedPrompt: { id: 'default-system-prompt', content: '', name: '', promptType: 'system' },
   setIsSettingsModalVisible: jest.fn(),
-  isFlyoutMode: false,
 };
 
 const mockUseAssistantContext = {
@@ -91,93 +91,27 @@ jest.mock('../../../../assistant_context', () => {
 describe('SelectSystemPrompt', () => {
   beforeEach(() => jest.clearAllMocks());
 
-  it('renders the prompt super select when isEditing is true', () => {
-    const { getByTestId } = render(<SelectSystemPrompt {...props} isEditing={true} />);
+  it('renders the prompt super select', () => {
+    const { getByTestId } = render(<SelectSystemPrompt {...props} />);
 
     expect(getByTestId(TEST_IDS.PROMPT_SUPERSELECT)).toBeInTheDocument();
   });
 
-  it('does NOT render the prompt super select when isEditing is false', () => {
-    const { queryByTestId } = render(<SelectSystemPrompt {...props} isEditing={false} />);
-
-    expect(queryByTestId(TEST_IDS.PROMPT_SUPERSELECT)).not.toBeInTheDocument();
-  });
-
-  it('does NOT render the clear system prompt button when isEditing is true', () => {
-    const { queryByTestId } = render(<SelectSystemPrompt {...props} isEditing={true} />);
-
-    expect(queryByTestId('clearSystemPrompt')).not.toBeInTheDocument();
-  });
-
-  it('renders the clear system prompt button when isEditing is true AND isClearable is true', () => {
-    const { getByTestId } = render(
-      <SelectSystemPrompt {...props} isClearable={true} isEditing={true} />
-    );
+  it('renders the clear system prompt button', () => {
+    const { getByTestId } = render(<SelectSystemPrompt {...props} />);
 
     expect(getByTestId('clearSystemPrompt')).toBeInTheDocument();
   });
 
-  it('does NOT render the clear system prompt button when isEditing is false', () => {
-    const { queryByTestId } = render(<SelectSystemPrompt {...props} isEditing={false} />);
-
-    expect(queryByTestId('clearSystemPrompt')).not.toBeInTheDocument();
-  });
-
-  it('renders the add system prompt button when isEditing is false', () => {
-    const { getByTestId } = render(<SelectSystemPrompt {...props} isEditing={false} />);
-
-    expect(getByTestId('addSystemPrompt')).toBeInTheDocument();
-  });
-
-  it('does NOT render the add system prompt button when isEditing is true', () => {
-    const { queryByTestId } = render(<SelectSystemPrompt {...props} isEditing={true} />);
-
-    expect(queryByTestId('addSystemPrompt')).not.toBeInTheDocument();
-  });
-
   it('clears the selected system prompt when the clear button is clicked', () => {
     const clearSelectedSystemPrompt = jest.fn();
 
     const { getByTestId } = render(
-      <SelectSystemPrompt
-        {...props}
-        clearSelectedSystemPrompt={clearSelectedSystemPrompt}
-        isEditing={true}
-        isClearable={true}
-      />
+      <SelectSystemPrompt {...props} clearSelectedSystemPrompt={clearSelectedSystemPrompt} />
     );
 
     userEvent.click(getByTestId('clearSystemPrompt'));
 
     expect(clearSelectedSystemPrompt).toHaveBeenCalledTimes(1);
   });
-
-  it('hides the select when the clear button is clicked', () => {
-    const setIsEditing = jest.fn();
-
-    const { getByTestId } = render(
-      <SelectSystemPrompt
-        {...props}
-        setIsEditing={setIsEditing}
-        isEditing={true}
-        isClearable={true}
-      />
-    );
-
-    userEvent.click(getByTestId('clearSystemPrompt'));
-
-    expect(setIsEditing).toHaveBeenCalledWith(false);
-  });
-
-  it('shows the select when the add button is clicked', () => {
-    const setIsEditing = jest.fn();
-
-    const { getByTestId } = render(
-      <SelectSystemPrompt {...props} setIsEditing={setIsEditing} isEditing={false} />
-    );
-
-    userEvent.click(getByTestId('addSystemPrompt'));
-
-    expect(setIsEditing).toHaveBeenCalledWith(true);
-  });
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.tsx
index 0296fa3e636ca..0f10cf6d3063f 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/select_system_prompt/index.tsx
@@ -38,15 +38,11 @@ export interface Props {
   selectedPrompt: PromptResponse | undefined;
   clearSelectedSystemPrompt?: () => void;
   isClearable?: boolean;
-  isEditing?: boolean;
   isDisabled?: boolean;
   isOpen?: boolean;
   isSettingsModalVisible: boolean;
-  setIsEditing?: React.Dispatch<React.SetStateAction<boolean>>;
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  showTitles?: boolean;
   onSystemPromptSelectionChange?: (promptId: string | undefined) => void;
-  isFlyoutMode: boolean;
 }
 
 const ADD_NEW_SYSTEM_PROMPT = 'ADD_NEW_SYSTEM_PROMPT';
@@ -58,15 +54,11 @@ const SelectSystemPromptComponent: React.FC<Props> = ({
   selectedPrompt,
   clearSelectedSystemPrompt,
   isClearable = false,
-  isEditing = false,
   isDisabled = false,
   isOpen = false,
   isSettingsModalVisible,
   onSystemPromptSelectionChange,
-  setIsEditing,
   setIsSettingsModalVisible,
-  showTitles = false,
-  isFlyoutMode = false,
 }) => {
   const { setSelectedSettingsTab } = useAssistantContext();
   const { setApiConfig } = useConversation();
@@ -117,10 +109,7 @@ const SelectSystemPromptComponent: React.FC<Props> = ({
   }, []);
 
   // SuperSelect State/Actions
-  const options = useMemo(
-    () => getOptions({ prompts: allSystemPrompts, showTitles, isFlyoutMode }),
-    [allSystemPrompts, showTitles, isFlyoutMode]
-  );
+  const options = useMemo(() => getOptions({ prompts: allSystemPrompts }), [allSystemPrompts]);
 
   const onChange = useCallback(
     (selectedSystemPromptId) => {
@@ -134,11 +123,9 @@ const SelectSystemPromptComponent: React.FC<Props> = ({
         onSystemPromptSelectionChange(selectedSystemPromptId);
       }
       setSelectedSystemPrompt(selectedSystemPromptId);
-      setIsEditing?.(false);
     },
     [
       onSystemPromptSelectionChange,
-      setIsEditing,
       setIsSettingsModalVisible,
       setSelectedSettingsTab,
       setSelectedSystemPrompt,
@@ -147,14 +134,8 @@ const SelectSystemPromptComponent: React.FC<Props> = ({
 
   const clearSystemPrompt = useCallback(() => {
     setSelectedSystemPrompt(undefined);
-    setIsEditing?.(false);
     clearSelectedSystemPrompt?.();
-  }, [clearSelectedSystemPrompt, setIsEditing, setSelectedSystemPrompt]);
-
-  const onShowSelectSystemPrompt = useCallback(() => {
-    setIsEditing?.(true);
-    setIsOpenLocal(true);
-  }, [setIsEditing]);
+  }, [clearSelectedSystemPrompt, setSelectedSystemPrompt]);
 
   return (
     <EuiFlexGroup
@@ -170,94 +151,69 @@ const SelectSystemPromptComponent: React.FC<Props> = ({
           max-width: 100%;
         `}
       >
-        {isEditing && (
-          <EuiFormRow
+        <EuiFormRow
+          css={css`
+            min-width: 100%;
+          `}
+        >
+          <EuiSuperSelect
+            // Limits popover z-index to prevent it from getting too high and covering tooltips.
+            // If the z-index is not defined, when a popover is opened, it sets the target z-index + 2000
+            popoverProps={{ zIndex: euiThemeVars.euiZLevel8 }}
+            compressed={compressed}
+            data-test-subj={TEST_IDS.PROMPT_SUPERSELECT}
+            fullWidth
+            hasDividers
+            itemLayoutAlign="top"
+            disabled={isDisabled}
+            isOpen={isOpenLocal && !isSettingsModalVisible}
+            onChange={onChange}
+            onBlur={handleOnBlur}
+            options={[...options, addNewSystemPrompt]}
+            placeholder={i18n.SELECT_A_SYSTEM_PROMPT}
+            valueOfSelected={valueOfSelected}
+            prepend={!isSettingsModalVisible ? PROMPT_CONTEXT_SELECTOR_PREFIX : undefined}
             css={css`
-              min-width: 100%;
+              padding-right: 56px !important;
             `}
-          >
-            <EuiSuperSelect
-              // Limits popover z-index to prevent it from getting too high and covering tooltips.
-              // If the z-index is not defined, when a popover is opened, it sets the target z-index + 2000
-              popoverProps={{ zIndex: euiThemeVars.euiZLevel8 }}
-              compressed={compressed}
-              data-test-subj={TEST_IDS.PROMPT_SUPERSELECT}
-              fullWidth
-              hasDividers
-              itemLayoutAlign="top"
-              disabled={isDisabled}
-              isOpen={isOpenLocal && !isSettingsModalVisible}
-              onChange={onChange}
-              onBlur={handleOnBlur}
-              options={[...options, addNewSystemPrompt]}
-              placeholder={i18n.SELECT_A_SYSTEM_PROMPT}
-              valueOfSelected={valueOfSelected}
-              prepend={
-                isFlyoutMode && !isSettingsModalVisible ? PROMPT_CONTEXT_SELECTOR_PREFIX : undefined
-              }
-              css={
-                isFlyoutMode &&
-                css`
-                  padding-right: 56px !important;
-                `
-              }
-            />
-          </EuiFormRow>
-        )}
+          />
+        </EuiFormRow>
       </EuiFlexItem>
 
       <EuiFlexItem
         grow={false}
-        css={
-          isFlyoutMode
-            ? css`
-                position: absolute;
-                right: 36px;
-              `
-            : undefined
-        }
+        css={css`
+          position: absolute;
+          right: 36px;
+        `}
       >
-        {isEditing && isClearable && selectedPrompt && (
+        {isClearable && selectedPrompt && (
           <EuiToolTip content={i18n.CLEAR_SYSTEM_PROMPT}>
             <EuiButtonIcon
               aria-label={i18n.CLEAR_SYSTEM_PROMPT}
               data-test-subj="clearSystemPrompt"
               iconType="cross"
               onClick={clearSystemPrompt}
-              css={
-                isFlyoutMode
-                  ? // mimic EuiComboBox clear button
-                    css`
-                      inline-size: 16px;
-                      block-size: 16px;
-                      border-radius: 16px;
-                      background: ${euiThemeVars.euiColorMediumShade};
-
-                      :hover:not(:disabled) {
-                        background: ${euiThemeVars.euiColorMediumShade};
-                        transform: none;
-                      }
-
-                      > svg {
-                        width: 8px;
-                        height: 8px;
-                        stroke-width: 2px;
-                        fill: #fff;
-                        stroke: #fff;
-                      }
-                    `
-                  : undefined
-              }
-            />
-          </EuiToolTip>
-        )}
-        {!isEditing && (
-          <EuiToolTip content={i18n.ADD_SYSTEM_PROMPT_TOOLTIP}>
-            <EuiButtonIcon
-              aria-label={i18n.ADD_SYSTEM_PROMPT_TOOLTIP}
-              data-test-subj="addSystemPrompt"
-              iconType="plus"
-              onClick={onShowSelectSystemPrompt}
+              // mimic EuiComboBox clear button
+              css={css`
+                inline-size: 16px;
+                block-size: 16px;
+                border-radius: 16px;
+                background: ${euiThemeVars.euiColorMediumShade};
+
+                :hover:not(:disabled) {
+                  background: ${euiThemeVars.euiColorMediumShade};
+                  transform: none;
+                }
+
+                > svg {
+                  width: 8px;
+                  height: 8px;
+                  stroke-width: 2px;
+                  fill: #fff;
+                  stroke: #fff;
+                }
+              `}
             />
           </EuiToolTip>
         )}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_modal/system_prompt_selector/system_prompt_selector.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_modal/system_prompt_selector/system_prompt_selector.tsx
index 2c4826940a7ca..ae5fce935cfe3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_modal/system_prompt_selector/system_prompt_selector.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_editor/system_prompt/system_prompt_modal/system_prompt_selector/system_prompt_selector.tsx
@@ -147,9 +147,8 @@ export const SystemPromptSelector: React.FC<Props> = React.memo(
 
     const renderOption: (
       option: SystemPromptSelectorOption,
-      searchValue: string,
-      OPTION_CONTENT_CLASSNAME: string
-    ) => React.ReactNode = (option, searchValue, contentClassName) => {
+      searchValue: string
+    ) => React.ReactNode = (option, searchValue) => {
       const { label, value } = option;
       return (
         <EuiFlexGroup
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_textarea/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_textarea/index.tsx
index 5787847043cfc..fe9f2f8a1a762 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_textarea/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/prompt_textarea/index.tsx
@@ -16,11 +16,10 @@ export interface Props extends React.TextareaHTMLAttributes<HTMLTextAreaElement>
   isDisabled?: boolean;
   onPromptSubmit: (value: string) => void;
   value: string;
-  isFlyoutMode: boolean;
 }
 
 export const PromptTextArea = forwardRef<HTMLTextAreaElement, Props>(
-  ({ isDisabled = false, value, onPromptSubmit, handlePromptChange, isFlyoutMode }, ref) => {
+  ({ isDisabled = false, value, onPromptSubmit, handlePromptChange }, ref) => {
     const onChangeCallback = useCallback(
       (event: React.ChangeEvent<HTMLTextAreaElement>) => {
         handlePromptChange(event.target.value);
@@ -46,8 +45,8 @@ export const PromptTextArea = forwardRef<HTMLTextAreaElement, Props>(
       <EuiTextArea
         css={css`
           padding-right: 64px !important;
-          min-height: ${!isFlyoutMode ? '125px' : '64px'};
-          max-height: ${!isFlyoutMode ? 'auto' : '350px'};
+          min-height: 64px;
+          max-height: 350px;
         `}
         className="eui-scrollBar"
         inputRef={ref}
@@ -61,7 +60,7 @@ export const PromptTextArea = forwardRef<HTMLTextAreaElement, Props>(
         value={value}
         onChange={onChangeCallback}
         onKeyDown={onKeyDown}
-        rows={isFlyoutMode ? 1 : 6}
+        rows={1}
       />
     );
   }
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_selector/quick_prompt_selector.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_selector/quick_prompt_selector.tsx
index d29887e8c4f6a..759c6e49e446e 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_selector/quick_prompt_selector.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompt_selector/quick_prompt_selector.tsx
@@ -140,9 +140,8 @@ export const QuickPromptSelector: React.FC<Props> = React.memo(
 
     const renderOption: (
       option: QuickPromptSelectorOption,
-      searchValue: string,
-      OPTION_CONTENT_CLASSNAME: string
-    ) => React.ReactNode = (option, searchValue, contentClassName) => {
+      searchValue: string
+    ) => React.ReactNode = (option, searchValue) => {
       const { color, label, value } = option;
       return (
         <EuiFlexGroup
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.test.tsx
index 6e5172dc0c2ad..dda9f8e503b6e 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.test.tsx
@@ -19,7 +19,6 @@ const testProps = {
   setInput,
   setIsSettingsModalVisible,
   trackPrompt,
-  isFlyoutMode: false,
   allPrompts: MOCK_QUICK_PROMPTS,
 };
 const setSelectedSettingsTab = jest.fn();
@@ -36,6 +35,16 @@ const testTitle = 'SPL_QUERY_CONVERSION_TITLE';
 const testPrompt = 'SPL_QUERY_CONVERSION_PROMPT';
 const customTitle = 'A_CUSTOM_OPTION';
 
+jest.mock('react-use', () => ({
+  ...jest.requireActual('react-use'),
+  useMeasure: () => [
+    () => {},
+    {
+      width: 500,
+    },
+  ],
+}));
+
 jest.mock('../../assistant_context', () => ({
   ...jest.requireActual('../../assistant_context'),
   useAssistantContext: () => mockUseAssistantContext,
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.tsx
index c578a58be728d..e910d238ccc5d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/quick_prompts/quick_prompts.tsx
@@ -27,12 +27,10 @@ import { QUICK_PROMPTS_TAB } from '../settings/const';
 
 export const KNOWLEDGE_BASE_CATEGORY = 'knowledge-base';
 
-const COUNT_BEFORE_OVERFLOW = 5;
 interface QuickPromptsProps {
   setInput: (input: string) => void;
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
   trackPrompt: (prompt: string) => void;
-  isFlyoutMode: boolean;
   allPrompts: PromptResponse[];
 }
 
@@ -42,7 +40,7 @@ interface QuickPromptsProps {
  * and localstorage for storing new and edited prompts.
  */
 export const QuickPrompts: React.FC<QuickPromptsProps> = React.memo(
-  ({ setInput, setIsSettingsModalVisible, trackPrompt, isFlyoutMode, allPrompts }) => {
+  ({ setInput, setIsSettingsModalVisible, trackPrompt, allPrompts }) => {
     const [quickPromptsContainerRef, { width }] = useMeasure();
 
     const { knowledgeBase, promptContexts, setSelectedSettingsTab } = useAssistantContext();
@@ -103,25 +101,15 @@ export const QuickPrompts: React.FC<QuickPromptsProps> = React.memo(
     }, [setIsSettingsModalVisible, setSelectedSettingsTab]);
 
     const quickPrompts = useMemo(() => {
-      const visibleCount = isFlyoutMode ? Math.floor(width / 120) : COUNT_BEFORE_OVERFLOW;
+      const visibleCount = Math.floor(width / 120);
       const visibleItems = contextFilteredQuickPrompts.slice(0, visibleCount);
       const overflowItems = contextFilteredQuickPrompts.slice(visibleCount);
 
       return { visible: visibleItems, overflow: overflowItems };
-    }, [contextFilteredQuickPrompts, isFlyoutMode, width]);
+    }, [contextFilteredQuickPrompts, width]);
 
     return (
-      <EuiFlexGroup
-        gutterSize="s"
-        alignItems="center"
-        justifyContent={isFlyoutMode ? 'spaceBetween' : 'flexStart'}
-        css={
-          !isFlyoutMode &&
-          css`
-            margin: 16px;
-          `
-        }
-      >
+      <EuiFlexGroup gutterSize="s" alignItems="center" justifyContent={'spaceBetween'}>
         <EuiFlexItem
           css={css`
             overflow: hidden;
@@ -154,20 +142,12 @@ export const QuickPrompts: React.FC<QuickPromptsProps> = React.memo(
               <EuiFlexItem grow={false}>
                 <EuiPopover
                   button={
-                    isFlyoutMode ? (
-                      <EuiButtonIcon
-                        color={'primary'}
-                        iconType={'boxesHorizontal'}
-                        onClick={toggleOverflowPopover}
-                      />
-                    ) : (
-                      <EuiBadge
-                        color={'hollow'}
-                        iconType={'boxesHorizontal'}
-                        onClick={toggleOverflowPopover}
-                        onClickAriaLabel={i18n.QUICK_PROMPT_OVERFLOW_ARIA}
-                      />
-                    )
+                    <EuiButtonIcon
+                      color={'primary'}
+                      iconType={'boxesHorizontal'}
+                      onClick={toggleOverflowPopover}
+                      aria-label={i18n.QUICK_PROMPT_OVERFLOW_ARIA}
+                    />
                   }
                   isOpen={isOverflowPopoverOpen}
                   closePopover={closeOverflowPopover}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.test.tsx
index 8f4a8680f9c57..9fb8db972e482 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.test.tsx
@@ -55,7 +55,6 @@ const testProps = {
   selectedConversationId: welcomeConvo.title,
   onClose,
   onSave,
-  isFlyoutMode: false,
   onConversationSelected,
   conversations: {},
   anonymizationFields: { total: 0, page: 1, perPage: 1000, data: [] },
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx
index d5bbefe304208..4b46d2b75d0a9 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings.tsx
@@ -59,7 +59,6 @@ interface Props {
   onClose: (
     event?: React.KeyboardEvent<HTMLDivElement> | React.MouseEvent<HTMLButtonElement>
   ) => void;
-  isFlyoutMode: boolean;
   onSave: (success: boolean) => Promise<void>;
   selectedConversationId?: string;
   onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
@@ -80,7 +79,6 @@ export const AssistantSettings: React.FC<Props> = React.memo(
     onConversationSelected,
     conversations,
     conversationsLoaded,
-    isFlyoutMode,
   }) => {
     const {
       actionTypeRegistry,
@@ -338,7 +336,6 @@ export const AssistantSettings: React.FC<Props> = React.memo(
                       setAssistantStreamingEnabled={setUpdatedAssistantStreamingEnabled}
                       onSelectedConversationChange={onHandleSelectedConversationChange}
                       http={http}
-                      isFlyoutMode={isFlyoutMode}
                     />
                   ))}
                 {selectedSettingsTab === QUICK_PROMPTS_TAB && (
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.test.tsx
index 3aab8d1169bfc..0ef76adad9940 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.test.tsx
@@ -22,7 +22,6 @@ const testProps = {
   isSettingsModalVisible: false,
   selectedConversation: welcomeConvo,
   setIsSettingsModalVisible,
-  isFlyoutMode: false,
   onConversationSelected,
   conversations: {},
   conversationsLoaded: true,
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.tsx
index 30f141f219476..0df20b0cd4db2 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_button.tsx
@@ -23,7 +23,6 @@ interface Props {
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
   onConversationSelected: ({ cId, cTitle }: { cId: string; cTitle: string }) => void;
   isDisabled?: boolean;
-  isFlyoutMode: boolean;
   conversations: Record<string, Conversation>;
   conversationsLoaded: boolean;
   refetchConversationsState: () => Promise<void>;
@@ -42,7 +41,6 @@ export const AssistantSettingsButton: React.FC<Props> = React.memo(
     isSettingsModalVisible,
     setIsSettingsModalVisible,
     selectedConversationId,
-    isFlyoutMode,
     onConversationSelected,
     conversations,
     conversationsLoaded,
@@ -92,7 +90,7 @@ export const AssistantSettingsButton: React.FC<Props> = React.memo(
             isDisabled={isDisabled}
             iconType="gear"
             size="xs"
-            {...(isFlyoutMode ? { color: 'text' } : {})}
+            color="text"
           />
         </EuiToolTip>
 
@@ -103,7 +101,6 @@ export const AssistantSettingsButton: React.FC<Props> = React.memo(
             onConversationSelected={onConversationSelected}
             onClose={handleCloseModal}
             onSave={handleSave}
-            isFlyoutMode={isFlyoutMode}
             conversations={conversations}
             conversationsLoaded={conversationsLoaded}
           />
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx
index 15fb05ca1c807..7d70ee5ede730 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.test.tsx
@@ -62,7 +62,6 @@ const testProps = {
   selectedConversation: welcomeConvo,
   onClose,
   onSave,
-  isFlyoutMode: false,
   onConversationSelected,
   conversations: {},
   anonymizationFields: { total: 0, page: 1, perPage: 1000, data: [] },
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx
index 3f9be4972fe7e..be6370d36e841 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/assistant_settings_management.tsx
@@ -49,7 +49,6 @@ interface Props {
   conversations: Record<string, Conversation>;
   conversationsLoaded: boolean;
   selectedConversation: Conversation;
-  isFlyoutMode: boolean;
   refetchConversations: () => void;
 }
 
@@ -61,7 +60,6 @@ export const AssistantSettingsManagement: React.FC<Props> = React.memo(
   ({
     conversations,
     conversationsLoaded,
-    isFlyoutMode,
     refetchConversations,
     selectedConversation: defaultSelectedConversation,
   }) => {
@@ -304,7 +302,6 @@ export const AssistantSettingsManagement: React.FC<Props> = React.memo(
               conversationsSettingsBulkActions={conversationsSettingsBulkActions}
               defaultConnector={defaultConnector}
               handleSave={handleSave}
-              isFlyoutMode={isFlyoutMode}
               onCancelClick={onCancelClick}
               onSelectedConversationChange={onHandleSelectedConversationChange}
               selectedConversation={selectedConversation}
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/evaluation_settings/evaluation_settings.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/evaluation_settings/evaluation_settings.tsx
index fe4d75be04004..71bbab7636a4a 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/evaluation_settings/evaluation_settings.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/settings/evaluation_settings/evaluation_settings.tsx
@@ -44,14 +44,10 @@ const DEFAULT_EVAL_TYPES_OPTIONS = [
 ];
 const DEFAULT_OUTPUT_INDEX = '.kibana-elastic-ai-assistant-evaluation-results';
 
-interface Props {
-  onEvaluationSettingsChange?: () => void;
-}
-
 /**
  * Evaluation Settings -- development-only feature for evaluating models
  */
-export const EvaluationSettings: React.FC<Props> = React.memo(({ onEvaluationSettingsChange }) => {
+export const EvaluationSettings: React.FC = React.memo(() => {
   const { actionTypeRegistry, basePath, http, setTraceOptions, traceOptions } =
     useAssistantContext();
   const { data: connectors } = useLoadConnectors({ http });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_assistant_overlay/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_assistant_overlay/index.tsx
index 3396223d192ca..9ccc2cbce815d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_assistant_overlay/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_assistant_overlay/index.tsx
@@ -130,7 +130,7 @@ export const useAssistantOverlay = (
   // proxy show / hide calls to assistant context, using our internal prompt context id:
   // silent:boolean doesn't show the toast notification if the conversation is not found
   const showAssistantOverlay = useCallback(
-    async (showOverlay: boolean, silent?: boolean) => {
+    async (showOverlay: boolean) => {
       let conversation;
       if (!isLoading) {
         conversation = conversationTitle
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/index.tsx
index a276aea3ff4ab..4643af5509aeb 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/index.tsx
@@ -33,7 +33,6 @@ interface CreateConversationProps {
   messages?: ClientMessage[];
   conversationIds?: string[];
   apiConfig?: Conversation['apiConfig'];
-  isFlyoutMode: boolean;
 }
 
 interface SetApiConfigProps {
@@ -126,13 +125,10 @@ export const useConversation = (): UseConversation => {
    * Create a new conversation with the given conversationId, and optionally add messages
    */
   const getDefaultConversation = useCallback(
-    ({ cTitle, messages, isFlyoutMode }: CreateConversationProps): Conversation => {
+    ({ cTitle, messages }: CreateConversationProps): Conversation => {
       const newConversation: Conversation =
         cTitle === i18n.WELCOME_CONVERSATION_TITLE
-          ? {
-              ...WELCOME_CONVERSATION,
-              messages: !isFlyoutMode ? WELCOME_CONVERSATION.messages : [],
-            }
+          ? WELCOME_CONVERSATION
           : {
               ...DEFAULT_CONVERSATION_STATE,
               id: '',
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/sample_conversations.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/sample_conversations.tsx
index 7cdf709192f70..85192f646963c 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/sample_conversations.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant/use_conversation/sample_conversations.tsx
@@ -13,35 +13,7 @@ export const WELCOME_CONVERSATION: Conversation = {
   id: '',
   title: WELCOME_CONVERSATION_TITLE,
   category: 'assistant',
-  messages: [
-    {
-      role: 'assistant',
-      content: i18n.WELCOME_GENERAL,
-      timestamp: '',
-      presentation: {
-        delay: 2 * 1000,
-        stream: true,
-      },
-    },
-    {
-      role: 'assistant',
-      content: i18n.WELCOME_GENERAL_2,
-      timestamp: '',
-      presentation: {
-        delay: 1000,
-        stream: true,
-      },
-    },
-    {
-      role: 'assistant',
-      content: i18n.WELCOME_GENERAL_3,
-      timestamp: '',
-      presentation: {
-        delay: 1000,
-        stream: true,
-      },
-    },
-  ],
+  messages: [],
   replacements: {},
   excludeFromLastConversationStorage: true,
 };
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/assistant_context/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/assistant_context/index.tsx
index 78336f8a8b03d..65fca75623306 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/assistant_context/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/assistant_context/index.tsx
@@ -73,7 +73,6 @@ export interface AssistantProviderProps {
     showAnonymizedValues: boolean;
     setIsStreaming: (isStreaming: boolean) => void;
     currentUserAvatar?: UserAvatar;
-    isFlyoutMode: boolean;
   }) => EuiCommentProps[];
   http: HttpSetup;
   baseConversations: Record<string, Conversation>;
@@ -114,7 +113,6 @@ export interface UseAssistantContext {
     showAnonymizedValues: boolean;
     currentUserAvatar?: UserAvatar;
     setIsStreaming: (isStreaming: boolean) => void;
-    isFlyoutMode: boolean;
   }) => EuiCommentProps[];
   http: HttpSetup;
   knowledgeBase: KnowledgeBaseConfig;
@@ -234,9 +232,7 @@ export const AssistantProvider: React.FC<AssistantProviderProps> = ({
   /**
    * Global Assistant Overlay actions
    */
-  const [showAssistantOverlay, setShowAssistantOverlay] = useState<ShowAssistantOverlay>(
-    (showAssistant) => {}
-  );
+  const [showAssistantOverlay, setShowAssistantOverlay] = useState<ShowAssistantOverlay>(() => {});
 
   /**
    * Settings State
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.test.tsx
index a131e63ae49c3..5465ca19e99de 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.test.tsx
@@ -30,7 +30,6 @@ describe('connectorMissingCallout', () => {
               isConnectorConfigured={false}
               isSettingsModalVisible={false}
               setIsSettingsModalVisible={jest.fn()}
-              isFlyoutMode={false}
             />
           </TestProviders>
         );
@@ -45,7 +44,6 @@ describe('connectorMissingCallout', () => {
               isConnectorConfigured={true}
               isSettingsModalVisible={false}
               setIsSettingsModalVisible={jest.fn()}
-              isFlyoutMode={false}
             />
           </TestProviders>
         );
@@ -70,7 +68,6 @@ describe('connectorMissingCallout', () => {
               isConnectorConfigured={true}
               isSettingsModalVisible={false}
               setIsSettingsModalVisible={jest.fn()}
-              isFlyoutMode={false}
             />
           </TestProviders>
         );
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.tsx
index 8853ca0a67d33..26ce2f736ed9a 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_missing_callout/index.tsx
@@ -20,7 +20,6 @@ interface Props {
   isConnectorConfigured: boolean;
   isSettingsModalVisible: boolean;
   setIsSettingsModalVisible: React.Dispatch<React.SetStateAction<boolean>>;
-  isFlyoutMode: boolean;
 }
 
 /**
@@ -31,7 +30,7 @@ interface Props {
  * TODO: Add setting for 'default connector' so we can auto-resolve and not even show this
  */
 export const ConnectorMissingCallout: React.FC<Props> = React.memo(
-  ({ isConnectorConfigured, isSettingsModalVisible, setIsSettingsModalVisible, isFlyoutMode }) => {
+  ({ isConnectorConfigured, isSettingsModalVisible, setIsSettingsModalVisible }) => {
     const { assistantAvailability, setSelectedSettingsTab } = useAssistantContext();
 
     const onConversationSettingsClicked = useCallback(() => {
@@ -55,13 +54,10 @@ export const ConnectorMissingCallout: React.FC<Props> = React.memo(
             iconType="controlsVertical"
             size="m"
             title={i18n.MISSING_CONNECTOR_CALLOUT_TITLE}
-            css={
-              isFlyoutMode &&
-              css`
-                padding-left: ${euiLightVars.euiPanelPaddingModifiers.paddingMedium} !important;
-                padding-right: ${euiLightVars.euiPanelPaddingModifiers.paddingMedium} !important;
-              `
-            }
+            css={css`
+              padding-left: ${euiLightVars.euiPanelPaddingModifiers.paddingMedium} !important;
+              padding-right: ${euiLightVars.euiPanelPaddingModifiers.paddingMedium} !important;
+            `}
           >
             <p>
               <FormattedMessage
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.test.tsx
index c91cf1e094d90..0eb9d0a916c44 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.test.tsx
@@ -18,7 +18,6 @@ const defaultProps = {
   onConnectorSelectionChange,
   selectedConnectorId: 'connectorId',
   setIsOpen,
-  isFlyoutMode: false,
 };
 
 const connectorTwo = mockConnectors[1];
@@ -64,14 +63,14 @@ describe('Connector selector', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-  it('renders empty selection if no selected connector is provided', () => {
+  it('renders add new connector button if no selected connector is provided', () => {
     const { getByTestId } = render(
       <TestProviders>
         <ConnectorSelector {...defaultProps} selectedConnectorId={undefined} />
       </TestProviders>
     );
-    expect(getByTestId('connector-selector')).toBeInTheDocument();
-    expect(getByTestId('connector-selector')).toHaveTextContent('');
+    fireEvent.click(getByTestId('connector-selector'));
+    expect(getByTestId('addNewConnectorButton')).toBeInTheDocument();
   });
   it('renders with provided selected connector', () => {
     const { getByTestId } = render(
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.tsx
index 410ee650c43ef..ad0fffc44e6b5 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector/index.tsx
@@ -30,7 +30,6 @@ interface Props {
   selectedConnectorId?: string;
   displayFancy?: (displayText: string) => React.ReactNode;
   setIsOpen?: (isOpen: boolean) => void;
-  isFlyoutMode: boolean;
   stats?: AttackDiscoveryStats | null;
 }
 
@@ -47,7 +46,6 @@ export const ConnectorSelector: React.FC<Props> = React.memo(
     selectedConnectorId,
     onConnectorSelectionChange,
     setIsOpen,
-    isFlyoutMode,
     stats = null,
   }) => {
     const { actionTypeRegistry, http, assistantAvailability } = useAssistantContext();
@@ -177,7 +175,7 @@ export const ConnectorSelector: React.FC<Props> = React.memo(
 
     return (
       <>
-        {isFlyoutMode && !connectorExists && !connectorOptions.length ? (
+        {!connectorExists && !connectorOptions.length ? (
           <EuiButtonEmpty
             data-test-subj="addNewConnectorButton"
             iconType="plusInCircle"
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.test.tsx
index 456bcac71cec1..cb547ffec1cef 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.test.tsx
@@ -11,7 +11,6 @@ import { fireEvent, render } from '@testing-library/react';
 import { TestProviders } from '../../mock/test_providers/test_providers';
 import { mockConnectors } from '../../mock/connectors';
 import { ConnectorSelectorInline } from './connector_selector_inline';
-import * as i18n from '../translations';
 import { Conversation } from '../../..';
 import { useLoadConnectors } from '../use_load_connectors';
 
@@ -41,7 +40,7 @@ jest.mock('@kbn/triggers-actions-ui-plugin/public/common/constants', () => ({
 jest.mock('../use_load_connectors', () => ({
   useLoadConnectors: jest.fn(() => {
     return {
-      data: [],
+      data: mockConnectors,
       error: null,
       isSuccess: true,
     };
@@ -68,67 +67,61 @@ describe('ConnectorSelectorInline', () => {
     jest.clearAllMocks();
   });
   it('renders empty view if no selected conversation is provided', () => {
-    const { getByText } = render(
+    const { getByTestId } = render(
       <TestProviders>
         <ConnectorSelectorInline
           isDisabled={false}
           selectedConnectorId={undefined}
           selectedConversation={undefined}
-          isFlyoutMode={false}
           onConnectorSelected={jest.fn()}
         />
       </TestProviders>
     );
-    expect(getByText(i18n.INLINE_CONNECTOR_PLACEHOLDER)).toBeInTheDocument();
+    fireEvent.click(getByTestId('connector-selector'));
+    expect(getByTestId('addNewConnectorButton')).toBeInTheDocument();
   });
 
   it('renders empty view if selectedConnectorId is NOT in list of connectors', () => {
-    const { getByText } = render(
+    const { getByTestId } = render(
       <TestProviders>
         <ConnectorSelectorInline
           isDisabled={false}
           selectedConnectorId={'missing-connector-id'}
           selectedConversation={defaultConvo}
-          isFlyoutMode={false}
           onConnectorSelected={jest.fn()}
         />
       </TestProviders>
     );
-    expect(getByText(i18n.INLINE_CONNECTOR_PLACEHOLDER)).toBeInTheDocument();
+    fireEvent.click(getByTestId('connector-selector'));
+    expect(getByTestId('addNewConnectorButton')).toBeInTheDocument();
   });
-  it('Clicking add connector button opens the connector selector', () => {
-    const { getByTestId, queryByTestId } = render(
+  it('renders the connector selector', () => {
+    const { getByTestId } = render(
       <TestProviders>
         <ConnectorSelectorInline
           isDisabled={false}
-          selectedConnectorId={'missing-connector-id'}
+          selectedConnectorId={mockConnectors[0].id}
           selectedConversation={defaultConvo}
-          isFlyoutMode={false}
           onConnectorSelected={jest.fn()}
         />
       </TestProviders>
     );
-    expect(queryByTestId('connector-selector')).not.toBeInTheDocument();
-    fireEvent.click(getByTestId('connectorSelectorPlaceholderButton'));
     expect(getByTestId('connector-selector')).toBeInTheDocument();
   });
   it('On connector change, update conversation API config', () => {
     const connectorTwo = mockConnectors[1];
-    const { getByTestId, queryByTestId } = render(
+    const { getByTestId } = render(
       <TestProviders>
         <ConnectorSelectorInline
           isDisabled={false}
-          selectedConnectorId={'missing-connector-id'}
+          selectedConnectorId={mockConnectors[0].id}
           selectedConversation={defaultConvo}
-          isFlyoutMode={false}
           onConnectorSelected={jest.fn()}
         />
       </TestProviders>
     );
-    fireEvent.click(getByTestId('connectorSelectorPlaceholderButton'));
     fireEvent.click(getByTestId('connector-selector'));
     fireEvent.click(getByTestId(connectorTwo.id));
-    expect(queryByTestId('connector-selector')).not.toBeInTheDocument();
     expect(setApiConfig).toHaveBeenCalledWith({
       apiConfig: {
         actionTypeId: '.gen-ai',
@@ -151,16 +144,13 @@ describe('ConnectorSelectorInline', () => {
       <TestProviders>
         <ConnectorSelectorInline
           isDisabled={false}
-          selectedConnectorId={'missing-connector-id'}
+          selectedConnectorId={mockConnectors[0].id}
           selectedConversation={defaultConvo}
-          isFlyoutMode={false}
           onConnectorSelected={jest.fn()}
         />
       </TestProviders>
     );
-    fireEvent.click(getByTestId('connectorSelectorPlaceholderButton'));
     fireEvent.click(getByTestId('connector-selector'));
-    fireEvent.click(getByTestId('addNewConnectorButton'));
     expect(getByTestId('connector-selector')).toBeInTheDocument();
     expect(setApiConfig).not.toHaveBeenCalled();
   });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.tsx
index ebf762530af11..19e5db98a74fa 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_selector_inline/connector_selector_inline.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import React, { useCallback, useState } from 'react';
 
 import { css } from '@emotion/css';
@@ -13,8 +13,6 @@ import { euiThemeVars } from '@kbn/ui-theme';
 import type { AttackDiscoveryStats } from '@kbn/elastic-assistant-common';
 import { AIConnector, ConnectorSelector } from '../connector_selector';
 import { Conversation } from '../../..';
-import { useLoadConnectors } from '../use_load_connectors';
-import * as i18n from '../translations';
 import { useAssistantContext } from '../../assistant_context';
 import { useConversation } from '../../assistant/use_conversation';
 import { getGenAiConfig } from '../helpers';
@@ -25,7 +23,6 @@ interface Props {
   isDisabled?: boolean;
   selectedConnectorId?: string;
   selectedConversation?: Conversation;
-  isFlyoutMode: boolean;
   onConnectorIdSelected?: (connectorId: string) => void;
   onConnectorSelected?: (conversation: Conversation) => void;
   stats?: AttackDiscoveryStats | null;
@@ -53,14 +50,6 @@ const inputDisplayClassName = css`
   text-overflow: ellipsis;
 `;
 
-const placeholderButtonClassName = css`
-  overflow: hidden;
-  text-overflow: ellipsis;
-  max-width: 400px;
-  font-weight: normal;
-  padding: 0 14px 0 0;
-`;
-
 /**
  * A compact wrapper of the ConnectorSelector component used in the Settings modal.
  */
@@ -69,29 +58,16 @@ export const ConnectorSelectorInline: React.FC<Props> = React.memo(
     isDisabled = false,
     selectedConnectorId,
     selectedConversation,
-    isFlyoutMode,
-
     onConnectorIdSelected,
     onConnectorSelected,
     stats = null,
   }) => {
     const [isOpen, setIsOpen] = useState<boolean>(false);
-    const { assistantAvailability, http } = useAssistantContext();
+    const { assistantAvailability } = useAssistantContext();
     const { setApiConfig } = useConversation();
 
-    const { data: aiConnectors } = useLoadConnectors({
-      http,
-    });
-
-    const selectedConnectorName =
-      (aiConnectors ?? []).find((c) => c.id === selectedConnectorId)?.name ??
-      i18n.INLINE_CONNECTOR_PLACEHOLDER;
     const localIsDisabled = isDisabled || !assistantAvailability.hasConnectorsReadPrivilege;
 
-    const onConnectorClick = useCallback(() => {
-      setIsOpen(!isOpen);
-    }, [isOpen]);
-
     const onChange = useCallback(
       async (connector: AIConnector) => {
         const connectorId = connector.id;
@@ -129,40 +105,6 @@ export const ConnectorSelectorInline: React.FC<Props> = React.memo(
       [selectedConversation, setApiConfig, onConnectorIdSelected, onConnectorSelected]
     );
 
-    if (isFlyoutMode) {
-      return (
-        <EuiFlexGroup
-          alignItems="center"
-          className={inputContainerClassName}
-          direction="row"
-          gutterSize="xs"
-          justifyContent={'flexStart'}
-          responsive={false}
-        >
-          <EuiFlexItem>
-            <ConnectorSelector
-              displayFancy={(displayText) => (
-                <EuiText
-                  className={inputDisplayClassName}
-                  size="s"
-                  color={euiThemeVars.euiColorPrimaryText}
-                >
-                  {displayText}
-                </EuiText>
-              )}
-              isOpen={isOpen}
-              isDisabled={localIsDisabled}
-              selectedConnectorId={selectedConnectorId}
-              setIsOpen={setIsOpen}
-              onConnectorSelectionChange={onChange}
-              isFlyoutMode={isFlyoutMode}
-              stats={stats}
-            />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      );
-    }
-
     return (
       <EuiFlexGroup
         alignItems="center"
@@ -173,36 +115,23 @@ export const ConnectorSelectorInline: React.FC<Props> = React.memo(
         responsive={false}
       >
         <EuiFlexItem>
-          {isOpen ? (
-            <ConnectorSelector
-              displayFancy={(displayText) => (
-                <EuiText className={inputDisplayClassName} size="xs">
-                  {displayText}
-                </EuiText>
-              )}
-              isOpen
-              isDisabled={localIsDisabled}
-              selectedConnectorId={selectedConnectorId}
-              setIsOpen={setIsOpen}
-              onConnectorSelectionChange={onChange}
-              isFlyoutMode={isFlyoutMode}
-              stats={stats}
-            />
-          ) : (
-            <span>
-              <EuiButtonEmpty
-                className={placeholderButtonClassName}
-                data-test-subj="connectorSelectorPlaceholderButton"
-                iconSide={'right'}
-                iconType="arrowDown"
-                isDisabled={localIsDisabled}
-                onClick={onConnectorClick}
-                size={'xs'}
+          <ConnectorSelector
+            displayFancy={(displayText) => (
+              <EuiText
+                className={inputDisplayClassName}
+                size="s"
+                color={euiThemeVars.euiColorPrimaryText}
               >
-                {selectedConnectorName}
-              </EuiButtonEmpty>
-            </span>
-          )}
+                {displayText}
+              </EuiText>
+            )}
+            isOpen={isOpen}
+            isDisabled={localIsDisabled}
+            selectedConnectorId={selectedConnectorId}
+            setIsOpen={setIsOpen}
+            onConnectorSelectionChange={onChange}
+            stats={stats}
+          />
         </EuiFlexItem>
       </EuiFlexGroup>
     );
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/helpers.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/helpers.tsx
deleted file mode 100644
index cb11ca51047f0..0000000000000
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/helpers.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Conversation } from '../../assistant_context/types';
-
-/**
- * Removes all presentation data from the conversation
- * @param conversation
- */
-export const clearPresentationData = (conversation: Conversation): Conversation => {
-  const { messages, ...restConversation } = conversation;
-  return {
-    ...restConversation,
-    messages: messages.map((message) => {
-      const { presentation, ...restMessages } = message;
-      return {
-        ...restMessages,
-        presentation: undefined,
-      };
-    }),
-  };
-};
-
-/**
- * Returns true if the conversation has no presentation data
- * @param conversation
- */
-export const conversationHasNoPresentationData = (conversation: Conversation): boolean =>
-  !conversation.messages.some((message) => message.presentation !== undefined);
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.test.tsx
index cf46b5886a389..b6eaa4578d4a0 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.test.tsx
@@ -6,19 +6,15 @@
  */
 
 import React from 'react';
-import { useConnectorSetup } from '.';
-import { act, renderHook } from '@testing-library/react-hooks';
 import { fireEvent, render } from '@testing-library/react';
 import { welcomeConvo } from '../../mock/conversation';
 import { TestProviders } from '../../mock/test_providers/test_providers';
-import { EuiCommentList } from '@elastic/eui';
+import { ConnectorSetup } from '.';
 
-const onSetupComplete = jest.fn();
 const onConversationUpdate = jest.fn();
 
 const defaultProps = {
   conversation: welcomeConvo,
-  onSetupComplete,
   onConversationUpdate,
 };
 const newConnector = { actionTypeId: '.gen-ai', name: 'cool name' };
@@ -50,121 +46,40 @@ jest.mock('../../assistant/use_conversation', () => ({
 }));
 
 jest.spyOn(global, 'clearTimeout');
-describe('useConnectorSetup', () => {
+describe('ConnectorSetup', () => {
   beforeEach(() => {
     jest.clearAllMocks();
   });
-  it('should render comments and prompts', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook(() => useConnectorSetup(defaultProps), {
-        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
-      });
-      await waitForNextUpdate();
-      expect(
-        result.current.comments.map((c) => ({ username: c.username, timestamp: c.timestamp }))
-      ).toEqual([
-        {
-          username: 'You',
-          timestamp: `at: ${new Date('2024-03-18T18:59:18.174Z').toLocaleString()}`,
-        },
-        {
-          username: 'Assistant',
-          timestamp: `at: ${new Date('2024-03-19T18:59:18.174Z').toLocaleString()}`,
-        },
-      ]);
-
-      expect(result.current.prompt.props['data-test-subj']).toEqual('prompt');
+  it('should render action type selector', async () => {
+    const { getByTestId } = render(<ConnectorSetup {...defaultProps} />, {
+      wrapper: TestProviders,
     });
+
+    expect(getByTestId('modal-mock')).toBeInTheDocument();
   });
-  it('should set api config for each conversation when new connector is saved', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook(() => useConnectorSetup(defaultProps), {
-        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
-      });
-      await waitForNextUpdate();
-      const { getByTestId, queryByTestId, rerender } = render(result.current.prompt, {
-        wrapper: TestProviders,
-      });
-      expect(getByTestId('connectorButton')).toBeInTheDocument();
-      expect(queryByTestId('skip-setup-button')).not.toBeInTheDocument();
-      fireEvent.click(getByTestId('connectorButton'));
 
-      rerender(result.current.prompt);
-      fireEvent.click(getByTestId('modal-mock'));
-      expect(setApiConfig).toHaveBeenCalledTimes(1);
+  it('should set api config for each conversation when new connector is saved', async () => {
+    const { getByTestId } = render(<ConnectorSetup {...defaultProps} />, {
+      wrapper: TestProviders,
     });
+
+    fireEvent.click(getByTestId('modal-mock'));
+    expect(setApiConfig).toHaveBeenCalledTimes(1);
   });
 
   it('should NOT set the api config for each conversation when a new connector is saved and updateConversationsOnSaveConnector is false', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook(
-        () =>
-          useConnectorSetup({
-            ...defaultProps,
-            updateConversationsOnSaveConnector: false, // <-- don't update the conversations
-          }),
-        {
-          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
-        }
-      );
-      await waitForNextUpdate();
-      const { getByTestId, queryByTestId, rerender } = render(result.current.prompt, {
+    const { getByTestId } = render(
+      <ConnectorSetup
+        {...defaultProps}
+        updateConversationsOnSaveConnector={false} // <-- don't update the conversations
+      />,
+      {
         wrapper: TestProviders,
-      });
-      expect(getByTestId('connectorButton')).toBeInTheDocument();
-      expect(queryByTestId('skip-setup-button')).not.toBeInTheDocument();
-      fireEvent.click(getByTestId('connectorButton'));
+      }
+    );
 
-      rerender(result.current.prompt);
-      fireEvent.click(getByTestId('modal-mock'));
+    fireEvent.click(getByTestId('modal-mock'));
 
-      expect(setApiConfig).not.toHaveBeenCalled();
-    });
-  });
-
-  it('should show skip button if message has presentation data', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook(
-        () =>
-          useConnectorSetup({
-            ...defaultProps,
-            conversation: {
-              ...defaultProps.conversation,
-              messages: [
-                {
-                  ...defaultProps.conversation.messages[0],
-                  presentation: {
-                    delay: 0,
-                    stream: false,
-                  },
-                },
-              ],
-            },
-          }),
-        {
-          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
-        }
-      );
-      await waitForNextUpdate();
-      const { getByTestId, queryByTestId } = render(result.current.prompt, {
-        wrapper: TestProviders,
-      });
-      expect(getByTestId('skip-setup-button')).toBeInTheDocument();
-      expect(queryByTestId('connectorButton')).not.toBeInTheDocument();
-    });
-  });
-  it('should call onSetupComplete and setConversations when onHandleMessageStreamingComplete', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderHook(() => useConnectorSetup(defaultProps), {
-        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
-      });
-      await waitForNextUpdate();
-      render(<EuiCommentList comments={result.current.comments} />, {
-        wrapper: TestProviders,
-      });
-
-      expect(clearTimeout).toHaveBeenCalled();
-      expect(onSetupComplete).toHaveBeenCalled();
-    });
+    expect(setApiConfig).not.toHaveBeenCalled();
   });
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx
index 81166bbf90fa1..a27da69709c38 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/connectorland/connector_setup/index.tsx
@@ -5,181 +5,44 @@
  * 2.0.
  */
 
-import React, { useCallback, useMemo, useRef, useState } from 'react';
-import type { EuiCommentProps } from '@elastic/eui';
-import { EuiAvatar, EuiBadge, EuiMarkdownFormat, EuiText, EuiTextAlign } from '@elastic/eui';
-import styled from '@emotion/styled';
-import { css } from '@emotion/react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { ActionConnector } from '@kbn/triggers-actions-ui-plugin/public/common/constants';
 
 import { ActionType } from '@kbn/triggers-actions-ui-plugin/public';
 import { AddConnectorModal } from '../add_connector_modal';
 import { WELCOME_CONVERSATION } from '../../assistant/use_conversation/sample_conversations';
-import { Conversation, ClientMessage } from '../../..';
+import { Conversation } from '../../..';
 import { useLoadActionTypes } from '../use_load_action_types';
-import { StreamingText } from '../../assistant/streaming_text';
-import { ConnectorButton } from '../connector_button';
 import { useConversation } from '../../assistant/use_conversation';
-import { conversationHasNoPresentationData } from './helpers';
-import * as i18n from '../translations';
 import { useAssistantContext } from '../../assistant_context';
 import { useLoadConnectors } from '../use_load_connectors';
-import { AssistantAvatar } from '../../assistant/assistant_avatar/assistant_avatar';
 import { getGenAiConfig } from '../helpers';
 
-const ConnectorButtonWrapper = styled.div`
-  margin-bottom: 10px;
-`;
-
 export interface ConnectorSetupProps {
   conversation?: Conversation;
-  isFlyoutMode?: boolean;
-  onSetupComplete?: () => void;
   onConversationUpdate?: ({ cId, cTitle }: { cId: string; cTitle: string }) => Promise<void>;
   updateConversationsOnSaveConnector?: boolean;
 }
 
-export const useConnectorSetup = ({
+export const ConnectorSetup = ({
   conversation: defaultConversation,
-  isFlyoutMode,
-  onSetupComplete,
   onConversationUpdate,
   updateConversationsOnSaveConnector = true,
-}: ConnectorSetupProps): {
-  comments: EuiCommentProps[];
-  prompt: React.ReactElement;
-} => {
+}: ConnectorSetupProps) => {
   const conversation = useMemo(
-    () =>
-      defaultConversation || {
-        ...WELCOME_CONVERSATION,
-        messages: !isFlyoutMode ? WELCOME_CONVERSATION.messages : [],
-      },
-    [defaultConversation, isFlyoutMode]
+    () => defaultConversation || WELCOME_CONVERSATION,
+    [defaultConversation]
   );
   const { setApiConfig } = useConversation();
-  const bottomRef = useRef<HTMLDivElement | null>(null);
   // Access all conversations so we can add connector to all on initial setup
   const { actionTypeRegistry, http } = useAssistantContext();
 
-  const {
-    data: connectors,
-    isSuccess: areConnectorsFetched,
-    refetch: refetchConnectors,
-  } = useLoadConnectors({ http });
-  const isConnectorConfigured = areConnectorsFetched && !!connectors?.length;
+  const { refetch: refetchConnectors } = useLoadConnectors({ http });
 
-  const [isConnectorModalVisible, setIsConnectorModalVisible] = useState<boolean>(false);
-  const [showAddConnectorButton, setShowAddConnectorButton] = useState<boolean>(() => {
-    // If no presentation data on messages, default to showing add connector button so it doesn't delay render and flash on screen
-    return conversationHasNoPresentationData(conversation);
-  });
   const { data: actionTypes } = useLoadActionTypes({ http });
 
   const [selectedActionType, setSelectedActionType] = useState<ActionType | null>(null);
 
-  const lastConversationMessageIndex = useMemo(
-    () => conversation.messages.length - 1,
-    [conversation.messages.length]
-  );
-
-  const [currentMessageIndex, setCurrentMessageIndex] = useState(
-    // If connector is configured or conversation has already been replayed show all messages immediately
-    isConnectorConfigured || conversationHasNoPresentationData(conversation)
-      ? lastConversationMessageIndex
-      : 0
-  );
-
-  const streamingTimeoutRef = useRef<number | undefined>(undefined);
-
-  // Once streaming of previous message is complete, proceed to next message
-  const onHandleMessageStreamingComplete = useCallback(() => {
-    if (currentMessageIndex === lastConversationMessageIndex) {
-      clearTimeout(streamingTimeoutRef.current);
-      return;
-    }
-    streamingTimeoutRef.current = window.setTimeout(() => {
-      bottomRef.current?.scrollIntoView({ block: 'end' });
-      return setCurrentMessageIndex(currentMessageIndex + 1);
-    }, conversation.messages[currentMessageIndex]?.presentation?.delay ?? 0);
-    return () => clearTimeout(streamingTimeoutRef.current);
-  }, [conversation.messages, currentMessageIndex, lastConversationMessageIndex]);
-
-  // Show button to add connector after last message has finished streaming
-  const onHandleLastMessageStreamingComplete = useCallback(() => {
-    setShowAddConnectorButton(true);
-    bottomRef.current?.scrollIntoView({ block: 'end' });
-    onSetupComplete?.();
-  }, [onSetupComplete]);
-
-  // Show button to add connector after last message has finished streaming
-  const handleSkipSetup = useCallback(() => {
-    setCurrentMessageIndex(lastConversationMessageIndex);
-  }, [lastConversationMessageIndex]);
-
-  // Create EuiCommentProps[] from conversation messages
-  const commentBody = useCallback(
-    (message: ClientMessage, index: number, length: number) => {
-      // If timestamp is not set, set it to current time (will update conversation at end of setup)
-      if (
-        conversation.messages[index].timestamp == null ||
-        conversation.messages[index].timestamp.length === 0
-      ) {
-        conversation.messages[index].timestamp = new Date().toISOString();
-      }
-      const isLastMessage = index === length - 1;
-      const enableStreaming =
-        (message?.presentation?.stream ?? false) && currentMessageIndex !== length - 1;
-      return (
-        <StreamingText
-          text={message.content ?? ''}
-          delay={enableStreaming ? 50 : 0}
-          onStreamingComplete={
-            isLastMessage ? onHandleLastMessageStreamingComplete : onHandleMessageStreamingComplete
-          }
-        >
-          {(streamedText, isStreamingComplete) => (
-            <EuiText>
-              <EuiMarkdownFormat className={`message-${index}`}>{streamedText}</EuiMarkdownFormat>
-              <span ref={bottomRef} />
-            </EuiText>
-          )}
-        </StreamingText>
-      );
-    },
-    [
-      conversation.messages,
-      currentMessageIndex,
-      onHandleLastMessageStreamingComplete,
-      onHandleMessageStreamingComplete,
-    ]
-  );
-
-  const comments = useMemo(
-    () =>
-      conversation.messages.slice(0, currentMessageIndex + 1).map((message, index) => {
-        const isUser = message.role === 'user';
-        const timestamp = `${i18n.CONNECTOR_SETUP_TIMESTAMP_AT}: ${new Date(
-          message.timestamp
-        ).toLocaleString()}`;
-        const commentProps: EuiCommentProps = {
-          username: isUser ? i18n.CONNECTOR_SETUP_USER_YOU : i18n.CONNECTOR_SETUP_USER_ASSISTANT,
-          children: commentBody(message, index, conversation.messages.length),
-          timelineAvatar: (
-            <EuiAvatar
-              name={i18n.CONNECTOR_SETUP_USER_ASSISTANT}
-              size="l"
-              color="subdued"
-              iconType={AssistantAvatar}
-            />
-          ),
-          timestamp,
-        };
-        return commentProps;
-      }),
-    [commentBody, conversation.messages, currentMessageIndex]
-  );
-
   const onSaveConnector = useCallback(
     async (connector: ActionConnector) => {
       if (updateConversationsOnSaveConnector) {
@@ -204,7 +67,6 @@ export const useConnectorSetup = ({
           });
 
           refetchConnectors?.();
-          setIsConnectorModalVisible(false);
         }
       } else {
         refetchConnectors?.();
@@ -221,65 +83,17 @@ export const useConnectorSetup = ({
 
   const handleClose = useCallback(() => {
     setSelectedActionType(null);
-    setIsConnectorModalVisible(false);
   }, []);
 
-  return {
-    comments: isFlyoutMode ? [] : comments,
-    prompt: isFlyoutMode ? (
-      <div data-test-subj="prompt">
-        <AddConnectorModal
-          actionTypeRegistry={actionTypeRegistry}
-          actionTypes={actionTypes}
-          onClose={handleClose}
-          onSaveConnector={onSaveConnector}
-          onSelectActionType={setSelectedActionType}
-          selectedActionType={selectedActionType}
-          actionTypeSelectorInline={true}
-        />
-      </div>
-    ) : (
-      <div data-test-subj="prompt">
-        {showAddConnectorButton && (
-          <ConnectorButtonWrapper>
-            <ConnectorButton setIsConnectorModalVisible={setIsConnectorModalVisible} />
-          </ConnectorButtonWrapper>
-        )}
-        {!showAddConnectorButton && (
-          <EuiText
-            color="subdued"
-            size={'xs'}
-            css={
-              !isFlyoutMode
-                ? css`
-                    margin-top: 20px;
-                  `
-                : null
-            }
-          >
-            <EuiTextAlign textAlign="center">
-              <EuiBadge
-                color="hollow"
-                data-test-subj="skip-setup-button"
-                onClick={handleSkipSetup}
-                onClickAriaLabel={i18n.CONNECTOR_SETUP_SKIP}
-              >
-                {i18n.CONNECTOR_SETUP_SKIP}
-              </EuiBadge>
-            </EuiTextAlign>
-          </EuiText>
-        )}
-        {isConnectorModalVisible && (
-          <AddConnectorModal
-            actionTypeRegistry={actionTypeRegistry}
-            actionTypes={actionTypes}
-            onClose={handleClose}
-            onSaveConnector={onSaveConnector}
-            onSelectActionType={setSelectedActionType}
-            selectedActionType={selectedActionType}
-          />
-        )}
-      </div>
-    ),
-  };
+  return (
+    <AddConnectorModal
+      actionTypeRegistry={actionTypeRegistry}
+      actionTypes={actionTypes}
+      onClose={handleClose}
+      onSaveConnector={onSaveConnector}
+      onSelectActionType={setSelectedActionType}
+      selectedActionType={selectedActionType}
+      actionTypeSelectorInline={true}
+    />
+  );
 };
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts b/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
index 387c1d01422f6..3324d09b50a5a 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
+++ b/x-pack/packages/kbn-elastic-assistant/impl/content/prompts/welcome/translations.ts
@@ -7,30 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const WELCOME_GENERAL = i18n.translate(
-  'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneralPrompt',
-  {
-    defaultMessage:
-      'Welcome to your Elastic AI Assistant! I am your 100% open-code portal into your Elastic life. In time, I will be able to answer questions and provide assistance across all your information in Elastic, and oh-so much more. Till then, I hope this early preview will open your mind to the possibilities of what we can create when we work together, in the open. Cheers!',
-  }
-);
-
-export const WELCOME_GENERAL_2 = i18n.translate(
-  'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt',
-  {
-    defaultMessage:
-      "First things first, we'll need to set up a Generative AI Connector to get this chat experience going! With the Generative AI Connector, you'll be able to configure access to either an OpenAI service or an Amazon Bedrock service, but you better believe you'll be able to deploy your own models within your Elastic Cloud instance and use those here in the future... 😉",
-  }
-);
-
-export const WELCOME_GENERAL_3 = i18n.translate(
-  'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral3Prompt',
-  {
-    defaultMessage:
-      'Go ahead and click the add connector button below to continue the conversation!',
-  }
-);
-
 export const ENTERPRISE = i18n.translate(
   'xpack.elasticAssistant.securityAssistant.content.prompts.welcome.enterprisePrompt',
   {
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/context_preview.tsx b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/context_preview.tsx
index 91b676c491e47..49d5d0fe4d63d 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/context_preview.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/context_preview.tsx
@@ -48,6 +48,7 @@ const SelectedPromptContextPreviewComponent = ({
 
   return (
     <EuiText
+      data-test-subj="selectedPromptContextPreview"
       color="subdued"
       size="xs"
       css={css`
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.test.tsx b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.test.tsx
index 52bb444bcc038..0ffbee7a56ca3 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.test.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.test.tsx
@@ -7,7 +7,6 @@
 
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
 
 import { SelectedPromptContext } from '../assistant/prompt_context/types';
 import { TestProviders } from '../mock/test_providers/test_providers';
@@ -38,21 +37,6 @@ describe('DataAnonymizationEditor', () => {
     rawData: 'test-raw-data',
   };
 
-  it('renders stats', () => {
-    render(
-      <TestProviders>
-        <DataAnonymizationEditor
-          selectedPromptContext={mockSelectedPromptContext}
-          setSelectedPromptContexts={jest.fn()}
-          currentReplacements={{}}
-          isFlyoutMode={false}
-        />
-      </TestProviders>
-    );
-
-    expect(screen.getByTestId('stats')).toBeInTheDocument();
-  });
-
   describe('when rawData is a string (non-anonymized data)', () => {
     it('renders the ReadOnlyContextViewer when rawData is (non-anonymized data)', () => {
       render(
@@ -61,7 +45,6 @@ describe('DataAnonymizationEditor', () => {
             selectedPromptContext={mockSelectedPromptContext}
             setSelectedPromptContexts={jest.fn()}
             currentReplacements={{}}
-            isFlyoutMode={false}
           />
         </TestProviders>
       );
@@ -76,7 +59,6 @@ describe('DataAnonymizationEditor', () => {
             selectedPromptContext={mockSelectedPromptContext}
             setSelectedPromptContexts={jest.fn()}
             currentReplacements={{}}
-            isFlyoutMode={false}
           />
         </TestProviders>
       );
@@ -105,24 +87,17 @@ describe('DataAnonymizationEditor', () => {
             selectedPromptContext={selectedPromptContextWithAnonymized}
             setSelectedPromptContexts={setSelectedPromptContexts}
             currentReplacements={{}}
-            isFlyoutMode={false}
           />
         </TestProviders>
       );
     });
 
-    it('renders the ContextEditor when rawData is anonymized data', () => {
-      expect(screen.getByTestId('contextEditor')).toBeInTheDocument();
+    it('renders the SelectedPromptContextPreview when rawData is anonymized data', () => {
+      expect(screen.getByTestId('selectedPromptContextPreview')).toBeInTheDocument();
     });
 
     it('does NOT render the ReadOnlyContextViewer when rawData is anonymized data', () => {
       expect(screen.queryByTestId('readOnlyContextViewer')).not.toBeInTheDocument();
     });
-
-    it('calls setSelectedPromptContexts when a field is toggled', () => {
-      userEvent.click(screen.getAllByTestId('allowed')[0]); // toggle the first field
-
-      expect(setSelectedPromptContexts).toBeCalled();
-    });
   });
 });
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.tsx
index 1fd0e31c78767..0794ca4330350 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.tsx
+++ b/x-pack/packages/kbn-elastic-assistant/impl/data_anonymization_editor/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiPanel, EuiSpacer } from '@elastic/eui';
+import { EuiPanel } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
 import styled from '@emotion/styled';
 import { AnonymizedData } from '@kbn/elastic-assistant-common/impl/data_anonymization/types';
@@ -14,9 +14,7 @@ import { BatchUpdateListItem } from './context_editor/types';
 import { getIsDataAnonymizable, updateSelectedPromptContext } from './helpers';
 import { ReadOnlyContextViewer } from './read_only_context_viewer';
 import { ContextEditorFlyout } from './context_editor_flyout';
-import { ContextEditor } from './context_editor';
 import { ReplacementsContextViewer } from './replacements_context_viewer';
-import { Stats } from './stats';
 
 const EditorContainer = styled.div`
   overflow-x: auto;
@@ -28,14 +26,12 @@ export interface Props {
     React.SetStateAction<Record<string, SelectedPromptContext>>
   >;
   currentReplacements: AnonymizedData['replacements'] | undefined;
-  isFlyoutMode: boolean;
 }
 
 const DataAnonymizationEditorComponent: React.FC<Props> = ({
   selectedPromptContext,
   setSelectedPromptContexts,
   currentReplacements,
-  isFlyoutMode,
 }) => {
   const isDataAnonymizable = useMemo<boolean>(
     () => getIsDataAnonymizable(selectedPromptContext.rawData),
@@ -63,66 +59,27 @@ const DataAnonymizationEditorComponent: React.FC<Props> = ({
     [selectedPromptContext, setSelectedPromptContexts]
   );
 
-  if (isFlyoutMode) {
-    return (
-      <EditorContainer data-test-subj="dataAnonymizationEditor">
-        <EuiPanel hasShadow={false} paddingSize="m">
-          {typeof selectedPromptContext.rawData === 'string' ? (
-            selectedPromptContext.replacements != null ? (
-              <ReplacementsContextViewer
-                markdown={selectedPromptContext.rawData}
-                replacements={selectedPromptContext.replacements}
-              />
-            ) : (
-              <ReadOnlyContextViewer rawData={selectedPromptContext.rawData} />
-            )
-          ) : (
-            <ContextEditorFlyout
-              selectedPromptContext={selectedPromptContext}
-              onListUpdated={onListUpdated}
-              currentReplacements={currentReplacements}
-              isDataAnonymizable={isDataAnonymizable}
-            />
-          )}
-        </EuiPanel>
-      </EditorContainer>
-    );
-  }
-
   return (
     <EditorContainer data-test-subj="dataAnonymizationEditor">
-      <Stats
-        isDataAnonymizable={isDataAnonymizable}
-        anonymizationFields={selectedPromptContext.contextAnonymizationFields?.data}
-        rawData={selectedPromptContext.rawData}
-        replacements={selectedPromptContext.replacements}
-      />
-
-      <EuiSpacer size="s" />
-
-      {typeof selectedPromptContext.rawData === 'string' ? (
-        selectedPromptContext.replacements != null ? (
-          <ReplacementsContextViewer
-            markdown={selectedPromptContext.rawData}
-            replacements={selectedPromptContext.replacements}
-          />
+      <EuiPanel hasShadow={false} paddingSize="m">
+        {typeof selectedPromptContext.rawData === 'string' ? (
+          selectedPromptContext.replacements != null ? (
+            <ReplacementsContextViewer
+              markdown={selectedPromptContext.rawData}
+              replacements={selectedPromptContext.replacements}
+            />
+          ) : (
+            <ReadOnlyContextViewer rawData={selectedPromptContext.rawData} />
+          )
         ) : (
-          <ReadOnlyContextViewer rawData={selectedPromptContext.rawData} />
-        )
-      ) : (
-        <ContextEditor
-          anonymizationFields={
-            selectedPromptContext.contextAnonymizationFields ?? {
-              total: 0,
-              page: 1,
-              perPage: 1000,
-              data: [],
-            }
-          }
-          onListUpdated={onListUpdated}
-          rawData={selectedPromptContext.rawData}
-        />
-      )}
+          <ContextEditorFlyout
+            selectedPromptContext={selectedPromptContext}
+            onListUpdated={onListUpdated}
+            currentReplacements={currentReplacements}
+            isDataAnonymizable={isDataAnonymizable}
+          />
+        )}
+      </EuiPanel>
     </EditorContainer>
   );
 };
diff --git a/x-pack/packages/kbn-elastic-assistant/impl/mock/get_anonymized_value/index.ts b/x-pack/packages/kbn-elastic-assistant/impl/mock/get_anonymized_value/index.ts
index a6d5c4e5d3972..256f9776c4563 100644
--- a/x-pack/packages/kbn-elastic-assistant/impl/mock/get_anonymized_value/index.ts
+++ b/x-pack/packages/kbn-elastic-assistant/impl/mock/get_anonymized_value/index.ts
@@ -5,13 +5,6 @@
  * 2.0.
  */
 
-import { Replacements } from '@kbn/elastic-assistant-common';
-
 /** This mock returns the reverse of `value` */
-export const mockGetAnonymizedValue = ({
-  currentReplacements,
-  rawValue,
-}: {
-  currentReplacements: Replacements | undefined;
-  rawValue: string;
-}): string => rawValue.split('').reverse().join('');
+export const mockGetAnonymizedValue = ({ rawValue }: { rawValue: string }): string =>
+  rawValue.split('').reverse().join('');
diff --git a/x-pack/packages/kbn-entities-schema/src/schema/common.ts b/x-pack/packages/kbn-entities-schema/src/schema/common.ts
index b0d4b7247d12c..bb9d07b1957f4 100644
--- a/x-pack/packages/kbn-entities-schema/src/schema/common.ts
+++ b/x-pack/packages/kbn-entities-schema/src/schema/common.ts
@@ -96,3 +96,9 @@ export const identityFieldsSchema = z
     optional: z.boolean(),
   })
   .or(z.string().transform((value) => ({ field: value, optional: false })));
+
+const semVerRegex = new RegExp(/^[0-9]{1,}\.[0-9]{1,}\.[0-9]{1,}$/);
+export const semVerSchema = z.string().refine((maybeSemVer) => semVerRegex.test(maybeSemVer), {
+  message:
+    'The string does use the Semantic Versioning (Semver) format of {major}.{minor}.{patch} (e.g., 1.0.0), ensure each part contains only digits.',
+});
diff --git a/x-pack/packages/kbn-entities-schema/src/schema/entity.ts b/x-pack/packages/kbn-entities-schema/src/schema/entity.ts
index 8e5c411c2489e..58a9c011091b4 100644
--- a/x-pack/packages/kbn-entities-schema/src/schema/entity.ts
+++ b/x-pack/packages/kbn-entities-schema/src/schema/entity.ts
@@ -13,7 +13,6 @@ const entitySchema = z.object({
     id: z.string(),
     identityFields: arrayOfStringsSchema,
     displayName: z.string(),
-    spaceId: z.string(),
     metrics: z.record(z.string(), z.number()),
   }),
 });
diff --git a/x-pack/packages/kbn-entities-schema/src/schema/entity_definition.ts b/x-pack/packages/kbn-entities-schema/src/schema/entity_definition.ts
index 15f3e98582c97..8fee16117b9c6 100644
--- a/x-pack/packages/kbn-entities-schema/src/schema/entity_definition.ts
+++ b/x-pack/packages/kbn-entities-schema/src/schema/entity_definition.ts
@@ -13,10 +13,12 @@ import {
   filterSchema,
   durationSchema,
   identityFieldsSchema,
+  semVerSchema,
 } from './common';
 
 export const entityDefinitionSchema = z.object({
   id: z.string().regex(/^[\w-]+$/),
+  version: semVerSchema,
   name: z.string(),
   description: z.optional(z.string()),
   type: z.string(),
diff --git a/x-pack/packages/kbn-langchain/server/language_models/chat_openai.ts b/x-pack/packages/kbn-langchain/server/language_models/chat_openai.ts
index 391609db21565..c20de3be57e07 100644
--- a/x-pack/packages/kbn-langchain/server/language_models/chat_openai.ts
+++ b/x-pack/packages/kbn-langchain/server/language_models/chat_openai.ts
@@ -138,9 +138,10 @@ export class ActionsClientChatOpenAI extends ChatOpenAI {
     return this.caller.call(async () => {
       const requestBody = this.formatRequestForActionsClient(completionRequest);
       this.#logger.debug(
-        `${LLM_TYPE}#completionWithRetry ${this.#traceId} assistantMessage:\n${JSON.stringify(
-          requestBody.params.subActionParams
-        )} `
+        () =>
+          `${LLM_TYPE}#completionWithRetry ${this.#traceId} assistantMessage:\n${JSON.stringify(
+            requestBody.params.subActionParams
+          )} `
       );
 
       const actionResult = await this.#actionsClient.execute(requestBody);
diff --git a/x-pack/packages/kbn-langchain/server/language_models/llm.ts b/x-pack/packages/kbn-langchain/server/language_models/llm.ts
index bad538821ff1d..8ebf62e8c31f0 100644
--- a/x-pack/packages/kbn-langchain/server/language_models/llm.ts
+++ b/x-pack/packages/kbn-langchain/server/language_models/llm.ts
@@ -84,9 +84,10 @@ export class ActionsClientLlm extends LLM {
     // convert the Langchain prompt to an assistant message:
     const assistantMessage = getMessageContentAndRole(prompt);
     this.#logger.debug(
-      `ActionsClientLlm#_call\ntraceId: ${this.#traceId}\nassistantMessage:\n${JSON.stringify(
-        assistantMessage
-      )} `
+      () =>
+        `ActionsClientLlm#_call\ntraceId: ${this.#traceId}\nassistantMessage:\n${JSON.stringify(
+          assistantMessage
+        )} `
     );
     // create a new connector request body with the assistant message:
     const requestBody = {
diff --git a/x-pack/packages/kbn-langchain/server/language_models/simple_chat_model.ts b/x-pack/packages/kbn-langchain/server/language_models/simple_chat_model.ts
index ed38723993876..4bd77919d9fce 100644
--- a/x-pack/packages/kbn-langchain/server/language_models/simple_chat_model.ts
+++ b/x-pack/packages/kbn-langchain/server/language_models/simple_chat_model.ts
@@ -102,9 +102,10 @@ export class ActionsClientSimpleChatModel extends SimpleChatModel {
       formattedMessages.push(getMessageContentAndRole(message.content, message._getType()));
     });
     this.#logger.debug(
-      `ActionsClientSimpleChatModel#_call\ntraceId: ${
-        this.#traceId
-      }\nassistantMessage:\n${JSON.stringify(formattedMessages)} `
+      () =>
+        `ActionsClientSimpleChatModel#_call\ntraceId: ${
+          this.#traceId
+        }\nassistantMessage:\n${JSON.stringify(formattedMessages)} `
     );
     // create a new connector request body with the assistant message:
     const requestBody = {
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/README.mdx b/x-pack/packages/kbn-langchain/server/tracers/README.mdx
similarity index 100%
rename from x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/README.mdx
rename to x-pack/packages/kbn-langchain/server/tracers/README.mdx
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/apm_tracer.ts b/x-pack/packages/kbn-langchain/server/tracers/apm/apm_tracer.ts
similarity index 80%
rename from x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/apm_tracer.ts
rename to x-pack/packages/kbn-langchain/server/tracers/apm/apm_tracer.ts
index ba4baef0433ad..b0843c1c50d8d 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/apm_tracer.ts
+++ b/x-pack/packages/kbn-langchain/server/tracers/apm/apm_tracer.ts
@@ -77,12 +77,12 @@ export class APMTracer extends BaseTracer implements LangChainTracerFields {
   }
 
   async onRetrieverStart(run: Run): Promise<void> {
-    this.logger.debug(`onRetrieverStart: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onRetrieverStart: run:\n${JSON.stringify(run, null, 2)}`);
     this.createAndAddSpanFromRun(run, this.retrieverSpans);
   }
 
   async onRetrieverEnd(run: Run): Promise<void> {
-    this.logger.debug(`onRetrieverEnd: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onRetrieverEnd: run:\n${JSON.stringify(run, null, 2)}`);
     const span = this.retrieverSpans.pop();
     if (span != null) {
       span.addLabels(this._getLabelsFromRun(run));
@@ -91,16 +91,16 @@ export class APMTracer extends BaseTracer implements LangChainTracerFields {
   }
 
   async onRetrieverError(run: Run): Promise<void> {
-    this.logger.debug(`onRetrieverError: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onRetrieverError: run:\n${JSON.stringify(run, null, 2)}`);
   }
 
   async onLLMStart(run: Run): Promise<void> {
-    this.logger.debug(`onLLMStart: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onLLMStart: run:\n${JSON.stringify(run, null, 2)}`);
     this.createAndAddSpanFromRun(run, this.llmSpans);
   }
 
   async onLLMEnd(run: Run): Promise<void> {
-    this.logger.debug(`onLLMEnd: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onLLMEnd: run:\n${JSON.stringify(run, null, 2)}`);
     const span = this.llmSpans.pop();
     if (span != null) {
       span.addLabels(this._getLabelsFromRun(run));
@@ -109,16 +109,16 @@ export class APMTracer extends BaseTracer implements LangChainTracerFields {
   }
 
   async onLLMError(run: Run): Promise<void> {
-    this.logger.debug(`onLLMError: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onLLMError: run:\n${JSON.stringify(run, null, 2)}`);
   }
 
   async onChainStart(run: Run): Promise<void> {
-    this.logger.debug(`onChainStart: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onChainStart: run:\n${JSON.stringify(run, null, 2)}`);
     this.createAndAddSpanFromRun(run, this.chainSpans);
   }
 
   async onChainEnd(run: Run): Promise<void> {
-    this.logger.debug(`onChainEnd: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onChainEnd: run:\n${JSON.stringify(run, null, 2)}`);
     const span = this.chainSpans.pop();
     if (span != null) {
       span.addLabels(this._getLabelsFromRun(run));
@@ -127,16 +127,16 @@ export class APMTracer extends BaseTracer implements LangChainTracerFields {
   }
 
   async onChainError(run: Run): Promise<void> {
-    this.logger.debug(`onChainError: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onChainError: run:\n${JSON.stringify(run, null, 2)}`);
   }
 
   async onToolStart(run: Run): Promise<void> {
-    this.logger.debug(`onToolStart: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onToolStart: run:\n${JSON.stringify(run, null, 2)}`);
     this.createAndAddSpanFromRun(run, this.toolSpans);
   }
 
   async onToolEnd(run: Run): Promise<void> {
-    this.logger.debug(`onToolEnd: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onToolEnd: run:\n${JSON.stringify(run, null, 2)}`);
     const span = this.toolSpans.pop();
     if (span != null) {
       span.addLabels(this._getLabelsFromRun(run));
@@ -145,6 +145,6 @@ export class APMTracer extends BaseTracer implements LangChainTracerFields {
   }
 
   async onToolError(run: Run): Promise<void> {
-    this.logger.debug(`onToolError: run:\n${JSON.stringify(run, null, 2)}`);
+    this.logger.debug(() => `onToolError: run:\n${JSON.stringify(run, null, 2)}`);
   }
 }
diff --git a/x-pack/packages/kbn-langchain/server/tracers/apm/index.ts b/x-pack/packages/kbn-langchain/server/tracers/apm/index.ts
new file mode 100644
index 0000000000000..293db467d740b
--- /dev/null
+++ b/x-pack/packages/kbn-langchain/server/tracers/apm/index.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { APMTracer } from './apm_tracer';
diff --git a/x-pack/packages/kbn-langchain/server/tracers/langsmith/index.ts b/x-pack/packages/kbn-langchain/server/tracers/langsmith/index.ts
new file mode 100644
index 0000000000000..179a5aa297c7e
--- /dev/null
+++ b/x-pack/packages/kbn-langchain/server/tracers/langsmith/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export { getLangSmithTracer, isLangSmithEnabled } from './langsmith_tracer';
diff --git a/x-pack/packages/kbn-langchain/server/tracers/langsmith/langsmith_tracer.ts b/x-pack/packages/kbn-langchain/server/tracers/langsmith/langsmith_tracer.ts
new file mode 100644
index 0000000000000..15501d22dbe09
--- /dev/null
+++ b/x-pack/packages/kbn-langchain/server/tracers/langsmith/langsmith_tracer.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Client } from 'langsmith';
+import type { Logger } from '@kbn/core/server';
+import { ToolingLog } from '@kbn/tooling-log';
+import { LangChainTracer } from '@langchain/core/tracers/tracer_langchain';
+
+/**
+ * Returns a custom LangChainTracer which adds the `exampleId` so Dataset 'Test' runs are written to LangSmith
+ * If `exampleId` is present (and a corresponding example exists in LangSmith) trace is written to the Dataset's `Tests`
+ * section, otherwise it is written to the `Project` provided
+ *
+ * @param apiKey API Key for LangSmith (will fetch from env vars if not provided)
+ * @param projectName Name of project to trace results to
+ * @param exampleId Dataset exampleId to associate trace with
+ * @param logger
+ */
+export const getLangSmithTracer = ({
+  apiKey,
+  projectName,
+  exampleId,
+  logger,
+}: {
+  apiKey?: string;
+  projectName?: string;
+  exampleId?: string;
+  logger: Logger | ToolingLog;
+}): LangChainTracer[] => {
+  try {
+    if (!isLangSmithEnabled() || apiKey == null) {
+      return [];
+    }
+    const lcTracer = new LangChainTracer({
+      projectName, // Shows as the 'test' run's 'name' in langsmith ui
+      exampleId,
+      client: new Client({ apiKey }),
+    });
+
+    return [lcTracer];
+  } catch (e) {
+    // Note: creating a tracer can fail if the LangSmith env vars are not set correctly
+    logger.error(`Error creating LangSmith tracer: ${e.message}`);
+  }
+
+  return [];
+};
+
+/**
+ * Returns true if LangSmith/tracing is enabled
+ */
+export const isLangSmithEnabled = (): boolean => {
+  try {
+    // Just checking if apiKey is available, if better way to check for enabled that is not env var please update
+    const config = Client.getDefaultClientConfig();
+    return config.apiKey != null;
+  } catch (e) {
+    return false;
+  }
+};
diff --git a/x-pack/packages/kbn-langchain/tsconfig.json b/x-pack/packages/kbn-langchain/tsconfig.json
index 949aca47794ec..e775b1a4ad50d 100644
--- a/x-pack/packages/kbn-langchain/tsconfig.json
+++ b/x-pack/packages/kbn-langchain/tsconfig.json
@@ -18,6 +18,7 @@
     "@kbn/logging",
     "@kbn/actions-plugin",
     "@kbn/logging-mocks",
-    "@kbn/utility-types"
+    "@kbn/utility-types",
+    "@kbn/tooling-log"
   ]
 }
diff --git a/x-pack/packages/ml/agg_utils/index.ts b/x-pack/packages/ml/agg_utils/index.ts
index 2102522bea636..049623ffddb38 100644
--- a/x-pack/packages/ml/agg_utils/index.ts
+++ b/x-pack/packages/ml/agg_utils/index.ts
@@ -6,7 +6,7 @@
  */
 
 export { buildSamplerAggregation } from './src/build_sampler_aggregation';
-export { fetchAggIntervals } from './src/fetch_agg_intervals';
+export { fetchAggIntervals, type FetchAggIntervalsParams } from './src/fetch_agg_intervals';
 export { fetchHistogramsForFields } from './src/fetch_histograms_for_fields';
 export { DEFAULT_SAMPLER_SHARD_SIZE } from './src/field_histograms';
 export { getSamplerAggregationsResponsePath } from './src/get_sampler_aggregations_response_path';
diff --git a/x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts b/x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts
index 14dd0b850abef..f10977073f9bf 100644
--- a/x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts
+++ b/x-pack/packages/ml/agg_utils/src/fetch_agg_intervals.ts
@@ -22,30 +22,51 @@ import type { HistogramField, NumericColumnStatsMap } from './types';
 const MAX_CHART_COLUMNS = 20;
 
 /**
- * Returns aggregation intervals for the supplied document fields.
+ * Interface for the parameters required to fetch aggregation intervals.
+ */
+export interface FetchAggIntervalsParams {
+  /** The Elasticsearch client to use for the query. */
+  esClient: ElasticsearchClient;
+  /** An optional abort signal to cancel the request. */
+  abortSignal?: AbortSignal;
+  /** The arguments for the aggregation query. */
+  arguments: {
+    /** The index pattern to query against. */
+    indexPattern: string;
+    /** The query to filter documents. */
+    query: estypes.QueryDslQueryContainer;
+    /** The fields to aggregate on. */
+    fields: HistogramField[];
+    /** The size of the sampler shard. */
+    samplerShardSize: number;
+    /** Optional runtime mappings for the query. */
+    runtimeMappings?: estypes.MappingRuntimeFields;
+    /** Optional probability for random sampling. */
+    randomSamplerProbability?: number;
+    /** Optional seed for random sampling. */
+    randomSamplerSeed?: number;
+  };
+}
+/**
+ * Asynchronously fetches aggregation intervals from an Elasticsearch client.
  *
- * @param client - The Elasticsearch client.
- * @param indexPattern - The index pattern to search.
- * @param query - The query to filter documents.
- * @param fields - An array of field definitions for which aggregation intervals are requested.
- * @param samplerShardSize - The shard size parameter for sampling aggregations. A value less than 1 indicates no sampling.
- * @param runtimeMappings - Optional runtime mappings to apply.
- * @param abortSignal - Optional AbortSignal for canceling the request.
- * @param randomSamplerProbability - Optional probability value for random sampling.
- * @param randomSamplerSeed - Optional seed value for random sampling.
- * @returns A promise that resolves to a map of aggregation intervals for the specified fields.
+ * @param params - The parameters for fetching aggregation intervals.
+ * @returns A promise that resolves to a map of numeric column statistics.
  */
 export const fetchAggIntervals = async (
-  client: ElasticsearchClient,
-  indexPattern: string,
-  query: estypes.QueryDslQueryContainer,
-  fields: HistogramField[],
-  samplerShardSize: number,
-  runtimeMappings?: estypes.MappingRuntimeFields,
-  abortSignal?: AbortSignal,
-  randomSamplerProbability?: number,
-  randomSamplerSeed?: number
+  params: FetchAggIntervalsParams
 ): Promise<NumericColumnStatsMap> => {
+  const { esClient, abortSignal, arguments: args } = params;
+  const {
+    indexPattern,
+    query,
+    fields,
+    samplerShardSize,
+    runtimeMappings,
+    randomSamplerProbability,
+    randomSamplerSeed,
+  } = args;
+
   if (
     samplerShardSize >= 1 &&
     randomSamplerProbability !== undefined &&
@@ -77,7 +98,7 @@ export const fetchAggIntervals = async (
     seed: randomSamplerSeed,
   });
 
-  const body = await client.search(
+  const body = await esClient.search(
     {
       index: indexPattern,
       size: 0,
diff --git a/x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts b/x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts
index c6f1d6c5e0166..f74ebbaac3994 100644
--- a/x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts
+++ b/x-pack/packages/ml/agg_utils/src/fetch_histograms_for_fields.ts
@@ -167,32 +167,48 @@ export type FieldsForHistograms = Array<
   | UnsupportedHistogramField
 >;
 
+interface FetchHistogramsForFieldsParams {
+  /** The Elasticsearch client to use for the query. */
+  esClient: ElasticsearchClient;
+  /** An optional abort signal to cancel the request. */
+  abortSignal?: AbortSignal;
+  /** The arguments for the aggregation query. */
+  arguments: {
+    /** The index pattern to query against. */
+    indexPattern: string;
+    /** The query to filter documents. */
+    query: any;
+    /** The fields for which histograms are to be fetched. */
+    fields: FieldsForHistograms;
+    /** The size of the sampler shard. */
+    samplerShardSize: number;
+    /** Optional runtime mappings for the query. */
+    runtimeMappings?: estypes.MappingRuntimeFields;
+    /** Optional probability for random sampling. */
+    randomSamplerProbability?: number;
+    /** Optional seed for random sampling. */
+    randomSamplerSeed?: number;
+  };
+}
+
 /**
- * Fetches data to be used in mini histogram charts. Supports auto-identifying
- * the histogram interval and min/max values.
+ * Asynchronously fetches histograms for specified fields from an Elasticsearch client.
  *
- * @param client Elasticsearch Client
- * @param indexPattern index pattern to be queried
- * @param query Elasticsearch query
- * @param fields the fields the histograms should be generated for
- * @param samplerShardSize shard_size parameter of the sampler aggregation
- * @param runtimeMappings optional runtime mappings
- * @param abortSignal optional abort signal
- * @param randomSamplerProbability optional random sampler probability
- * @param randomSamplerSeed optional random sampler seed
- * @returns an array of histogram data for each supplied field
+ * @param params The parameters for fetching histograms.
+ * @returns A promise that resolves with the fetched histograms.
  */
-export const fetchHistogramsForFields = async (
-  client: ElasticsearchClient,
-  indexPattern: string,
-  query: any,
-  fields: FieldsForHistograms,
-  samplerShardSize: number,
-  runtimeMappings?: estypes.MappingRuntimeFields,
-  abortSignal?: AbortSignal,
-  randomSamplerProbability?: number,
-  randomSamplerSeed?: number
-) => {
+export const fetchHistogramsForFields = async (params: FetchHistogramsForFieldsParams) => {
+  const { esClient, abortSignal, arguments: args } = params;
+  const {
+    indexPattern,
+    query,
+    fields,
+    samplerShardSize,
+    runtimeMappings,
+    randomSamplerProbability,
+    randomSamplerSeed,
+  } = args;
+
   if (
     samplerShardSize >= 1 &&
     randomSamplerProbability !== undefined &&
@@ -202,17 +218,19 @@ export const fetchHistogramsForFields = async (
   }
 
   const aggIntervals = {
-    ...(await fetchAggIntervals(
-      client,
-      indexPattern,
-      query,
-      fields.filter((f) => !isNumericHistogramFieldWithColumnStats(f)),
-      samplerShardSize,
-      runtimeMappings,
+    ...(await fetchAggIntervals({
+      esClient,
       abortSignal,
-      randomSamplerProbability,
-      randomSamplerSeed
-    )),
+      arguments: {
+        indexPattern,
+        query,
+        fields: fields.filter((f) => !isNumericHistogramFieldWithColumnStats(f)),
+        samplerShardSize,
+        runtimeMappings,
+        randomSamplerProbability,
+        randomSamplerSeed,
+      },
+    })),
     ...fields.filter(isNumericHistogramFieldWithColumnStats).reduce((p, field) => {
       const { interval, min, max, fieldName } = field;
       p[stringHash(fieldName)] = { interval, min, max };
@@ -259,7 +277,7 @@ export const fetchHistogramsForFields = async (
     seed: randomSamplerSeed,
   });
 
-  const body = await client.search(
+  const body = await esClient.search(
     {
       index: indexPattern,
       size: 0,
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_categories.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_categories.ts
index 99300b2bef2e6..56f2b57f2fee8 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_categories.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_categories.ts
@@ -97,10 +97,10 @@ export const fetchCategories = async (
   esClient: ElasticsearchClient,
   params: AiopsLogRateAnalysisSchema,
   fieldNames: string[],
-  logger: Logger,
+  logger?: Logger,
   // The default value of 1 means no sampling will be used
   sampleProbability: number = 1,
-  emitError: (m: string) => void,
+  emitError?: (m: string) => void,
   abortSignal?: AbortSignal
 ): Promise<FetchCategoriesResponse[]> => {
   const randomSamplerWrapper = createRandomSamplerWrapper({
@@ -122,14 +122,19 @@ export const fetchCategories = async (
 
   function reportError(fieldName: string, error: unknown) {
     if (!isRequestAbortedError(error)) {
-      logger.error(
-        `Failed to fetch category aggregation for fieldName "${fieldName}", got: \n${JSON.stringify(
-          error,
-          null,
-          2
-        )}`
-      );
-      emitError(`Failed to fetch category aggregation for fieldName "${fieldName}".`);
+      if (logger) {
+        logger.error(
+          `Failed to fetch category aggregation for fieldName "${fieldName}", got: \n${JSON.stringify(
+            error,
+            null,
+            2
+          )}`
+        );
+      }
+
+      if (emitError) {
+        emitError(`Failed to fetch category aggregation for fieldName "${fieldName}".`);
+      }
     }
   }
 
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_category_counts.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_category_counts.ts
index 93018370a54ff..0879e5de7aeff 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_category_counts.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_category_counts.ts
@@ -75,8 +75,8 @@ export const fetchCategoryCounts = async (
   categories: FetchCategoriesResponse,
   from: number | undefined,
   to: number | undefined,
-  logger: Logger,
-  emitError: (m: string) => void,
+  logger?: Logger,
+  emitError?: (m: string) => void,
   abortSignal?: AbortSignal
 ): Promise<FetchCategoriesResponse> => {
   const updatedCategories = cloneDeep(categories);
@@ -101,14 +101,19 @@ export const fetchCategoryCounts = async (
     );
   } catch (error) {
     if (!isRequestAbortedError(error)) {
-      logger.error(
-        `Failed to fetch category counts for field name "${fieldName}", got: \n${JSON.stringify(
-          error,
-          null,
-          2
-        )}`
-      );
-      emitError(`Failed to fetch category counts for field name "${fieldName}".`);
+      if (logger) {
+        logger.error(
+          `Failed to fetch category counts for field name "${fieldName}", got: \n${JSON.stringify(
+            error,
+            null,
+            2
+          )}`
+        );
+      }
+
+      if (emitError) {
+        emitError(`Failed to fetch category counts for field name "${fieldName}".`);
+      }
     }
     return updatedCategories;
   }
@@ -118,14 +123,19 @@ export const fetchCategoryCounts = async (
       updatedCategories.categories[index].count =
         (resp.hits.total as estypes.SearchTotalHits).value ?? 0;
     } else {
-      logger.error(
-        `Failed to fetch category count for category "${
-          updatedCategories.categories[index].key
-        }", got: \n${JSON.stringify(resp, null, 2)}`
-      );
-      emitError(
-        `Failed to fetch category count for category "${updatedCategories.categories[index].key}".`
-      );
+      if (logger) {
+        logger.error(
+          `Failed to fetch category count for category "${
+            updatedCategories.categories[index].key
+          }", got: \n${JSON.stringify(resp, null, 2)}`
+        );
+      }
+
+      if (emitError) {
+        emitError(
+          `Failed to fetch category count for category "${updatedCategories.categories[index].key}".`
+        );
+      }
     }
   }
 
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_frequent_item_sets.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_frequent_item_sets.ts
index bf3607ce23736..34c34482ccf7c 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_frequent_item_sets.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_frequent_item_sets.ts
@@ -80,20 +80,38 @@ export function getFrequentItemSetsAggFields(significantItems: SignificantItem[]
   );
 }
 
-export async function fetchFrequentItemSets(
-  client: ElasticsearchClient,
-  index: string,
-  searchQuery: estypes.QueryDslQueryContainer,
-  significantItems: SignificantItem[],
-  timeFieldName: string,
-  deviationMin: number,
-  deviationMax: number,
-  logger: Logger,
-  // The default value of 1 means no sampling will be used
-  sampleProbability: number = 1,
-  emitError: (m: string) => void,
-  abortSignal?: AbortSignal
-): Promise<FetchFrequentItemSetsResponse> {
+export async function fetchFrequentItemSets({
+  esClient,
+  abortSignal,
+  emitError,
+  logger,
+  arguments: args,
+}: {
+  esClient: ElasticsearchClient;
+  emitError: (m: string) => void;
+  abortSignal?: AbortSignal;
+  logger: Logger;
+  arguments: {
+    index: string;
+    searchQuery: estypes.QueryDslQueryContainer;
+    significantItems: SignificantItem[];
+    timeFieldName: string;
+    deviationMin: number;
+    deviationMax: number;
+    sampleProbability?: number;
+  };
+}): Promise<FetchFrequentItemSetsResponse> {
+  const {
+    index,
+    searchQuery,
+    significantItems,
+    timeFieldName,
+    deviationMin,
+    deviationMax,
+    // The default value of 1 means no sampling will be used
+    sampleProbability = 1,
+  } = args;
+
   // Sort significant terms by ascending p-value, necessary to apply the field limit correctly.
   const sortedSignificantItems = significantItems.slice().sort((a, b) => {
     return (a.pValue ?? 0) - (b.pValue ?? 0);
@@ -140,7 +158,7 @@ export async function fetchFrequentItemSets(
     track_total_hits: true,
   };
 
-  const body = await client.search<
+  const body = await esClient.search<
     unknown,
     { sample: FrequentItemSetsAggregation } | FrequentItemSetsAggregation
   >(
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.test.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.test.ts
index a47b6d94db128..dc6d3537f8424 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.test.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.test.ts
@@ -46,7 +46,7 @@ describe('fetch_index_info', () => {
       } as unknown as ElasticsearchClient;
 
       const { baselineTotalDocCount, deviationTotalDocCount, fieldCandidates } =
-        await fetchIndexInfo(esClientMock, paramsSearchQueryMock);
+        await fetchIndexInfo({ esClient: esClientMock, arguments: paramsSearchQueryMock });
 
       expect(fieldCandidates).toEqual(['myIpFieldName', 'myKeywordFieldName']);
       expect(baselineTotalDocCount).toEqual(5000000);
@@ -76,7 +76,7 @@ describe('fetch_index_info', () => {
         deviationTotalDocCount,
         fieldCandidates,
         textFieldCandidates,
-      } = await fetchIndexInfo(esClientMock, paramsSearchQueryMock);
+      } = await fetchIndexInfo({ esClient: esClientMock, arguments: paramsSearchQueryMock });
 
       expect(fieldCandidates).toEqual([
         '_metadata.elastic_apm_trace_id',
@@ -258,7 +258,7 @@ describe('fetch_index_info', () => {
         deviationTotalDocCount,
         fieldCandidates,
         textFieldCandidates,
-      } = await fetchIndexInfo(esClientMock, paramsSearchQueryMock);
+      } = await fetchIndexInfo({ esClient: esClientMock, arguments: paramsSearchQueryMock });
 
       expect(fieldCandidates).toEqual([
         'category.keyword',
@@ -315,7 +315,7 @@ describe('fetch_index_info', () => {
         deviationTotalDocCount,
         fieldCandidates,
         textFieldCandidates,
-      } = await fetchIndexInfo(esClientMock, paramsSearchQueryMock);
+      } = await fetchIndexInfo({ esClient: esClientMock, arguments: paramsSearchQueryMock });
 
       expect(fieldCandidates).toEqual(['items']);
       expect(textFieldCandidates).toEqual([]);
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.ts
index 458fc630b5009..a97b6049ab7b5 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_index_info.ts
@@ -39,12 +39,18 @@ interface IndexInfo {
   zeroDocsFallback: boolean;
 }
 
-export const fetchIndexInfo = async (
-  esClient: ElasticsearchClient,
-  params: AiopsLogRateAnalysisSchema,
-  textFieldCandidatesOverrides: string[] = [],
-  abortSignal?: AbortSignal
-): Promise<IndexInfo> => {
+export const fetchIndexInfo = async ({
+  esClient,
+  abortSignal,
+  arguments: args,
+}: {
+  esClient: ElasticsearchClient;
+  abortSignal?: AbortSignal;
+  arguments: AiopsLogRateAnalysisSchema & {
+    textFieldCandidatesOverrides?: string[];
+  };
+}): Promise<IndexInfo> => {
+  const { textFieldCandidatesOverrides = [], ...params } = args;
   const { index } = params;
   // Get all supported fields
   const respMapping = await esClient.fieldCaps(
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_categories.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_categories.ts
index e15918d0896e7..1d95995157192 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_categories.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_categories.ts
@@ -32,16 +32,22 @@ const getCategoriesTestData = (categories: Category[]): Histogram[] => {
 const getCategoriesTotalCount = (categories: Category[]): number =>
   categories.reduce((p, c) => p + c.count, 0);
 
-export const fetchSignificantCategories = async (
-  esClient: ElasticsearchClient,
-  params: AiopsLogRateAnalysisSchema,
-  fieldNames: string[],
-  logger: Logger,
+export const fetchSignificantCategories = async ({
+  esClient,
+  abortSignal,
+  emitError,
+  logger,
+  arguments: args,
+}: {
+  esClient: ElasticsearchClient;
+  abortSignal?: AbortSignal;
+  emitError?: (m: string) => void;
+  logger?: Logger;
+  arguments: AiopsLogRateAnalysisSchema & { fieldNames: string[]; sampleProbability?: number };
+}) => {
   // The default value of 1 means no sampling will be used
-  sampleProbability: number = 1,
-  emitError: (m: string) => void,
-  abortSignal?: AbortSignal
-) => {
+  const { fieldNames, sampleProbability = 1, ...params } = args;
+
   const categoriesOverall = await fetchCategories(
     esClient,
     params,
diff --git a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_term_p_values.ts b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_term_p_values.ts
index 98dbd11398174..9017b4949c8fe 100644
--- a/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_term_p_values.ts
+++ b/x-pack/packages/ml/aiops_log_rate_analysis/queries/fetch_significant_term_p_values.ts
@@ -111,16 +111,25 @@ interface Aggs extends estypes.AggregationsSignificantLongTermsAggregate {
   buckets: estypes.AggregationsSignificantLongTermsBucket[];
 }
 
-export const fetchSignificantTermPValues = async (
-  esClient: ElasticsearchClient,
-  params: AiopsLogRateAnalysisSchema,
-  fieldNames: string[],
-  logger: Logger,
+export const fetchSignificantTermPValues = async ({
+  esClient,
+  abortSignal,
+  logger,
+  emitError,
+  arguments: args,
+}: {
+  esClient: ElasticsearchClient;
+  abortSignal?: AbortSignal;
+  logger?: Logger;
+  emitError?: (m: string) => void;
+  arguments: AiopsLogRateAnalysisSchema & {
+    fieldNames: string[];
+    sampleProbability?: number;
+  };
+}): Promise<SignificantItem[]> => {
   // The default value of 1 means no sampling will be used
-  sampleProbability: number = 1,
-  emitError: (m: string) => void,
-  abortSignal?: AbortSignal
-): Promise<SignificantItem[]> => {
+  const { fieldNames, sampleProbability = 1, ...params } = args;
+
   const randomSamplerWrapper = createRandomSamplerWrapper({
     probability: sampleProbability,
     seed: RANDOM_SAMPLER_SEED,
@@ -139,14 +148,19 @@ export const fetchSignificantTermPValues = async (
 
   function reportError(fieldName: string, error: unknown) {
     if (!isRequestAbortedError(error)) {
-      logger.error(
-        `Failed to fetch p-value aggregation for fieldName "${fieldName}", got: \n${JSON.stringify(
-          error,
-          null,
-          2
-        )}`
-      );
-      emitError(`Failed to fetch p-value aggregation for fieldName "${fieldName}".`);
+      if (logger) {
+        logger.error(
+          `Failed to fetch p-value aggregation for fieldName "${fieldName}", got: \n${JSON.stringify(
+            error,
+            null,
+            2
+          )}`
+        );
+      }
+
+      if (emitError) {
+        emitError(`Failed to fetch p-value aggregation for fieldName "${fieldName}".`);
+      }
     }
   }
 
diff --git a/x-pack/packages/ml/inference_integration_flyout/components/elasticsearch_models.tsx b/x-pack/packages/ml/inference_integration_flyout/components/elasticsearch_models.tsx
index 0825cba6828b4..4bd6354ef73da 100644
--- a/x-pack/packages/ml/inference_integration_flyout/components/elasticsearch_models.tsx
+++ b/x-pack/packages/ml/inference_integration_flyout/components/elasticsearch_models.tsx
@@ -70,10 +70,7 @@ export const ElasticsearchModels: React.FC<ElasticsearchModelsProps> = ({
     }
   }, [numberOfAllocations, numberOfThreads, serviceType]);
 
-  const elasticSearchModelTypesDescriptions: Record<
-    ElasticsearchModelDefaultOptions | string,
-    ElasticsearchModelDescriptions
-  > = {
+  const elasticSearchModelTypesDescriptions: Record<string, ElasticsearchModelDescriptions> = {
     [ElasticsearchModelDefaultOptions.elser]: {
       description: i18n.translate(
         'xpack.ml.addInferenceEndpoint.elasticsearchModels.elser.description',
diff --git a/x-pack/packages/ml/trained_models_utils/index.ts b/x-pack/packages/ml/trained_models_utils/index.ts
index ada09d62af072..293f6662f5011 100644
--- a/x-pack/packages/ml/trained_models_utils/index.ts
+++ b/x-pack/packages/ml/trained_models_utils/index.ts
@@ -27,4 +27,13 @@ export {
   ELASTIC_MODEL_TYPE,
   MODEL_STATE,
   type ModelState,
+  ELSER_LINUX_OPTIMIZED_MODEL_ID,
+  ELSER_MODEL_ID,
+  E5_LINUX_OPTIMIZED_MODEL_ID,
+  E5_MODEL_ID,
+  LANG_IDENT_MODEL_ID,
+  LATEST_ELSER_VERSION,
+  LATEST_ELSER_MODEL_ID,
+  LATEST_E5_MODEL_ID,
+  ElserModels,
 } from './src/constants/trained_models';
diff --git a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
index 0e19fef36e2e2..938f9c0ef81e0 100644
--- a/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
+++ b/x-pack/packages/ml/trained_models_utils/src/constants/trained_models.ts
@@ -7,6 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 
+export const ELSER_MODEL_ID = '.elser_model_2';
+export const ELSER_LINUX_OPTIMIZED_MODEL_ID = '.elser_model_2_linux-x86_64';
+export const E5_MODEL_ID = '.multilingual-e5-small';
+export const E5_LINUX_OPTIMIZED_MODEL_ID = '.multilingual-e5-small_linux-x86_64';
+export const LANG_IDENT_MODEL_ID = 'lang_ident_model_1';
+export const ELSER_ID_V1 = '.elser_model_1' as const;
+export const LATEST_ELSER_VERSION: ElserVersion = 2;
+export const LATEST_ELSER_MODEL_ID = ELSER_LINUX_OPTIMIZED_MODEL_ID;
+export const LATEST_E5_MODEL_ID = E5_LINUX_OPTIMIZED_MODEL_ID;
+
+export const ElserModels = [ELSER_MODEL_ID, ELSER_LINUX_OPTIMIZED_MODEL_ID, ELSER_ID_V1];
+
 export const DEPLOYMENT_STATE = {
   STARTED: 'started',
   STARTING: 'starting',
@@ -46,10 +58,8 @@ export const BUILT_IN_MODEL_TAG = 'prepackaged';
 
 export const ELASTIC_MODEL_TAG = 'elastic';
 
-export const ELSER_ID_V1 = '.elser_model_1' as const;
-
 export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object.freeze({
-  '.elser_model_1': {
+  [ELSER_ID_V1]: {
     modelName: 'elser',
     hidden: true,
     version: 1,
@@ -63,7 +73,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
     }),
     type: ['elastic', 'pytorch', 'text_expansion'],
   },
-  '.elser_model_2': {
+  [ELSER_MODEL_ID]: {
     modelName: 'elser',
     version: 2,
     default: true,
@@ -77,7 +87,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
     }),
     type: ['elastic', 'pytorch', 'text_expansion'],
   },
-  '.elser_model_2_linux-x86_64': {
+  [ELSER_LINUX_OPTIMIZED_MODEL_ID]: {
     modelName: 'elser',
     version: 2,
     os: 'Linux',
@@ -92,7 +102,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
     }),
     type: ['elastic', 'pytorch', 'text_expansion'],
   },
-  '.multilingual-e5-small': {
+  [E5_MODEL_ID]: {
     modelName: 'e5',
     version: 1,
     default: true,
@@ -108,7 +118,7 @@ export const ELASTIC_MODEL_DEFINITIONS: Record<string, ModelDefinition> = Object
     licenseUrl: 'https://huggingface.co/elastic/multilingual-e5-small',
     type: ['pytorch', 'text_embedding'],
   },
-  '.multilingual-e5-small_linux-x86_64': {
+  [E5_LINUX_OPTIMIZED_MODEL_ID]: {
     modelName: 'e5',
     version: 1,
     os: 'Linux',
@@ -178,29 +188,69 @@ export interface GetModelDownloadConfigOptions {
   version?: ElserVersion;
 }
 
+export interface LocalInferenceServiceSettings {
+  service: 'elser' | 'elasticsearch';
+  service_settings: {
+    num_allocations: number;
+    num_threads: number;
+    model_id: string;
+  };
+}
+
 export type InferenceServiceSettings =
+  | LocalInferenceServiceSettings
   | {
-      service: 'elser';
+      service: 'openai';
       service_settings: {
-        num_allocations: number;
-        num_threads: number;
+        api_key: string;
+        organization_id: string;
+        url: string;
         model_id: string;
       };
     }
   | {
-      service: 'elasticsearch';
+      service: 'mistral';
+      service_settings: {
+        api_key: string;
+        model: string;
+        max_input_tokens: string;
+        rate_limit: {
+          requests_per_minute: number;
+        };
+      };
+    }
+  | {
+      service: 'cohere';
       service_settings: {
-        num_allocations: number;
-        num_threads: number;
+        similarity: string;
+        dimensions: string;
         model_id: string;
+        embedding_type: string;
       };
     }
   | {
-      service: 'openai';
+      service: 'azureaistudio';
       service_settings: {
-        api_key: string;
-        organization_id: string;
-        url: string;
+        target: string;
+        provider: string;
+        embedding_type: string;
+      };
+    }
+  | {
+      service: 'azureopenai';
+      service_settings: {
+        resource_name: string;
+        deployment_id: string;
+        api_version: string;
+      };
+    }
+  | {
+      service: 'googleaistudio';
+      service_settings: {
+        model_id: string;
+        rate_limit: {
+          requests_per_minute: number;
+        };
       };
     }
   | {
diff --git a/x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.test.tsx b/x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.test.tsx
index c68dd56b4b00e..cf2f39da52651 100644
--- a/x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.test.tsx
+++ b/x-pack/packages/security-solution/data_table/components/data_table/column_headers/helpers.test.tsx
@@ -231,7 +231,6 @@ describe('helpers', () => {
           esTypes: ['date'],
           format: '',
           id: '@timestamp',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           isSortable,
           name: '@timestamp',
           readFromDocValues: true,
@@ -248,7 +247,6 @@ describe('helpers', () => {
           esTypes: ['ip'],
           format: '',
           id: 'source.ip',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           isSortable,
           name: 'source.ip',
           schema: undefined,
@@ -264,7 +262,6 @@ describe('helpers', () => {
           esTypes: ['ip'],
           format: '',
           id: 'destination.ip',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           isSortable,
           name: 'destination.ip',
           schema: undefined,
@@ -290,7 +287,6 @@ describe('helpers', () => {
           esTypes: ['date'],
           format: '',
           id: '@timestamp',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           isSortable,
           name: '@timestamp',
           readFromDocValues: true,
diff --git a/x-pack/packages/security-solution/data_table/mock/mock_source.ts b/x-pack/packages/security-solution/data_table/mock/mock_source.ts
index 822922f52754d..eebf9f0979d57 100644
--- a/x-pack/packages/security-solution/data_table/mock/mock_source.ts
+++ b/x-pack/packages/security-solution/data_table/mock/mock_source.ts
@@ -8,25 +8,12 @@
 import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { BrowserFields } from '@kbn/timelines-plugin/common';
 
-const DEFAULT_INDEX_PATTERN = [
-  'apm-*-transaction*',
-  'auditbeat-*',
-  'endgame-*',
-  'filebeat-*',
-  'logs-*',
-  'packetbeat-*',
-  'traces-apm*',
-  'winlogbeat-*',
-  '-*elastic-cloud-logs-*',
-];
-
 export const mockBrowserFields: BrowserFields = {
   agent: {
     fields: {
       'agent.ephemeral_id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.ephemeral_id',
         searchable: true,
         type: 'string',
@@ -35,7 +22,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.hostname': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.hostname',
         searchable: true,
         type: 'string',
@@ -44,7 +30,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.id',
         searchable: true,
         type: 'string',
@@ -53,7 +38,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.name',
         searchable: true,
         type: 'string',
@@ -66,7 +50,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a0': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a0',
         searchable: true,
         type: 'string',
@@ -75,7 +58,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a1': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a1',
         searchable: true,
         type: 'string',
@@ -84,7 +66,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a2': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a2',
         searchable: true,
         type: 'string',
@@ -97,7 +78,6 @@ export const mockBrowserFields: BrowserFields = {
       '@timestamp': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: '@timestamp',
         searchable: true,
         type: 'date',
@@ -110,7 +90,6 @@ export const mockBrowserFields: BrowserFields = {
         esTypes: [],
         searchable: true,
         aggregatable: false,
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
       message: {
         name: 'message',
@@ -119,7 +98,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: false,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -128,7 +106,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.address',
         searchable: true,
         type: 'string',
@@ -137,7 +114,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.bytes',
         searchable: true,
         type: 'number',
@@ -146,7 +122,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.domain',
         searchable: true,
         type: 'string',
@@ -155,7 +130,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.geo.country_iso_code': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.geo.country_iso_code',
         searchable: true,
         type: 'string',
@@ -168,7 +142,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.account.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.account.id',
         searchable: true,
         type: 'string',
@@ -177,7 +150,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.availability_zone': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.availability_zone',
         searchable: true,
         type: 'string',
@@ -190,7 +162,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.id',
         searchable: true,
         type: 'string',
@@ -199,7 +170,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.name',
         searchable: true,
         type: 'string',
@@ -208,7 +178,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.tag': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.tag',
         searchable: true,
         type: 'string',
@@ -221,7 +190,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.address',
         searchable: true,
         type: 'string',
@@ -230,7 +198,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.bytes',
         searchable: true,
         type: 'number',
@@ -239,7 +206,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.domain',
         searchable: true,
         type: 'string',
@@ -248,7 +214,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.ip',
         searchable: true,
         type: 'ip',
@@ -257,7 +222,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.port',
         searchable: true,
         type: 'number',
@@ -269,7 +233,6 @@ export const mockBrowserFields: BrowserFields = {
     fields: {
       'event.end': {
         format: '',
-        indexes: DEFAULT_INDEX_PATTERN,
         name: 'event.end',
         searchable: true,
         type: 'date',
@@ -283,7 +246,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.category': {
         name: 'event.category',
@@ -292,7 +254,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.severity': {
         name: 'event.severity',
@@ -301,7 +262,6 @@ export const mockBrowserFields: BrowserFields = {
         format: 'number',
         searchable: true,
         aggregatable: true,
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -314,7 +274,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -323,7 +282,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.ip',
         searchable: true,
         type: 'ip',
@@ -332,7 +290,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.port',
         searchable: true,
         type: 'number',
@@ -349,7 +306,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -358,7 +314,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.firstAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.firstAttributes',
         searchable: true,
         type: 'string',
@@ -371,7 +326,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.secondAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.secondAttributes',
         searchable: true,
         type: 'string',
@@ -384,7 +338,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.thirdAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.thirdAttributes',
         searchable: true,
         type: 'date',
diff --git a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/body/data_quality_details/storage_details/helpers.ts b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/body/data_quality_details/storage_details/helpers.ts
index 5b3860af44920..3eaf493222cb0 100644
--- a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/body/data_quality_details/storage_details/helpers.ts
+++ b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/body/data_quality_details/storage_details/helpers.ts
@@ -134,37 +134,34 @@ export const getFlattenedBuckets = ({
     if (((isILMAvailable && ilmExplain != null) || !isILMAvailable) && stats != null) {
       return [
         ...acc,
-        ...Object.entries(stats).reduce<FlattenedBucket[]>(
-          (validStats, [indexName, indexStats]) => {
-            const ilmPhase = getIlmPhase(ilmExplain?.[indexName], isILMAvailable);
-            const isSelectedPhase =
-              (isILMAvailable && ilmPhase != null && ilmPhasesMap[ilmPhase] != null) ||
-              !isILMAvailable;
-
-            if (isSelectedPhase) {
-              const incompatible =
-                results != null && results[indexName] != null
-                  ? results[indexName].incompatible
-                  : undefined;
-              const sizeInBytes = getSizeInBytes({ indexName, stats });
-              const docsCount = getDocsCount({ stats, indexName });
-              return [
-                ...validStats,
-                {
-                  ilmPhase,
-                  incompatible,
-                  indexName,
-                  pattern,
-                  sizeInBytes,
-                  docsCount,
-                },
-              ];
-            } else {
-              return validStats;
-            }
-          },
-          []
-        ),
+        ...Object.entries(stats).reduce<FlattenedBucket[]>((validStats, [indexName]) => {
+          const ilmPhase = getIlmPhase(ilmExplain?.[indexName], isILMAvailable);
+          const isSelectedPhase =
+            (isILMAvailable && ilmPhase != null && ilmPhasesMap[ilmPhase] != null) ||
+            !isILMAvailable;
+
+          if (isSelectedPhase) {
+            const incompatible =
+              results != null && results[indexName] != null
+                ? results[indexName].incompatible
+                : undefined;
+            const sizeInBytes = getSizeInBytes({ indexName, stats });
+            const docsCount = getDocsCount({ stats, indexName });
+            return [
+              ...validStats,
+              {
+                ilmPhase,
+                incompatible,
+                indexName,
+                pattern,
+                sizeInBytes,
+                docsCount,
+              },
+            ];
+          } else {
+            return validStats;
+          }
+        }, []),
       ];
     }
 
@@ -232,7 +229,7 @@ export const getLayersMultiDimensional = ({
       groupByRollup: (d: Datum) => d.indexName,
       nodeLabel: (indexName: Datum) => indexName,
       shape: {
-        fillColor: (indexName: Key, sortIndex: number, node: Pick<ArrayNode, 'path'>) => {
+        fillColor: (indexName: Key, _sortIndex: number, node: Pick<ArrayNode, 'path'>) => {
           const pattern = getGroupFromPath(node.path) ?? '';
           const flattenedBucket = pathToFlattenedBucketMap[`${pattern}${indexName}`];
 
diff --git a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/stat_label/index.tsx b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/stat_label/index.tsx
index 31b4620fbb5f0..32402b49b570c 100644
--- a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/stat_label/index.tsx
+++ b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/stat_label/index.tsx
@@ -19,12 +19,11 @@ const Line2 = styled.span`
 const EMPTY = ' ';
 
 interface Props {
-  color?: string;
   line1?: string;
   line2?: string;
 }
 
-export const StatLabel: React.FC<Props> = ({ color, line1 = EMPTY, line2 = EMPTY }) => (
+export const StatLabel: React.FC<Props> = ({ line1 = EMPTY, line2 = EMPTY }) => (
   <>
     <Line1 data-test-subj="line1">{line1}</Line1>
     <Line2 data-test-subj="line2">{line2}</Line2>
diff --git a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/ecs_compliant_tab/index.tsx b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/ecs_compliant_tab/index.tsx
index b53567e709eb4..855ef75e80b84 100644
--- a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/ecs_compliant_tab/index.tsx
+++ b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/ecs_compliant_tab/index.tsx
@@ -26,15 +26,10 @@ const EmptyPromptContainer = styled.div`
 
 interface Props {
   indexName: string;
-  onAddToNewCase: (markdownComments: string[]) => void;
   partitionedFieldMetadata: PartitionedFieldMetadata;
 }
 
-const EcsCompliantTabComponent: React.FC<Props> = ({
-  indexName,
-  onAddToNewCase,
-  partitionedFieldMetadata,
-}) => {
+const EcsCompliantTabComponent: React.FC<Props> = ({ indexName, partitionedFieldMetadata }) => {
   const emptyPromptBody = useMemo(() => <EmptyPromptBody body={i18n.ECS_COMPLIANT_EMPTY} />, []);
   const title = useMemo(() => <EmptyPromptTitle title={i18n.ECS_COMPLIANT_EMPTY_TITLE} />, []);
 
diff --git a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/helpers.tsx b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/helpers.tsx
index 670357c3730f7..8790ab12591b3 100644
--- a/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/helpers.tsx
+++ b/x-pack/packages/security-solution/ecs_data_quality_dashboard/impl/data_quality/data_quality_panel/tabs/helpers.tsx
@@ -212,11 +212,7 @@ export const getTabs = ({
       </EuiBadge>
     ),
     content: (
-      <EcsCompliantTab
-        indexName={indexName}
-        onAddToNewCase={onAddToNewCase}
-        partitionedFieldMetadata={partitionedFieldMetadata}
-      />
+      <EcsCompliantTab indexName={indexName} partitionedFieldMetadata={partitionedFieldMetadata} />
     ),
     id: ECS_COMPLIANT_TAB_ID,
     name: i18n.ECS_COMPLIANT_FIELDS,
diff --git a/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.styles.ts b/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.styles.ts
index ca0f592f96a43..f5af4cd05ad24 100644
--- a/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.styles.ts
+++ b/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.styles.ts
@@ -69,7 +69,7 @@ export const SolutionSideNavCategoryTitleStyles = (euiTheme: EuiThemeComputed<{}
   font-weight: ${euiTheme.font.weight.medium};
 `;
 
-export const SolutionSideNavPanelLinksGroupStyles = (euiTheme: EuiThemeComputed<{}>) => css`
+export const SolutionSideNavPanelLinksGroupStyles = () => css`
   padding-left: 0;
   padding-right: 0;
 `;
diff --git a/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.tsx b/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.tsx
index dfe2f643d4783..248121872018b 100644
--- a/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.tsx
+++ b/x-pack/packages/security-solution/side_nav/src/solution_side_nav_panel.tsx
@@ -333,8 +333,7 @@ interface SolutionSideNavPanelItemsProps {
  */
 const SolutionSideNavPanelItems: React.FC<SolutionSideNavPanelItemsProps> = React.memo(
   function SolutionSideNavPanelItems({ items, onClose }) {
-    const { euiTheme } = useEuiTheme();
-    const panelLinksGroupClassNames = classNames(SolutionSideNavPanelLinksGroupStyles(euiTheme));
+    const panelLinksGroupClassNames = classNames(SolutionSideNavPanelLinksGroupStyles());
     return (
       <EuiListGroup className={panelLinksGroupClassNames}>
         {items.map((item) => (
diff --git a/x-pack/packages/security/plugin_types_server/index.ts b/x-pack/packages/security/plugin_types_server/index.ts
index 1228b9d36f961..21ab0eb2b39af 100644
--- a/x-pack/packages/security/plugin_types_server/index.ts
+++ b/x-pack/packages/security/plugin_types_server/index.ts
@@ -14,15 +14,6 @@ export type {
   AuditLogger,
 } from './src/audit';
 export type {
-  CreateAPIKeyParams,
-  CreateAPIKeyResult,
-  CreateRestAPIKeyParams,
-  GrantAPIKeyResult,
-  InvalidateAPIKeysParams,
-  ValidateAPIKeyParams,
-  CreateRestAPIKeyWithKibanaPrivilegesParams,
-  CreateCrossClusterAPIKeyParams,
-  InvalidateAPIKeyResult,
   APIKeys,
   AuthenticationServiceStart,
   UpdateAPIKeyParams,
@@ -39,7 +30,6 @@ export type {
   CheckPrivilegesWithRequest,
   CheckSavedObjectsPrivilegesWithRequest,
   CheckPrivilegesDynamicallyWithRequest,
-  KibanaPrivilegesType,
   SavedObjectActions,
   UIActions,
   CheckPrivilegesPayload,
@@ -51,7 +41,6 @@ export type {
   CheckPrivilegesOptions,
   CheckUserProfilesPrivilegesPayload,
   CheckUserProfilesPrivilegesResponse,
-  ElasticsearchPrivilegesType,
   CasesActions,
   CheckPrivileges,
   AlertingActions,
@@ -72,11 +61,30 @@ export type {
 } from './src/user_profile';
 
 export {
-  restApiKeySchema,
-  getRestApiKeyWithKibanaPrivilegesSchema,
   getUpdateRestApiKeyWithKibanaPrivilegesSchema,
-  crossClusterApiKeySchema,
   updateRestApiKeySchema,
   updateCrossClusterApiKeySchema,
 } from './src/authentication';
-export { GLOBAL_RESOURCE, elasticsearchRoleSchema, getKibanaRoleSchema } from './src/authorization';
+
+export type {
+  ElasticsearchPrivilegesType,
+  KibanaPrivilegesType,
+  APIKeysService,
+  CreateAPIKeyParams,
+  CreateAPIKeyResult,
+  InvalidateAPIKeyResult,
+  InvalidateAPIKeysParams,
+  ValidateAPIKeyParams,
+  CreateRestAPIKeyParams,
+  CreateRestAPIKeyWithKibanaPrivilegesParams,
+  CreateCrossClusterAPIKeyParams,
+  GrantAPIKeyResult,
+} from '@kbn/core-security-server';
+export { isCreateRestAPIKeyParams } from '@kbn/core-security-server';
+
+export {
+  restApiKeySchema,
+  crossClusterApiKeySchema,
+  getRestApiKeyWithKibanaPrivilegesSchema,
+} from './src/authentication';
+export { getKibanaRoleSchema, elasticsearchRoleSchema, GLOBAL_RESOURCE } from './src/authorization';
diff --git a/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts b/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts
index 2ced5478b46eb..c331802c7f693 100644
--- a/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts
+++ b/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/api_keys.ts
@@ -5,153 +5,9 @@
  * 2.0.
  */
 
-import type { estypes } from '@elastic/elasticsearch';
-
-import type { KibanaRequest } from '@kbn/core/server';
-import { schema, TypeOf } from '@kbn/config-schema';
+import { schema } from '@kbn/config-schema';
 import { getKibanaRoleSchema, elasticsearchRoleSchema } from '../../authorization';
 
-export interface APIKeys {
-  /**
-   * Determines if API Keys are enabled in Elasticsearch.
-   */
-  areAPIKeysEnabled(): Promise<boolean>;
-
-  /**
-   * Determines if Cross-Cluster API Keys are enabled in Elasticsearch.
-   */
-  areCrossClusterAPIKeysEnabled(): Promise<boolean>;
-
-  /**
-   * Tries to create an API key for the current user.
-   *
-   * Returns newly created API key or `null` if API keys are disabled.
-   *
-   * User needs `manage_api_key` privilege to create REST API keys and `manage_security` for Cross-Cluster API keys.
-   *
-   * @param request Request instance.
-   * @param createParams The params to create an API key
-   */
-  create(
-    request: KibanaRequest,
-    createParams: CreateAPIKeyParams
-  ): Promise<CreateAPIKeyResult | null>;
-
-  /**
-   * Tries to grant an API key for the current user.
-   * @param request Request instance.
-   * @param createParams Create operation parameters.
-   */
-  grantAsInternalUser(
-    request: KibanaRequest,
-    createParams: CreateRestAPIKeyParams | CreateRestAPIKeyWithKibanaPrivilegesParams
-  ): Promise<GrantAPIKeyResult | null>;
-
-  /**
-   * Tries to validate an API key.
-   * @param apiKeyPrams ValidateAPIKeyParams.
-   */
-  validate(apiKeyPrams: ValidateAPIKeyParams): Promise<boolean>;
-
-  /**
-   * Tries to invalidate an API keys.
-   * @param request Request instance.
-   * @param params The params to invalidate an API keys.
-   */
-  invalidate(
-    request: KibanaRequest,
-    params: InvalidateAPIKeysParams
-  ): Promise<InvalidateAPIKeyResult | null>;
-
-  /**
-   * Tries to invalidate the API keys by using the internal user.
-   * @param params The params to invalidate the API keys.
-   */
-  invalidateAsInternalUser(params: InvalidateAPIKeysParams): Promise<InvalidateAPIKeyResult | null>;
-}
-
-export type CreateAPIKeyParams =
-  | CreateRestAPIKeyParams
-  | CreateRestAPIKeyWithKibanaPrivilegesParams
-  | CreateCrossClusterAPIKeyParams;
-
-/**
- * Response of Kibana Create API key endpoint.
- */
-export type CreateAPIKeyResult = estypes.SecurityCreateApiKeyResponse;
-
-export type CreateRestAPIKeyParams = TypeOf<typeof restApiKeySchema>;
-export type CreateRestAPIKeyWithKibanaPrivilegesParams = TypeOf<
-  ReturnType<typeof getRestApiKeyWithKibanaPrivilegesSchema>
->;
-export type CreateCrossClusterAPIKeyParams = TypeOf<typeof crossClusterApiKeySchema>;
-
-export interface GrantAPIKeyResult {
-  /**
-   * Unique id for this API key
-   */
-  id: string;
-  /**
-   * Name for this API key
-   */
-  name: string;
-  /**
-   * Generated API key
-   */
-  api_key: string;
-}
-
-/**
- * Represents the parameters for validating API Key credentials.
- */
-export interface ValidateAPIKeyParams {
-  /**
-   * Unique id for this API key
-   */
-  id: string;
-
-  /**
-   * Generated API Key (secret)
-   */
-  api_key: string;
-}
-
-/**
- * Represents the params for invalidating multiple API keys
- */
-export interface InvalidateAPIKeysParams {
-  ids: string[];
-}
-
-/**
- * The return value when invalidating an API key in Elasticsearch.
- */
-export interface InvalidateAPIKeyResult {
-  /**
-   * The IDs of the API keys that were invalidated as part of the request.
-   */
-  invalidated_api_keys: string[];
-  /**
-   * The IDs of the API keys that were already invalidated.
-   */
-  previously_invalidated_api_keys: string[];
-  /**
-   * The number of errors that were encountered when invalidating the API keys.
-   */
-  error_count: number;
-  /**
-   * Details about these errors. This field is not present in the response when error_count is 0.
-   */
-  error_details?: Array<{
-    type?: string;
-    reason?: string;
-    caused_by?: {
-      type?: string;
-      reason?: string;
-    };
-  }>;
-}
-
 export const restApiKeySchema = schema.object({
   type: schema.maybe(schema.literal('rest')),
   name: schema.string(),
@@ -165,8 +21,11 @@ export const restApiKeySchema = schema.object({
 export const getRestApiKeyWithKibanaPrivilegesSchema = (
   getBasePrivilegeNames: Parameters<typeof getKibanaRoleSchema>[0]
 ) =>
-  restApiKeySchema.extends({
-    role_descriptors: null,
+  schema.object({
+    type: schema.maybe(schema.literal('rest')),
+    name: schema.string(),
+    expiration: schema.maybe(schema.string()),
+    metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
     kibana_role_descriptors: schema.recordOf(
       schema.string(),
       schema.object({
@@ -176,9 +35,11 @@ export const getRestApiKeyWithKibanaPrivilegesSchema = (
     ),
   });
 
-export const crossClusterApiKeySchema = restApiKeySchema.extends({
+export const crossClusterApiKeySchema = schema.object({
   type: schema.literal('cross_cluster'),
-  role_descriptors: null,
+  name: schema.string(),
+  expiration: schema.maybe(schema.string()),
+  metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
   access: schema.object(
     {
       search: schema.maybe(
@@ -203,41 +64,52 @@ export const crossClusterApiKeySchema = restApiKeySchema.extends({
   ),
 });
 
-/**
- * Response of Kibana Update API key endpoint.
- */
-export type UpdateAPIKeyResult = estypes.SecurityUpdateApiKeyResponse;
-
-/**
- * Request body of Kibana Update API key endpoint.
- */
-export type UpdateAPIKeyParams =
-  | UpdateRestAPIKeyParams
-  | UpdateCrossClusterAPIKeyParams
-  | UpdateRestAPIKeyWithKibanaPrivilegesParams;
-
-export const updateRestApiKeySchema = restApiKeySchema.extends({
-  name: null,
+export const updateRestApiKeySchema = schema.object({
   id: schema.string(),
+  type: schema.maybe(schema.literal('rest')),
+  expiration: schema.maybe(schema.string()),
+  role_descriptors: schema.recordOf(schema.string(), schema.object({}, { unknowns: 'allow' }), {
+    defaultValue: {},
+  }),
+  metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
 });
 
-export const updateCrossClusterApiKeySchema = crossClusterApiKeySchema.extends({
-  name: null,
+export const updateCrossClusterApiKeySchema = schema.object({
   id: schema.string(),
+  type: schema.literal('cross_cluster'),
+  expiration: schema.maybe(schema.string()),
+  metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
+  access: schema.object(
+    {
+      search: schema.maybe(
+        schema.arrayOf(
+          schema.object({
+            names: schema.arrayOf(schema.string()),
+            query: schema.maybe(schema.any()),
+            field_security: schema.maybe(schema.any()),
+            allow_restricted_indices: schema.maybe(schema.boolean()),
+          })
+        )
+      ),
+      replication: schema.maybe(
+        schema.arrayOf(
+          schema.object({
+            names: schema.arrayOf(schema.string()),
+          })
+        )
+      ),
+    },
+    { unknowns: 'allow' }
+  ),
 });
 
-export type UpdateRestAPIKeyParams = TypeOf<typeof updateRestApiKeySchema>;
-export type UpdateCrossClusterAPIKeyParams = TypeOf<typeof updateCrossClusterApiKeySchema>;
-export type UpdateRestAPIKeyWithKibanaPrivilegesParams = TypeOf<
-  ReturnType<typeof getUpdateRestApiKeyWithKibanaPrivilegesSchema>
->;
-
 export const getUpdateRestApiKeyWithKibanaPrivilegesSchema = (
   getBasePrivilegeNames: Parameters<typeof getKibanaRoleSchema>[0]
 ) =>
-  restApiKeySchema.extends({
-    role_descriptors: null,
-    name: null,
+  schema.object({
+    type: schema.maybe(schema.literal('rest')),
+    expiration: schema.maybe(schema.string()),
+    metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
     id: schema.string(),
     kibana_role_descriptors: schema.recordOf(
       schema.string(),
diff --git a/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/index.ts b/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/index.ts
index ec36a99b4da63..1673682052554 100644
--- a/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/index.ts
+++ b/x-pack/packages/security/plugin_types_server/src/authentication/api_keys/index.ts
@@ -5,23 +5,6 @@
  * 2.0.
  */
 
-export type {
-  CreateAPIKeyParams,
-  CreateAPIKeyResult,
-  InvalidateAPIKeyResult,
-  InvalidateAPIKeysParams,
-  ValidateAPIKeyParams,
-  CreateRestAPIKeyParams,
-  CreateRestAPIKeyWithKibanaPrivilegesParams,
-  CreateCrossClusterAPIKeyParams,
-  GrantAPIKeyResult,
-  APIKeys,
-  UpdateAPIKeyParams,
-  UpdateAPIKeyResult,
-  UpdateCrossClusterAPIKeyParams,
-  UpdateRestAPIKeyParams,
-  UpdateRestAPIKeyWithKibanaPrivilegesParams,
-} from './api_keys';
 export {
   crossClusterApiKeySchema,
   getRestApiKeyWithKibanaPrivilegesSchema,
diff --git a/x-pack/packages/security/plugin_types_server/src/authentication/authentication_service.ts b/x-pack/packages/security/plugin_types_server/src/authentication/authentication_service.ts
index 6bc5a73113ae3..5d066bb6565ca 100644
--- a/x-pack/packages/security/plugin_types_server/src/authentication/authentication_service.ts
+++ b/x-pack/packages/security/plugin_types_server/src/authentication/authentication_service.ts
@@ -6,14 +6,13 @@
  */
 
 import type { KibanaRequest } from '@kbn/core/server';
-import type { AuthenticatedUser } from '@kbn/core-security-common';
-
-import type { APIKeys } from './api_keys';
+import type { AuthenticatedUser } from '@kbn/security-plugin-types-common';
+import type { APIKeysService } from '@kbn/core-security-server';
 
 /**
  * Authentication services available on the security plugin's start contract.
  */
 export interface AuthenticationServiceStart {
-  apiKeys: APIKeys;
+  apiKeys: APIKeysService;
   getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null;
 }
diff --git a/x-pack/packages/security/plugin_types_server/src/authentication/index.ts b/x-pack/packages/security/plugin_types_server/src/authentication/index.ts
index 6e30f9ebcec24..4a5e7da782baf 100644
--- a/x-pack/packages/security/plugin_types_server/src/authentication/index.ts
+++ b/x-pack/packages/security/plugin_types_server/src/authentication/index.ts
@@ -5,29 +5,22 @@
  * 2.0.
  */
 
+export type { AuthenticationServiceStart } from './authentication_service';
+
 export type {
-  CreateAPIKeyParams,
-  CreateAPIKeyResult,
-  CreateRestAPIKeyParams,
-  CreateRestAPIKeyWithKibanaPrivilegesParams,
-  CreateCrossClusterAPIKeyParams,
-  InvalidateAPIKeyResult,
-  InvalidateAPIKeysParams,
-  ValidateAPIKeyParams,
-  APIKeys,
-  GrantAPIKeyResult,
+  APIKeysService as APIKeys,
   UpdateAPIKeyParams,
   UpdateAPIKeyResult,
   UpdateCrossClusterAPIKeyParams,
   UpdateRestAPIKeyParams,
   UpdateRestAPIKeyWithKibanaPrivilegesParams,
-} from './api_keys';
-export type { AuthenticationServiceStart } from './authentication_service';
+} from '@kbn/core-security-server';
+
 export {
-  restApiKeySchema,
+  crossClusterApiKeySchema,
   getRestApiKeyWithKibanaPrivilegesSchema,
   getUpdateRestApiKeyWithKibanaPrivilegesSchema,
-  crossClusterApiKeySchema,
+  restApiKeySchema,
   updateRestApiKeySchema,
   updateCrossClusterApiKeySchema,
 } from './api_keys';
diff --git a/x-pack/packages/security/plugin_types_server/src/authorization/index.ts b/x-pack/packages/security/plugin_types_server/src/authorization/index.ts
index 54364d7817f31..baeeeddc1fa74 100644
--- a/x-pack/packages/security/plugin_types_server/src/authorization/index.ts
+++ b/x-pack/packages/security/plugin_types_server/src/authorization/index.ts
@@ -42,7 +42,6 @@ export type {
   PrivilegeDeprecationsRolesByFeatureIdResponse,
 } from './deprecations';
 export type { AuthorizationMode } from './mode';
-export type { ElasticsearchPrivilegesType, KibanaPrivilegesType } from './role_schema';
 
 export { GLOBAL_RESOURCE } from './constants';
 export { elasticsearchRoleSchema, getKibanaRoleSchema } from './role_schema';
diff --git a/x-pack/packages/security/plugin_types_server/tsconfig.json b/x-pack/packages/security/plugin_types_server/tsconfig.json
index 04ed00229a3de..2f4ae387ac2b5 100644
--- a/x-pack/packages/security/plugin_types_server/tsconfig.json
+++ b/x-pack/packages/security/plugin_types_server/tsconfig.json
@@ -10,11 +10,10 @@
     "target/**/*"
   ],
   "kbn_references": [
-    "@kbn/config-schema",
     "@kbn/core",
     "@kbn/security-plugin-types-common",
     "@kbn/core-user-profile-server",
     "@kbn/core-security-server",
-    "@kbn/core-security-common"
+    "@kbn/config-schema",
   ]
 }
diff --git a/x-pack/plugins/actions/server/actions_client/actions_client.test.ts b/x-pack/plugins/actions/server/actions_client/actions_client.test.ts
index 8f08bbb4b2d5a..46e73f7bb3591 100644
--- a/x-pack/plugins/actions/server/actions_client/actions_client.test.ts
+++ b/x-pack/plugins/actions/server/actions_client/actions_client.test.ts
@@ -8,6 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import moment from 'moment';
 import { ByteSizeValue } from '@kbn/config-schema';
+import { MockedLogger, loggerMock } from '@kbn/logging-mocks';
 import {
   DEFAULT_MICROSOFT_EXCHANGE_URL,
   DEFAULT_MICROSOFT_GRAPH_API_SCOPE,
@@ -47,7 +48,7 @@ import { actionsAuthorizationMock } from '../authorization/actions_authorization
 import { trackLegacyRBACExemption } from '../lib/track_legacy_rbac_exemption';
 import { ConnectorTokenClient } from '../lib/connector_token_client';
 import { encryptedSavedObjectsMock } from '@kbn/encrypted-saved-objects-plugin/server/mocks';
-import { Logger, SavedObject } from '@kbn/core/server';
+import { SavedObject } from '@kbn/core/server';
 import { connectorTokenClientMock } from '../lib/connector_token_client.mock';
 import { inMemoryMetricsMock } from '../monitoring/in_memory_metrics.mock';
 import { getOAuthJwtAccessToken } from '../lib/get_oauth_jwt_access_token';
@@ -108,7 +109,6 @@ const request = httpServerMock.createKibanaRequest();
 const auditLogger = auditLoggerMock.create();
 const mockUsageCountersSetup = usageCountersServiceMock.createSetupContract();
 const mockUsageCounter = mockUsageCountersSetup.createUsageCounter('test');
-const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
 const mockTaskManager = taskManagerMock.createSetup();
 const configurationUtilities = actionsConfigMock.create();
 const eventLogClient = eventLogClientMock.create();
@@ -133,8 +133,11 @@ const actionTypeIdFromSavedObjectMock = (actionTypeId: string = 'my-action-type'
   } as SavedObject;
 };
 
+let logger: MockedLogger;
+
 beforeEach(() => {
   jest.resetAllMocks();
+  logger = loggerMock.create();
   mockedLicenseState = licenseStateMock.create();
   actionTypeRegistryParams = {
     licensing: licensingMock.createSetup(),
@@ -1853,9 +1856,13 @@ describe('getOAuthAccessToken()', () => {
       tokenUrl: 'https://testurl.service-now.com/oauth_token.do',
     });
     expect(getOAuthClientCredentialsAccessToken).not.toHaveBeenCalled();
-    expect(logger.debug).toHaveBeenCalledWith(
-      `Successfully retrieved access token using JWT OAuth with tokenUrl https://testurl.service-now.com/oauth_token.do and config {\"clientId\":\"abc\",\"jwtKeyId\":\"def\",\"userIdentifierValue\":\"userA\"}`
-    );
+    expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "Successfully retrieved access token using JWT OAuth with tokenUrl https://testurl.service-now.com/oauth_token.do and config {\\"clientId\\":\\"abc\\",\\"jwtKeyId\\":\\"def\\",\\"userIdentifierValue\\":\\"userA\\"}",
+        ],
+      ]
+    `);
   });
 
   test('calls getOAuthClientCredentialsAccessToken when type="client"', async () => {
@@ -1892,9 +1899,13 @@ describe('getOAuthAccessToken()', () => {
       oAuthScope: 'https://graph.microsoft.com/.default',
     });
     expect(getOAuthJwtAccessToken).not.toHaveBeenCalled();
-    expect(logger.debug).toHaveBeenCalledWith(
-      `Successfully retrieved access token using Client Credentials OAuth with tokenUrl https://login.microsoftonline.com/98765/oauth2/v2.0/token, scope https://graph.microsoft.com/.default and config {\"clientId\":\"abc\",\"tenantId\":\"def\"}`
-    );
+    expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "Successfully retrieved access token using Client Credentials OAuth with tokenUrl https://login.microsoftonline.com/98765/oauth2/v2.0/token, scope https://graph.microsoft.com/.default and config {\\"clientId\\":\\"abc\\",\\"tenantId\\":\\"def\\"}",
+        ],
+      ]
+    `);
   });
 
   test('throws when getOAuthJwtAccessToken throws error', async () => {
@@ -1919,9 +1930,13 @@ describe('getOAuthAccessToken()', () => {
     ).rejects.toMatchInlineSnapshot(`[Error: Failed to retrieve access token]`);
 
     expect(getOAuthJwtAccessToken as jest.Mock).toHaveBeenCalled();
-    expect(logger.debug).toHaveBeenCalledWith(
-      `Failed to retrieve access token using JWT OAuth with tokenUrl https://testurl.service-now.com/oauth_token.do and config {\"clientId\":\"abc\",\"jwtKeyId\":\"def\",\"userIdentifierValue\":\"userA\"} - Something went wrong!`
-    );
+    expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "Failed to retrieve access token using JWT OAuth with tokenUrl https://testurl.service-now.com/oauth_token.do and config {\\"clientId\\":\\"abc\\",\\"jwtKeyId\\":\\"def\\",\\"userIdentifierValue\\":\\"userA\\"} - Something went wrong!",
+        ],
+      ]
+    `);
   });
 
   test('throws when getOAuthClientCredentialsAccessToken throws error', async () => {
@@ -1947,9 +1962,13 @@ describe('getOAuthAccessToken()', () => {
     ).rejects.toMatchInlineSnapshot(`[Error: Failed to retrieve access token]`);
 
     expect(getOAuthClientCredentialsAccessToken as jest.Mock).toHaveBeenCalled();
-    expect(logger.debug).toHaveBeenCalledWith(
-      `Failed to retrieved access token using Client Credentials OAuth with tokenUrl https://login.microsoftonline.com/98765/oauth2/v2.0/token, scope https://graph.microsoft.com/.default and config {\"clientId\":\"abc\",\"tenantId\":\"def\"} - Something went wrong!`
-    );
+    expect(loggingSystemMock.collect(logger).debug).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          "Failed to retrieved access token using Client Credentials OAuth with tokenUrl https://login.microsoftonline.com/98765/oauth2/v2.0/token, scope https://graph.microsoft.com/.default and config {\\"clientId\\":\\"abc\\",\\"tenantId\\":\\"def\\"} - Something went wrong!",
+        ],
+      ]
+    `);
   });
 });
 
diff --git a/x-pack/plugins/actions/server/actions_client/actions_client.ts b/x-pack/plugins/actions/server/actions_client/actions_client.ts
index 1187898006f9e..10c47731ef004 100644
--- a/x-pack/plugins/actions/server/actions_client/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client/actions_client.ts
@@ -557,15 +557,17 @@ export class ActionsClient {
         });
 
         this.context.logger.debug(
-          `Successfully retrieved access token using JWT OAuth with tokenUrl ${
-            tokenOpts.tokenUrl
-          } and config ${JSON.stringify(tokenOpts.config)}`
+          () =>
+            `Successfully retrieved access token using JWT OAuth with tokenUrl ${
+              tokenOpts.tokenUrl
+            } and config ${JSON.stringify(tokenOpts.config)}`
         );
       } catch (err) {
         this.context.logger.debug(
-          `Failed to retrieve access token using JWT OAuth with tokenUrl ${
-            tokenOpts.tokenUrl
-          } and config ${JSON.stringify(tokenOpts.config)} - ${err.message}`
+          () =>
+            `Failed to retrieve access token using JWT OAuth with tokenUrl ${
+              tokenOpts.tokenUrl
+            } and config ${JSON.stringify(tokenOpts.config)} - ${err.message}`
         );
         throw Boom.badRequest(`Failed to retrieve access token`);
       }
@@ -584,17 +586,19 @@ export class ActionsClient {
         });
 
         this.context.logger.debug(
-          `Successfully retrieved access token using Client Credentials OAuth with tokenUrl ${
-            tokenOpts.tokenUrl
-          }, scope ${tokenOpts.scope} and config ${JSON.stringify(tokenOpts.config)}`
+          () =>
+            `Successfully retrieved access token using Client Credentials OAuth with tokenUrl ${
+              tokenOpts.tokenUrl
+            }, scope ${tokenOpts.scope} and config ${JSON.stringify(tokenOpts.config)}`
         );
       } catch (err) {
         this.context.logger.debug(
-          `Failed to retrieved access token using Client Credentials OAuth with tokenUrl ${
-            tokenOpts.tokenUrl
-          }, scope ${tokenOpts.scope} and config ${JSON.stringify(tokenOpts.config)} - ${
-            err.message
-          }`
+          () =>
+            `Failed to retrieved access token using Client Credentials OAuth with tokenUrl ${
+              tokenOpts.tokenUrl
+            }, scope ${tokenOpts.scope} and config ${JSON.stringify(tokenOpts.config)} - ${
+              err.message
+            }`
         );
         throw Boom.badRequest(`Failed to retrieve access token`);
       }
diff --git a/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
index e1366f7f9c573..05d74f781c434 100644
--- a/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
+++ b/x-pack/plugins/actions/server/integration_tests/__snapshots__/connector_types.test.ts.snap
@@ -7561,6 +7561,44 @@ Object {
       ],
       "type": "alternatives",
     },
+    "scriptType": Object {
+      "flags": Object {
+        "default": null,
+        "error": [Function],
+        "presence": "optional",
+      },
+      "matches": Array [
+        Object {
+          "schema": Object {
+            "flags": Object {
+              "error": [Function],
+            },
+            "rules": Array [
+              Object {
+                "args": Object {
+                  "method": [Function],
+                },
+                "name": "custom",
+              },
+            ],
+            "type": "string",
+          },
+        },
+        Object {
+          "schema": Object {
+            "allow": Array [
+              null,
+            ],
+            "flags": Object {
+              "error": [Function],
+              "only": true,
+            },
+            "type": "any",
+          },
+        },
+      ],
+      "type": "alternatives",
+    },
   },
   "type": "object",
 }
diff --git a/x-pack/plugins/actions/server/lib/action_executor.test.ts b/x-pack/plugins/actions/server/lib/action_executor.test.ts
index bfcedc821368f..b2e6badae3c59 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.test.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.test.ts
@@ -1695,10 +1695,35 @@ describe('Event log', () => {
       { actionTypeId: '.gen-ai', completion_tokens: 9, prompt_tokens: 10, total_tokens: 19 }
     );
   });
+  test('reports telemetry for token count events with additional properties', async () => {
+    const executorMock = setupActionExecutorMock('.gen-ai', {} as ConnectorType['validate'], {
+      defaultModel: 'gpt-4',
+      apiProvider: 'OpenAI',
+    });
+    executorMock.mockResolvedValue({
+      actionId: '1',
+      status: 'ok',
+      // @ts-ignore
+      data: mockGenAi,
+    });
+    await actionExecutor.execute(executeParams);
+    expect(actionExecutorInitializationParams.analyticsService.reportEvent).toHaveBeenCalledWith(
+      GEN_AI_TOKEN_COUNT_EVENT.eventType,
+      {
+        actionTypeId: '.gen-ai',
+        completion_tokens: 9,
+        prompt_tokens: 10,
+        total_tokens: 19,
+        model: 'gpt-4',
+        provider: 'OpenAI',
+      }
+    );
+  });
 });
 function setupActionExecutorMock(
   actionTypeId = 'test',
-  validationOverride?: ConnectorType['validate']
+  validationOverride?: ConnectorType['validate'],
+  additionalConfig?: Record<string, unknown>
 ) {
   const thisConnectorType: jest.Mocked<ConnectorType> = {
     ...connectorType,
@@ -1712,6 +1737,7 @@ function setupActionExecutorMock(
       actionTypeId,
       config: {
         bar: true,
+        ...additionalConfig,
       },
       secrets: {
         baz: true,
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index f8f8f32547c10..685e18c585ae0 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -603,6 +603,7 @@ export class ActionExecutor {
                   ...(actionTypeId === '.gen-ai' && config?.apiProvider != null
                     ? { provider: config?.apiProvider }
                     : {}),
+                  ...(config?.defaultModel != null ? { model: config?.defaultModel } : {}),
                 });
               }
             })
diff --git a/x-pack/plugins/actions/server/lib/event_based_telemetry.ts b/x-pack/plugins/actions/server/lib/event_based_telemetry.ts
index eb7ad8dbdfb65..2a8006758489f 100644
--- a/x-pack/plugins/actions/server/lib/event_based_telemetry.ts
+++ b/x-pack/plugins/actions/server/lib/event_based_telemetry.ts
@@ -13,6 +13,7 @@ export const GEN_AI_TOKEN_COUNT_EVENT: EventTypeOpts<{
   prompt_tokens: number;
   completion_tokens: number;
   provider?: string;
+  model?: string;
 }> = {
   eventType: 'gen_ai_token_count',
   schema: {
@@ -51,6 +52,13 @@ export const GEN_AI_TOKEN_COUNT_EVENT: EventTypeOpts<{
         optional: true,
       },
     },
+    model: {
+      type: 'keyword',
+      _meta: {
+        description: 'LLM model',
+        optional: true,
+      },
+    },
   },
 };
 
diff --git a/x-pack/plugins/actions/server/sub_action_framework/sub_action_connector.ts b/x-pack/plugins/actions/server/sub_action_framework/sub_action_connector.ts
index 19cc7e90d6254..d5ad5391628bc 100644
--- a/x-pack/plugins/actions/server/sub_action_framework/sub_action_connector.ts
+++ b/x-pack/plugins/actions/server/sub_action_framework/sub_action_connector.ts
@@ -107,7 +107,7 @@ export abstract class SubActionConnector<Config, Secrets> {
       responseSchema.validate(data);
     } catch (resValidationError) {
       const err = new Error(`Response validation failed (${resValidationError})`);
-      this.logger.debug(`${err.message}:\n${inspect(data, { depth: 10 })}`);
+      this.logger.debug(() => `${err.message}:\n${inspect(data, { depth: 10 })}`);
       throw err;
     }
   }
diff --git a/x-pack/plugins/aiops/public/plugin.tsx b/x-pack/plugins/aiops/public/plugin.tsx
index b1d62c4275180..7d55c3098cfaf 100755
--- a/x-pack/plugins/aiops/public/plugin.tsx
+++ b/x-pack/plugins/aiops/public/plugin.tsx
@@ -41,7 +41,9 @@ export class AiopsPlugin
         { registerChangePointChartsAttachment },
         [coreStart, pluginStart],
       ]) => {
-        if (license.hasAtLeast('platinum')) {
+        const { canUseAiops } = coreStart.application.capabilities.ml;
+
+        if (license.hasAtLeast('platinum') && canUseAiops) {
           if (embeddable) {
             registerEmbeddables(embeddable, core);
           }
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/grouping_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/grouping_handler.ts
index 8fe478a805355..258b94bb12cc6 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/grouping_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/grouping_handler.ts
@@ -40,7 +40,7 @@ import type { ResponseStreamFetchOptions } from '../response_stream_factory';
 export const groupingHandlerFactory =
   <T extends ApiVersion>({
     abortSignal,
-    client,
+    esClient,
     requestBody,
     responseStream,
     logDebugMessage,
@@ -81,24 +81,26 @@ export const groupingHandlerFactory =
     );
 
     try {
-      const { fields, itemSets } = await fetchFrequentItemSets(
-        client,
-        requestBody.index,
-        JSON.parse(requestBody.searchQuery) as estypes.QueryDslQueryContainer,
-        significantTerms,
-        requestBody.timeFieldName,
-        requestBody.deviationMin,
-        requestBody.deviationMax,
+      const { fields, itemSets } = await fetchFrequentItemSets({
+        esClient,
         logger,
-        stateHandler.sampleProbability(),
-        responseStream.pushError,
-        abortSignal
-      );
+        emitError: responseStream.pushError,
+        abortSignal,
+        arguments: {
+          index: requestBody.index,
+          searchQuery: JSON.parse(requestBody.searchQuery) as estypes.QueryDslQueryContainer,
+          significantItems: significantTerms,
+          timeFieldName: requestBody.timeFieldName,
+          deviationMin: requestBody.deviationMin,
+          deviationMax: requestBody.deviationMax,
+          sampleProbability: stateHandler.sampleProbability(),
+        },
+      });
 
       if (significantCategories.length > 0 && significantTerms.length > 0) {
         const { fields: significantCategoriesFields, itemSets: significantCategoriesItemSets } =
           await fetchTerms2CategoriesCounts(
-            client,
+            esClient,
             requestBody,
             JSON.parse(requestBody.searchQuery) as estypes.QueryDslQueryContainer,
             significantTerms,
@@ -161,27 +163,26 @@ export const groupingHandlerFactory =
             let cpgTimeSeries: NumericChartData;
             try {
               cpgTimeSeries = (
-                (await fetchHistogramsForFields(
-                  client,
-                  requestBody.index,
-                  histogramQuery,
-                  // fields
-                  [
-                    {
-                      fieldName: requestBody.timeFieldName,
-                      type: KBN_FIELD_TYPES.DATE,
-                      interval: overallTimeSeries.interval,
-                      min: overallTimeSeries.stats[0],
-                      max: overallTimeSeries.stats[1],
-                    },
-                  ],
-                  // samplerShardSize
-                  -1,
-                  undefined,
+                (await fetchHistogramsForFields({
+                  esClient,
                   abortSignal,
-                  stateHandler.sampleProbability(),
-                  RANDOM_SAMPLER_SEED
-                )) as [NumericChartData]
+                  arguments: {
+                    indexPattern: requestBody.index,
+                    query: histogramQuery,
+                    fields: [
+                      {
+                        fieldName: requestBody.timeFieldName,
+                        type: KBN_FIELD_TYPES.DATE,
+                        interval: overallTimeSeries.interval,
+                        min: overallTimeSeries.stats[0],
+                        max: overallTimeSeries.stats[1],
+                      },
+                    ],
+                    samplerShardSize: -1,
+                    randomSamplerProbability: stateHandler.sampleProbability(),
+                    randomSamplerSeed: RANDOM_SAMPLER_SEED,
+                  },
+                })) as [NumericChartData]
               )[0];
             } catch (e) {
               if (!isRequestAbortedError(e)) {
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/histogram_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/histogram_handler.ts
index e3501a53f5df8..2863d5c6dd427 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/histogram_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/histogram_handler.ts
@@ -35,7 +35,7 @@ import type { ResponseStreamFetchOptions } from '../response_stream_factory';
 export const histogramHandlerFactory =
   <T extends ApiVersion>({
     abortSignal,
-    client,
+    esClient,
     logDebugMessage,
     logger,
     requestBody,
@@ -90,27 +90,26 @@ export const histogramHandlerFactory =
 
           try {
             cpTimeSeries = (
-              (await fetchHistogramsForFields(
-                client,
-                requestBody.index,
-                histogramQuery,
-                // fields
-                [
-                  {
-                    fieldName: requestBody.timeFieldName,
-                    type: KBN_FIELD_TYPES.DATE,
-                    interval: overallTimeSeries.interval,
-                    min: overallTimeSeries.stats[0],
-                    max: overallTimeSeries.stats[1],
-                  },
-                ],
-                // samplerShardSize
-                -1,
-                undefined,
+              (await fetchHistogramsForFields({
+                esClient,
                 abortSignal,
-                stateHandler.sampleProbability(),
-                RANDOM_SAMPLER_SEED
-              )) as [NumericChartData]
+                arguments: {
+                  indexPattern: requestBody.index,
+                  query: histogramQuery,
+                  fields: [
+                    {
+                      fieldName: requestBody.timeFieldName,
+                      type: KBN_FIELD_TYPES.DATE,
+                      interval: overallTimeSeries.interval,
+                      min: overallTimeSeries.stats[0],
+                      max: overallTimeSeries.stats[1],
+                    },
+                  ],
+                  samplerShardSize: -1,
+                  randomSamplerProbability: stateHandler.sampleProbability(),
+                  randomSamplerSeed: RANDOM_SAMPLER_SEED,
+                },
+              })) as [NumericChartData]
             )[0];
           } catch (e) {
             logger.error(
@@ -183,27 +182,26 @@ export const histogramHandlerFactory =
 
         try {
           catTimeSeries = (
-            (await fetchHistogramsForFields(
-              client,
-              requestBody.index,
-              histogramQuery,
-              // fields
-              [
-                {
-                  fieldName: requestBody.timeFieldName,
-                  type: KBN_FIELD_TYPES.DATE,
-                  interval: overallTimeSeries.interval,
-                  min: overallTimeSeries.stats[0],
-                  max: overallTimeSeries.stats[1],
-                },
-              ],
-              // samplerShardSize
-              -1,
-              undefined,
+            (await fetchHistogramsForFields({
+              esClient,
               abortSignal,
-              stateHandler.sampleProbability(),
-              RANDOM_SAMPLER_SEED
-            )) as [NumericChartData]
+              arguments: {
+                indexPattern: requestBody.index,
+                query: histogramQuery,
+                fields: [
+                  {
+                    fieldName: requestBody.timeFieldName,
+                    type: KBN_FIELD_TYPES.DATE,
+                    interval: overallTimeSeries.interval,
+                    min: overallTimeSeries.stats[0],
+                    max: overallTimeSeries.stats[1],
+                  },
+                ],
+                samplerShardSize: -1,
+                randomSamplerProbability: stateHandler.sampleProbability(),
+                randomSamplerSeed: RANDOM_SAMPLER_SEED,
+              },
+            })) as [NumericChartData]
           )[0];
         } catch (e) {
           logger.error(
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/index_info_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/index_info_handler.ts
index 5c326e7821887..1a01d9c543206 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/index_info_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/index_info_handler.ts
@@ -24,7 +24,7 @@ export const indexInfoHandlerFactory =
   async () => {
     const {
       abortSignal,
-      client,
+      esClient,
       logDebugMessage,
       logger,
       requestBody,
@@ -56,12 +56,14 @@ export const indexInfoHandlerFactory =
       );
 
       try {
-        const indexInfo = await fetchIndexInfo(
-          client,
-          requestBody,
-          ['message', 'error.message'],
-          abortSignal
-        );
+        const indexInfo = await fetchIndexInfo({
+          esClient,
+          abortSignal,
+          arguments: {
+            ...requestBody,
+            textFieldCandidatesOverrides: ['message', 'error.message'],
+          },
+        });
 
         logDebugMessage(`Baseline document count: ${indexInfo.baselineTotalDocCount}`);
         logDebugMessage(`Deviation document count: ${indexInfo.deviationTotalDocCount}`);
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/overall_histogram_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/overall_histogram_handler.ts
index 7e4114148a4ed..97e56795a9dfc 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/overall_histogram_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/overall_histogram_handler.ts
@@ -22,7 +22,7 @@ import type { ResponseStreamFetchOptions } from '../response_stream_factory';
 export const overallHistogramHandlerFactory =
   <T extends ApiVersion>({
     abortSignal,
-    client,
+    esClient,
     requestBody,
     logDebugMessage,
     logger,
@@ -42,19 +42,18 @@ export const overallHistogramHandlerFactory =
 
     try {
       overallTimeSeries = (
-        (await fetchHistogramsForFields(
-          client,
-          requestBody.index,
-          overallHistogramQuery,
-          // fields
-          histogramFields,
-          // samplerShardSize
-          -1,
-          undefined,
+        (await fetchHistogramsForFields({
+          esClient,
           abortSignal,
-          stateHandler.sampleProbability(),
-          RANDOM_SAMPLER_SEED
-        )) as [NumericChartData]
+          arguments: {
+            indexPattern: requestBody.index,
+            query: overallHistogramQuery,
+            fields: histogramFields,
+            samplerShardSize: -1,
+            randomSamplerProbability: stateHandler.sampleProbability(),
+            randomSamplerSeed: RANDOM_SAMPLER_SEED,
+          },
+        })) as [NumericChartData]
       )[0];
     } catch (e) {
       if (!isRequestAbortedError(e)) {
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/significant_items_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/significant_items_handler.ts
index 92d400b466653..197cc17b77a91 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/significant_items_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/significant_items_handler.ts
@@ -46,7 +46,7 @@ type Candidate = FieldCandidate | TextFieldCandidate;
 export const significantItemsHandlerFactory =
   <T extends ApiVersion>({
     abortSignal,
-    client,
+    esClient,
     logDebugMessage,
     logger,
     requestBody,
@@ -110,15 +110,17 @@ export const significantItemsHandlerFactory =
         let pValues: Awaited<ReturnType<typeof fetchSignificantTermPValues>>;
 
         try {
-          pValues = await fetchSignificantTermPValues(
-            client,
-            requestBody,
-            [fieldCandidate],
+          pValues = await fetchSignificantTermPValues({
+            esClient,
+            abortSignal,
             logger,
-            stateHandler.sampleProbability(),
-            responseStream.pushError,
-            abortSignal
-          );
+            emitError: responseStream.pushError,
+            arguments: {
+              ...requestBody,
+              fieldNames: [fieldCandidate],
+              sampleProbability: stateHandler.sampleProbability(),
+            },
+          });
         } catch (e) {
           if (!isRequestAbortedError(e)) {
             logger.error(
@@ -144,15 +146,17 @@ export const significantItemsHandlerFactory =
       } else if (isTextFieldCandidate(payload)) {
         const { textFieldCandidate } = payload;
 
-        const significantCategoriesForField = await fetchSignificantCategories(
-          client,
-          requestBody,
-          [textFieldCandidate],
+        const significantCategoriesForField = await fetchSignificantCategories({
+          esClient,
           logger,
-          stateHandler.sampleProbability(),
-          responseStream.pushError,
-          abortSignal
-        );
+          emitError: responseStream.pushError,
+          abortSignal,
+          arguments: {
+            ...requestBody,
+            fieldNames: [textFieldCandidate],
+            sampleProbability: stateHandler.sampleProbability(),
+          },
+        });
 
         if (significantCategoriesForField.length > 0) {
           significantCategories.push(...significantCategoriesForField);
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts
index 8844bd5082e33..882057bc12cbf 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/analysis_handlers/top_items_handler.ts
@@ -33,7 +33,7 @@ import type { ResponseStreamFetchOptions } from '../response_stream_factory';
 export const topItemsHandlerFactory =
   <T extends ApiVersion>({
     abortSignal,
-    client,
+    esClient,
     logDebugMessage,
     logger,
     requestBody,
@@ -64,7 +64,7 @@ export const topItemsHandlerFactory =
     if (textFieldCandidates.length > 0) {
       topCategories.push(
         ...(await fetchTopCategories(
-          client,
+          esClient,
           requestBody,
           textFieldCandidates,
           logger,
@@ -113,7 +113,7 @@ export const topItemsHandlerFactory =
 
       try {
         fetchedTopTerms = await fetchTopTerms(
-          client,
+          esClient,
           requestBody,
           [fieldCandidate],
           logger,
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/response_stream_factory.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/response_stream_factory.ts
index f6ada20d3f4f8..a3e525598ef25 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/response_stream_factory.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/response_stream_factory.ts
@@ -39,7 +39,7 @@ import { streamPushPingWithTimeoutFactory } from './response_stream_utils/stream
  */
 export interface ResponseStreamOptions<T extends ApiVersion> {
   version: T;
-  client: ElasticsearchClient;
+  esClient: ElasticsearchClient;
   requestBody: AiopsLogRateAnalysisSchema<T>;
   events: KibanaRequestEvents;
   headers: Headers;
diff --git a/x-pack/plugins/aiops/server/routes/log_rate_analysis/route_handler_factory.ts b/x-pack/plugins/aiops/server/routes/log_rate_analysis/route_handler_factory.ts
index 0864efbcf63da..4c8145043891f 100644
--- a/x-pack/plugins/aiops/server/routes/log_rate_analysis/route_handler_factory.ts
+++ b/x-pack/plugins/aiops/server/routes/log_rate_analysis/route_handler_factory.ts
@@ -58,14 +58,14 @@ export function routeHandlerFactory<T extends ApiVersion>(
       return response.forbidden();
     }
 
-    const client = (await context.core).elasticsearch.client.asCurrentUser;
+    const esClient = (await context.core).elasticsearch.client.asCurrentUser;
     const executionContext = createExecutionContext(coreStart, AIOPS_PLUGIN_ID, request.route.path);
 
     return await coreStart.executionContext.withContext(executionContext, () => {
       const { analysis, logDebugMessage, stateHandler, responseStream, responseWithHeaders } =
         responseStreamFactory<T>({
           version,
-          client,
+          esClient,
           requestBody: request.body,
           events: request.events,
           headers: request.headers,
diff --git a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
index 66cc1a3077481..136d7dd73d32a 100644
--- a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
+++ b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
@@ -520,9 +520,10 @@ export class AlertsClient<
         );
       } else {
         this.options.logger.debug(
-          `Could not find alert document to update for recovered alert with id ${id} and uuid ${currentRecoveredAlerts[
-            id
-          ].getUuid()}`
+          () =>
+            `Could not find alert document to update for recovered alert with id ${id} and uuid ${currentRecoveredAlerts[
+              id
+            ].getUuid()}`
         );
       }
     }
diff --git a/x-pack/plugins/alerting/server/alerts_service/lib/data_stream_adapter.ts b/x-pack/plugins/alerting/server/alerts_service/lib/data_stream_adapter.ts
index 0a3710ecf1159..98cd0b67ff05a 100644
--- a/x-pack/plugins/alerting/server/alerts_service/lib/data_stream_adapter.ts
+++ b/x-pack/plugins/alerting/server/alerts_service/lib/data_stream_adapter.ts
@@ -152,9 +152,10 @@ async function createAliasStream(opts: CreateConcreteWriteIndexOpts): Promise<vo
     );
 
     logger.debug(
-      `Found ${concreteIndices.length} concrete indices for ${
-        indexPatterns.name
-      } - ${JSON.stringify(concreteIndices)}`
+      () =>
+        `Found ${concreteIndices.length} concrete indices for ${
+          indexPatterns.name
+        } - ${JSON.stringify(concreteIndices)}`
     );
   } catch (error) {
     // 404 is expected if no concrete write indices have been created
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
index da0b65f550deb..bc5cc108dba2b 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.test.ts
@@ -25,7 +25,7 @@ const esqlQueryRequest = {
   },
 };
 
-const logger = loggingSystemMock.create().get();
+let logger = loggingSystemMock.create().get();
 
 const rule = {
   name: 'test-rule',
@@ -43,6 +43,10 @@ describe('wrapScopedClusterClient', () => {
     jest.useRealTimers();
   });
 
+  beforeEach(() => {
+    logger = loggingSystemMock.create().get();
+  });
+
   afterEach(() => {
     jest.resetAllMocks();
   });
@@ -68,7 +72,7 @@ describe('wrapScopedClusterClient', () => {
       });
       expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
       expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         `executing query for rule .test-rule-type:abcdefg in space my-space - {\"body\":{\"query\":{\"bool\":{\"filter\":{\"range\":{\"@timestamp\":{\"gte\":0}}}}}}} - with options {} and 5000ms requestTimeout`
       );
     });
@@ -93,7 +97,7 @@ describe('wrapScopedClusterClient', () => {
       });
       expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
       expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         `executing query for rule .test-rule-type:abcdefg in space my-space - {\"body\":{\"query\":{\"bool\":{\"filter\":{\"range\":{\"@timestamp\":{\"gte\":0}}}}}}} - with options {} and 5000ms requestTimeout`
       );
     });
@@ -193,7 +197,7 @@ describe('wrapScopedClusterClient', () => {
       expect(stats.numSearches).toEqual(3);
       expect(stats.esSearchDurationMs).toEqual(999);
 
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         `executing query for rule .test-rule-type:abcdefg in space my-space - {\"body\":{\"query\":{\"bool\":{\"filter\":{\"range\":{\"@timestamp\":{\"gte\":0}}}}}}} - with options {}`
       );
     });
@@ -241,7 +245,7 @@ describe('wrapScopedClusterClient', () => {
       });
       expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
       expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         'executing eql query for rule .test-rule-type:abcdefg in space my-space - {"index":"foo","query":"process where process.name == \\"regsvr32.exe\\""} - with options {} and 5000ms requestTimeout'
       );
     });
@@ -266,7 +270,7 @@ describe('wrapScopedClusterClient', () => {
       });
       expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
       expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         'executing eql query for rule .test-rule-type:abcdefg in space my-space - {"index":"foo","query":"process where process.name == \\"regsvr32.exe\\""} - with options {} and 5000ms requestTimeout'
       );
     });
@@ -340,7 +344,7 @@ describe('wrapScopedClusterClient', () => {
       expect(stats.numSearches).toEqual(3);
       expect(stats.esSearchDurationMs).toEqual(999);
 
-      expect(logger.debug).toHaveBeenCalledWith(
+      expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
         `executing eql query for rule .test-rule-type:abcdefg in space my-space - {\"index\":\"foo\",\"query\":\"process where process.name == \\\"regsvr32.exe\\\"\"} - with options {}`
       );
     });
@@ -391,7 +395,7 @@ describe('wrapScopedClusterClient', () => {
         });
         expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
         expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-        expect(logger.debug).toHaveBeenCalledWith(
+        expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
           'executing ES|QL query for rule .test-rule-type:abcdefg in space my-space - {"method":"POST","path":"/_query","body":{"query":"from .kibana_task_manager"}} - with options {} and 5000ms requestTimeout'
         );
       });
@@ -416,7 +420,7 @@ describe('wrapScopedClusterClient', () => {
         });
         expect(scopedClusterClient.asInternalUser.search).not.toHaveBeenCalled();
         expect(scopedClusterClient.asCurrentUser.search).not.toHaveBeenCalled();
-        expect(logger.debug).toHaveBeenCalledWith(
+        expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
           'executing ES|QL query for rule .test-rule-type:abcdefg in space my-space - {"method":"POST","path":"/_query","body":{"query":"from .kibana_task_manager"}} - with options {} and 5000ms requestTimeout'
         );
       });
@@ -490,7 +494,7 @@ describe('wrapScopedClusterClient', () => {
         expect(stats.numSearches).toEqual(3);
         expect(stats.totalSearchDurationMs).toBeGreaterThan(-1);
 
-        expect(logger.debug).toHaveBeenCalledWith(
+        expect(loggingSystemMock.collect(logger).debug[0][0]).toEqual(
           `executing ES|QL query for rule .test-rule-type:abcdefg in space my-space - {\"method\":\"POST\",\"path\":\"/_query\",\"body\":{\"query\":\"from .kibana_task_manager\"}} - with options {}`
         );
       });
diff --git a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
index ac5b407e4029c..fb7575891dfc8 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_scoped_cluster_client.ts
@@ -167,11 +167,12 @@ function getWrappedTransportRequestFn(opts: WrapEsClientOpts) {
         const requestOptions = options ?? {};
         const start = Date.now();
         opts.logger.debug(
-          `executing ES|QL query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
-            opts.rule.spaceId
-          } - ${JSON.stringify(params)} - with options ${JSON.stringify(requestOptions)}${
-            requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
-          }`
+          () =>
+            `executing ES|QL query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
+              opts.rule.spaceId
+            } - ${JSON.stringify(params)} - with options ${JSON.stringify(requestOptions)}${
+              requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
+            }`
         );
         const result = (await originalRequestFn.call(opts.esClient.transport, params, {
           ...requestOptions,
@@ -235,11 +236,12 @@ function getWrappedEqlSearchFn(opts: WrapEsClientOpts) {
       const searchOptions = options ?? {};
       const start = Date.now();
       opts.logger.debug(
-        `executing eql query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
-          opts.rule.spaceId
-        } - ${JSON.stringify(params)} - with options ${JSON.stringify(searchOptions)}${
-          requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
-        }`
+        () =>
+          `executing eql query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
+            opts.rule.spaceId
+          } - ${JSON.stringify(params)} - with options ${JSON.stringify(searchOptions)}${
+            requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
+          }`
       );
       const result = (await originalEqlSearch.call(opts.esClient, params, {
         ...searchOptions,
@@ -316,11 +318,12 @@ function getWrappedSearchFn(opts: WrapEsClientOpts) {
       const searchOptions = options ?? {};
       const start = Date.now();
       opts.logger.debug(
-        `executing query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
-          opts.rule.spaceId
-        } - ${JSON.stringify(params)} - with options ${JSON.stringify(searchOptions)}${
-          requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
-        }`
+        () =>
+          `executing query for rule ${opts.rule.alertTypeId}:${opts.rule.id} in space ${
+            opts.rule.spaceId
+          } - ${JSON.stringify(params)} - with options ${JSON.stringify(searchOptions)}${
+            requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
+          }`
       );
       const result = (await originalSearch.call(opts.esClient, params, {
         ...searchOptions,
diff --git a/x-pack/plugins/alerting/server/lib/wrap_search_source_client.test.ts b/x-pack/plugins/alerting/server/lib/wrap_search_source_client.test.ts
index 21fe0e7ecb02f..2eb51cfd06f7a 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_search_source_client.test.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_search_source_client.test.ts
@@ -11,7 +11,7 @@ import { createSearchSourceMock } from '@kbn/data-plugin/common/search/search_so
 import { of, throwError } from 'rxjs';
 import { wrapSearchSourceClient } from './wrap_search_source_client';
 
-const logger = loggingSystemMock.create().get();
+let logger: ReturnType<typeof loggingSystemMock.createLogger>;
 
 const rule = {
   name: 'test-rule',
@@ -38,6 +38,10 @@ describe('wrapSearchSourceClient', () => {
     jest.useFakeTimers({ legacyFakeTimers: true });
   });
 
+  beforeEach(() => {
+    logger = loggingSystemMock.createLogger();
+  });
+
   afterAll(() => {
     jest.useRealTimers();
   });
@@ -84,7 +88,7 @@ describe('wrapSearchSourceClient', () => {
         requestTimeout: 5000,
       },
     });
-    expect(logger.debug).toHaveBeenCalledWith(
+    expect(loggingSystemMock.collect(logger).debug.map((params) => params[0])).toContain(
       `executing query for rule .test-rule-type:abcdefg in space my-space - with options {} and 5000ms requestTimeout`
     );
   });
@@ -136,7 +140,7 @@ describe('wrapSearchSourceClient', () => {
     expect(stats.numSearches).toEqual(3);
     expect(stats.esSearchDurationMs).toEqual(999);
 
-    expect(logger.debug).toHaveBeenCalledWith(
+    expect(loggingSystemMock.collect(logger).debug.map((params) => params[0])).toContain(
       `executing query for rule .test-rule-type:abcdefg in space my-space - with options {}`
     );
   });
diff --git a/x-pack/plugins/alerting/server/lib/wrap_search_source_client.ts b/x-pack/plugins/alerting/server/lib/wrap_search_source_client.ts
index 77d08a969fae0..e1cf3cba0bd24 100644
--- a/x-pack/plugins/alerting/server/lib/wrap_search_source_client.ts
+++ b/x-pack/plugins/alerting/server/lib/wrap_search_source_client.ts
@@ -153,11 +153,12 @@ function wrapFetch$({
     const start = Date.now();
 
     logger.debug(
-      `executing query for rule ${rule.alertTypeId}:${rule.id} in space ${
-        rule.spaceId
-      } - with options ${JSON.stringify(searchOptions)}${
-        requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
-      }`
+      () =>
+        `executing query for rule ${rule.alertTypeId}:${rule.id} in space ${
+          rule.spaceId
+        } - with options ${JSON.stringify(searchOptions)}${
+          requestTimeout ? ` and ${requestTimeout}ms requestTimeout` : ''
+        }`
     );
 
     return pureSearchSource
diff --git a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts
index f768f85d17748..84181bb512a78 100644
--- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.test.ts
@@ -366,6 +366,7 @@ describe('Ad Hoc Task Runner', () => {
       triggeredActionsStatus: 'complete',
     });
     (RuleRunMetricsStore as jest.Mock).mockImplementation(() => ruleRunMetricsStore);
+    logger.isLevelEnabled.mockReturnValue(true);
     logger.get.mockImplementation(() => logger);
     taskRunnerFactoryInitializerParams.executionContext.withContext.mockImplementation((ctx, fn) =>
       fn()
@@ -1244,6 +1245,84 @@ describe('Ad Hoc Task Runner', () => {
       expect(logger.error).not.toHaveBeenCalled();
     });
 
+    test('should handle task cancellation signal due to timeout when for last schedule entry', async () => {
+      encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+        ...mockedAdHocRunSO,
+        attributes: {
+          ...mockedAdHocRunSO.attributes,
+          schedule: [{ ...schedule1, status: adHocRunStatus.COMPLETE }, schedule2],
+        },
+      });
+      const taskRunner = new AdHocTaskRunner({
+        context: taskRunnerFactoryInitializerParams,
+        internalSavedObjectsRepository,
+        taskInstance: mockedTaskInstance,
+      });
+
+      const promise = taskRunner.run();
+      await Promise.resolve();
+      await taskRunner.cancel();
+      await promise;
+      await taskRunner.cleanup();
+
+      expect(encryptedSavedObjectsClient.getDecryptedAsInternalUser).toHaveBeenCalledWith(
+        AD_HOC_RUN_SAVED_OBJECT_TYPE,
+        'abc',
+        {}
+      );
+      expect(ruleTypeRegistry.get).toHaveBeenCalledWith('siem.queryRule');
+      expect(ruleTypeRegistry.ensureRuleTypeEnabled).toHaveBeenCalledWith('siem.queryRule');
+      expect(mockValidateRuleTypeParams).toHaveBeenCalledWith(
+        mockedAdHocRunSO.attributes.rule.params,
+        ruleTypeWithAlerts.validate.params
+      );
+
+      // @ts-ignore - accessing private variable
+      // should run the first entry in the schedule
+      expect(taskRunner.scheduleToRunIndex).toEqual(1);
+      expect(RuleRunMetricsStore).toHaveBeenCalledTimes(1);
+      expect(ruleTypeWithAlerts.executor).toHaveBeenCalledTimes(1);
+
+      expect(internalSavedObjectsRepository.update).toHaveBeenCalledWith(
+        AD_HOC_RUN_SAVED_OBJECT_TYPE,
+        mockedAdHocRunSO.id,
+        {
+          schedule: [
+            { ...schedule1, status: adHocRunStatus.COMPLETE },
+            { ...schedule2, status: adHocRunStatus.TIMEOUT },
+          ],
+        },
+        { namespace: undefined, refresh: false }
+      );
+
+      expect(internalSavedObjectsRepository.delete).toHaveBeenCalledWith(
+        AD_HOC_RUN_SAVED_OBJECT_TYPE,
+        mockedAdHocRunSO.id,
+        { namespace: undefined, refresh: false }
+      );
+
+      testAlertingEventLogCalls({
+        status: 'ok',
+        timeout: true,
+        backfillRunAt: schedule2.runAt,
+        backfillInterval: schedule2.interval,
+      });
+      expect(logger.debug).toHaveBeenCalledTimes(3);
+      expect(logger.debug).nthCalledWith(
+        1,
+        `Executing ad hoc run for rule test:rule-id for runAt ${schedule2.runAt}`
+      );
+      expect(logger.debug).nthCalledWith(
+        2,
+        `Cancelling execution for ad hoc run with id abc for rule type test with id rule-id - execution exceeded rule type timeout of 3m`
+      );
+      expect(logger.debug).nthCalledWith(
+        3,
+        `Aborting any in-progress ES searches for rule type test with id rule-id`
+      );
+      expect(logger.error).not.toHaveBeenCalled();
+    });
+
     test('should handle task cancellation that leads to executor throwing error', async () => {
       ruleTypeWithAlerts.executor.mockImplementationOnce(() => {
         throw new Error('Search has been aborted due to cancelled execution');
diff --git a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts
index bccf28a7cb7bc..61f8f411aef8b 100644
--- a/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/ad_hoc_task_runner.ts
@@ -20,7 +20,7 @@ import {
   TaskErrorSource,
 } from '@kbn/task-manager-plugin/server';
 import { nanosToMillis } from '@kbn/event-log-plugin/common';
-import { RunResult } from '@kbn/task-manager-plugin/server/task';
+import { CancellableTask, RunResult } from '@kbn/task-manager-plugin/server/task';
 import { AdHocRunStatus, adHocRunStatus } from '../../common/constants';
 import { RuleRunnerErrorStackTraceLog, RuleTaskStateAndMetrics, TaskRunnerContext } from './types';
 import { getExecutorServices } from './get_executor_services';
@@ -66,7 +66,7 @@ interface RunParams {
   validatedParams: RuleTypeParams;
 }
 
-export class AdHocTaskRunner {
+export class AdHocTaskRunner implements CancellableTask {
   private readonly context: TaskRunnerContext;
   private readonly executionId: string;
   private readonly internalSavedObjectsRepository: ISavedObjectsRepository;
@@ -573,6 +573,10 @@ export class AdHocTaskRunner {
             : undefined,
       },
     });
+    this.shouldDeleteTask = !this.hasAnyPendingRuns();
+
+    // cleanup function is not called for timed out tasks
+    await this.cleanup();
   }
 
   async cleanup() {
diff --git a/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.test.ts b/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.test.ts
index e30865028867a..615a0416c8571 100644
--- a/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.test.ts
@@ -6,12 +6,12 @@
  */
 
 import { processRunResults } from './process_run_result';
-import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { loggerMock } from '@kbn/logging-mocks';
 import { ruleResultServiceMock } from '../../monitoring/rule_result_service.mock';
 import { asErr, asOk } from '../../lib/result_type';
 import { ActionsCompletion } from '@kbn/alerting-state-types';
 
-const logger = loggingSystemMock.create().get();
+const logger = loggerMock.create();
 const ruleResultService = ruleResultServiceMock.create();
 
 const executionMetrics = {
@@ -32,6 +32,7 @@ const executionMetrics = {
 describe('processRunResults', () => {
   beforeEach(() => {
     jest.resetAllMocks();
+    logger.isLevelEnabled.mockReturnValue(true);
   });
 
   test('should process results as expected when results are successful', () => {
diff --git a/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.ts b/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.ts
index d419ffeb72a3a..b1d898b1ec074 100644
--- a/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.ts
+++ b/x-pack/plugins/alerting/server/task_runner/lib/process_run_result.ts
@@ -69,7 +69,7 @@ export function processRunResults({
     (err: ElasticsearchError) => lastRunFromError(err)
   );
 
-  if (logger) {
+  if (logger && logger.isLevelEnabled('debug')) {
     logger.debug(`deprecated ruleRunStatus for ${logPrefix}: ${JSON.stringify(executionStatus)}`);
     logger.debug(`ruleRunStatus for ${logPrefix}: ${JSON.stringify(lastRun)}`);
     if (executionMetrics) {
diff --git a/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts b/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
index 8bde8e3abf403..aabd657289e75 100644
--- a/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/log_alerts.test.ts
@@ -27,6 +27,7 @@ describe('logAlerts', () => {
 
   beforeEach(() => {
     jest.resetAllMocks();
+    logger.isLevelEnabled.mockReturnValue(true);
     ruleRunMetricsStore = new RuleRunMetricsStore();
   });
 
diff --git a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
index 10d3f06dd0de5..a83f8ebb74ac4 100644
--- a/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
+++ b/x-pack/plugins/alerting/server/task_runner/log_alerts.ts
@@ -58,7 +58,7 @@ export function logAlerts<
     });
   }
 
-  if (activeAlertIds.length > 0) {
+  if (activeAlertIds.length > 0 && logger.isLevelEnabled('debug')) {
     logger.debug(
       `rule ${ruleLogPrefix} has ${activeAlertIds.length} active alerts: ${JSON.stringify(
         activeAlertIds.map((alertId) => ({
@@ -68,7 +68,7 @@ export function logAlerts<
       )}`
     );
   }
-  if (recoveredAlertIds.length > 0) {
+  if (recoveredAlertIds.length > 0 && logger.isLevelEnabled('debug')) {
     logger.debug(
       `rule ${ruleLogPrefix} has ${recoveredAlertIds.length} recovered alerts: ${JSON.stringify(
         recoveredAlertIds
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
index d87dbf17f2d89..d6f4e4942da1b 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.test.ts
@@ -220,6 +220,7 @@ describe('Task Runner', () => {
 
   beforeEach(() => {
     jest.resetAllMocks();
+    logger.isLevelEnabled.mockReturnValue(true);
     jest
       .requireMock('../lib/wrap_scoped_cluster_client')
       .createWrappedScopedClusterClientFactory.mockReturnValue({
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner.ts b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
index d5da0a3a8a226..fadd0a944acc8 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -630,11 +630,13 @@ export class TaskRunner<
           if (outcome === 'failure') {
             this.inMemoryMetrics.increment(IN_MEMORY_METRICS.RULE_FAILURES);
           }
-          this.logger.debug(
-            `Updating rule task for ${this.ruleType.id} rule with id ${ruleId} - ${JSON.stringify(
-              executionStatus
-            )} - ${JSON.stringify(lastRun)}`
-          );
+          if (this.logger.isLevelEnabled('debug')) {
+            this.logger.debug(
+              `Updating rule task for ${this.ruleType.id} rule with id ${ruleId} - ${JSON.stringify(
+                executionStatus
+              )} - ${JSON.stringify(lastRun)}`
+            );
+          }
           await this.updateRuleSavedObjectPostRun(ruleId, namespace, {
             executionStatus: ruleExecutionStatusToRaw(executionStatus),
             nextRun,
diff --git a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
index 0e95ad588eda1..b41b26bd1ea49 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner_cancel.test.ts
@@ -198,6 +198,7 @@ describe('Task Runner Cancel', () => {
     alertingEventLogger.getStartAndDuration.mockImplementation(() => ({ start: new Date() }));
     (AlertingEventLogger as jest.Mock).mockImplementation(() => alertingEventLogger);
     logger.get.mockImplementation(() => logger);
+    logger.isLevelEnabled.mockReturnValue(true);
 
     actionsClient.bulkEnqueueExecution.mockResolvedValue({ errors: false, items: [] });
   });
diff --git a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_event_log.ts b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_event_log.ts
index 49b7c7374213d..df76929ca5d50 100644
--- a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_event_log.ts
+++ b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_event_log.ts
@@ -156,10 +156,10 @@ export async function getExecutionsPerDayCount({
       },
     };
 
-    logger.debug(`query for getExecutionsPerDayCount - ${JSON.stringify(query)}`);
+    logger.debug(() => `query for getExecutionsPerDayCount - ${JSON.stringify(query)}`);
     const results = await esClient.search(query);
 
-    logger.debug(`results for getExecutionsPerDayCount query - ${JSON.stringify(results)}`);
+    logger.debug(() => `results for getExecutionsPerDayCount query - ${JSON.stringify(results)}`);
 
     const totalRuleExecutions =
       typeof results.hits.total === 'number' ? results.hits.total : results.hits.total?.value;
@@ -242,10 +242,12 @@ export async function getExecutionTimeoutsPerDayCount({
       },
     };
 
-    logger.debug(`query for getExecutionTimeoutsPerDayCount - ${JSON.stringify(query)}`);
+    logger.debug(() => `query for getExecutionTimeoutsPerDayCount - ${JSON.stringify(query)}`);
     const results = await esClient.search(query);
 
-    logger.debug(`results for getExecutionTimeoutsPerDayCount query - ${JSON.stringify(results)}`);
+    logger.debug(
+      () => `results for getExecutionTimeoutsPerDayCount query - ${JSON.stringify(results)}`
+    );
 
     const aggregations = results.aggregations as {
       by_rule_type_id: AggregationsTermsAggregateBase<AggregationsStringTermsBucketKeys>;
diff --git a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_kibana.ts b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_kibana.ts
index ecaf99ffc44a3..fdfdbf1dbcfe6 100644
--- a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_kibana.ts
+++ b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_kibana.ts
@@ -272,10 +272,10 @@ export async function getTotalCountAggregations({
       },
     };
 
-    logger.debug(`query for getTotalCountAggregations - ${JSON.stringify(query)}`);
+    logger.debug(() => `query for getTotalCountAggregations - ${JSON.stringify(query)}`);
     const results = await esClient.search(query);
 
-    logger.debug(`results for getTotalCountAggregations query - ${JSON.stringify(results)}`);
+    logger.debug(() => `results for getTotalCountAggregations query - ${JSON.stringify(results)}`);
 
     const aggregations = results.aggregations as {
       by_rule_type_id: AggregationsTermsAggregateBase<AggregationsStringTermsBucketKeys>;
@@ -445,10 +445,10 @@ export async function getTotalCountInUse({
       },
     };
 
-    logger.debug(`query for getTotalCountInUse - ${JSON.stringify(query)}`);
+    logger.debug(() => `query for getTotalCountInUse - ${JSON.stringify(query)}`);
     const results = await esClient.search(query);
 
-    logger.debug(`results for getTotalCountInUse query - ${JSON.stringify(results)}`);
+    logger.debug(() => `results for getTotalCountInUse query - ${JSON.stringify(results)}`);
 
     const aggregations = results.aggregations as {
       by_rule_type_id: AggregationsTermsAggregateBase<AggregationsStringTermsBucketKeys>;
diff --git a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_task_manager.ts b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_task_manager.ts
index 9b37051db5baf..f3741a086bf9b 100644
--- a/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_task_manager.ts
+++ b/x-pack/plugins/alerting/server/usage/lib/get_telemetry_from_task_manager.ts
@@ -99,11 +99,11 @@ export async function getFailedAndUnrecognizedTasksPerDay({
       },
     };
 
-    logger.debug(`query for getFailedAndUnrecognizedTasksPerDay - ${JSON.stringify(query)}`);
+    logger.debug(() => `query for getFailedAndUnrecognizedTasksPerDay - ${JSON.stringify(query)}`);
     const results = await esClient.search(query);
 
     logger.debug(
-      `results for getFailedAndUnrecognizedTasksPerDay query - ${JSON.stringify(results)}`
+      () => `results for getFailedAndUnrecognizedTasksPerDay query - ${JSON.stringify(results)}`
     );
 
     const aggregations = results.aggregations as {
diff --git a/x-pack/plugins/cases/docs/openapi/bundled.json b/x-pack/plugins/cases/docs/openapi/bundled.json
index 152a5c34e87a4..6bc965f7ee5fc 100644
--- a/x-pack/plugins/cases/docs/openapi/bundled.json
+++ b/x-pack/plugins/cases/docs/openapi/bundled.json
@@ -354,9 +354,9 @@
     },
     "/api/cases/configure": {
       "get": {
-        "summary": "Retrieves external connection details, such as the closure type and default connector for cases in the default space.",
+        "summary": "Get case settings in the default space",
         "operationId": "getCaseConfigurationDefaultSpace",
-        "description": "You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.\n",
+        "description": "Retrieves setting details such as the closure type, custom fields, templatse, and the default connector for cases in the default space. You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the cases were created.\n",
         "tags": [
           "cases"
         ],
@@ -378,40 +378,6 @@
                       "closure_type": {
                         "$ref": "#/components/schemas/closure_types"
                       },
-                      "customFields": {
-                        "type": "array",
-                        "x-technical-preview": true,
-                        "description": "Custom fields configuration details.",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "key": {
-                              "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 36
-                            },
-                            "label": {
-                              "description": "The custom field label that is displayed in the case.",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 50
-                            },
-                            "required": {
-                              "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                              "type": "boolean"
-                            },
-                            "type": {
-                              "description": "The type of the custom field.",
-                              "type": "string",
-                              "enum": [
-                                "text",
-                                "toggle"
-                              ]
-                            }
-                          }
-                        }
-                      },
                       "connector": {
                         "type": "object",
                         "properties": {
@@ -491,6 +457,51 @@
                           }
                         }
                       },
+                      "customFields": {
+                        "type": "array",
+                        "x-technical-preview": true,
+                        "description": "Custom fields configuration details.",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "defaultValue": {
+                              "oneOf": [
+                                {
+                                  "type": "string"
+                                },
+                                {
+                                  "type": "boolean"
+                                }
+                              ],
+                              "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                            },
+                            "key": {
+                              "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 36
+                            },
+                            "label": {
+                              "description": "The custom field label that is displayed in the case.",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 50
+                            },
+                            "required": {
+                              "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                              "type": "boolean"
+                            },
+                            "type": {
+                              "description": "The type of the custom field.",
+                              "type": "string",
+                              "enum": [
+                                "text",
+                                "toggle"
+                              ]
+                            }
+                          }
+                        }
+                      },
                       "error": {
                         "type": [
                           "string",
@@ -535,6 +546,9 @@
                       "owner": {
                         "$ref": "#/components/schemas/owners"
                       },
+                      "templates": {
+                        "$ref": "#/components/schemas/templates"
+                      },
                       "updated_at": {
                         "type": [
                           "string",
@@ -621,9 +635,9 @@
         }
       },
       "post": {
-        "summary": "Creates a case specific configuration that includes external connection details and custom fields.",
+        "summary": "Add case settings in the default space",
         "operationId": "setCaseConfigurationDefaultSpace",
-        "description": "You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details.\n",
+        "description": "Case settings include external connection details, custom fields, and templates.  Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.\n",
         "tags": [
           "cases"
         ],
@@ -657,40 +671,6 @@
                     "closure_type": {
                       "$ref": "#/components/schemas/closure_types"
                     },
-                    "customFields": {
-                      "type": "array",
-                      "x-technical-preview": true,
-                      "description": "Custom fields configuration details.",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "key": {
-                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 36
-                          },
-                          "label": {
-                            "description": "The custom field label that is displayed in the case.",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 50
-                          },
-                          "required": {
-                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                            "type": "boolean"
-                          },
-                          "type": {
-                            "description": "The type of the custom field.",
-                            "type": "string",
-                            "enum": [
-                              "text",
-                              "toggle"
-                            ]
-                          }
-                        }
-                      }
-                    },
                     "connector": {
                       "type": "object",
                       "properties": {
@@ -770,6 +750,51 @@
                         }
                       }
                     },
+                    "customFields": {
+                      "type": "array",
+                      "x-technical-preview": true,
+                      "description": "Custom fields configuration details.",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "defaultValue": {
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "boolean"
+                              }
+                            ],
+                            "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                          },
+                          "key": {
+                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 36
+                          },
+                          "label": {
+                            "description": "The custom field label that is displayed in the case.",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 50
+                          },
+                          "required": {
+                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                            "type": "boolean"
+                          },
+                          "type": {
+                            "description": "The type of the custom field.",
+                            "type": "string",
+                            "enum": [
+                              "text",
+                              "toggle"
+                            ]
+                          }
+                        }
+                      }
+                    },
                     "error": {
                       "type": [
                         "string",
@@ -814,6 +839,9 @@
                     "owner": {
                       "$ref": "#/components/schemas/owners"
                     },
+                    "templates": {
+                      "$ref": "#/components/schemas/templates"
+                    },
                     "updated_at": {
                       "type": [
                         "string",
@@ -901,9 +929,9 @@
     },
     "/api/cases/configure/{configurationId}": {
       "patch": {
-        "summary": "Updates external connection details, such as the closure type and default connector for cases in the default space.",
+        "summary": "Update case settings in the default space",
         "operationId": "updateCaseConfigurationDefaultSpace",
-        "description": "You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API.\n",
+        "description": "Updates setting details such as the closure type, custom fields, templates, and the default connector for cases in the default space. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the case was created.\n",
         "tags": [
           "cases"
         ],
@@ -940,40 +968,6 @@
                     "closure_type": {
                       "$ref": "#/components/schemas/closure_types"
                     },
-                    "customFields": {
-                      "type": "array",
-                      "x-technical-preview": true,
-                      "description": "Custom fields configuration details.",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "key": {
-                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 36
-                          },
-                          "label": {
-                            "description": "The custom field label that is displayed in the case.",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 50
-                          },
-                          "required": {
-                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                            "type": "boolean"
-                          },
-                          "type": {
-                            "description": "The type of the custom field.",
-                            "type": "string",
-                            "enum": [
-                              "text",
-                              "toggle"
-                            ]
-                          }
-                        }
-                      }
-                    },
                     "connector": {
                       "type": "object",
                       "properties": {
@@ -1053,6 +1047,51 @@
                         }
                       }
                     },
+                    "customFields": {
+                      "type": "array",
+                      "x-technical-preview": true,
+                      "description": "Custom fields configuration details.",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "defaultValue": {
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "boolean"
+                              }
+                            ],
+                            "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                          },
+                          "key": {
+                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 36
+                          },
+                          "label": {
+                            "description": "The custom field label that is displayed in the case.",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 50
+                          },
+                          "required": {
+                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                            "type": "boolean"
+                          },
+                          "type": {
+                            "description": "The type of the custom field.",
+                            "type": "string",
+                            "enum": [
+                              "text",
+                              "toggle"
+                            ]
+                          }
+                        }
+                      }
+                    },
                     "error": {
                       "type": [
                         "string",
@@ -1097,6 +1136,9 @@
                     "owner": {
                       "$ref": "#/components/schemas/owners"
                     },
+                    "templates": {
+                      "$ref": "#/components/schemas/templates"
+                    },
                     "updated_at": {
                       "type": [
                         "string",
@@ -1903,9 +1945,9 @@
     },
     "/api/cases/configure/connectors/_find": {
       "get": {
-        "summary": "Retrieves information about connectors in the default space.",
+        "summary": "Get case connectors in the default space",
         "operationId": "findCaseConnectorsDefaultSpace",
-        "description": "In particular, only the connectors that are supported for use in cases are returned. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.\n",
+        "description": "Retrieves information about connectors that are supported for use in cases in the default space. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.\n",
         "tags": [
           "cases"
         ],
@@ -2312,9 +2354,9 @@
     },
     "/s/{spaceId}/api/cases/configure": {
       "get": {
-        "summary": "Retrieves external connection details, such as the closure type and default connector for cases.",
+        "summary": "Get case settings",
         "operationId": "getCaseConfiguration",
-        "description": "You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.\n",
+        "description": "Retrieves setting details such as the closure type, custom fields, templates, and the default connector for cases. You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the cases were created.\n",
         "tags": [
           "cases"
         ],
@@ -2339,40 +2381,6 @@
                       "closure_type": {
                         "$ref": "#/components/schemas/closure_types"
                       },
-                      "customFields": {
-                        "type": "array",
-                        "x-technical-preview": true,
-                        "description": "Custom fields configuration details.",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "key": {
-                              "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 36
-                            },
-                            "label": {
-                              "description": "The custom field label that is displayed in the case.",
-                              "type": "string",
-                              "minLength": 1,
-                              "maxLength": 50
-                            },
-                            "required": {
-                              "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                              "type": "boolean"
-                            },
-                            "type": {
-                              "description": "The type of the custom field.",
-                              "type": "string",
-                              "enum": [
-                                "text",
-                                "toggle"
-                              ]
-                            }
-                          }
-                        }
-                      },
                       "connector": {
                         "type": "object",
                         "properties": {
@@ -2452,6 +2460,51 @@
                           }
                         }
                       },
+                      "customFields": {
+                        "type": "array",
+                        "x-technical-preview": true,
+                        "description": "Custom fields configuration details.",
+                        "items": {
+                          "type": "object",
+                          "properties": {
+                            "defaultValue": {
+                              "oneOf": [
+                                {
+                                  "type": "string"
+                                },
+                                {
+                                  "type": "boolean"
+                                }
+                              ],
+                              "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                            },
+                            "key": {
+                              "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 36
+                            },
+                            "label": {
+                              "description": "The custom field label that is displayed in the case.",
+                              "type": "string",
+                              "minLength": 1,
+                              "maxLength": 50
+                            },
+                            "required": {
+                              "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                              "type": "boolean"
+                            },
+                            "type": {
+                              "description": "The type of the custom field.",
+                              "type": "string",
+                              "enum": [
+                                "text",
+                                "toggle"
+                              ]
+                            }
+                          }
+                        }
+                      },
                       "error": {
                         "type": [
                           "string",
@@ -2496,6 +2549,9 @@
                       "owner": {
                         "$ref": "#/components/schemas/owners"
                       },
+                      "templates": {
+                        "$ref": "#/components/schemas/templates"
+                      },
                       "updated_at": {
                         "type": [
                           "string",
@@ -2582,9 +2638,9 @@
         }
       },
       "post": {
-        "summary": "Creates a case specific configuration that includes external connection details and custom fields.",
+        "summary": "Add case settings",
         "operationId": "setCaseConfiguration",
-        "description": "You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details.\n",
+        "description": "Case settings include external connection details, custom fields, and templates.  Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.\n",
         "tags": [
           "cases"
         ],
@@ -2621,40 +2677,6 @@
                     "closure_type": {
                       "$ref": "#/components/schemas/closure_types"
                     },
-                    "customFields": {
-                      "type": "array",
-                      "x-technical-preview": true,
-                      "description": "Custom fields configuration details.",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "key": {
-                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 36
-                          },
-                          "label": {
-                            "description": "The custom field label that is displayed in the case.",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 50
-                          },
-                          "required": {
-                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                            "type": "boolean"
-                          },
-                          "type": {
-                            "description": "The type of the custom field.",
-                            "type": "string",
-                            "enum": [
-                              "text",
-                              "toggle"
-                            ]
-                          }
-                        }
-                      }
-                    },
                     "connector": {
                       "type": "object",
                       "properties": {
@@ -2734,6 +2756,51 @@
                         }
                       }
                     },
+                    "customFields": {
+                      "type": "array",
+                      "x-technical-preview": true,
+                      "description": "Custom fields configuration details.",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "defaultValue": {
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "boolean"
+                              }
+                            ],
+                            "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                          },
+                          "key": {
+                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 36
+                          },
+                          "label": {
+                            "description": "The custom field label that is displayed in the case.",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 50
+                          },
+                          "required": {
+                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                            "type": "boolean"
+                          },
+                          "type": {
+                            "description": "The type of the custom field.",
+                            "type": "string",
+                            "enum": [
+                              "text",
+                              "toggle"
+                            ]
+                          }
+                        }
+                      }
+                    },
                     "error": {
                       "type": [
                         "string",
@@ -2778,6 +2845,9 @@
                     "owner": {
                       "$ref": "#/components/schemas/owners"
                     },
+                    "templates": {
+                      "$ref": "#/components/schemas/templates"
+                    },
                     "updated_at": {
                       "type": [
                         "string",
@@ -2865,9 +2935,9 @@
     },
     "/s/{spaceId}/api/cases/configure/{configurationId}": {
       "patch": {
-        "summary": "Updates external connection details, such as the closure type and default connector for cases.",
+        "summary": "Update case settings",
         "operationId": "updateCaseConfiguration",
-        "description": "You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API.\n",
+        "description": "Updates setting details such as the closure type, custom fields, templates, and the default connector for cases. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the case was created.\n",
         "tags": [
           "cases"
         ],
@@ -2878,68 +2948,34 @@
           {
             "$ref": "#/components/parameters/configuration_id"
           },
-          {
-            "$ref": "#/components/parameters/space_id"
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/update_case_configuration_request"
-              },
-              "examples": {
-                "updateCaseConfigurationRequest": {
-                  "$ref": "#/components/examples/update_case_configuration_request"
-                }
-              }
-            }
-          }
-        },
-        "responses": {
-          "200": {
-            "description": "Indicates a successful call.",
-            "content": {
-              "application/json": {
-                "schema": {
-                  "type": "object",
-                  "properties": {
-                    "closure_type": {
-                      "$ref": "#/components/schemas/closure_types"
-                    },
-                    "customFields": {
-                      "type": "array",
-                      "x-technical-preview": true,
-                      "description": "Custom fields configuration details.",
-                      "items": {
-                        "type": "object",
-                        "properties": {
-                          "key": {
-                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 36
-                          },
-                          "label": {
-                            "description": "The custom field label that is displayed in the case.",
-                            "type": "string",
-                            "minLength": 1,
-                            "maxLength": 50
-                          },
-                          "required": {
-                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
-                            "type": "boolean"
-                          },
-                          "type": {
-                            "description": "The type of the custom field.",
-                            "type": "string",
-                            "enum": [
-                              "text",
-                              "toggle"
-                            ]
-                          }
-                        }
-                      }
+          {
+            "$ref": "#/components/parameters/space_id"
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/update_case_configuration_request"
+              },
+              "examples": {
+                "updateCaseConfigurationRequest": {
+                  "$ref": "#/components/examples/update_case_configuration_request"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "Indicates a successful call.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "object",
+                  "properties": {
+                    "closure_type": {
+                      "$ref": "#/components/schemas/closure_types"
                     },
                     "connector": {
                       "type": "object",
@@ -3020,6 +3056,51 @@
                         }
                       }
                     },
+                    "customFields": {
+                      "type": "array",
+                      "x-technical-preview": true,
+                      "description": "Custom fields configuration details.",
+                      "items": {
+                        "type": "object",
+                        "properties": {
+                          "defaultValue": {
+                            "oneOf": [
+                              {
+                                "type": "string"
+                              },
+                              {
+                                "type": "boolean"
+                              }
+                            ],
+                            "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                          },
+                          "key": {
+                            "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 36
+                          },
+                          "label": {
+                            "description": "The custom field label that is displayed in the case.",
+                            "type": "string",
+                            "minLength": 1,
+                            "maxLength": 50
+                          },
+                          "required": {
+                            "description": "Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.\n",
+                            "type": "boolean"
+                          },
+                          "type": {
+                            "description": "The type of the custom field.",
+                            "type": "string",
+                            "enum": [
+                              "text",
+                              "toggle"
+                            ]
+                          }
+                        }
+                      }
+                    },
                     "error": {
                       "type": [
                         "string",
@@ -3064,6 +3145,9 @@
                     "owner": {
                       "$ref": "#/components/schemas/owners"
                     },
+                    "templates": {
+                      "$ref": "#/components/schemas/templates"
+                    },
                     "updated_at": {
                       "type": [
                         "string",
@@ -3151,9 +3235,9 @@
     },
     "/s/{spaceId}/api/cases/configure/connectors/_find": {
       "get": {
-        "summary": "Retrieves information about connectors.",
+        "summary": "Get case connectors",
         "operationId": "findCaseConnectors",
-        "description": "In particular, only the connectors that are supported for use in cases are returned. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.\n",
+        "description": "Retrieves information about connectors that are supported for use in cases. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.\n",
         "tags": [
           "cases"
         ],
@@ -4908,6 +4992,11 @@
           }
         }
       },
+      "case_description": {
+        "description": "The description for the case.",
+        "type": "string",
+        "maxLength": 30000
+      },
       "owners": {
         "type": "string",
         "description": "The application that owns the cases: Stack Management, Observability, or Elastic Security.\n",
@@ -4936,7 +5025,7 @@
           }
         }
       },
-      "severity_property": {
+      "case_severity": {
         "type": "string",
         "description": "The severity of the case.",
         "enum": [
@@ -4947,6 +5036,25 @@
         ],
         "default": "low"
       },
+      "case_tags": {
+        "description": "The words and phrases that help categorize cases. It can be an empty array.\n",
+        "type": "array",
+        "maxItems": 200,
+        "items": {
+          "type": "string",
+          "maxLength": 256
+        }
+      },
+      "case_category": {
+        "description": "A word or phrase that categorizes the case.",
+        "type": "string",
+        "maxLength": 50
+      },
+      "case_title": {
+        "description": "A title for the case.",
+        "type": "string",
+        "maxLength": 160
+      },
       "create_case_request": {
         "title": "Create case request",
         "description": "The create case API request body varies depending on the type of connector.",
@@ -4989,9 +5097,7 @@
             ]
           },
           "description": {
-            "description": "The description for the case.",
-            "type": "string",
-            "maxLength": 30000
+            "$ref": "#/components/schemas/case_description"
           },
           "owner": {
             "$ref": "#/components/schemas/owners"
@@ -5000,26 +5106,16 @@
             "$ref": "#/components/schemas/settings"
           },
           "severity": {
-            "$ref": "#/components/schemas/severity_property"
+            "$ref": "#/components/schemas/case_severity"
           },
           "tags": {
-            "description": "The words and phrases that help categorize cases. It can be an empty array.",
-            "type": "array",
-            "maxItems": 200,
-            "items": {
-              "type": "string",
-              "maxLength": 256
-            }
+            "$ref": "#/components/schemas/case_tags"
           },
           "category": {
-            "description": "A word or phrase that categorizes the case.",
-            "type": "string",
-            "maxLength": 50
+            "$ref": "#/components/schemas/case_category"
           },
           "title": {
-            "description": "A title for the case.",
-            "type": "string",
-            "maxLength": 160
+            "$ref": "#/components/schemas/case_title"
           },
           "customFields": {
             "type": "array",
@@ -5625,7 +5721,7 @@
           }
         }
       },
-      "status": {
+      "case_status": {
         "type": "string",
         "description": "The status of the case.",
         "enum": [
@@ -5822,10 +5918,10 @@
             "$ref": "#/components/schemas/settings"
           },
           "severity": {
-            "$ref": "#/components/schemas/severity_property"
+            "$ref": "#/components/schemas/case_severity"
           },
           "status": {
-            "$ref": "#/components/schemas/status"
+            "$ref": "#/components/schemas/case_status"
           },
           "tags": {
             "type": "array",
@@ -5919,9 +6015,7 @@
                   "$ref": "#/components/schemas/assignees"
                 },
                 "category": {
-                  "description": "A word or phrase that categorizes the case.",
-                  "type": "string",
-                  "maxLength": 50
+                  "$ref": "#/components/schemas/case_category"
                 },
                 "connector": {
                   "oneOf": [
@@ -5994,8 +6088,7 @@
                   }
                 },
                 "description": {
-                  "description": "An updated description for the case.",
-                  "type": "string"
+                  "$ref": "#/components/schemas/case_description"
                 },
                 "id": {
                   "description": "The identifier for the case.",
@@ -6006,24 +6099,16 @@
                   "$ref": "#/components/schemas/settings"
                 },
                 "severity": {
-                  "$ref": "#/components/schemas/severity_property"
+                  "$ref": "#/components/schemas/case_severity"
                 },
                 "status": {
-                  "$ref": "#/components/schemas/status"
+                  "$ref": "#/components/schemas/case_status"
                 },
                 "tags": {
-                  "description": "The words and phrases that help categorize cases.",
-                  "type": "array",
-                  "maxItems": 200,
-                  "items": {
-                    "type": "string",
-                    "maxLength": 256
-                  }
+                  "$ref": "#/components/schemas/case_tags"
                 },
                 "title": {
-                  "description": "A title for the case.",
-                  "type": "string",
-                  "maxLength": 160
+                  "$ref": "#/components/schemas/case_title"
                 },
                 "version": {
                   "description": "The current version of the case. To determine this value, use the get case or find cases APIs.",
@@ -6069,6 +6154,127 @@
           ".none"
         ]
       },
+      "template_tags": {
+        "description": "The words and phrases that help categorize templates. It can be an empty array.\n",
+        "type": "array",
+        "maxItems": 200,
+        "items": {
+          "type": "string",
+          "maxLength": 256
+        }
+      },
+      "templates": {
+        "type": "array",
+        "x-technical-preview": true,
+        "items": {
+          "type": "object",
+          "properties": {
+            "caseFields": {
+              "type": "object",
+              "properties": {
+                "assignees": {
+                  "$ref": "#/components/schemas/assignees"
+                },
+                "category": {
+                  "$ref": "#/components/schemas/case_category"
+                },
+                "connector": {
+                  "type": "object",
+                  "properties": {
+                    "fields": {
+                      "description": "The fields specified in the case configuration are not used and are not propagated to individual cases, therefore it is recommended to set it to `null`.",
+                      "type": [
+                        "object",
+                        "null"
+                      ]
+                    },
+                    "id": {
+                      "description": "The identifier for the connector. If you do not want a default connector, use `none`. To retrieve connector IDs, use the find connectors API.",
+                      "type": "string",
+                      "examples": [
+                        "none"
+                      ]
+                    },
+                    "name": {
+                      "description": "The name of the connector. If you do not want a default connector, use `none`. To retrieve connector names, use the find connectors API.",
+                      "type": "string",
+                      "examples": [
+                        "none"
+                      ]
+                    },
+                    "type": {
+                      "$ref": "#/components/schemas/connector_types"
+                    }
+                  }
+                },
+                "customFields": {
+                  "type": "array",
+                  "x-technical-preview": true,
+                  "description": "Custom field values in the template.",
+                  "items": {
+                    "type": "object",
+                    "properties": {
+                      "key": {
+                        "type": "string",
+                        "description": "The unique key for the custom field."
+                      },
+                      "type": {
+                        "type": "string",
+                        "enum": [
+                          "text",
+                          "toggle"
+                        ],
+                        "description": "The type of the custom field."
+                      },
+                      "value": {
+                        "oneOf": [
+                          {
+                            "type": "string"
+                          },
+                          {
+                            "type": "boolean"
+                          }
+                        ],
+                        "description": "The default value for the custom field when a case uses the template. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                      }
+                    }
+                  }
+                },
+                "description": {
+                  "$ref": "#/components/schemas/case_description"
+                },
+                "settings": {
+                  "$ref": "#/components/schemas/settings"
+                },
+                "severity": {
+                  "$ref": "#/components/schemas/case_severity"
+                },
+                "tags": {
+                  "$ref": "#/components/schemas/case_tags"
+                },
+                "title": {
+                  "$ref": "#/components/schemas/case_title"
+                }
+              }
+            },
+            "description": {
+              "type": "string",
+              "description": "A description for the template."
+            },
+            "key": {
+              "type": "string",
+              "description": "A unique key for the template. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific template.\n"
+            },
+            "name": {
+              "type": "string",
+              "description": "The name of the template."
+            },
+            "tags": {
+              "$ref": "#/components/schemas/template_tags"
+            }
+          }
+        }
+      },
       "set_case_configuration_request": {
         "title": "Set case configuration request",
         "description": "External connection details, such as the closure type and default connector for cases.",
@@ -6133,6 +6339,17 @@
                 "type"
               ],
               "properties": {
+                "defaultValue": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "boolean"
+                    }
+                  ],
+                  "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                },
                 "key": {
                   "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
                   "type": "string",
@@ -6162,12 +6379,15 @@
           },
           "owner": {
             "$ref": "#/components/schemas/owners"
+          },
+          "templates": {
+            "$ref": "#/components/schemas/templates"
           }
         }
       },
       "update_case_configuration_request": {
         "title": "Update case configuration request",
-        "description": "External connection details, such as the closure type and default connector for cases.",
+        "description": "You can update settings such as the closure type, custom fields, templates, and the default connector for cases.\n",
         "type": "object",
         "required": [
           "version"
@@ -6225,6 +6445,17 @@
                 "type"
               ],
               "properties": {
+                "defaultValue": {
+                  "oneOf": [
+                    {
+                      "type": "string"
+                    },
+                    {
+                      "type": "boolean"
+                    }
+                  ],
+                  "description": "A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.\n"
+                },
                 "key": {
                   "description": "A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.\n",
                   "type": "string",
@@ -6252,6 +6483,9 @@
               }
             }
           },
+          "templates": {
+            "$ref": "#/components/schemas/templates"
+          },
           "version": {
             "description": "The version of the connector. To retrieve the version value, use the get configuration API.\n",
             "type": "string",
@@ -6875,10 +7109,10 @@
             "$ref": "#/components/schemas/settings"
           },
           "severity": {
-            "$ref": "#/components/schemas/severity_property"
+            "$ref": "#/components/schemas/case_severity"
           },
           "status": {
-            "$ref": "#/components/schemas/status"
+            "$ref": "#/components/schemas/case_status"
           },
           "tags": {
             "type": "array",
@@ -6931,7 +7165,7 @@
         "type": "object",
         "properties": {
           "severity": {
-            "$ref": "#/components/schemas/severity_property"
+            "$ref": "#/components/schemas/case_severity"
           }
         }
       },
@@ -6939,7 +7173,7 @@
         "type": "object",
         "properties": {
           "status": {
-            "$ref": "#/components/schemas/status"
+            "$ref": "#/components/schemas/case_status"
           }
         }
       },
@@ -7590,13 +7824,14 @@
             "customFields": [
               {
                 "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
+                "defaultValue": "Custom text field value.",
                 "label": "my-text-field",
                 "required": false,
                 "type": "text"
               }
             ],
             "owner": "cases",
-            "created_at": "2023-06-01T17:07:17.767Z",
+            "created_at": "2024-07-01T17:07:17.767Z",
             "created_by": {
               "username": "elastic",
               "email": null,
@@ -7611,13 +7846,52 @@
               "fields": null
             },
             "mappings": [],
-            "version": "WzUxLDRd",
-            "error": null
+            "version": "WzEyLDNd",
+            "error": null,
+            "templates": [
+              {
+                "key": "505932fe-ee3a-4960-a661-c781b5acdb05",
+                "name": "template-1",
+                "caseFields": {
+                  "title": "Default case title",
+                  "tags": [
+                    "Default case tag"
+                  ],
+                  "category": "Default-category",
+                  "description": "A default description for cases.",
+                  "assignees": [
+                    {
+                      "uid": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
+                    }
+                  ],
+                  "connector": {
+                    "id": "none",
+                    "type": ".none",
+                    "fields": null,
+                    "name": "none"
+                  },
+                  "customFields": [
+                    {
+                      "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
+                      "value": "Default text field value.",
+                      "type": "text"
+                    }
+                  ],
+                  "settings": {
+                    "syncAlerts": false
+                  }
+                },
+                "description": "A description of the template.",
+                "tags": [
+                  "Template tag 1"
+                ]
+              }
+            ]
           }
         ]
       },
       "set_case_configuration_request": {
-        "summary": "Set the closure type and default connector for Stack Management cases.",
+        "summary": "Set the closure type, custom fields, and default connector for Stack Management cases.",
         "value": {
           "owner": "cases",
           "connector": {
@@ -7632,7 +7906,38 @@
               "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
               "label": "my-text-field",
               "required": false,
-              "type": "text"
+              "type": "text",
+              "defaultValue": "My custom field default value."
+            }
+          ],
+          "templates": [
+            {
+              "key": "505932fe-ee3a-4960-a661-c781b5acdb05",
+              "name": "template-1",
+              "caseFields": {
+                "title": "Default case title",
+                "tags": [
+                  "Default case tag"
+                ],
+                "category": "Default-category",
+                "description": "A default description for cases.",
+                "assignees": [
+                  {
+                    "uid": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
+                  }
+                ],
+                "customFields": [
+                  {
+                    "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
+                    "type": "text",
+                    "value": "A text field value for the template."
+                  }
+                ]
+              },
+              "description": "A description of the template.",
+              "tags": [
+                "Template tag 1"
+              ]
             }
           ]
         }
@@ -7646,11 +7951,42 @@
               "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
               "label": "my-text-field",
               "required": false,
-              "type": "text"
+              "type": "text",
+              "defaultValue": "My custom field default value."
+            }
+          ],
+          "templates": [
+            {
+              "key": "505932fe-ee3a-4960-a661-c781b5acdb05",
+              "name": "template-1",
+              "caseFields": {
+                "title": "Default case title",
+                "tags": [
+                  "Default case tag"
+                ],
+                "category": "Default-category",
+                "description": "A default description for cases.",
+                "assignees": [
+                  {
+                    "uid": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
+                  }
+                ],
+                "customFields": [
+                  {
+                    "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
+                    "type": "text",
+                    "value": "A text field value for the template."
+                  }
+                ]
+              },
+              "description": "A description of the template.",
+              "tags": [
+                "Template tag 1"
+              ]
             }
           ],
           "owner": "cases",
-          "created_at": "2023-10-01T17:07:17.767Z",
+          "created_at": "2024-07-01T17:07:17.767Z",
           "created_by": {
             "username": "elastic",
             "email": "null,",
@@ -7680,6 +8016,11 @@
               "source": "comments",
               "target": "comments",
               "action_type": "append"
+            },
+            {
+              "source": "tags",
+              "target": "labels",
+              "action_type": "overwrite"
             }
           ],
           "version": "WzIwNzMsMV0=",
@@ -7703,7 +8044,8 @@
               "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
               "label": "my-text-field",
               "required": true,
-              "type": "text"
+              "type": "text",
+              "defaultValue": "A new default value."
             },
             {
               "key": "fcc6840d-eb14-42df-8aaf-232201a705ec",
@@ -7723,7 +8065,8 @@
               "key": "d312efda-ec2b-42ec-9e2c-84981795c581",
               "label": "my-text-field",
               "required": true,
-              "type": "text"
+              "type": "text",
+              "defaultValue": "A new default value."
             },
             {
               "key": "fcc6840d-eb14-42df-8aaf-232201a705ec",
@@ -7733,14 +8076,14 @@
             }
           ],
           "owner": "cases",
-          "created_at": "2023-10-01T17:07:17.767Z",
+          "created_at": "2024-07-01T17:07:17.767Z",
           "created_by": {
             "username": "elastic",
-            "email": "null,",
+            "email": null,
             "full_name": null,
             "profile_uid": "u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0"
           },
-          "updated_at": "2023-10-19T00:52:42.401Z",
+          "updated_at": "2024-07-19T00:52:42.401Z",
           "updated_by": {
             "username": "elastic",
             "full_name": null,
@@ -7764,15 +8107,21 @@
               "target": "description",
               "action_type": "overwrite"
             },
+            {
+              "source": "tags",
+              "target": "labels",
+              "action_type": "overwrite"
+            },
             {
               "source": "comments",
               "target": "comments",
               "action_type": "append"
             }
           ],
-          "version": "zEzNSw1XQ==",
+          "version": "WzI2LDNd",
           "error": null,
-          "id": "4a97a440-e1cd-11ec-be9b-9b1838238ee6"
+          "id": "4a97a440-e1cd-11ec-be9b-9b1838238ee6",
+          "templates": []
         }
       },
       "get_reporters_response": {
diff --git a/x-pack/plugins/cases/docs/openapi/bundled.yaml b/x-pack/plugins/cases/docs/openapi/bundled.yaml
index 407958509f31c..7aeea6de8e052 100644
--- a/x-pack/plugins/cases/docs/openapi/bundled.yaml
+++ b/x-pack/plugins/cases/docs/openapi/bundled.yaml
@@ -205,10 +205,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /api/cases/configure:
     get:
-      summary: Retrieves external connection details, such as the closure type and default connector for cases in the default space.
+      summary: Get case settings in the default space
       operationId: getCaseConfigurationDefaultSpace
       description: |
-        You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.
+        Retrieves setting details such as the closure type, custom fields, templatse, and the default connector for cases in the default space. You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the cases were created.
       tags:
         - cases
       parameters:
@@ -225,34 +225,6 @@ paths:
                   properties:
                     closure_type:
                       $ref: '#/components/schemas/closure_types'
-                    customFields:
-                      type: array
-                      x-technical-preview: true
-                      description: Custom fields configuration details.
-                      items:
-                        type: object
-                        properties:
-                          key:
-                            description: |
-                              A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                            type: string
-                            minLength: 1
-                            maxLength: 36
-                          label:
-                            description: The custom field label that is displayed in the case.
-                            type: string
-                            minLength: 1
-                            maxLength: 50
-                          required:
-                            description: |
-                              Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                            type: boolean
-                          type:
-                            description: The type of the custom field.
-                            type: string
-                            enum:
-                              - text
-                              - toggle
                     connector:
                       type: object
                       properties:
@@ -307,6 +279,39 @@ paths:
                             - 'null'
                           examples:
                             - elastic
+                    customFields:
+                      type: array
+                      description: Custom fields configuration details.
+                      items:
+                        type: object
+                        properties:
+                          defaultValue:
+                            oneOf:
+                              - type: string
+                              - type: boolean
+                            description: |
+                              A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                          key:
+                            description: |
+                              A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                            type: string
+                            minLength: 1
+                            maxLength: 36
+                          label:
+                            description: The custom field label that is displayed in the case.
+                            type: string
+                            minLength: 1
+                            maxLength: 50
+                          required:
+                            description: |
+                              Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                            type: boolean
+                          type:
+                            description: The type of the custom field.
+                            type: string
+                            enum:
+                              - text
+                              - toggle
                     error:
                       type:
                         - string
@@ -336,6 +341,8 @@ paths:
                               - summary
                     owner:
                       $ref: '#/components/schemas/owners'
+                    templates:
+                      $ref: '#/components/schemas/templates'
                     updated_at:
                       type:
                         - string
@@ -388,10 +395,10 @@ paths:
               schema:
                 $ref: '#/components/schemas/4xx_response'
     post:
-      summary: Creates a case specific configuration that includes external connection details and custom fields.
+      summary: Add case settings in the default space
       operationId: setCaseConfigurationDefaultSpace
       description: |
-        You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details.
+        Case settings include external connection details, custom fields, and templates.  Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.
       tags:
         - cases
       parameters:
@@ -414,34 +421,6 @@ paths:
                 properties:
                   closure_type:
                     $ref: '#/components/schemas/closure_types'
-                  customFields:
-                    type: array
-                    x-technical-preview: true
-                    description: Custom fields configuration details.
-                    items:
-                      type: object
-                      properties:
-                        key:
-                          description: |
-                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                          type: string
-                          minLength: 1
-                          maxLength: 36
-                        label:
-                          description: The custom field label that is displayed in the case.
-                          type: string
-                          minLength: 1
-                          maxLength: 50
-                        required:
-                          description: |
-                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                          type: boolean
-                        type:
-                          description: The type of the custom field.
-                          type: string
-                          enum:
-                            - text
-                            - toggle
                   connector:
                     type: object
                     properties:
@@ -496,6 +475,39 @@ paths:
                           - 'null'
                         examples:
                           - elastic
+                  customFields:
+                    type: array
+                    description: Custom fields configuration details.
+                    items:
+                      type: object
+                      properties:
+                        defaultValue:
+                          oneOf:
+                            - type: string
+                            - type: boolean
+                          description: |
+                            A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                        key:
+                          description: |
+                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                          type: string
+                          minLength: 1
+                          maxLength: 36
+                        label:
+                          description: The custom field label that is displayed in the case.
+                          type: string
+                          minLength: 1
+                          maxLength: 50
+                        required:
+                          description: |
+                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                          type: boolean
+                        type:
+                          description: The type of the custom field.
+                          type: string
+                          enum:
+                            - text
+                            - toggle
                   error:
                     type:
                       - string
@@ -525,6 +537,8 @@ paths:
                             - summary
                   owner:
                     $ref: '#/components/schemas/owners'
+                  templates:
+                    $ref: '#/components/schemas/templates'
                   updated_at:
                     type:
                       - string
@@ -578,10 +592,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /api/cases/configure/{configurationId}:
     patch:
-      summary: Updates external connection details, such as the closure type and default connector for cases in the default space.
+      summary: Update case settings in the default space
       operationId: updateCaseConfigurationDefaultSpace
       description: |
-        You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API.
+        Updates setting details such as the closure type, custom fields, templates, and the default connector for cases in the default space. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the case was created.
       tags:
         - cases
       parameters:
@@ -605,34 +619,6 @@ paths:
                 properties:
                   closure_type:
                     $ref: '#/components/schemas/closure_types'
-                  customFields:
-                    type: array
-                    x-technical-preview: true
-                    description: Custom fields configuration details.
-                    items:
-                      type: object
-                      properties:
-                        key:
-                          description: |
-                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                          type: string
-                          minLength: 1
-                          maxLength: 36
-                        label:
-                          description: The custom field label that is displayed in the case.
-                          type: string
-                          minLength: 1
-                          maxLength: 50
-                        required:
-                          description: |
-                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                          type: boolean
-                        type:
-                          description: The type of the custom field.
-                          type: string
-                          enum:
-                            - text
-                            - toggle
                   connector:
                     type: object
                     properties:
@@ -687,6 +673,39 @@ paths:
                           - 'null'
                         examples:
                           - elastic
+                  customFields:
+                    type: array
+                    description: Custom fields configuration details.
+                    items:
+                      type: object
+                      properties:
+                        defaultValue:
+                          oneOf:
+                            - type: string
+                            - type: boolean
+                          description: |
+                            A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                        key:
+                          description: |
+                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                          type: string
+                          minLength: 1
+                          maxLength: 36
+                        label:
+                          description: The custom field label that is displayed in the case.
+                          type: string
+                          minLength: 1
+                          maxLength: 50
+                        required:
+                          description: |
+                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                          type: boolean
+                        type:
+                          description: The type of the custom field.
+                          type: string
+                          enum:
+                            - text
+                            - toggle
                   error:
                     type:
                       - string
@@ -716,6 +735,8 @@ paths:
                             - summary
                   owner:
                     $ref: '#/components/schemas/owners'
+                  templates:
+                    $ref: '#/components/schemas/templates'
                   updated_at:
                     type:
                       - string
@@ -1208,10 +1229,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /api/cases/configure/connectors/_find:
     get:
-      summary: Retrieves information about connectors in the default space.
+      summary: Get case connectors in the default space
       operationId: findCaseConnectorsDefaultSpace
       description: |
-        In particular, only the connectors that are supported for use in cases are returned. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
+        Retrieves information about connectors that are supported for use in cases in the default space. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
       tags:
         - cases
       responses:
@@ -1447,10 +1468,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /s/{spaceId}/api/cases/configure:
     get:
-      summary: Retrieves external connection details, such as the closure type and default connector for cases.
+      summary: Get case settings
       operationId: getCaseConfiguration
       description: |
-        You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.
+        Retrieves setting details such as the closure type, custom fields, templates, and the default connector for cases. You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the cases were created.
       tags:
         - cases
       parameters:
@@ -1468,34 +1489,6 @@ paths:
                   properties:
                     closure_type:
                       $ref: '#/components/schemas/closure_types'
-                    customFields:
-                      type: array
-                      x-technical-preview: true
-                      description: Custom fields configuration details.
-                      items:
-                        type: object
-                        properties:
-                          key:
-                            description: |
-                              A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                            type: string
-                            minLength: 1
-                            maxLength: 36
-                          label:
-                            description: The custom field label that is displayed in the case.
-                            type: string
-                            minLength: 1
-                            maxLength: 50
-                          required:
-                            description: |
-                              Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                            type: boolean
-                          type:
-                            description: The type of the custom field.
-                            type: string
-                            enum:
-                              - text
-                              - toggle
                     connector:
                       type: object
                       properties:
@@ -1550,6 +1543,39 @@ paths:
                             - 'null'
                           examples:
                             - elastic
+                    customFields:
+                      type: array
+                      description: Custom fields configuration details.
+                      items:
+                        type: object
+                        properties:
+                          defaultValue:
+                            oneOf:
+                              - type: string
+                              - type: boolean
+                            description: |
+                              A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                          key:
+                            description: |
+                              A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                            type: string
+                            minLength: 1
+                            maxLength: 36
+                          label:
+                            description: The custom field label that is displayed in the case.
+                            type: string
+                            minLength: 1
+                            maxLength: 50
+                          required:
+                            description: |
+                              Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                            type: boolean
+                          type:
+                            description: The type of the custom field.
+                            type: string
+                            enum:
+                              - text
+                              - toggle
                     error:
                       type:
                         - string
@@ -1579,6 +1605,8 @@ paths:
                               - summary
                     owner:
                       $ref: '#/components/schemas/owners'
+                    templates:
+                      $ref: '#/components/schemas/templates'
                     updated_at:
                       type:
                         - string
@@ -1631,10 +1659,10 @@ paths:
               schema:
                 $ref: '#/components/schemas/4xx_response'
     post:
-      summary: Creates a case specific configuration that includes external connection details and custom fields.
+      summary: Add case settings
       operationId: setCaseConfiguration
       description: |
-        You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details.
+        Case settings include external connection details, custom fields, and templates.  Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.
       tags:
         - cases
       parameters:
@@ -1658,34 +1686,6 @@ paths:
                 properties:
                   closure_type:
                     $ref: '#/components/schemas/closure_types'
-                  customFields:
-                    type: array
-                    x-technical-preview: true
-                    description: Custom fields configuration details.
-                    items:
-                      type: object
-                      properties:
-                        key:
-                          description: |
-                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                          type: string
-                          minLength: 1
-                          maxLength: 36
-                        label:
-                          description: The custom field label that is displayed in the case.
-                          type: string
-                          minLength: 1
-                          maxLength: 50
-                        required:
-                          description: |
-                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                          type: boolean
-                        type:
-                          description: The type of the custom field.
-                          type: string
-                          enum:
-                            - text
-                            - toggle
                   connector:
                     type: object
                     properties:
@@ -1740,6 +1740,39 @@ paths:
                           - 'null'
                         examples:
                           - elastic
+                  customFields:
+                    type: array
+                    description: Custom fields configuration details.
+                    items:
+                      type: object
+                      properties:
+                        defaultValue:
+                          oneOf:
+                            - type: string
+                            - type: boolean
+                          description: |
+                            A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                        key:
+                          description: |
+                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                          type: string
+                          minLength: 1
+                          maxLength: 36
+                        label:
+                          description: The custom field label that is displayed in the case.
+                          type: string
+                          minLength: 1
+                          maxLength: 50
+                        required:
+                          description: |
+                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                          type: boolean
+                        type:
+                          description: The type of the custom field.
+                          type: string
+                          enum:
+                            - text
+                            - toggle
                   error:
                     type:
                       - string
@@ -1769,6 +1802,8 @@ paths:
                             - summary
                   owner:
                     $ref: '#/components/schemas/owners'
+                  templates:
+                    $ref: '#/components/schemas/templates'
                   updated_at:
                     type:
                       - string
@@ -1822,10 +1857,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /s/{spaceId}/api/cases/configure/{configurationId}:
     patch:
-      summary: Updates external connection details, such as the closure type and default connector for cases.
+      summary: Update case settings
       operationId: updateCaseConfiguration
       description: |
-        You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. Refer to the add connectors API.
+        Updates setting details such as the closure type, custom fields, templates, and the default connector for cases. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the case was created.
       tags:
         - cases
       parameters:
@@ -1850,34 +1885,6 @@ paths:
                 properties:
                   closure_type:
                     $ref: '#/components/schemas/closure_types'
-                  customFields:
-                    type: array
-                    x-technical-preview: true
-                    description: Custom fields configuration details.
-                    items:
-                      type: object
-                      properties:
-                        key:
-                          description: |
-                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
-                          type: string
-                          minLength: 1
-                          maxLength: 36
-                        label:
-                          description: The custom field label that is displayed in the case.
-                          type: string
-                          minLength: 1
-                          maxLength: 50
-                        required:
-                          description: |
-                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
-                          type: boolean
-                        type:
-                          description: The type of the custom field.
-                          type: string
-                          enum:
-                            - text
-                            - toggle
                   connector:
                     type: object
                     properties:
@@ -1932,6 +1939,39 @@ paths:
                           - 'null'
                         examples:
                           - elastic
+                  customFields:
+                    type: array
+                    description: Custom fields configuration details.
+                    items:
+                      type: object
+                      properties:
+                        defaultValue:
+                          oneOf:
+                            - type: string
+                            - type: boolean
+                          description: |
+                            A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+                        key:
+                          description: |
+                            A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
+                          type: string
+                          minLength: 1
+                          maxLength: 36
+                        label:
+                          description: The custom field label that is displayed in the case.
+                          type: string
+                          minLength: 1
+                          maxLength: 50
+                        required:
+                          description: |
+                            Indicates whether the field is required. If `false`, the custom field can be set to null or omitted when a case is created or updated.
+                          type: boolean
+                        type:
+                          description: The type of the custom field.
+                          type: string
+                          enum:
+                            - text
+                            - toggle
                   error:
                     type:
                       - string
@@ -1961,6 +2001,8 @@ paths:
                             - summary
                   owner:
                     $ref: '#/components/schemas/owners'
+                  templates:
+                    $ref: '#/components/schemas/templates'
                   updated_at:
                     type:
                       - string
@@ -2014,10 +2056,10 @@ paths:
                 $ref: '#/components/schemas/4xx_response'
   /s/{spaceId}/api/cases/configure/connectors/_find:
     get:
-      summary: Retrieves information about connectors.
+      summary: Get case connectors
       operationId: findCaseConnectors
       description: |
-        In particular, only the connectors that are supported for use in cases are returned. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
+        Retrieves information about connectors that are supported for use in cases. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
       tags:
         - cases
       parameters:
@@ -3166,6 +3208,10 @@ components:
             - .swimlane
           enum:
             - .swimlane
+    case_description:
+      description: The description for the case.
+      type: string
+      maxLength: 30000
     owners:
       type: string
       description: |
@@ -3187,7 +3233,7 @@ components:
           type: boolean
           examples:
             - true
-    severity_property:
+    case_severity:
       type: string
       description: The severity of the case.
       enum:
@@ -3196,6 +3242,22 @@ components:
         - low
         - medium
       default: low
+    case_tags:
+      description: |
+        The words and phrases that help categorize cases. It can be an empty array.
+      type: array
+      maxItems: 200
+      items:
+        type: string
+        maxLength: 256
+    case_category:
+      description: A word or phrase that categorizes the case.
+      type: string
+      maxLength: 50
+    case_title:
+      description: A title for the case.
+      type: string
+      maxLength: 160
     create_case_request:
       title: Create case request
       description: The create case API request body varies depending on the type of connector.
@@ -3220,35 +3282,23 @@ components:
             - $ref: '#/components/schemas/connector_properties_servicenow_sir'
             - $ref: '#/components/schemas/connector_properties_swimlane'
         description:
-          description: The description for the case.
-          type: string
-          maxLength: 30000
+          $ref: '#/components/schemas/case_description'
         owner:
           $ref: '#/components/schemas/owners'
         settings:
           $ref: '#/components/schemas/settings'
         severity:
-          $ref: '#/components/schemas/severity_property'
+          $ref: '#/components/schemas/case_severity'
         tags:
-          description: The words and phrases that help categorize cases. It can be an empty array.
-          type: array
-          maxItems: 200
-          items:
-            type: string
-            maxLength: 256
+          $ref: '#/components/schemas/case_tags'
         category:
-          description: A word or phrase that categorizes the case.
-          type: string
-          maxLength: 50
+          $ref: '#/components/schemas/case_category'
         title:
-          description: A title for the case.
-          type: string
-          maxLength: 160
+          $ref: '#/components/schemas/case_title'
         customFields:
           type: array
           description: |
             Custom field values for a case. Any optional custom fields that are not specified in the request are set to null.
-          x-technical-preview: true
           minItems: 0
           maxItems: 10
           items:
@@ -3656,7 +3706,7 @@ components:
                 - 'null'
               examples:
                 - elastic
-    status:
+    case_status:
       type: string
       description: The status of the case.
       enum:
@@ -3747,7 +3797,6 @@ components:
         customFields:
           type: array
           description: Custom field values for the case.
-          x-technical-preview: true
           items:
             type: object
             properties:
@@ -3795,9 +3844,9 @@ components:
         settings:
           $ref: '#/components/schemas/settings'
         severity:
-          $ref: '#/components/schemas/severity_property'
+          $ref: '#/components/schemas/case_severity'
         status:
-          $ref: '#/components/schemas/status'
+          $ref: '#/components/schemas/case_status'
         tags:
           type: array
           items:
@@ -3862,9 +3911,7 @@ components:
               assignees:
                 $ref: '#/components/schemas/assignees'
               category:
-                description: A word or phrase that categorizes the case.
-                type: string
-                maxLength: 50
+                $ref: '#/components/schemas/case_category'
               connector:
                 oneOf:
                   - $ref: '#/components/schemas/connector_properties_none'
@@ -3878,7 +3925,6 @@ components:
                 type: array
                 description: |
                   Custom field values for a case. Any optional custom fields that are not specified in the request are set to null.
-                x-technical-preview: true
                 minItems: 0
                 maxItems: 10
                 items:
@@ -3910,8 +3956,7 @@ components:
                           maxLength: 160
                         - type: boolean
               description:
-                description: An updated description for the case.
-                type: string
+                $ref: '#/components/schemas/case_description'
               id:
                 description: The identifier for the case.
                 type: string
@@ -3919,20 +3964,13 @@ components:
               settings:
                 $ref: '#/components/schemas/settings'
               severity:
-                $ref: '#/components/schemas/severity_property'
+                $ref: '#/components/schemas/case_severity'
               status:
-                $ref: '#/components/schemas/status'
+                $ref: '#/components/schemas/case_status'
               tags:
-                description: The words and phrases that help categorize cases.
-                type: array
-                maxItems: 200
-                items:
-                  type: string
-                  maxLength: 256
+                $ref: '#/components/schemas/case_tags'
               title:
-                description: A title for the case.
-                type: string
-                maxLength: 160
+                $ref: '#/components/schemas/case_title'
               version:
                 description: The current version of the case. To determine this value, use the get case or find cases APIs.
                 type: string
@@ -3963,6 +4001,90 @@ components:
         - .swimlane
       examples:
         - .none
+    template_tags:
+      description: |
+        The words and phrases that help categorize templates. It can be an empty array.
+      type: array
+      maxItems: 200
+      items:
+        type: string
+        maxLength: 256
+    templates:
+      type: array
+      x-technical-preview: true
+      items:
+        type: object
+        properties:
+          caseFields:
+            type: object
+            properties:
+              assignees:
+                $ref: '#/components/schemas/assignees'
+              category:
+                $ref: '#/components/schemas/case_category'
+              connector:
+                type: object
+                properties:
+                  fields:
+                    description: The fields specified in the case configuration are not used and are not propagated to individual cases, therefore it is recommended to set it to `null`.
+                    type:
+                      - object
+                      - 'null'
+                  id:
+                    description: The identifier for the connector. If you do not want a default connector, use `none`. To retrieve connector IDs, use the find connectors API.
+                    type: string
+                    examples:
+                      - none
+                  name:
+                    description: The name of the connector. If you do not want a default connector, use `none`. To retrieve connector names, use the find connectors API.
+                    type: string
+                    examples:
+                      - none
+                  type:
+                    $ref: '#/components/schemas/connector_types'
+              customFields:
+                type: array
+                description: Custom field values in the template.
+                items:
+                  type: object
+                  properties:
+                    key:
+                      type: string
+                      description: The unique key for the custom field.
+                    type:
+                      type: string
+                      enum:
+                        - text
+                        - toggle
+                      description: The type of the custom field.
+                    value:
+                      oneOf:
+                        - type: string
+                        - type: boolean
+                      description: |
+                        The default value for the custom field when a case uses the template. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
+              description:
+                $ref: '#/components/schemas/case_description'
+              settings:
+                $ref: '#/components/schemas/settings'
+              severity:
+                $ref: '#/components/schemas/case_severity'
+              tags:
+                $ref: '#/components/schemas/case_tags'
+              title:
+                $ref: '#/components/schemas/case_title'
+          description:
+            type: string
+            description: A description for the template.
+          key:
+            type: string
+            description: |
+              A unique key for the template. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific template.
+          name:
+            type: string
+            description: The name of the template.
+          tags:
+            $ref: '#/components/schemas/template_tags'
     set_case_configuration_request:
       title: Set case configuration request
       description: External connection details, such as the closure type and default connector for cases.
@@ -4003,7 +4125,6 @@ components:
         customFields:
           type: array
           description: Custom fields case configuration.
-          x-technical-preview: true
           minItems: 0
           maxItems: 10
           items:
@@ -4014,6 +4135,12 @@ components:
               - required
               - type
             properties:
+              defaultValue:
+                oneOf:
+                  - type: string
+                  - type: boolean
+                description: |
+                  A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
               key:
                 description: |
                   A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
@@ -4037,9 +4164,12 @@ components:
                   - toggle
         owner:
           $ref: '#/components/schemas/owners'
+        templates:
+          $ref: '#/components/schemas/templates'
     update_case_configuration_request:
       title: Update case configuration request
-      description: External connection details, such as the closure type and default connector for cases.
+      description: |
+        You can update settings such as the closure type, custom fields, templates, and the default connector for cases.
       type: object
       required:
         - version
@@ -4075,7 +4205,6 @@ components:
         customFields:
           type: array
           description: Custom fields case configuration.
-          x-technical-preview: true
           items:
             type: object
             required:
@@ -4084,6 +4213,12 @@ components:
               - required
               - type
             properties:
+              defaultValue:
+                oneOf:
+                  - type: string
+                  - type: boolean
+                description: |
+                  A default value for the custom field. If the `type` is `text`, the default value must be a string. If the `type` is `toggle`, the default value must be boolean.
               key:
                 description: |
                   A unique key for the custom field. Must be lower case and composed only of a-z, 0-9, '_', and '-' characters. It is used in API calls to refer to a specific custom field.
@@ -4105,6 +4240,8 @@ components:
                 enum:
                   - text
                   - toggle
+        templates:
+          $ref: '#/components/schemas/templates'
         version:
           description: |
             The version of the connector. To retrieve the version value, use the get configuration API.
@@ -4543,9 +4680,9 @@ components:
         settings:
           $ref: '#/components/schemas/settings'
         severity:
-          $ref: '#/components/schemas/severity_property'
+          $ref: '#/components/schemas/case_severity'
         status:
-          $ref: '#/components/schemas/status'
+          $ref: '#/components/schemas/case_status'
         tags:
           type: array
           items:
@@ -4578,12 +4715,12 @@ components:
       type: object
       properties:
         severity:
-          $ref: '#/components/schemas/severity_property'
+          $ref: '#/components/schemas/case_severity'
     payload_status:
       type: object
       properties:
         status:
-          $ref: '#/components/schemas/status'
+          $ref: '#/components/schemas/case_status'
     payload_tags:
       type: object
       properties:
@@ -5024,11 +5161,12 @@ components:
           closure_type: close-by-user
           customFields:
             - key: d312efda-ec2b-42ec-9e2c-84981795c581
+              defaultValue: Custom text field value.
               label: my-text-field
               required: false
               type: text
           owner: cases
-          created_at: '2023-06-01T17:07:17.767Z'
+          created_at: '2024-07-01T17:07:17.767Z'
           created_by:
             username: elastic
             email: null
@@ -5041,10 +5179,35 @@ components:
             type: .none
             fields: null
           mappings: []
-          version: WzUxLDRd
+          version: WzEyLDNd
           error: null
+          templates:
+            - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+              name: template-1
+              caseFields:
+                title: Default case title
+                tags:
+                  - Default case tag
+                category: Default-category
+                description: A default description for cases.
+                assignees:
+                  - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+                connector:
+                  id: none
+                  type: .none
+                  fields: null
+                  name: none
+                customFields:
+                  - key: d312efda-ec2b-42ec-9e2c-84981795c581
+                    value: Default text field value.
+                    type: text
+                settings:
+                  syncAlerts: false
+              description: A description of the template.
+              tags:
+                - Template tag 1
     set_case_configuration_request:
-      summary: Set the closure type and default connector for Stack Management cases.
+      summary: Set the closure type, custom fields, and default connector for Stack Management cases.
       value:
         owner: cases
         connector:
@@ -5058,6 +5221,25 @@ components:
             label: my-text-field
             required: false
             type: text
+            defaultValue: My custom field default value.
+        templates:
+          - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+            name: template-1
+            caseFields:
+              title: Default case title
+              tags:
+                - Default case tag
+              category: Default-category
+              description: A default description for cases.
+              assignees:
+                - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+              customFields:
+                - key: d312efda-ec2b-42ec-9e2c-84981795c581
+                  type: text
+                  value: A text field value for the template.
+            description: A description of the template.
+            tags:
+              - Template tag 1
     set_case_configuration_response:
       summary: This is an example response for case settings.
       value:
@@ -5067,8 +5249,27 @@ components:
             label: my-text-field
             required: false
             type: text
+            defaultValue: My custom field default value.
+        templates:
+          - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+            name: template-1
+            caseFields:
+              title: Default case title
+              tags:
+                - Default case tag
+              category: Default-category
+              description: A default description for cases.
+              assignees:
+                - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+              customFields:
+                - key: d312efda-ec2b-42ec-9e2c-84981795c581
+                  type: text
+                  value: A text field value for the template.
+            description: A description of the template.
+            tags:
+              - Template tag 1
         owner: cases
-        created_at: '2023-10-01T17:07:17.767Z'
+        created_at: '2024-07-01T17:07:17.767Z'
         created_by:
           username: elastic
           email: null,
@@ -5091,6 +5292,9 @@ components:
           - source: comments
             target: comments
             action_type: append
+          - source: tags
+            target: labels
+            action_type: overwrite
         version: WzIwNzMsMV0=
         error: null
         id: 4a97a440-e1cd-11ec-be9b-9b1838238ee6
@@ -5109,6 +5313,7 @@ components:
             label: my-text-field
             required: true
             type: text
+            defaultValue: A new default value.
           - key: fcc6840d-eb14-42df-8aaf-232201a705ec
             label: my-toggle
             required: false
@@ -5122,18 +5327,19 @@ components:
             label: my-text-field
             required: true
             type: text
+            defaultValue: A new default value.
           - key: fcc6840d-eb14-42df-8aaf-232201a705ec
             label: my-toggle
             required: false
             type: toggle
         owner: cases
-        created_at: '2023-10-01T17:07:17.767Z'
+        created_at: '2024-07-01T17:07:17.767Z'
         created_by:
           username: elastic
-          email: null,
+          email: null
           full_name: null
           profile_uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
-        updated_at: '2023-10-19T00:52:42.401Z'
+        updated_at: '2024-07-19T00:52:42.401Z'
         updated_by:
           username: elastic
           full_name: null
@@ -5151,12 +5357,16 @@ components:
           - source: description
             target: description
             action_type: overwrite
+          - source: tags
+            target: labels
+            action_type: overwrite
           - source: comments
             target: comments
             action_type: append
-        version: zEzNSw1XQ==
+        version: WzI2LDNd
         error: null
         id: 4a97a440-e1cd-11ec-be9b-9b1838238ee6
+        templates: []
     get_reporters_response:
       summary: A list of two users that opened cases
       value:
diff --git a/x-pack/plugins/cases/docs/openapi/components/examples/get_case_configuration_response.yaml b/x-pack/plugins/cases/docs/openapi/components/examples/get_case_configuration_response.yaml
index 8b9197600917f..f3cfa44265001 100644
--- a/x-pack/plugins/cases/docs/openapi/components/examples/get_case_configuration_response.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/examples/get_case_configuration_response.yaml
@@ -4,11 +4,12 @@ value:
     closure_type: close-by-user
     customFields:
       - key: d312efda-ec2b-42ec-9e2c-84981795c581
+        defaultValue: Custom text field value.
         label: my-text-field
         required: false
         type: text
     owner: cases
-    created_at: 2023-06-01T17:07:17.767Z
+    created_at: 2024-07-01T17:07:17.767Z
     created_by:
       username: elastic
       email: null
@@ -21,5 +22,30 @@ value:
       type: .none
       fields: null
     mappings: []
-    version: WzUxLDRd
+    version: WzEyLDNd
     error: null
+    templates:
+      - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+        name: template-1
+        caseFields:
+          title: Default case title
+          tags:
+            - Default case tag
+          category: Default-category
+          description: A default description for cases.
+          assignees:
+            - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+          connector:
+            id: none
+            type: .none
+            fields: null
+            name: none
+          customFields:
+            - key: d312efda-ec2b-42ec-9e2c-84981795c581
+              value: Default text field value.
+              type: text
+          settings:
+            syncAlerts: false
+        description: A description of the template.
+        tags:
+          - Template tag 1
diff --git a/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_request.yaml b/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_request.yaml
index 472a33d9feacb..e64fb2bc72f99 100644
--- a/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_request.yaml
@@ -1,4 +1,4 @@
-summary: Set the closure type and default connector for Stack Management cases.
+summary: Set the closure type, custom fields, and default connector for Stack Management cases.
 value: 
   owner: cases
   connector:
@@ -11,4 +11,23 @@ value:
     - key: d312efda-ec2b-42ec-9e2c-84981795c581
       label: my-text-field
       required: false
-      type: text
\ No newline at end of file
+      type: text
+      defaultValue: My custom field default value.
+  templates:
+    - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+      name: template-1
+      caseFields: 
+        title: Default case title
+        tags:
+          - Default case tag
+        category: Default-category
+        description: A default description for cases.
+        assignees:
+          - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+        customFields:
+          - key: d312efda-ec2b-42ec-9e2c-84981795c581
+            type: text
+            value: A text field value for the template.
+      description: A description of the template.
+      tags:
+        - Template tag 1       
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_response.yaml b/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_response.yaml
index d5a9f7205e23d..d0518c7c010c5 100644
--- a/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_response.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/examples/set_case_configuration_response.yaml
@@ -6,8 +6,27 @@ value:
       label: my-text-field
       required: false
       type: text
+      defaultValue: My custom field default value.
+  templates:
+    - key: 505932fe-ee3a-4960-a661-c781b5acdb05
+      name: template-1
+      caseFields: 
+        title: Default case title
+        tags:
+          - Default case tag
+        category: Default-category
+        description: A default description for cases.
+        assignees:
+          - uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
+        customFields:
+          - key: d312efda-ec2b-42ec-9e2c-84981795c581
+            type: text
+            value: A text field value for the template.
+      description: A description of the template.
+      tags:
+        - Template tag 1
   owner: cases
-  created_at: 2023-10-01T17:07:17.767Z
+  created_at: 2024-07-01T17:07:17.767Z
   created_by:
     username: elastic
     email: null,
@@ -30,6 +49,9 @@ value:
     - source: comments
       target: comments
       action_type: append
+    - source: tags
+      target: labels
+      action_type: overwrite
   version: WzIwNzMsMV0=
   error: null
   id: 4a97a440-e1cd-11ec-be9b-9b1838238ee6
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_request.yaml b/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_request.yaml
index 83d617b17946b..196ef19ba1f07 100644
--- a/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_request.yaml
@@ -12,6 +12,7 @@ value:
       label: my-text-field
       required: true
       type: text
+      defaultValue: "A new default value."
     - key: fcc6840d-eb14-42df-8aaf-232201a705ec
       label: my-toggle
       required: false
diff --git a/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_response.yaml b/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_response.yaml
index 6dd1da4d6f1f1..2f34418e214ac 100644
--- a/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_response.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/examples/update_case_configuration_response.yaml
@@ -6,18 +6,19 @@ value:
       label: my-text-field
       required: true
       type: text
+      defaultValue: A new default value.
     - key: fcc6840d-eb14-42df-8aaf-232201a705ec
       label: my-toggle
       required: false
       type: toggle
   owner: cases
-  created_at: 2023-10-01T17:07:17.767Z
+  created_at: 2024-07-01T17:07:17.767Z
   created_by:
     username: elastic
-    email: null,
+    email: null
     full_name: null
     profile_uid: u_mGBROF_q5bmFCATbLXAcCwKa0k8JvONAwSruelyKA5E_0
-  updated_at: 2023-10-19T00:52:42.401Z
+  updated_at: 2024-07-19T00:52:42.401Z
   updated_by:
     username: elastic
     full_name: null
@@ -35,9 +36,13 @@ value:
     - source: description
       target: description
       action_type: overwrite
+    - source: tags
+      target: labels
+      action_type: overwrite
     - source: comments
       target: comments
       action_type: append
-  version: zEzNSw1XQ==
+  version: WzI2LDNd
   error: null
-  id: 4a97a440-e1cd-11ec-be9b-9b1838238ee6
\ No newline at end of file
+  id: 4a97a440-e1cd-11ec-be9b-9b1838238ee6
+  templates: []
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_category.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_category.yaml
new file mode 100644
index 0000000000000..ebf0a65319853
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_category.yaml
@@ -0,0 +1,3 @@
+description: A word or phrase that categorizes the case.
+type: string
+maxLength: 50
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_customfields.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_customfields.yaml
index 344e17b00617d..71c64225a72ad 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_customfields.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_customfields.yaml
@@ -1,3 +1,11 @@
+defaultValue:
+  oneOf:
+    - type: string
+    - type: boolean
+  description: >
+    A default value for the custom field.
+    If the `type` is `text`, the default value must be a string.
+    If the `type` is `toggle`, the default value must be boolean.
 key:
   description: >
     A unique key for the custom field.
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_response_properties.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_response_properties.yaml
index e85179f3053ac..1085e1f8ef974 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_response_properties.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_configure_response_properties.yaml
@@ -1,14 +1,6 @@
 closure_type:
   $ref: 'closure_types.yaml'
-customFields:
-  type: array
-  x-technical-preview: true
-  description: Custom fields configuration details.
-  items:
-    type: object
-    properties:
-      $ref: 'case_configure_customfields.yaml'
-connector: 
+connector:
   type: object
   properties:
     $ref: 'case_configure_connector_properties.yaml'
@@ -20,15 +12,22 @@ created_at:
 created_by:
   type: object
   required:
-      - email
-      - full_name
-      - username
+    - email
+    - full_name
+    - username
   properties:
     $ref: 'user_properties.yaml'
+customFields:
+  type: array
+  description: Custom fields configuration details.
+  items:
+    type: object
+    properties:
+      $ref: 'case_configure_customfields.yaml'
 error:
   type:
-    - "string"
-    - "null"
+    - 'string'
+    - 'null'
   examples:
     - null
 id:
@@ -54,24 +53,26 @@ mappings:
           - summary
 owner:
   $ref: 'owners.yaml'
+templates:
+  $ref: 'templates.yaml'
 updated_at:
   type:
-    - "string"
-    - "null"
+    - 'string'
+    - 'null'
   format: date-time
   examples:
     - 2022-06-01T19:58:48.169Z
 updated_by:
   type:
-    - "object"
-    - "null"
+    - 'object'
+    - 'null'
   required:
-      - email
-      - full_name
-      - username
+    - email
+    - full_name
+    - username
   properties:
     $ref: 'user_properties.yaml'
 version:
   type: string
   examples:
-    - WzIwNzMsMV0=
\ No newline at end of file
+    - WzIwNzMsMV0=
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_description.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_description.yaml
new file mode 100644
index 0000000000000..a7336b64b44ac
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_description.yaml
@@ -0,0 +1,3 @@
+description: The description for the case.
+type: string
+maxLength: 30000
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_response_properties.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_response_properties.yaml
index bc26dedac8534..a0ef24983502f 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/case_response_properties.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_response_properties.yaml
@@ -27,13 +27,13 @@ properties:
     $ref: 'assignees.yaml'
   category:
     type:
-      - "string"
-      - "null"
+      - 'string'
+      - 'null'
     description: The case category.
   closed_at:
     type:
-      - "string"
-      - "null"
+      - 'string'
+      - 'null'
     format: date-time
   closed_by:
     $ref: 'case_response_closed_by_properties.yaml'
@@ -81,7 +81,6 @@ properties:
   customFields:
     type: array
     description: Custom field values for the case.
-    x-technical-preview: true
     items:
       type: object
       properties:
@@ -92,8 +91,8 @@ properties:
       - A case description.
   duration:
     type:
-      - "integer"
-      - "null"
+      - 'integer'
+      - 'null'
     description: >
       The elapsed time from the creation of the case to its closure (in seconds).
       If the case has not been closed, the duration is set to null. If the case
@@ -112,9 +111,9 @@ properties:
   settings:
     $ref: 'settings.yaml'
   severity:
-    $ref: 'severity_property.yaml'
+    $ref: 'case_severity.yaml'
   status:
-    $ref: 'status.yaml'
+    $ref: 'case_status.yaml'
   tags:
     type: array
     items:
@@ -135,8 +134,8 @@ properties:
       - 0
   updated_at:
     type:
-      - "string"
-      - "null"
+      - 'string'
+      - 'null'
     format: date-time
   updated_by:
     $ref: 'case_response_updated_by_properties.yaml'
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/severity_property.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_severity.yaml
similarity index 100%
rename from x-pack/plugins/cases/docs/openapi/components/schemas/severity_property.yaml
rename to x-pack/plugins/cases/docs/openapi/components/schemas/case_severity.yaml
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/status.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_status.yaml
similarity index 100%
rename from x-pack/plugins/cases/docs/openapi/components/schemas/status.yaml
rename to x-pack/plugins/cases/docs/openapi/components/schemas/case_status.yaml
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_tags.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_tags.yaml
new file mode 100644
index 0000000000000..cb0e78901b907
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_tags.yaml
@@ -0,0 +1,7 @@
+description: >
+  The words and phrases that help categorize cases. It can be an empty array.
+type: array
+maxItems: 200
+items:
+  type: string
+  maxLength: 256
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/case_title.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/case_title.yaml
new file mode 100644
index 0000000000000..0ed3923a4a9c9
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/case_title.yaml
@@ -0,0 +1,3 @@
+description: A title for the case.
+type: string
+maxLength: 160
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/create_case_request.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/create_case_request.yaml
index 71d3e036ac94b..94e9ecae9254d 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/create_case_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/create_case_request.yaml
@@ -22,36 +22,24 @@ properties:
       - $ref: 'connector_properties_servicenow_sir.yaml'
       - $ref: 'connector_properties_swimlane.yaml'
   description:
-    description: The description for the case.
-    type: string
-    maxLength: 30000
+    $ref: 'case_description.yaml'
   owner:
     $ref: 'owners.yaml'
   settings:
     $ref: 'settings.yaml'
   severity:
-    $ref: 'severity_property.yaml'
+    $ref: 'case_severity.yaml'
   tags:
-    description: The words and phrases that help categorize cases. It can be an empty array.
-    type: array
-    maxItems: 200
-    items:
-      type: string
-      maxLength: 256
+    $ref: 'case_tags.yaml'
   category:
-    description: A word or phrase that categorizes the case.
-    type: string
-    maxLength: 50
+    $ref: 'case_category.yaml'
   title:
-    description: A title for the case.
-    type: string
-    maxLength: 160
+    $ref: 'case_title.yaml'
   customFields:
     type: array
     description: >
       Custom field values for a case.
       Any optional custom fields that are not specified in the request are set to null.
-    x-technical-preview: true
     minItems: 0
     maxItems: 10
     items:
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_create_case.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_create_case.yaml
index 9bda777bccead..a5483b6412871 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_create_case.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_create_case.yaml
@@ -13,9 +13,9 @@ properties:
   settings:
     $ref: 'settings.yaml'
   severity:
-    $ref: 'severity_property.yaml'
+    $ref: 'case_severity.yaml'
   status: 
-    $ref: 'status.yaml'
+    $ref: 'case_status.yaml'
   tags: 
     type: array
     items:
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_severity.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_severity.yaml
index 471c309304b99..99dd67b55a43e 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_severity.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_severity.yaml
@@ -1,4 +1,4 @@
 type: object
 properties:
   severity:
-    $ref: 'severity_property.yaml'
\ No newline at end of file
+    $ref: 'case_severity.yaml'
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_status.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_status.yaml
index 63b67c4e510aa..4ba8eee486fe3 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/payload_status.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/payload_status.yaml
@@ -1,4 +1,4 @@
 type: object
 properties:
   status:
-    $ref: 'status.yaml'
\ No newline at end of file
+    $ref: 'case_status.yaml'
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/set_case_configuration_request.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/set_case_configuration_request.yaml
index 043febb36c8b6..dd275406264b5 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/set_case_configuration_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/set_case_configuration_request.yaml
@@ -21,7 +21,6 @@ properties:
   customFields:
     type: array
     description: Custom fields case configuration.
-    x-technical-preview: true
     minItems: 0
     maxItems: 10
     items:
@@ -35,3 +34,5 @@ properties:
         $ref: 'case_configure_customfields.yaml'
   owner:
     $ref: 'owners.yaml'
+  templates:
+    $ref: 'templates.yaml'
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/template_tags.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/template_tags.yaml
new file mode 100644
index 0000000000000..8dd87c7a35612
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/template_tags.yaml
@@ -0,0 +1,7 @@
+description: >
+  The words and phrases that help categorize templates. It can be an empty array.
+type: array
+maxItems: 200
+items:
+  type: string
+  maxLength: 256
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/templates.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/templates.yaml
new file mode 100644
index 0000000000000..b01cf5ad1f34e
--- /dev/null
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/templates.yaml
@@ -0,0 +1,66 @@
+type: array
+x-technical-preview: true
+items:
+  type: object
+  properties:
+    caseFields:
+      type: object
+      properties:
+        assignees:
+          $ref: 'assignees.yaml'
+        category:
+          $ref: 'case_category.yaml'
+        connector:
+          type: object
+          properties:
+            $ref: 'case_configure_connector_properties.yaml'
+        customFields:
+          type: array
+          x-technical-preview: true
+          description: Custom field values in the template.
+          items:
+            type: object
+            properties:
+              key:
+                type: string
+                description: The unique key for the custom field.
+              type:
+                type: string
+                enum:
+                  - text
+                  - toggle
+                description: The type of the custom field.
+              value:
+                oneOf:
+                  - type: string
+                  - type: boolean
+                description: >
+                  The default value for the custom field when a case uses the template.
+                  If the `type` is `text`, the default value must be a string.
+                  If the `type` is `toggle`, the default value must be boolean.
+        description:
+          $ref: 'case_description.yaml'
+        settings:
+          $ref: 'settings.yaml'
+        severity:
+          $ref: 'case_severity.yaml'
+        tags:
+          $ref: 'case_tags.yaml'
+        title:
+          $ref: 'case_title.yaml'
+    description:
+      type: string
+      description: A description for the template.
+    key:
+      type: string
+      description: >
+        A unique key for the template.
+        Must be lower case and composed only of a-z, 0-9, '_', and '-' characters.
+        It is used in API calls to refer to a specific template.
+    name:
+      type: string
+      description: The name of the template.
+    tags:
+      $ref: 'template_tags.yaml'
+      
+     
\ No newline at end of file
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_configuration_request.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_configuration_request.yaml
index 8a6a3aa7f302b..e359eea8e1030 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_configuration_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_configuration_request.yaml
@@ -1,7 +1,8 @@
 title: Update case configuration request
-description: External connection details, such as the closure type and default connector for cases.
+description: >
+  You can update settings such as the closure type, custom fields, templates, and the default connector for cases.
 type: object
-required: 
+required:
   - version
 properties:
   closure_type:
@@ -19,7 +20,6 @@ properties:
   customFields:
     type: array
     description: Custom fields case configuration.
-    x-technical-preview: true
     items:
       type: object
       required:
@@ -29,10 +29,12 @@ properties:
         - type
       properties:
         $ref: 'case_configure_customfields.yaml'
+  templates:
+    $ref: 'templates.yaml'
   version:
     description: >
       The version of the connector.
       To retrieve the version value, use the get configuration API.
     type: string
     examples:
-      - WzIwMiwxXQ==
\ No newline at end of file
+      - WzIwMiwxXQ==
diff --git a/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_request.yaml b/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_request.yaml
index 3fa99d40e5002..8062128c03450 100644
--- a/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_request.yaml
+++ b/x-pack/plugins/cases/docs/openapi/components/schemas/update_case_request.yaml
@@ -19,9 +19,7 @@ properties:
         assignees:
           $ref: 'assignees.yaml'
         category:
-          description: A word or phrase that categorizes the case.
-          type: string
-          maxLength: 50
+          $ref: 'case_category.yaml'
         connector:
           oneOf:
             - $ref: 'connector_properties_none.yaml'
@@ -36,7 +34,6 @@ properties:
           description: >
             Custom field values for a case.
             Any optional custom fields that are not specified in the request are set to null.
-          x-technical-preview: true
           minItems: 0
           maxItems: 10
           items:
@@ -48,8 +45,7 @@ properties:
             properties:
               $ref: 'case_customfields.yaml'
         description:
-          description: An updated description for the case.
-          type: string
+          $ref: 'case_description.yaml'
         id:
           description: The identifier for the case.
           type: string
@@ -57,20 +53,13 @@ properties:
         settings:
           $ref: 'settings.yaml'
         severity:
-          $ref: 'severity_property.yaml'
+          $ref: 'case_severity.yaml'
         status:
-          $ref: 'status.yaml'
+          $ref: 'case_status.yaml'
         tags:
-          description: The words and phrases that help categorize cases.
-          type: array
-          maxItems: 200
-          items:
-            type: string
-            maxLength: 256
+          $ref: 'case_tags.yaml'
         title:
-          description: A title for the case.
-          type: string
-          maxLength: 160
+          $ref: 'case_title.yaml'
         version:
           description: The current version of the case. To determine this value, use the get case or find cases APIs.
           type: string
diff --git a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure.yaml b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure.yaml
index 5de3de67182b0..5618eb08a4b72 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure.yaml
@@ -1,10 +1,11 @@
 get:
-  summary: Retrieves external connection details, such as the closure type and default connector for cases in the default space.
+  summary: Get case settings in the default space
   operationId: getCaseConfigurationDefaultSpace
   description: >
+    Retrieves setting details such as the closure type, custom fields, templatse, and the default connector for cases in the default space.
     You must have `read` privileges for the **Cases** feature in the
     **Management**, **Observability**, or **Security** section of the Kibana
-    feature privileges, depending on the owner of the case configuration.
+    feature privileges, depending on where the cases were created.
   tags:
     - cases
   parameters:
@@ -31,14 +32,15 @@ get:
             $ref: '../components/schemas/4xx_response.yaml'
 
 post:
-  summary: Creates a case specific configuration that includes external connection details and custom fields.
+  summary: Add case settings in the default space
   operationId: setCaseConfigurationDefaultSpace
   description: >
-    You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.
+    Case settings include external connection details, custom fields, and templates. 
     Connectors are used to interface with external systems.
-    You must create a connector before you can use it in your cases. Refer to the add connectors API.
+    You must create a connector before you can use it in your cases.
     If you set a default connector, it is automatically selected when you create cases in Kibana.
     If you use the create case API, however, you must still specify all of the connector details.
+    You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.
   tags:
     - cases
   parameters:
diff --git a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@connectors@_find.yaml b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@connectors@_find.yaml
index 53a5ebf537e57..5ce6113cf699d 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@connectors@_find.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@connectors@_find.yaml
@@ -1,10 +1,9 @@
 get:
-  summary: Retrieves information about connectors in the default space.
+  summary: Get case connectors in the default space
   operationId: findCaseConnectorsDefaultSpace
   description: >
-    In particular, only the connectors that are supported for use in cases are
-    returned. You must have `read` privileges for the **Actions and Connectors**
-    feature in the **Management** section of the Kibana feature privileges.
+    Retrieves information about connectors that are supported for use in cases in the default space.
+    You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
   tags:
     - cases
   responses:
diff --git a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@{configurationid}.yaml b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@{configurationid}.yaml
index d31299128b076..90f75c8d45e45 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@{configurationid}.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/api@cases@configure@{configurationid}.yaml
@@ -1,11 +1,13 @@
 patch:
-  summary: Updates external connection details, such as the closure type and default connector for cases in the default space.
+  summary: Update case settings in the default space
   operationId: updateCaseConfigurationDefaultSpace
   description: >
-    You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on the owner of the case configuration.
+    Updates setting details such as the closure type, custom fields, templates, and the default connector for cases in the default space.
     Connectors are used to interface with external systems.
     You must create a connector before you can use it in your cases.
-    Refer to the add connectors API.
+    You must have `all` privileges for the **Cases** feature in the
+    **Management**, **Observability**, or **Security** section of the Kibana
+    feature privileges, depending on where the case was created.
   tags:
     - cases
   parameters:
diff --git a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure.yaml b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure.yaml
index d12262379df81..7e616ed1c4f14 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure.yaml
@@ -1,10 +1,11 @@
 get:
-  summary: Retrieves external connection details, such as the closure type and default connector for cases.
+  summary: Get case settings
   operationId: getCaseConfiguration
   description: >
+    Retrieves setting details such as the closure type, custom fields, templates, and the default connector for cases.
     You must have `read` privileges for the **Cases** feature in the
     **Management**, **Observability**, or **Security** section of the Kibana
-    feature privileges, depending on the owner of the case configuration.
+    feature privileges, depending on where the cases were created.
   tags:
     - cases
   parameters:
@@ -32,17 +33,15 @@ get:
             $ref: '../components/schemas/4xx_response.yaml'
 
 post:
-  summary: Creates a case specific configuration that includes external connection details and custom fields.
+  summary: Add case settings
   operationId: setCaseConfiguration
   description: >
-    You must have `all` privileges for the **Cases** feature in the
-    **Management**, **Observability**, or **Security** section of the Kibana
-    feature privileges, depending on the owner of the case configuration.
-    Connectors are used to interface with external systems. You must create a
-    connector before you can use it in your cases. Refer to the add connectors
-    API. If you set a default connector, it is automatically selected when you
-    create cases in Kibana. If you use the create case API, however, you must
-    still specify all of the connector details.
+    Case settings include external connection details, custom fields, and templates. 
+    Connectors are used to interface with external systems.
+    You must create a connector before you can use it in your cases.
+    If you set a default connector, it is automatically selected when you create cases in Kibana.
+    If you use the create case API, however, you must still specify all of the connector details.
+    You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.
   tags:
     - cases
   parameters:
diff --git a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@connectors@_find.yaml b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@connectors@_find.yaml
index f04f802ba3245..b496bb141f2ee 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@connectors@_find.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@connectors@_find.yaml
@@ -1,10 +1,9 @@
 get:
-  summary: Retrieves information about connectors.
+  summary: Get case connectors
   operationId: findCaseConnectors
   description: >
-    In particular, only the connectors that are supported for use in cases are
-    returned. You must have `read` privileges for the **Actions and Connectors**
-    feature in the **Management** section of the Kibana feature privileges.
+    Retrieves information about connectors that are supported for use in cases.
+    You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.
   tags:
     - cases
   parameters:
diff --git a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@{configurationid}.yaml b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@{configurationid}.yaml
index c8656181aca93..5d31a7e027cb2 100644
--- a/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@{configurationid}.yaml
+++ b/x-pack/plugins/cases/docs/openapi/paths/s@{spaceid}@api@cases@configure@{configurationid}.yaml
@@ -1,12 +1,13 @@
 patch:
-  summary: Updates external connection details, such as the closure type and default connector for cases.
+  summary: Update case settings
   operationId: updateCaseConfiguration
   description: >
+    Updates setting details such as the closure type, custom fields, templates, and the default connector for cases.
+    Connectors are used to interface with external systems.
+    You must create a connector before you can use it in your cases.
     You must have `all` privileges for the **Cases** feature in the
     **Management**, **Observability**, or **Security** section of the Kibana
-    feature privileges, depending on the owner of the case configuration.
-    Connectors are used to interface with external systems. You must create a
-    connector before you can use it in your cases. Refer to the add connectors API.
+    feature privileges, depending on where the case was created.
   tags:
     - cases
   parameters:
diff --git a/x-pack/plugins/cases/public/common/translations.ts b/x-pack/plugins/cases/public/common/translations.ts
index eab026897e3bf..2e11c3a64caae 100644
--- a/x-pack/plugins/cases/public/common/translations.ts
+++ b/x-pack/plugins/cases/public/common/translations.ts
@@ -22,11 +22,11 @@ export const DELETE_CASE = (quantity: number = 1) =>
   });
 
 export const COPY_ID_ACTION_LABEL = i18n.translate('xpack.cases.caseView.copyID', {
-  defaultMessage: 'Copy Case ID',
+  defaultMessage: 'Copy case ID',
 });
 
 export const COPY_ID_ACTION_SUCCESS = i18n.translate('xpack.cases.caseView.copyIDSuccess', {
-  defaultMessage: 'Copied Case ID to clipboard',
+  defaultMessage: 'Copied case ID to clipboard',
 });
 
 export const NAME = i18n.translate('xpack.cases.caseView.name', {
@@ -153,6 +153,14 @@ export const ACTIONS = i18n.translate('xpack.cases.allCases.actions', {
   defaultMessage: 'Actions',
 });
 
+export const ACTIONS_BUTTON_ARIA_LABEL = (title: string) =>
+  i18n.translate('xpack.cases.allCases.actions.button.ariaLabel', {
+    defaultMessage: 'Actions for "{title}" column',
+    values: {
+      title,
+    },
+  });
+
 export const NO_TAGS_AVAILABLE = i18n.translate('xpack.cases.allCases.noTagsAvailable', {
   defaultMessage: 'No tags available',
 });
diff --git a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
index 0c33980b3ab63..388b3de940ec5 100644
--- a/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
+++ b/x-pack/plugins/cases/public/components/actions/copy_id/use_copy_id_action.test.tsx
@@ -50,7 +50,7 @@ describe('useCopyIDAction', () => {
         />,
         "key": "cases-action-copy-id",
         "name": <EuiTextColor>
-          Copy Case ID
+          Copy case ID
         </EuiTextColor>,
         "onClick": [Function],
       }
@@ -84,7 +84,7 @@ describe('useCopyIDAction', () => {
     await waitFor(() => {
       expect(onActionSuccess).toHaveBeenCalled();
       expect(appMockRender.coreStart.notifications.toasts.addSuccess).toHaveBeenCalledWith({
-        title: 'Copied Case ID to clipboard',
+        title: 'Copied case ID to clipboard',
         className: 'eui-textBreakWord',
       });
     });
diff --git a/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx b/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx
index 199b0eebfb2c6..e5efc9463bb26 100644
--- a/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/severity_filter.test.tsx
@@ -14,7 +14,8 @@ import { screen, waitFor, within } from '@testing-library/react';
 import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl';
 import { SeverityFilter } from './severity_filter';
 
-describe('Severity form field', () => {
+// Failing: See https://github.com/elastic/kibana/issues/176336
+describe.skip('Severity form field', () => {
   const onChange = jest.fn();
   let appMockRender: AppMockRenderer;
   const props = {
diff --git a/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx b/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
index 70a163bcd69a0..4c43201b1eab4 100644
--- a/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/use_actions.tsx
@@ -174,7 +174,7 @@ const ActionColumnComponent: React.FC<{ theCase: CaseUI; disableActions: boolean
           <EuiButtonIcon
             onClick={tooglePopover}
             iconType="boxesHorizontal"
-            aria-label={i18n.ACTIONS}
+            aria-label={i18n.ACTIONS_BUTTON_ARIA_LABEL(theCase.title)}
             color="text"
             key={`case-action-popover-button-${theCase.id}`}
             data-test-subj={`case-action-popover-button-${theCase.id}`}
diff --git a/x-pack/plugins/cases/public/components/configure_cases/flyout.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/flyout.test.tsx
index 555f5e6f553b8..5d6c1784603e4 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/flyout.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/flyout.test.tsx
@@ -600,6 +600,11 @@ describe('CommonFlyout ', () => {
                 type: 'toggle',
                 value: true,
               },
+              {
+                key: 'test_key_3',
+                type: 'text',
+                value: null,
+              },
               {
                 key: 'test_key_4',
                 type: 'toggle',
@@ -766,7 +771,7 @@ describe('CommonFlyout ', () => {
         expect(props.onSaveField).not.toHaveBeenCalled();
       });
 
-      expect(await screen.findByText('A Template name is required.')).toBeInTheDocument();
+      expect(await screen.findByText('Template name is required.')).toBeInTheDocument();
     });
 
     it('shows error if template name is too long', async () => {
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
index b424b2ca62fc0..97e43a2ade559 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.test.tsx
@@ -724,6 +724,166 @@ describe('ConfigureCases', () => {
       });
     });
 
+    it('deletes a custom field from template while deleting custom field from configuration', async () => {
+      useGetCaseConfigurationMock.mockImplementation(() => ({
+        ...useCaseConfigureResponse,
+        data: {
+          ...useCaseConfigureResponse.data,
+          customFields: customFieldsConfigurationMock,
+          templates: [
+            {
+              key: 'test_template_4',
+              name: 'Fourth test template',
+              caseFields: {
+                title: 'Case with sample template 4',
+                description: 'case desc',
+                customFields: [
+                  {
+                    key: customFieldsConfigurationMock[0].key,
+                    type: CustomFieldTypes.TEXT,
+                    value: 'this is a text field value',
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      }));
+
+      appMockRender.render(<ConfigureCases />);
+
+      const list = await screen.findByTestId('custom-fields-list');
+
+      userEvent.click(
+        within(list).getByTestId(`${customFieldsConfigurationMock[0].key}-custom-field-delete`)
+      );
+
+      expect(await screen.findByTestId('confirm-delete-modal')).toBeInTheDocument();
+
+      userEvent.click(screen.getByText('Delete'));
+
+      await waitFor(() => {
+        expect(persistCaseConfigure).toHaveBeenCalledWith({
+          connector: {
+            id: 'none',
+            name: 'none',
+            type: ConnectorTypes.none,
+            fields: null,
+          },
+          closureType: 'close-by-user',
+          customFields: [
+            { ...customFieldsConfigurationMock[1] },
+            { ...customFieldsConfigurationMock[2] },
+            { ...customFieldsConfigurationMock[3] },
+          ],
+          templates: [
+            {
+              key: 'test_template_4',
+              name: 'Fourth test template',
+              caseFields: {
+                title: 'Case with sample template 4',
+                description: 'case desc',
+                customFields: [],
+              },
+            },
+          ],
+          id: '',
+          version: '',
+        });
+      });
+    });
+
+    it('adds a custom field to template while adding a new custom field', async () => {
+      useGetCaseConfigurationMock.mockImplementation(() => ({
+        ...useCaseConfigureResponse,
+        data: {
+          ...useCaseConfigureResponse.data,
+          customFields: customFieldsConfigurationMock,
+          templates: [
+            {
+              key: 'test_template_4',
+              name: 'Fourth test template',
+              caseFields: null,
+            },
+          ],
+        },
+      }));
+
+      appMockRender.render(<ConfigureCases />);
+
+      userEvent.click(await screen.findByTestId(`add-custom-field`));
+
+      expect(await screen.findByTestId('common-flyout')).toBeInTheDocument();
+
+      userEvent.paste(screen.getByTestId('custom-field-label-input'), 'New custom field');
+      userEvent.click(screen.getByTestId('text-custom-field-required'));
+      userEvent.paste(
+        screen.getByTestId('text-custom-field-default-value'),
+        'This is a default value'
+      );
+
+      userEvent.click(screen.getByTestId('common-flyout-save'));
+
+      await waitFor(() => {
+        expect(persistCaseConfigure).toHaveBeenCalledWith({
+          connector: {
+            id: 'none',
+            name: 'none',
+            type: ConnectorTypes.none,
+            fields: null,
+          },
+          closureType: 'close-by-user',
+          customFields: [
+            ...customFieldsConfigurationMock,
+            {
+              key: expect.anything(),
+              label: 'New custom field',
+              type: CustomFieldTypes.TEXT as const,
+              required: true,
+              defaultValue: 'This is a default value',
+            },
+          ],
+          templates: [
+            {
+              key: 'test_template_4',
+              name: 'Fourth test template',
+              caseFields: {
+                customFields: [
+                  {
+                    key: customFieldsConfigurationMock[0].key,
+                    type: customFieldsConfigurationMock[0].type,
+                    value: customFieldsConfigurationMock[0].defaultValue,
+                  },
+                  {
+                    key: customFieldsConfigurationMock[1].key,
+                    type: customFieldsConfigurationMock[1].type,
+                    value: customFieldsConfigurationMock[1].defaultValue,
+                  },
+                  {
+                    key: customFieldsConfigurationMock[2].key,
+                    type: customFieldsConfigurationMock[2].type,
+                    value: null,
+                  },
+                  {
+                    key: customFieldsConfigurationMock[3].key,
+                    type: customFieldsConfigurationMock[3].type,
+                    value: false,
+                  },
+                  {
+                    key: expect.anything(),
+                    type: CustomFieldTypes.TEXT as const,
+                    value: 'This is a default value',
+                  },
+                ],
+              },
+            },
+          ],
+          id: '',
+          version: '',
+        });
+      });
+    });
+
     it('updates a custom field correctly', async () => {
       useGetCaseConfigurationMock.mockImplementation(() => ({
         ...useCaseConfigureResponse,
@@ -929,6 +1089,11 @@ describe('ConfigureCases', () => {
                     type: customFieldsConfigurationMock[1].type,
                     value: customFieldsConfigurationMock[1].defaultValue,
                   },
+                  {
+                    key: customFieldsConfigurationMock[2].key,
+                    type: customFieldsConfigurationMock[2].type,
+                    value: null,
+                  },
                   {
                     key: customFieldsConfigurationMock[3].key,
                     type: customFieldsConfigurationMock[3].type,
diff --git a/x-pack/plugins/cases/public/components/configure_cases/index.tsx b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
index 1003a10646e8c..2eadd6ccbe79a 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
@@ -24,7 +24,11 @@ import {
 
 import type { ActionConnectorTableItem } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { CasesConnectorFeatureId } from '@kbn/actions-plugin/common';
-import type { CustomFieldConfiguration, TemplateConfiguration } from '../../../common/types/domain';
+import type {
+  CustomFieldConfiguration,
+  TemplateConfiguration,
+  CustomFieldTypes,
+} from '../../../common/types/domain';
 import { useKibana } from '../../common/lib/kibana';
 import { useGetActionTypes } from '../../containers/configure/use_action_types';
 import { useGetCaseConfiguration } from '../../containers/configure/use_get_case_configuration';
@@ -48,6 +52,8 @@ import { Templates } from '../templates';
 import type { TemplateFormProps } from '../templates/types';
 import { CustomFieldsForm } from '../custom_fields/form';
 import { TemplateForm } from '../templates/form';
+import type { CasesConfigurationUI, CaseUI } from '../../containers/types';
+import { builderMap as customFieldsBuilderMap } from '../custom_fields/builder';
 
 const sectionWrapperCss = css`
   box-sizing: content-box;
@@ -68,6 +74,40 @@ interface Flyout {
   visible: boolean;
 }
 
+const addNewCustomFieldToTemplates = ({
+  templates,
+  customFields,
+}: Pick<CasesConfigurationUI, 'templates' | 'customFields'>) => {
+  return templates.map((template) => {
+    const templateCustomFields = template.caseFields?.customFields ?? [];
+
+    customFields.forEach((field) => {
+      if (
+        !templateCustomFields.length ||
+        !templateCustomFields.find((templateCustomField) => templateCustomField.key === field.key)
+      ) {
+        const customFieldFactory = customFieldsBuilderMap[field.type];
+        const { getDefaultValue } = customFieldFactory();
+        const value = getDefaultValue?.() ?? null;
+
+        templateCustomFields.push({
+          key: field.key,
+          type: field.type as CustomFieldTypes,
+          value: field.defaultValue ?? value,
+        } as CaseUI['customFields'][number]);
+      }
+    });
+
+    return {
+      ...template,
+      caseFields: {
+        ...template.caseFields,
+        customFields: [...templateCustomFields],
+      },
+    };
+  });
+};
+
 export const ConfigureCases: React.FC = React.memo(() => {
   const { permissions } = useCasesContext();
   const { triggersActionsUi } = useKibana().services;
@@ -334,10 +374,16 @@ export const ConfigureCases: React.FC = React.memo(() => {
     (data: CustomFieldConfiguration) => {
       const updatedCustomFields = addOrReplaceField(customFields, data);
 
+      // add the new custom field to each template as well
+      const updatedTemplates = addNewCustomFieldToTemplates({
+        templates,
+        customFields: updatedCustomFields,
+      });
+
       persistCaseConfigure({
         connector,
         customFields: updatedCustomFields,
-        templates,
+        templates: updatedTemplates,
         id: configurationId,
         version: configurationVersion,
         closureType,
diff --git a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
index 9cf77466a225b..70e91af618854 100644
--- a/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/connector_selector/form.test.tsx
@@ -6,48 +6,90 @@
  */
 
 import React from 'react';
-import { mount } from 'enzyme';
-import type { FormHook } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
-import { UseField, Form, useForm } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import { screen } from '@testing-library/react';
 import { ConnectorSelector } from './form';
-import { connectorsMock } from '../../containers/mock';
-import { getFormMock } from '../__mock__/form';
 import { useKibana } from '../../common/lib/kibana';
+import type { AppMockRenderer } from '../../common/mock';
+import { createAppMockRenderer } from '../../common/mock';
+import { UseField } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
+import { FormTestComponent } from '../../common/test_utils';
+import { connectorsMock } from '../../containers/mock';
 
-jest.mock('@kbn/es-ui-shared-plugin/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../common/lib/kibana');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
-const useFormMock = useForm as jest.Mock;
 
 describe('ConnectorSelector', () => {
-  const formHookMock = getFormMock({ connectorId: connectorsMock[0].id });
+  const handleChange = jest.fn();
+  const defaultProps = {
+    connectors: [],
+    handleChange,
+    dataTestSubj: 'connectors',
+    disabled: false,
+    idAria: 'connectors',
+    isLoading: false,
+  };
+
+  let appMock: AppMockRenderer;
+
+  beforeEach(() => {
+    appMock = createAppMockRenderer();
+    jest.clearAllMocks();
+  });
 
   beforeEach(() => {
-    useFormMock.mockImplementation(() => ({ form: formHookMock }));
     useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
       actionTypeTitle: 'test',
       iconClass: 'logoSecurity',
     });
   });
 
-  it('it should render', async () => {
-    const wrapper = mount(
-      <Form form={formHookMock as unknown as FormHook}>
+  it('should render', async () => {
+    appMock.render(
+      <FormTestComponent>
+        <UseField
+          path="connectorId"
+          component={ConnectorSelector}
+          componentProps={{
+            ...defaultProps,
+          }}
+        />
+      </FormTestComponent>
+    );
+
+    expect(await screen.findByTestId(defaultProps.dataTestSubj));
+  });
+
+  it('should set the selected connector to none if the connector is not available', async () => {
+    appMock.render(
+      <FormTestComponent formDefaultValue={{ connectorId: 'foo' }}>
+        <UseField
+          path="connectorId"
+          component={ConnectorSelector}
+          componentProps={{
+            ...defaultProps,
+          }}
+        />
+      </FormTestComponent>
+    );
+
+    expect(await screen.findByText('No connector selected'));
+  });
+
+  it('should set the selected connector correctly', async () => {
+    appMock.render(
+      <FormTestComponent formDefaultValue={{ connectorId: connectorsMock[0].id }}>
         <UseField
           path="connectorId"
           component={ConnectorSelector}
           componentProps={{
+            ...defaultProps,
             connectors: connectorsMock,
-            dataTestSubj: 'caseConnectors',
-            disabled: false,
-            idAria: 'caseConnectors',
-            isLoading: false,
           }}
         />
-      </Form>
+      </FormTestComponent>
     );
 
-    expect(wrapper.find(`[data-test-subj="caseConnectors"]`).exists()).toBeTruthy();
+    expect(await screen.findByText(connectorsMock[0].name));
   });
 });
diff --git a/x-pack/plugins/cases/public/components/connector_selector/form.tsx b/x-pack/plugins/cases/public/components/connector_selector/form.tsx
index 37221edf9048a..fa991bc5b9871 100644
--- a/x-pack/plugins/cases/public/components/connector_selector/form.tsx
+++ b/x-pack/plugins/cases/public/components/connector_selector/form.tsx
@@ -45,6 +45,10 @@ export const ConnectorSelector = ({
     [handleChange, field]
   );
 
+  const isConnectorAvailable = Boolean(
+    connectors.find((connector) => connector.id === field.value)
+  );
+
   return (
     <EuiFormRow
       css={css`
@@ -66,7 +70,7 @@ export const ConnectorSelector = ({
         disabled={disabled}
         isLoading={isLoading}
         onChange={onChange}
-        selectedConnector={isEmpty(field.value) ? 'none' : field.value}
+        selectedConnector={isEmpty(field.value) || !isConnectorAvailable ? 'none' : field.value}
       />
     </EuiFormRow>
   );
diff --git a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
index 964daacb4a6bf..bf2ba2a4ece3c 100644
--- a/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/resilient/use_get_severity.test.tsx
@@ -19,7 +19,8 @@ jest.mock('./api');
 
 const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
-describe('useGetSeverity', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/187456
+describe.skip('useGetSeverity', () => {
   const { http } = useKibanaMock().services;
   let appMockRender: AppMockRenderer;
 
diff --git a/x-pack/plugins/cases/public/components/create/form.test.tsx b/x-pack/plugins/cases/public/components/create/form.test.tsx
index 885e25e959ac9..c93ffbd4cff77 100644
--- a/x-pack/plugins/cases/public/components/create/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.test.tsx
@@ -24,7 +24,7 @@ import { useAvailableCasesOwners } from '../app/use_available_owners';
 import type { AppMockRenderer } from '../../common/mock';
 import { createAppMockRenderer } from '../../common/mock';
 import userEvent from '@testing-library/user-event';
-import { CustomFieldTypes } from '../../../common/types/domain';
+import { ConnectorTypes, CustomFieldTypes } from '../../../common/types/domain';
 import { useSuggestUserProfiles } from '../../containers/user_profiles/use_suggest_user_profiles';
 import { useGetCurrentUserProfile } from '../../containers/user_profiles/use_get_current_user_profile';
 import { userProfiles } from '../../containers/user_profiles/api.mock';
@@ -334,5 +334,73 @@ describe('CreateCaseForm', () => {
 
       expect(await screen.findByText('No connector selected')).toBeInTheDocument();
     });
+
+    it('selects the placeholder empty template correctly', async () => {
+      useGetAllCaseConfigurationsMock.mockReturnValue({
+        ...useGetAllCaseConfigurationsResponse,
+        data: [
+          {
+            ...useGetAllCaseConfigurationsResponse.data[0],
+            customFields: [
+              {
+                key: 'first_custom_field_key',
+                type: CustomFieldTypes.TEXT,
+                required: false,
+                label: 'My test label 1',
+                defaultValue: 'custom field default value',
+              },
+            ],
+            templates: templatesConfigurationMock,
+            connector: {
+              id: 'servicenow-1',
+              name: 'My SN connector',
+              type: ConnectorTypes.serviceNowITSM,
+              fields: null,
+            },
+          },
+        ],
+      });
+
+      const license = licensingMock.createLicense({
+        license: { type: 'platinum' },
+      });
+      const firstTemplate = templatesConfigurationMock[4];
+
+      appMockRenderer = createAppMockRenderer({ license });
+      appMockRenderer.render(<CreateCaseForm {...casesFormProps} />);
+
+      userEvent.selectOptions(
+        await screen.findByTestId('create-case-template-select'),
+        firstTemplate.name
+      );
+
+      const title = within(await screen.findByTestId('caseTitle')).getByTestId('input');
+      const description = within(await screen.findByTestId('caseDescription')).getByRole('textbox');
+      const tags = within(await screen.findByTestId('caseTags')).getByTestId('comboBoxInput');
+      const category = within(await screen.findByTestId('caseCategory')).getByTestId(
+        'comboBoxSearchInput'
+      );
+      const assignees = within(await screen.findByTestId('caseAssignees')).getByTestId(
+        'comboBoxSearchInput'
+      );
+      const severity = await screen.findByTestId('case-severity-selection');
+      const customField = await screen.findByTestId(
+        'first_custom_field_key-text-create-custom-field'
+      );
+
+      userEvent.selectOptions(
+        await screen.findByTestId('create-case-template-select'),
+        'No template selected'
+      );
+
+      expect(title).not.toHaveValue();
+      expect(description).not.toHaveValue();
+      expect(tags).not.toHaveValue();
+      expect(category).not.toHaveValue();
+      expect(severity).toHaveTextContent('Low');
+      expect(assignees).not.toHaveValue();
+      expect(customField).toHaveValue('custom field default value');
+      expect(await screen.findByText('My SN connector')).toBeInTheDocument();
+    });
   });
 });
diff --git a/x-pack/plugins/cases/public/components/create/form_fields.tsx b/x-pack/plugins/cases/public/components/create/form_fields.tsx
index 26189e33b7f12..da81e65b8e0f0 100644
--- a/x-pack/plugins/cases/public/components/create/form_fields.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_fields.tsx
@@ -17,7 +17,7 @@ import {
 import { css } from '@emotion/react';
 import { useFormContext } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 
-import type { CasePostRequest } from '../../../common';
+import type { CasePostRequest, CaseUI } from '../../../common';
 import type { ActionConnector } from '../../../common/types/domain';
 import { Connector } from '../case_form_fields/connector';
 import * as i18n from './translations';
@@ -28,6 +28,7 @@ import { useCasesFeatures } from '../../common/use_cases_features';
 import { TemplateSelector } from './templates';
 import { getInitialCaseValue } from './utils';
 import { CaseFormFields } from '../case_form_fields';
+import { builderMap as customFieldsBuilderMap } from '../custom_fields/builder';
 
 export interface CreateCaseFormFieldsProps {
   configuration: CasesConfigurationUI;
@@ -42,9 +43,26 @@ const transformTemplateCaseFieldsToCaseFormFields = (
   caseTemplateFields: CasesConfigurationUITemplate['caseFields']
 ): CasePostRequest => {
   const caseFields = removeEmptyFields(caseTemplateFields ?? {});
-  return getInitialCaseValue({ owner, ...caseFields });
+  const transFormedCustomFields = caseFields?.customFields?.map((customField) => {
+    const customFieldFactory = customFieldsBuilderMap[customField.type];
+    const { convertNullToEmpty } = customFieldFactory();
+    const value = convertNullToEmpty ? convertNullToEmpty(customField.value) : customField.value;
+
+    return {
+      ...customField,
+      value,
+    };
+  });
+
+  return getInitialCaseValue({
+    owner,
+    ...caseFields,
+    customFields: transFormedCustomFields as CaseUI['customFields'],
+  });
 };
 
+const DEFAULT_EMPTY_TEMPLATE_KEY = 'defaultEmptyTemplateKey';
+
 export const CreateCaseFormFields: React.FC<CreateCaseFormFieldsProps> = React.memo(
   ({ configuration, connectors, isLoading, withSteps, draftStorageKey }) => {
     const { reset, updateFieldValues, isSubmitting, setFieldValue } = useFormContext();
@@ -61,6 +79,18 @@ export const CreateCaseFormFields: React.FC<CreateCaseFormFieldsProps> = React.m
       setFieldValue('connectorId', configuration.connector.id);
     }, [configuration.connector.id, setFieldValue]);
 
+    const defaultTemplate = useMemo(
+      () => ({
+        key: DEFAULT_EMPTY_TEMPLATE_KEY,
+        name: i18n.DEFAULT_EMPTY_TEMPLATE_NAME,
+        caseFields: getInitialCaseValue({
+          owner: configurationOwner,
+          connector: configuration.connector,
+        }),
+      }),
+      [configurationOwner, configuration.connector]
+    );
+
     const onTemplateChange = useCallback(
       (caseFields: CasesConfigurationUITemplate['caseFields']) => {
         const caseFormFields = transformTemplateCaseFieldsToCaseFormFields(
@@ -83,12 +113,12 @@ export const CreateCaseFormFields: React.FC<CreateCaseFormFieldsProps> = React.m
         children: (
           <TemplateSelector
             isLoading={isSubmitting || isLoading}
-            templates={configuration.templates}
+            templates={[defaultTemplate, ...configuration.templates]}
             onTemplateChange={onTemplateChange}
           />
         ),
       }),
-      [configuration.templates, isLoading, isSubmitting, onTemplateChange]
+      [configuration.templates, defaultTemplate, isLoading, isSubmitting, onTemplateChange]
     );
 
     const secondStep = useMemo(
diff --git a/x-pack/plugins/cases/public/components/create/templates.tsx b/x-pack/plugins/cases/public/components/create/templates.tsx
index 612a7d8a24a70..3df1504ccf14f 100644
--- a/x-pack/plugins/cases/public/components/create/templates.tsx
+++ b/x-pack/plugins/cases/public/components/create/templates.tsx
@@ -57,7 +57,6 @@ export const TemplateSelectorComponent: React.FC<Props> = ({
         isLoading={isLoading}
         data-test-subj="create-case-template-select"
         fullWidth
-        hasNoInitialSelection
         value={selectedTemplate}
       />
     </EuiFormRow>
diff --git a/x-pack/plugins/cases/public/components/create/translations.ts b/x-pack/plugins/cases/public/components/create/translations.ts
index aef9c7c525acd..89e384502d3ed 100644
--- a/x-pack/plugins/cases/public/components/create/translations.ts
+++ b/x-pack/plugins/cases/public/components/create/translations.ts
@@ -55,9 +55,16 @@ export const TEMPLATE_LABEL = i18n.translate('xpack.cases.create.templateLabel',
 });
 
 export const TEMPLATE_HELP_TEXT = i18n.translate('xpack.cases.create.templateHelpText', {
-  defaultMessage: 'Selecting a template will pre-fill certain case fields below',
+  defaultMessage: 'Select a template to use its default field values.',
 });
 
 export const SOLUTION_SELECTOR_LABEL = i18n.translate('xpack.cases.create.solutionSelectorLabel', {
   defaultMessage: 'Create case under:',
 });
+
+export const DEFAULT_EMPTY_TEMPLATE_NAME = i18n.translate(
+  'xpack.cases.create.defaultEmptyTemplateName',
+  {
+    defaultMessage: 'No template selected',
+  }
+);
diff --git a/x-pack/plugins/cases/public/components/custom_fields/form.test.tsx b/x-pack/plugins/cases/public/components/custom_fields/form.test.tsx
index 89fdca73fefbf..125a5ada01e5f 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/custom_fields/form.test.tsx
@@ -18,7 +18,8 @@ import userEvent from '@testing-library/user-event';
 import { customFieldsConfigurationMock } from '../../containers/mock';
 import type { FormState } from '../configure_cases/flyout';
 
-describe('CustomFieldsForm ', () => {
+// FLAKY: https://github.com/elastic/kibana/issues/187554
+describe.skip('CustomFieldsForm ', () => {
   let appMockRender: AppMockRenderer;
   const onChange = jest.fn();
 
diff --git a/x-pack/plugins/cases/public/components/custom_fields/index.tsx b/x-pack/plugins/cases/public/components/custom_fields/index.tsx
index a5068df682ad1..afe3a4ad04b32 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/index.tsx
+++ b/x-pack/plugins/cases/public/components/custom_fields/index.tsx
@@ -21,7 +21,6 @@ import { useCasesContext } from '../cases_context/use_cases_context';
 import type { CustomFieldsConfiguration } from '../../../common/types/domain';
 import { MAX_CUSTOM_FIELDS_PER_CASE } from '../../../common/constants';
 import { CustomFieldsList } from './custom_fields_list';
-import { ExperimentalBadge } from '../experimental_badge/experimental_badge';
 
 export interface Props {
   customFields: CustomFieldsConfiguration;
@@ -68,14 +67,7 @@ const CustomFieldsComponent: React.FC<Props> = ({
   return canAddCustomFields ? (
     <EuiDescribedFormGroup
       fullWidth
-      title={
-        <EuiFlexGroup alignItems="center" gutterSize="none">
-          <EuiFlexItem grow={false}>{i18n.TITLE}</EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <ExperimentalBadge />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      }
+      title={<h3>{i18n.TITLE}</h3>}
       description={<p>{i18n.DESCRIPTION}</p>}
       data-test-subj="custom-fields-form-group"
     >
diff --git a/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.test.ts b/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.test.ts
index 9ce931b1fa293..46b7518a40fe2 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.test.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.test.ts
@@ -20,6 +20,7 @@ describe('configureTextCustomFieldFactory ', () => {
       label: 'Text',
       getEuiTableColumn: expect.any(Function),
       build: expect.any(Function),
+      convertNullToEmpty: expect.any(Function),
     });
   });
 });
diff --git a/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.ts b/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.ts
index 908d7c678d3dd..c0f50820d45f3 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/text/configure_text_field.ts
@@ -25,4 +25,5 @@ export const configureTextCustomFieldFactory: CustomFieldFactory<CaseCustomField
     View,
     Create,
   }),
+  convertNullToEmpty: (value: string | boolean | null) => (value == null ? '' : String(value)),
 });
diff --git a/x-pack/plugins/cases/public/components/custom_fields/text/create.test.tsx b/x-pack/plugins/cases/public/components/custom_fields/text/create.test.tsx
index 0b62466fa6858..86a4aef5ad720 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/text/create.test.tsx
+++ b/x-pack/plugins/cases/public/components/custom_fields/text/create.test.tsx
@@ -191,7 +191,7 @@ describe('Create ', () => {
     userEvent.click(await screen.findByText('Submit'));
 
     expect(
-      await screen.findByText(`A ${customFieldConfiguration.label} is required.`)
+      await screen.findByText(`${customFieldConfiguration.label} is required.`)
     ).toBeInTheDocument();
 
     await waitFor(() => {
diff --git a/x-pack/plugins/cases/public/components/custom_fields/text/edit.test.tsx b/x-pack/plugins/cases/public/components/custom_fields/text/edit.test.tsx
index 0c0ff65d5036e..04dee5dc04878 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/text/edit.test.tsx
+++ b/x-pack/plugins/cases/public/components/custom_fields/text/edit.test.tsx
@@ -380,7 +380,7 @@ describe('Edit ', () => {
     userEvent.click(await screen.findByTestId('case-text-custom-field-edit-button-test_key_1'));
     userEvent.clear(await screen.findByTestId('case-text-custom-field-form-field-test_key_1'));
 
-    expect(await screen.findByText('A My test label 1 is required.')).toBeInTheDocument();
+    expect(await screen.findByText('My test label 1 is required.')).toBeInTheDocument();
   });
 
   it('does not shows a validation error if the field is not required', async () => {
diff --git a/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_text_field.test.ts b/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_text_field.test.ts
index 3ac05ad6b867c..9a9994db2a3d2 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_text_field.test.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_text_field.test.ts
@@ -24,6 +24,7 @@ describe('configureToggleCustomFieldFactory ', () => {
         { key: 'on', label: 'On', value: true },
         { key: 'off', label: 'Off', value: false },
       ],
+      getDefaultValue: expect.any(Function),
     });
   });
 });
diff --git a/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_toggle_field.ts b/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_toggle_field.ts
index 6b82f423256cb..0ad2e0fd2a68f 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_toggle_field.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/toggle/configure_toggle_field.ts
@@ -30,4 +30,5 @@ export const configureToggleCustomFieldFactory: CustomFieldFactory<CaseCustomFie
     { key: 'on', label: i18n.TOGGLE_FIELD_ON_LABEL, value: true },
     { key: 'off', label: i18n.TOGGLE_FIELD_OFF_LABEL, value: false },
   ],
+  getDefaultValue: () => false,
 });
diff --git a/x-pack/plugins/cases/public/components/custom_fields/translations.ts b/x-pack/plugins/cases/public/components/custom_fields/translations.ts
index 1f6616ceeb612..5f1a91765193f 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/translations.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/translations.ts
@@ -77,7 +77,7 @@ export const REQUIRED = i18n.translate('xpack.cases.customFields.required', {
 export const REQUIRED_FIELD = (fieldName: string): string =>
   i18n.translate('xpack.cases.customFields.requiredField', {
     values: { fieldName },
-    defaultMessage: 'A {fieldName} is required.',
+    defaultMessage: '{fieldName} is required.',
   });
 
 export const EDIT_CUSTOM_FIELDS_ARIA_LABEL = (customFieldLabel: string) =>
diff --git a/x-pack/plugins/cases/public/components/custom_fields/types.ts b/x-pack/plugins/cases/public/components/custom_fields/types.ts
index a1dcffaec6b97..70caeabd8edd2 100644
--- a/x-pack/plugins/cases/public/components/custom_fields/types.ts
+++ b/x-pack/plugins/cases/public/components/custom_fields/types.ts
@@ -54,6 +54,8 @@ export type CustomFieldFactory<T extends CaseUICustomField> = () => {
   getEuiTableColumn: (params: { label: string }) => CustomFieldEuiTableColumn;
   build: () => CustomFieldType<T>;
   filterOptions?: CustomFieldFactoryFilterOption[];
+  getDefaultValue?: () => string | boolean | null;
+  convertNullToEmpty?: (value: string | boolean | null) => string;
 };
 
 export type CustomFieldBuilderMap = {
diff --git a/x-pack/plugins/cases/public/components/templates/form.test.tsx b/x-pack/plugins/cases/public/components/templates/form.test.tsx
index a01aa25132cb5..2f04bead5005e 100644
--- a/x-pack/plugins/cases/public/components/templates/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/templates/form.test.tsx
@@ -561,6 +561,11 @@ describe('TemplateForm', () => {
               type: 'toggle',
               value: true,
             },
+            {
+              key: 'test_key_3',
+              type: 'text',
+              value: null,
+            },
             {
               key: 'test_key_4',
               type: 'toggle',
@@ -645,6 +650,11 @@ describe('TemplateForm', () => {
               type: 'toggle',
               value: true,
             },
+            {
+              key: 'test_key_3',
+              type: 'text',
+              value: null,
+            },
             {
               key: 'test_key_4',
               type: 'toggle',
diff --git a/x-pack/plugins/cases/public/components/templates/form_fields.test.tsx b/x-pack/plugins/cases/public/components/templates/form_fields.test.tsx
index 814ba13efe6ed..cdd9ca2814f0a 100644
--- a/x-pack/plugins/cases/public/components/templates/form_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/templates/form_fields.test.tsx
@@ -17,6 +17,7 @@ import { useGetChoicesResponse } from '../create/mock';
 import { connectorsMock, customFieldsConfigurationMock } from '../../containers/mock';
 import { TEMPLATE_FIELDS, CASE_FIELDS, CONNECTOR_FIELDS, CASE_SETTINGS } from './translations';
 import { FormFields } from './form_fields';
+import { waitForEuiPopoverOpen } from '@elastic/eui/lib/test/rtl';
 
 jest.mock('../connectors/servicenow/use_get_choices');
 
@@ -395,4 +396,47 @@ describe('form fields', () => {
       );
     });
   });
+
+  it('does not render duplicate template tags', async () => {
+    const newProps = {
+      ...defaultProps,
+      currentConfiguration: {
+        ...defaultProps.currentConfiguration,
+        templates: [
+          {
+            key: 'test_template_1',
+            name: 'Test',
+            tags: ['one', 'two'],
+            caseFields: {},
+          },
+          {
+            key: 'test_template_2',
+            name: 'Test 2',
+            tags: ['one', 'three'],
+            caseFields: {},
+          },
+        ],
+      },
+    };
+
+    appMockRenderer.render(
+      <FormTestComponent onSubmit={onSubmit} formDefaultValue={formDefaultValue}>
+        <FormFields {...newProps} />
+      </FormTestComponent>
+    );
+
+    const caseTags = await screen.findByTestId('template-tags');
+
+    userEvent.click(within(caseTags).getByTestId('comboBoxToggleListButton'));
+    await waitForEuiPopoverOpen();
+
+    /**
+     * RTL will throw an error if there are more that one
+     * element matching the text. This ensures that duplicated
+     * tags are removed. Docs: https://testing-library.com/docs/queries/about
+     */
+    expect(await screen.findByText('one'));
+    expect(await screen.findByText('two'));
+    expect(await screen.findByText('three'));
+  });
 });
diff --git a/x-pack/plugins/cases/public/components/templates/form_fields.tsx b/x-pack/plugins/cases/public/components/templates/form_fields.tsx
index 9f28f7b7179b4..9a69d1c4590dc 100644
--- a/x-pack/plugins/cases/public/components/templates/form_fields.tsx
+++ b/x-pack/plugins/cases/public/components/templates/form_fields.tsx
@@ -9,6 +9,7 @@ import React, { memo, useMemo } from 'react';
 import { UseField } from '@kbn/es-ui-shared-plugin/static/forms/hook_form_lib';
 import { HiddenField } from '@kbn/es-ui-shared-plugin/static/forms/components';
 import { EuiSteps } from '@elastic/eui';
+import { uniq } from 'lodash';
 import { CaseFormFields } from '../case_form_fields';
 import * as i18n from './translations';
 import type { ActionConnector } from '../../containers/configure/types';
@@ -33,9 +34,7 @@ const FormFieldsComponent: React.FC<FormFieldsProps> = ({
 }) => {
   const { isSyncAlertsEnabled } = useCasesFeatures();
   const { customFields: configurationCustomFields, templates } = currentConfiguration;
-  const configurationTemplateTags = templates
-    .map((template) => (template?.tags?.length ? template.tags : []))
-    .flat();
+  const configurationTemplateTags = getTemplateTags(templates);
 
   const firstStep = useMemo(
     () => ({
@@ -103,3 +102,6 @@ const FormFieldsComponent: React.FC<FormFieldsProps> = ({
 FormFieldsComponent.displayName = 'FormFields';
 
 export const FormFields = memo(FormFieldsComponent);
+
+const getTemplateTags = (templates: CasesConfigurationUI['templates']) =>
+  uniq(templates.map((template) => (template?.tags?.length ? template.tags : [])).flat());
diff --git a/x-pack/plugins/cases/public/components/templates/translations.ts b/x-pack/plugins/cases/public/components/templates/translations.ts
index 2993070046813..607276180fca8 100644
--- a/x-pack/plugins/cases/public/components/templates/translations.ts
+++ b/x-pack/plugins/cases/public/components/templates/translations.ts
@@ -14,8 +14,7 @@ export const TEMPLATE_TITLE = i18n.translate('xpack.cases.templates.title', {
 });
 
 export const TEMPLATE_DESCRIPTION = i18n.translate('xpack.cases.templates.description', {
-  defaultMessage:
-    'Add Case Templates to automatically define the case fields while creating a new case. A user can choose to create an empty case or based on a preset template. Templates allow to auto-populate values when creating new cases.',
+  defaultMessage: 'Create templates that automatically populate values in new cases.',
 });
 
 export const NO_TEMPLATES = i18n.translate('xpack.cases.templates.noTemplates', {
@@ -37,7 +36,7 @@ export const REQUIRED = i18n.translate('xpack.cases.templates.required', {
 export const REQUIRED_FIELD = (fieldName: string): string =>
   i18n.translate('xpack.cases.templates.requiredField', {
     values: { fieldName },
-    defaultMessage: 'A {fieldName} is required.',
+    defaultMessage: '{fieldName} is required.',
   });
 
 export const TEMPLATE_NAME = i18n.translate('xpack.cases.templates.templateName', {
@@ -45,8 +44,7 @@ export const TEMPLATE_NAME = i18n.translate('xpack.cases.templates.templateName'
 });
 
 export const TEMPLATE_TAGS_HELP = i18n.translate('xpack.cases.templates.templateTagsHelp', {
-  defaultMessage:
-    'Type one or more custom identifying tags for this template. Please enter after each tag to begin a new one',
+  defaultMessage: 'Separate tags with a line break.',
 });
 
 export const TEMPLATE_FIELDS = i18n.translate('xpack.cases.templates.templateFields', {
diff --git a/x-pack/plugins/cases/public/components/templates/utils.test.ts b/x-pack/plugins/cases/public/components/templates/utils.test.ts
index 9e3cd70c120af..639facc690752 100644
--- a/x-pack/plugins/cases/public/components/templates/utils.test.ts
+++ b/x-pack/plugins/cases/public/components/templates/utils.test.ts
@@ -117,9 +117,9 @@ describe('utils', () => {
         name: 'template 1',
         templateDescription: '',
         customFields: {
-          custom_field_1: 'foobar',
-          custom_fields_2: '',
-          custom_field_3: true,
+          test_key_1: 'foobar',
+          test_key_3: '',
+          test_key_2: true,
         },
       });
 
@@ -131,7 +131,11 @@ describe('utils', () => {
             name: 'none',
             type: '.none',
           },
-          customFields: [],
+          customFields: [
+            { key: 'test_key_1', type: 'text', value: 'foobar' },
+            { key: 'test_key_3', type: 'text', value: null },
+            { key: 'test_key_2', type: 'toggle', value: true },
+          ],
           settings: {
             syncAlerts: false,
           },
diff --git a/x-pack/plugins/cases/public/components/templates/utils.ts b/x-pack/plugins/cases/public/components/templates/utils.ts
index 3ee3002388e2d..29dda56fbe0e6 100644
--- a/x-pack/plugins/cases/public/components/templates/utils.ts
+++ b/x-pack/plugins/cases/public/components/templates/utils.ts
@@ -79,14 +79,19 @@ export const templateSerializer = (
     return data;
   }
 
-  const { fields: connectorFields = null, key, name, ...rest } = data;
+  const {
+    fields: connectorFields = null,
+    key,
+    name,
+    customFields: templateCustomFields,
+    ...rest
+  } = data;
 
   const serializedConnectorFields = getConnectorsFormSerializer({ fields: connectorFields });
   const nonEmptyFields = removeEmptyFields({ ...rest });
 
   const {
     connectorId,
-    customFields: templateCustomFields,
     syncAlerts = false,
     templateTags,
     templateDescription,
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.test.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.test.tsx
index 31f34de24d5ed..8437da2f28b9c 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.test.tsx
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.test.tsx
@@ -11,7 +11,8 @@ import { SECURITY_SOLUTION_OWNER } from '../../../../common';
 import { canUseCases } from '../../../client/helpers/can_use_cases';
 import CasesProvider from '../../cases_context';
 import { ActionWrapper } from './action_wrapper';
-import { getMockCaseUiActionProps } from './mocks';
+import { getMockServices } from './mocks';
+import type { CasesActionContextProps } from './types';
 
 jest.mock('../../cases_context', () =>
   jest.fn().mockImplementation(({ children, ...props }) => <div {...props}>{children}</div>)
@@ -28,7 +29,11 @@ jest.mock('../../../client/helpers/can_use_cases', () => {
 const mockCasePermissions = jest.fn().mockReturnValue({ create: true, update: true });
 
 describe('ActionWrapper', () => {
-  const props = { ...getMockCaseUiActionProps(), currentAppId: 'securitySolutionUI' };
+  const props = {
+    casesActionContextProps: {} as unknown as CasesActionContextProps,
+    currentAppId: 'securitySolutionUI',
+    services: getMockServices(),
+  };
 
   beforeEach(() => {
     jest.clearAllMocks();
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.tsx
index 543969c731d36..add06a7badb22 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.tsx
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/action_wrapper.tsx
@@ -11,7 +11,7 @@ import { Router } from '@kbn/shared-ux-router';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 
 import { SECURITY_SOLUTION_OWNER } from '../../../../common';
-import type { CasesUIActionProps } from './types';
+import type { CasesActionContextProps, Services } from './types';
 import { KibanaContextProvider, useKibana } from '../../../common/lib/kibana';
 import CasesProvider from '../../cases_context';
 import { getCaseOwnerByAppId } from '../../../../common/utils/owner';
@@ -20,13 +20,13 @@ import { canUseCases } from '../../../client/helpers/can_use_cases';
 export const DEFAULT_DARK_MODE = 'theme:darkMode' as const;
 
 interface Props {
-  caseContextProps: CasesUIActionProps['caseContextProps'];
+  casesActionContextProps: CasesActionContextProps;
   currentAppId?: string;
 }
 
 const ActionWrapperWithContext: React.FC<PropsWithChildren<Props>> = ({
   children,
-  caseContextProps,
+  casesActionContextProps,
   currentAppId,
 }) => {
   const { application, i18n, theme } = useKibana().services;
@@ -40,7 +40,7 @@ const ActionWrapperWithContext: React.FC<PropsWithChildren<Props>> = ({
     <KibanaRenderContextProvider i18n={i18n} theme={theme}>
       <CasesProvider
         value={{
-          ...caseContextProps,
+          ...casesActionContextProps,
           owner: owner ? [owner] : [],
           permissions: casePermissions,
           features: { alerts: { sync: syncAlerts } },
@@ -54,29 +54,31 @@ const ActionWrapperWithContext: React.FC<PropsWithChildren<Props>> = ({
 
 ActionWrapperWithContext.displayName = 'ActionWrapperWithContext';
 
-type ActionWrapperComponentProps = PropsWithChildren<
-  CasesUIActionProps & { currentAppId?: string }
->;
+type ActionWrapperComponentProps = PropsWithChildren<{
+  casesActionContextProps: CasesActionContextProps;
+  currentAppId?: string;
+  services: Services;
+}>;
 
 const ActionWrapperComponent: React.FC<ActionWrapperComponentProps> = ({
-  core,
-  plugins,
-  storage,
-  history,
+  casesActionContextProps,
   children,
-  caseContextProps,
   currentAppId,
+  services,
 }) => {
   return (
     <KibanaContextProvider
       services={{
-        ...core,
-        ...plugins,
-        storage,
+        ...services.core,
+        ...services.plugins,
+        storage: services.storage,
       }}
     >
-      <Router history={history}>
-        <ActionWrapperWithContext caseContextProps={caseContextProps} currentAppId={currentAppId}>
+      <Router history={services.history}>
+        <ActionWrapperWithContext
+          casesActionContextProps={casesActionContextProps}
+          currentAppId={currentAppId}
+        >
           {children}
         </ActionWrapperWithContext>
       </Router>
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.test.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.test.tsx
deleted file mode 100644
index 07d05f292d722..0000000000000
--- a/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.test.tsx
+++ /dev/null
@@ -1,221 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { LENS_EMBEDDABLE_TYPE, type Embeddable as LensEmbeddable } from '@kbn/lens-plugin/public';
-import { ErrorEmbeddable } from '@kbn/embeddable-plugin/public';
-import type { Action } from '@kbn/ui-actions-plugin/public';
-import ReactDOM, { unmountComponentAtNode } from 'react-dom';
-
-import { createAddToExistingCaseLensAction } from './add_to_existing_case';
-import type { ActionContext } from './types';
-import { useCasesAddToExistingCaseModal } from '../../all_cases/selector_modal/use_cases_add_to_existing_case_modal';
-import type { PropsWithChildren } from 'react';
-import React from 'react';
-import { toMountPoint } from '@kbn/react-kibana-mount';
-import {
-  getMockApplications$,
-  getMockCaseUiActionProps,
-  getMockCurrentAppId$,
-  mockAttributes,
-  MockEmbeddable,
-  mockTimeRange,
-} from './mocks';
-import { useKibana } from '../../../common/lib/kibana';
-import { waitFor } from '@testing-library/react';
-import { canUseCases } from '../../../client/helpers/can_use_cases';
-import { getCaseOwnerByAppId } from '../../../../common/utils/owner';
-
-const element = document.createElement('div');
-document.body.appendChild(element);
-
-jest.mock('../../all_cases/selector_modal/use_cases_add_to_existing_case_modal', () => ({
-  useCasesAddToExistingCaseModal: jest.fn(),
-}));
-
-jest.mock('../../../client/helpers/can_use_cases', () => {
-  const actual = jest.requireActual('../../../client/helpers/can_use_cases');
-  return {
-    ...actual,
-    canUseCases: jest.fn(),
-  };
-});
-
-jest.mock('@kbn/kibana-react-plugin/public', () => ({
-  KibanaThemeProvider: jest
-    .fn()
-    .mockImplementation(({ children }: PropsWithChildren<unknown>) => <>{children}</>),
-}));
-
-jest.mock('@kbn/react-kibana-mount', () => ({
-  toMountPoint: jest.fn(),
-}));
-
-jest.mock('../../../common/lib/kibana', () => {
-  return {
-    useKibana: jest.fn(),
-    KibanaContextProvider: jest
-      .fn()
-      .mockImplementation(({ children, ...props }) => <div {...props}>{children}</div>),
-  };
-});
-
-jest.mock('react-dom', () => {
-  const original = jest.requireActual('react-dom');
-  return { ...original, unmountComponentAtNode: jest.fn() };
-});
-
-jest.mock('./action_wrapper');
-
-jest.mock('../../../../common/utils/owner', () => ({
-  getCaseOwnerByAppId: jest.fn().mockReturnValue('securitySolution'),
-}));
-
-describe('createAddToExistingCaseLensAction', () => {
-  const mockEmbeddable = new MockEmbeddable(LENS_EMBEDDABLE_TYPE, {
-    id: 'mockId',
-    attributes: mockAttributes,
-    timeRange: mockTimeRange,
-  }) as unknown as LensEmbeddable;
-
-  const context = {
-    embeddable: mockEmbeddable,
-  } as unknown as ActionContext;
-
-  const caseUiActionProps = getMockCaseUiActionProps();
-
-  const mockUseCasesAddToExistingCaseModal = useCasesAddToExistingCaseModal as jest.Mock;
-  const mockOpenModal = jest.fn();
-  const mockMount = jest.fn();
-  let action: Action<ActionContext>;
-  const mockCasePermissions = jest.fn();
-  beforeEach(() => {
-    mockUseCasesAddToExistingCaseModal.mockReturnValue({
-      open: mockOpenModal,
-    });
-    (useKibana as jest.Mock).mockReturnValue({
-      services: {
-        application: {
-          currentAppId$: getMockCurrentAppId$(),
-          applications$: getMockApplications$(),
-        },
-      },
-    });
-    (canUseCases as jest.Mock).mockReturnValue(
-      mockCasePermissions.mockReturnValue({ create: true, update: true })
-    );
-    (toMountPoint as jest.Mock).mockImplementation((node) => {
-      ReactDOM.render(node, element);
-      return mockMount;
-    });
-    jest.clearAllMocks();
-    action = createAddToExistingCaseLensAction(caseUiActionProps);
-  });
-
-  test('it should return display name', () => {
-    expect(action.getDisplayName(context)).toEqual('Add to case');
-  });
-
-  it('should return icon type', () => {
-    expect(action.getIconType(context)).toEqual('casesApp');
-  });
-
-  describe('isCompatible', () => {
-    it('should return false if error embeddable', async () => {
-      expect(
-        await action.isCompatible({
-          ...context,
-          embeddable: new ErrorEmbeddable('some error', {
-            id: '123',
-          }) as unknown as LensEmbeddable,
-        })
-      ).toEqual(false);
-    });
-
-    it('should return false if not lens embeddable', async () => {
-      expect(
-        await action.isCompatible({
-          ...context,
-          embeddable: new MockEmbeddable('not_lens') as unknown as LensEmbeddable,
-        })
-      ).toEqual(false);
-    });
-
-    it('should return false if no permission', async () => {
-      mockCasePermissions.mockReturnValue({ create: false, update: false });
-      expect(await action.isCompatible(context)).toEqual(false);
-    });
-
-    it('should return true if is lens embeddable', async () => {
-      expect(await action.isCompatible(context)).toEqual(true);
-    });
-
-    it('should check permission with undefined if owner is not found', async () => {
-      (getCaseOwnerByAppId as jest.Mock).mockReturnValue(undefined);
-      await action.isCompatible(context);
-      expect(mockCasePermissions).toBeCalledWith(undefined);
-    });
-  });
-
-  describe('execute', () => {
-    beforeEach(async () => {
-      await action.execute(context);
-    });
-
-    it('should execute', () => {
-      expect(toMountPoint).toHaveBeenCalled();
-      expect(mockMount).toHaveBeenCalled();
-    });
-  });
-
-  describe('Add to existing case modal', () => {
-    beforeEach(async () => {
-      await action.execute(context);
-    });
-
-    it('should open modal with an attachment', async () => {
-      await waitFor(() => {
-        expect(mockOpenModal).toHaveBeenCalled();
-
-        const getAttachments = mockOpenModal.mock.calls[0][0].getAttachments;
-        expect(getAttachments()).toEqual([
-          {
-            persistableStateAttachmentState: {
-              attributes: mockAttributes,
-              timeRange: mockTimeRange,
-            },
-            persistableStateAttachmentTypeId: '.lens',
-            type: 'persistableState',
-          },
-        ]);
-      });
-    });
-
-    it('should have correct onClose handler - when close modal clicked', () => {
-      const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
-      onClose();
-      expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
-    });
-
-    it('should have correct onClose handler - when case selected', () => {
-      const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
-      onClose({ id: 'case-id', title: 'case-title' });
-      expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
-    });
-
-    it('should have correct onClose handler - when case created', () => {
-      const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
-      onClose(null, true);
-      expect(unmountComponentAtNode as jest.Mock).not.toHaveBeenCalled();
-    });
-
-    it('should have correct onSuccess handler', () => {
-      const onSuccess = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onSuccess;
-      onSuccess();
-      expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.tsx
index 647abe8b41f2a..9565417141178 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.tsx
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/add_to_existing_case.tsx
@@ -4,130 +4,39 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useEffect, useMemo } from 'react';
-import { unmountComponentAtNode } from 'react-dom';
-import type { Embeddable as LensEmbeddable } from '@kbn/lens-plugin/public';
-import { createAction } from '@kbn/ui-actions-plugin/public';
-import { isErrorEmbeddable } from '@kbn/embeddable-plugin/public';
 
-import { toMountPoint } from '@kbn/react-kibana-mount';
+import { createAction, IncompatibleActionError } from '@kbn/ui-actions-plugin/public';
 
-import type { CaseUI } from '../../../../common';
-import { isLensEmbeddable, hasInput, getLensCaseAttachment } from './utils';
-
-import type { ActionContext, CasesUIActionProps } from './types';
-import { useCasesAddToExistingCaseModal } from '../../all_cases/selector_modal/use_cases_add_to_existing_case_modal';
+import type { EmbeddableApiContext } from '@kbn/presentation-publishing';
+import type { CasesActionContextProps, Services } from './types';
 import { ADD_TO_EXISTING_CASE_DISPLAYNAME } from './translations';
-import { ActionWrapper } from './action_wrapper';
-import { canUseCases } from '../../../client/helpers/can_use_cases';
-import { getCaseOwnerByAppId } from '../../../../common/utils/owner';
 
 export const ACTION_ID = 'embeddable_addToExistingCase';
-export const DEFAULT_DARK_MODE = 'theme:darkMode' as const;
-
-interface Props {
-  embeddable: LensEmbeddable;
-  onSuccess: () => void;
-  onClose: (theCase?: CaseUI) => void;
-}
-
-const AddExistingCaseModalWrapper: React.FC<Props> = ({ embeddable, onClose, onSuccess }) => {
-  const modal = useCasesAddToExistingCaseModal({
-    onClose,
-    onSuccess,
-  });
-
-  const attachments = useMemo(() => {
-    const { timeRange } = embeddable.getInput();
-    const attributes = embeddable.getFullAttributes();
-    // we've checked attributes exists before rendering (isCompatible), attributes should not be undefined here
-    return attributes != null ? [getLensCaseAttachment({ attributes, timeRange })] : [];
-  }, [embeddable]);
-  useEffect(() => {
-    modal.open({ getAttachments: () => attachments });
-  }, [attachments, modal]);
-
-  return null;
-};
-
-AddExistingCaseModalWrapper.displayName = 'AddExistingCaseModalWrapper';
-
-export const createAddToExistingCaseLensAction = ({
-  core,
-  plugins,
-  storage,
-  history,
-  caseContextProps,
-}: CasesUIActionProps) => {
-  const { application: applicationService, i18n, theme } = core;
 
+export const createAddToExistingCaseLensAction = (
+  casesActionContextProps: CasesActionContextProps,
+  services: Services
+) => {
   let currentAppId: string | undefined;
 
-  applicationService?.currentAppId$.subscribe((appId) => {
+  services.core.application?.currentAppId$.subscribe((appId) => {
     currentAppId = appId;
   });
 
-  return createAction<ActionContext>({
+  return createAction<EmbeddableApiContext>({
     id: ACTION_ID,
     type: 'actionButton',
     getIconType: () => 'casesApp',
     getDisplayName: () => ADD_TO_EXISTING_CASE_DISPLAYNAME,
     isCompatible: async ({ embeddable }) => {
-      const owner = getCaseOwnerByAppId(currentAppId);
-      const casePermissions = canUseCases(applicationService.capabilities)(
-        owner ? [owner] : undefined
-      );
-
-      return (
-        !isErrorEmbeddable(embeddable) &&
-        isLensEmbeddable(embeddable) &&
-        casePermissions.update &&
-        casePermissions.create &&
-        hasInput(embeddable)
-      );
+      const { isCompatible } = await import('./is_compatible');
+      return isCompatible(embeddable, currentAppId, services.core);
     },
     execute: async ({ embeddable }) => {
-      const targetDomElement = document.createElement('div');
-
-      const cleanupDom = (shouldCleanup?: boolean) => {
-        if (targetDomElement != null && shouldCleanup) {
-          unmountComponentAtNode(targetDomElement);
-        }
-      };
-
-      const onClose = (theCase?: CaseUI, isCreateCase?: boolean) => {
-        const closeModalClickedScenario = theCase == null && !isCreateCase;
-        const caseSelectedScenario = theCase != null;
-        // When `Creating` a case from the `add to existing case modal`,
-        // we close the modal and then open the flyout.
-        // If we clean up dom when closing the modal, then the flyout won't open.
-        // Thus we do not clean up dom when `Creating` a case.
-        const shouldCleanup = closeModalClickedScenario || caseSelectedScenario;
-        cleanupDom(shouldCleanup);
-      };
-
-      const onSuccess = () => {
-        cleanupDom(true);
-      };
-      const mount = toMountPoint(
-        <ActionWrapper
-          core={core}
-          caseContextProps={caseContextProps}
-          storage={storage}
-          plugins={plugins}
-          history={history}
-          currentAppId={currentAppId}
-        >
-          <AddExistingCaseModalWrapper
-            embeddable={embeddable}
-            onClose={onClose}
-            onSuccess={onSuccess}
-          />
-        </ActionWrapper>,
-        { i18n, theme }
-      );
-
-      mount(targetDomElement);
+      const { isLensApi } = await import('@kbn/lens-plugin/public');
+      if (!isLensApi(embeddable)) throw new IncompatibleActionError();
+      const { openModal } = await import('./open_modal');
+      openModal(embeddable, currentAppId, casesActionContextProps, services);
     },
   });
 };
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.test.ts b/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.test.ts
new file mode 100644
index 0000000000000..1169ec14648b4
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.test.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { BehaviorSubject } from 'rxjs';
+import { coreMock } from '@kbn/core/public/mocks';
+import { isCompatible } from './is_compatible';
+import { canUseCases } from '../../../client/helpers/can_use_cases';
+import { mockLensApi } from './mocks';
+
+jest.mock('../../../../common/utils/owner', () => ({
+  getCaseOwnerByAppId: () => 'securitySolution',
+}));
+
+jest.mock('../../../client/helpers/can_use_cases', () => {
+  const actual = jest.requireActual('../../../client/helpers/can_use_cases');
+  return {
+    ...actual,
+    canUseCases: jest.fn(),
+  };
+});
+
+describe('isCompatible', () => {
+  const appId = 'myAppId';
+  const mockCoreStart = coreMock.createStart();
+
+  const mockCasePermissions = jest.fn();
+  beforeEach(() => {
+    (canUseCases as jest.Mock).mockReturnValue(
+      mockCasePermissions.mockReturnValue({ create: true, update: true })
+    );
+    jest.clearAllMocks();
+  });
+
+  test('should return false if error embeddable', async () => {
+    const errorApi = {
+      ...mockLensApi,
+      blockingError: new BehaviorSubject<Error | undefined>(new Error('Simulated blocking error')),
+    };
+    expect(isCompatible(errorApi, appId, mockCoreStart)).toBe(false);
+  });
+
+  test('should return false if not lens embeddable', async () => {
+    expect(isCompatible({}, appId, mockCoreStart)).toBe(false);
+  });
+
+  test('should return false if no permission', async () => {
+    mockCasePermissions.mockReturnValue({ create: false, update: false });
+    expect(isCompatible(mockLensApi, appId, mockCoreStart)).toBe(false);
+  });
+
+  test('should return true if is lens embeddable', async () => {
+    expect(isCompatible(mockLensApi, appId, mockCoreStart)).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.ts b/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.ts
new file mode 100644
index 0000000000000..64becf44e266e
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/is_compatible.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { CoreStart } from '@kbn/core-lifecycle-browser';
+import { isLensApi } from '@kbn/lens-plugin/public';
+import { hasBlockingError } from '@kbn/presentation-publishing';
+import { canUseCases } from '../../../client/helpers/can_use_cases';
+import { getCaseOwnerByAppId } from '../../../../common/utils/owner';
+
+export function isCompatible(
+  embeddable: unknown,
+  currentAppId: string | undefined,
+  core: CoreStart
+) {
+  if (!isLensApi(embeddable) || hasBlockingError(embeddable)) return false;
+  if (!embeddable.getFullAttributes()) {
+    return false;
+  }
+  const timeRange = embeddable.timeRange$?.value ?? embeddable.parentApi?.timeRange$?.value;
+  if (!timeRange) {
+    return false;
+  }
+  const owner = getCaseOwnerByAppId(currentAppId);
+  const casePermissions = canUseCases(core.application.capabilities)(owner ? [owner] : undefined);
+  return casePermissions.update && casePermissions.create;
+}
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/mocks.ts b/x-pack/plugins/cases/public/components/visualizations/actions/mocks.ts
index aee3b128d554b..4d28bf6728e0f 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/mocks.ts
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/mocks.ts
@@ -10,36 +10,13 @@ import { BehaviorSubject } from 'rxjs';
 
 import type { PublicAppInfo } from '@kbn/core/public';
 import { coreMock } from '@kbn/core/public/mocks';
-import type { TypedLensByValueInput } from '@kbn/lens-plugin/public';
-import type { CasesUIActionProps } from './types';
+import type { LensApi, LensSavedObjectAttributes } from '@kbn/lens-plugin/public';
+import type { AggregateQuery, Filter, Query, TimeRange } from '@kbn/es-query';
+import type { Services } from './types';
 
 const coreStart = coreMock.createStart();
 
-export class MockEmbeddable {
-  public type;
-  private input;
-  constructor(
-    type: string,
-    input?: {
-      attributes: TypedLensByValueInput['attributes'];
-      id: string;
-      timeRange: { from: string; to: string; fromStr: string; toStr: string };
-    }
-  ) {
-    this.type = type;
-    this.input = input;
-  }
-  getFilters() {}
-  getQuery() {}
-  getInput() {
-    return this.input;
-  }
-  getFullAttributes() {
-    return this.input?.attributes;
-  }
-}
-
-export const mockAttributes = {
+export const mockLensAttributes = {
   title: 'mockTitle',
   description: 'mockDescription',
   references: [],
@@ -57,9 +34,26 @@ export const mockAttributes = {
       },
     },
   },
-} as unknown as TypedLensByValueInput['attributes'];
+} as unknown as LensSavedObjectAttributes;
 
-export const mockTimeRange = { from: '', to: '', fromStr: '', toStr: '' };
+export const mockLensApi = {
+  type: 'lens',
+  getSavedVis: () => {},
+  canViewUnderlyingData: () => {},
+  getViewUnderlyingDataArgs: () => {},
+  getFullAttributes: () => {
+    return mockLensAttributes;
+  },
+  panelTitle: new BehaviorSubject('myPanel'),
+  hidePanelTitle: new BehaviorSubject('false'),
+  timeslice$: new BehaviorSubject<[number, number] | undefined>(undefined),
+  timeRange$: new BehaviorSubject<TimeRange | undefined>({
+    from: 'now-24h',
+    to: 'now',
+  }),
+  filters$: new BehaviorSubject<Filter[] | undefined>(undefined),
+  query$: new BehaviorSubject<Query | AggregateQuery | undefined>(undefined),
+} as unknown as LensApi;
 
 export const getMockCurrentAppId$ = () => new BehaviorSubject<string>('securitySolutionUI');
 export const getMockApplications$ = () =>
@@ -67,26 +61,17 @@ export const getMockApplications$ = () =>
     new Map([['securitySolutionUI', { category: { label: 'Test' } } as unknown as PublicAppInfo]])
   );
 
-export const getMockCaseUiActionProps = () => {
-  const core = {
-    ...coreStart,
-    application: { currentAppId$: getMockCurrentAppId$(), capabilities: {} },
-    uiSettings: {
-      get: jest.fn().mockReturnValue(true),
+export const getMockServices = () => {
+  return {
+    core: {
+      ...coreStart,
+      application: { currentAppId$: getMockCurrentAppId$(), capabilities: {} },
+      uiSettings: {
+        get: jest.fn().mockReturnValue(true),
+      },
     },
-  };
-  const plugins = {};
-  const storage = {};
-  const history = createBrowserHistory();
-  const caseContextProps = {};
-
-  const caseUiActionProps = {
-    core,
-    plugins,
-    storage,
-    history,
-    caseContextProps,
-  } as unknown as CasesUIActionProps;
-
-  return caseUiActionProps;
+    plugins: {},
+    storage: {},
+    history: createBrowserHistory(),
+  } as unknown as Services;
 };
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.test.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.test.tsx
new file mode 100644
index 0000000000000..ac38056b9321e
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.test.tsx
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import ReactDOM, { unmountComponentAtNode } from 'react-dom';
+import { useCasesAddToExistingCaseModal } from '../../all_cases/selector_modal/use_cases_add_to_existing_case_modal';
+import type { PropsWithChildren } from 'react';
+import React from 'react';
+import { toMountPoint } from '@kbn/react-kibana-mount';
+import {
+  getMockApplications$,
+  getMockCurrentAppId$,
+  mockLensApi,
+  mockLensAttributes,
+  getMockServices,
+} from './mocks';
+import { useKibana } from '../../../common/lib/kibana';
+import { waitFor } from '@testing-library/react';
+import { openModal } from './open_modal';
+import type { CasesActionContextProps } from './types';
+
+const element = document.createElement('div');
+document.body.appendChild(element);
+
+jest.mock('../../all_cases/selector_modal/use_cases_add_to_existing_case_modal', () => ({
+  useCasesAddToExistingCaseModal: jest.fn(),
+}));
+
+jest.mock('@kbn/kibana-react-plugin/public', () => ({
+  KibanaThemeProvider: jest
+    .fn()
+    .mockImplementation(({ children }: PropsWithChildren<unknown>) => <>{children}</>),
+}));
+
+jest.mock('@kbn/react-kibana-mount', () => ({
+  toMountPoint: jest.fn(),
+}));
+
+jest.mock('../../../common/lib/kibana', () => {
+  return {
+    useKibana: jest.fn(),
+    KibanaContextProvider: jest
+      .fn()
+      .mockImplementation(({ children, ...props }) => <div {...props}>{children}</div>),
+  };
+});
+
+jest.mock('react-dom', () => {
+  const original = jest.requireActual('react-dom');
+  return { ...original, unmountComponentAtNode: jest.fn() };
+});
+
+jest.mock('./action_wrapper');
+
+describe('openModal', () => {
+  const mockUseCasesAddToExistingCaseModal = useCasesAddToExistingCaseModal as jest.Mock;
+  const mockOpenModal = jest.fn();
+  const mockMount = jest.fn();
+  beforeEach(() => {
+    mockUseCasesAddToExistingCaseModal.mockReturnValue({
+      open: mockOpenModal,
+    });
+    (useKibana as jest.Mock).mockReturnValue({
+      services: {
+        application: {
+          currentAppId$: getMockCurrentAppId$(),
+          applications$: getMockApplications$(),
+        },
+      },
+    });
+    (toMountPoint as jest.Mock).mockImplementation((node) => {
+      ReactDOM.render(node, element);
+      return mockMount;
+    });
+    jest.clearAllMocks();
+    openModal(mockLensApi, 'myAppId', {} as unknown as CasesActionContextProps, getMockServices());
+  });
+
+  test('should open modal with an attachment', async () => {
+    await waitFor(() => {
+      expect(mockOpenModal).toHaveBeenCalled();
+
+      const getAttachments = mockOpenModal.mock.calls[0][0].getAttachments;
+      expect(getAttachments()).toEqual([
+        {
+          persistableStateAttachmentState: {
+            attributes: mockLensAttributes,
+            timeRange: {
+              from: 'now-24h',
+              to: 'now',
+            },
+          },
+          persistableStateAttachmentTypeId: '.lens',
+          type: 'persistableState',
+        },
+      ]);
+    });
+  });
+
+  test('should have correct onClose handler - when close modal clicked', () => {
+    const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
+    onClose();
+    expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
+  });
+
+  test('should have correct onClose handler - when case selected', () => {
+    const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
+    onClose({ id: 'case-id', title: 'case-title' });
+    expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
+  });
+
+  test('should have correct onClose handler - when case created', () => {
+    const onClose = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onClose;
+    onClose(null, true);
+    expect(unmountComponentAtNode as jest.Mock).not.toHaveBeenCalled();
+  });
+
+  test('should have correct onSuccess handler', () => {
+    const onSuccess = mockUseCasesAddToExistingCaseModal.mock.calls[0][0].onSuccess;
+    onSuccess();
+    expect(unmountComponentAtNode as jest.Mock).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.tsx b/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.tsx
new file mode 100644
index 0000000000000..e0871e0710e68
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/open_modal.tsx
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useMemo } from 'react';
+import { unmountComponentAtNode } from 'react-dom';
+import type { LensApi } from '@kbn/lens-plugin/public';
+import { toMountPoint } from '@kbn/react-kibana-mount';
+import { useStateFromPublishingSubject } from '@kbn/presentation-publishing';
+import { ActionWrapper } from './action_wrapper';
+import type { CasesActionContextProps, Services } from './types';
+import type { CaseUI } from '../../../../common';
+import { getLensCaseAttachment } from './utils';
+import { useCasesAddToExistingCaseModal } from '../../all_cases/selector_modal/use_cases_add_to_existing_case_modal';
+
+interface Props {
+  lensApi: LensApi;
+  onSuccess: () => void;
+  onClose: (theCase?: CaseUI) => void;
+}
+
+const AddExistingCaseModalWrapper: React.FC<Props> = ({ lensApi, onClose, onSuccess }) => {
+  const modal = useCasesAddToExistingCaseModal({
+    onClose,
+    onSuccess,
+  });
+
+  const timeRange = useStateFromPublishingSubject(lensApi.timeRange$);
+  const parentTimeRange = useStateFromPublishingSubject(lensApi.parentApi?.timeRange$);
+
+  const attachments = useMemo(() => {
+    const appliedTimeRange = timeRange ?? parentTimeRange;
+    const attributes = lensApi.getFullAttributes();
+    return !attributes || !appliedTimeRange
+      ? []
+      : [getLensCaseAttachment({ attributes, timeRange: appliedTimeRange })];
+  }, [lensApi, timeRange, parentTimeRange]);
+  useEffect(() => {
+    modal.open({ getAttachments: () => attachments });
+  }, [attachments, modal]);
+
+  return null;
+};
+AddExistingCaseModalWrapper.displayName = 'AddExistingCaseModalWrapper';
+
+export function openModal(
+  lensApi: LensApi,
+  currentAppId: string | undefined,
+  casesActionContextProps: CasesActionContextProps,
+  services: Services
+) {
+  const targetDomElement = document.createElement('div');
+
+  const cleanupDom = (shouldCleanup?: boolean) => {
+    if (targetDomElement != null && shouldCleanup) {
+      unmountComponentAtNode(targetDomElement);
+    }
+  };
+
+  const onClose = (theCase?: CaseUI, isCreateCase?: boolean) => {
+    const closeModalClickedScenario = theCase == null && !isCreateCase;
+    const caseSelectedScenario = theCase != null;
+    // When `Creating` a case from the `add to existing case modal`,
+    // we close the modal and then open the flyout.
+    // If we clean up dom when closing the modal, then the flyout won't open.
+    // Thus we do not clean up dom when `Creating` a case.
+    const shouldCleanup = closeModalClickedScenario || caseSelectedScenario;
+    cleanupDom(shouldCleanup);
+  };
+
+  const onSuccess = () => {
+    cleanupDom(true);
+  };
+  const mount = toMountPoint(
+    <ActionWrapper
+      casesActionContextProps={casesActionContextProps}
+      currentAppId={currentAppId}
+      services={services}
+    >
+      <AddExistingCaseModalWrapper lensApi={lensApi} onClose={onClose} onSuccess={onSuccess} />
+    </ActionWrapper>,
+    { i18n: services.core.i18n, theme: services.core.theme }
+  );
+
+  mount(targetDomElement);
+}
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/register.ts b/x-pack/plugins/cases/public/components/visualizations/actions/register.ts
index 70d0d6d7a84d4..d2f3d68e737a5 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/register.ts
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/register.ts
@@ -8,31 +8,15 @@
 import { CONTEXT_MENU_TRIGGER } from '@kbn/embeddable-plugin/public';
 
 import { createAddToExistingCaseLensAction } from './add_to_existing_case';
-import type { CasesUIActionProps } from './types';
+import type { CasesActionContextProps, Services } from './types';
 
-export const registerUIActions = ({
-  core,
-  plugins,
-  caseContextProps,
-  history,
-  storage,
-}: CasesUIActionProps) => {
-  registerLensActions({ core, plugins, caseContextProps, history, storage });
-};
-
-const registerLensActions = ({
-  core,
-  plugins,
-  caseContextProps,
-  history,
-  storage,
-}: CasesUIActionProps) => {
-  const addToExistingCaseAction = createAddToExistingCaseLensAction({
-    core,
-    plugins,
-    caseContextProps,
-    history,
-    storage,
-  });
-  plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, addToExistingCaseAction);
+export const registerUIActions = (
+  casesActionContextProps: CasesActionContextProps,
+  services: Services
+) => {
+  const addToExistingCaseAction = createAddToExistingCaseLensAction(
+    casesActionContextProps,
+    services
+  );
+  services.plugins.uiActions.addTriggerAction(CONTEXT_MENU_TRIGGER, addToExistingCaseAction);
 };
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/types.ts b/x-pack/plugins/cases/public/components/visualizations/actions/types.ts
index 8cbe7fd93585d..b1ccf7bad921c 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/types.ts
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/types.ts
@@ -5,30 +5,23 @@
  * 2.0.
  */
 
-import type { CoreStart } from '@kbn/core-lifecycle-browser';
-import type { Embeddable } from '@kbn/lens-plugin/public';
+import type { CoreStart } from '@kbn/core/public';
 import type * as H from 'history';
 import type { Storage } from '@kbn/kibana-utils-plugin/public';
 
-import type { ActionExecutionContext } from '@kbn/ui-actions-plugin/public';
 import type { CasesPublicStartDependencies } from '../../../types';
 import type { CasesContextProps } from '../../cases_context';
 
-export type CasesUIActionContextProps = Pick<
+export type CasesActionContextProps = Pick<
   CasesContextProps,
   | 'externalReferenceAttachmentTypeRegistry'
   | 'persistableStateAttachmentTypeRegistry'
   | 'getFilesClient'
 >;
 
-export interface CasesUIActionProps {
+export interface Services {
   core: CoreStart;
   plugins: CasesPublicStartDependencies;
-  caseContextProps: CasesUIActionContextProps;
   history: H.History;
   storage: Storage;
 }
-
-export type ActionContext = ActionExecutionContext<{
-  embeddable: Embeddable;
-}>;
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/utils.test.ts b/x-pack/plugins/cases/public/components/visualizations/actions/utils.test.ts
index 591e12dd7a712..d643a668553d3 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/utils.test.ts
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/utils.test.ts
@@ -5,51 +5,9 @@
  * 2.0.
  */
 
-import { LENS_EMBEDDABLE_TYPE } from '@kbn/lens-plugin/public';
-import { isLensEmbeddable, hasInput, getLensCaseAttachment } from './utils';
+import { getLensCaseAttachment } from './utils';
 
 describe('utils', () => {
-  describe('isLensEmbeddable', () => {
-    it('return true if it is a lens embeddable', () => {
-      // @ts-expect-error: extra attributes are not needed
-      expect(isLensEmbeddable({ type: LENS_EMBEDDABLE_TYPE })).toBe(true);
-    });
-
-    it('return false if it is not a lens embeddable', () => {
-      // @ts-expect-error: extra attributes are not needed
-      expect(isLensEmbeddable({ type: 'not-exist' })).toBe(false);
-    });
-  });
-
-  describe('hasInput', () => {
-    it('return true if it has correct input', () => {
-      const embeddable = {
-        getInput: () => ({ timeRange: {} }),
-        getFullAttributes: jest.fn().mockReturnValue({}),
-      };
-
-      // @ts-expect-error: extra attributes are not needed
-      expect(hasInput(embeddable)).toBe(true);
-    });
-
-    it('return false if attributes are null', () => {
-      const embeddable = {
-        getInput: () => ({ timeRange: {} }),
-        getFullAttributes: jest.fn().mockReturnValue(null),
-      };
-
-      // @ts-expect-error: extra attributes are not needed
-      expect(hasInput(embeddable)).toBe(false);
-    });
-
-    it('return false if timeRange is null', () => {
-      const embeddable = { getInput: () => ({ timeRange: null }), getFullAttributes: () => ({}) };
-
-      // @ts-expect-error: extra attributes are not needed
-      expect(hasInput(embeddable)).toBe(false);
-    });
-  });
-
   describe('getLensCaseAttachment', () => {
     it('create a case lens attachment correctly', () => {
       const embeddable = { attributes: {}, timeRange: {} };
diff --git a/x-pack/plugins/cases/public/components/visualizations/actions/utils.ts b/x-pack/plugins/cases/public/components/visualizations/actions/utils.ts
index aaabd73dfc884..e51f1fb13bdee 100644
--- a/x-pack/plugins/cases/public/components/visualizations/actions/utils.ts
+++ b/x-pack/plugins/cases/public/components/visualizations/actions/utils.ts
@@ -4,24 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { IEmbeddable } from '@kbn/embeddable-plugin/public';
 import type { LensSavedObjectAttributes } from '@kbn/lens-plugin/public';
-import { LENS_EMBEDDABLE_TYPE, type Embeddable as LensEmbeddable } from '@kbn/lens-plugin/public';
 import { LENS_ATTACHMENT_TYPE } from '../../../../common/constants/visualizations';
 import type { PersistableStateAttachmentPayload } from '../../../../common/types/domain';
 import { AttachmentType } from '../../../../common/types/domain';
 import type { LensProps } from '../types';
 
-export const isLensEmbeddable = (embeddable: IEmbeddable): embeddable is LensEmbeddable => {
-  return embeddable.type === LENS_EMBEDDABLE_TYPE;
-};
-
-export const hasInput = (embeddable: LensEmbeddable) => {
-  const { timeRange } = embeddable.getInput();
-  const attributes = embeddable.getFullAttributes();
-  return attributes != null && timeRange != null;
-};
-
 type PersistableStateAttachmentWithoutOwner = Omit<PersistableStateAttachmentPayload, 'owner'>;
 
 export const getLensCaseAttachment = ({
diff --git a/x-pack/plugins/cases/public/plugin.ts b/x-pack/plugins/cases/public/plugin.ts
index 12308fcc2f8b6..67295a29437db 100644
--- a/x-pack/plugins/cases/public/plugin.ts
+++ b/x-pack/plugins/cases/public/plugin.ts
@@ -149,17 +149,19 @@ export class CasesUiPlugin
       getFilesClient: plugins.files.filesClientFactory.asScoped,
     });
 
-    registerActions({
-      core,
-      plugins,
-      caseContextProps: {
+    registerActions(
+      {
         externalReferenceAttachmentTypeRegistry: this.externalReferenceAttachmentTypeRegistry,
         persistableStateAttachmentTypeRegistry: this.persistableStateAttachmentTypeRegistry,
         getFilesClient: plugins.files.filesClientFactory.asScoped,
       },
-      history: createBrowserHistory(),
-      storage: this.storage,
-    });
+      {
+        core,
+        plugins,
+        history: createBrowserHistory(),
+        storage: this.storage,
+      }
+    );
 
     return {
       api: createClientAPI({ http: core.http }),
diff --git a/x-pack/plugins/cases/server/client/configure/client.test.ts b/x-pack/plugins/cases/server/client/configure/client.test.ts
index 8b312d2d957a2..aab8937591f9e 100644
--- a/x-pack/plugins/cases/server/client/configure/client.test.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.test.ts
@@ -556,16 +556,32 @@ describe('client', () => {
       });
 
       describe('customFields', () => {
-        it('throws when there are no customFields in configure and template has customField in the request', async () => {
+        it('throws when template has duplicated custom field keys in the request', async () => {
           clientArgs.services.caseConfigureService.get.mockResolvedValue({
             // @ts-ignore: these are all the attributes needed for the test
             attributes: {
+              customFields: [
+                {
+                  key: 'custom_field_key_1',
+                  label: 'text label',
+                  type: CustomFieldTypes.TEXT,
+                  required: false,
+                },
+              ],
               templates: [
                 {
                   key: 'template_1',
                   name: 'template 1',
                   description: 'this is test description',
-                  caseFields: null,
+                  caseFields: {
+                    customFields: [
+                      {
+                        key: 'custom_field_key_1',
+                        type: CustomFieldTypes.TEXT,
+                        value: 'custom field value 1',
+                      },
+                    ],
+                  },
                 },
               ],
             },
@@ -576,11 +592,19 @@ describe('client', () => {
               'test-id',
               {
                 version: 'test-version',
+                customFields: [
+                  {
+                    key: 'custom_field_key_1',
+                    label: 'text label',
+                    type: CustomFieldTypes.TEXT,
+                    required: false,
+                  },
+                ],
                 templates: [
                   {
                     key: 'template_1',
                     name: 'template 1',
-                    description: 'this is test description',
+                    description: 'test',
                     caseFields: {
                       customFields: [
                         {
@@ -588,6 +612,11 @@ describe('client', () => {
                           type: CustomFieldTypes.TEXT,
                           value: 'custom field value 1',
                         },
+                        {
+                          key: 'custom_field_key_1',
+                          type: CustomFieldTypes.TEXT,
+                          value: 'custom field value 2',
+                        },
                       ],
                     },
                   },
@@ -597,11 +626,11 @@ describe('client', () => {
               casesClientInternal
             )
           ).rejects.toThrow(
-            'Failed to get patch configure in route: Error: No custom fields configured.'
+            `Failed to get patch configure in route: Error: Invalid duplicated templates[0]'s customFields keys in request: custom_field_key_1`
           );
         });
 
-        it('throws when template has duplicated custom field keys in the request', async () => {
+        it('throws when template has customField with invalid type in the request', async () => {
           clientArgs.services.caseConfigureService.get.mockResolvedValue({
             // @ts-ignore: these are all the attributes needed for the test
             attributes: {
@@ -637,22 +666,25 @@ describe('client', () => {
               'test-id',
               {
                 version: 'test-version',
+                customFields: [
+                  {
+                    key: 'custom_field_key_1',
+                    label: 'text label',
+                    type: CustomFieldTypes.TEXT,
+                    required: false,
+                  },
+                ],
                 templates: [
                   {
                     key: 'template_1',
                     name: 'template 1',
-                    description: 'test',
+                    description: 'this is test description',
                     caseFields: {
                       customFields: [
                         {
                           key: 'custom_field_key_1',
-                          type: CustomFieldTypes.TEXT,
-                          value: 'custom field value 1',
-                        },
-                        {
-                          key: 'custom_field_key_1',
-                          type: CustomFieldTypes.TEXT,
-                          value: 'custom field value 2',
+                          type: CustomFieldTypes.TOGGLE,
+                          value: true,
                         },
                       ],
                     },
@@ -663,20 +695,40 @@ describe('client', () => {
               casesClientInternal
             )
           ).rejects.toThrow(
-            `Failed to get patch configure in route: Error: Invalid duplicated templates[0]'s customFields keys in request: custom_field_key_1`
+            'Failed to get patch configure in route: Error: The following custom fields have the wrong type in the request: "text label"'
           );
         });
 
-        it('throws when there are invalid customField keys in the request', async () => {
+        it('adds new custom field to template when configuration custom fields have new custom field', async () => {
           clientArgs.services.caseConfigureService.get.mockResolvedValue({
             // @ts-ignore: these are all the attributes needed for the test
             attributes: {
+              connector: {
+                id: 'none',
+                name: 'none',
+                type: ConnectorTypes.none,
+                fields: null,
+              },
+              customFields: [],
+              templates: [],
+              closure_type: 'close-by-user',
+              owner: 'cases',
+            },
+            id: 'test-id',
+            version: 'test-version',
+          });
+
+          await update(
+            'test-id',
+            {
+              version: 'test-version',
               customFields: [
                 {
                   key: 'custom_field_key_1',
                   label: 'text label',
                   type: CustomFieldTypes.TEXT,
                   required: false,
+                  defaultValue: 'custom field 1 default value 1',
                 },
               ],
               templates: [
@@ -684,60 +736,82 @@ describe('client', () => {
                   key: 'template_1',
                   name: 'template 1',
                   description: 'this is test description',
+                  caseFields: null,
+                },
+              ],
+            },
+            clientArgs,
+            casesClientInternal
+          );
+
+          expect(clientArgs.services.caseConfigureService.patch).toHaveBeenCalledWith({
+            configurationId: 'test-id',
+            originalConfiguration: {
+              attributes: {
+                closure_type: 'close-by-user',
+                connector: {
+                  fields: null,
+                  id: 'none',
+                  name: 'none',
+                  type: '.none',
+                },
+                customFields: [],
+                owner: 'cases',
+                templates: [],
+              },
+              id: 'test-id',
+              version: 'test-version',
+            },
+            unsecuredSavedObjectsClient: expect.anything(),
+            updatedAttributes: {
+              customFields: [
+                {
+                  key: 'custom_field_key_1',
+                  label: 'text label',
+                  type: CustomFieldTypes.TEXT,
+                  required: false,
+                  defaultValue: 'custom field 1 default value 1',
+                },
+              ],
+              templates: [
+                {
                   caseFields: {
                     customFields: [
                       {
                         key: 'custom_field_key_1',
                         type: CustomFieldTypes.TEXT,
-                        value: 'custom field value 1',
+                        value: 'custom field 1 default value 1',
                       },
                     ],
                   },
+                  description: 'this is test description',
+                  key: 'template_1',
+                  name: 'template 1',
                 },
               ],
+              updated_at: expect.anything(),
+              updated_by: expect.anything(),
             },
           });
-
-          await expect(
-            update(
-              'test-id',
-              {
-                version: 'test-version',
-                templates: [
-                  {
-                    key: 'template_1',
-                    name: 'template 1',
-                    description: 'this is test description',
-                    caseFields: {
-                      customFields: [
-                        {
-                          key: 'custom_field_key_2',
-                          type: CustomFieldTypes.TEXT,
-                          value: 'custom field value 1',
-                        },
-                      ],
-                    },
-                  },
-                ],
-              },
-              clientArgs,
-              casesClientInternal
-            )
-          ).rejects.toThrow(
-            'Failed to get patch configure in route: Error: Invalid custom field keys: custom_field_key_2'
-          );
         });
 
-        it('throws when template has customField with invalid type in the request', async () => {
+        it('updates default value of existing custom fields in the configuration correctly', async () => {
           clientArgs.services.caseConfigureService.get.mockResolvedValue({
             // @ts-ignore: these are all the attributes needed for the test
             attributes: {
+              connector: {
+                id: 'none',
+                name: 'none',
+                type: ConnectorTypes.none,
+                fields: null,
+              },
               customFields: [
                 {
                   key: 'custom_field_key_1',
                   label: 'text label',
                   type: CustomFieldTypes.TEXT,
                   required: false,
+                  defaultValue: 'custom field 1 default value 1',
                 },
               ],
               templates: [
@@ -750,20 +824,74 @@ describe('client', () => {
                       {
                         key: 'custom_field_key_1',
                         type: CustomFieldTypes.TEXT,
-                        value: 'custom field value 1',
+                        value: 'custom field 1 default value 1',
                       },
                     ],
                   },
                 },
               ],
+              closure_type: 'close-by-user',
+              owner: 'cases',
             },
+            id: 'test-id',
+            version: 'test-version',
           });
 
-          await expect(
-            update(
-              'test-id',
-              {
-                version: 'test-version',
+          await update(
+            'test-id',
+            {
+              version: 'test-version',
+              customFields: [
+                {
+                  key: 'custom_field_key_1',
+                  label: 'text label',
+                  type: CustomFieldTypes.TEXT,
+                  required: false,
+                  defaultValue: 'updated default value!!',
+                },
+              ],
+              templates: [
+                {
+                  key: 'template_1',
+                  name: 'template 1',
+                  description: 'this is test description',
+                  caseFields: {
+                    customFields: [
+                      {
+                        key: 'custom_field_key_1',
+                        type: CustomFieldTypes.TEXT,
+                        value: 'custom field 1 default value 1',
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+            clientArgs,
+            casesClientInternal
+          );
+
+          expect(clientArgs.services.caseConfigureService.patch).toHaveBeenCalledWith({
+            configurationId: 'test-id',
+            originalConfiguration: {
+              attributes: {
+                closure_type: 'close-by-user',
+                connector: {
+                  fields: null,
+                  id: 'none',
+                  name: 'none',
+                  type: '.none',
+                },
+                owner: 'cases',
+                customFields: [
+                  {
+                    key: 'custom_field_key_1',
+                    label: 'text label',
+                    type: CustomFieldTypes.TEXT,
+                    required: false,
+                    defaultValue: 'custom field 1 default value 1',
+                  },
+                ],
                 templates: [
                   {
                     key: 'template_1',
@@ -773,20 +901,130 @@ describe('client', () => {
                       customFields: [
                         {
                           key: 'custom_field_key_1',
-                          type: CustomFieldTypes.TOGGLE,
-                          value: true,
+                          type: CustomFieldTypes.TEXT,
+                          value: 'custom field 1 default value 1',
                         },
                       ],
                     },
                   },
                 ],
               },
-              clientArgs,
-              casesClientInternal
-            )
-          ).rejects.toThrow(
-            'Failed to get patch configure in route: Error: The following custom fields have the wrong type in the request: "text label"'
+              id: 'test-id',
+              version: 'test-version',
+            },
+            unsecuredSavedObjectsClient: expect.anything(),
+            updatedAttributes: {
+              customFields: [
+                {
+                  key: 'custom_field_key_1',
+                  label: 'text label',
+                  type: CustomFieldTypes.TEXT,
+                  required: false,
+                  defaultValue: 'updated default value!!',
+                },
+              ],
+              templates: [
+                {
+                  caseFields: {
+                    customFields: [
+                      {
+                        key: 'custom_field_key_1',
+                        type: CustomFieldTypes.TEXT,
+                        value: 'custom field 1 default value 1',
+                      },
+                    ],
+                  },
+                  description: 'this is test description',
+                  key: 'template_1',
+                  name: 'template 1',
+                },
+              ],
+              updated_at: expect.anything(),
+              updated_by: expect.anything(),
+            },
+          });
+        });
+
+        it('removes custom field from template when there are no customFields in the request', async () => {
+          clientArgs.services.caseConfigureService.get.mockResolvedValue({
+            // @ts-ignore: these are all the attributes needed for the test
+            attributes: {
+              connector: {
+                id: 'none',
+                name: 'none',
+                type: ConnectorTypes.none,
+                fields: null,
+              },
+              customFields: [],
+              templates: [],
+              closure_type: 'close-by-user',
+              owner: 'cases',
+            },
+            id: 'test-id',
+            version: 'test-version',
+          });
+
+          await update(
+            'test-id',
+            {
+              version: 'test-version',
+              customFields: [],
+              templates: [
+                {
+                  key: 'template_1',
+                  name: 'template 1',
+                  description: 'this is test description',
+                  caseFields: {
+                    customFields: [
+                      {
+                        key: 'custom_field_key_1',
+                        type: CustomFieldTypes.TEXT,
+                        value: 'custom field value 1',
+                      },
+                    ],
+                  },
+                },
+              ],
+            },
+            clientArgs,
+            casesClientInternal
           );
+
+          expect(clientArgs.services.caseConfigureService.patch).toHaveBeenCalledWith({
+            configurationId: 'test-id',
+            originalConfiguration: {
+              attributes: {
+                closure_type: 'close-by-user',
+                connector: {
+                  fields: null,
+                  id: 'none',
+                  name: 'none',
+                  type: '.none',
+                },
+                customFields: [],
+                owner: 'cases',
+                templates: [],
+              },
+              id: 'test-id',
+              version: 'test-version',
+            },
+            unsecuredSavedObjectsClient: expect.anything(),
+            updatedAttributes: {
+              customFields: [],
+              templates: [
+                {
+                  key: 'template_1',
+                  name: 'template 1',
+                  description: 'this is test description',
+                  caseFields: {
+                    customFields: [],
+                  },
+                },
+              ],
+              updated_at: expect.anything(),
+              updated_by: expect.anything(),
+            },
+          });
         });
 
         it('removes deleted custom field from template correctly', async () => {
@@ -1166,7 +1404,7 @@ describe('client', () => {
           ).resolves.not.toThrow();
         });
 
-        it('throws when there are no customFields in configure and template has customField in the request', async () => {
+        it('throws error when there are no customFields but template has custom fields in the request', async () => {
           await expect(
             create(
               {
@@ -1241,7 +1479,7 @@ describe('client', () => {
           );
         });
 
-        it('throws when there are invalid customField keys in the request', async () => {
+        it('throw error when there are new customFields in the request but template does not have custom fields', async () => {
           await expect(
             create(
               {
@@ -1259,15 +1497,7 @@ describe('client', () => {
                     key: 'template_1',
                     name: 'template 1',
                     description: 'this is test description',
-                    caseFields: {
-                      customFields: [
-                        {
-                          key: 'custom_field_key_2',
-                          type: CustomFieldTypes.TEXT,
-                          value: 'custom field value 1',
-                        },
-                      ],
-                    },
+                    caseFields: null,
                   },
                 ],
               },
@@ -1275,7 +1505,7 @@ describe('client', () => {
               casesClientInternal
             )
           ).rejects.toThrow(
-            'Failed to create case configuration: Error: Invalid custom field keys: custom_field_key_2'
+            'Failed to create case configuration: Error: No custom fields added to template.'
           );
         });
 
diff --git a/x-pack/plugins/cases/server/client/configure/client.ts b/x-pack/plugins/cases/server/client/configure/client.ts
index 68db617af8bc2..00810cb742323 100644
--- a/x-pack/plugins/cases/server/client/configure/client.ts
+++ b/x-pack/plugins/cases/server/client/configure/client.ts
@@ -44,7 +44,7 @@ import type { CasesClientArgs } from '../types';
 import { getMappings } from './get_mappings';
 
 import { Operations } from '../../authorization';
-import { combineAuthorizedAndOwnerFilter, removeCustomFieldFromTemplates } from '../utils';
+import { combineAuthorizedAndOwnerFilter, transformTemplateCustomFields } from '../utils';
 import type { MappingsArgs, CreateMappingsArgs, UpdateMappingsArgs } from './types';
 import { createMappings } from './create_mappings';
 import { updateMappings } from './update_mappings';
@@ -320,14 +320,14 @@ export async function update(
       originalCustomFields: configuration.attributes.customFields,
     });
 
-    await validateTemplates({
+    const updatedTemplates = transformTemplateCustomFields({
       templates,
-      clientArgs,
-      customFields: configuration.attributes.customFields,
+      customFields: request.customFields,
     });
 
-    const updatedTemplates = removeCustomFieldFromTemplates({
-      templates,
+    await validateTemplates({
+      templates: updatedTemplates,
+      clientArgs,
       customFields: request.customFields,
     });
 
diff --git a/x-pack/plugins/cases/server/client/configure/validators.test.ts b/x-pack/plugins/cases/server/client/configure/validators.test.ts
index ca81926519d37..63dc5b9dd8457 100644
--- a/x-pack/plugins/cases/server/client/configure/validators.test.ts
+++ b/x-pack/plugins/cases/server/client/configure/validators.test.ts
@@ -198,6 +198,35 @@ describe('validators', () => {
       ).toThrowErrorMatchingInlineSnapshot(`"No custom fields configured."`);
     });
 
+    it('throws if configuration has custom fields and template has no custom fields', () => {
+      expect(() =>
+        validateTemplatesCustomFieldsInRequest({
+          templates: [
+            {
+              key: 'template_key_1',
+              name: 'first template',
+              description: 'this is a first template value',
+              caseFields: null,
+            },
+          ],
+          customFieldsConfiguration: [
+            {
+              key: 'first_key',
+              type: CustomFieldTypes.TEXT,
+              label: 'foo',
+              required: false,
+            },
+            {
+              key: 'second_key',
+              type: CustomFieldTypes.TOGGLE,
+              label: 'foo',
+              required: false,
+            },
+          ],
+        })
+      ).toThrowErrorMatchingInlineSnapshot(`"No custom fields added to template."`);
+    });
+
     it('throws for a single invalid type', () => {
       expect(() =>
         validateTemplatesCustomFieldsInRequest({
diff --git a/x-pack/plugins/cases/server/client/configure/validators.ts b/x-pack/plugins/cases/server/client/configure/validators.ts
index 1dec647561ab8..4075f2edeeb27 100644
--- a/x-pack/plugins/cases/server/client/configure/validators.ts
+++ b/x-pack/plugins/cases/server/client/configure/validators.ts
@@ -60,20 +60,21 @@ export const validateTemplatesCustomFieldsInRequest = ({
   }
 
   templates.forEach((template, index) => {
-    if (
-      !template.caseFields ||
-      !template.caseFields.customFields ||
-      !template.caseFields.customFields.length
-    ) {
-      return;
+    if (customFieldsConfiguration === undefined && template.caseFields?.customFields?.length) {
+      throw Boom.badRequest('No custom fields configured.');
     }
 
-    if (customFieldsConfiguration === undefined) {
-      throw Boom.badRequest('No custom fields configured.');
+    if (
+      (!template.caseFields ||
+        !template.caseFields.customFields ||
+        !template.caseFields.customFields.length) &&
+      customFieldsConfiguration?.length
+    ) {
+      throw Boom.badRequest('No custom fields added to template.');
     }
 
     const params = {
-      requestCustomFields: template.caseFields.customFields,
+      requestCustomFields: template?.caseFields?.customFields,
       customFieldsConfiguration,
     };
 
diff --git a/x-pack/plugins/cases/server/client/utils.test.ts b/x-pack/plugins/cases/server/client/utils.test.ts
index 56615189d1d5e..eb7aaea6d6938 100644
--- a/x-pack/plugins/cases/server/client/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/utils.test.ts
@@ -19,7 +19,7 @@ import {
   constructQueryOptions,
   constructSearch,
   convertSortField,
-  removeCustomFieldFromTemplates,
+  transformTemplateCustomFields,
 } from './utils';
 import { CasePersistedSeverity, CasePersistedStatus } from '../common/types/case';
 import type { CustomFieldsConfiguration } from '../../common/types/domain';
@@ -1132,7 +1132,7 @@ describe('utils', () => {
     });
   });
 
-  describe('removeCustomFieldFromTemplates', () => {
+  describe('transformTemplateCustomFields', () => {
     const customFields = [
       {
         type: CustomFieldTypes.TEXT as const,
@@ -1204,7 +1204,7 @@ describe('utils', () => {
     ];
 
     it('removes custom field from template correctly', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates,
         customFields: [customFields[0], customFields[1]],
       });
@@ -1253,7 +1253,7 @@ describe('utils', () => {
     });
 
     it('removes multiple custom fields from template correctly', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates,
         customFields: [customFields[0]],
       });
@@ -1292,7 +1292,7 @@ describe('utils', () => {
     });
 
     it('removes all custom fields from templates when custom fields are empty', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates,
         customFields: [],
       });
@@ -1319,7 +1319,7 @@ describe('utils', () => {
     });
 
     it('removes all custom fields from templates when custom fields are undefined', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates,
         customFields: undefined,
       });
@@ -1330,8 +1330,8 @@ describe('utils', () => {
       ]);
     });
 
-    it('does not remove custom field when templates do not have custom fields', () => {
-      const res = removeCustomFieldFromTemplates({
+    it('adds custom fields to templates when templates do not have custom fields', () => {
+      const res = transformTemplateCustomFields({
         templates: [
           {
             key: 'test_template_1',
@@ -1353,7 +1353,20 @@ describe('utils', () => {
 
       expect(res).toEqual([
         {
-          caseFields: null,
+          caseFields: {
+            customFields: [
+              {
+                key: customFields[0].key,
+                type: customFields[0].type,
+                value: customFields[0].defaultValue,
+              },
+              {
+                key: customFields[1].key,
+                type: customFields[1].type,
+                value: customFields[1].defaultValue,
+              },
+            ],
+          },
           description: 'This is a first test template',
           key: 'test_template_1',
           name: 'First test template',
@@ -1364,13 +1377,25 @@ describe('utils', () => {
           caseFields: {
             description: 'this is test',
             title: 'Test title',
+            customFields: [
+              {
+                key: customFields[0].key,
+                type: customFields[0].type,
+                value: customFields[0].defaultValue,
+              },
+              {
+                key: customFields[1].key,
+                type: customFields[1].type,
+                value: customFields[1].defaultValue,
+              },
+            ],
           },
         },
       ]);
     });
 
-    it('does not remove custom field when templates have empty custom fields', () => {
-      const res = removeCustomFieldFromTemplates({
+    it('adds custom fields to templates when template custom fields are empty', () => {
+      const res = transformTemplateCustomFields({
         templates: [
           {
             key: 'test_template_2',
@@ -1382,7 +1407,7 @@ describe('utils', () => {
             },
           },
         ],
-        customFields: [customFields[0], customFields[1]],
+        customFields: [customFields[0], customFields[1], customFields[2]],
       });
 
       expect(res).toEqual([
@@ -1392,14 +1417,149 @@ describe('utils', () => {
           caseFields: {
             title: 'Test title',
             description: 'this is test',
-            customFields: [],
+            customFields: [
+              {
+                key: customFields[0].key,
+                type: customFields[0].type,
+                value: customFields[0].defaultValue,
+              },
+              {
+                key: customFields[1].key,
+                type: customFields[1].type,
+                value: customFields[1].defaultValue,
+              },
+              {
+                key: customFields[2].key,
+                type: customFields[2].type,
+                value: null,
+              },
+            ],
+          },
+        },
+      ]);
+    });
+
+    it('adds custom fields to templates with correct values', () => {
+      const res = transformTemplateCustomFields({
+        templates: [
+          {
+            key: 'test_template_2',
+            name: 'Second test template',
+            caseFields: {
+              title: 'Test title',
+              description: 'this is test',
+              customFields: [],
+            },
+          },
+        ],
+        customFields: [
+          ...customFields,
+          {
+            type: CustomFieldTypes.TOGGLE as const,
+            key: 'test_key_4',
+            label: 'My test label 4',
+            required: true,
+          },
+        ],
+      });
+
+      expect(res).toEqual([
+        {
+          key: 'test_template_2',
+          name: 'Second test template',
+          caseFields: {
+            title: 'Test title',
+            description: 'this is test',
+            customFields: [
+              {
+                key: customFields[0].key,
+                type: customFields[0].type,
+                value: customFields[0].defaultValue,
+              },
+              {
+                key: customFields[1].key,
+                type: customFields[1].type,
+                value: customFields[1].defaultValue,
+              },
+              {
+                key: customFields[2].key,
+                type: customFields[2].type,
+                value: null,
+              },
+              {
+                type: CustomFieldTypes.TOGGLE as const,
+                key: 'test_key_4',
+                value: false,
+              },
+            ],
+          },
+        },
+      ]);
+    });
+
+    it('does not change the existing template custom field', () => {
+      const res = transformTemplateCustomFields({
+        templates: [
+          {
+            key: 'test_template_2',
+            name: 'Second test template',
+            caseFields: {
+              title: 'Test title',
+              description: 'this is test',
+              customFields: [
+                {
+                  key: customFields[0].key,
+                  type: CustomFieldTypes.TEXT as const,
+                  value: 'updated text value',
+                },
+                {
+                  key: customFields[1].key,
+                  type: CustomFieldTypes.TOGGLE as const,
+                  value: false,
+                },
+                {
+                  key: customFields[2].key,
+                  type: customFields[2].type,
+                  value: null,
+                },
+              ],
+            },
+          },
+        ],
+        customFields,
+      });
+
+      expect(res).toEqual([
+        {
+          key: 'test_template_2',
+          name: 'Second test template',
+          caseFields: {
+            title: 'Test title',
+            description: 'this is test',
+            customFields: [
+              {
+                key: customFields[0].key,
+                type: customFields[0].type,
+                value: 'updated text value',
+              },
+              {
+                key: customFields[1].key,
+                type: customFields[1].type,
+                value: false,
+              },
+              {
+                key: customFields[2].key,
+                type: customFields[2].type,
+                value: null,
+              },
+            ],
           },
         },
       ]);
     });
 
     it('does not remove custom field from empty templates', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates: [],
         customFields: [customFields[0], customFields[1]],
       });
@@ -1408,7 +1568,7 @@ describe('utils', () => {
     });
 
     it('returns empty array when templates are undefined', () => {
-      const res = removeCustomFieldFromTemplates({
+      const res = transformTemplateCustomFields({
         templates: undefined,
         customFields: [customFields[0], customFields[1]],
       });
diff --git a/x-pack/plugins/cases/server/client/utils.ts b/x-pack/plugins/cases/server/client/utils.ts
index 258761a563fd3..5f854aa3236fe 100644
--- a/x-pack/plugins/cases/server/client/utils.ts
+++ b/x-pack/plugins/cases/server/client/utils.ts
@@ -17,11 +17,13 @@ import { nodeBuilder, fromKueryExpression, escapeKuery } from '@kbn/es-query';
 import { spaceIdToNamespace } from '@kbn/spaces-plugin/server/lib/utils/namespace';
 
 import type {
+  CaseCustomField,
   CaseSeverity,
   CaseStatuses,
   CustomFieldsConfiguration,
   ExternalReferenceAttachmentPayload,
   TemplatesConfiguration,
+  CustomFieldTypes,
 } from '../../common/types/domain';
 import {
   ActionsAttachmentPayloadRt,
@@ -607,9 +609,9 @@ export const constructSearch = (
 };
 
 /**
- * remove deleted custom field from template
+ * remove deleted custom field from template or add newly added custom field to template
  */
-export const removeCustomFieldFromTemplates = ({
+export const transformTemplateCustomFields = ({
   templates,
   customFields,
 }: {
@@ -621,21 +623,40 @@ export const removeCustomFieldFromTemplates = ({
   }
 
   return templates.map((template) => {
-    if (!template.caseFields?.customFields || !template.caseFields?.customFields.length) {
-      return template;
-    }
+    const templateCustomFields = template.caseFields?.customFields ?? [];
 
-    if (!customFields || !customFields?.length) {
+    if (!customFields || !customFields.length) {
       return { ...template, caseFields: { ...template.caseFields, customFields: [] } };
     }
 
-    const templateCustomFields = template.caseFields.customFields.filter((templateCustomField) =>
+    // remove deleted custom field from template
+    const transformedTemplateCustomFields = templateCustomFields.filter((templateCustomField) =>
       customFields?.find((customField) => customField.key === templateCustomField.key)
     );
 
+    // add new custom fields to template
+    if (customFields.length >= transformedTemplateCustomFields.length) {
+      customFields.forEach((field) => {
+        if (
+          !transformedTemplateCustomFields.find(
+            (templateCustomField) => templateCustomField.key === field.key
+          )
+        ) {
+          const { getDefaultValue } = casesCustomFields.get(field.type) ?? {};
+          const value = getDefaultValue?.() ?? null;
+
+          transformedTemplateCustomFields.push({
+            key: field.key,
+            type: field.type as CustomFieldTypes,
+            value: field.defaultValue ?? value,
+          } as CaseCustomField);
+        }
+      });
+    }
+
     return {
       ...template,
-      caseFields: { ...template.caseFields, customFields: templateCustomFields },
+      caseFields: { ...template.caseFields, customFields: transformedTemplateCustomFields },
     };
   });
 };
diff --git a/x-pack/plugins/cases/server/connectors/cases/cases_connector_executor.ts b/x-pack/plugins/cases/server/connectors/cases/cases_connector_executor.ts
index 15435cc8be76c..ac9490a814a61 100644
--- a/x-pack/plugins/cases/server/connectors/cases/cases_connector_executor.ts
+++ b/x-pack/plugins/cases/server/connectors/cases/cases_connector_executor.ts
@@ -173,10 +173,15 @@ export class CasesConnectorExecutor {
   }: Pick<CasesConnectorRunParams, 'alerts' | 'groupingBy'> & {
     params: CasesConnectorRunParams;
   }): GroupedAlerts[] {
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][groupAlerts] Grouping ${alerts.length} alerts`,
-      this.getLogMetadata(params, { labels: { groupingBy }, tags: ['case-connector:groupAlerts'] })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][groupAlerts] Grouping ${alerts.length} alerts`,
+        this.getLogMetadata(params, {
+          labels: { groupingBy },
+          tags: ['case-connector:groupAlerts'],
+        })
+      );
+    }
 
     const uniqueGroupingByFields = Array.from(new Set<string>(groupingBy));
     const groupingMap = new Map<string, GroupedAlerts>();
@@ -190,19 +195,23 @@ export class CasesConnectorExecutor {
       uniqueGroupingByFields.every((groupingByField) => Boolean(get(alert, groupingByField, null)))
     );
 
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][groupAlerts] Total alerts to be grouped: ${alertsWithAllGroupingFields.length} out of ${alerts.length}`,
-      this.getLogMetadata(params, { tags: ['case-connector:groupAlerts'] })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][groupAlerts] Total alerts to be grouped: ${alertsWithAllGroupingFields.length} out of ${alerts.length}`,
+        this.getLogMetadata(params, { tags: ['case-connector:groupAlerts'] })
+      );
+    }
 
     for (const alert of alertsWithAllGroupingFields) {
       const alertWithOnlyTheGroupingFields = pick(alert, uniqueGroupingByFields);
       const groupingKey = stringify(alertWithOnlyTheGroupingFields);
 
-      this.logger.debug(
-        `[CasesConnector][CasesConnectorExecutor][groupAlerts] Alert ${alert._id} got grouped into bucket with ID ${groupingKey}`,
-        this.getLogMetadata(params, { tags: ['case-connector:groupAlerts', groupingKey] })
-      );
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(
+          `[CasesConnector][CasesConnectorExecutor][groupAlerts] Alert ${alert._id} got grouped into bucket with ID ${groupingKey}`,
+          this.getLogMetadata(params, { tags: ['case-connector:groupAlerts', groupingKey] })
+        );
+      }
 
       if (groupingMap.has(groupingKey)) {
         groupingMap.get(groupingKey)?.alerts.push(alert);
@@ -261,10 +270,12 @@ export class CasesConnectorExecutor {
     params: CasesConnectorRunParams,
     groupedAlerts: GroupedAlerts[]
   ): Map<string, GroupedAlertsWithOracleKey> {
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Generating ${groupedAlerts.length} oracle keys`,
-      this.getLogMetadata(params, { tags: ['case-connector:generateOracleKeys'] })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Generating ${groupedAlerts.length} oracle keys`,
+        this.getLogMetadata(params, { tags: ['case-connector:generateOracleKeys'] })
+      );
+    }
 
     const { rule, owner } = params;
 
@@ -280,21 +291,25 @@ export class CasesConnectorExecutor {
 
       const oracleKey = this.casesOracleService.getRecordId(getRecordIdParams);
 
-      this.logger.debug(
-        `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Oracle key ${oracleKey} generated`,
-        this.getLogMetadata(params, {
-          labels: { params: getRecordIdParams },
-          tags: ['case-connector:generateOracleKeys', oracleKey],
-        })
-      );
+      if (this.logger.isLevelEnabled('debug')) {
+        this.logger.debug(
+          `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Oracle key ${oracleKey} generated`,
+          this.getLogMetadata(params, {
+            labels: { params: getRecordIdParams },
+            tags: ['case-connector:generateOracleKeys', oracleKey],
+          })
+        );
+      }
 
       oracleMap.set(oracleKey, { oracleKey, grouping, alerts });
     }
 
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Total of oracles keys generated ${oracleMap.size}`,
-      this.getLogMetadata(params, { tags: ['case-connector:generateOracleKeys'] })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][generateOracleKeys] Total of oracles keys generated ${oracleMap.size}`,
+        this.getLogMetadata(params, { tags: ['case-connector:generateOracleKeys'] })
+      );
+    }
 
     return oracleMap;
   }
@@ -303,11 +318,12 @@ export class CasesConnectorExecutor {
     params: CasesConnectorRunParams,
     groupedAlertsWithOracleKey: Map<string, GroupedAlertsWithOracleKey>
   ): Promise<Map<string, GroupedAlertsWithOracleRecords>> {
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] Upserting ${groupedAlertsWithOracleKey.size} oracle records`,
-      this.getLogMetadata(params, { tags: ['case-connector:upsertOracleRecords'] })
-    );
-
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] Upserting ${groupedAlertsWithOracleKey.size} oracle records`,
+        this.getLogMetadata(params, { tags: ['case-connector:upsertOracleRecords'] })
+      );
+    }
     const bulkCreateReq: BulkCreateOracleRecordRequest = [];
     const oracleRecordMap = new Map<string, GroupedAlertsWithOracleRecords>();
 
@@ -322,25 +338,29 @@ export class CasesConnectorExecutor {
 
     const ids = Array.from(groupedAlertsWithOracleKey.values()).map(({ oracleKey }) => oracleKey);
 
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] Getting oracle records with ids ${ids}`,
-      this.getLogMetadata(params, { tags: ['case-connector:upsertOracleRecords', ...ids] })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] Getting oracle records with ids ${ids}`,
+        this.getLogMetadata(params, { tags: ['case-connector:upsertOracleRecords', ...ids] })
+      );
+    }
 
     const bulkGetRes = await this.casesOracleService.bulkGetRecords(ids);
     const [bulkGetValidRecords, bulkGetRecordsErrors] = partitionRecordsByError(bulkGetRes);
 
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] The total number of valid oracle records is ${bulkGetValidRecords.length} and the total number of errors while getting the records is ${bulkGetRecordsErrors.length}`,
-      this.getLogMetadata(params, {
-        labels: {
-          total: ids.length,
-          success: bulkGetValidRecords.length,
-          errors: bulkGetRecordsErrors.length,
-        },
-        tags: ['case-connector:upsertOracleRecords'],
-      })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] The total number of valid oracle records is ${bulkGetValidRecords.length} and the total number of errors while getting the records is ${bulkGetRecordsErrors.length}`,
+        this.getLogMetadata(params, {
+          labels: {
+            total: ids.length,
+            success: bulkGetValidRecords.length,
+            errors: bulkGetRecordsErrors.length,
+          },
+          tags: ['case-connector:upsertOracleRecords'],
+        })
+      );
+    }
 
     addRecordToMap(bulkGetValidRecords);
 
@@ -350,16 +370,18 @@ export class CasesConnectorExecutor {
 
     const [nonFoundErrors, restOfErrors] = partitionByNonFoundErrors(bulkGetRecordsErrors);
 
-    this.logger.debug(
-      `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] The total number of non found oracle records is ${nonFoundErrors.length} and the total number of the rest of errors while getting the records is ${restOfErrors.length}`,
-      this.getLogMetadata(params, {
-        labels: {
-          nonFoundErrors: nonFoundErrors.length,
-          restOfErrors: restOfErrors.length,
-        },
-        tags: ['case-connector:upsertOracleRecords'],
-      })
-    );
+    if (this.logger.isLevelEnabled('debug')) {
+      this.logger.debug(
+        `[CasesConnector][CasesConnectorExecutor][upsertOracleRecords] The total number of non found oracle records is ${nonFoundErrors.length} and the total number of the rest of errors while getting the records is ${restOfErrors.length}`,
+        this.getLogMetadata(params, {
+          labels: {
+            nonFoundErrors: nonFoundErrors.length,
+            restOfErrors: restOfErrors.length,
+          },
+          tags: ['case-connector:upsertOracleRecords'],
+        })
+      );
+    }
 
     this.handleAndThrowErrors(restOfErrors);
 
@@ -1073,17 +1095,19 @@ export class CasesConnectorExecutor {
        * attachments.bulkCreate throws an error on errors
        */
       async (req: BulkCreateAlertsReq) => {
-        this.logger.debug(
-          `[CasesConnector][CasesConnectorExecutor][attachAlertsToCases] Attaching ${req.attachments.length} alerts to case with ID ${req.caseId}`,
-          this.getLogMetadata(params, {
-            labels: { caseId: req.caseId },
-            tags: [
-              'case-connector:attachAlertsToCases',
-              req.caseId,
-              ...(req.attachments as Array<{ alertId: string }>).map(({ alertId }) => alertId),
-            ],
-          })
-        );
+        if (this.logger.isLevelEnabled('debug')) {
+          this.logger.debug(
+            `[CasesConnector][CasesConnectorExecutor][attachAlertsToCases] Attaching ${req.attachments.length} alerts to case with ID ${req.caseId}`,
+            this.getLogMetadata(params, {
+              labels: { caseId: req.caseId },
+              tags: [
+                'case-connector:attachAlertsToCases',
+                req.caseId,
+                ...(req.attachments as Array<{ alertId: string }>).map(({ alertId }) => alertId),
+              ],
+            })
+          );
+        }
 
         await this.casesClient.attachments.bulkCreate(req);
       },
diff --git a/x-pack/plugins/cases/server/custom_fields/toggle.ts b/x-pack/plugins/cases/server/custom_fields/toggle.ts
index c250bf85ea168..512e226badaf5 100644
--- a/x-pack/plugins/cases/server/custom_fields/toggle.ts
+++ b/x-pack/plugins/cases/server/custom_fields/toggle.ts
@@ -19,4 +19,5 @@ export const getCasesToggleCustomField = () => ({
       }
     });
   },
+  getDefaultValue: () => false,
 });
diff --git a/x-pack/plugins/cases/server/custom_fields/types.ts b/x-pack/plugins/cases/server/custom_fields/types.ts
index 7a0df91682a68..0999ccb4b90c4 100644
--- a/x-pack/plugins/cases/server/custom_fields/types.ts
+++ b/x-pack/plugins/cases/server/custom_fields/types.ts
@@ -12,6 +12,7 @@ export interface ICasesCustomField {
   isSortable: boolean;
   savedObjectMappingType: string;
   validateFilteringValues: (values: Array<string | number | boolean | null>) => void;
+  getDefaultValue?: () => boolean | string | null;
 }
 
 export interface CasesCustomFieldsMap {
diff --git a/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
index e4d2c75689cd2..21407054bb970 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_configure.ts
@@ -15,7 +15,9 @@ export const getCaseConfigureRoute = createCasesRoute({
   path: CASE_CONFIGURE_URL,
   routerOptions: {
     access: 'public',
-    summary: `Get case settings`,
+    summary: 'Get case settings',
+    description:
+      'Retrieves setting details such as the closure type, custom fields, templates, and the default connector for cases. You must have `read` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the cases were created.',
   },
   handler: async ({ context, request, response }) => {
     try {
diff --git a/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts b/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
index 3201cb7005fb4..8c6aa326d4ddb 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_connectors.ts
@@ -18,7 +18,9 @@ export const getConnectorsRoute = createCasesRoute({
   routerOptions: {
     tags: ['access:casesGetConnectorsConfigure'],
     access: 'public',
-    summary: `Get case connectors`,
+    summary: 'Get case connectors',
+    description:
+      'Retrieves information about connectors that are supported for use in cases. You must have `read` privileges for the **Actions and Connectors** feature in the **Management** section of the Kibana feature privileges.',
   },
   handler: async ({ context, response }) => {
     try {
diff --git a/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
index c028013332866..f7f3fa51c7a89 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
@@ -17,7 +17,9 @@ export const patchCaseConfigureRoute = createCasesRoute({
   path: CASE_CONFIGURE_DETAILS_URL,
   routerOptions: {
     access: 'public',
-    summary: `Update case settings`,
+    summary: 'Update case settings',
+    description:
+      'Updates case settings such as the closure type, custom fields, templates, and the default connector for cases. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where the case was created.',
   },
   handler: async ({ context, request, response }) => {
     try {
diff --git a/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts b/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
index 6b6d6b1e48441..9797f8805d85d 100644
--- a/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
+++ b/x-pack/plugins/cases/server/routes/api/configure/post_configure.ts
@@ -17,7 +17,9 @@ export const postCaseConfigureRoute = createCasesRoute({
   path: CASE_CONFIGURE_URL,
   routerOptions: {
     access: 'public',
-    summary: `Add case settings`,
+    summary: 'Add case settings',
+    description:
+      'Case settings include external connection details, custom fields, and templates. Connectors are used to interface with external systems. You must create a connector before you can use it in your cases. If you set a default connector, it is automatically selected when you create cases in Kibana. If you use the create case API, however, you must still specify all of the connector details. You must have `all` privileges for the **Cases** feature in the **Management**, **Observability**, or **Security** section of the Kibana feature privileges, depending on where you are creating cases.',
   },
   handler: async ({ context, request, response }) => {
     try {
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
index d53cbc2edd867..034e369b1c700 100644
--- a/x-pack/plugins/cases/server/services/cases/index.ts
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -274,7 +274,7 @@ export class CasesService {
     options?: SavedObjectsBulkDeleteOptions;
   }) {
     try {
-      this.log.debug(`Attempting to bulk delete case entities ${JSON.stringify(entities)}`);
+      this.log.debug(() => `Attempting to bulk delete case entities ${JSON.stringify(entities)}`);
       await this.unsecuredSavedObjectsClient.bulkDelete(entities, options);
     } catch (error) {
       this.log.error(`Error bulk deleting case entities ${JSON.stringify(entities)}: ${error}`);
diff --git a/x-pack/plugins/cases/tsconfig.json b/x-pack/plugins/cases/tsconfig.json
index 535f4e5e106dc..6bbc5cfd4e421 100644
--- a/x-pack/plugins/cases/tsconfig.json
+++ b/x-pack/plugins/cases/tsconfig.json
@@ -75,6 +75,7 @@
     "@kbn/core-logging-browser-mocks",
     "@kbn/data-views-plugin",
     "@kbn/core-http-router-server-internal",
+    "@kbn/presentation-publishing",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/cloud_security_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/cloud_security_grouping.tsx
index a95ae51f81eac..a7371851c5712 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/cloud_security_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/cloud_security_grouping.tsx
@@ -77,13 +77,6 @@ export const CloudSecurityGrouping = ({
       data-test-subj={CSP_GROUPING}
       css={css`
         position: relative;
-        && [data-test-subj='group-stats'] > .euiFlexItem:last-child {
-          display: none;
-        }
-        && [data-test-subj='group-stats'] > .euiFlexItem:not(:first-child) > span {
-          border-right: none;
-          margin-right: 0;
-        }
       `}
     >
       {groupSelectorComponent && (
diff --git a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
index d9e7ac07b9dbd..e480233f376fa 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/cloud_security_grouping/use_cloud_security_grouping.ts
@@ -8,7 +8,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { isNoneGroup, useGrouping } from '@kbn/grouping';
 import * as uuid from 'uuid';
 import type { DataView } from '@kbn/data-views-plugin/common';
-import { GroupOption, GroupPanelRenderer, GroupStatsRenderer } from '@kbn/grouping/src';
+import { GroupOption, GroupPanelRenderer, GetGroupStats } from '@kbn/grouping/src';
 
 import { useUrlQuery } from '../../common/hooks/use_url_query';
 
@@ -28,7 +28,7 @@ export const useCloudSecurityGrouping = ({
   getDefaultQuery,
   unit,
   groupPanelRenderer,
-  groupStatsRenderer,
+  getGroupStats,
   groupingLevel,
   groupingLocalStorageKey,
   maxGroupingLevels = DEFAULT_MAX_GROUPING_LEVELS,
@@ -40,7 +40,7 @@ export const useCloudSecurityGrouping = ({
   getDefaultQuery: (params: FindingsBaseURLQuery) => FindingsBaseURLQuery;
   unit: (count: number) => string;
   groupPanelRenderer?: GroupPanelRenderer<any>;
-  groupStatsRenderer?: GroupStatsRenderer<any>;
+  getGroupStats?: GetGroupStats<any>;
   groupingLevel?: number;
   groupingLocalStorageKey: string;
   maxGroupingLevels?: number;
@@ -60,7 +60,7 @@ export const useCloudSecurityGrouping = ({
     componentProps: {
       unit,
       groupPanelRenderer,
-      groupStatsRenderer,
+      getGroupStats,
       groupsUnit,
     },
     defaultGroupingOptions,
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_input_var_fields.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_input_var_fields.tsx
index a66bff8bd3506..f4c7fd1b8d501 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_input_var_fields.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/aws_credentials_form/aws_input_var_fields.tsx
@@ -30,8 +30,8 @@ export const AwsInputVarFields = ({
 }) => {
   return (
     <div>
-      {fields.map((field) => (
-        <>
+      {fields.map((field, index) => (
+        <div key={index}>
           {field.type === 'password' && field.isSecret === true && (
             <>
               <EuiSpacer size="m" />
@@ -85,7 +85,7 @@ export const AwsInputVarFields = ({
               />
             </EuiFormRow>
           )}
-        </>
+        </div>
       ))}
     </div>
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
index 0f3b9916cef1a..02aa0eb679a66 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/azure_credentials_form/azure_credentials_form.tsx
@@ -279,8 +279,8 @@ export const AzureInputVarFields = ({
 }) => {
   return (
     <div>
-      {fields.map((field) => (
-        <>
+      {fields.map((field, index) => (
+        <div key={index}>
           {field.type === 'password' && field.isSecret === true && (
             <>
               <EuiSpacer size="m" />
@@ -332,7 +332,7 @@ export const AzureInputVarFields = ({
               />
             </EuiFormRow>
           )}
-        </>
+        </div>
       ))}
     </div>
   );
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
index b31f00c21c867..2b060778933d3 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credential_form.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React, { useEffect, useRef } from 'react';
+import React, { Suspense, useEffect, useRef } from 'react';
 import semverLt from 'semver/functions/lt';
 import semverCoerce from 'semver/functions/coerce';
 import semverValid from 'semver/functions/valid';
@@ -15,13 +15,13 @@ import {
   EuiForm,
   EuiFormRow,
   EuiHorizontalRule,
+  EuiLoadingSpinner,
   EuiSelect,
   EuiSpacer,
   EuiText,
-  EuiTextArea,
   EuiTitle,
 } from '@elastic/eui';
-import type { NewPackagePolicy } from '@kbn/fleet-plugin/public';
+import { LazyPackagePolicyInputVarField, type NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import { NewPackagePolicyInput, PackageInfo } from '@kbn/fleet-plugin/common';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
@@ -30,6 +30,7 @@ import { GcpCredentialsType } from '../../../../common/types_old';
 import { CLOUDBEAT_GCP } from '../../../../common/constants';
 import { CspRadioOption, RadioGroup } from '../csp_boxed_radio_group';
 import {
+  findVariableDef,
   getCspmCloudShellDefaultValue,
   getPosturePolicy,
   NewPackagePolicyPostureInput,
@@ -193,7 +194,10 @@ const credentialOptionsList = [
   },
 ];
 
-type GcpFields = Record<string, { label: string; type?: 'password' | 'text'; value?: string }>;
+type GcpFields = Record<
+  string,
+  { label: string; type?: 'password' | 'text'; value?: string; isSecret?: boolean }
+>;
 interface GcpInputFields {
   fields: GcpFields;
 }
@@ -222,7 +226,8 @@ export const gcpField: GcpInputFields = {
       label: i18n.translate('xpack.csp.findings.gcpIntegration.gcpInputText.credentialJSONText', {
         defaultMessage: 'JSON blob containing the credentials and key used to subscribe',
       }),
-      type: 'text',
+      type: 'password',
+      isSecret: true,
     },
     'gcp.credentials.type': {
       label: i18n.translate(
@@ -263,6 +268,7 @@ export interface GcpFormProps {
   setIsValid: (isValid: boolean) => void;
   onChange: any;
   disabled: boolean;
+  isEditPage?: boolean;
 }
 
 export const getInputVarsFields = (input: NewPackagePolicyInput, fields: GcpFields) =>
@@ -367,6 +373,7 @@ export const GcpCredentialsForm = ({
   setIsValid,
   onChange,
   disabled,
+  isEditPage,
 }: GcpFormProps) => {
   /* Create a subset of properties from GcpField to use for hiding value of credentials json and credentials file when user switch from Manual to Cloud Shell, we wanna keep Project and Organization ID */
   const subsetOfGcpField = (({ ['gcp.credentials.file']: a, ['gcp.credentials.json']: b }) => ({
@@ -489,6 +496,8 @@ export const GcpCredentialsForm = ({
             updatePolicy(getPosturePolicy(newPolicy, input.type, { [key]: { value } }))
           }
           isOrganization={isOrganization}
+          packageInfo={packageInfo}
+          isEditPage={isEditPage}
         />
       )}
 
@@ -504,11 +513,15 @@ export const GcpInputVarFields = ({
   onChange,
   isOrganization,
   disabled,
+  packageInfo,
+  isEditPage,
 }: {
   fields: Array<GcpFields[keyof GcpFields] & { value: string; id: string }>;
   onChange: (key: string, value: string) => void;
   isOrganization: boolean;
   disabled: boolean;
+  packageInfo: PackageInfo;
+  isEditPage?: boolean;
 }) => {
   const getFieldById = (id: keyof GcpInputFields['fields']) => {
     return fields.find((element) => element.id === id);
@@ -581,15 +594,41 @@ export const GcpInputVarFields = ({
           </EuiFormRow>
         )}
         {credentialsTypeValue === credentialJSONValue && credentialJSONFields && (
-          <EuiFormRow fullWidth label={gcpField.fields['gcp.credentials.json'].label}>
-            <EuiTextArea
-              data-test-subj={CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_JSON}
-              id={credentialJSONFields.id}
-              fullWidth
-              value={credentialJSONFields.value || ''}
-              onChange={(event) => onChange(credentialJSONFields.id, event.target.value)}
-            />
-          </EuiFormRow>
+          <div
+            css={css`
+              width: 100%;
+              .euiFormControlLayout,
+              .euiFormControlLayout__childrenWrapper,
+              .euiFormRow,
+              input {
+                max-width: 100%;
+                width: 100%;
+              }
+            `}
+          >
+            <EuiSpacer size="m" />
+            <EuiFormRow fullWidth label={gcpField.fields['gcp.credentials.json'].label}>
+              <Suspense fallback={<EuiLoadingSpinner size="l" />}>
+                <LazyPackagePolicyInputVarField
+                  data-test-subj={CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_JSON}
+                  varDef={{
+                    ...findVariableDef(packageInfo, credentialJSONFields.id)!,
+                    required: true,
+                    type: 'textarea',
+                    secret: true,
+                    full_width: true,
+                  }}
+                  value={credentialJSONFields.value || ''}
+                  onChange={(value) => {
+                    onChange(credentialJSONFields.id, value);
+                  }}
+                  errors={[]}
+                  forceShowErrors={false}
+                  isEditPage={isEditPage}
+                />
+              </Suspense>
+            </EuiFormRow>
+          </div>
         )}
       </EuiForm>
     </div>
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credentials_form_agentless.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credentials_form_agentless.tsx
index ca25f3ea1469e..d246ea82689bb 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credentials_form_agentless.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/gcp_credentials_form/gcp_credentials_form_agentless.tsx
@@ -33,8 +33,8 @@ export const GcpCredentialsFormAgentless = ({
   input,
   newPolicy,
   updatePolicy,
-  packageInfo,
   disabled,
+  packageInfo,
 }: GcpFormProps) => {
   const accountType = input.streams?.[0]?.vars?.['gcp.account_type']?.value;
   const isOrganization = accountType === ORGANIZATION_ACCOUNT;
@@ -102,6 +102,7 @@ export const GcpCredentialsFormAgentless = ({
           updatePolicy(getPosturePolicy(newPolicy, input.type, { [key]: { value } }))
         }
         isOrganization={isOrganization}
+        packageInfo={packageInfo}
       />
       <EuiSpacer size="s" />
       <ReadDocumentation url={cspIntegrationDocsNavigation.cspm.getStartedPath} />
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
index 38e6d5d632cea..d495cee7431fd 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/mocks.ts
@@ -6,7 +6,7 @@
  */
 import type { NewPackagePolicy } from '@kbn/fleet-plugin/public';
 import type { PackageInfo, PackagePolicyConfigRecord } from '@kbn/fleet-plugin/common';
-import { createNewPackagePolicyMock, createAgentPolicyMock } from '@kbn/fleet-plugin/common/mocks';
+import { createNewPackagePolicyMock } from '@kbn/fleet-plugin/common/mocks';
 import { RegistryRelease, RegistryVarType } from '@kbn/fleet-plugin/common/types';
 import {
   CLOUDBEAT_GCP,
@@ -29,9 +29,6 @@ export const getMockPolicyEKS = (vars?: PackagePolicyConfigRecord) =>
   getPolicyMock(CLOUDBEAT_EKS, 'kspm', 'eks', vars);
 export const getMockPolicyVulnMgmtAWS = () =>
   getPolicyMock(CLOUDBEAT_VULN_MGMT_AWS, 'vuln_mgmt', 'aws');
-export const getMockAgentlessAgentPolicy = () => {
-  return createAgentPolicyMock({ id: 'agentless' });
-};
 export const getMockPackageInfo = () => getPackageInfoMock();
 
 export const getMockPackageInfoVulnMgmtAWS = () => {
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.test.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.test.tsx
index d228edf845552..84abf584b5080 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.test.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.test.tsx
@@ -16,7 +16,6 @@ import {
 } from './policy_template_form';
 import { TestProvider } from '../../test/test_provider';
 import {
-  getMockAgentlessAgentPolicy,
   getMockPackageInfo,
   getMockPackageInfoCspmAWS,
   getMockPackageInfoCspmAzure,
@@ -30,12 +29,7 @@ import {
   getMockPolicyVulnMgmtAWS,
   getPackageInfoMock,
 } from './mocks';
-import type {
-  AgentPolicy,
-  NewPackagePolicy,
-  PackageInfo,
-  PackagePolicy,
-} from '@kbn/fleet-plugin/common';
+import type { NewPackagePolicy, PackageInfo, PackagePolicy } from '@kbn/fleet-plugin/common';
 import { getPosturePolicy } from './utils';
 import {
   CLOUDBEAT_AWS,
@@ -114,16 +108,14 @@ describe('<CspPolicyTemplateForm />', () => {
   const WrappedComponent = ({
     newPolicy,
     edit = false,
-    agentPolicies,
     packageInfo = {} as PackageInfo,
-    agentlessPolicy,
+    isAgentlessEnabled,
   }: {
     edit?: boolean;
     newPolicy: NewPackagePolicy;
-    agentPolicies?: AgentPolicy[];
     packageInfo?: PackageInfo;
     onChange?: jest.Mock<void, [NewPackagePolicy]>;
-    agentlessPolicy?: AgentPolicy;
+    isAgentlessEnabled?: boolean;
   }) => {
     const { AppWrapper: FleetAppWrapper } = createFleetTestRendererMock();
     return (
@@ -136,8 +128,7 @@ describe('<CspPolicyTemplateForm />', () => {
               onChange={onChange}
               packageInfo={packageInfo}
               isEditPage={true}
-              agentPolicies={agentPolicies}
-              agentlessPolicy={agentlessPolicy}
+              isAgentlessEnabled={isAgentlessEnabled}
             />
           )}
           {!edit && (
@@ -146,8 +137,7 @@ describe('<CspPolicyTemplateForm />', () => {
               onChange={onChange}
               packageInfo={packageInfo}
               isEditPage={false}
-              agentPolicies={agentPolicies}
-              agentlessPolicy={agentlessPolicy}
+              isAgentlessEnabled={isAgentlessEnabled}
             />
           )}
         </TestProvider>
@@ -1236,48 +1226,6 @@ describe('<CspPolicyTemplateForm />', () => {
       });
     });
 
-    it(`renders ${CLOUDBEAT_GCP} Credentials JSON fields`, () => {
-      let policy = getMockPolicyGCP();
-      policy = getPosturePolicy(policy, CLOUDBEAT_GCP, {
-        setup_access: { value: 'manual' },
-        'gcp.credentials.type': { value: 'credentials-json' },
-      });
-
-      const { getByRole, getByLabelText } = render(
-        <WrappedComponent newPolicy={policy} packageInfo={getMockPackageInfoCspmGCP()} />
-      );
-
-      expect(getByRole('option', { name: 'Credentials JSON', selected: true })).toBeInTheDocument();
-
-      expect(
-        getByLabelText('JSON blob containing the credentials and key used to subscribe')
-      ).toBeInTheDocument();
-    });
-
-    it(`updates ${CLOUDBEAT_GCP} Credentials JSON fields`, () => {
-      let policy = getMockPolicyGCP();
-      policy = getPosturePolicy(policy, CLOUDBEAT_GCP, {
-        'gcp.project_id': { value: 'a' },
-        'gcp.credentials.type': { value: 'credentials-json' },
-        setup_access: { value: 'manual' },
-      });
-
-      const { getByTestId } = render(
-        <WrappedComponent newPolicy={policy} packageInfo={getMockPackageInfoCspmGCP()} />
-      );
-
-      userEvent.type(getByTestId(CIS_GCP_INPUT_FIELDS_TEST_SUBJECTS.CREDENTIALS_JSON), 'b');
-
-      policy = getPosturePolicy(policy, CLOUDBEAT_GCP, {
-        'gcp.credentials.json': { value: 'b' },
-      });
-
-      expect(onChange).toHaveBeenCalledWith({
-        isValid: true,
-        updatedPolicy: policy,
-      });
-    });
-
     it(`${CLOUDBEAT_GCP} form do not displays upgrade message for supported versions and gcp organization option is enabled`, () => {
       let policy = getMockPolicyGCP();
       policy = getPosturePolicy(policy, CLOUDBEAT_GCP, {
@@ -1500,12 +1448,23 @@ describe('<CspPolicyTemplateForm />', () => {
   });
 
   describe('Agentless', () => {
+    it('should not render setup technology selector if agentless is not available and CSPM integration supports agentless', async () => {
+      const newPackagePolicy = getMockPolicyAWS();
+
+      const { queryByTestId } = render(
+        <WrappedComponent newPolicy={newPackagePolicy} isAgentlessEnabled={false} />
+      );
+
+      const setupTechnologySelector = queryByTestId(SETUP_TECHNOLOGY_SELECTOR_TEST_SUBJ);
+      // default state
+      expect(setupTechnologySelector).not.toBeInTheDocument();
+    });
+
     it('should render setup technology selector for AWS and allow to select agent-based', async () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
       const newPackagePolicy = getMockPolicyAWS();
 
       const { getByTestId, getByRole } = render(
-        <WrappedComponent newPolicy={newPackagePolicy} agentlessPolicy={agentlessPolicy} />
+        <WrappedComponent newPolicy={newPackagePolicy} isAgentlessEnabled={true} />
       );
 
       const setupTechnologySelectorAccordion = getByTestId(
@@ -1540,14 +1499,13 @@ describe('<CspPolicyTemplateForm />', () => {
       });
     });
 
-    it('should render setup technology selector for GCP for organisation account type', async () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
+    it.skip('should render setup technology selector for GCP for organisation account type', async () => {
       const newPackagePolicy = getMockPolicyGCP();
 
       const { getByTestId, queryByTestId, getByRole } = render(
         <WrappedComponent
           newPolicy={newPackagePolicy}
-          agentlessPolicy={agentlessPolicy}
+          isAgentlessEnabled={true}
           packageInfo={{ version: '1.6.0' } as PackageInfo}
         />
       );
@@ -1593,8 +1551,7 @@ describe('<CspPolicyTemplateForm />', () => {
       });
     });
 
-    it('should render setup technology selector for GCP for single-account', async () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
+    it.skip('should render setup technology selector for GCP for single-account', async () => {
       const newPackagePolicy = getMockPolicyGCP({
         'gcp.account_type': { value: GCP_SINGLE_ACCOUNT, type: 'text' },
       });
@@ -1602,7 +1559,7 @@ describe('<CspPolicyTemplateForm />', () => {
       const { getByTestId, queryByTestId } = render(
         <WrappedComponent
           newPolicy={newPackagePolicy}
-          agentlessPolicy={agentlessPolicy}
+          isAgentlessEnabled={true}
           packageInfo={{ version: '1.6.0' } as PackageInfo}
         />
       );
@@ -1639,13 +1596,12 @@ describe('<CspPolicyTemplateForm />', () => {
     });
 
     it('should render setup technology selector for Azure for Organisation type', async () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
       const newPackagePolicy = getMockPolicyAzure();
 
       const { getByTestId, queryByTestId, getByRole } = render(
         <WrappedComponent
           newPolicy={newPackagePolicy}
-          agentlessPolicy={agentlessPolicy}
+          isAgentlessEnabled={true}
           packageInfo={getPackageInfoMock() as PackageInfo}
         />
       );
@@ -1686,7 +1642,6 @@ describe('<CspPolicyTemplateForm />', () => {
     });
 
     it('should render setup technology selector for Azure for Single Subscription type', async () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
       const newPackagePolicy = getMockPolicyAzure({
         'azure.account_type': { value: 'single-account', type: 'text' },
       });
@@ -1694,7 +1649,7 @@ describe('<CspPolicyTemplateForm />', () => {
       const { getByTestId, queryByTestId } = render(
         <WrappedComponent
           newPolicy={newPackagePolicy}
-          agentlessPolicy={agentlessPolicy}
+          isAgentlessEnabled={true}
           packageInfo={getPackageInfoMock() as PackageInfo}
         />
       );
@@ -1725,11 +1680,10 @@ describe('<CspPolicyTemplateForm />', () => {
     });
 
     it('should not render setup technology selector for KSPM', () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
       const newPackagePolicy = getMockPolicyEKS();
 
       const { queryByTestId } = render(
-        <WrappedComponent newPolicy={newPackagePolicy} agentlessPolicy={agentlessPolicy} />
+        <WrappedComponent newPolicy={newPackagePolicy} isAgentlessEnabled={true} />
       );
 
       const setupTechnologySelectorAccordion = queryByTestId(
@@ -1740,11 +1694,10 @@ describe('<CspPolicyTemplateForm />', () => {
     });
 
     it('should not render setup technology selector for CNVM', () => {
-      const agentlessPolicy = getMockAgentlessAgentPolicy();
       const newPackagePolicy = getMockPolicyVulnMgmtAWS();
 
       const { queryByTestId } = render(
-        <WrappedComponent newPolicy={newPackagePolicy} agentlessPolicy={agentlessPolicy} />
+        <WrappedComponent newPolicy={newPackagePolicy} isAgentlessEnabled={true} />
       );
 
       const setupTechnologySelectorAccordion = queryByTestId(
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
index cd49d80ae7281..0bd4c57129cc4 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_form.tsx
@@ -408,7 +408,7 @@ const GcpAccountTypeSelect = ({
           <EuiText color="subdued" size="s">
             <FormattedMessage
               id="xpack.csp.fleetIntegration.gcpAccountType.gcpSingleAccountDescription"
-              defaultMessage="Deploying to a single project is suitable for an initial POC. To ensure compete coverage, it is strongly recommended to deploy CSPM at the organization-level, which automatically connects all projects (both current and future)."
+              defaultMessage="Deploying to a single project is suitable for an initial POC. To ensure complete coverage, it is strongly recommended to deploy CSPM at the organization-level, which automatically connects all projects (both current and future)."
             />
           </EuiText>
         </>
@@ -533,14 +533,13 @@ const IntegrationSettings = ({ onChange, fields }: IntegrationInfoFieldsProps) =
 
 export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensionComponentProps>(
   ({
-    agentPolicies,
     newPolicy,
     onChange,
     validationResults,
     isEditPage,
     packageInfo,
     handleSetupTechnologyChange,
-    agentlessPolicy,
+    isAgentlessEnabled,
   }) => {
     const integrationParam = useParams<{ integration: CloudSecurityPolicyTemplate }>().integration;
     const integration = SUPPORTED_POLICY_TEMPLATES.includes(integrationParam)
@@ -551,8 +550,7 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
     const input = getSelectedOption(newPolicy.inputs, integration);
     const { isAgentlessAvailable, setupTechnology, updateSetupTechnology } = useSetupTechnology({
       input,
-      agentPolicies,
-      agentlessPolicy,
+      isAgentlessEnabled,
       handleSetupTechnologyChange,
       isEditPage,
     });
@@ -781,6 +779,7 @@ export const CspPolicyTemplateForm = memo<PackagePolicyReplaceDefineStepExtensio
           setIsValid={setIsValid}
           disabled={isEditPage}
           setupTechnology={setupTechnology}
+          isEditPage={isEditPage}
         />
         <EuiSpacer />
       </>
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
index fd816d03fb507..ee76d40e1dcac 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/policy_template_selectors.tsx
@@ -79,6 +79,7 @@ interface PolicyTemplateVarsFormProps {
   setIsValid: (isValid: boolean) => void;
   disabled: boolean;
   setupTechnology: SetupTechnology;
+  isEditPage?: boolean;
 }
 
 export const PolicyTemplateVarsForm = ({
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.test.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.test.ts
index f08b1ad59b9b5..ae0cd7745fecd 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.test.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.test.ts
@@ -33,51 +33,45 @@ describe('useSetupTechnology', () => {
     });
 
     it('sets to AGENTLESS when agentless is available and AWS cloud', () => {
-      const agentlessPolicy = { id: 'agentlessPolicyId' } as AgentPolicy;
       const input = { type: CLOUDBEAT_AWS } as NewPackagePolicyInput;
       const { result } = renderHook(() =>
-        useSetupTechnology({ input, agentlessPolicy, isEditPage })
+        useSetupTechnology({ input, isAgentlessEnabled: true, isEditPage })
       );
       expect(result.current.isAgentlessAvailable).toBeTruthy();
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENTLESS);
     });
 
     it('sets to AGENTLESS when agentless is available and GCP cloud', () => {
-      const agentlessPolicy = { id: 'agentlessPolicyId' } as AgentPolicy;
       const input = { type: CLOUDBEAT_GCP } as NewPackagePolicyInput;
       const { result } = renderHook(() =>
-        useSetupTechnology({ input, agentlessPolicy, isEditPage })
+        useSetupTechnology({ input, isAgentlessEnabled: true, isEditPage })
       );
       expect(result.current.isAgentlessAvailable).toBeTruthy();
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENTLESS);
     });
 
     it('sets to AGENTLESS when agentless is available and Azure cloud', () => {
-      const agentlessPolicy = { id: 'agentlessPolicyId' } as AgentPolicy;
       const input = { type: CLOUDBEAT_AZURE } as NewPackagePolicyInput;
       const { result } = renderHook(() =>
-        useSetupTechnology({ input, agentlessPolicy, isEditPage })
+        useSetupTechnology({ input, isAgentlessEnabled: true, isEditPage })
       );
       expect(result.current.isAgentlessAvailable).toBeTruthy();
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENTLESS);
     });
 
     it('sets to AGENT_BASED when agentless is available but input is not supported for agentless', () => {
-      const agentlessPolicy = { id: 'agentlessPolicyId' } as AgentPolicy;
       const input = { type: CLOUDBEAT_EKS } as NewPackagePolicyInput;
       const { result } = renderHook(() =>
-        useSetupTechnology({ input, agentlessPolicy, isEditPage })
+        useSetupTechnology({ input, isAgentlessEnabled: true, isEditPage })
       );
       expect(result.current.isAgentlessAvailable).toBeFalsy();
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENT_BASED);
     });
 
-    it('sets to AGENT_BASED when agentPolicyId differs from agentlessPolicyId', () => {
+    it('sets to AGENT_BASED when isAgentlessEnabled is false', () => {
       const input = { type: CLOUDBEAT_AWS } as NewPackagePolicyInput;
-      const agentPolicies = [{ id: 'agentPolicyId' } as AgentPolicy];
-      const agentlessPolicy = { id: 'agentlessPolicyId' } as AgentPolicy;
       const { result } = renderHook(() =>
-        useSetupTechnology({ input, agentPolicies, agentlessPolicy, isEditPage })
+        useSetupTechnology({ input, isAgentlessEnabled: false, isEditPage })
       );
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENT_BASED);
     });
@@ -113,13 +107,12 @@ describe('useSetupTechnology', () => {
       expect(result.current.setupTechnology).toBe(SetupTechnology.AGENT_BASED);
     });
 
-    it('initializes with AGENTLESS technology if the agent policy id is "agentless"', () => {
+    it('initializes with AGENTLESS technology if isAgentlessEnable is true', () => {
       const input = { type: CLOUDBEAT_AWS } as NewPackagePolicyInput;
-      const agentPolicies = [{ id: 'agentless' } as AgentPolicy];
       const { result } = renderHook(() =>
         useSetupTechnology({
           input,
-          agentPolicies,
+          isAgentlessEnabled: true,
           isEditPage,
         })
       );
diff --git a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.ts b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.ts
index 20c104fc071c9..77b99d42d6411 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.ts
+++ b/x-pack/plugins/cloud_security_posture/public/components/fleet_extensions/setup_technology_selector/use_setup_technology.ts
@@ -6,20 +6,18 @@
  */
 import { useEffect, useState } from 'react';
 
-import { AgentPolicy, NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
+import { NewPackagePolicyInput } from '@kbn/fleet-plugin/common';
 import { SetupTechnology } from '@kbn/fleet-plugin/public';
 import { CLOUDBEAT_AWS, CLOUDBEAT_GCP, CLOUDBEAT_AZURE } from '../../../../common/constants';
 
 export const useSetupTechnology = ({
   input,
-  agentPolicies,
-  agentlessPolicy,
+  isAgentlessEnabled,
   handleSetupTechnologyChange,
   isEditPage,
 }: {
   input: NewPackagePolicyInput;
-  agentPolicies?: AgentPolicy[];
-  agentlessPolicy?: AgentPolicy;
+  isAgentlessEnabled?: boolean;
   handleSetupTechnologyChange?: (value: SetupTechnology) => void;
   isEditPage: boolean;
 }) => {
@@ -27,11 +25,9 @@ export const useSetupTechnology = ({
   const isCspmGcp = input.type === CLOUDBEAT_GCP;
   const isCspmAzure = input.type === CLOUDBEAT_AZURE;
   const isAgentlessSupportedForCloudProvider = isCspmAws || isCspmGcp || isCspmAzure;
-  const isAgentlessAvailable = Boolean(isAgentlessSupportedForCloudProvider && agentlessPolicy);
-  const agentPolicyIds = (agentPolicies || []).map((policy: AgentPolicy) => policy.id);
-  const agentlessPolicyId = agentlessPolicy?.id;
+  const isAgentlessAvailable = isAgentlessSupportedForCloudProvider && isAgentlessEnabled;
   const [setupTechnology, setSetupTechnology] = useState<SetupTechnology>(() => {
-    if (isEditPage && agentPolicyIds.includes(SetupTechnology.AGENTLESS)) {
+    if (isEditPage && isAgentlessAvailable) {
       return SetupTechnology.AGENTLESS;
     }
 
@@ -50,26 +46,16 @@ export const useSetupTechnology = ({
       return;
     }
 
-    const hasAgentPolicies = agentPolicyIds.length > 0;
-    const agentlessPolicyIsAbsent =
-      !agentlessPolicyId || !agentPolicyIds.includes(agentlessPolicyId);
-
-    if (hasAgentPolicies && agentlessPolicyIsAbsent) {
-      /*
-        handle case when agent policy is coming from outside,
-        e.g. from the get param or when coming to integration from a specific agent policy
-      */
+    if (!isAgentlessAvailable) {
       setSetupTechnology(SetupTechnology.AGENT_BASED);
-    } else if (isAgentlessAvailable) {
+    } else {
       /*
         preselecting agentless when available
         and resetting to agent-based when switching to another integration type, which doesn't support agentless
       */
       setSetupTechnology(SetupTechnology.AGENTLESS);
-    } else {
-      setSetupTechnology(SetupTechnology.AGENT_BASED);
     }
-  }, [agentPolicyIds, agentlessPolicyId, isAgentlessAvailable, isDirty, isEditPage]);
+  }, [isAgentlessAvailable, isDirty, isEditPage]);
 
   useEffect(() => {
     if (isEditPage) {
diff --git a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
index e2d453c078115..a2b1aa1d0d831 100644
--- a/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/components/no_vulnerabilities_states.tsx
@@ -74,8 +74,11 @@ const CnvmIntegrationNotInstalledEmptyPrompt = ({
         <h2>
           <FormattedMessage
             id="xpack.csp.cloudPosturePage.vulnerabilitiesInstalledEmptyPrompt.promptTitle"
-            defaultMessage="Detect vulnerabilities in your <br/> cloud assets"
+            defaultMessage="Detect vulnerabilities in your {lineBreak} cloud assets"
             ignoreTag
+            values={{
+              lineBreak: <br />,
+            }}
           />
         </h2>
       }
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
index cfb572116e65c..a12cc5bb353e2 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_container.tsx
@@ -41,7 +41,7 @@ const SubGrouping = ({
     setActivePageIndex,
   } = useLatestFindingsGrouping({
     groupPanelRenderer,
-    groupStatsRenderer,
+    getGroupStats: groupStatsRenderer,
     groupingLevel,
     selectedGroup,
     groupFilters: parentGroupFilters ? JSON.parse(parentGroupFilters) : [],
@@ -76,7 +76,7 @@ const SubGrouping = ({
 
 export const LatestFindingsContainer = () => {
   const { grouping, isFetching, urlQuery, setUrlQuery, onResetFilters, error, isEmptyResults } =
-    useLatestFindingsGrouping({ groupPanelRenderer, groupStatsRenderer });
+    useLatestFindingsGrouping({ groupPanelRenderer, getGroupStats: groupStatsRenderer });
 
   const renderChildComponent = ({
     level,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
index d40037d156d3f..cd49925798b3a 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/latest_findings_group_renderer.tsx
@@ -14,14 +14,14 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import { GroupPanelRenderer, RawBucket, StatRenderer } from '@kbn/grouping/src';
+import { GroupPanelRenderer, GroupStatsItem, RawBucket } from '@kbn/grouping/src';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { FINDINGS_GROUPING_OPTIONS } from '../../../common/constants';
 import {
-  NullGroup,
-  LoadingGroup,
   firstNonNullValue,
+  LoadingGroup,
+  NullGroup,
 } from '../../../components/cloud_security_grouping';
 import { getAbbreviatedNumber } from '../../../common/utils/get_abbreviated_number';
 import { CISBenchmarkIcon } from '../../../components/cis_benchmark_icon';
@@ -221,21 +221,17 @@ const ComplianceBar = React.memo(ComplianceBarComponent);
 export const groupStatsRenderer = (
   selectedGroup: string,
   bucket: RawBucket<FindingsGroupingAggregation>
-): StatRenderer[] => {
-  const defaultBadges = [
-    {
-      title: i18n.translate('xpack.csp.findings.grouping.stats.badges.findings', {
-        defaultMessage: 'Findings',
-      }),
-      renderer: <FindingsCount bucket={bucket} />,
-    },
-    {
-      title: i18n.translate('xpack.csp.findings.grouping.stats.badges.compliance', {
-        defaultMessage: 'Compliance',
-      }),
-      renderer: <ComplianceBar bucket={bucket} />,
-    },
-  ];
-
-  return defaultBadges;
-};
+): GroupStatsItem[] => [
+  {
+    title: i18n.translate('xpack.csp.findings.grouping.stats.badges.findings', {
+      defaultMessage: 'Findings',
+    }),
+    component: <FindingsCount bucket={bucket} />,
+  },
+  {
+    title: i18n.translate('xpack.csp.findings.grouping.stats.badges.compliance', {
+      defaultMessage: 'Compliance',
+    }),
+    component: <ComplianceBar bucket={bucket} />,
+  },
+];
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
index 47f00a9a1927a..0235960207e27 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/configurations/latest_findings/use_latest_findings_grouping.tsx
@@ -8,7 +8,7 @@ import { getGroupingQuery } from '@kbn/grouping';
 import {
   GroupingAggregation,
   GroupPanelRenderer,
-  GroupStatsRenderer,
+  GetGroupStats,
   isNoneGroup,
   NamedAggregation,
   parseGroupingQuery,
@@ -130,13 +130,13 @@ export const isFindingsRootGroupingAggregation = (
  */
 export const useLatestFindingsGrouping = ({
   groupPanelRenderer,
-  groupStatsRenderer,
+  getGroupStats,
   groupingLevel = 0,
   groupFilters = [],
   selectedGroup,
 }: {
   groupPanelRenderer?: GroupPanelRenderer<FindingsGroupingAggregation>;
-  groupStatsRenderer?: GroupStatsRenderer<FindingsGroupingAggregation>;
+  getGroupStats?: GetGroupStats<FindingsGroupingAggregation>;
   groupingLevel?: number;
   groupFilters?: Filter[];
   selectedGroup?: string;
@@ -165,7 +165,7 @@ export const useLatestFindingsGrouping = ({
     getDefaultQuery,
     unit: FINDINGS_UNIT,
     groupPanelRenderer,
-    groupStatsRenderer,
+    getGroupStats,
     groupingLocalStorageKey: LOCAL_STORAGE_FINDINGS_GROUPING_KEY,
     groupingLevel,
     groupsUnit: MISCONFIGURATIONS_GROUPS_UNIT,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx
index 5aa8aae1dc590..83745e5f5d113 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/rules/rules_table_header.tsx
@@ -333,8 +333,13 @@ const CurrentPageOfTotal = ({
           <EuiText size="xs" textAlign="left" color="subdued" style={{ marginLeft: '8px' }}>
             <FormattedMessage
               id="xpack.csp.rules.rulesTable.showingPageOfTotalLabel"
-              defaultMessage="Showing {pageSize} of {total, plural, one {# rule} other {# rules}} \u2000|\u2000 Selected {selectedRulesAmount, plural, one {# rule} other {# rules}}"
-              values={{ pageSize, total, selectedRulesAmount: selectedRules.length || 0 }}
+              defaultMessage="Showing {pageSize} of {total, plural, one {# rule} other {# rules}} {pipe} Selected {selectedRulesAmount, plural, one {# rule} other {# rules}}"
+              values={{
+                pageSize,
+                total,
+                selectedRulesAmount: selectedRules.length || 0,
+                pipe: '\u2000|\u2000',
+              }}
             />
           </EuiText>
         </EuiFlexItem>
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
index 2e1c93f4218f4..e713a0ad6aad9 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/hooks/use_latest_vulnerabilities_grouping.tsx
@@ -8,7 +8,7 @@ import { getGroupingQuery } from '@kbn/grouping';
 import {
   GroupingAggregation,
   GroupPanelRenderer,
-  GroupStatsRenderer,
+  GetGroupStats,
   isNoneGroup,
   NamedAggregation,
   parseGroupingQuery,
@@ -109,13 +109,13 @@ export const isVulnerabilitiesRootGroupingAggregation = (
  */
 export const useLatestVulnerabilitiesGrouping = ({
   groupPanelRenderer,
-  groupStatsRenderer,
+  getGroupStats,
   groupingLevel = 0,
   groupFilters = [],
   selectedGroup,
 }: {
   groupPanelRenderer?: GroupPanelRenderer<VulnerabilitiesGroupingAggregation>;
-  groupStatsRenderer?: GroupStatsRenderer<VulnerabilitiesGroupingAggregation>;
+  getGroupStats?: GetGroupStats<VulnerabilitiesGroupingAggregation>;
   groupingLevel?: number;
   groupFilters?: Filter[];
   selectedGroup?: string;
@@ -144,7 +144,7 @@ export const useLatestVulnerabilitiesGrouping = ({
     getDefaultQuery,
     unit: VULNERABILITIES_UNIT,
     groupPanelRenderer,
-    groupStatsRenderer,
+    getGroupStats,
     groupingLocalStorageKey: LOCAL_STORAGE_VULNERABILITIES_GROUPING_KEY,
     groupingLevel,
     groupsUnit: VULNERABILITIES_GROUPS_UNIT,
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
index 6b2ed7aea04db..c5510ea7deaaf 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_container.tsx
@@ -42,7 +42,7 @@ export const LatestVulnerabilitiesContainer = () => {
       setActivePageIndex,
     } = useLatestVulnerabilitiesGrouping({
       groupPanelRenderer,
-      groupStatsRenderer,
+      getGroupStats: groupStatsRenderer,
       groupingLevel,
       selectedGroup,
       groupFilters: parentGroupFilters ? JSON.parse(parentGroupFilters) : [],
@@ -138,7 +138,7 @@ export const LatestVulnerabilitiesContainer = () => {
   };
 
   const { grouping, isFetching, urlQuery, setUrlQuery, onResetFilters, error, isEmptyResults } =
-    useLatestVulnerabilitiesGrouping({ groupPanelRenderer, groupStatsRenderer });
+    useLatestVulnerabilitiesGrouping({ groupPanelRenderer, getGroupStats: groupStatsRenderer });
 
   if (error || isEmptyResults) {
     return (
diff --git a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
index 489c8ac0990f8..51dc1e9009502 100644
--- a/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
+++ b/x-pack/plugins/cloud_security_posture/public/pages/vulnerabilities/latest_vulnerabilities_group_renderer.tsx
@@ -14,7 +14,7 @@ import {
   useEuiTheme,
 } from '@elastic/eui';
 import { css } from '@emotion/react';
-import { GroupPanelRenderer, RawBucket, StatRenderer } from '@kbn/grouping/src';
+import { GroupPanelRenderer, GroupStatsItem, RawBucket } from '@kbn/grouping/src';
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { getCloudProviderNameFromAbbreviation } from '../../../common/utils/helpers';
@@ -195,17 +195,13 @@ const SeverityStats = React.memo(SeverityStatsComponent);
 export const groupStatsRenderer = (
   selectedGroup: string,
   bucket: RawBucket<VulnerabilitiesGroupingAggregation>
-): StatRenderer[] => {
-  const defaultBadges = [
-    {
-      title: VULNERABILITIES,
-      renderer: <VulnerabilitiesCount bucket={bucket} />,
-    },
-    {
-      title: '',
-      renderer: <SeverityStats bucket={bucket} />,
-    },
-  ];
-
-  return defaultBadges;
-};
+): GroupStatsItem[] => [
+  {
+    title: VULNERABILITIES,
+    component: <VulnerabilitiesCount bucket={bucket} />,
+  },
+  {
+    title: '',
+    component: <SeverityStats bucket={bucket} />,
+  },
+];
diff --git a/x-pack/plugins/data_quality/common/index.ts b/x-pack/plugins/data_quality/common/index.ts
index 79bbe59ff35d2..1b174a9efe524 100644
--- a/x-pack/plugins/data_quality/common/index.ts
+++ b/x-pack/plugins/data_quality/common/index.ts
@@ -13,6 +13,3 @@ export const PLUGIN_NAME = i18n.translate('xpack.dataQuality.name', {
 });
 
 export { DATA_QUALITY_URL_STATE_KEY, datasetQualityUrlSchemaV1 } from './url_schema';
-
-export { DATA_QUALITY_LOCATOR_ID } from './locators';
-export type { DataQualityLocatorParams } from './locators';
diff --git a/x-pack/plugins/data_quality/common/locators/construct_dataset_quality_locator_path.ts b/x-pack/plugins/data_quality/common/locators/construct_dataset_quality_locator_path.ts
index 45f58752bd2fc..f5b5b0bf7ce59 100644
--- a/x-pack/plugins/data_quality/common/locators/construct_dataset_quality_locator_path.ts
+++ b/x-pack/plugins/data_quality/common/locators/construct_dataset_quality_locator_path.ts
@@ -8,9 +8,9 @@
 import { setStateToKbnUrl } from '@kbn/kibana-utils-plugin/common';
 import { ManagementAppLocatorParams } from '@kbn/management-plugin/common/locator';
 import { LocatorPublic } from '@kbn/share-plugin/common';
+import { DataQualityLocatorParams } from '@kbn/deeplinks-observability';
 import { datasetQualityUrlSchemaV1, DATA_QUALITY_URL_STATE_KEY } from '../url_schema';
 import { deepCompactObject } from '../utils/deep_compact_object';
-import { DataQualityLocatorParams } from './types';
 
 interface LocatorPathConstructionParams {
   locatorParams: DataQualityLocatorParams;
@@ -20,7 +20,7 @@ interface LocatorPathConstructionParams {
 
 export const constructDatasetQualityLocatorPath = async (params: LocatorPathConstructionParams) => {
   const {
-    locatorParams: { filters },
+    locatorParams: { filters, flyout },
     useHash,
     managementLocator,
   } = params;
@@ -29,6 +29,7 @@ export const constructDatasetQualityLocatorPath = async (params: LocatorPathCons
     deepCompactObject({
       v: 1,
       filters,
+      flyout,
     })
   );
 
diff --git a/x-pack/plugins/data_quality/common/locators/dataset_quality_locator.ts b/x-pack/plugins/data_quality/common/locators/dataset_quality_locator.ts
index 70e4770090ef3..4bf804955b6bc 100644
--- a/x-pack/plugins/data_quality/common/locators/dataset_quality_locator.ts
+++ b/x-pack/plugins/data_quality/common/locators/dataset_quality_locator.ts
@@ -6,11 +6,8 @@
  */
 
 import type { LocatorDefinition, LocatorPublic } from '@kbn/share-plugin/public';
-import {
-  DataQualityLocatorDependencies,
-  DataQualityLocatorParams,
-  DATA_QUALITY_LOCATOR_ID,
-} from './types';
+import { DataQualityLocatorParams, DATA_QUALITY_LOCATOR_ID } from '@kbn/deeplinks-observability';
+import { DataQualityLocatorDependencies } from './types';
 import { constructDatasetQualityLocatorPath } from './construct_dataset_quality_locator_path';
 
 export type DatasetQualityLocator = LocatorPublic<DataQualityLocatorParams>;
diff --git a/x-pack/plugins/data_quality/common/locators/types.ts b/x-pack/plugins/data_quality/common/locators/types.ts
index 57067cd0e482a..786b5e1cf567f 100644
--- a/x-pack/plugins/data_quality/common/locators/types.ts
+++ b/x-pack/plugins/data_quality/common/locators/types.ts
@@ -7,31 +7,6 @@
 
 import { ManagementAppLocatorParams } from '@kbn/management-plugin/common/locator';
 import { LocatorPublic } from '@kbn/share-plugin/common';
-import { SerializableRecord } from '@kbn/utility-types';
-
-export const DATA_QUALITY_LOCATOR_ID = 'DATA_QUALITY_LOCATOR';
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type RefreshInterval = {
-  pause: boolean;
-  value: number;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type TimeRangeConfig = {
-  from: string;
-  to: string;
-  refresh: RefreshInterval;
-};
-
-// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
-type Filters = {
-  timeRange: TimeRangeConfig;
-};
-
-export interface DataQualityLocatorParams extends SerializableRecord {
-  filters?: Filters;
-}
 
 export interface DataQualityLocatorDependencies {
   useHash: boolean;
diff --git a/x-pack/plugins/data_quality/common/url_schema/url_schema_v1.ts b/x-pack/plugins/data_quality/common/url_schema/url_schema_v1.ts
index 6fd5781a217e8..076e1b641b7e2 100644
--- a/x-pack/plugins/data_quality/common/url_schema/url_schema_v1.ts
+++ b/x-pack/plugins/data_quality/common/url_schema/url_schema_v1.ts
@@ -37,11 +37,11 @@ const datasetRT = rt.intersection([
     type: rt.string,
     name: rt.string,
     namespace: rt.string,
-    title: rt.string,
   }),
   rt.exact(
     rt.partial({
       integration: integrationRT,
+      title: rt.string,
     })
   ),
 ]);
diff --git a/x-pack/plugins/data_quality/tsconfig.json b/x-pack/plugins/data_quality/tsconfig.json
index 7a904e9f95cda..911c4fbfff557 100644
--- a/x-pack/plugins/data_quality/tsconfig.json
+++ b/x-pack/plugins/data_quality/tsconfig.json
@@ -25,8 +25,8 @@
     "@kbn/core-chrome-browser",
     "@kbn/features-plugin",
     "@kbn/share-plugin",
-    "@kbn/utility-types",
     "@kbn/deeplinks-management",
+    "@kbn/deeplinks-observability",
     "@kbn/ebt-tools",
   ],
   "exclude": ["target/**/*"]
diff --git a/x-pack/plugins/data_visualizer/kibana.jsonc b/x-pack/plugins/data_visualizer/kibana.jsonc
index 1ad88eaea4cb4..84fc98d3fb22f 100644
--- a/x-pack/plugins/data_visualizer/kibana.jsonc
+++ b/x-pack/plugins/data_visualizer/kibana.jsonc
@@ -37,7 +37,7 @@
       "fieldFormats",
       "uiActions",
       "lens",
-      "textBasedLanguages",
+      "esql",
       "visualizations"
     ]
   }
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_esql.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_esql.tsx
index 4ffe604c3d352..fd65ed3c7dfa6 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_esql.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_esql.tsx
@@ -12,7 +12,7 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { usePageUrlState } from '@kbn/ml-url-state';
 
 import { FullTimeRangeSelector, DatePickerWrapper } from '@kbn/ml-date-picker';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import type { AggregateQuery } from '@kbn/es-query';
 
 import {
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/field_stats/field_stats_esql_editor.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/field_stats/field_stats_esql_editor.tsx
index bdaee8c1a5ae1..a015d975fdf18 100644
--- a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/field_stats/field_stats_esql_editor.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/embeddables/field_stats/field_stats_esql_editor.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { useRef, useState, useCallback } from 'react';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import { EuiFlexItem } from '@elastic/eui';
 import type { AggregateQuery } from '@kbn/es-query';
 
diff --git a/x-pack/plugins/data_visualizer/tsconfig.json b/x-pack/plugins/data_visualizer/tsconfig.json
index 9616783094354..ed8a3540f6d8a 100644
--- a/x-pack/plugins/data_visualizer/tsconfig.json
+++ b/x-pack/plugins/data_visualizer/tsconfig.json
@@ -68,7 +68,7 @@
     "@kbn/security-plugin",
     "@kbn/share-plugin",
     "@kbn/test-jest-helpers",
-    "@kbn/text-based-languages",
+    "@kbn/esql",
     "@kbn/ui-actions-plugin",
     "@kbn/ui-theme",
     "@kbn/unified-search-plugin",
diff --git a/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts b/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts
index 680ab17672f61..0360f93b15ee6 100644
--- a/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts
+++ b/x-pack/plugins/elastic_assistant/server/ai_assistant_data_clients/knowledge_base/index.ts
@@ -260,7 +260,7 @@ export class AIAssistantKnowledgeBaseDataClient extends AIAssistantDataClient {
           })
         : undefined;
     this.options.logger.debug(`created: ${created?.data.hits.hits.length ?? '0'}`);
-    this.options.logger.debug(`errors: ${JSON.stringify(errors, null, 2)}`);
+    this.options.logger.debug(() => `errors: ${JSON.stringify(errors, null, 2)}`);
 
     return created?.data ? transformESSearchToKnowledgeBaseEntry(created?.data) : [];
   };
@@ -314,12 +314,14 @@ export class AIAssistantKnowledgeBaseDataClient extends AIAssistantDataClient {
       );
 
       this.options.logger.debug(
-        `getKnowledgeBaseDocuments() - Similarity Search Query:\n ${JSON.stringify(
-          vectorSearchQuery
-        )}`
+        () =>
+          `getKnowledgeBaseDocuments() - Similarity Search Query:\n ${JSON.stringify(
+            vectorSearchQuery
+          )}`
       );
       this.options.logger.debug(
-        `getKnowledgeBaseDocuments() - Similarity Search Results:\n ${JSON.stringify(results)}`
+        () =>
+          `getKnowledgeBaseDocuments() - Similarity Search Results:\n ${JSON.stringify(results)}`
       );
 
       return results;
@@ -347,7 +349,7 @@ export class AIAssistantKnowledgeBaseDataClient extends AIAssistantDataClient {
     }
 
     this.options.logger.debug(
-      `Creating Knowledge Base Entry:\n ${JSON.stringify(knowledgeBaseEntry, null, 2)}`
+      () => `Creating Knowledge Base Entry:\n ${JSON.stringify(knowledgeBaseEntry, null, 2)}`
     );
     this.options.logger.debug(`kbIndex: ${this.indexTemplateAndPattern.alias}`);
     const esClient = await this.options.elasticsearchClientPromise;
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/elasticsearch_store/elasticsearch_store.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/elasticsearch_store/elasticsearch_store.ts
index e076c90526a53..5398abcb8a78e 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/elasticsearch_store/elasticsearch_store.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/elasticsearch_store/elasticsearch_store.ts
@@ -127,7 +127,7 @@ export class ElasticsearchStore extends VectorStore {
 
     try {
       const response = await this.esClient.bulk({ refresh: true, operations });
-      this.logger.debug(`Add Documents Response:\n ${JSON.stringify(response)}`);
+      this.logger.debug(() => `Add Documents Response:\n ${JSON.stringify(response)}`);
 
       const errorIds = response.items.filter((i) => i.index?.error != null);
       operations.forEach((op, i) => {
@@ -268,11 +268,12 @@ export class ElasticsearchStore extends VectorStore {
       });
 
       this.logger.debug(
-        `Similarity search metadata source:\n${JSON.stringify(
-          results.map((r) => r?.metadata?.source ?? '(missing metadata.source)'),
-          null,
-          2
-        )}`
+        () =>
+          `Similarity search metadata source:\n${JSON.stringify(
+            results.map((r) => r?.metadata?.source ?? '(missing metadata.source)'),
+            null,
+            2
+          )}`
       );
 
       return results;
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/execute_custom_llm_chain/index.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/execute_custom_llm_chain/index.ts
index b6a624b368d82..cd1a032406326 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/execute_custom_llm_chain/index.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/execute_custom_llm_chain/index.ts
@@ -18,12 +18,12 @@ import {
   ActionsClientSimpleChatModel,
 } from '@kbn/langchain/server';
 import { MessagesPlaceholder } from '@langchain/core/prompts';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { withAssistantSpan } from '../tracers/apm/with_assistant_span';
 import { EsAnonymizationFieldsSchema } from '../../../ai_assistant_data_clients/anonymization_fields/types';
 import { transformESSearchToAnonymizationFields } from '../../../ai_assistant_data_clients/anonymization_fields/helpers';
 import { AgentExecutor } from '../executors/types';
-import { APMTracer } from '../tracers/apm_tracer';
 import { AssistantToolParams } from '../../../types';
-import { withAssistantSpan } from '../tracers/with_assistant_span';
 export const DEFAULT_AGENT_EXECUTOR_ID = 'Elastic AI Assistant Agent Executor';
 
 /**
@@ -119,7 +119,9 @@ export const callAgentExecutor: AgentExecutor<true | false> = async ({
     (tool) => tool.getTool(assistantToolParams) ?? []
   );
 
-  logger.debug(`applicable tools: ${JSON.stringify(tools.map((t) => t.name).join(', '), null, 2)}`);
+  logger.debug(
+    () => `applicable tools: ${JSON.stringify(tools.map((t) => t.name).join(', '), null, 2)}`
+  );
 
   const executorArgs = {
     memory,
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/executors/openai_functions_executor.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/executors/openai_functions_executor.ts
index 6aa1aa3ce7890..edea22a888dff 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/executors/openai_functions_executor.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/executors/openai_functions_executor.ts
@@ -11,9 +11,9 @@ import { BufferMemory, ChatMessageHistory } from 'langchain/memory';
 import { ChainTool } from 'langchain/tools/chain';
 
 import { ActionsClientLlm } from '@kbn/langchain/server';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { withAssistantSpan } from '../tracers/apm/with_assistant_span';
 import { AgentExecutor } from './types';
-import { withAssistantSpan } from '../tracers/with_assistant_span';
-import { APMTracer } from '../tracers/apm_tracer';
 
 export const OPEN_AI_FUNCTIONS_AGENT_EXECUTOR_ID =
   'Elastic AI Assistant Agent Executor (OpenAI Functions)';
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/helpers.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/helpers.ts
index 482c89c10e969..fe46a5deae9fe 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/helpers.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/helpers.ts
@@ -11,11 +11,11 @@ import { streamFactory, StreamResponseWithHeaders } from '@kbn/ml-response-strea
 import { transformError } from '@kbn/securitysolution-es-utils';
 import type { KibanaRequest } from '@kbn/core-http-server';
 import type { ExecuteConnectorRequestBody, TraceData } from '@kbn/elastic-assistant-common';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { withAssistantSpan } from '../../tracers/apm/with_assistant_span';
 import { AGENT_NODE_TAG } from './nodes/run_agent';
 import { DEFAULT_ASSISTANT_GRAPH_ID, DefaultAssistantGraph } from './graph';
 import type { OnLlmResponse, TraceOptions } from '../../executors/types';
-import type { APMTracer } from '../../tracers/apm_tracer';
-import { withAssistantSpan } from '../../tracers/with_assistant_span';
 
 interface StreamGraphParams {
   apmTracer: APMTracer;
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts
index 517ac10479461..87437a98898d4 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/index.ts
@@ -13,11 +13,11 @@ import {
   ActionsClientSimpleChatModel,
 } from '@kbn/langchain/server';
 import { createOpenAIFunctionsAgent, createStructuredChatAgent } from 'langchain/agents';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
 import { EsAnonymizationFieldsSchema } from '../../../../ai_assistant_data_clients/anonymization_fields/types';
 import { AssistantToolParams } from '../../../../types';
 import { AgentExecutor } from '../../executors/types';
 import { openAIFunctionAgentPrompt, structuredChatAgentPrompt } from './prompts';
-import { APMTracer } from '../../tracers/apm_tracer';
 import { getDefaultAssistantGraph } from './graph';
 import { invokeGraph, streamGraph } from './helpers';
 import { transformESSearchToAnonymizationFields } from '../../../../ai_assistant_data_clients/anonymization_fields/helpers';
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/execute_tools.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/execute_tools.ts
index b42455e14f6f1..ae33faee3e227 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/execute_tools.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/execute_tools.ts
@@ -30,7 +30,7 @@ export const TOOLS_NODE = 'tools';
  * @param tools - The tools available to execute
  */
 export const executeTools = async ({ config, logger, state, tools }: ExecuteToolsParams) => {
-  logger.debug(`Node state:\n${JSON.stringify(state, null, 2)}`);
+  logger.debug(() => `Node state:\n${JSON.stringify(state, null, 2)}`);
 
   const toolExecutor = new ToolExecutor({ tools });
   const agentAction = state.agentOutcome;
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/generate_chat_title.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/generate_chat_title.ts
index d1d60e9bed9b4..105b625cd5f36 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/generate_chat_title.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/generate_chat_title.ts
@@ -35,7 +35,7 @@ export const generateChatTitle = async ({
   model,
   state,
 }: GenerateChatTitleParams) => {
-  logger.debug(`Node state:\n ${JSON.stringify(state, null, 2)}`);
+  logger.debug(() => `Node state:\n ${JSON.stringify(state, null, 2)}`);
 
   if (state.messages.length !== 0) {
     logger.debug('No need to generate chat title, messages already exist');
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/run_agent.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/run_agent.ts
index 0a6ee3b79087c..aeca4dca21ea6 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/run_agent.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/run_agent.ts
@@ -38,7 +38,7 @@ export const runAgent = async ({
   logger,
   state,
 }: RunAgentParams) => {
-  logger.debug(`Node state:\n${JSON.stringify(state, null, 2)}`);
+  logger.debug(() => `Node state:\n${JSON.stringify(state, null, 2)}`);
 
   const knowledgeHistory = await dataClients?.kbDataClient?.getKnowledgeBaseDocuments({
     kbResource: 'user',
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/should_continue.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/should_continue.ts
index 046c4a86d4c7a..57fcb5510318b 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/should_continue.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/langchain/graphs/default_assistant_graph/nodes/should_continue.ts
@@ -19,7 +19,7 @@ export interface ShouldContinueParams extends NodeParamsBase {
  * @param state - The current state of the graph
  */
 export const shouldContinue = ({ logger, state }: ShouldContinueParams) => {
-  logger.debug(`Node state:\n${JSON.stringify(state, null, 2)}`);
+  logger.debug(() => `Node state:\n${JSON.stringify(state, null, 2)}`);
 
   if (state.agentOutcome && 'returnValues' in state.agentOutcome) {
     return 'end';
diff --git a/x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/with_assistant_span.ts b/x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/apm/with_assistant_span.ts
similarity index 100%
rename from x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/with_assistant_span.ts
rename to x-pack/plugins/elastic_assistant/server/lib/langchain/tracers/apm/with_assistant_span.ts
diff --git a/x-pack/plugins/elastic_assistant/server/lib/model_evaluator/evaluation.ts b/x-pack/plugins/elastic_assistant/server/lib/model_evaluator/evaluation.ts
index d6fb04f2a13dc..93f164835876a 100644
--- a/x-pack/plugins/elastic_assistant/server/lib/model_evaluator/evaluation.ts
+++ b/x-pack/plugins/elastic_assistant/server/lib/model_evaluator/evaluation.ts
@@ -15,9 +15,10 @@ import { ToolingLog } from '@kbn/tooling-log';
 import { LangChainTracer } from '@langchain/core/tracers/tracer_langchain';
 import { RunCollectorCallbackHandler } from '@langchain/core/tracers/run_collector';
 import { Dataset } from '@kbn/elastic-assistant-common';
+import { isLangSmithEnabled } from '@kbn/langchain/server/tracers/langsmith';
 import { AgentExecutorEvaluatorWithMetadata } from '../langchain/executors/types';
 import { callAgentWithRetry, getMessageFromLangChainResponse } from './utils';
-import { isLangSmithEnabled, writeLangSmithFeedback } from '../../routes/evaluate/utils';
+import { writeLangSmithFeedback } from '../../routes/evaluate/utils';
 import { ResponseBody } from '../langchain/types';
 
 export interface PerformEvaluationParams {
diff --git a/x-pack/plugins/elastic_assistant/server/routes/attack_discovery/helpers.ts b/x-pack/plugins/elastic_assistant/server/routes/attack_discovery/helpers.ts
index 5f5eb8d0d8659..1de3b86e74deb 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/attack_discovery/helpers.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/attack_discovery/helpers.ts
@@ -28,7 +28,7 @@ import type { ActionsClient } from '@kbn/actions-plugin/server';
 import moment from 'moment/moment';
 import { uniq } from 'lodash/fp';
 import { PublicMethodsOf } from '@kbn/utility-types';
-import { getLangSmithTracer } from '../evaluate/utils';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import { getLlmType } from '../utils';
 import type { GetRegisteredTools } from '../../services/app_context';
 import {
diff --git a/x-pack/plugins/elastic_assistant/server/routes/evaluate/post_evaluate.ts b/x-pack/plugins/elastic_assistant/server/routes/evaluate/post_evaluate.ts
index 990417b799234..79b601ed01073 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/evaluate/post_evaluate.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/evaluate/post_evaluate.ts
@@ -18,6 +18,7 @@ import {
   ExecuteConnectorRequestBody,
 } from '@kbn/elastic-assistant-common';
 import { ActionsClientLlm } from '@kbn/langchain/server';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import { buildRouteValidationWithZod } from '@kbn/elastic-assistant-common/impl/schemas/common';
 import { ESQL_RESOURCE, KNOWLEDGE_BASE_INDEX_PATTERN } from '../knowledge_base/constants';
 import { buildResponse } from '../../lib/build_response';
@@ -29,7 +30,7 @@ import {
   indexEvaluations,
   setupEvaluationIndex,
 } from '../../lib/model_evaluator/output_index/utils';
-import { fetchLangSmithDataset, getConnectorName, getLangSmithTracer } from './utils';
+import { fetchLangSmithDataset, getConnectorName } from './utils';
 import { DEFAULT_PLUGIN_NAME, getPluginNameFromRequest } from '../helpers';
 
 /**
diff --git a/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts b/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
index 17757b8778771..46909805510e2 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/evaluate/utils.ts
@@ -10,8 +10,8 @@ import type { ActionResult } from '@kbn/actions-plugin/server';
 import type { Logger } from '@kbn/core/server';
 import type { Run } from 'langsmith/schemas';
 import { ToolingLog } from '@kbn/tooling-log';
-import { LangChainTracer } from '@langchain/core/tracers/tracer_langchain';
 import { Dataset } from '@kbn/elastic-assistant-common';
+import { isLangSmithEnabled } from '@kbn/langchain/server/tracers/langsmith';
 
 /**
  * Return connector name for the given connectorId/connectors
@@ -97,56 +97,3 @@ export const writeLangSmithFeedback = async (
     return '';
   }
 };
-
-/**
- * Returns a custom LangChainTracer which adds the `exampleId` so Dataset 'Test' runs are written to LangSmith
- * If `exampleId` is present (and a corresponding example exists in LangSmith) trace is written to the Dataset's `Tests`
- * section, otherwise it is written to the `Project` provided
- *
- * @param apiKey API Key for LangSmith (will fetch from env vars if not provided)
- * @param projectName Name of project to trace results to
- * @param exampleId Dataset exampleId to associate trace with
- * @param logger
- */
-export const getLangSmithTracer = ({
-  apiKey,
-  projectName,
-  exampleId,
-  logger,
-}: {
-  apiKey?: string;
-  projectName?: string;
-  exampleId?: string;
-  logger: Logger | ToolingLog;
-}): LangChainTracer[] => {
-  try {
-    if (!isLangSmithEnabled() && apiKey == null) {
-      return [];
-    }
-    const lcTracer = new LangChainTracer({
-      projectName, // Shows as the 'test' run's 'name' in langsmith ui
-      exampleId,
-      client: new Client({ apiKey }),
-    });
-
-    return [lcTracer];
-  } catch (e) {
-    // Note: creating a tracer can fail if the LangSmith env vars are not set correctly
-    logger.error(`Error creating LangSmith tracer: ${e.message}`);
-  }
-
-  return [];
-};
-
-/**
- * Returns true if LangSmith/tracing is enabled
- */
-export const isLangSmithEnabled = (): boolean => {
-  try {
-    // Just checking if apiKey is available, if better way to check for enabled that is not env var please update
-    const config = Client.getDefaultClientConfig();
-    return config.apiKey != null;
-  } catch (e) {
-    return false;
-  }
-};
diff --git a/x-pack/plugins/elastic_assistant/server/routes/helpers.ts b/x-pack/plugins/elastic_assistant/server/routes/helpers.ts
index aa060e24bc5df..a8fe0d0c25d68 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/helpers.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/helpers.ts
@@ -27,6 +27,7 @@ import { i18n } from '@kbn/i18n';
 import { AwaitedProperties, PublicMethodsOf } from '@kbn/utility-types';
 import { ActionsClient } from '@kbn/actions-plugin/server';
 import { AssistantFeatureKey } from '@kbn/elastic-assistant-common/impl/capabilities';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import { MINIMUM_AI_ASSISTANT_LICENSE } from '../../common/constants';
 import { ESQL_RESOURCE, KNOWLEDGE_BASE_INDEX_PATTERN } from './knowledge_base/constants';
 import { callAgentExecutor } from '../lib/langchain/execute_custom_llm_chain';
@@ -39,7 +40,6 @@ import {
 import { executeAction, StaticResponse } from '../lib/executor';
 import { getLangChainMessages } from '../lib/langchain/helpers';
 
-import { getLangSmithTracer } from './evaluate/utils';
 import { ElasticsearchStore } from '../lib/langchain/elasticsearch_store/elasticsearch_store';
 import { AIAssistantConversationsDataClient } from '../ai_assistant_data_clients/conversations';
 import { INVOKE_ASSISTANT_SUCCESS_EVENT } from '../lib/telemetry/event_based_telemetry';
diff --git a/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/bulk_actions_route.ts b/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/bulk_actions_route.ts
index dbd9d83bae3ac..f5fd6305c8b4b 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/bulk_actions_route.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/bulk_actions_route.ts
@@ -144,7 +144,8 @@ export const bulkActionKnowledgeBaseEntriesRoute = (router: ElasticAssistantPlug
           }
 
           logger.debug(
-            `Performing bulk action on Knowledge Base Entries:\n${JSON.stringify(request.body)}`
+            () =>
+              `Performing bulk action on Knowledge Base Entries:\n${JSON.stringify(request.body)}`
           );
 
           const { body } = request;
diff --git a/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/create_route.ts b/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/create_route.ts
index b93ab4e894c8b..2d7bdb93ad2e1 100644
--- a/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/create_route.ts
+++ b/x-pack/plugins/elastic_assistant/server/routes/knowledge_base/entries/create_route.ts
@@ -60,7 +60,7 @@ export const createKnowledgeBaseEntryRoute = (router: ElasticAssistantPluginRout
             return checkResponse;
           }
 
-          logger.debug(`Creating KB Entry:\n${JSON.stringify(request.body)}`);
+          logger.debug(() => `Creating KB Entry:\n${JSON.stringify(request.body)}`);
           const documents: Array<Document<Metadata>> = [
             {
               metadata: request.body.metadata,
diff --git a/x-pack/plugins/elastic_assistant/server/services/app_context.ts b/x-pack/plugins/elastic_assistant/server/services/app_context.ts
index cb425540635d9..6648b12ddb02e 100644
--- a/x-pack/plugins/elastic_assistant/server/services/app_context.ts
+++ b/x-pack/plugins/elastic_assistant/server/services/app_context.ts
@@ -80,9 +80,10 @@ class AppContextService {
     this.logger?.debug('AppContextService:registerFeatures');
     this.logger?.debug(`pluginName: ${pluginName}`);
     this.logger?.debug(
-      `features: ${Object.entries(features)
-        .map(([feature, enabled]) => `${feature}:${enabled}`)
-        .join(', ')}`
+      () =>
+        `features: ${Object.entries(features)
+          .map(([feature, enabled]) => `${feature}:${enabled}`)
+          .join(', ')}`
     );
 
     if (!this.registeredFeatures.has(pluginName)) {
@@ -107,9 +108,10 @@ class AppContextService {
     this.logger?.debug('AppContextService:getRegisteredFeatures');
     this.logger?.debug(`pluginName: ${pluginName}`);
     this.logger?.debug(
-      `features: ${Object.entries(features)
-        .map(([feature, enabled]) => `${feature}:${enabled}`)
-        .join(', ')}`
+      () =>
+        `features: ${Object.entries(features)
+          .map(([feature, enabled]) => `${feature}:${enabled}`)
+          .join(', ')}`
     );
 
     return features;
diff --git a/x-pack/plugins/elastic_assistant/tsconfig.json b/x-pack/plugins/elastic_assistant/tsconfig.json
index 8f546d6e5fe01..a2d0ec6c1d68a 100644
--- a/x-pack/plugins/elastic_assistant/tsconfig.json
+++ b/x-pack/plugins/elastic_assistant/tsconfig.json
@@ -27,7 +27,6 @@
     "@kbn/core-elasticsearch-server",
     "@kbn/logging",
     "@kbn/ml-plugin",
-    "@kbn/apm-utils",
     "@kbn/elastic-assistant-common",
     "@kbn/core-http-router-server-mocks",
     "@kbn/data-stream-adapter",
@@ -46,6 +45,7 @@
     "@kbn/langchain",
     "@kbn/stack-connectors-plugin",
     "@kbn/security-plugin",
+    "@kbn/apm-utils",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
index 7e4f28bbd2093..44072a0828d48 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encrypted_saved_objects_service.ts
@@ -308,11 +308,12 @@ export class EncryptedSavedObjectsService {
     const encryptedAttributesKeys = Object.keys(encryptedAttributes);
     if (encryptedAttributesKeys.length !== typeDefinition.attributesToEncrypt.size) {
       this.options.logger.debug(
-        `The following attributes of saved object "${descriptorToArray(
-          descriptor
-        )}" should have been encrypted: ${Array.from(
-          typeDefinition.attributesToEncrypt
-        )}, but found only: ${encryptedAttributesKeys}`
+        () =>
+          `The following attributes of saved object "${descriptorToArray(
+            descriptor
+          )}" should have been encrypted: ${Array.from(
+            typeDefinition.attributesToEncrypt
+          )}, but found only: ${encryptedAttributesKeys}`
       );
     }
 
@@ -569,11 +570,12 @@ export class EncryptedSavedObjectsService {
     const decryptedAttributesKeys = Object.keys(decryptedAttributes);
     if (decryptedAttributesKeys.length !== typeDefinition.attributesToEncrypt.size) {
       this.options.logger.debug(
-        `The following attributes of saved object "${descriptorToArray(
-          descriptor
-        )}" should have been decrypted: ${Array.from(
-          typeDefinition.attributesToEncrypt
-        )}, but found only: ${decryptedAttributesKeys}`
+        () =>
+          `The following attributes of saved object "${descriptorToArray(
+            descriptor
+          )}" should have been decrypted: ${Array.from(
+            typeDefinition.attributesToEncrypt
+          )}, but found only: ${decryptedAttributesKeys}`
       );
     }
 
@@ -605,9 +607,10 @@ export class EncryptedSavedObjectsService {
 
     if (Object.keys(attributesAAD).length === 0) {
       this.options.logger.debug(
-        `The AAD for saved object "${descriptorToArray(
-          descriptor
-        )}" does not include any attributes.`
+        () =>
+          `The AAD for saved object "${descriptorToArray(
+            descriptor
+          )}" does not include any attributes.`
       );
     }
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
index c18c7a46c54c4..d8fa12a3e4973 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts
@@ -14,7 +14,7 @@ import type {
   StartServicesAccessor,
 } from '@kbn/core/server';
 import { ENCRYPTION_EXTENSION_ID } from '@kbn/core-saved-objects-server';
-import type { AuthenticatedUser, SecurityPluginSetup } from '@kbn/security-plugin/server';
+import type { AuthenticatedUser } from '@kbn/core-security-common';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import type { EncryptedSavedObjectsService } from './encrypted_saved_objects_service';
@@ -25,7 +25,6 @@ interface EncryptionKeyRotationServiceOptions {
   logger: Logger;
   service: PublicMethodsOf<EncryptedSavedObjectsService>;
   getStartServices: StartServicesAccessor;
-  security?: SecurityPluginSetup;
 }
 
 interface EncryptionKeyRotationParams {
@@ -69,7 +68,7 @@ export class EncryptionKeyRotationService {
     request: KibanaRequest,
     { batchSize, type }: EncryptionKeyRotationParams
   ): Promise<EncryptionKeyRotationResult> {
-    const [{ savedObjects }] = await this.options.getStartServices();
+    const [{ security, savedObjects }] = await this.options.getStartServices();
     const typeRegistry = savedObjects.getTypeRegistry();
 
     // We need to retrieve all SavedObject types which have encrypted attributes, specifically
@@ -105,7 +104,7 @@ export class EncryptionKeyRotationService {
     // don't want to have Encrypted Saved Objects wrapper so that it doesn't strip encrypted
     // attributes. But for the update we want to have it so that it automatically re-encrypts
     // attributes with the new primary encryption key.
-    const user = this.options.security?.authc.getCurrentUser(request) ?? undefined;
+    const user = security.authc.getCurrentUser(request) ?? undefined;
     const retrieveClient = savedObjects.getScopedClient(request, {
       includedHiddenTypes: registeredHiddenSavedObjectTypes,
       excludedExtensions: [ENCRYPTION_EXTENSION_ID],
diff --git a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
index ba69b00ecb4e1..50514bc619978 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/plugin.ts
@@ -60,7 +60,7 @@ export class EncryptedSavedObjectsPlugin
     this.logger = this.initializerContext.logger.get();
   }
 
-  public setup(core: CoreSetup, deps: PluginsSetup): EncryptedSavedObjectsPluginSetup {
+  public setup(core: CoreSetup, _deps: PluginsSetup): EncryptedSavedObjectsPluginSetup {
     const config = this.initializerContext.config.get<ConfigType>();
     const canEncrypt = config.encryptionKey !== undefined;
     if (!canEncrypt) {
@@ -95,7 +95,6 @@ export class EncryptedSavedObjectsPlugin
     this.savedObjectsSetup = setupSavedObjects({
       service,
       savedObjects: core.savedObjects,
-      security: deps.security,
       getStartServices: core.getStartServices,
     });
 
@@ -110,7 +109,6 @@ export class EncryptedSavedObjectsPlugin
             logger: this.logger.get('key-rotation-service'),
             service,
             getStartServices: core.getStartServices,
-            security: deps.security,
           })
         ),
         config,
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
index edcf522987115..83d56a133ea16 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.test.ts
@@ -43,7 +43,10 @@ describe('Key rotation routes', () => {
     });
 
     it('correctly defines route.', () => {
-      expect(routeConfig.options).toEqual({ tags: ['access:rotateEncryptionKey'] });
+      expect(routeConfig.options).toEqual({
+        tags: ['access:rotateEncryptionKey', 'oas-tag:saved objects'],
+        description: `Rotate a key for encrypted saved objects`,
+      });
       expect(routeConfig.validate).toEqual({
         body: undefined,
         query: expect.any(Type),
diff --git a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
index 9305446767e9d..c9c452cf9a031 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/routes/key_rotation.ts
@@ -39,7 +39,8 @@ export function defineKeyRotationRoutes({
         }),
       },
       options: {
-        tags: ['access:rotateEncryptionKey'],
+        tags: ['access:rotateEncryptionKey', 'oas-tag:saved objects'],
+        description: `Rotate a key for encrypted saved objects`,
       },
     },
     async (context, request, response) => {
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
index dc7cb2a9e52d5..bd8f21d1c8bf9 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.test.ts
@@ -15,7 +15,7 @@ import {
   savedObjectsRepositoryMock,
   savedObjectsTypeRegistryMock,
 } from '@kbn/core/server/mocks';
-import { securityMock } from '@kbn/security-plugin/server/mocks';
+import { nextTick } from '@kbn/test-jest-helpers';
 
 import type { ClientInstanciator } from '.';
 import { setupSavedObjects } from '.';
@@ -47,14 +47,14 @@ describe('#setupSavedObjects', () => {
     setupContract = setupSavedObjects({
       service: mockEncryptedSavedObjectsService,
       savedObjects: coreSetupMock.savedObjects,
-      security: securityMock.createSetup(),
       getStartServices: coreSetupMock.getStartServices,
     });
   });
 
   describe('#setupContract', () => {
     it('includes hiddenTypes when specified', async () => {
-      await setupContract({ includedHiddenTypes: ['hiddenType'] });
+      setupContract({ includedHiddenTypes: ['hiddenType'] });
+      await nextTick();
       expect(coreStartMock.savedObjects.createInternalRepository).toHaveBeenCalledWith([
         'hiddenType',
       ]);
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
index 6c7b9ef5513ac..3fbfec79b1528 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts
@@ -18,7 +18,6 @@ import type {
   SavedObjectsServiceSetup,
   StartServicesAccessor,
 } from '@kbn/core/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import { getDescriptorNamespace, normalizeNamespace } from './get_descriptor_namespace';
@@ -30,7 +29,6 @@ export { normalizeNamespace };
 interface SetupSavedObjectsParams {
   service: PublicMethodsOf<EncryptedSavedObjectsService>;
   savedObjects: SavedObjectsServiceSetup;
-  security?: SecurityPluginSetup;
   getStartServices: StartServicesAccessor;
 }
 
@@ -78,7 +76,6 @@ export interface EncryptedSavedObjectsClient {
 export function setupSavedObjects({
   service,
   savedObjects,
-  security,
   getStartServices,
 }: SetupSavedObjectsParams): ClientInstanciator {
   // Register custom saved object extension that will encrypt, decrypt and strip saved object
@@ -87,7 +84,10 @@ export function setupSavedObjects({
     return new SavedObjectsEncryptionExtension({
       baseTypeRegistry,
       service,
-      getCurrentUser: () => security?.authc.getCurrentUser(request) ?? undefined,
+      getCurrentUser: async () => {
+        const [{ security }] = await getStartServices();
+        return security.authc.getCurrentUser(request) ?? undefined;
+      },
     });
   });
 
diff --git a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts
index fe5d00ee4a8fb..01c35c7403fdf 100644
--- a/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts
+++ b/x-pack/plugins/encrypted_saved_objects/server/saved_objects/saved_objects_encryption_extension.ts
@@ -22,13 +22,13 @@ import type { EncryptedSavedObjectsService } from '../crypto';
 export interface Params {
   baseTypeRegistry: ISavedObjectTypeRegistry;
   service: Readonly<EncryptedSavedObjectsService>;
-  getCurrentUser: () => AuthenticatedUser | undefined;
+  getCurrentUser: () => Promise<AuthenticatedUser | undefined>;
 }
 
 export class SavedObjectsEncryptionExtension implements ISavedObjectsEncryptionExtension {
   readonly _baseTypeRegistry: ISavedObjectTypeRegistry;
   readonly _service: Readonly<EncryptedSavedObjectsService>;
-  readonly _getCurrentUser: () => AuthenticatedUser | undefined;
+  readonly _getCurrentUser: () => Promise<AuthenticatedUser | undefined>;
 
   constructor({ baseTypeRegistry, service, getCurrentUser }: Params) {
     this._baseTypeRegistry = baseTypeRegistry;
@@ -51,6 +51,7 @@ export class SavedObjectsEncryptionExtension implements ISavedObjectsEncryptionE
         type: response.type,
         namespace: getDescriptorNamespace(this._baseTypeRegistry, response.type, namespace),
       };
+      const user = await this._getCurrentUser();
       // Error is returned when decryption fails, and in this case encrypted attributes will be
       // stripped from the returned attributes collection. That will let consumer decide whether to
       // fail or handle recovery gracefully.
@@ -58,7 +59,7 @@ export class SavedObjectsEncryptionExtension implements ISavedObjectsEncryptionE
         normalizedDescriptor,
         response.attributes as Record<string, unknown>,
         originalAttributes as Record<string, unknown>,
-        { user: this._getCurrentUser() }
+        { user }
       );
 
       return { ...response, attributes, ...(error && { error }) };
@@ -82,8 +83,7 @@ export class SavedObjectsEncryptionExtension implements ISavedObjectsEncryptionE
       id,
       namespace: getDescriptorNamespace(this._baseTypeRegistry, type, namespace),
     };
-    return this._service.encryptAttributes(normalizedDescriptor, attributes, {
-      user: this._getCurrentUser(),
-    });
+    const user = await this._getCurrentUser();
+    return this._service.encryptAttributes(normalizedDescriptor, attributes, { user });
   }
 }
diff --git a/x-pack/plugins/encrypted_saved_objects/tsconfig.json b/x-pack/plugins/encrypted_saved_objects/tsconfig.json
index 17dea87aca6ee..83cdcd6225850 100644
--- a/x-pack/plugins/encrypted_saved_objects/tsconfig.json
+++ b/x-pack/plugins/encrypted_saved_objects/tsconfig.json
@@ -12,6 +12,8 @@
     "@kbn/core-saved-objects-server",
     "@kbn/core-saved-objects-base-server-internal",
     "@kbn/core-saved-objects-api-server-mocks",
+    "@kbn/core-security-common",
+    "@kbn/test-jest-helpers",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/enterprise_search/common/constants.ts b/x-pack/plugins/enterprise_search/common/constants.ts
index 47c4741e41afc..f2be720d1c04c 100644
--- a/x-pack/plugins/enterprise_search/common/constants.ts
+++ b/x-pack/plugins/enterprise_search/common/constants.ts
@@ -8,7 +8,7 @@
 import {
   ENTERPRISE_SEARCH_APP_ID,
   ENTERPRISE_SEARCH_CONTENT_APP_ID,
-  ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   ENTERPRISE_SEARCH_APPLICATIONS_APP_ID,
   ENTERPRISE_SEARCH_ANALYTICS_APP_ID,
   ENTERPRISE_SEARCH_APPSEARCH_APP_ID,
@@ -178,7 +178,7 @@ export const VECTOR_SEARCH_PLUGIN = {
 };
 
 export const INFERENCE_ENDPOINTS_PLUGIN = {
-  ID: ENTERPRISE_SEARCH_INFERENCE_ENDPOINTS_APP_ID,
+  ID: ENTERPRISE_SEARCH_RELEVANCE_APP_ID,
   NAME: i18n.translate('xpack.enterpriseSearch.inferenceEndpoints.productName', {
     defaultMessage: 'Inference Endpoints',
   }),
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
index 0ea858d0f2f50..4f91ddf4cb5c6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
@@ -10,6 +10,7 @@ import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
 export const mockLicensingValues = {
   license: licensingMock.createLicense(),
   hasPlatinumLicense: false,
+  hasEnterpriseLicense: true,
   hasGoldLicense: false,
   isTrial: false,
   canManageLicense: true,
diff --git a/x-pack/plugins/enterprise_search/public/applications/applications/components/playground/playground.tsx b/x-pack/plugins/enterprise_search/public/applications/applications/components/playground/playground.tsx
index e6882acb0ac3b..b117518d3a6e0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/applications/components/playground/playground.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/applications/components/playground/playground.tsx
@@ -9,11 +9,8 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { EuiBetaBadge, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { FormattedMessage } from '@kbn/i18n-react';
-
 import { KibanaLogic } from '../../../shared/kibana';
 import { EnterpriseSearchApplicationsPageTemplate } from '../layout/page_template';
 
@@ -31,32 +28,9 @@ export const Playground: React.FC = () => {
             defaultMessage: 'Playground',
           }),
         ]}
-        pageHeader={{
-          pageTitle: (
-            <EuiFlexGroup>
-              <EuiFlexItem grow={false}>
-                <FormattedMessage
-                  id="xpack.enterpriseSearch.content.playground.headerTitle"
-                  defaultMessage="Playground"
-                />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiBetaBadge
-                  label={i18n.translate(
-                    'xpack.enterpriseSearch.content.playground.headerTitle.techPreview',
-                    {
-                      defaultMessage: 'TECH PREVIEW',
-                    }
-                  )}
-                  color="hollow"
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          ),
-          rightSideItems: [<searchPlayground.PlaygroundToolbar />],
-        }}
         pageViewTelemetry="Playground"
         restrictWidth={false}
+        panelled={false}
         customPageSections
         bottomBorder="extended"
         docLink="playground"
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
index 77454581c61e7..e39f0f0b71f29 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/nav.tsx
@@ -40,6 +40,8 @@ import {
 import { INFERENCE_ENDPOINTS_PATH } from '../../enterprise_search_relevance/routes';
 import { KibanaLogic } from '../kibana';
 
+import { LicensingLogic } from '../licensing';
+
 import { generateNavLink } from './nav_link_helpers';
 
 /**
@@ -51,7 +53,11 @@ import { generateNavLink } from './nav_link_helpers';
 export const useEnterpriseSearchNav = (alwaysReturn = false) => {
   const { isSearchHomepageEnabled, searchHomepage, isSidebarEnabled, productAccess } =
     useValues(KibanaLogic);
+
+  const { hasEnterpriseLicense } = useValues(LicensingLogic);
+
   const indicesNavItems = useIndicesNav();
+
   if (!isSidebarEnabled && !alwaysReturn) return undefined;
 
   const navItems: Array<EuiSideNavItemTypeEnhanced<unknown>> = [
@@ -154,25 +160,29 @@ export const useEnterpriseSearchNav = (alwaysReturn = false) => {
         defaultMessage: 'Build',
       }),
     },
-    {
-      id: 'relevance',
-      items: [
-        {
-          id: 'inference_endpoints',
-          name: i18n.translate('xpack.enterpriseSearch.nav.inferenceEndpointsTitle', {
-            defaultMessage: 'Inference Endpoints',
-          }),
-          ...generateNavLink({
-            shouldNotCreateHref: true,
-            shouldShowActiveForSubroutes: true,
-            to: INFERENCE_ENDPOINTS_PLUGIN.URL + INFERENCE_ENDPOINTS_PATH,
-          }),
-        },
-      ],
-      name: i18n.translate('xpack.enterpriseSearch.nav.relevanceTitle', {
-        defaultMessage: 'Relevance',
-      }),
-    },
+    ...(hasEnterpriseLicense
+      ? [
+          {
+            id: 'relevance',
+            items: [
+              {
+                id: 'inference_endpoints',
+                name: i18n.translate('xpack.enterpriseSearch.nav.inferenceEndpointsTitle', {
+                  defaultMessage: 'Inference Endpoints',
+                }),
+                ...generateNavLink({
+                  shouldNotCreateHref: true,
+                  shouldShowActiveForSubroutes: true,
+                  to: INFERENCE_ENDPOINTS_PLUGIN.URL + INFERENCE_ENDPOINTS_PATH,
+                }),
+              },
+            ],
+            name: i18n.translate('xpack.enterpriseSearch.nav.relevanceTitle', {
+              defaultMessage: 'Relevance',
+            }),
+          },
+        ]
+      : []),
     {
       id: 'es_getting_started',
       items: [
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
index 85a26abeef1e1..743483e96fa31 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.test.ts
@@ -167,6 +167,38 @@ describe('LicensingLogic', () => {
       });
     });
 
+    describe('hasEnterpriseLicense', () => {
+      it('is true for enterprise and trial licenses', () => {
+        updateLicense({ status: 'active', type: 'enterprise' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(true);
+
+        updateLicense({ status: 'active', type: 'trial' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(true);
+      });
+
+      it('is false if the current license is expired', () => {
+        updateLicense({ status: 'expired', type: 'enterprise' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'expired', type: 'trial' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+      });
+
+      it('is false for licenses below enterprise', () => {
+        updateLicense({ status: 'active', type: 'gold' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'platinum' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'basic' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+
+        updateLicense({ status: 'active', type: 'standard' });
+        expect(LicensingLogic.values.hasEnterpriseLicense).toEqual(false);
+      });
+    });
+
     describe('isTrial', () => {
       it('is true for active trial license', () => {
         updateLicense({ status: 'active', type: 'trial' });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
index 77a09de2c863f..ab3586f6563c1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/licensing/licensing_logic.ts
@@ -13,6 +13,7 @@ import { ILicense } from '@kbn/licensing-plugin/public';
 interface LicensingValues {
   license: ILicense | null;
   licenseSubscription: Subscription | null;
+  hasEnterpriseLicense: boolean;
   hasPlatinumLicense: boolean;
   hasGoldLicense: boolean;
   isTrial: boolean;
@@ -52,6 +53,13 @@ export const LicensingLogic = kea<MakeLogicType<LicensingValues, LicensingAction
         return license?.isActive && qualifyingLicenses.includes(license?.type);
       },
     ],
+    hasEnterpriseLicense: [
+      (selectors) => [selectors.license],
+      (license) => {
+        const qualifyingLicenses = ['enterprise', 'trial'];
+        return license?.isActive && qualifyingLicenses.includes(license?.type);
+      },
+    ],
     hasGoldLicense: [
       (selectors) => [selectors.license],
       (license) => {
diff --git a/x-pack/plugins/enterprise_search/public/navigation_tree.ts b/x-pack/plugins/enterprise_search/public/navigation_tree.ts
index 8bb6bf70e603b..d5c640fa67b3e 100644
--- a/x-pack/plugins/enterprise_search/public/navigation_tree.ts
+++ b/x-pack/plugins/enterprise_search/public/navigation_tree.ts
@@ -211,7 +211,7 @@ export const getNavigationTreeDefinition = ({
                   }),
                 },
                 {
-                  children: [{ link: 'searchInferenceEndpoints' }],
+                  children: [{ link: 'enterpriseSearchRelevance:inferenceEndpoints' }],
                   id: 'relevance',
                   title: i18n.translate('xpack.enterpriseSearch.searchNav.relevance', {
                     defaultMessage: 'Relevance',
diff --git a/x-pack/plugins/enterprise_search/public/plugin.ts b/x-pack/plugins/enterprise_search/public/plugin.ts
index 280de2f04356b..552bb43fbd073 100644
--- a/x-pack/plugins/enterprise_search/public/plugin.ts
+++ b/x-pack/plugins/enterprise_search/public/plugin.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { BehaviorSubject, firstValueFrom } from 'rxjs';
+import { BehaviorSubject, firstValueFrom, Subscription } from 'rxjs';
 
 import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 import { CloudSetup, CloudStart } from '@kbn/cloud-plugin/public';
@@ -27,6 +27,7 @@ import type { HomePublicPluginSetup } from '@kbn/home-plugin/public';
 import { i18n } from '@kbn/i18n';
 import type { IndexManagementPluginStart } from '@kbn/index-management';
 import { LensPublicStart } from '@kbn/lens-plugin/public';
+import { ILicense } from '@kbn/licensing-plugin/public';
 import { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { MlPluginStart } from '@kbn/ml-plugin/public';
 import type { NavigationPublicPluginStart } from '@kbn/navigation-plugin/public';
@@ -84,6 +85,7 @@ export type EnterpriseSearchPublicStart = ReturnType<EnterpriseSearchPlugin['sta
 
 interface PluginsSetup {
   cloud?: CloudSetup;
+  licensing: LicensingPluginStart;
   home?: HomePublicPluginSetup;
   searchHomepage?: SearchHomepagePluginSetup;
   security?: SecurityPluginSetup;
@@ -186,6 +188,7 @@ const appSearchLinks: AppDeepLink[] = [
 
 export class EnterpriseSearchPlugin implements Plugin {
   private config: ClientConfigType;
+  private licenseSubscription: Subscription | null = null;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.config = initializerContext.config.get<ClientConfigType>();
@@ -261,7 +264,8 @@ export class EnterpriseSearchPlugin implements Plugin {
     if (!config.ui?.enabled) {
       return;
     }
-    const { cloud, share } = plugins;
+    const { cloud, share, licensing } = plugins;
+
     const useSearchHomepage =
       plugins.searchHomepage && plugins.searchHomepage.isHomepageFeatureEnabled();
 
@@ -445,29 +449,33 @@ export class EnterpriseSearchPlugin implements Plugin {
       title: ANALYTICS_PLUGIN.NAME,
     });
 
-    core.application.register({
-      appRoute: INFERENCE_ENDPOINTS_PLUGIN.URL,
-      category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
-      deepLinks: relevanceLinks,
-      euiIconType: INFERENCE_ENDPOINTS_PLUGIN.LOGO,
-      id: INFERENCE_ENDPOINTS_PLUGIN.ID,
-      mount: async (params: AppMountParameters) => {
-        const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
-        const { chrome, http } = kibanaDeps.core;
-        chrome.docTitle.change(INFERENCE_ENDPOINTS_PLUGIN.NAME);
-
-        await this.getInitialData(http);
-        const pluginData = this.getPluginData();
-
-        const { renderApp } = await import('./applications');
-        const { EnterpriseSearchRelevance } = await import(
-          './applications/enterprise_search_relevance'
-        );
-
-        return renderApp(EnterpriseSearchRelevance, kibanaDeps, pluginData);
-      },
-      title: INFERENCE_ENDPOINTS_PLUGIN.NAME,
-      visibleIn: [],
+    this.licenseSubscription = licensing?.license$.subscribe((license: ILicense) => {
+      if (license.isActive && license.hasAtLeast('enterprise')) {
+        core.application.register({
+          appRoute: INFERENCE_ENDPOINTS_PLUGIN.URL,
+          category: DEFAULT_APP_CATEGORIES.enterpriseSearch,
+          deepLinks: relevanceLinks,
+          euiIconType: INFERENCE_ENDPOINTS_PLUGIN.LOGO,
+          id: INFERENCE_ENDPOINTS_PLUGIN.ID,
+          mount: async (params: AppMountParameters) => {
+            const kibanaDeps = await this.getKibanaDeps(core, params, cloud);
+            const { chrome, http } = kibanaDeps.core;
+            chrome.docTitle.change(INFERENCE_ENDPOINTS_PLUGIN.NAME);
+
+            await this.getInitialData(http);
+            const pluginData = this.getPluginData();
+
+            const { renderApp } = await import('./applications');
+            const { EnterpriseSearchRelevance } = await import(
+              './applications/enterprise_search_relevance'
+            );
+
+            return renderApp(EnterpriseSearchRelevance, kibanaDeps, pluginData);
+          },
+          title: INFERENCE_ENDPOINTS_PLUGIN.NAME,
+          visibleIn: [],
+        });
+      }
     });
 
     core.application.register({
@@ -645,7 +653,9 @@ export class EnterpriseSearchPlugin implements Plugin {
     return {};
   }
 
-  public stop() {}
+  public stop() {
+    this.licenseSubscription?.unsubscribe();
+  }
 
   private updateSideNavDefinition = (items: Partial<DynamicSideNavItems>) => {
     this.sideNavDynamicItems$.next({ ...this.sideNavDynamicItems$.getValue(), ...items });
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.test.ts b/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.test.ts
index 9e017424a8f3d..9f1325f2c7a3d 100644
--- a/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.test.ts
@@ -9,15 +9,16 @@ import { mockLogger } from '../../__mocks__';
 
 import { MlTrainedModels } from '@kbn/ml-plugin/server';
 
-import { MlModelDeploymentState } from '../../../common/types/ml';
-
-import { fetchMlModels } from './fetch_ml_models';
 import {
   E5_LINUX_OPTIMIZED_MODEL_ID,
   E5_MODEL_ID,
   ELSER_LINUX_OPTIMIZED_MODEL_ID,
   ELSER_MODEL_ID,
-} from './utils';
+} from '@kbn/ml-trained-models-utils';
+
+import { MlModelDeploymentState } from '../../../common/types/ml';
+
+import { fetchMlModels } from './fetch_ml_models';
 
 describe('fetchMlModels', () => {
   const mockTrainedModelsProvider = {
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.ts b/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.ts
index 595c35b33755e..889b7bb1b89e1 100644
--- a/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/ml/fetch_ml_models.ts
@@ -11,6 +11,14 @@ import { Logger } from '@kbn/core/server';
 import { i18n } from '@kbn/i18n';
 import { MlTrainedModels } from '@kbn/ml-plugin/server';
 
+import {
+  E5_LINUX_OPTIMIZED_MODEL_ID,
+  E5_MODEL_ID,
+  ELSER_LINUX_OPTIMIZED_MODEL_ID,
+  ELSER_MODEL_ID,
+  LANG_IDENT_MODEL_ID,
+} from '@kbn/ml-trained-models-utils';
+
 import { getMlModelTypesForModelConfig } from '../../../common/ml_inference_pipeline';
 
 import { MlModelDeploymentState, MlModel } from '../../../common/types/ml';
@@ -18,15 +26,10 @@ import { MlModelDeploymentState, MlModel } from '../../../common/types/ml';
 import {
   BASE_MODEL,
   ELSER_LINUX_OPTIMIZED_MODEL_PLACEHOLDER,
-  ELSER_MODEL_ID,
   ELSER_MODEL_PLACEHOLDER,
   E5_LINUX_OPTIMIZED_MODEL_PLACEHOLDER,
-  E5_MODEL_ID,
   E5_MODEL_PLACEHOLDER,
-  LANG_IDENT_MODEL_ID,
   MODEL_TITLES_BY_TYPE,
-  E5_LINUX_OPTIMIZED_MODEL_ID,
-  ELSER_LINUX_OPTIMIZED_MODEL_ID,
 } from './utils';
 
 let compatibleElserModelId = ELSER_MODEL_ID;
diff --git a/x-pack/plugins/enterprise_search/server/lib/ml/utils.ts b/x-pack/plugins/enterprise_search/server/lib/ml/utils.ts
index d063fd158385a..20c9fe7ce0193 100644
--- a/x-pack/plugins/enterprise_search/server/lib/ml/utils.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/ml/utils.ts
@@ -8,13 +8,14 @@
 import { i18n } from '@kbn/i18n';
 import { SUPPORTED_PYTORCH_TASKS } from '@kbn/ml-trained-models-utils';
 
-import { MlModelDeploymentState, MlModel } from '../../../common/types/ml';
+import {
+  E5_LINUX_OPTIMIZED_MODEL_ID,
+  E5_MODEL_ID,
+  ELSER_LINUX_OPTIMIZED_MODEL_ID,
+  ELSER_MODEL_ID,
+} from '@kbn/ml-trained-models-utils';
 
-export const ELSER_MODEL_ID = '.elser_model_2';
-export const ELSER_LINUX_OPTIMIZED_MODEL_ID = '.elser_model_2_linux-x86_64';
-export const E5_MODEL_ID = '.multilingual-e5-small';
-export const E5_LINUX_OPTIMIZED_MODEL_ID = '.multilingual-e5-small_linux-x86_64';
-export const LANG_IDENT_MODEL_ID = 'lang_ident_model_1';
+import { MlModelDeploymentState, MlModel } from '../../../common/types/ml';
 
 export const MODEL_TITLES_BY_TYPE: Record<string, string | undefined> = {
   fill_mask: i18n.translate('xpack.enterpriseSearch.content.ml_inference.fill_mask', {
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index 24298c55fdffa..ee403e223305f 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -21,6 +21,7 @@ import { DataPluginStart } from '@kbn/data-plugin/server/plugin';
 import { PluginSetupContract as FeaturesPluginSetup } from '@kbn/features-plugin/server';
 import { GlobalSearchPluginSetup } from '@kbn/global-search-plugin/server';
 import type { GuidedOnboardingPluginSetup } from '@kbn/guided-onboarding-plugin/server';
+import type { LicensingPluginStart } from '@kbn/licensing-plugin/public';
 import { LogsSharedPluginSetup } from '@kbn/logs-shared-plugin/server';
 import type { MlPluginSetup } from '@kbn/ml-plugin/server';
 import { SearchConnectorsPluginSetup } from '@kbn/search-connectors-plugin/server';
@@ -95,6 +96,7 @@ interface PluginsSetup {
   guidedOnboarding?: GuidedOnboardingPluginSetup;
   logsShared: LogsSharedPluginSetup;
   ml?: MlPluginSetup;
+  licensing: LicensingPluginStart;
   searchConnectors?: SearchConnectorsPluginSetup;
   security: SecurityPluginSetup;
   usageCollection?: UsageCollectionSetup;
@@ -148,6 +150,7 @@ export class EnterpriseSearchPlugin implements Plugin {
       logsShared,
       customIntegrations,
       ml,
+      licensing,
       guidedOnboarding,
       cloud,
       searchConnectors,
@@ -262,6 +265,7 @@ export class EnterpriseSearchPlugin implements Plugin {
       log,
       enterpriseSearchRequestHandler,
       ml,
+      licensing,
     };
 
     registerConfigDataRoute(dependencies);
diff --git a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
index 6009c87fcde99..25e67c6857154 100644
--- a/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
+++ b/x-pack/plugins/event_log/server/es/cluster_client_adapter.ts
@@ -529,10 +529,11 @@ export function getQueryBodyWithAuthFilter(
     dslFilterQuery = queryFilter ? toElasticsearchQuery(queryFilter) : undefined;
   } catch (err) {
     logger.debug(
-      `esContext: Invalid kuery syntax for the filter (${filter}) error: ${JSON.stringify({
-        message: err.message,
-        statusCode: err.statusCode,
-      })}`
+      () =>
+        `esContext: Invalid kuery syntax for the filter (${filter}) error: ${JSON.stringify({
+          message: err.message,
+          statusCode: err.statusCode,
+        })}`
     );
     throw err;
   }
@@ -691,10 +692,11 @@ export function getQueryBody(
     dslFilterQuery = filterKueryNode ? toElasticsearchQuery(filterKueryNode) : undefined;
   } catch (err) {
     logger.debug(
-      `esContext: Invalid kuery syntax for the filter (${filter}) error: ${JSON.stringify({
-        message: err.message,
-        statusCode: err.statusCode,
-      })}`
+      () =>
+        `esContext: Invalid kuery syntax for the filter (${filter}) error: ${JSON.stringify({
+          message: err.message,
+          statusCode: err.statusCode,
+        })}`
     );
     throw err;
   }
diff --git a/x-pack/plugins/fleet/common/authz.ts b/x-pack/plugins/fleet/common/authz.ts
index 463ab7dc90c97..7399eb98a583b 100644
--- a/x-pack/plugins/fleet/common/authz.ts
+++ b/x-pack/plugins/fleet/common/authz.ts
@@ -144,8 +144,7 @@ export const calculateAuthz = ({
         // These are currently used by Fleet Server setup
         setup: fleet.all || fleet.setup,
         readEnrollmentTokens: (fleet.all || fleet.setup || fleet.agents?.all) ?? false,
-        readAgentPolicies:
-          (fleet.all || fleet.read || fleet.setup || fleet.agentPolicies?.read) ?? false,
+        readAgentPolicies: (fleet.all || fleet.setup) ?? false,
       };
 
   return {
diff --git a/x-pack/plugins/fleet/common/constants/locators.ts b/x-pack/plugins/fleet/common/constants/locators.ts
index daa00bcae46e0..cca0687a172d8 100644
--- a/x-pack/plugins/fleet/common/constants/locators.ts
+++ b/x-pack/plugins/fleet/common/constants/locators.ts
@@ -8,6 +8,7 @@
 export const LOCATORS_IDS = {
   APM_LOCATOR: 'APM_LOCATOR',
   DASHBOARD_APP: 'DASHBOARD_APP_LOCATOR',
+  DISCOVER_APP_LOCATOR: 'DISCOVER_APP_LOCATOR',
 } as const;
 
 // Dashboards ids
diff --git a/x-pack/plugins/fleet/common/constants/mappings.ts b/x-pack/plugins/fleet/common/constants/mappings.ts
index 4c45df62246d1..f804dc872e0d1 100644
--- a/x-pack/plugins/fleet/common/constants/mappings.ts
+++ b/x-pack/plugins/fleet/common/constants/mappings.ts
@@ -260,6 +260,9 @@ export const AGENT_MAPPINGS = {
         },
       },
     },
+    namespaces: {
+      type: 'keyword',
+    },
     packages: {
       type: 'keyword',
     },
@@ -290,6 +293,9 @@ export const AGENT_MAPPINGS = {
     unenrolled_reason: {
       type: 'keyword',
     },
+    unhealthy_reason: {
+      type: 'keyword',
+    },
     updated_at: {
       type: 'date',
     },
@@ -326,6 +332,9 @@ export const AGENT_MAPPINGS = {
             download_percent: {
               type: 'double',
             },
+            download_rate: {
+              type: 'double',
+            },
             failed_state: {
               type: 'keyword',
             },
@@ -337,6 +346,17 @@ export const AGENT_MAPPINGS = {
                 },
               },
             },
+            retry_error_msg: {
+              type: 'text',
+              fields: {
+                keyword: {
+                  type: 'keyword',
+                },
+              },
+            },
+            retry_until: {
+              type: 'date',
+            },
           },
         },
       },
diff --git a/x-pack/plugins/fleet/common/experimental_features.ts b/x-pack/plugins/fleet/common/experimental_features.ts
index 5e8679e555908..502d3b603f159 100644
--- a/x-pack/plugins/fleet/common/experimental_features.ts
+++ b/x-pack/plugins/fleet/common/experimental_features.ts
@@ -22,12 +22,12 @@ const _allowedExperimentalValues = {
   outputSecretsStorage: true,
   remoteESOutput: true,
   agentless: false,
-  enableStrictKQLValidation: false,
+  enableStrictKQLValidation: true,
   subfeaturePrivileges: false,
   enablePackagesStateMachine: true,
   advancedPolicySettings: true,
   useSpaceAwareness: false,
-  enableReusableIntegrationPolicies: false,
+  enableReusableIntegrationPolicies: true,
 };
 
 /**
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 06a8b979c8eb5..fda07095de95d 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -435,6 +435,7 @@ export enum RegistryVarsEntryKeys {
   os = 'os',
   secret = 'secret',
   hide_in_deployment_modes = 'hide_in_deployment_modes',
+  full_width = 'full_width',
 }
 
 // EPR types this as `[]map[string]interface{}`
@@ -457,6 +458,7 @@ export interface RegistryVarsEntry {
     };
   };
   [RegistryVarsEntryKeys.hide_in_deployment_modes]?: string[];
+  [RegistryVarsEntryKeys.full_width]?: boolean;
 }
 
 // Deprecated as part of the removing public references to saved object schemas
diff --git a/x-pack/plugins/fleet/cypress/e2e/package_policy_pipelines_and_mappings_real.cy.ts b/x-pack/plugins/fleet/cypress/e2e/package_policy_pipelines_and_mappings_real.cy.ts
index 0478c450ae5a2..269c848f998bf 100644
--- a/x-pack/plugins/fleet/cypress/e2e/package_policy_pipelines_and_mappings_real.cy.ts
+++ b/x-pack/plugins/fleet/cypress/e2e/package_policy_pipelines_and_mappings_real.cy.ts
@@ -82,8 +82,13 @@ describe('Input package create and edit package policy', () => {
 
     cy.getBySel(EXISTING_HOSTS_TAB).click();
 
-    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click().get(`#${agentPolicyId}`).click();
-    cy.wait(500); // wait for policy id to be set
+    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click();
+    cy.getBySel('agentPolicyMultiItem').each(($el) => {
+      if ($el.text() === agentPolicyName) {
+        $el.trigger('click');
+      }
+    });
+    cy.wait(1000); // wait for policy id to be set
     cy.getBySel(CREATE_PACKAGE_POLICY_SAVE_BTN).click();
 
     cy.getBySel(CONFIRM_MODAL.CANCEL_BUTTON).click();
@@ -150,8 +155,13 @@ describe('Integration package with custom dataset create and edit package policy
 
     cy.getBySel(EXISTING_HOSTS_TAB).click();
 
-    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click().get(`#${agentPolicyId}`).click();
-    cy.wait(500); // wait for policy id to be set
+    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click();
+    cy.getBySel('agentPolicyMultiItem').each(($el) => {
+      if ($el.text() === agentPolicyName) {
+        $el.trigger('click');
+      }
+    });
+    cy.wait(1000); // wait for policy id to be set
     cy.getBySel(CREATE_PACKAGE_POLICY_SAVE_BTN).click();
 
     cy.getBySel(CONFIRM_MODAL.CANCEL_BUTTON).click();
@@ -210,8 +220,13 @@ describe('Integration package with fixed dataset create and edit package policy'
 
     cy.getBySel(EXISTING_HOSTS_TAB).click();
 
-    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click().get(`#${agentPolicyId}`).click();
-    cy.wait(500); // wait for policy id to be set
+    cy.getBySel(POLICY_EDITOR.AGENT_POLICY_SELECT).click();
+    cy.getBySel('agentPolicyMultiItem').each(($el) => {
+      if ($el.text() === agentPolicyName) {
+        $el.trigger('click');
+      }
+    });
+    cy.wait(1000); // wait for policy id to be set
     cy.getBySel(CREATE_PACKAGE_POLICY_SAVE_BTN).click();
 
     cy.getBySel(CONFIRM_MODAL.CANCEL_BUTTON).click();
diff --git a/x-pack/plugins/fleet/cypress/screens/integrations.ts b/x-pack/plugins/fleet/cypress/screens/integrations.ts
index 7cc6aefdf89ec..1a31d2dc5de31 100644
--- a/x-pack/plugins/fleet/cypress/screens/integrations.ts
+++ b/x-pack/plugins/fleet/cypress/screens/integrations.ts
@@ -38,7 +38,7 @@ export const SETTINGS = {
 export const POLICY_EDITOR = {
   POLICY_NAME_INPUT: 'packagePolicyNameInput',
   DATASET_SELECT: 'datasetComboBox',
-  AGENT_POLICY_SELECT: 'agentPolicySelect',
+  AGENT_POLICY_SELECT: 'agentPolicyMultiSelect',
   INSPECT_PIPELINES_BTN: 'datastreamInspectPipelineBtn',
   EDIT_MAPPINGS_BTN: 'datastreamEditMappingsBtn',
   CREATE_MAPPINGS_BTN: 'datastreamAddCustomComponentTemplateBtn',
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.test.tsx
index d572a00ec2241..22f81b125015e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/components/search_bar.test.tsx
@@ -173,7 +173,7 @@ describe('SearchBar', () => {
 
 describe('getFieldSpecs', () => {
   it('returns fieldSpecs for Fleet agents', () => {
-    expect(getFieldSpecs(AGENTS_INDEX, AGENTS_PREFIX)).toHaveLength(67);
+    expect(getFieldSpecs(AGENTS_INDEX, AGENTS_PREFIX)).toHaveLength(73);
   });
 
   it('returns fieldSpecs for Fleet enrollment tokens', () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx
index a6bf030ad7fe0..322bbfbaa57e2 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_panel.test.tsx
@@ -359,10 +359,13 @@ describe('PackagePolicyInputPanel', () => {
   describe('When agentless is enabled', () => {
     beforeEach(() => {
       useAgentlessMock.mockReturnValue({
+        agentlessAPIUrl: 'https://agentless.api.url',
         isAgentlessEnabled: true,
         isAgentlessPackagePolicy: jest.fn(),
         isAgentlessAgentPolicy: jest.fn(),
         isAgentlessIntegration: jest.fn(),
+        isAgentlessCloudEnabled: true,
+        isAgentlessServerlessEnabled: false,
       });
     });
 
@@ -392,10 +395,13 @@ describe('PackagePolicyInputPanel', () => {
   describe('When agentless not enabled', () => {
     beforeEach(() => {
       useAgentlessMock.mockReturnValue({
+        agentlessAPIUrl: undefined,
         isAgentlessEnabled: false,
         isAgentlessPackagePolicy: jest.fn(),
         isAgentlessAgentPolicy: jest.fn(),
         isAgentlessIntegration: jest.fn(),
+        isAgentlessCloudEnabled: true,
+        isAgentlessServerlessEnabled: false,
       });
     });
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_var_field.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_var_field.tsx
index 114d973f32541..af0b2dbce2ff1 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_var_field.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/components/package_policy_input_var_field.tsx
@@ -185,7 +185,7 @@ function getInputComponent({
   fieldTestSelector,
   setIsDirty,
 }: InputComponentProps) {
-  const { multi, type, options } = varDef;
+  const { multi, type, options, full_width: fullWidth } = varDef;
   if (multi) {
     return (
       <MultiTextInput
@@ -208,6 +208,7 @@ function getInputComponent({
           onBlur={() => setIsDirty(true)}
           disabled={frozen}
           resize="vertical"
+          fullWidth={fullWidth}
           data-test-subj={`textAreaInput-${fieldTestSelector}`}
         />
       );
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.test.tsx
index 30688c7a99b11..237ab76465fdd 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.test.tsx
@@ -105,7 +105,7 @@ describe('step select agent policy', () => {
       const select = renderResult.container.querySelector('[data-test-subj="agentPolicySelect"]');
       expect((select as any)?.value).toEqual('');
 
-      expect(renderResult.getByText('An agent policy is required.')).toBeVisible();
+      expect(renderResult.getByText('At least one agent policy is required.')).toBeVisible();
     });
   });
 
@@ -178,7 +178,7 @@ describe('step select agent policy', () => {
         );
         expect((select as any)?.value).toEqual(undefined);
 
-        expect(renderResult.getByText('An agent policy is required.')).toBeVisible();
+        expect(renderResult.getByText('At least one agent policy is required.')).toBeVisible();
       });
     });
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.tsx
index 6238a2cc62a07..ecfd18ef9aac4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_agent_policy.tsx
@@ -101,6 +101,9 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
         updateAgentPolicies([]);
       }
     };
+    if (isLoading || selectedPolicyIds.length === 0) {
+      return;
+    }
     const agentPoliciesHaveAllSelectedIds = selectedPolicyIds.every((id) =>
       agentPolicies.map((policy) => policy.id).includes(id)
     );
@@ -110,7 +113,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
       setSelectedAgentPolicyError(undefined);
       updateAgentPolicies(agentPolicies.filter((policy) => selectedPolicyIds.includes(policy.id)));
     }
-  }, [selectedPolicyIds, agentPolicies, updateAgentPolicies]);
+  }, [selectedPolicyIds, agentPolicies, updateAgentPolicies, isLoading]);
 
   // Try to select default agent policy
   useEffect(() => {
@@ -192,7 +195,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
                 <h3>
                   <FormattedMessage
                     id="xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyFormGroupTitle"
-                    defaultMessage="Agent policy"
+                    defaultMessage="Agent policies"
                   />
                 </h3>
               </EuiTitle>
@@ -215,7 +218,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
                   <EuiFlexItem>
                     <FormattedMessage
                       id="xpack.fleet.createPackagePolicy.StepSelectPolicy.agentPolicyLabel"
-                      defaultMessage="Agent policy"
+                      defaultMessage="Agent policies"
                     />
                   </EuiFlexItem>
                 </EuiFlexGroup>
@@ -241,7 +244,7 @@ export const StepSelectAgentPolicy: React.FunctionComponent<{
                 selectedPolicyIds.length === 0 ? (
                   <FormattedMessage
                     id="xpack.fleet.createPackagePolicy.StepSelectPolicy.noPolicySelectedError"
-                    defaultMessage="An agent policy is required."
+                    defaultMessage="At least one agent policy is required."
                   />
                 ) : someNewAgentPoliciesHaveLimitedPackage ? (
                   <FormattedMessage
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_hosts.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_hosts.test.tsx
index 1ba7f56273dc6..7f302b6ce51ec 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_hosts.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/steps/step_select_hosts.test.tsx
@@ -175,7 +175,7 @@ describe('StepSelectHosts', () => {
     });
 
     waitFor(() => {
-      expect(renderResult.getByText('An agent policy is required.')).toBeInTheDocument();
+      expect(renderResult.getByText('At least one agent policy is required.')).toBeInTheDocument();
     });
   });
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.test.tsx
index 74dd8b52fbb3c..9283a8fa42c39 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/form.test.tsx
@@ -12,12 +12,14 @@ import type { TestRenderer } from '../../../../../../../mock';
 import { createFleetTestRendererMock } from '../../../../../../../mock';
 import type { PackageInfo } from '../../../../../types';
 
-import { sendGetPackagePolicies } from '../../../../../hooks';
+import { sendGetPackagePolicies, useConfig } from '../../../../../hooks';
 
 import { SelectedPolicyTab } from '../../components';
 
 import { useOnSubmit } from './form';
 
+type MockFn = jest.MockedFunction<any>;
+
 jest.mock('../../../../../hooks', () => {
   return {
     ...jest.requireActual('../../../../../hooks'),
@@ -31,6 +33,7 @@ jest.mock('../../../../../hooks', () => {
     sendGetStatus: jest
       .fn()
       .mockResolvedValue({ data: { isReady: true, missing_requirements: [] } }),
+    useConfig: jest.fn(),
   };
 });
 
@@ -86,6 +89,9 @@ describe('useOnSubmit', () => {
 
   beforeEach(() => {
     testRenderer = createFleetTestRendererMock();
+    (useConfig as MockFn).mockReturnValue({
+      agentless: undefined,
+    } as any);
   });
 
   describe('default API response', () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts
index 5099cdde2277c..0e1a3db041430 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.test.ts
@@ -9,20 +9,149 @@ import { renderHook, act } from '@testing-library/react-hooks';
 
 import { SetupTechnology } from '../../../../../../../../common/types';
 import { ExperimentalFeaturesService } from '../../../../../services';
-import { sendGetOneAgentPolicy, useStartServices } from '../../../../../hooks';
+import { sendGetOneAgentPolicy, useStartServices, useConfig } from '../../../../../hooks';
 import { SelectedPolicyTab } from '../../components';
+import { generateNewAgentPolicyWithDefaults } from '../../../../../../../../common/services/generate_new_agent_policy';
 
-import { useSetupTechnology } from './setup_technology';
+import { useAgentless, useSetupTechnology } from './setup_technology';
 
 jest.mock('../../../../../services');
 jest.mock('../../../../../hooks', () => ({
   ...jest.requireActual('../../../../../hooks'),
   sendGetOneAgentPolicy: jest.fn(),
   useStartServices: jest.fn(),
+  useConfig: jest.fn(),
 }));
+jest.mock('../../../../../../../../common/services/generate_new_agent_policy');
 
 type MockFn = jest.MockedFunction<any>;
 
+describe('useAgentless', () => {
+  const mockedExperimentalFeaturesService = jest.mocked(ExperimentalFeaturesService);
+
+  beforeEach(() => {
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      agentless: false,
+    } as any);
+    (useConfig as MockFn).mockReturnValue({
+      agentless: undefined,
+    } as any);
+    (useStartServices as MockFn).mockReturnValue({
+      cloud: {
+        isServerlessEnabled: false,
+        isCloudEnabled: false,
+      },
+    });
+    jest.clearAllMocks();
+  });
+
+  it('should should not return return isAgentless when agentless is not enabled', () => {
+    const { result } = renderHook(() => useAgentless());
+
+    expect(result.current.isAgentlessEnabled).toBeFalsy();
+    expect(result.current.agentlessAPIUrl).toBeFalsy();
+    expect(result.current.isAgentlessCloudEnabled).toBeFalsy();
+    expect(result.current.isAgentlessServerlessEnabled).toBeFalsy();
+  });
+  it('should should return agentlessAPIUrl when agentless config is set', () => {
+    const agentlessAPIUrl = 'https://agentless.api.url';
+    (useConfig as MockFn).mockReturnValue({
+      agentless: {
+        api: {
+          url: agentlessAPIUrl,
+        },
+      },
+    } as any);
+
+    const { result } = renderHook(() => useAgentless());
+
+    expect(result.current.agentlessAPIUrl).toBeTruthy();
+    expect(result.current.agentlessAPIUrl).toBe(agentlessAPIUrl);
+    expect(result.current.isAgentlessEnabled).toBeFalsy();
+    expect(result.current.isAgentlessCloudEnabled).toBeFalsy();
+    expect(result.current.isAgentlessServerlessEnabled).toBeFalsy();
+  });
+
+  it('should return isAgentlessEnabled as falsy if agentlessAPIUrl and experimental feature agentless is truthy without cloud or serverless', () => {
+    const agentlessAPIUrl = 'https://agentless.api.url';
+    (useConfig as MockFn).mockReturnValue({
+      agentless: {
+        api: {
+          url: agentlessAPIUrl,
+        },
+      },
+    } as any);
+
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      agentless: false,
+    } as any);
+
+    const { result } = renderHook(() => useAgentless());
+
+    expect(result.current.agentlessAPIUrl).toBeTruthy();
+    expect(result.current.isAgentlessEnabled).toBeFalsy();
+    expect(result.current.isAgentlessCloudEnabled).toBeFalsy();
+    expect(result.current.isAgentlessServerlessEnabled).toBeFalsy();
+  });
+
+  it('should return isAgentlessEnabled and isAgentlessCloudEnabled as truthy with isCloudEnabled', () => {
+    const agentlessAPIUrl = 'https://agentless.api.url';
+    (useConfig as MockFn).mockReturnValue({
+      agentless: {
+        api: {
+          url: agentlessAPIUrl,
+        },
+      },
+    } as any);
+
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      agentless: true,
+    } as any);
+
+    (useStartServices as MockFn).mockReturnValue({
+      cloud: {
+        isServerlessEnabled: false,
+        isCloudEnabled: true,
+      },
+    });
+
+    const { result } = renderHook(() => useAgentless());
+
+    expect(result.current.agentlessAPIUrl).toBeTruthy();
+    expect(result.current.isAgentlessEnabled).toBeTruthy();
+    expect(result.current.isAgentlessCloudEnabled).toBeTruthy();
+    expect(result.current.isAgentlessServerlessEnabled).toBeFalsy();
+  });
+  it('should return isAgentlessEnabled and isAgentlessServerlessEnabled as truthy with isServerlessEnabled', () => {
+    const agentlessAPIUrl = 'https://agentless.api.url';
+    (useConfig as MockFn).mockReturnValue({
+      agentless: {
+        api: {
+          url: agentlessAPIUrl,
+        },
+      },
+    } as any);
+
+    mockedExperimentalFeaturesService.get.mockReturnValue({
+      agentless: true,
+    } as any);
+
+    (useStartServices as MockFn).mockReturnValue({
+      cloud: {
+        isServerlessEnabled: true,
+        isCloudEnabled: false,
+      },
+    });
+
+    const { result } = renderHook(() => useAgentless());
+
+    expect(result.current.agentlessAPIUrl).toBeTruthy();
+    expect(result.current.isAgentlessEnabled).toBeTruthy();
+    expect(result.current.isAgentlessCloudEnabled).toBeFalsy();
+    expect(result.current.isAgentlessServerlessEnabled).toBeTruthy();
+  });
+});
+
 describe('useSetupTechnology', () => {
   const updateNewAgentPolicyMock = jest.fn();
   const updateAgentPoliciesMock = jest.fn();
@@ -30,6 +159,8 @@ describe('useSetupTechnology', () => {
   const newAgentPolicyMock = {
     name: 'mock_new_agent_policy',
     namespace: 'default',
+    is_managed: false,
+    supports_agentless: false,
   };
   const mockedExperimentalFeaturesService = jest.mocked(ExperimentalFeaturesService);
 
@@ -37,6 +168,9 @@ describe('useSetupTechnology', () => {
     mockedExperimentalFeaturesService.get.mockReturnValue({
       agentless: true,
     } as any);
+    (useConfig as MockFn).mockReturnValue({
+      agentless: undefined,
+    } as any);
     (sendGetOneAgentPolicy as MockFn).mockResolvedValue({
       data: {
         item: { id: 'agentless-policy-id' },
@@ -47,6 +181,11 @@ describe('useSetupTechnology', () => {
         isServerlessEnabled: true,
       },
     });
+
+    (generateNewAgentPolicyWithDefaults as MockFn).mockReturnValue({
+      name: 'mock_new_agentless_policy',
+      supports_agentless: true,
+    });
     jest.clearAllMocks();
   });
 
@@ -66,11 +205,10 @@ describe('useSetupTechnology', () => {
 
     expect(sendGetOneAgentPolicy).not.toHaveBeenCalled();
     expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENT_BASED);
-    expect(result.current.agentlessPolicy).toBeUndefined();
   });
 
-  it('should fetch agentless policy if agentless is enabled', async () => {
-    const { result, waitForNextUpdate } = renderHook(() =>
+  it('should fetch agentless policy if agentless feature is enabled and isServerless is true', async () => {
+    const { waitForNextUpdate } = renderHook(() =>
       useSetupTechnology({
         updateNewAgentPolicy: updateNewAgentPolicyMock,
         newAgentPolicy: newAgentPolicyMock,
@@ -81,7 +219,71 @@ describe('useSetupTechnology', () => {
 
     await waitForNextUpdate();
 
-    expect(result.current.agentlessPolicy).toEqual({ id: 'agentless-policy-id' });
+    expect(sendGetOneAgentPolicy).toHaveBeenCalled();
+  });
+
+  it('should create agentless policy if agentless feature is enabled and isCloud is true and agentless.api.url', async () => {
+    (useConfig as MockFn).mockReturnValue({
+      agentless: {
+        api: {
+          url: 'https://agentless.api.url',
+        },
+      },
+    } as any);
+    (useStartServices as MockFn).mockReturnValue({
+      cloud: {
+        // isServerlessEnabled: false,
+        isCloudEnabled: true,
+      },
+    });
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useSetupTechnology({
+        updateNewAgentPolicy: updateNewAgentPolicyMock,
+        newAgentPolicy: newAgentPolicyMock,
+        updateAgentPolicies: updateAgentPoliciesMock,
+        setSelectedPolicyTab: setSelectedPolicyTabMock,
+      })
+    );
+
+    expect(generateNewAgentPolicyWithDefaults).toHaveBeenCalled();
+
+    act(() => {
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENTLESS);
+    });
+    waitForNextUpdate();
+
+    expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENTLESS);
+    expect(updateNewAgentPolicyMock).toHaveBeenCalledWith({
+      name: 'mock_new_agentless_policy',
+      supports_agentless: true,
+    });
+  });
+
+  it('should not create agentless policy if agentless feature is enabled and isCloud is true and agentless.api.url is not defined', async () => {
+    (useConfig as MockFn).mockReturnValue({} as any);
+    (useStartServices as MockFn).mockReturnValue({
+      cloud: {
+        isCloudEnabled: true,
+      },
+    });
+
+    const { result, waitForNextUpdate } = renderHook(() =>
+      useSetupTechnology({
+        updateNewAgentPolicy: updateNewAgentPolicyMock,
+        newAgentPolicy: newAgentPolicyMock,
+        updateAgentPolicies: updateAgentPoliciesMock,
+        setSelectedPolicyTab: setSelectedPolicyTabMock,
+      })
+    );
+
+    expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENT_BASED);
+
+    act(() => {
+      result.current.handleSetupTechnologyChange(SetupTechnology.AGENT_BASED);
+    });
+
+    waitForNextUpdate();
+    expect(updateNewAgentPolicyMock).toHaveBeenCalledTimes(0);
   });
 
   it('should not fetch agentless policy if agentless is enabled but serverless is disabled', async () => {
@@ -102,7 +304,6 @@ describe('useSetupTechnology', () => {
 
     expect(sendGetOneAgentPolicy).not.toHaveBeenCalled();
     expect(result.current.selectedSetupTechnology).toBe(SetupTechnology.AGENT_BASED);
-    expect(result.current.agentlessPolicy).toBeUndefined();
   });
 
   it('should update agent policy and selected policy tab when setup technology is agentless', async () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts
index cc67adddeca19..47591102efdbd 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/hooks/setup_technology.ts
@@ -6,8 +6,11 @@
  */
 
 import { useCallback, useEffect, useState } from 'react';
+import { v4 as uuidv4 } from 'uuid';
 
+import { useConfig } from '../../../../../hooks';
 import { ExperimentalFeaturesService } from '../../../../../services';
+import { generateNewAgentPolicyWithDefaults } from '../../../../../../../../common/services/generate_new_agent_policy';
 import type {
   AgentPolicy,
   NewAgentPolicy,
@@ -20,11 +23,18 @@ import { SelectedPolicyTab } from '../../components';
 import { AGENTLESS_POLICY_ID } from '../../../../../../../../common/constants';
 
 export const useAgentless = () => {
+  const config = useConfig();
   const { agentless: agentlessExperimentalFeatureEnabled } = ExperimentalFeaturesService.get();
   const { cloud } = useStartServices();
   const isServerless = !!cloud?.isServerlessEnabled;
+  const isCloud = !!cloud?.isCloudEnabled;
+  const agentlessAPIUrl = config.agentless?.api.url;
 
-  const isAgentlessEnabled = agentlessExperimentalFeatureEnabled && isServerless;
+  const isAgentlessEnabled =
+    agentlessExperimentalFeatureEnabled && (isServerless || (isCloud && !!agentlessAPIUrl));
+
+  const isAgentlessCloudEnabled = isCloud && isAgentlessEnabled && !!agentlessAPIUrl;
+  const isAgentlessServerlessEnabled = isServerless && isAgentlessEnabled;
 
   const isAgentlessAgentPolicy = (agentPolicy: AgentPolicy | undefined) => {
     if (!agentPolicy) return false;
@@ -54,6 +64,9 @@ export const useAgentless = () => {
     return isAgentlessEnabled && packagePolicy.policy_ids.includes(AGENTLESS_POLICY_ID);
   };
   return {
+    agentlessAPIUrl,
+    isAgentlessCloudEnabled,
+    isAgentlessServerlessEnabled,
     isAgentlessEnabled,
     isAgentlessAgentPolicy,
     isAgentlessIntegration,
@@ -74,11 +87,24 @@ export function useSetupTechnology({
   setSelectedPolicyTab: (tab: SelectedPolicyTab) => void;
   packageInfo?: PackageInfo;
 }) {
-  const { isAgentlessEnabled, isAgentlessIntegration } = useAgentless();
+  const { cloud } = useStartServices();
+  const {
+    isAgentlessEnabled,
+    isAgentlessIntegration,
+    isAgentlessCloudEnabled,
+    isAgentlessServerlessEnabled,
+  } = useAgentless();
+  // this is a placeholder for the new agent-BASED policy that will be used when the user switches from agentless to agent-based and back
+  const [newAgentBasedPolicy] = useState<NewAgentPolicy | undefined>({ ...newAgentPolicy });
   const [selectedSetupTechnology, setSelectedSetupTechnology] = useState<SetupTechnology>(
     SetupTechnology.AGENT_BASED
   );
-  const [agentlessPolicy, setAgentlessPolicy] = useState<AgentPolicy | undefined>();
+  const [newAgentlessPolicy, setNewAgentlessPolicy] = useState<AgentPolicy | NewAgentPolicy>(
+    generateNewAgentPolicyWithDefaults({
+      name: `Agentless policy ${uuidv4()}`,
+      supports_agentless: true,
+    })
+  );
 
   useEffect(() => {
     if (isAgentlessEnabled && packageInfo && isAgentlessIntegration(packageInfo)) {
@@ -86,34 +112,50 @@ export function useSetupTechnology({
     }
   }, [isAgentlessEnabled, isAgentlessIntegration, packageInfo]);
 
+  // tech debt: remove this useEffect when Serverless uses the Agentless API
+  // https://github.com/elastic/security-team/issues/9781
   useEffect(() => {
     const fetchAgentlessPolicy = async () => {
       const { data, error } = await sendGetOneAgentPolicy(AGENTLESS_POLICY_ID);
       const isAgentlessAvailable = !error && data && data.item;
 
       if (isAgentlessAvailable) {
-        setAgentlessPolicy(data.item);
+        setNewAgentlessPolicy(data.item);
       }
     };
 
     if (isAgentlessEnabled) {
-      fetchAgentlessPolicy();
+      if (cloud?.isServerlessEnabled) {
+        fetchAgentlessPolicy();
+      }
     }
-  }, [isAgentlessEnabled]);
+  }, [isAgentlessEnabled, cloud]);
 
   const handleSetupTechnologyChange = useCallback(
-    (setupTechnology) => {
+    (setupTechnology: SetupTechnology) => {
       if (!isAgentlessEnabled || setupTechnology === selectedSetupTechnology) {
         return;
       }
 
       if (setupTechnology === SetupTechnology.AGENTLESS) {
-        if (agentlessPolicy) {
-          updateAgentPolicies([agentlessPolicy]);
+        if (isAgentlessCloudEnabled) {
+          updateNewAgentPolicy(newAgentlessPolicy as NewAgentPolicy);
+          setSelectedPolicyTab(SelectedPolicyTab.NEW);
+          updateAgentPolicies([newAgentlessPolicy] as AgentPolicy[]);
+        }
+        // tech debt: remove this when Serverless uses the Agentless API
+        // https://github.com/elastic/security-team/issues/9781
+        if (isAgentlessServerlessEnabled) {
+          updateNewAgentPolicy(newAgentlessPolicy as AgentPolicy);
+          updateAgentPolicies([newAgentlessPolicy] as AgentPolicy[]);
           setSelectedPolicyTab(SelectedPolicyTab.EXISTING);
         }
       } else if (setupTechnology === SetupTechnology.AGENT_BASED) {
-        updateNewAgentPolicy(newAgentPolicy);
+        updateNewAgentPolicy({
+          ...newAgentBasedPolicy,
+          supports_agentless: false,
+          is_managed: false,
+        } as NewAgentPolicy);
         setSelectedPolicyTab(SelectedPolicyTab.NEW);
         updateAgentPolicies([]);
       }
@@ -122,17 +164,18 @@ export function useSetupTechnology({
     [
       isAgentlessEnabled,
       selectedSetupTechnology,
-      agentlessPolicy,
-      updateAgentPolicies,
-      setSelectedPolicyTab,
+      isAgentlessCloudEnabled,
+      isAgentlessServerlessEnabled,
       updateNewAgentPolicy,
-      newAgentPolicy,
+      newAgentlessPolicy,
+      setSelectedPolicyTab,
+      updateAgentPolicies,
+      newAgentBasedPolicy,
     ]
   );
 
   return {
     handleSetupTechnologyChange,
-    agentlessPolicy,
     selectedSetupTechnology,
   };
 }
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
index 9b235df27b3c9..4109a66a59638 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.test.tsx
@@ -25,11 +25,15 @@ import {
   useStartServices,
   useGetAgentPolicies,
   useGetPackageInfoByKeyQuery,
+  useConfig,
 } from '../../../../hooks';
 
 jest.mock('../../../../hooks', () => {
   return {
     ...jest.requireActual('../../../../hooks'),
+    useConfig: jest.fn().mockReturnValue({
+      agents: { enabled: true },
+    }),
     useFleetStatus: jest.fn().mockReturnValue({ isReady: true } as any),
     sendGetStatus: jest
       .fn()
@@ -374,7 +378,6 @@ describe('When on the package policy create page', () => {
 
       expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalledWith({
         ...newPackagePolicy,
-        policy_id: 'agent-policy-1',
         policy_ids: ['agent-policy-1'],
         force: false,
       });
@@ -671,7 +674,7 @@ describe('When on the package policy create page', () => {
       });
     });
 
-    describe('With agentless policy available', () => {
+    describe('With agentless policy and Serverless available', () => {
       beforeEach(async () => {
         (useStartServices as jest.MockedFunction<any>).mockReturnValue({
           ...useStartServices(),
@@ -769,6 +772,60 @@ describe('When on the package policy create page', () => {
         expect(sendCreatePackagePolicy as jest.MockedFunction<any>).toHaveBeenCalled();
       });
     });
+
+    describe('With agentless Cloud available', () => {
+      beforeEach(async () => {
+        (useConfig as jest.MockedFunction<any>).mockReturnValue({
+          agentless: {
+            api: {
+              url: 'http://agentless-api-url',
+            },
+          },
+          agents: { enabled: true },
+        });
+        (useStartServices as jest.MockedFunction<any>).mockReturnValue({
+          ...useStartServices(),
+          cloud: {
+            ...useStartServices().cloud,
+            isServerlessEnabled: false,
+            isCloudEnabled: true,
+          },
+        });
+        (sendCreateAgentPolicy as jest.MockedFunction<any>).mockResolvedValue({
+          data: {
+            item: { id: 'agentless-policy-1', name: 'Agentless policy 1', namespace: 'default' },
+          },
+        });
+
+        (sendCreatePackagePolicy as jest.MockedFunction<any>).mockResolvedValue({
+          data: { item: { id: 'policy-1', inputs: [], policy_ids: ['agentless-policy-1'] } },
+        });
+        jest.spyOn(ExperimentalFeaturesService, 'get').mockReturnValue({ agentless: true } as any);
+        (useGetPackageInfoByKeyQuery as jest.Mock).mockReturnValue(
+          getMockPackageInfo({ requiresRoot: false, dataStreamRequiresRoot: false })
+        );
+
+        await act(async () => {
+          render();
+        });
+      });
+
+      test('should create create agent and package policy when in cloud and agentless API url is set', async () => {
+        await act(async () => {
+          fireEvent.click(renderResult.getByText(/Save and continue/).closest('button')!);
+        });
+
+        // tech debt: this should be converted to use MSW to mock the API calls
+        // https://github.com/elastic/security-team/issues/9816
+        expect(sendGetOneAgentPolicy).not.toHaveBeenCalled();
+        expect(sendCreateAgentPolicy).toHaveBeenCalled();
+        expect(sendCreatePackagePolicy).toHaveBeenCalled();
+
+        await waitFor(() => {
+          expect(renderResult.getByText('Nginx integration added')).toBeInTheDocument();
+        });
+      });
+    });
   });
 });
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
index 71b9278a6d549..9c24a9a87aecf 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/single_page_layout/index.tsx
@@ -81,6 +81,7 @@ import { PostInstallCloudFormationModal } from './components/cloud_security_post
 import { PostInstallGoogleCloudShellModal } from './components/cloud_security_posture/post_install_google_cloud_shell_modal';
 import { PostInstallAzureArmTemplateModal } from './components/cloud_security_posture/post_install_azure_arm_template_modal';
 import { RootPrivilegesCallout } from './root_callout';
+import { useAgentless } from './hooks/setup_technology';
 
 export const StepsWithLessPadding = styled(EuiSteps)`
   .euiStep__content {
@@ -341,15 +342,14 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
       "'package-policy-create' and 'package-policy-replace-define-step' cannot both be registered as UI extensions"
     );
   }
-
-  const { agentlessPolicy, handleSetupTechnologyChange, selectedSetupTechnology } =
-    useSetupTechnology({
-      newAgentPolicy,
-      updateNewAgentPolicy,
-      updateAgentPolicies,
-      setSelectedPolicyTab,
-      packageInfo,
-    });
+  const { isAgentlessEnabled } = useAgentless();
+  const { handleSetupTechnologyChange, selectedSetupTechnology } = useSetupTechnology({
+    newAgentPolicy,
+    updateNewAgentPolicy,
+    updateAgentPolicies,
+    setSelectedPolicyTab,
+    packageInfo,
+  });
 
   const replaceStepConfigurePackagePolicy =
     replaceDefineStepView && packageInfo?.name ? (
@@ -365,7 +365,7 @@ export const CreatePackagePolicySinglePage: CreatePackagePolicyParams = ({
             validationResults={validationResults}
             isEditPage={false}
             handleSetupTechnologyChange={handleSetupTechnologyChange}
-            agentlessPolicy={agentlessPolicy}
+            isAgentlessEnabled={isAgentlessEnabled}
           />
         </ExtensionWrapper>
       )
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
index e9bbde2520837..2cecdf37f30f5 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/components/package_policies/package_policies_table.tsx
@@ -113,7 +113,7 @@ export const PackagePoliciesTable: React.FunctionComponent<Props> = ({
         sortable: true,
         truncateText: true,
         name: i18n.translate('xpack.fleet.policyDetails.packagePoliciesTable.nameColumnTitle', {
-          defaultMessage: 'Name',
+          defaultMessage: 'Integration policy',
         }),
         render: (value: string, packagePolicy: InMemoryPackagePolicy) => (
           <EuiFlexGroup gutterSize="s" alignItems="center">
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index acaf623afa330..98096d02138f9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -144,6 +144,13 @@ export const EditPackagePolicyForm = memo<{
   const [isFirstLoad, setIsFirstLoad] = useState<boolean>(true);
   const [newAgentPolicyName, setNewAgentPolicyName] = useState<string | undefined>();
 
+  // make form dirty if new agent policy is selected
+  useEffect(() => {
+    if (newAgentPolicyName) {
+      setIsEdited(true);
+    }
+  }, [newAgentPolicyName, setIsEdited]);
+
   const [hasAgentPolicyError, setHasAgentPolicyError] = useState<boolean>(false);
 
   // Retrieve agent count
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
index 1bb7e1ee0ad00..437051f03398f 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_diagnostics/index.tsx
@@ -232,32 +232,39 @@ export const AgentDiagnosticsTab: React.FunctionComponent<AgentDiagnosticsProps>
         );
       },
     },
-    {
-      name: i18n.translate('xpack.fleet.requestDiagnostics.tableColumns.actionsLabelText', {
-        defaultMessage: 'Actions',
-      }),
-      width: '70px',
-      actions: [
-        {
-          type: 'icon',
-          icon: 'trash',
-          color: 'danger',
-          name: i18n.translate('xpack.fleet.requestDiagnostics.tableColumns.deleteButtonText', {
-            defaultMessage: 'Delete',
-          }),
-          available: (item: AgentDiagnostics) => item.status === 'READY',
-          description: i18n.translate(
-            'xpack.fleet.requestDiagnostics.tableColumns.deleteButtonDesc',
-            {
-              defaultMessage: 'Delete diagnostics file',
-            }
-          ),
-          onClick: (item: AgentDiagnostics) => {
-            deleteFile(item.id);
+    ...((authz.fleet.allAgents
+      ? [
+          {
+            name: i18n.translate('xpack.fleet.requestDiagnostics.tableColumns.actionsLabelText', {
+              defaultMessage: 'Actions',
+            }),
+            width: '70px',
+            actions: [
+              {
+                type: 'icon',
+                icon: 'trash',
+                color: 'danger',
+                name: i18n.translate(
+                  'xpack.fleet.requestDiagnostics.tableColumns.deleteButtonText',
+                  {
+                    defaultMessage: 'Delete',
+                  }
+                ),
+                available: (item: AgentDiagnostics) => item.status === 'READY',
+                description: i18n.translate(
+                  'xpack.fleet.requestDiagnostics.tableColumns.deleteButtonDesc',
+                  {
+                    defaultMessage: 'Delete diagnostics file',
+                  }
+                ),
+                onClick: (item: AgentDiagnostics) => {
+                  deleteFile(item.id);
+                },
+              },
+            ],
           },
-        },
-      ],
-    },
+        ]
+      : []) as Array<EuiBasicTableColumn<AgentDiagnostics>>),
   ];
 
   const requestDiagnosticsButton = (
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx
index 7824b8abd2a5c..78e32727212c9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.test.tsx
@@ -12,8 +12,6 @@ import { createFleetTestRendererMock } from '../../../../../../../mock';
 
 import { AgentLogsUI } from './agent_logs';
 
-jest.mock('../../../../../../../hooks/use_authz');
-
 jest.mock('@kbn/kibana-utils-plugin/public', () => {
   return {
     ...jest.requireActual('@kbn/kibana-utils-plugin/public'),
@@ -28,6 +26,13 @@ jest.mock('@kbn/logs-shared-plugin/public', () => {
     LogStream: () => <div />,
   };
 });
+jest.mock('@kbn/logs-shared-plugin/common', () => {
+  return {
+    getLogsLocatorsFromUrlService: jest.fn().mockReturnValue({
+      logsLocator: { getRedirectUrl: jest.fn(() => 'https://discover-redirect-url') },
+    }),
+  };
+});
 
 jest.mock('@kbn/shared-ux-link-redirect-app', () => {
   return {
@@ -52,6 +57,13 @@ jest.mock('../../../../../hooks', () => {
     ...jest.requireActual('../../../../../hooks'),
     useLink: jest.fn(),
     useStartServices: jest.fn(),
+    useAuthz: jest.fn(),
+    useDiscoverLocator: jest.fn().mockImplementation(() => {
+      return {
+        id: 'DISCOVER_APP_LOCATOR',
+        getRedirectUrl: jest.fn().mockResolvedValue('app/discover/logs/someview'),
+      };
+    }),
   };
 });
 
@@ -62,6 +74,7 @@ describe('AgentLogsUI', () => {
     jest.mocked(useAuthz).mockReturnValue({
       fleet: {
         allAgents: true,
+        readAgents: true,
       },
     } as any);
   });
@@ -100,34 +113,36 @@ describe('AgentLogsUI', () => {
           },
         },
       },
-      http: {
-        basePath: {
-          prepend: (url: string) => 'http://localhost:5620' + url,
+      share: {
+        url: {
+          locators: {
+            get: () => ({
+              useUrl: () => 'https://locator.url',
+            }),
+          },
         },
       },
-      cloud: {
-        isServerlessEnabled,
-      },
     });
   };
 
-  it('should render Open in Logs UI if capabilities not set', () => {
+  it('should render Open in Logs button if privileges are set', () => {
     mockStartServices();
     const result = renderComponent();
     expect(result.getByTestId('viewInLogsBtn')).toHaveAttribute(
       'href',
-      `http://localhost:5620/app/logs/stream?logPosition=(end%3A'2023-20-04T14%3A20%3A00.340Z'%2Cstart%3A'2023-20-04T14%3A00%3A00.340Z'%2CstreamLive%3A!f)&logFilter=(expression%3A'elastic_agent.id%3Aagent1%20and%20(data_stream.dataset%3Aelastic_agent)%20and%20(log.level%3Ainfo%20or%20log.level%3Aerror)'%2Ckind%3Akuery)`
+      `https://discover-redirect-url`
     );
   });
 
-  it('should render Open in Discover if serverless enabled', () => {
-    mockStartServices(true);
+  it('should not render Open in Logs button if privileges are not set', () => {
+    jest.mocked(useAuthz).mockReturnValue({
+      fleet: {
+        readAgents: false,
+      },
+    } as any);
+    mockStartServices();
     const result = renderComponent();
-    const viewInDiscover = result.getByTestId('viewInDiscoverBtn');
-    expect(viewInDiscover).toHaveAttribute(
-      'href',
-      `http://localhost:5620/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:'2023-20-04T14:00:00.340Z',to:'2023-20-04T14:20:00.340Z'))&_a=(columns:!(event.dataset,message),index:'logs-*',query:(language:kuery,query:'elastic_agent.id:agent1 and (data_stream.dataset:elastic_agent) and (log.level:info or log.level:error)'))`
-    );
+    expect(result.queryByTestId('viewInLogsBtn')).not.toBeInTheDocument();
   });
 
   it('should show log level dropdown with correct value', () => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
index 34cc206967d62..5a9bfecd22144 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/agent_logs.tsx
@@ -35,7 +35,7 @@ import { LogLevelFilter } from './filter_log_level';
 import { LogQueryBar } from './query_bar';
 import { buildQuery } from './build_query';
 import { SelectLogLevel } from './select_log_level';
-import { ViewLogsButton } from './view_logs_button';
+import { ViewLogsButton, getFormattedRange } from './view_logs_button';
 
 const WrapperFlexGroup = styled(EuiFlexGroup)`
   height: 100%;
@@ -112,9 +112,8 @@ const AgentPolicyLogsNotEnabledCallout: React.FunctionComponent<{ agentPolicy: A
 
 export const AgentLogsUI: React.FunctionComponent<AgentLogsProps> = memo(
   ({ agent, agentPolicy, state }) => {
-    const { data, application, cloud } = useStartServices();
+    const { data, application } = useStartServices();
     const { update: updateState } = AgentLogsUrlStateHelper.useTransitions();
-    const isLogsUIAvailable = !cloud?.isServerlessEnabled;
 
     // Util to convert date expressions (returned by datepicker) to timestamps (used by LogStream)
     const getDateRangeTimestamps = useCallback(
@@ -321,10 +320,9 @@ export const AgentLogsUI: React.FunctionComponent<AgentLogsProps> = memo(
                 }}
               >
                 <ViewLogsButton
-                  viewInLogs={isLogsUIAvailable}
                   logStreamQuery={logStreamQuery}
-                  startTime={state.start}
-                  endTime={state.end}
+                  startTime={getFormattedRange(state.start)}
+                  endTime={getFormattedRange(state.end)}
                 />
               </RedirectAppLinks>
             </EuiFlexItem>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/view_logs_button.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/view_logs_button.tsx
index 762c34ad7bc36..7b859596987c0 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/view_logs_button.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/view_logs_button.tsx
@@ -5,81 +5,61 @@
  * 2.0.
  */
 
-import url from 'url';
-import { stringify } from 'querystring';
-
 import React, { useMemo } from 'react';
-import { encode } from '@kbn/rison';
 import { EuiButton } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import { useStartServices } from '../../../../../hooks';
+import { getLogsLocatorsFromUrlService } from '@kbn/logs-shared-plugin/common';
+
+import moment from 'moment';
+
+import { useDiscoverLocator, useStartServices, useAuthz } from '../../../../../hooks';
 
 interface ViewLogsProps {
-  viewInLogs: boolean;
   logStreamQuery: string;
-  startTime: string;
-  endTime: string;
+  startTime: number;
+  endTime: number;
 }
 
+export const getFormattedRange = (date: string) => new Date(date).getTime();
+
 /*
-  Button that takes to the Logs view Ui when that is available, otherwise fallback to the Discover UI
-  The urls are built using same logStreamQuery (provided by a prop), startTime and endTime, ensuring that they'll both will target same log lines
+  Button that takes to the Logs view UI or the Discover logs, depending on what's available
+  If none is available, don't display the button at all
 */
 export const ViewLogsButton: React.FunctionComponent<ViewLogsProps> = ({
-  viewInLogs,
   logStreamQuery,
   startTime,
   endTime,
 }) => {
-  const { http } = useStartServices();
+  const discoverLocator = useDiscoverLocator();
 
-  // Generate URL to pass page state to Logs UI
-  const viewInLogsUrl = useMemo(
-    () =>
-      http.basePath.prepend(
-        url.format({
-          pathname: '/app/logs/stream',
-          search: stringify({
-            logPosition: encode({
-              start: startTime,
-              end: endTime,
-              streamLive: false,
-            }),
-            logFilter: encode({
-              expression: logStreamQuery,
-              kind: 'kuery',
-            }),
-          }),
-        })
-      ),
-    [http.basePath, startTime, endTime, logStreamQuery]
-  );
+  const { share } = useStartServices();
+  const { logsLocator } = getLogsLocatorsFromUrlService(share.url);
+  const authz = useAuthz();
 
-  const viewInDiscoverUrl = useMemo(() => {
-    const index = 'logs-*';
-    const query = encode({
-      query: logStreamQuery,
-      language: 'kuery',
+  const logsUrl = useMemo(() => {
+    const now = moment().toISOString();
+    const oneDayAgo = moment().subtract(1, 'day').toISOString();
+    const defaultStartTime = getFormattedRange(oneDayAgo);
+    const defaultEndTime = getFormattedRange(now);
+
+    return logsLocator.getRedirectUrl({
+      time: endTime ? endTime : defaultEndTime,
+      timeRange: {
+        startTime: startTime ? startTime : defaultStartTime,
+        endTime: endTime ? endTime : defaultEndTime,
+      },
+      filter: logStreamQuery,
     });
-    return http.basePath.prepend(
-      `/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:'${startTime}',to:'${endTime}'))&_a=(columns:!(event.dataset,message),index:'${index}',query:${query})`
-    );
-  }, [logStreamQuery, http.basePath, startTime, endTime]);
+  }, [endTime, logStreamQuery, logsLocator, startTime]);
 
-  return viewInLogs ? (
-    <EuiButton href={viewInLogsUrl} iconType="popout" data-test-subj="viewInLogsBtn">
+  return authz.fleet.readAgents && (logsLocator || discoverLocator) ? (
+    <EuiButton href={logsUrl} iconType="popout" data-test-subj="viewInLogsBtn">
       <FormattedMessage
         id="xpack.fleet.agentLogs.openInLogsUiLinkText"
         defaultMessage="Open in Logs"
       />
     </EuiButton>
-  ) : (
-    <EuiButton href={viewInDiscoverUrl} iconType="popout" data-test-subj="viewInDiscoverBtn">
-      <FormattedMessage
-        id="xpack.fleet.agentLogs.openInDiscoverUiLinkText"
-        defaultMessage="Open in Discover"
-      />
-    </EuiButton>
-  );
+  ) : null;
 };
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_flyout/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_flyout/index.test.tsx
index 433cd687208fc..c649b3829a41e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_flyout/index.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/agent_activity_flyout/index.test.tsx
@@ -11,7 +11,7 @@ import { act, render, fireEvent } from '@testing-library/react';
 import { IntlProvider } from 'react-intl';
 
 import { useActionStatus } from '../../hooks';
-import { useGetAgentPolicies, useStartServices } from '../../../../../hooks';
+import { useGetAgentPolicies, useStartServices, useAuthz } from '../../../../../hooks';
 
 import { AgentActivityFlyout } from '.';
 
@@ -25,6 +25,15 @@ jest.mock('@kbn/shared-ux-link-redirect-app', () => ({
 const mockUseActionStatus = useActionStatus as jest.Mock;
 const mockUseGetAgentPolicies = useGetAgentPolicies as jest.Mock;
 const mockUseStartServices = useStartServices as jest.Mock;
+const mockedUseAuthz = useAuthz as jest.Mock;
+
+jest.mock('@kbn/logs-shared-plugin/common', () => {
+  return {
+    getLogsLocatorsFromUrlService: jest.fn().mockReturnValue({
+      logsLocator: { getRedirectUrl: jest.fn(() => 'https://discover-redirect-url') },
+    }),
+  };
+});
 
 describe('AgentActivityFlyout', () => {
   const mockOnClose = jest.fn();
@@ -65,7 +74,22 @@ describe('AgentActivityFlyout', () => {
       docLinks: { links: { fleet: { upgradeElasticAgent: 'https://elastic.co' } } },
       application: { navigateToUrl: jest.fn() },
       http: { basePath: { prepend: jest.fn() } },
+      share: {
+        url: {
+          locators: {
+            get: () => ({
+              useUrl: () => 'https://locator.url',
+            }),
+          },
+        },
+      },
     });
+    mockedUseAuthz.mockReturnValue({
+      fleet: {
+        readAgents: true,
+        allAgents: true,
+      },
+    } as any);
   });
 
   beforeEach(() => {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.test.tsx
index b5018f812da4e..e8f73eae3a2b9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.test.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.test.tsx
@@ -12,7 +12,7 @@ import { I18nProvider } from '@kbn/i18n-react';
 
 import type { ActionStatus } from '../../../../../../../common/types';
 
-import { useStartServices } from '../../../../hooks';
+import { useStartServices, useAuthz } from '../../../../hooks';
 
 import { ViewErrors } from './view_errors';
 
@@ -21,6 +21,13 @@ jest.mock('../../../../hooks', () => {
     ...jest.requireActual('../../../../hooks'),
     useLink: jest.fn(),
     useStartServices: jest.fn(),
+    useAuthz: jest.fn(),
+    useDiscoverLocator: jest.fn().mockImplementation(() => {
+      return {
+        id: 'DISCOVER_APP_LOCATOR',
+        getRedirectUrl: jest.fn().mockResolvedValue('app/discover/logs/someview'),
+      };
+    }),
   };
 });
 
@@ -32,6 +39,14 @@ jest.mock('@kbn/shared-ux-link-redirect-app', () => ({
   },
 }));
 
+jest.mock('@kbn/logs-shared-plugin/common', () => {
+  return {
+    getLogsLocatorsFromUrlService: jest.fn().mockReturnValue({
+      logsLocator: { getRedirectUrl: jest.fn(() => 'https://discover-redirect-url') },
+    }),
+  };
+});
+
 const mockStartServices = (isServerlessEnabled?: boolean) => {
   mockUseStartServices.mockReturnValue({
     application: {},
@@ -47,18 +62,27 @@ const mockStartServices = (isServerlessEnabled?: boolean) => {
         },
       },
     },
-    http: {
-      basePath: {
-        prepend: (url: string) => 'http://localhost:5620' + url,
+    share: {
+      url: {
+        locators: {
+          get: () => ({
+            useUrl: () => 'https://locator.url',
+          }),
+        },
       },
     },
-    cloud: {
-      isServerlessEnabled,
-    },
   });
 };
 
 describe('ViewErrors', () => {
+  beforeEach(() => {
+    jest.mocked(useAuthz).mockReturnValue({
+      fleet: {
+        allAgents: true,
+        readAgents: true,
+      },
+    } as any);
+  });
   const renderComponent = (action: ActionStatus) => {
     return render(
       <I18nProvider>
@@ -67,7 +91,7 @@ describe('ViewErrors', () => {
     );
   };
 
-  it('should render error message with btn to Logs view if serverless not enabled', () => {
+  it('should render error message with btn to Logs view', () => {
     mockStartServices();
     const result = renderComponent({
       actionId: 'action1',
@@ -82,15 +106,32 @@ describe('ViewErrors', () => {
 
     const errorText = result.getByTestId('errorText');
     expect(errorText.textContent).toEqual('Agent agent1 is not upgradeable');
+  });
+
+  it('should render open in Logs button if correct privileges are set', () => {
+    mockStartServices();
+    const result = renderComponent({
+      actionId: 'action1',
+      latestErrors: [
+        {
+          agentId: 'agent1',
+          error: 'Agent agent1 is not upgradeable',
+          timestamp: '2023-03-06T14:51:24.709Z',
+        },
+      ],
+    } as any);
 
     const viewErrorBtn = result.getByTestId('viewInLogsBtn');
-    expect(viewErrorBtn.getAttribute('href')).toEqual(
-      `http://localhost:5620/app/logs/stream?logPosition=(end%3A'2023-03-06T14%3A56%3A24.709Z'%2Cstart%3A'2023-03-06T14%3A46%3A24.709Z'%2CstreamLive%3A!f)&logFilter=(expression%3A'elastic_agent.id%3Aagent1%20and%20(data_stream.dataset%3Aelastic_agent)%20and%20(log.level%3Aerror)'%2Ckind%3Akuery)`
-    );
+    expect(viewErrorBtn.getAttribute('href')).toEqual(`https://discover-redirect-url`);
   });
 
-  it('should render error message with btn to Discover view if serverless enabled', () => {
-    mockStartServices(true);
+  it('should not render open in Logs button if privileges are not set', () => {
+    jest.mocked(useAuthz).mockReturnValue({
+      fleet: {
+        readAgents: false,
+      },
+    } as any);
+    mockStartServices();
     const result = renderComponent({
       actionId: 'action1',
       latestErrors: [
@@ -102,12 +143,6 @@ describe('ViewErrors', () => {
       ],
     } as any);
 
-    const errorText = result.getByTestId('errorText');
-    expect(errorText.textContent).toEqual('Agent agent1 is not upgradeable');
-
-    const viewErrorBtn = result.getByTestId('viewInDiscoverBtn');
-    expect(viewErrorBtn.getAttribute('href')).toEqual(
-      `http://localhost:5620/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:'2023-03-06T14:46:24.709Z',to:'2023-03-06T14:56:24.709Z'))&_a=(columns:!(event.dataset,message),index:'logs-*',query:(language:kuery,query:'elastic_agent.id:agent1 and (data_stream.dataset:elastic_agent) and (log.level:error)'))`
-    );
+    expect(result.queryByTestId('viewInLogsBtn')).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.tsx
index 4d43c9a60a618..e73d7778d1405 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_list_page/components/view_errors.tsx
@@ -17,7 +17,10 @@ import { i18n } from '@kbn/i18n';
 import type { ActionErrorResult } from '../../../../../../../common/types';
 
 import { buildQuery } from '../../agent_details_page/components/agent_logs/build_query';
-import { ViewLogsButton } from '../../agent_details_page/components/agent_logs/view_logs_button';
+import {
+  ViewLogsButton,
+  getFormattedRange,
+} from '../../agent_details_page/components/agent_logs/view_logs_button';
 
 import type { ActionStatus } from '../../../../types';
 import { useStartServices } from '../../../../hooks';
@@ -30,11 +33,12 @@ const TruncatedEuiText = styled(EuiText)`
 
 export const ViewErrors: React.FunctionComponent<{ action: ActionStatus }> = ({ action }) => {
   const coreStart = useStartServices();
-  const isLogsUIAvailable = !coreStart.cloud?.isServerlessEnabled;
 
-  const getLogsButton = (agentId: string, timestamp: string, viewInLogs: boolean) => {
-    const startTime = moment(timestamp).subtract(5, 'm').toISOString();
-    const endTime = moment(timestamp).add(5, 'm').toISOString();
+  const getLogsButton = (agentId: string, timestamp: string) => {
+    const start = moment(timestamp).subtract(5, 'm').toISOString();
+    const end = moment(timestamp).add(5, 'm').toISOString();
+    const startTime = getFormattedRange(start);
+    const endTime = getFormattedRange(end);
 
     const logStreamQuery = buildQuery({
       agentId,
@@ -43,12 +47,7 @@ export const ViewErrors: React.FunctionComponent<{ action: ActionStatus }> = ({
       userQuery: '',
     });
     return (
-      <ViewLogsButton
-        viewInLogs={viewInLogs}
-        logStreamQuery={logStreamQuery}
-        startTime={startTime}
-        endTime={endTime}
-      />
+      <ViewLogsButton logStreamQuery={logStreamQuery} startTime={startTime} endTime={endTime} />
     );
   };
 
@@ -86,7 +85,7 @@ export const ViewErrors: React.FunctionComponent<{ action: ActionStatus }> = ({
         const errorItem = (action.latestErrors ?? []).find((item) => item.agentId === agentId);
         return (
           <RedirectAppLinks coreStart={coreStart}>
-            {getLogsButton(agentId, errorItem!.timestamp, !!isLogsUIAvailable)}
+            {getLogsButton(agentId, errorItem!.timestamp)}
           </RedirectAppLinks>
         );
       },
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
index 3a21103503ae5..a9adc6140c7c5 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
@@ -128,6 +128,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
       const agentPolicy = agentPoliciesById[enrollmentKey.policy_id];
       return !agentPolicy?.is_managed;
     }) || [];
+  const filteredTotal = rowItems.length;
 
   const columns = [
     {
@@ -294,7 +295,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
         pagination={{
           pageIndex: pagination.currentPage - 1,
           pageSize: pagination.pageSize,
-          totalItemCount: total,
+          totalItemCount: filteredTotal,
           pageSizeOptions,
         }}
         onChange={({ page }: { page: { index: number; size: number } }) => {
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
index 9f1d716f6f396..4261d32b6b4b5 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/integration_preference.tsx
@@ -23,7 +23,7 @@ import {
   EuiSwitch,
 } from '@elastic/eui';
 
-import { usePutSettingsMutation, useStartServices } from '../../../hooks';
+import { usePutSettingsMutation, useStartServices, useAuthz } from '../../../hooks';
 
 export type IntegrationPreferenceType = 'recommended' | 'beats' | 'agent';
 
@@ -92,7 +92,7 @@ export const IntegrationPreference = ({
   const [prereleaseIntegrationsChecked, setPrereleaseIntegrationsChecked] = React.useState<
     boolean | undefined
   >(undefined);
-
+  const authz = useAuthz();
   const { docLinks, notifications } = useStartServices();
 
   const { mutateAsync: mutateSettingsAsync } = usePutSettingsMutation();
@@ -153,18 +153,24 @@ export const IntegrationPreference = ({
     updateSettings(event.target.checked);
   };
 
+  const canUpdateBetaSetting = authz.fleet.allSettings;
+
   return (
     <EuiPanel hasShadow={false} paddingSize="none">
-      <EuiSwitchNoWrap
-        label="Display beta integrations"
-        checked={
-          typeof prereleaseIntegrationsChecked !== 'undefined'
-            ? prereleaseIntegrationsChecked
-            : prereleaseIntegrationsEnabled
-        }
-        onChange={onPrereleaseSwitchChange}
-      />
-      <EuiSpacer size="l" />
+      {canUpdateBetaSetting && (
+        <>
+          <EuiSwitchNoWrap
+            label="Display beta integrations"
+            checked={
+              typeof prereleaseIntegrationsChecked !== 'undefined'
+                ? prereleaseIntegrationsChecked
+                : prereleaseIntegrationsEnabled
+            }
+            onChange={onPrereleaseSwitchChange}
+          />
+          <EuiSpacer size="l" />
+        </>
+      )}
       <EuiText size="s">{title}</EuiText>
       <EuiSpacer size="m" />
       <EuiForm>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.test.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.test.tsx
new file mode 100644
index 0000000000000..a1de54ae5f9fc
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.test.tsx
@@ -0,0 +1,143 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { createIntegrationsTestRendererMock } from '../../../../../../../mock';
+import { isPackagePrerelease } from '../../../../../../../../common/services';
+import { useGetInputsTemplatesQuery } from '../../../../../hooks';
+import type { PackageInfo } from '../../../../../types';
+
+import { Configs } from '.';
+
+jest.mock('../../../../../hooks', () => {
+  return {
+    ...jest.requireActual('../../../../../hooks'),
+    useGetInputsTemplatesQuery: jest.fn(),
+    useConfirmForceInstall: jest.fn(),
+    useStartServices: jest.fn().mockReturnValue({
+      notifications: {
+        toasts: {
+          addError: jest.fn(),
+          addSuccess: jest.fn(),
+        },
+      },
+      docLinks: {
+        links: {
+          fleet: {},
+        },
+      },
+    }),
+  };
+});
+jest.mock('../../../../../../../../common/services');
+
+const mockIsPackagePrerelease = isPackagePrerelease as jest.Mock;
+
+function renderComponent(packageInfo: PackageInfo) {
+  const renderer = createIntegrationsTestRendererMock();
+
+  return renderer.render(<Configs packageInfo={packageInfo} />);
+}
+
+describe('Configs', () => {
+  beforeEach(() => {
+    mockIsPackagePrerelease.mockReset();
+    (useGetInputsTemplatesQuery as jest.Mock).mockReset();
+  });
+
+  const packageInfo = {
+    name: 'nginx',
+    title: 'Nginx',
+    version: '1.3.0',
+    release: 'ga',
+    description: 'Collect logs and metrics from Nginx HTTP servers with Elastic Agent.',
+    format_version: '',
+    owner: { github: '' },
+    assets: {} as any,
+    policy_templates: [
+      {
+        name: 'nginx',
+        title: 'Nginx logs and metrics',
+        description: 'Collect logs and metrics from Nginx instances',
+        inputs: [
+          {
+            type: 'logfile',
+            title: 'Collect logs from Nginx instances',
+            description: 'Collecting Nginx access and error logs',
+          },
+        ],
+        multiple: true,
+      },
+    ],
+    data_streams: [
+      {
+        type: 'logs',
+        dataset: 'nginx.access',
+        title: 'Nginx access logs',
+        release: 'experimental',
+        ingest_pipeline: 'default',
+        streams: [
+          {
+            input: 'logfile',
+            vars: [
+              {
+                name: 'paths',
+                type: 'text',
+                title: 'Paths',
+                multi: true,
+                required: true,
+                show_user: true,
+                default: ['/var/log/nginx/access.log*'],
+              },
+            ],
+            template_path: 'stream.yml.hbs',
+            title: 'Nginx access logs',
+            description: 'Collect Nginx access logs',
+            enabled: true,
+          },
+        ],
+        package: 'nginx',
+        path: 'access',
+      },
+    ],
+    latestVersion: '1.3.0',
+    keepPoliciesUpToDate: false,
+    status: 'not_installed',
+  } as PackageInfo;
+
+  it('it should display configs tab and a warning if the integration is not installed', () => {
+    mockIsPackagePrerelease.mockReturnValue(false);
+    (useGetInputsTemplatesQuery as jest.Mock).mockReturnValue({ data: 'yaml configs' });
+
+    const result = renderComponent(packageInfo);
+    expect(result.queryByTestId('configsTab.notInstalled')).toBeInTheDocument();
+    expect(result.queryByTestId('configsTab.info')).toBeInTheDocument();
+    expect(result.queryByTestId('configsTab.codeblock')?.textContent).toContain('yaml configs');
+    expect(result.queryByTestId('prereleaseCallout')).not.toBeInTheDocument();
+  });
+
+  it('it should display prerelease callout if the package is prerelease', () => {
+    mockIsPackagePrerelease.mockReturnValue(true);
+    (useGetInputsTemplatesQuery as jest.Mock).mockReturnValue({ data: 'yaml configs' });
+
+    const result = renderComponent(packageInfo);
+    expect(result.queryByTestId('configsTab.info')).toBeInTheDocument();
+    expect(result.queryByTestId('prereleaseCallout')).toBeInTheDocument();
+    expect(result.queryByTestId('configsTab.codeblock')).toBeInTheDocument();
+  });
+
+  it('it should display a warning callout if there is an error', () => {
+    mockIsPackagePrerelease.mockReturnValue(false);
+    (useGetInputsTemplatesQuery as jest.Mock).mockReturnValue({ error: 'some error' });
+
+    const result = renderComponent(packageInfo);
+    expect(result.queryByTestId('configsTab.errorCallout')).toBeInTheDocument();
+    expect(result.queryByTestId('configsTab.codeblock')).not.toBeInTheDocument();
+    expect(result.queryByTestId('configsTab.info')).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.tsx
index 0167c337d7ddf..e80665631f3ea 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/configs/index.tsx
@@ -17,7 +17,6 @@ import {
   EuiCode,
 } from '@elastic/eui';
 
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
 import type { PackageInfo } from '../../../../../types';
@@ -33,7 +32,7 @@ interface ConfigsProps {
 }
 
 export const Configs: React.FC<ConfigsProps> = ({ packageInfo }) => {
-  const { notifications, docLinks } = useStartServices();
+  const { docLinks } = useStartServices();
   const { name: pkgName, version: pkgVersion, title: pkgTitle } = packageInfo;
   const notInstalled = packageInfo.status !== 'installing';
 
@@ -47,78 +46,100 @@ export const Configs: React.FC<ConfigsProps> = ({ packageInfo }) => {
     { format: 'yaml', prerelease: isPrerelease }
   );
 
-  if (error) {
-    notifications.toasts.addError(error, {
-      title: i18n.translate('xpack.fleet.epm.InputTemplates.loadingErro', {
-        defaultMessage: 'Error input templates',
-      }),
-    });
-  }
-
   return (
     <EuiFlexGroup data-test-subj="epm.Configs" alignItems="flexStart">
       <SideBarColumn grow={1} />
-      <EuiFlexItem grow={7}>
-        {isLoading && !configs ? (
-          <EuiSkeletonText lines={10} />
-        ) : (
-          <>
-            {isPrerelease && (
-              <>
-                <EuiSpacer size="s" />
-                <PrereleaseCallout
-                  packageName={packageInfo.name}
-                  packageTitle={packageInfo.title}
-                />
-              </>
-            )}
-            <EuiText>
-              <p>
-                <FormattedMessage
-                  id="xpack.fleet.epm.InputTemplates.mainText"
-                  defaultMessage="View sample configurations for each of the {name} integration's data streams below. Copy/paste this YML into your {elasticAgentYml} file or into a file within your {inputsDir} directory. For more information, see the {userGuideLink}"
-                  values={{
-                    name: pkgTitle,
-                    elasticAgentYml: <EuiCode>elastic-agent.yml</EuiCode>,
-                    inputsDir: <EuiCode>inputs.d</EuiCode>,
-                    userGuideLink: (
-                      <EuiLink
-                        href={docLinks.links.fleet.elasticAgentInputConfiguration}
-                        external
-                        target="_blank"
-                      >
-                        <FormattedMessage
-                          id="xpack.fleet.epm.InputTemplates.guideLink"
-                          defaultMessage="Fleet and Elastic Agent Guide"
-                        />
-                      </EuiLink>
-                    ),
-                  }}
-                />
-              </p>
-            </EuiText>
-            {notInstalled && (
-              <>
-                <EuiSpacer size="s" />
-                <EuiCallOut
-                  title={
-                    <FormattedMessage
-                      id="xpack.fleet.epm.InputTemplates.installCallout"
-                      defaultMessage="Install the integration to use the following configs."
-                    />
-                  }
-                  color="warning"
-                  iconType="warning"
-                />
-              </>
-            )}
-            <EuiSpacer size="s" />
-            <EuiCodeBlock language="yaml" isCopyable={true} paddingSize="s" overflowHeight={1000}>
-              {configs}
-            </EuiCodeBlock>
-          </>
-        )}
-      </EuiFlexItem>
+      {error ? (
+        <EuiFlexItem grow={7}>
+          <EuiCallOut
+            data-test-subj="configsTab.errorCallout"
+            title={
+              <FormattedMessage
+                id="xpack.fleet.epm.InputTemplates.errorTitle"
+                defaultMessage="Unsupported"
+              />
+            }
+            color="warning"
+            iconType="alert"
+          >
+            <p>
+              <FormattedMessage
+                id="xpack.fleet.epm.InputTemplates.error"
+                defaultMessage="This integration doesn't support automatic generation of sample configurations."
+              />
+            </p>
+          </EuiCallOut>
+        </EuiFlexItem>
+      ) : (
+        <EuiFlexItem grow={7}>
+          {isLoading && !configs ? (
+            <EuiSkeletonText lines={10} />
+          ) : (
+            <>
+              {isPrerelease && (
+                <>
+                  <EuiSpacer size="s" />
+                  <PrereleaseCallout
+                    packageName={packageInfo.name}
+                    packageTitle={packageInfo.title}
+                  />
+                </>
+              )}
+              <EuiText>
+                <p data-test-subj="configsTab.info">
+                  <FormattedMessage
+                    id="xpack.fleet.epm.InputTemplates.mainText"
+                    defaultMessage="View sample configurations for each of the {name} integration's data streams below. Copy/paste this YML into your {elasticAgentYml} file or into a file within your {inputsDir} directory. For more information, see the {userGuideLink}"
+                    values={{
+                      name: pkgTitle,
+                      elasticAgentYml: <EuiCode>elastic-agent.yml</EuiCode>,
+                      inputsDir: <EuiCode>inputs.d</EuiCode>,
+                      userGuideLink: (
+                        <EuiLink
+                          href={docLinks.links.fleet.elasticAgentInputConfiguration}
+                          external
+                          target="_blank"
+                        >
+                          <FormattedMessage
+                            id="xpack.fleet.epm.InputTemplates.guideLink"
+                            defaultMessage="Fleet and Elastic Agent Guide"
+                          />
+                        </EuiLink>
+                      ),
+                    }}
+                  />
+                </p>
+              </EuiText>
+              {notInstalled && (
+                <>
+                  <EuiSpacer size="s" />
+                  <EuiCallOut
+                    data-test-subj="configsTab.notInstalled"
+                    title={
+                      <FormattedMessage
+                        id="xpack.fleet.epm.InputTemplates.installCallout"
+                        defaultMessage="Install the integration to use the following configs."
+                      />
+                    }
+                    color="warning"
+                    iconType="warning"
+                  />
+                </>
+              )}
+              <EuiSpacer size="s" />
+              <EuiCodeBlock
+                language="yaml"
+                isCopyable={true}
+                paddingSize="s"
+                overflowHeight={1000}
+                data-test-subj="configsTab.codeblock"
+              >
+                {configs}
+              </EuiCodeBlock>
+            </>
+          )}
+        </EuiFlexItem>
+      )}
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_banner_background.svg b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_banner_background.svg
new file mode 100644
index 0000000000000..cd37f26c95f7b
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_banner_background.svg
@@ -0,0 +1,329 @@
+<svg width="80" height="108" viewBox="0 0 80 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_42_84480" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="80" height="108">
+<path d="M80 6.98955e-07L0 0L8.17243e-07 108L80 108L80 6.98955e-07Z" fill="#C4C4C4"/>
+</mask>
+<g mask="url(#mask0_42_84480)">
+<path d="M64.6069 22.4096C64.4414 22.5824 64.4414 22.7552 64.4414 22.928C64.4414 22.9856 64.4414 23.0432 64.4414 23.1008C64.7724 22.8128 65.1586 22.5824 65.4897 22.2944C65.1586 22.2944 64.7724 22.1792 64.6069 22.4096Z" fill="#1BA9F5"/>
+<path d="M78.8974 13.9988C78.8422 13.8836 78.7319 13.826 78.6767 13.7684C78.0698 13.4228 77.4629 13.7684 77.4629 14.4596C77.4629 14.8052 77.5181 15.1508 77.5732 15.4964C78.125 15.266 78.6767 15.0356 79.2284 14.8628C79.1732 14.5748 79.0629 14.2868 78.8974 13.9988Z" fill="#1BA9F5"/>
+<path d="M71.9443 17.8555C71.6133 17.9707 71.1719 17.9707 71.1719 18.4891C71.1719 18.5467 71.1719 18.5467 71.1719 18.6043C71.5029 18.4315 71.7788 18.2587 72.1098 18.0859C72.0546 18.0283 71.9995 17.9707 71.9443 17.8555Z" fill="#1BA9F5"/>
+<path d="M42.9244 38.3628C42.8141 38.5356 42.8693 38.766 42.8693 38.8812C43.2003 39.2268 43.5313 39.2268 43.6417 38.9964C43.752 38.766 43.752 38.478 43.6968 38.2476C43.5313 38.0172 43.0348 38.0748 42.9244 38.3628Z" fill="#1BA9F5"/>
+<path d="M43.6957 47.8068C43.475 48.0372 43.4198 48.5556 43.6405 48.786C43.8612 49.0164 44.2474 49.0164 44.4681 48.7284C44.6888 48.4404 44.7439 48.0372 44.5232 47.8644C44.3577 47.5764 43.9715 47.5764 43.6957 47.8068Z" fill="#1BA9F5"/>
+<path d="M45.5181 43.2584C45.6836 43.028 45.7388 42.7976 45.5732 42.5672C45.1319 42.0488 44.6353 41.588 43.9181 41.3576C43.8077 41.3 43.6422 41.3576 43.587 41.3576C42.925 41.5304 42.7043 42.2216 43.1456 42.74C43.4215 43.0856 43.7525 43.316 44.1387 43.5464C44.525 43.892 45.2422 43.6616 45.5181 43.2584Z" fill="#1BA9F5"/>
+<path d="M64.4411 18.0311C64.6066 17.9159 64.3859 17.6279 64.3308 17.6279C64.2204 17.5703 64.0549 17.5127 63.9446 17.6855C63.8342 17.8583 63.8894 17.9735 63.9446 18.0311C64.1101 18.0887 64.2756 18.2039 64.4411 18.0311Z" fill="#1BA9F5"/>
+<path d="M42.3724 56.9114C42.5379 57.0266 42.7586 56.969 42.9241 57.0266C43.1448 56.681 43.0896 56.3354 42.8689 56.105C42.6482 55.9322 42.4827 56.0474 42.3172 56.2202C42.1517 56.4506 42.1517 56.7962 42.3724 56.9114Z" fill="#1BA9F5"/>
+<path d="M41.3794 49.1914C41.2139 49.4794 40.8829 49.7674 41.2139 50.1706C41.4346 50.401 41.7105 50.5162 41.9863 50.2858C42.1518 50.1706 42.2622 49.9402 42.2622 49.7674C42.2622 49.4218 41.9863 49.3066 41.3794 49.1914Z" fill="#1BA9F5"/>
+<path d="M45.0771 46.313C45.0219 45.9674 44.5254 45.6218 44.1391 45.9674C43.9736 46.0826 43.8633 46.4282 43.8633 46.6586C43.8633 46.8314 44.1391 47.0618 44.3047 47.1194C44.746 47.2346 45.1322 46.7162 45.0771 46.313Z" fill="#1BA9F5"/>
+<path d="M53.1859 34.3915C53.1307 34.5643 53.1307 34.6795 53.1859 34.7947C53.4066 34.5067 53.5721 34.2187 53.7928 33.9883C53.4618 33.9883 53.2411 34.1611 53.1859 34.3915Z" fill="#1BA9F5"/>
+<path d="M43.0888 52.2426C43.3646 52.5306 43.7508 52.5882 43.9715 52.3002C44.1922 52.0122 44.3026 51.2634 44.0819 51.033C43.7508 50.6874 43.2543 50.745 42.8681 51.0906C42.5922 51.3786 42.7026 51.8394 43.0888 52.2426Z" fill="#1BA9F5"/>
+<path d="M53.352 32.3725C53.5727 32.1421 53.5727 31.7965 53.352 31.5661C53.1313 31.3357 52.7451 31.2781 52.5244 31.5661C52.3037 31.7965 52.3037 32.2573 52.5796 32.4877C52.8003 32.6029 53.1313 32.6029 53.352 32.3725Z" fill="#1BA9F5"/>
+<path d="M55.9998 30.5865C55.7239 30.3561 55.5032 30.4713 55.2825 30.7017C55.0621 30.9897 55.0621 31.3929 55.2825 31.5657C55.3377 31.6233 55.3929 31.6233 55.5032 31.6809C55.7239 31.3929 55.9446 31.1625 56.1653 30.8745C56.1653 30.8169 56.1101 30.7017 55.9998 30.5865Z" fill="#1BA9F5"/>
+<path d="M51.6963 34.3317C52.1928 33.8709 51.917 33.2373 51.7514 32.9493C51.5859 32.6037 50.8135 32.7765 50.5376 33.2949C50.3721 33.5829 50.4273 33.8709 50.648 34.1013C50.8687 34.4469 51.4204 34.5621 51.6963 34.3317Z" fill="#1BA9F5"/>
+<path d="M48.4981 42.2216C48.8291 41.8184 48.774 40.9544 48.3878 40.724C48.1119 40.4936 47.5602 40.6664 47.3395 40.9544C47.0084 41.3576 47.0084 41.8184 47.4498 42.164C47.836 42.452 48.2774 42.5096 48.4981 42.2216Z" fill="#1BA9F5"/>
+<path d="M58.3194 26.0355C58.0987 26.2083 57.9884 26.8419 58.1539 27.0723C58.2643 27.3027 58.816 27.3603 59.0918 27.1299C59.3125 26.9571 59.3677 26.6691 59.147 26.4387C58.816 26.0355 58.4849 25.8627 58.3194 26.0355Z" fill="#1BA9F5"/>
+<path d="M61.0755 21.4276C61.3514 21.1396 61.3514 20.794 61.1307 20.5636C60.91 20.2756 60.0272 20.2756 59.8066 20.506C59.4755 20.8516 59.5307 21.2548 59.9721 21.658C60.3583 21.946 60.7445 21.8884 61.0755 21.4276Z" fill="#1BA9F5"/>
+<path d="M63.8884 16.709C63.9436 16.7666 64.0539 16.7666 64.2194 16.709C64.2194 16.8242 64.1643 16.9394 64.1643 16.997C64.2194 17.5154 64.9918 18.2642 65.4884 18.2066C65.8194 18.2066 66.1505 17.9186 66.316 17.5154C66.316 17.6306 66.3712 17.7458 66.4263 17.861C66.2608 18.2642 66.0953 18.6098 65.9849 18.9554C65.8746 19.301 66.2608 19.6466 66.5367 19.4738C66.8677 19.2434 67.3643 19.1282 67.5298 18.6098C67.4746 18.437 67.3643 18.2066 67.3091 18.0338C67.5849 17.5154 67.6401 16.997 67.3643 16.7666C67.1436 16.5938 66.9229 16.5938 66.7022 16.7666C66.5918 16.8242 66.5367 16.8818 66.4815 16.997C66.4815 16.9394 66.4815 16.9394 66.4815 16.8818C66.4263 16.3058 65.7643 15.7298 65.2677 15.7874C65.1574 15.7874 65.1022 15.845 64.9918 15.845C64.8815 15.557 64.2194 15.3842 63.9436 15.6146C63.6677 15.9602 63.6125 16.4786 63.8884 16.709Z" fill="#1BA9F5"/>
+<path d="M61.1305 24.8299C61.4064 25.0603 61.9029 25.0027 62.1236 24.7723C62.3995 24.4843 62.3995 23.5051 62.1788 23.3323C61.8478 23.1019 61.2409 23.2171 60.9098 23.6203C60.5788 24.0235 60.634 24.4267 61.1305 24.8299Z" fill="#1BA9F5"/>
+<path d="M63.3379 23.9617C63.2827 23.9041 63.1723 23.7313 63.1172 23.7889C63.0068 23.7889 62.8965 24.0193 62.8965 24.1345C62.8965 24.1921 62.8965 24.2497 62.9517 24.3073C63.062 24.1921 63.1723 24.0769 63.3379 23.9617Z" fill="#1BA9F5"/>
+<path d="M68.1919 12.3844C68.3022 12.3268 68.3022 11.9812 68.1919 11.9236C68.1367 11.8084 67.8609 11.8084 67.7505 11.866C67.6402 11.9236 67.5298 12.2692 67.585 12.3844C67.6953 12.5572 68.1367 12.442 68.1919 12.3844Z" fill="#1BA9F5"/>
+<path d="M71.2273 15.0966C71.8894 15.039 72.3307 14.5206 72.2756 13.8294C72.2204 13.2534 71.8342 12.8502 71.3928 12.9078C70.7859 12.9654 70.1238 13.6566 70.179 14.175C70.2342 14.751 70.6756 15.1542 71.2273 15.0966Z" fill="#1BA9F5"/>
+<path d="M56.0004 27.0722C56.4417 26.6114 56.4417 26.0354 55.9452 25.517C55.559 25.1138 54.9523 25.1138 54.5661 25.4594C54.1799 25.805 54.3454 26.6114 54.7868 27.0722C55.1728 27.4754 55.6141 27.4178 56.0004 27.0722Z" fill="#1BA9F5"/>
+<path d="M54.7332 17.9735C55.0091 18.1463 55.5054 17.9159 55.5054 17.5127C55.5054 17.3399 55.1194 17.1671 54.8987 16.9943C54.8436 16.9367 54.6781 16.8215 54.5677 17.0519C54.4022 17.2247 54.4574 17.8007 54.7332 17.9735Z" fill="#1BA9F5"/>
+<path d="M73.5439 8.87378C73.8198 8.93138 73.9853 8.64338 73.9853 8.41298C73.9853 8.24018 73.8198 7.77938 73.4888 7.83698C73.1577 7.89458 73.1577 8.29778 73.2129 8.47058C73.2129 8.64338 73.3784 8.81618 73.5439 8.87378Z" fill="#1BA9F5"/>
+<path d="M56.8262 23.0985C57.1021 22.8105 56.9917 22.2345 56.5503 21.8889C56.3296 21.6585 56.0538 21.7161 55.8331 21.9465C55.5021 22.2345 55.4469 22.8105 55.6676 23.0409C55.9986 23.2713 56.6055 23.3289 56.8262 23.0985Z" fill="#1BA9F5"/>
+<path d="M54.0151 29.5514C54.4013 29.1482 54.4013 28.2266 54.0151 27.8234C53.6289 27.3626 52.9117 27.4778 52.36 28.0538C51.9738 28.457 51.9738 29.0906 52.36 29.4938C52.691 29.9546 53.5738 30.0122 54.0151 29.5514Z" fill="#1BA9F5"/>
+<path d="M58.6483 21.1995C58.869 20.9691 58.869 20.3355 58.7035 20.2203C58.4828 19.9899 57.8759 20.0475 57.7104 20.3355C57.4897 20.5659 57.5449 20.9691 57.8207 21.1995C58.0414 21.3723 58.4828 21.4299 58.6483 21.1995Z" fill="#1BA9F5"/>
+<path d="M58.9781 18.8359C59.1988 18.6055 59.1988 18.2023 58.9781 18.0295C58.7574 17.7991 58.4815 17.8567 58.2609 18.0871C58.0953 18.2599 58.0953 18.5479 58.2609 18.7207C58.4815 18.9511 58.8126 19.0087 58.9781 18.8359Z" fill="#1BA9F5"/>
+<path d="M58.2622 22.9259C58.1518 22.9259 57.9863 23.2715 57.9863 23.4443C57.9863 23.6171 58.0967 23.8475 58.2622 23.9627C58.3725 24.0203 58.6484 23.9627 58.7587 23.8475C59.0346 23.6747 59.2001 23.4443 59.4208 23.1563C59.5863 22.9835 59.5312 22.7531 59.3105 22.5803C59.2553 22.5803 59.0898 22.5227 59.0346 22.5803C58.8139 22.8683 58.5381 22.8683 58.2622 22.9259Z" fill="#1BA9F5"/>
+<path d="M76.1945 11.8086C76.4152 11.6934 76.36 10.7718 76.029 10.7142C75.7531 10.6566 75.4221 10.8294 75.3669 11.1174C75.2566 11.463 75.9738 11.9238 76.1945 11.8086Z" fill="#1BA9F5"/>
+<path d="M79.1703 7.78097C79.2806 7.55057 79.0047 6.85938 78.7289 6.85938C78.2875 6.85938 78.0116 7.03217 78.122 7.55057C78.2323 8.06897 79.0599 8.01137 79.1703 7.78097Z" fill="#1BA9F5"/>
+<path d="M75.4217 15.1515C75.6975 15.1515 75.8631 14.5755 75.6424 14.1147C75.4217 13.7115 74.8699 13.9419 74.7044 14.1147C74.4837 14.2875 75.1458 15.1515 75.4217 15.1515Z" fill="#1BA9F5"/>
+<path d="M77.7368 12.9619C77.792 12.8467 77.792 12.6163 77.6816 12.5587C77.5713 12.5011 77.3506 12.6163 77.2954 12.6739C77.2402 12.7315 77.1851 13.0771 77.3506 13.1923C77.4609 13.2499 77.6816 13.0771 77.7368 12.9619Z" fill="#1BA9F5"/>
+<path d="M79.9448 3.97636C80.2207 3.91876 80.1655 3.63075 80.1655 3.51555C80.1655 3.40035 79.9448 3.28516 79.8345 3.28516C79.7241 3.34276 79.5586 3.51556 79.5586 3.57316C79.6138 3.74596 79.6689 4.03396 79.9448 3.97636Z" fill="#1BA9F5"/>
+<path d="M79.7793 11.349C79.7793 11.8098 80 12.0978 80.2758 11.9826C80.4965 11.8674 80.7172 11.6946 80.7724 11.4642C80.8276 11.2338 80.4414 10.8882 80.1655 11.0034C80 11.061 79.8345 11.2914 79.7793 11.349Z" fill="#1BA9F5"/>
+<path d="M48.1649 20.9673C48.2752 20.8521 48.22 20.6217 48.1649 20.5641C48.1097 20.5065 47.7787 20.3337 47.6683 20.4489C47.558 20.5641 47.6683 20.9097 47.7235 20.9673C47.8338 20.9673 48.0545 21.0825 48.1649 20.9673Z" fill="#1BA9F5"/>
+<path d="M38.1258 33.3518C38.2913 33.1214 38.0706 32.9486 38.0155 32.891C37.9603 32.8334 37.6844 32.891 37.6293 32.9486C37.5741 33.0638 37.5741 33.2942 37.6293 33.3518C37.7396 33.4094 37.9603 33.5246 38.1258 33.3518Z" fill="#1BA9F5"/>
+<path d="M39.1723 37.2124C39.6136 37.558 40.1654 36.8668 40.055 36.6364C39.9447 36.406 39.3378 36.0604 39.1171 36.2908C38.7861 36.5788 38.6757 36.9244 39.1723 37.2124Z" fill="#1BA9F5"/>
+<path d="M36.1387 41.4162C36.249 41.5314 36.5249 41.5314 36.6904 41.4162C36.9111 41.2434 36.9111 40.9554 36.6904 40.7826C36.5801 40.6674 36.1938 40.437 35.918 40.725C35.6973 41.0706 36.0283 41.3586 36.1387 41.4162Z" fill="#1BA9F5"/>
+<path d="M40.8809 44.5266C40.8809 44.757 41.9291 44.9298 42.0947 44.757C42.3153 44.5842 42.0395 44.0082 41.5981 43.893C41.1567 43.6626 40.8809 44.2386 40.8809 44.5266Z" fill="#1BA9F5"/>
+<path d="M35.0356 47.8104C35.0356 47.6952 34.87 47.4648 34.7597 47.4648C34.6493 47.4648 34.4287 47.58 34.3735 47.7528C34.3183 47.868 34.4287 48.2136 34.5942 48.2712C34.7597 48.2712 35.0356 47.9256 35.0356 47.8104Z" fill="#1BA9F5"/>
+<path d="M41.3779 36.1152C41.5986 35.9424 41.3779 35.5968 41.2676 35.4816C41.1572 35.3664 40.9365 35.2513 40.771 35.4241C40.6055 35.5969 40.7158 35.8273 40.771 35.9425C40.8814 36.1153 41.1572 36.3456 41.3779 36.1152Z" fill="#1BA9F5"/>
+<path d="M40.7723 55.5298C40.8826 55.4146 40.8275 55.1842 40.7723 55.1266C40.7171 55.069 40.3861 54.8962 40.2757 55.0114C40.1654 55.1266 40.2757 55.4722 40.3309 55.5298C40.4412 55.5874 40.6619 55.645 40.7723 55.5298Z" fill="#1BA9F5"/>
+<path d="M40.4964 41.7659C40.5515 41.4779 39.9998 40.9019 39.6688 41.0747C39.4481 41.1899 39.2826 41.6507 39.4481 41.8235C39.6136 42.1115 40.4412 41.9963 40.4964 41.7659Z" fill="#1BA9F5"/>
+<path d="M42.2085 41.9331C42.374 41.9331 42.4292 41.5875 42.374 41.4723C42.3188 41.3571 42.2085 41.1843 42.043 41.2419C41.8774 41.2995 41.8223 41.4723 41.8223 41.6451C41.8774 41.7027 42.043 41.9907 42.2085 41.9331Z" fill="#1BA9F5"/>
+<path d="M38.7299 59.8517C38.6747 59.9093 38.7299 60.1397 38.7851 60.2549C38.8402 60.3125 39.0609 60.4277 39.1713 60.3125C39.2816 60.1973 39.1161 59.9093 39.0609 59.8517C39.0057 59.7941 38.7851 59.7365 38.7299 59.8517Z" fill="#1BA9F5"/>
+<path d="M37.7387 45.9662C37.2973 46.427 37.2973 47.4062 37.6835 47.7518C38.0697 48.0974 38.6766 48.0398 39.0628 47.6366C39.5042 47.1182 39.5042 46.3694 39.0076 45.9662C38.5663 45.6206 38.0145 45.6206 37.7387 45.9662Z" fill="#1BA9F5"/>
+<path d="M35.143 52.4194C34.7016 52.9378 34.7016 53.6866 35.0878 54.0322C35.474 54.3778 36.5223 54.3202 36.8533 53.9746C37.2395 53.5714 37.1843 52.765 36.6878 52.3618C36.3568 52.0162 35.474 52.0162 35.143 52.4194Z" fill="#1BA9F5"/>
+<path d="M45.2968 39.3975C45.4623 39.1671 45.4623 38.8215 45.2416 38.7063C45.0761 38.5911 44.8002 38.5335 44.6347 38.6487C44.4692 38.7063 44.3036 39.2823 44.5243 39.5127C44.745 39.6855 45.0761 39.6855 45.2968 39.3975Z" fill="#1BA9F5"/>
+<path d="M47.834 35.8884C47.5581 36.0036 46.9512 35.8308 46.565 35.946C45.9581 36.1188 45.5167 36.5796 45.7374 37.2132C46.0133 37.962 46.565 38.1348 47.1719 37.962C47.9995 37.674 47.5581 36.8676 48.165 36.8676C48.7719 36.8676 48.4409 37.4436 49.2684 37.4436C50.096 37.4436 50.5374 36.6948 50.2615 36.1764C49.9305 35.658 49.434 35.7732 49.3788 35.6004C49.3236 35.4276 49.3236 34.8516 48.8822 34.8516C47.8891 34.9092 48.1098 35.7732 47.834 35.8884Z" fill="#1BA9F5"/>
+<path d="M47.9449 28.4586C47.7794 28.2282 47.338 28.2858 47.2276 28.5738C47.1725 28.7466 47.2276 28.977 47.2276 29.0346C47.5587 29.3226 47.8897 29.265 48.0001 29.0346C48.0552 28.9194 48.0001 28.6314 47.9449 28.4586Z" fill="#1BA9F5"/>
+<path d="M43.6957 26.7274C43.8612 26.5546 43.7509 25.9786 43.5302 25.7482C43.3095 25.5178 42.9233 25.5178 42.7026 25.8058C42.4819 26.0938 42.4819 26.3818 42.7026 26.6122C42.9785 26.9002 43.5302 26.9578 43.6957 26.7274Z" fill="#1BA9F5"/>
+<path d="M49.5453 31.3363C49.766 31.5667 50.4833 31.4515 50.704 31.1635C50.8695 30.9331 50.8695 30.4147 50.704 30.2419C50.2626 29.8387 49.7109 29.7235 49.435 30.0115C49.2143 30.2995 49.2695 31.0483 49.5453 31.3363Z" fill="#1BA9F5"/>
+<path d="M49.599 21.7188C49.7093 21.6036 49.5438 21.3156 49.4887 21.258C49.4335 21.2004 49.2128 21.2004 49.1576 21.258C49.1024 21.3156 49.1576 21.546 49.2128 21.6612C49.2128 21.7188 49.4887 21.834 49.599 21.7188Z" fill="#1BA9F5"/>
+<path d="M48.4951 28.4012C48.771 28.574 49.102 28.3436 49.2676 28.1708C49.4883 27.998 49.3227 27.71 49.1572 27.5372C48.9365 27.3644 48.6055 27.3644 48.4951 27.5948C48.3848 27.8252 48.1641 28.2284 48.4951 28.4012Z" fill="#1BA9F5"/>
+<path d="M43.973 32.1428C43.9178 32.1428 43.9178 32.3156 43.973 32.3156C44.0282 32.3732 44.1385 32.4308 44.1937 32.3732C44.2489 32.3156 44.1937 32.258 44.1937 32.1428C44.1385 32.1428 44.0282 32.0852 43.973 32.1428Z" fill="#1BA9F5"/>
+<path d="M47.8868 26.6732C48.2179 26.4428 48.2731 25.8668 48.0524 25.6364C47.8317 25.406 47.3351 25.3484 47.1144 25.6364C46.8937 25.8668 47.0041 26.3852 47.3903 26.7884C47.5006 26.7308 47.7765 26.7884 47.8868 26.6732Z" fill="#1BA9F5"/>
+<path d="M51.7523 26.669C52.0833 26.2082 52.0281 25.4594 51.6419 25.0562C51.4212 24.8258 50.8143 24.941 50.5937 25.229C50.2074 25.6898 50.2074 26.2082 50.6488 26.6114C50.9799 26.957 51.5316 26.957 51.7523 26.669Z" fill="#1BA9F5"/>
+<path d="M43.0898 30.8186C43.0898 31.2218 43.145 31.2794 43.3657 31.4522C43.5864 31.625 43.7519 31.625 43.8623 31.625C43.9174 31.337 44.3036 30.9338 44.0829 30.7034C43.8623 30.4154 43.4209 30.6458 43.145 30.6458C43.145 30.7034 43.0898 30.761 43.0898 30.8186Z" fill="#1BA9F5"/>
+<path d="M47.0624 31.9642C47.2279 32.0794 47.6693 32.3098 47.8348 32.0794C48.0003 31.849 47.7797 31.3882 47.6693 31.2154C47.4486 30.985 47.1728 31.1002 46.9521 31.3306C46.7314 31.6186 46.8969 31.849 47.0624 31.9642Z" fill="#1BA9F5"/>
+<path d="M46.3992 34.2748C46.7302 33.9292 46.7302 33.4684 46.4544 33.1804C46.0682 32.8348 45.4061 32.7772 45.1854 33.1228C44.9096 33.4684 44.9096 34.1596 45.1854 34.5052C45.4061 34.7356 46.0682 34.6204 46.3992 34.2748Z" fill="#1BA9F5"/>
+<path d="M230.786 161.34L46.1793 161.34C20.6897 161.34 5.66186e-07 139.74 3.64817e-07 113.129C1.63449e-07 86.518 20.6897 64.918 46.1793 64.918L230.786 64.918C256.276 64.918 276.966 86.518 276.966 113.129C276.966 139.74 256.276 161.34 230.786 161.34Z" fill="#E7EBF1"/>
+<path d="M30.8426 78.6289C30.3461 78.6289 29.9598 78.8593 30.015 79.2625C30.015 79.6081 30.6219 80.2993 30.8978 80.2993C31.3392 80.2993 31.615 79.9537 31.615 79.4353C31.6702 78.8017 31.4495 78.6289 30.8426 78.6289Z" fill="#CAD0E2"/>
+<path d="M42.3723 68.8917C42.0413 68.9493 41.9861 69.4101 41.9309 69.6405C41.8758 69.9285 42.1516 70.0437 42.4275 69.9861C42.7033 69.9861 42.9792 69.6981 42.8689 69.4677C42.8137 69.2949 42.7033 68.8341 42.3723 68.8917Z" fill="#CAD0E2"/>
+<path d="M37.793 80.4691C37.793 80.7571 37.9585 80.8723 38.2343 80.8147C38.2895 80.7571 38.3999 80.6995 38.3999 80.5843C38.3999 80.2387 38.6206 80.0659 38.7861 79.8355C38.8412 79.7203 38.7861 79.3747 38.6757 79.2595C38.6206 79.2019 38.5102 79.1443 38.455 79.0867C38.5654 78.9715 38.6757 78.8563 38.7309 78.7987C38.6757 78.3955 38.3447 78.2227 38.0688 78.2803C37.793 78.3379 37.793 78.5683 37.793 78.7987C37.793 78.9715 37.9033 79.0867 38.0137 79.2019C37.9585 79.3171 37.8481 79.4323 37.8481 79.5475C37.793 79.8355 37.793 80.1811 37.793 80.4691Z" fill="#CAD0E2"/>
+<path d="M53.1855 69.065C53.5165 69.065 53.682 68.777 53.682 68.4314C53.682 67.9706 53.2958 67.625 52.9648 67.625C52.6338 67.625 52.3027 67.9706 52.3027 68.3162C52.3027 68.6618 52.7993 69.065 53.1855 69.065Z" fill="#CAD0E2"/>
+<path d="M43.1995 67.8573C43.1443 67.6845 42.9788 67.5693 42.9236 67.5117C42.4822 67.5693 42.2615 67.7997 42.3719 68.0877C42.427 68.2605 42.5926 68.4333 42.7581 68.4909C42.9788 68.4909 43.2546 68.0877 43.1995 67.8573Z" fill="#CAD0E2"/>
+<path d="M34.1509 73.9051C33.9854 73.5019 33.6544 73.5019 33.3234 73.6171C33.1027 74.0779 33.1578 74.3659 33.5992 74.6539C33.9302 74.5387 34.3165 74.3659 34.1509 73.9051Z" fill="#CAD0E2"/>
+<path d="M38.2334 83.6953C38.5644 83.6953 39.2265 83.1193 39.2265 82.8313C39.2265 82.3705 38.8954 82.0825 38.3437 82.1401C37.9023 82.1401 37.6816 82.4857 37.6816 83.0617C37.7368 83.4073 37.9023 83.6377 38.2334 83.6953Z" fill="#CAD0E2"/>
+<path d="M33.2694 71.4844C32.9384 71.4844 32.6625 71.83 32.6625 72.118C32.5522 72.0028 32.4419 71.9452 32.2763 71.9452C31.9453 71.9452 31.7246 72.118 31.7246 72.4636C31.7246 72.8092 31.9453 73.1548 32.2763 73.1548C32.6074 73.1548 32.8281 72.8668 32.8281 72.5212C32.8281 72.5212 32.8281 72.5212 32.8281 72.4636C32.9384 72.6364 33.1591 72.7516 33.3246 72.7516C33.6556 72.7516 33.8763 72.406 33.8212 72.0604C33.8763 71.7724 33.6005 71.4844 33.2694 71.4844Z" fill="#CAD0E2"/>
+<path d="M32.8295 69.3516C32.4433 69.3516 32.0571 69.7548 31.8915 70.158C31.7812 70.2732 31.6708 70.3884 31.6708 70.5612C31.6157 70.7916 31.7812 71.0796 32.0019 71.2524C32.1122 71.3676 32.4433 71.31 32.6088 71.2524C32.664 71.2524 32.7191 71.2524 32.7743 71.2524C33.326 71.1948 33.6019 70.9068 33.5467 70.2732C33.4915 69.8124 33.1605 69.3516 32.8295 69.3516Z" fill="#CAD0E2"/>
+<path d="M62.0137 70.6204C62.0688 70.966 62.455 71.254 62.7309 71.1964C63.0068 71.1388 63.2275 70.9084 63.2275 70.5628C63.1723 70.1596 62.8964 69.8716 62.5654 69.9292C62.2895 69.9292 62.0137 70.2748 62.0137 70.6204Z" fill="#CAD0E2"/>
+<path d="M32.2197 76.4963C32.2749 76.7267 32.7163 77.0147 33.0473 76.9571C33.3232 76.8995 33.4335 76.6691 33.3783 76.3235C33.268 75.9203 33.1576 75.6899 32.9921 75.5747C33.1576 75.5171 33.268 75.3443 33.3232 75.1139C33.3232 74.9411 33.268 74.7107 33.1576 74.5379C32.8818 74.3075 32.6611 74.3651 32.1094 74.8259C32.2197 75.1715 32.2197 75.5747 32.6611 75.6323C32.4404 75.8627 32.2197 76.2659 32.2197 76.4963Z" fill="#CAD0E2"/>
+<path d="M28.6901 69.2349C28.6349 69.5805 28.8556 69.9261 29.1866 69.9837C28.9659 70.0413 28.7453 70.0989 28.5246 70.0413C28.359 70.0413 28.1384 70.2141 28.028 70.3869C27.8625 70.6749 27.697 70.8477 27.4763 71.1357C27.2004 71.4813 27.2556 71.9421 27.5315 72.1725C27.9177 72.5181 28.2487 72.5757 28.5797 72.1725C28.5797 72.1725 28.5797 72.1725 28.6349 72.1149C28.8556 72.0573 29.2418 71.7117 29.4073 71.4813L29.4625 71.4813C29.7384 71.5389 30.0142 71.4237 30.1246 71.1357C30.2901 70.7901 30.1797 70.5021 30.0142 70.1565C29.9039 69.9837 29.7384 69.8685 29.5728 69.8685C29.7935 69.6957 29.959 69.4077 29.9039 69.1197C29.9039 69.0621 29.9039 69.0045 29.8487 69.0045C29.9039 69.0045 29.9039 69.0045 29.959 69.0045C30.4004 68.8893 30.6763 68.1981 30.6211 67.7373C30.6211 67.7373 30.6211 67.7373 30.6211 67.6797C29.7384 68.0253 28.8556 68.3709 27.9728 68.7741C28.0832 69.0621 28.359 69.2349 28.6901 69.2349Z" fill="#CAD0E2"/>
+<path d="M40.6629 65.4344C40.4974 65.492 40.3871 65.6072 40.3871 65.78C40.3871 65.9528 40.5526 66.0681 40.7181 66.1257L40.7181 66.1832C40.2767 66.068 39.5595 66.2408 39.2836 66.5864C39.0629 66.8744 39.0629 67.3352 39.2284 67.6808C39.0078 67.8536 38.8422 68.1993 38.8974 68.4297C38.8974 68.7177 39.2284 69.1208 39.5043 69.1208C39.6147 69.1208 39.725 69.1208 39.8353 69.0632C39.8353 69.3512 40.1112 69.5241 40.3871 69.5817C40.7733 69.2937 40.8284 68.948 40.5526 68.66C40.8284 68.3144 41.1043 68.0264 41.2698 67.7384C41.4353 67.4504 41.325 66.932 41.1595 66.5864C41.3802 66.7016 41.6009 66.7016 41.9319 66.644C42.7595 66.4712 42.9802 66.1832 42.925 65.4344C42.925 65.2616 42.8698 65.1465 42.8147 65.0313C42.0974 65.0889 41.3802 65.1465 40.7181 65.2617C40.7181 65.3193 40.6629 65.3768 40.6629 65.4344Z" fill="#CAD0E2"/>
+<path d="M30.895 90.8945C30.7295 90.8945 30.6191 91.1825 30.6191 91.2401C30.6191 91.3553 30.6191 91.5857 30.8398 91.5857C31.0605 91.5857 31.0605 91.4129 31.0605 91.3553C31.0605 91.2401 31.0605 90.9521 30.895 90.8945Z" fill="#CAD0E2"/>
+<path d="M20.3045 96.5408C20.3597 96.1376 19.9183 95.792 19.3666 95.7344C19.0907 95.7344 18.7597 96.0224 18.7045 96.368C18.6493 96.7712 19.0356 97.232 19.3666 97.2896C19.808 97.2896 20.2493 96.8864 20.3045 96.5408Z" fill="#CAD0E2"/>
+<path d="M37.3512 69.4659C37.3512 69.1203 37.0201 68.8323 36.7443 68.8323C36.6339 68.8323 36.5236 68.8899 36.4132 68.9475C36.3581 68.6595 36.2477 68.3715 36.0822 68.1411C35.8615 67.7955 35.365 67.6803 34.9787 67.7955C34.9787 67.7379 34.9236 67.7379 34.9236 67.6803C35.0339 67.5075 35.0891 67.2771 35.0339 67.1043C34.9787 66.8739 34.8684 66.7011 34.6477 66.5859C34.6477 66.5283 34.6477 66.4131 34.5925 66.3555C33.2684 66.7011 31.9994 67.1043 30.7305 67.6227C30.896 67.9107 31.227 68.1987 31.6684 68.0835C32.0546 67.9107 32.3856 67.5651 32.6063 67.6227C32.827 67.6227 33.1029 67.7379 33.0477 68.0835C32.9925 68.4291 33.2684 68.8899 33.9856 68.9475C34.096 68.9475 34.2063 68.9475 34.2615 68.9475C34.2615 69.3507 34.427 69.6963 34.6477 70.0419C34.7581 70.1571 34.8132 70.3875 34.8132 70.5027C34.8132 71.0211 34.9787 71.3091 35.365 71.4243C35.3098 71.4243 35.3098 71.4243 35.2546 71.4243C34.9236 71.4243 34.7029 71.7123 34.7581 72.0579C34.8132 72.4035 35.0891 72.6915 35.4201 72.6339C35.7512 72.5763 35.8615 72.3459 35.8615 72.0579C35.8615 72.0003 35.8615 71.9427 35.8063 71.8851C35.9718 72.0579 36.1925 72.1731 36.4684 72.1155C36.9098 72.0579 37.1856 71.7123 37.1305 71.3667C37.0753 71.0211 36.7994 70.7907 36.4132 70.8483C36.4684 70.6755 36.4684 70.4451 36.3581 70.2147C36.3029 70.0419 36.2477 69.9267 36.2477 69.7539C36.3581 69.8691 36.4684 69.9843 36.6339 69.9843C37.0753 70.0995 37.3512 69.8115 37.3512 69.4659ZM35.7512 71.7123C35.696 71.5971 35.5856 71.5395 35.5305 71.4819C35.6408 71.4819 35.696 71.4819 35.8063 71.4819C35.7512 71.5395 35.696 71.6547 35.7512 71.7123Z" fill="#CAD0E2"/>
+<path d="M19.201 101.088C18.9251 101.203 18.8148 101.549 18.9251 101.837C19.0906 102.183 19.4768 102.355 19.7527 102.183C20.0285 102.067 20.1389 101.607 20.0285 101.319C19.863 101.088 19.4768 100.973 19.201 101.088Z" fill="#CAD0E2"/>
+<path d="M44.3592 81.849C44.4695 81.9642 44.8557 81.849 45.1316 81.7914C45.1868 81.7914 45.3523 81.7338 45.3523 81.5034C45.3523 81.273 44.9109 80.8698 44.5799 80.9274C44.304 81.0426 44.0833 81.561 44.3592 81.849Z" fill="#CAD0E2"/>
+<path d="M31.6143 87.3801C31.7798 86.9193 31.4488 86.3433 31.0074 86.2281C30.566 86.1129 30.3454 86.3433 30.0695 86.1705C29.7936 85.9977 29.5729 86.1705 29.4074 86.4585C29.2419 86.7465 28.9109 87.2073 29.2971 87.4953C29.6833 87.7833 29.9591 87.5529 30.0143 87.4377C30.0695 87.3225 30.4005 87.2073 30.3454 87.3801C30.2902 87.5529 30.4557 87.7257 30.8419 87.8409C31.1729 87.8985 31.4488 87.7833 31.6143 87.3801Z" fill="#CAD0E2"/>
+<path d="M12.4139 90.7795C12.8002 90.5491 12.745 90.0883 12.745 89.7427C12.745 89.7427 12.745 89.7427 12.6898 89.7427C12.6346 89.6851 12.5795 89.6851 12.5243 89.6851C12.0277 89.4547 11.7519 89.5123 11.5864 89.8003C11.5312 89.8579 11.5312 89.9731 11.476 90.0307C10.6484 89.9155 10.3174 90.3763 10.5381 91.4707C10.4829 91.5283 10.4277 91.5859 10.3726 91.6435C10.0967 91.8163 10.0967 92.0467 10.1519 92.3347C10.207 92.6227 10.4277 92.7379 10.6484 92.7379C10.8139 92.7955 10.9243 92.7955 11.0346 92.7955C11.2002 92.9683 11.476 92.9683 11.6967 92.7955C11.9174 92.6227 12.1933 92.4499 12.0829 92.1619C11.9726 91.9315 11.807 91.7587 11.6415 91.7011C11.6967 91.3555 11.7519 91.0675 11.7519 90.7219C12.0277 90.8371 12.2484 90.8947 12.4139 90.7795Z" fill="#CAD0E2"/>
+<path d="M7.22568 103.336C6.94982 103.394 6.67396 104.027 6.89465 104.258C7.06017 104.43 7.44637 104.43 7.61189 104.258C7.83258 104.027 7.50155 103.336 7.22568 103.336Z" fill="#CAD0E2"/>
+<path d="M6.62049 99.4755C6.62049 99.1299 6.45497 98.9571 6.17911 98.8995C5.68256 98.7843 5.57221 99.1875 5.40669 99.5331C5.18601 99.4755 4.96532 99.4755 4.7998 99.4179C4.85497 99.1299 4.85497 98.8419 4.91014 98.5539C4.74463 98.3811 4.57911 98.2659 4.35842 98.1507C4.08256 98.0355 3.42049 98.1507 3.25497 98.3811C3.08945 98.3235 2.86876 98.3811 2.75842 98.4387C2.64807 98.6115 2.70325 98.8995 2.70325 99.0723C2.97911 99.3027 3.14463 99.3027 3.31014 99.1875C3.36532 99.3027 3.42049 99.4179 3.53083 99.5331C3.64118 99.6483 3.75152 99.7635 3.86187 99.8787C3.75152 100.282 3.64118 100.685 3.80669 101.031C3.75152 101.088 3.64118 101.146 3.58601 101.203C3.25497 101.491 3.1998 102.355 3.53083 102.643C3.86187 102.931 4.74463 102.931 5.07566 102.355C5.29635 102.01 5.29635 101.722 5.24118 101.434C5.29635 101.434 5.35152 101.376 5.40669 101.376C6.01359 101.146 6.01359 100.627 5.95842 100.051C6.17911 99.9939 6.62049 100.051 6.62049 99.4755Z" fill="#CAD0E2"/>
+<path d="M26.9781 79.5481C27.1436 79.4329 27.0333 79.0297 26.9781 78.9145C26.9229 78.7993 26.5919 78.7993 26.5367 78.9145C26.4264 78.9721 26.4264 79.2601 26.4816 79.3753C26.4816 79.4905 26.8126 79.6633 26.9781 79.5481Z" fill="#CAD0E2"/>
+<path d="M4.80058 105.584C4.46955 105.354 3.97299 105.411 3.69713 105.814C3.42127 106.16 3.42127 106.506 3.69713 106.736C3.53161 106.966 3.53161 107.312 3.64196 107.542C3.80748 107.83 4.19368 107.888 4.46954 107.773C4.74541 107.6 4.80058 107.312 4.69023 107.024C4.85575 106.966 4.9661 106.909 5.02127 106.794C5.24196 106.448 5.13161 105.872 4.80058 105.584Z" fill="#CAD0E2"/>
+<path d="M23.7793 78.2778C23.9448 78.6234 24.2207 78.6234 24.4965 78.6234C24.7724 78.6234 24.9931 78.7386 25.2689 78.5082C25.5448 78.2202 25.4344 77.5866 25.1034 77.3562C24.9379 77.241 24.7172 77.1834 24.4965 77.1834C24.4965 76.7802 24.2206 76.4922 23.8896 76.4922C23.6138 76.4922 23.3379 76.7802 23.3379 77.0682C23.3379 77.2986 23.5034 77.5866 23.7793 77.7018C23.6689 77.9322 23.7241 78.2202 23.7793 78.2778Z" fill="#CAD0E2"/>
+<path d="M5.62657 103.678C5.68175 103.275 5.5714 102.987 5.18519 102.93C5.07485 102.93 4.79899 103.045 4.79899 103.16C4.74382 103.39 4.79899 103.678 4.90933 103.794C5.13002 104.082 5.40588 103.851 5.62657 103.678Z" fill="#CAD0E2"/>
+<path d="M20.7988 74.6524C20.4677 74.7676 20.4677 75.0556 20.6333 75.2284C20.7436 75.3436 20.9643 75.574 21.1298 75.6316C21.2402 75.9196 21.4608 76.0924 21.7919 76.2652C22.3436 76.5532 22.6746 76.3228 23.0608 75.6316C23.4471 75.574 23.7781 75.5164 24.0539 75.4012C24.385 75.2284 24.5505 74.7676 24.385 74.4796C24.1643 74.0764 23.8884 73.6732 23.6677 73.27C23.8884 72.694 23.8884 72.6364 23.2815 72.3484C23.0057 72.406 22.8953 72.9244 22.5643 72.5788C22.6746 72.2908 22.785 72.0604 22.8402 71.7724C22.8402 71.6572 22.8402 71.5996 22.8402 71.4844C22.3988 71.7724 21.9574 72.0604 21.516 72.3484C21.6815 72.4636 21.8471 72.5788 22.0677 72.694C21.9574 72.7516 21.8471 72.8092 21.7367 72.8668C21.3505 73.0972 21.1298 73.0396 21.0746 72.6364C20.6884 72.9244 20.3022 73.1548 19.916 73.4428C19.916 73.4428 19.9712 73.4428 19.9712 73.5004C20.2471 73.6156 20.4126 73.7308 20.4677 74.0188C20.5229 74.4796 20.7988 74.5372 21.185 74.422C21.185 74.4796 21.185 74.4796 21.1298 74.5372C21.0746 74.5948 20.9643 74.5948 20.7988 74.6524Z" fill="#CAD0E2"/>
+<path d="M0.716531 107.31C0.992394 106.906 0.826876 106.446 0.716531 106.33C1.15791 106.042 1.3786 105.409 1.15791 104.948C1.04757 104.718 0.937221 104.602 0.771704 104.43C0.606187 105.466 0.440667 106.503 0.330322 107.598C0.49584 107.482 0.606187 107.425 0.716531 107.31Z" fill="#CAD0E2"/>
+<path d="M27.4771 73.273C27.4771 72.9274 27.0909 72.6394 26.7599 72.697C26.7047 72.697 26.7047 72.697 26.6495 72.697C26.5944 72.1786 26.0978 71.6602 25.6564 71.6602C25.1047 71.6602 24.553 72.121 24.553 72.6394C24.553 73.1578 25.2702 73.9642 25.8219 73.9066C26.0426 73.9066 26.2082 73.7914 26.3737 73.6186C26.484 73.7914 26.7047 73.9066 26.9254 73.9066C27.2013 73.9066 27.4771 73.561 27.4771 73.273Z" fill="#CAD0E2"/>
+<path d="M14.8984 78.5695C14.8432 78.6847 14.8432 78.7423 14.8432 78.8575C14.8432 79.2607 15.1743 79.5487 15.5053 79.4911C15.8363 79.4335 16.1674 79.0879 16.1674 78.7999C16.1674 78.5695 15.8363 78.2815 15.5605 78.1663C15.6156 77.9935 15.6708 77.8207 15.6708 77.7055C15.726 77.7055 15.8363 77.7055 15.8915 77.6479C16.2225 77.5327 16.4984 77.5327 16.7743 77.6479C17.2156 77.8207 17.7674 77.4751 17.657 77.0143C17.6018 76.5535 17.6018 76.0351 17.0501 75.8047C17.0501 75.8047 17.0501 75.8047 16.9949 75.8047C16.057 76.6111 15.1191 77.4751 14.2363 78.3967C14.4018 78.5695 14.6225 78.6271 14.8984 78.5695Z" fill="#CAD0E2"/>
+<path d="M25.5452 71.5413C25.8762 71.5989 26.3176 70.9077 26.2072 70.6773C26.0417 70.4469 25.2141 70.5045 25.159 70.8501C25.1038 71.0805 25.3245 71.4837 25.5452 71.5413Z" fill="#CAD0E2"/>
+<path d="M25.3242 70.1002C25.6001 70.273 26.0966 70.6186 26.5932 70.561C27.2553 70.4458 27.7518 69.4666 27.7518 68.8906C26.9242 69.2938 26.0966 69.697 25.3242 70.1002Z" fill="#CAD0E2"/>
+<path d="M24.8264 70.3906C24.5505 70.5634 24.2195 70.6786 23.9436 70.8514C24.0539 70.8514 24.1091 70.8514 24.2195 70.8514C24.5505 70.8514 24.716 70.621 24.8264 70.3906Z" fill="#CAD0E2"/>
+<path d="M6.07039 93.6621C6.34625 94.3533 6.84281 94.5261 7.39453 94.2381C8.00143 93.9501 8.16694 93.3165 7.83591 92.6253C7.78074 92.5101 7.72556 92.4525 7.61522 92.3949C7.56005 92.2797 7.39453 92.1645 7.33936 92.1645C7.0635 92.0493 6.73246 92.0493 6.4566 92.1645C5.96005 92.4525 5.79453 93.0285 6.07039 93.6621Z" fill="#CAD0E2"/>
+<path d="M2.15259 104.085C2.48362 103.97 2.59397 103.567 2.48362 103.279C2.31811 102.991 1.98707 102.818 1.65604 102.991C1.38018 103.106 1.26983 103.394 1.38018 103.74C1.54569 104.028 1.87673 104.2 2.15259 104.085Z" fill="#CAD0E2"/>
+<path d="M30.0156 82.9452C30.0156 83.118 30.0708 83.2332 30.2363 83.2332C30.4018 83.2908 30.5122 83.1756 30.5122 83.0028C30.5122 82.83 30.457 82.7148 30.2915 82.7148C30.126 82.7148 30.0156 82.7724 30.0156 82.9452Z" fill="#CAD0E2"/>
+<path d="M22.0704 80.067C22.1807 80.067 22.3463 80.1246 22.4566 80.1246C22.898 80.2398 23.1738 80.1246 23.229 79.8366C23.2842 79.4334 23.0635 79.203 22.5669 79.1454C22.5118 79.1454 22.4566 79.203 22.4014 79.203C22.1256 79.1454 22.0152 79.0302 22.1256 78.7422C22.1807 78.627 22.2359 78.5694 22.2911 78.4542C22.4566 78.051 22.3463 77.5326 22.0704 77.2446C21.7394 76.899 21.4083 76.8414 20.9118 77.0718C20.4152 77.3598 20.1945 77.8206 20.0842 78.339C19.8083 78.339 19.5876 78.2814 19.3669 78.339C18.6497 78.5118 18.4842 79.0302 18.9807 79.6062C19.4221 80.067 19.9738 80.067 20.3049 79.5486C20.4152 79.3758 20.4704 79.203 20.6359 78.8574C20.8566 79.0878 21.0221 79.203 21.0773 79.3758C21.2428 79.9518 21.5738 80.067 22.0704 80.067Z" fill="#CAD0E2"/>
+<path d="M25.4904 85.9467C26.7042 85.6587 26.7042 84.6795 26.3732 83.8731C26.2628 83.5851 26.0421 83.3547 25.8214 83.2395C25.4904 83.0667 25.1594 83.0666 24.718 83.1818C24.3318 83.297 23.8904 83.1243 23.6145 83.4123C23.449 83.5851 23.2283 83.8731 23.118 84.2187C23.118 84.2187 23.118 84.2187 23.118 84.2763C22.9525 84.6795 22.9525 85.1403 23.1732 85.6587C23.449 86.2347 23.7801 86.5227 24.2214 86.5803C24.6628 86.6379 24.9938 86.0619 25.4904 85.9467Z" fill="#CAD0E2"/>
+<path d="M21.4613 86.9793C21.351 86.5761 21.02 86.5185 20.6338 86.4609C20.4131 86.8065 20.1372 87.0945 20.4682 87.4977C20.4682 87.5553 20.5234 87.5553 20.5786 87.5553C20.3027 87.7857 20.082 88.2465 20.082 88.5921C20.082 88.9377 20.3579 89.1681 20.7441 89.1681C21.2958 89.1681 21.682 88.8225 21.682 88.3617C21.682 88.0161 21.5165 87.7281 21.2958 87.6129C21.4613 87.4401 21.5165 87.2097 21.4613 86.9793Z" fill="#CAD0E2"/>
+<path d="M23.5025 88.418C23.3921 88.4756 23.2818 88.6484 23.3369 88.7636C23.3369 88.8788 23.6128 89.0516 23.7231 89.0516C23.8335 88.994 23.8335 88.706 23.7783 88.5332C23.7783 88.4756 23.5025 88.3604 23.5025 88.418Z" fill="#CAD0E2"/>
+<path d="M28.1909 80.4127C28.0254 80.5279 27.8599 80.7583 27.8047 80.9311C27.6944 81.5647 27.9703 82.0255 28.6875 82.3135C28.853 82.1407 29.1289 82.0255 29.2944 81.8527C29.5703 81.5071 29.6254 80.9887 29.4047 80.7007C29.0737 80.4127 28.5771 80.2399 28.1909 80.4127Z" fill="#CAD0E2"/>
+<path d="M44.1945 69.2969C44.1393 69.4121 43.9187 69.5273 43.8635 69.7001C43.8635 69.8729 43.8635 69.9881 43.9187 70.1609C43.8635 70.1033 43.7531 70.0457 43.698 70.0457C43.3669 69.9305 42.8704 70.1033 42.5393 70.4489C42.4842 70.1609 42.2083 69.9881 41.9876 69.9881C41.7118 69.9881 41.4359 70.3337 41.4911 70.6793C41.4911 71.0249 41.8221 71.3129 42.098 71.2553C42.1531 71.2553 42.1531 71.2553 42.2083 71.2553C42.2083 71.4857 42.2635 71.6585 42.3738 71.7737C42.2635 71.7161 42.098 71.6585 41.9325 71.6585C41.4359 71.6585 41.0497 72.0617 41.1049 72.4073C41.16 72.9833 41.7118 73.5017 42.2083 73.5017C42.3187 73.5017 42.4842 73.4441 42.5945 73.3289C42.5945 73.5017 42.6497 73.6745 42.7049 73.8473C42.5945 73.8473 42.429 73.8473 42.3187 73.9625C41.9876 74.2505 42.0428 74.8265 42.3738 75.1145C42.6497 75.3449 43.1462 75.4601 43.4773 75.2873C43.9187 74.9993 43.8635 74.4809 43.8083 74.3657C44.3049 74.2505 44.7462 73.7321 44.6911 73.2137C44.6359 72.6953 44.36 72.3497 43.9738 72.1769C44.1393 72.0617 44.3049 71.8889 44.4152 71.5433C44.5256 71.0825 44.4704 70.7369 44.3049 70.4489C44.36 70.5065 44.4704 70.5065 44.5256 70.5065C44.8566 70.5065 45.2428 70.1609 45.2428 69.8729C45.1876 69.6425 44.7462 69.3545 44.1945 69.2969ZM42.8704 72.4073C42.8704 72.2921 42.8152 72.2345 42.76 72.1193C42.8152 72.1769 42.8704 72.1769 42.9256 72.2345C42.9256 72.2345 42.9807 72.2345 42.9807 72.2921C42.9256 72.3497 42.8704 72.3497 42.8704 72.4073Z" fill="#CAD0E2"/>
+<path d="M30.5108 73.7321C30.4556 73.1561 29.9591 72.6953 29.4625 72.6953C28.7453 72.6953 28.1936 73.2137 28.2487 73.9049C28.2487 74.2505 28.4142 74.5385 28.6349 74.7113C28.5246 74.7113 28.4142 74.6537 28.2487 74.7113C27.697 74.7689 27.3108 75.1721 27.366 75.6905C27.366 75.7481 27.366 75.8057 27.4211 75.8633L27.366 75.8633C26.8694 75.8633 26.3729 76.5545 26.428 77.2457C26.428 77.7641 26.8694 78.1673 27.366 78.1097C28.1936 77.9945 28.3039 77.7641 28.4142 76.9577C28.4694 76.9577 28.5798 76.9577 28.6349 76.9577C29.1315 76.8425 29.5177 76.3817 29.4625 75.8633C29.628 75.9785 29.8487 76.0361 30.0694 76.0361C30.566 76.0361 31.1729 75.4601 31.1729 74.9417C31.1729 74.3657 30.897 73.9049 30.5108 73.7321Z" fill="#CAD0E2"/>
+<path d="M9.48891 94.3515C9.10271 94.5243 8.82684 95.3883 8.99236 95.7915C9.15788 96.1947 9.76478 96.3675 10.151 96.1947C10.5372 96.0219 10.8131 95.3307 10.6475 94.9275C10.4268 94.4667 9.81995 94.1787 9.48891 94.3515Z" fill="#CAD0E2"/>
+<path d="M11.2007 82.1976C11.2007 82.2552 11.1455 82.3128 11.1455 82.3704C10.98 83.004 11.2558 83.4648 11.5869 83.6952C11.9731 83.9256 12.5248 83.5224 12.911 83.004C13.0765 82.7736 13.0213 82.3704 12.911 82.0824C12.9662 82.0248 12.9662 81.9672 12.9662 81.852C12.9662 81.7368 12.8558 81.4488 12.7455 81.276C13.0765 81.2184 13.242 81.0456 13.242 80.7C13.242 80.3544 12.9662 80.0664 12.58 80.0664C11.9731 80.7576 11.3662 81.4488 10.8145 82.14C10.9248 82.1976 11.0903 82.1976 11.2007 82.1976ZM12.1386 81.3336L12.1938 81.276C12.1386 81.3336 12.0834 81.4488 12.0834 81.564C12.0282 81.564 11.9731 81.564 11.9731 81.564C12.0282 81.5064 12.0834 81.4488 12.1386 81.3336Z" fill="#CAD0E2"/>
+<path d="M11.4764 98.7264C11.7522 98.5536 11.8626 98.1504 11.7522 97.8624C11.6419 97.5744 11.2005 97.4592 10.9246 97.632C10.6488 97.8048 10.5936 98.1504 10.7591 98.496C10.8695 98.784 11.1453 98.8992 11.4764 98.7264Z" fill="#CAD0E2"/>
+<path d="M15.4469 85.5372C15.5572 85.3068 15.3365 85.1916 15.1158 85.1916C15.1158 85.134 15.1158 85.134 15.1158 85.0764C15.1158 84.7884 14.7296 84.4428 14.3986 84.4428C14.2331 84.4428 14.0676 84.5004 13.9572 84.558C14.2331 84.3276 14.3434 84.0972 14.1227 83.8092C14.0676 83.694 13.7917 83.5788 13.6814 83.6364C13.5158 83.694 13.2951 83.8668 13.2951 84.0396C13.24 84.4428 13.571 84.558 13.8469 84.6156C13.6262 84.7884 13.5158 84.9612 13.5158 85.2492C13.5158 85.7676 13.9572 86.286 14.3434 86.286C14.4538 86.286 14.5641 86.1708 14.7296 86.0556C14.84 86.0556 15.0055 85.998 15.1158 85.8828C15.2262 85.7676 15.3917 85.71 15.4469 85.5372Z" fill="#CAD0E2"/>
+<path d="M16.9937 82.1385C16.773 81.6777 16.0006 81.3898 15.5041 81.6202C14.9523 81.8506 14.7868 82.5417 15.0627 83.2329C15.173 83.5209 15.3937 83.7513 15.6144 83.8089C15.5592 83.9241 15.5592 83.9817 15.5592 84.0969C15.5592 84.4425 15.8351 84.7882 16.111 84.7882C16.3868 84.7882 16.8282 84.3849 16.8834 84.1545C16.8834 83.9817 16.773 83.809 16.6075 83.6362C17.0489 83.233 17.2144 82.5993 16.9937 82.1385Z" fill="#CAD0E2"/>
+<path d="M14.123 90.4352C13.9575 90.4352 13.7368 90.6656 13.6816 90.7808C13.6816 91.0112 13.7368 91.3568 13.9023 91.472C14.2334 91.76 14.5092 91.4144 14.7851 91.184C14.7299 90.7808 14.5644 90.3776 14.123 90.4352Z" fill="#CAD0E2"/>
+<path d="M4.91086 92.7385C4.80051 92.7961 4.74534 92.9689 4.74534 93.0841C4.74534 93.1993 4.80051 93.4297 5.0212 93.4297C5.24189 93.4297 5.40741 93.2569 5.40741 93.0265C5.40741 92.8537 5.29706 92.7385 5.18672 92.6809C5.24189 92.6809 5.35223 92.6233 5.40741 92.6233C6.01431 92.3353 6.235 91.5865 5.90396 90.7801C5.79362 90.5497 5.68327 90.3769 5.46258 90.2617C5.07637 91.0105 4.69017 91.7593 4.35913 92.5657C4.57982 92.6809 4.74534 92.7385 4.91086 92.7385Z" fill="#CAD0E2"/>
+<path d="M53.6811 79.6602C53.626 79.6602 53.5156 79.7754 53.5156 79.8906C53.5156 80.0058 53.6811 80.0634 53.7363 80.0058C53.7915 79.9482 53.8467 79.833 53.8467 79.833C53.8467 79.7754 53.7915 79.6602 53.6811 79.6602Z" fill="#CAD0E2"/>
+<path d="M66.5923 65.0332C66.2061 65.3212 66.5371 65.6668 66.6475 66.0124C67.0889 66.0124 67.4751 65.8972 67.5302 65.4364C67.5302 65.2636 67.4199 64.9756 67.2544 64.918C67.1992 64.918 67.1992 64.918 67.144 64.918L66.813 64.918C66.7578 64.918 66.7026 64.9756 66.5923 65.0332Z" fill="#CAD0E2"/>
+<path d="M66.9241 72.6917C66.8137 72.4037 66.3172 72.0581 66.0413 72.1157C65.7654 72.1733 65.5999 72.576 65.6551 72.9216C65.7654 73.2672 66.0413 73.3824 66.4275 73.3248C66.8137 73.152 67.0344 72.9221 66.9241 72.6917Z" fill="#CAD0E2"/>
+<path d="M65.9873 74.1327C65.877 74.1903 65.877 74.3055 65.877 74.3631C65.877 74.4207 66.0425 74.4783 66.0976 74.4783C66.1528 74.4783 66.208 74.3631 66.208 74.3055C66.208 74.2479 66.0976 74.0751 65.9873 74.1327Z" fill="#CAD0E2"/>
+<path d="M67.862 72.0611C67.6965 72.1187 67.6413 72.4067 67.6965 72.4643C67.7516 72.5795 67.862 72.8675 67.9723 72.8099C68.0827 72.7523 68.193 72.5795 68.193 72.4643C68.193 72.3491 68.0275 72.0035 67.862 72.0611Z" fill="#CAD0E2"/>
+<path d="M61.1848 71.6557C61.1296 71.1949 60.7434 70.7917 60.4675 70.8493C59.971 70.9069 59.5296 71.5405 59.5848 72.0589C59.5848 72.4045 60.0261 72.6925 60.4123 72.5773C60.9089 72.5197 61.2399 72.1741 61.1848 71.6557Z" fill="#CAD0E2"/>
+<path d="M46.289 74.8231C46.3442 74.8231 46.5097 74.7079 46.5097 74.5927C46.5097 74.4775 46.3442 74.3623 46.1787 74.3047C46.1235 74.3047 45.8477 74.3623 45.8477 74.5351C45.8477 74.7079 46.1787 74.8231 46.289 74.8231Z" fill="#CAD0E2"/>
+<path d="M68.9105 71.1396C68.9656 71.3124 69.1863 71.4276 69.2967 71.4276C69.407 71.4276 69.5725 71.2548 69.5725 71.1396C69.5725 71.0244 69.407 70.8516 69.2967 70.8516C69.1863 70.8516 68.8553 70.9668 68.9105 71.1396Z" fill="#CAD0E2"/>
+<path d="M47.4492 67.2216C47.5595 67.2792 47.6147 67.2792 47.7251 67.2792C48.0561 67.2792 48.2768 66.9912 48.2768 66.6456C48.2768 66.3 48.0561 66.0696 47.7802 66.0696C47.5595 66.0696 47.394 66.1848 47.2285 66.3C47.0078 65.9544 46.732 65.724 46.4009 65.6088C45.9044 65.4936 45.5733 66.0696 45.0216 66.1272C44.9113 66.1272 44.8561 66.1848 44.7458 66.1848C44.7458 65.9544 44.7457 65.7816 44.5251 65.6088C44.3044 65.436 44.0285 65.3784 43.8078 65.6664C43.6975 65.8392 43.532 66.1848 43.5871 66.3576C43.6423 66.588 43.8078 66.7032 43.9733 66.7032C43.7526 67.1064 43.8078 67.6248 43.9733 68.0856C44.0837 68.3736 44.2492 68.604 44.4699 68.7768C44.7458 69.0072 45.132 69.0072 45.5733 68.892C46.0147 68.7768 46.3458 69.0648 46.732 68.7768C47.063 68.4888 47.5044 67.9128 47.4492 67.2216Z" fill="#CAD0E2"/>
+<path d="M46.4535 72.1737C46.3984 71.8281 46.1225 71.5977 45.7915 71.5977C45.4604 71.5977 45.2949 71.8281 45.2949 72.2313C45.2949 72.6345 45.5708 72.8649 45.9018 72.8649C46.1777 72.8073 46.4535 72.5193 46.4535 72.1737Z" fill="#CAD0E2"/>
+<path d="M54.6766 76.2608C53.7938 75.9152 54.2352 75.3968 53.6835 74.936C53.5731 74.8784 53.4628 74.8208 53.4076 74.8208C52.6904 74.7056 52.3042 75.224 52.5248 75.9152C52.6352 76.3184 52.8559 76.7216 53.1317 77.0672C53.4076 77.4704 54.1249 77.528 54.5111 77.2976C54.6214 77.1824 55.0076 76.664 54.6766 76.2608Z" fill="#CAD0E2"/>
+<path d="M55.3921 68.7766C55.4472 69.0646 55.8886 69.2956 56.1645 69.238C56.4403 69.1228 56.661 68.719 56.6059 68.431C56.6059 68.3158 56.4955 68.2006 56.4403 68.143C56.7162 67.9702 56.9369 67.6246 56.8817 67.3366C56.8265 66.8182 56.3852 66.3574 55.9438 66.415C55.5576 66.4726 55.0059 67.1638 55.0059 67.567C55.061 67.855 55.2817 68.143 55.5576 68.2582C55.3921 68.3734 55.3369 68.6038 55.3921 68.7766Z" fill="#CAD0E2"/>
+<path d="M59.6406 74.7117C59.6406 75.0573 59.8061 75.2877 60.1923 75.2877C60.5786 75.2877 60.7992 74.9997 60.7992 74.6541C60.7992 74.3661 60.5234 74.0781 60.2475 74.0781C59.9165 74.0781 59.6406 74.3661 59.6406 74.7117Z" fill="#CAD0E2"/>
+<path d="M68.8553 66.6473C68.8002 66.2441 68.5795 66.0137 68.3588 66.0713C68.0277 66.1289 67.6415 66.5897 67.6967 66.8777C67.7519 67.1657 68.0829 67.4537 68.4139 67.3961C68.6898 67.3385 68.8553 67.0505 68.8553 66.6473Z" fill="#CAD0E2"/>
+<path d="M79.6658 67.2202C79.8313 67.105 80.052 66.7594 79.9416 66.6442C79.8313 66.529 79.5554 66.3562 79.4451 66.4138C79.3347 66.4714 79.0037 66.817 79.0589 66.9898C79.0589 67.105 79.5554 67.2778 79.6658 67.2202Z" fill="#CAD0E2"/>
+<path d="M78.6196 69.1241C78.7299 69.4697 79.1713 69.7577 79.5024 69.6425C79.8886 69.5273 80.3851 68.7785 80.2748 68.4329C80.1644 68.0297 79.5575 67.7993 79.061 67.9721C78.6196 68.1449 78.4541 68.5481 78.6196 69.1241Z" fill="#CAD0E2"/>
+<path d="M74.2612 78.109C74.0957 78.1666 73.875 78.397 73.875 78.5122C73.875 78.6274 74.1509 78.8577 74.3164 78.8577C74.4267 78.8577 74.8129 78.5698 74.8129 78.397C74.8129 78.2242 74.3716 78.0514 74.2612 78.109Z" fill="#CAD0E2"/>
+<path d="M75.5853 68.6606C75.475 68.0846 74.8681 67.739 74.1508 67.9118C73.5439 68.027 73.2129 68.603 73.3784 69.179C73.4887 69.755 74.206 70.2158 74.7577 70.1006C75.3094 69.9854 75.6956 69.2366 75.5853 68.6606Z" fill="#CAD0E2"/>
+<path d="M74.8125 71.83C74.8125 72.0604 75.1435 72.0028 75.2539 72.0028C75.309 72.0028 75.4746 71.7724 75.4194 71.7148C75.3642 71.5996 75.1987 71.4844 75.1435 71.4844C75.0884 71.4844 74.8125 71.5996 74.8125 71.83Z" fill="#CAD0E2"/>
+<path d="M69.5711 68.4324C69.4608 68.1444 69.2953 68.1444 69.0746 68.202C68.7987 68.2596 68.6332 68.5476 68.7435 68.778C68.8539 68.9508 68.9642 69.1812 69.1298 69.1812C69.3504 69.2388 69.6815 68.7204 69.5711 68.4324Z" fill="#CAD0E2"/>
+<path d="M74.813 65.782C75.144 66.1276 75.9716 66.0124 76.1923 65.6668C76.3026 65.494 76.3578 65.206 76.3026 64.918L74.3164 64.918C74.4268 65.206 74.5923 65.494 74.813 65.782Z" fill="#CAD0E2"/>
+<path d="M80.6626 76.1484C80.9384 76.206 81.0488 75.918 80.9936 75.5724C80.9384 75.2268 80.7177 75.1692 80.497 75.2844C80.3315 75.342 79.9453 75.6876 79.9453 75.8604C79.9453 76.0332 80.4419 76.1484 80.6626 76.1484Z" fill="#CAD0E2"/>
+<path d="M77.7371 65.4364C78.0681 65.782 78.3992 65.6668 78.7854 65.494C78.7854 65.2636 78.8405 65.0908 78.7854 64.918L77.6267 64.918C77.5716 65.0908 77.5716 65.2636 77.7371 65.4364Z" fill="#CAD0E2"/>
+<path d="M53.0762 64.918C53.2417 65.3788 53.5727 65.6092 54.0693 65.5516C54.4555 65.494 54.7865 65.2636 54.952 64.918L53.0762 64.918Z" fill="#CAD0E2"/>
+<path d="M56.6607 83.1219C56.7159 82.9491 56.4952 82.4883 56.109 82.4883C55.9987 82.4883 55.778 82.6611 55.7228 82.8339C55.6676 83.0067 55.7228 83.2947 55.8332 83.4099C56.1642 83.6403 56.5504 83.2947 56.6607 83.1219Z" fill="#CAD0E2"/>
+<path d="M56.1647 69.9293C55.8337 69.9869 55.6682 70.3325 55.7233 70.6781C55.7785 71.0237 55.9992 71.1965 56.3302 71.1389C56.6613 71.0813 56.882 70.7357 56.8268 70.4477C56.8268 70.1597 56.4406 69.8717 56.1647 69.9293Z" fill="#CAD0E2"/>
+<path d="M57.4889 64.9756C57.1579 65.0332 56.9924 65.2636 57.0476 65.6092C57.1027 66.0124 57.3786 66.1852 57.7096 66.1276C57.9303 66.07 58.0958 65.8972 58.151 65.6668C58.2614 65.7244 58.4269 65.782 58.5924 65.7244C58.8683 65.6668 59.1441 65.5516 59.1441 65.2636C59.1441 65.1484 59.0889 64.9756 59.0338 64.918L57.9303 64.918C57.9303 64.9756 57.8752 64.9756 57.8752 65.0332C57.7648 64.9756 57.6545 64.918 57.4889 64.9756Z" fill="#CAD0E2"/>
+<path d="M50.9224 81.162C51.419 81.0468 51.8604 80.4708 51.8052 79.9524C51.8052 79.6068 51.2535 79.2612 50.8121 79.3188C50.3155 79.434 50.0397 79.7796 50.0949 80.298C50.15 80.874 50.5362 81.2196 50.9224 81.162Z" fill="#CAD0E2"/>
+<path d="M50.2068 74.7675C50.3171 74.9979 50.7034 75.1131 50.8689 74.9979C51.1447 74.8251 51.0896 74.0186 50.8137 73.961C50.5378 73.9034 50.0965 74.4795 50.2068 74.7675Z" fill="#CAD0E2"/>
+<path d="M52.0814 64.918L49.709 64.918C49.709 65.206 49.378 65.9548 49.8194 66.5308C50.2607 67.1068 50.978 67.0492 51.5297 66.7036C51.9159 66.4156 52.1366 65.5516 52.0814 64.918Z" fill="#CAD0E2"/>
+<path d="M52.7999 73.3838C53.1861 73.3262 53.6275 72.6926 53.5723 72.2894C53.5171 71.7134 53.1309 71.3678 52.6344 71.483C52.1378 71.5982 51.8619 71.9438 51.9171 72.4622C52.0275 72.9806 52.4688 73.4414 52.7999 73.3838Z" fill="#CAD0E2"/>
+<path d="M36.1925 76.7251C35.9718 76.6675 35.5305 77.0131 35.4753 77.3587C35.4201 77.6467 35.5856 77.8771 35.9167 77.9347C36.4132 77.9923 36.7443 77.9347 36.7994 77.6467C36.7994 77.3587 36.4684 76.7827 36.1925 76.7251Z" fill="#CAD0E2"/>
+<path d="M60.1369 68.6053C60.1369 68.2597 59.7507 67.9141 59.4748 67.9141C58.8127 67.9717 58.3713 68.3173 58.4265 68.7781C58.4817 69.1813 59.0886 69.6421 59.4748 69.5845C59.8058 69.5269 60.192 68.9509 60.1369 68.6053Z" fill="#CAD0E2"/>
+<path d="M61.9587 65.3798C61.9587 65.207 61.9587 65.0918 61.9587 64.9766L59.5863 64.9766C59.5311 65.1494 59.5311 65.3222 59.5863 65.495C59.7518 66.0134 60.138 66.3014 60.5794 66.1862C60.8553 66.1286 61.1311 65.8406 61.2415 65.6102C61.4622 65.6102 61.738 65.4374 61.9587 65.3798Z" fill="#CAD0E2"/>
+<path d="M56.3305 73.5573C56.165 73.6149 56.0547 73.8453 56.0547 74.0181C56.0547 74.1909 56.2754 74.5941 56.4409 74.5941C56.6064 74.5941 56.8271 74.1909 56.8271 74.0181C56.8823 73.7301 56.5512 73.4421 56.3305 73.5573Z" fill="#CAD0E2"/>
+<path d="M58.318 80.3566C58.7042 80.299 58.9249 80.0116 58.8697 79.6084C58.8146 79.3204 58.5387 79.0318 58.2077 79.0894C57.8215 79.147 57.5456 79.435 57.6008 79.7806C57.6008 80.1262 57.9318 80.4142 58.318 80.3566Z" fill="#CAD0E2"/>
+<path d="M57.2695 73.2681C57.3799 73.2681 57.5454 73.2105 57.6557 73.0953C57.8213 73.0953 58.0419 73.0953 58.1523 73.0953C58.3178 73.0377 58.6488 72.6921 58.5937 72.4041C58.5385 72.2313 58.373 72.1161 58.1523 72.0585C58.0419 71.7129 57.7109 71.5977 57.2695 71.5977C56.8281 71.6553 56.6075 72.0009 56.6626 72.5769C56.6626 72.9801 56.9385 73.2681 57.2695 73.2681Z" fill="#CAD0E2"/>
+<path d="M39.8343 75.4001C39.8895 74.8817 39.2275 74.3633 38.6206 74.3633C38.124 74.3633 37.793 74.7089 37.793 75.2273C37.793 75.5729 37.9033 75.8033 38.0688 75.9761C38.124 76.2641 38.3447 76.4369 38.5654 76.3793C38.6206 76.3793 38.6757 76.3217 38.6757 76.3217C38.7309 76.3217 38.7861 76.3217 38.7861 76.3217C39.2826 76.3217 39.7792 75.9185 39.8343 75.4001Z" fill="#CAD0E2"/>
+<path d="M39.3933 89.2254C39.4485 88.8222 39.0623 88.3614 38.7864 88.419C38.5106 88.4766 38.1795 89.4558 38.4002 89.7438C38.6209 90.0318 39.3382 89.6286 39.3933 89.2254Z" fill="#CAD0E2"/>
+<path d="M61.9584 68.0886C62.3446 67.9734 62.5652 67.6854 62.4549 67.2822C62.3446 66.9942 62.0135 66.7638 61.7377 66.8214C61.4066 66.9366 61.1859 67.3398 61.2963 67.6854C61.3515 67.9734 61.6825 68.1462 61.9584 68.0886Z" fill="#CAD0E2"/>
+<path d="M38.6211 83.9843C38.6211 83.8115 38.3452 83.7539 38.1797 83.7539C38.1245 83.7539 37.959 83.9267 37.959 84.0419C37.959 84.1571 38.1797 84.2723 38.29 84.2723C38.4004 84.2723 38.6211 84.1571 38.6211 83.9843Z" fill="#CAD0E2"/>
+<path d="M40.2753 82.1402C40.6064 82.1402 40.9926 81.6794 40.9374 81.3338C40.9374 80.9882 40.6064 80.7578 40.2753 80.7578C39.9443 80.7578 39.6133 81.0458 39.6133 81.3338C39.6685 81.737 40.0547 82.1978 40.2753 82.1402Z" fill="#CAD0E2"/>
+<path d="M38.1792 66.1835C38.124 66.0107 38.0137 65.8379 37.8481 65.7227C37.5723 65.7803 37.2964 65.8379 37.0757 65.8955C36.9654 66.0107 36.9654 66.1259 36.9654 66.2411C36.5792 66.2987 36.2481 66.5291 36.193 66.8171C36.1378 67.5083 36.7447 67.7387 37.0757 67.8539C37.3516 67.9691 37.793 67.3931 37.7378 66.8747C38.0137 66.8171 38.2344 66.4715 38.1792 66.1835Z" fill="#CAD0E2"/>
+<path d="M37.7903 88.0692C37.9007 88.0116 38.0662 87.954 38.0662 87.7812C38.0662 87.6084 37.9007 87.5508 37.8455 87.5508C37.7352 87.5508 37.5145 87.6084 37.4593 87.8388C37.4041 88.0692 37.7352 88.0692 37.7903 88.0692Z" fill="#CAD0E2"/>
+<path d="M48.2773 79.0295C48.6635 78.9719 48.8842 78.7415 48.829 78.3959C48.7739 78.0503 48.5532 77.7623 48.2221 77.8199C47.9463 77.8199 47.6152 78.1655 47.6152 78.4535C47.6704 78.7991 47.9463 79.0295 48.2773 79.0295Z" fill="#CAD0E2"/>
+<path d="M49.2115 73.7316C49.3771 73.386 49.3771 73.0404 49.046 72.8676C48.9357 72.81 48.6598 72.8676 48.6046 72.9252C48.4943 73.098 48.4391 73.386 48.4943 73.5588C48.6598 73.962 48.9357 73.8468 49.2115 73.7316Z" fill="#CAD0E2"/>
+<path d="M50.6493 70.4457C50.9803 70.4457 51.3665 70.6761 51.532 70.1577C51.6424 69.8697 51.532 69.5817 51.3113 69.4089C50.9251 69.1209 50.6493 69.4665 50.3734 69.7545C50.1527 69.6393 49.9872 69.5241 49.8217 69.4089C49.932 69.1209 50.0424 68.8905 50.2079 68.6601C50.0975 68.4297 49.9872 68.2569 49.8217 68.0841C49.601 67.8537 48.9389 67.7385 48.7182 67.9113C48.4424 68.0841 48.3872 68.6025 48.6079 69.0633C48.6631 69.2361 48.7734 69.3513 48.8286 69.5241C48.6079 69.8697 48.3872 70.2153 48.3872 70.5609C48.2768 70.5609 48.2217 70.6185 48.1113 70.6185C47.67 70.7337 47.3941 71.5401 47.6148 72.0009C47.8355 72.4041 48.6079 72.6921 49.1044 72.2889C49.3803 72.0585 49.5458 71.7705 49.601 71.4825C49.6562 71.4825 49.7113 71.4825 49.7665 71.4825C50.3734 71.4825 50.5389 71.0217 50.6493 70.4457Z" fill="#CAD0E2"/>
+<path d="M41.0477 83.7538C41.1581 83.869 41.2684 83.9842 41.4339 83.9842C41.765 83.9842 41.8753 83.7538 41.8753 83.4658C42.2063 83.4082 42.5925 83.2354 42.427 82.6594C42.2615 82.0258 41.5443 81.7378 40.9925 81.853C40.4408 81.9682 39.8339 82.9474 40.1098 83.6386C40.3305 83.9842 40.7719 83.9842 41.0477 83.7538Z" fill="#CAD0E2"/>
+<path d="M49.38 84.1002C49.6007 84.1002 49.7111 83.4666 49.6559 83.409C49.4904 83.1786 49.3249 82.8906 49.049 82.8906C48.7731 82.8906 48.718 83.2938 48.7731 83.409C48.8835 83.5818 49.1593 84.1002 49.38 84.1002Z" fill="#CAD0E2"/>
+<path d="M43.0887 79.6035C43.1439 79.3731 43.1439 79.1427 43.2542 78.9699C43.4749 78.6243 43.5301 78.2787 43.3094 77.8755C43.1439 77.5875 42.3715 77.5299 42.0404 77.7027C41.7646 77.8755 41.4335 78.0483 41.5991 78.5667C41.7094 78.9123 41.7646 79.2579 41.8749 79.6035C41.8198 80.0067 42.0404 80.2371 42.3715 80.2371C42.7577 80.2371 42.9784 80.0067 43.0887 79.6035Z" fill="#CAD0E2"/>
+<path d="M47.7251 74.4237C47.8354 74.4237 48.1665 74.3085 48.1665 74.1357C48.1665 73.9629 47.8906 73.8477 47.7803 73.8477C47.6699 73.8477 47.4492 73.9629 47.4492 74.1357C47.4492 74.3085 47.6147 74.4237 47.7251 74.4237Z" fill="#CAD0E2"/>
+<path d="M60.8 70.1014C61.0207 70.1014 61.2414 69.871 61.131 69.583C61.0207 69.295 60.9103 69.0646 60.5793 69.1222C60.3034 69.1798 60.0827 69.7558 60.1931 69.9286C60.3034 70.1014 60.5793 70.1014 60.8 70.1014Z" fill="#CAD0E2"/>
+<path d="M73.8774 66.8742C73.9877 66.8166 74.1533 66.5862 74.1533 66.471C74.1533 66.2982 73.9877 66.0102 73.8774 65.9526C73.4912 65.7798 73.3257 66.1254 73.1602 66.4134C73.2705 66.759 73.4912 66.9894 73.8774 66.8742Z" fill="#CAD0E2"/>
+<path d="M2.09666 99.4168C2.207 99.1864 2.15183 99.0136 2.04149 98.8984C1.93114 99.1864 1.87597 99.532 1.76563 99.82C1.93114 99.7624 2.04149 99.5896 2.09666 99.4168Z" fill="#CAD0E2"/>
+<path d="M45.9594 83.2929C45.9594 83.2353 45.8491 83.0625 45.7388 83.0625C45.6284 83.0625 45.4629 83.2353 45.4629 83.3505C45.4629 83.4657 45.5732 83.7537 45.7388 83.7537C45.8491 83.7537 45.9043 83.4081 45.9594 83.2929Z" fill="#CAD0E2"/>
+<path d="M45.6292 78.6274C45.4085 78.685 44.9671 78.9154 45.0223 79.2034C45.0775 79.4914 45.4637 79.549 45.6844 79.6066C45.9051 79.6642 46.1258 79.549 46.1809 79.2034C46.1258 78.9154 45.8499 78.5698 45.6292 78.6274Z" fill="#CAD0E2"/>
+<path d="M12.6906 101.893C12.8561 101.836 12.9112 101.375 12.8561 101.202C12.8009 100.914 12.4147 100.799 12.2492 100.972C12.1388 101.087 12.0837 101.375 12.1388 101.548C12.194 101.663 12.4699 101.951 12.6906 101.893Z" fill="#CAD0E2"/>
+<path d="M13.5728 99.0741C13.3522 98.6133 12.9108 98.4981 12.4142 98.7285C12.028 98.9013 11.9728 99.3621 12.1935 99.8805C12.359 100.284 12.6901 100.456 13.0211 100.341C13.3522 100.168 13.6832 99.3621 13.5728 99.0741Z" fill="#CAD0E2"/>
+<path d="M69.793 67.3925C69.8481 67.3925 69.9033 67.2197 69.9033 67.2197C69.9033 67.1621 69.8481 67.0469 69.7378 67.0469C69.6826 67.0469 69.5723 67.1621 69.5723 67.2773C69.6274 67.3925 69.7378 67.3925 69.793 67.3925Z" fill="#CAD0E2"/>
+<path d="M64.7739 72.6327C64.9394 72.5175 64.9946 72.2295 64.9946 72.0567C64.9946 71.8263 64.8291 71.5959 64.5532 71.6535C64.2773 71.7111 64.0566 71.8263 64.0566 72.1719C64.0566 72.4023 64.6084 72.7479 64.7739 72.6327Z" fill="#CAD0E2"/>
+<path d="M66.0394 69.1808C66.3153 69.1232 66.536 68.432 66.4256 67.9712C66.3704 67.6832 65.8739 67.3952 65.598 67.5104C65.1566 67.6832 64.8808 68.0864 64.9911 68.432C65.1015 68.8352 65.7084 69.2384 66.0394 69.1808Z" fill="#CAD0E2"/>
+<path d="M66.979 76.2043C67.1445 76.2043 67.2548 75.9739 67.31 75.6859C67.3652 75.6859 67.5307 75.4555 67.4755 75.3979C67.4755 75.3403 67.4203 75.2827 67.3652 75.2251C67.3652 75.1675 67.3652 75.1675 67.3652 75.1099C67.3652 74.9371 67.0341 74.5339 66.7583 74.5915C66.4824 74.6491 66.3169 75.1099 66.2617 75.3979C66.3169 75.6283 66.7031 76.2043 66.979 76.2043Z" fill="#CAD0E2"/>
+<path d="M64.0007 67.4532C64.442 67.3956 64.8834 66.8772 64.8283 66.474C64.7731 66.1284 64.1662 65.8404 63.7248 65.898C63.3938 65.9556 63.1179 66.3588 63.1731 66.7044C63.2834 67.1652 63.6696 67.5108 64.0007 67.4532Z" fill="#CAD0E2"/>
+<path d="M62.3447 74.6529C62.4551 74.6529 62.5654 74.4225 62.5654 74.3649C62.5654 74.2497 62.3999 73.9617 62.2344 74.0193C62.0688 74.0769 62.0137 74.3649 62.0137 74.4801C62.0137 74.5377 62.2344 74.6529 62.3447 74.6529Z" fill="#CAD0E2"/>
+<path d="M63.005 77.4156C63.2808 77.358 63.5567 77.0124 63.5015 76.7244C63.4464 76.4364 63.1153 76.1484 62.7843 76.1484C62.4533 76.1484 62.2326 76.4364 62.2877 76.782C62.3429 77.1852 62.674 77.4732 63.005 77.4156Z" fill="#CAD0E2"/>
+<path d="M71.34 76.9568C71.671 76.8992 71.8917 76.5536 71.8366 76.208C71.7814 75.92 71.4504 75.6896 71.1745 75.7472C70.8435 75.8048 70.6779 76.1504 70.7331 76.496C70.7883 76.8992 71.009 77.072 71.34 76.9568Z" fill="#CAD0E2"/>
+<path d="M71.834 64.918L71.3926 64.918C71.5029 64.976 71.6684 64.976 71.834 64.918Z" fill="#CAD0E2"/>
+<path d="M72.055 72.8654C72.3308 72.7502 72.5515 72.635 72.4964 72.2894C72.4412 72.0014 72.055 71.7716 71.8343 71.8292C71.6136 71.8868 71.5033 72.2894 71.6136 72.5774C71.6688 72.8078 71.8343 72.923 72.055 72.8654Z" fill="#CAD0E2"/>
+<path d="M71.0063 66.5271C71.1167 66.5271 71.227 66.2391 71.227 66.0663C71.227 66.0087 71.0615 65.8359 71.0063 65.8359C70.896 65.8935 70.7305 66.0087 70.7305 66.1239C70.7305 66.1815 70.9512 66.5271 71.0063 66.5271Z" fill="#CAD0E2"/>
+<path d="M67.8618 64.9756C67.917 65.1484 68.1377 65.206 68.1928 65.206C68.3032 65.206 68.5791 65.0908 68.5239 64.9756C68.5239 64.9756 68.5239 64.918 68.4687 64.918L67.8066 64.918C67.917 64.918 67.8618 64.9756 67.8618 64.9756Z" fill="#CAD0E2"/>
+<path d="M71.1722 68.6612C70.8963 68.7188 70.7308 68.9487 70.786 69.2943C70.786 69.5823 71.3929 69.8703 71.5584 69.6975C71.7239 69.5247 71.7791 69.3519 71.7791 69.1215C71.7791 68.8335 71.448 68.6036 71.1722 68.6612Z" fill="#CAD0E2"/>
+<path d="M71.8899 67.8544C72.0554 67.9696 72.2761 67.7968 72.3313 67.5088C72.3864 67.2784 72.2761 66.9328 72.1106 66.76C71.8899 66.5872 71.7243 66.7024 71.6692 66.8176C71.5588 66.9904 71.614 67.1632 71.6692 67.336C71.7243 67.5664 71.7244 67.7392 71.8899 67.8544Z" fill="#CAD0E2"/>
+<path d="M46.7868 77.1304C47.1179 77.0728 47.2834 76.7848 47.2834 76.3816C47.2282 75.9784 46.9524 75.748 46.5662 75.8056C46.2903 75.8632 46.0144 76.324 46.0696 76.612C46.1248 76.9576 46.4558 77.188 46.7868 77.1304Z" fill="#CAD0E2"/>
+<path d="M39.7782 70.6758C39.5576 70.6758 39.392 70.791 39.2817 70.9062C39.1713 70.8486 39.061 70.791 38.8955 70.791C38.2886 70.7334 37.6265 71.3094 37.5713 71.943C37.5162 72.519 38.1782 73.1526 38.73 73.2102C39.1162 73.2678 39.5024 72.9798 39.6679 72.519C39.7231 72.519 39.7782 72.519 39.7782 72.519C40.2196 72.4614 40.661 71.7702 40.6058 71.2518C40.5507 70.9062 40.2196 70.6758 39.7782 70.6758Z" fill="#CAD0E2"/>
+<path d="M40.7199 79.4283C41.051 79.4283 41.1613 79.1979 41.2165 78.9099C41.2165 78.4491 40.9406 77.9883 40.6096 77.9883C40.2234 77.9883 39.782 78.3915 39.782 78.6795C39.7268 79.0827 40.1682 79.4283 40.7199 79.4283Z" fill="#CAD0E2"/>
+<path d="M48.3862 64.918L48 64.918C48.0552 64.9756 48.1655 64.9756 48.2207 64.9756C48.2759 64.9756 48.331 64.918 48.3862 64.918Z" fill="#CAD0E2"/>
+<path d="M41.4887 73.9612C41.4887 73.558 41.1577 73.2701 40.8266 73.3277C40.5508 73.3853 40.3301 73.6733 40.3301 74.0765C40.3853 74.4221 40.6059 74.6524 40.8818 74.5948C41.3232 74.5948 41.5439 74.3068 41.4887 73.9612Z" fill="#CAD0E2"/>
+<path d="M8.05419 107.194C7.8335 107.424 7.8335 107.77 8.05419 108C8.27488 108.173 8.60591 108.173 8.8266 107.943C9.04729 107.712 9.04729 107.309 8.8266 107.136C8.60591 106.963 8.33005 106.906 8.05419 107.194Z" fill="#CAD0E2"/>
+<path d="M8.88396 102.07C9.21499 101.897 9.43568 101.091 9.27017 100.745C8.9943 100.227 8.55292 100.054 8.11155 100.342C7.67017 100.63 7.55982 101.033 7.78051 101.551C8.0012 101.955 8.55292 102.243 8.88396 102.07Z" fill="#CAD0E2"/>
+<path d="M6.5101 108.98C6.84114 108.808 7.00665 108.52 6.84114 108.174C6.67562 107.828 6.34459 107.713 6.06872 107.828C5.79286 107.944 5.62734 108.404 5.73769 108.635C5.84803 108.98 6.17907 109.096 6.5101 108.98Z" fill="#CAD0E2"/>
+<path d="M9.04776 88.5901C9.43397 88.4173 9.70983 87.9565 9.65466 87.6109C9.65466 87.5533 9.59949 87.4381 9.48914 87.3229C9.70983 87.0925 9.87535 86.7469 9.82017 86.2861C9.82017 85.9405 9.70983 85.6525 9.43397 85.4797C9.70983 85.5373 9.93052 85.4797 10.1512 85.3645C10.5374 85.1341 10.7581 84.6157 10.5926 84.2125C10.7029 84.0397 10.7581 83.8093 10.7581 83.5789C10.7581 83.2333 10.4822 83.0029 10.096 82.9453C9.59948 83.5789 9.10293 84.2701 8.66155 84.9613C8.66155 84.9613 8.66155 85.0189 8.71673 85.0189C8.7719 85.1341 8.88224 85.2493 9.04776 85.3645C8.99259 85.3645 8.99259 85.3645 8.93742 85.3645C8.71673 85.3645 8.44086 85.4797 8.27535 85.6525C8.165 85.8253 7.99949 86.0557 7.88914 86.2285C7.83397 86.3437 7.83397 86.5165 7.83397 86.6317C7.83397 86.8045 7.94431 86.9773 8.05466 87.0925C7.99949 87.1501 7.94431 87.2077 7.94431 87.3805C7.88914 87.8989 7.66845 88.1869 7.33742 88.4749C7.06155 88.7053 7.06155 88.9933 7.28224 89.2813C7.50293 89.5693 8.05466 89.6269 8.165 89.2813C8.33052 88.7629 8.71673 88.6477 9.04776 88.5901Z" fill="#CAD0E2"/>
+<path d="M9.378 91.8766C9.65386 91.7038 9.70903 91.4158 9.54352 91.0702C9.26765 90.5518 8.99179 90.3214 8.71593 90.4942C8.3849 90.667 8.16421 91.3006 8.32972 91.6462C8.44007 91.9918 9.04696 92.107 9.378 91.8766Z" fill="#CAD0E2"/>
+<path d="M27.1431 81.107C27.2534 80.3582 26.7569 80.0126 26.3707 79.8398C25.9845 79.667 25.2121 79.7822 25.0465 80.531C24.9362 80.4158 24.8258 80.3582 24.7155 80.4158C24.55 80.4734 24.4948 80.9342 24.55 80.9918C24.6603 81.1646 24.881 81.3374 24.9914 81.2798C25.1017 81.7406 25.3776 82.0286 25.7086 82.0862C26.2603 82.2014 27.0879 81.683 27.1431 81.107Z" fill="#CAD0E2"/>
+<path d="M9.38086 93.4296C9.38086 93.66 9.4912 93.9479 9.76707 93.8903C9.93258 93.8327 10.2084 93.6023 10.2636 93.4871C10.2636 93.3143 10.0429 93.084 9.93258 92.9688C9.4912 92.9688 9.38086 93.1992 9.38086 93.4296Z" fill="#CAD0E2"/>
+<path d="M3.80612 96.7101C4.41301 97.1133 5.07508 96.7677 5.46129 96.2493C5.8475 95.7309 5.57164 94.3485 5.07508 93.9453C4.57853 93.5421 4.0268 94.0605 3.86129 93.9453C3.86129 93.9453 3.80612 93.8877 3.80612 93.8301C3.58543 94.3485 3.36474 94.8669 3.19922 95.3853C3.30956 95.7885 3.36474 96.4221 3.80612 96.7101Z" fill="#CAD0E2"/>
+<path d="M35.3664 89.916C35.4767 90.492 35.8077 90.8952 36.1388 90.8952C36.4146 90.8376 36.5802 90.6648 36.6353 90.3768C36.7457 89.8584 36.6353 89.6856 36.0836 89.3976C35.9181 88.9944 35.8629 88.5912 35.6974 88.3032C35.5319 87.9576 35.0353 87.9576 34.9802 88.3608C34.8698 88.764 34.6491 89.2248 34.8698 89.6856C34.9802 89.7432 35.1457 89.8008 35.3664 89.916Z" fill="#CAD0E2"/>
+<path d="M7.7786 97.8633C8.05446 97.7481 8.16481 97.4025 7.99929 97.1145C7.83377 96.7113 7.3924 96.4809 7.00619 96.5961C6.67515 96.7113 6.50964 97.1721 6.61998 97.4601C6.84067 97.8057 7.44757 98.0361 7.7786 97.8633Z" fill="#CAD0E2"/>
+<path d="M18.3715 75.8619C18.8129 75.8043 19.3646 74.9979 19.2543 74.7675C19.1991 74.6523 18.9233 74.4795 18.5922 74.4219C18.2612 74.6523 17.9853 74.9403 17.6543 75.1707C17.6543 75.2283 17.6543 75.2859 17.7095 75.3435C17.8198 75.6891 18.0405 75.9195 18.3715 75.8619Z" fill="#CAD0E2"/>
+<path d="M17.765 80.1209C17.765 79.7177 17.3237 79.4297 16.6616 79.4297C16.3857 79.4297 16.0547 79.8905 16.0547 80.1785C16.0547 80.5241 16.5512 81.0425 16.8271 81.0425C17.2133 81.1001 17.765 80.5241 17.765 80.1209Z" fill="#CAD0E2"/>
+<path d="M18.5923 81.7352C18.813 81.6776 18.7026 81.3896 18.6475 81.2168C18.6475 81.1592 18.3716 81.044 18.3716 81.1016C18.2613 81.1592 18.1509 81.332 18.2061 81.4472C18.2613 81.5624 18.3716 81.7928 18.5923 81.7352Z" fill="#CAD0E2"/>
+<path d="M12.2487 88.2433C12.4694 88.1857 12.966 88.1857 12.966 87.7825C12.966 87.3793 12.4694 87.3217 12.2487 87.2641C12.0281 87.1489 11.8074 87.4369 11.7522 87.7825C11.7522 88.1281 11.9177 88.3585 12.2487 88.2433Z" fill="#CAD0E2"/>
+<path d="M11.3113 88.8789C11.5872 88.7061 11.6975 88.3605 11.532 88.0149C11.201 87.4389 10.87 87.2661 10.4838 87.4389C10.2079 87.6117 9.9872 88.3029 10.1527 88.5909C10.3182 88.8789 11.0355 89.0517 11.3113 88.8789Z" fill="#CAD0E2"/>
+<path d="M12.7466 86.9217C12.9121 86.6337 12.9121 86.3457 12.6362 86.1153C12.5259 86.0001 12.4155 85.8273 12.3052 85.6545C12.0293 85.1937 11.7535 85.0209 11.2569 85.1361C10.8155 85.2513 10.65 85.5969 10.9259 86.1729C11.1466 86.4033 11.4776 86.7489 11.919 87.0369C12.1948 87.2673 12.5259 87.2097 12.7466 86.9217Z" fill="#CAD0E2"/>
+<path d="M6.34549 102.527C6.511 102.642 6.73169 102.47 6.78687 102.412C6.84204 102.297 6.95238 102.124 6.78687 101.951C6.62135 101.778 6.40066 101.779 6.23514 102.009C6.1248 102.239 6.17997 102.412 6.34549 102.527Z" fill="#CAD0E2"/>
+<path d="M27.7531 83.7547C27.8083 83.4667 27.5324 83.1211 27.1462 83.1211C27.0358 83.2939 26.8703 83.4667 26.8152 83.6971C26.76 83.9851 26.9807 84.1579 27.2565 84.1579C27.4772 84.1579 27.6979 84.1003 27.7531 83.7547Z" fill="#CAD0E2"/>
+<path d="M25.104 94.6398C25.4902 94.6974 25.7661 94.467 25.9316 94.1214C26.0419 93.891 26.0971 93.603 26.1523 93.315C26.2626 93.2574 26.373 93.2574 26.5385 93.1998C26.9798 92.9694 27.3109 92.451 27.2557 92.0478C27.2005 91.5294 26.8695 91.1838 26.4281 90.9534C26.2626 90.8958 26.0419 90.8958 25.8764 90.9534C25.2695 91.2414 25.104 91.8174 25.2695 92.451C25.3247 92.5662 25.3798 92.6814 25.3798 92.8542C25.1592 92.9118 24.8833 92.9694 24.7178 93.0846C24.3316 93.2574 24.2212 93.4878 24.3316 93.9486C24.4419 94.3518 24.7178 94.5822 25.104 94.6398Z" fill="#CAD0E2"/>
+<path d="M28.6334 94.8697C28.5782 94.3513 27.9713 94.2937 27.8058 94.4665C27.6403 94.6393 27.6403 95.0425 27.8058 95.2153C28.0265 95.4457 28.5782 95.3881 28.6334 94.8697Z" fill="#CAD0E2"/>
+<path d="M24.2751 89.7973C24.2751 89.3941 23.944 89.1061 23.5027 89.0485C23.0061 88.9909 22.4544 89.3941 22.3992 89.7973C22.344 90.3157 22.7854 90.8341 23.282 90.8917C23.7233 90.9493 24.2199 90.4309 24.2751 89.7973Z" fill="#CAD0E2"/>
+<path d="M24.716 88.3577C25.1022 88.1849 25.1574 87.7817 25.0471 87.3785C24.716 87.2057 24.385 87.0905 24.1091 87.3785C23.8884 87.6089 23.8884 87.9546 24.1091 88.185C24.2746 88.3002 24.5505 88.4153 24.716 88.3577Z" fill="#CAD0E2"/>
+<path d="M23.726 94.2947C23.8363 94.2371 23.8915 94.0068 23.8363 93.8916C23.8363 93.7764 23.5604 93.7188 23.5053 93.7188C23.3949 93.7764 23.1742 93.9491 23.2294 94.1219C23.3398 94.2947 23.6156 94.2947 23.726 94.2947Z" fill="#CAD0E2"/>
+<path d="M29.022 90.0884C28.9669 89.57 28.36 89.5124 28.1945 89.6852C28.0289 89.858 28.0289 90.2612 28.1945 90.434C28.4703 90.6644 28.6358 90.6068 29.022 90.0884Z" fill="#6C88DF"/>
+<path d="M32.9927 85.5968C33.2134 85.6544 33.6548 85.712 33.8755 85.4816C34.0962 85.2512 34.4824 85.0784 34.4824 84.7904C34.4824 84.5024 34.4272 84.3872 34.2617 84.272C34.1513 84.1568 34.0962 83.984 33.8203 83.8688C33.5444 83.7536 33.0479 83.7536 32.7169 84.0416C32.3858 84.3296 32.3307 84.6752 32.3858 85.0208C32.4962 85.3664 32.772 85.5392 32.9927 85.5968Z" fill="#CAD0E2"/>
+<path d="M34.7578 81.277C34.7578 81.6802 35.3647 82.3714 35.6957 82.3714C36.0819 82.3138 36.413 81.7954 36.413 81.2194C36.413 80.701 36.0268 80.4706 35.4751 80.5282C35.144 80.5282 34.7578 80.9314 34.7578 81.277Z" fill="#CAD0E2"/>
+<path d="M35.42 75.5748C35.8062 75.5748 36.0821 75.2868 36.0821 74.9412C36.0269 74.538 35.5304 73.962 35.2545 74.0196C34.8131 74.0196 34.4821 74.4228 34.5373 74.9988C34.4821 75.3444 34.8683 75.6324 35.42 75.5748Z" fill="#CAD0E2"/>
+<path d="M36.2482 79.5497C36.2482 79.3769 36.0276 79.2617 35.9172 79.2617C35.8069 79.2617 35.531 79.4345 35.531 79.5497C35.531 79.7225 35.862 79.8377 35.9724 79.8377C36.0827 79.8377 36.2482 79.7225 36.2482 79.5497Z" fill="#CAD0E2"/>
+<path d="M32.6064 81.6201C32.6064 81.5049 32.5512 81.4473 32.5512 81.3321C32.5512 81.2745 32.5512 81.2169 32.5512 81.2169C32.496 81.1593 32.4408 81.1017 32.3857 81.1017C32.165 80.8137 31.7236 80.6409 31.3374 80.6985C30.7857 80.7561 30.2891 81.4473 30.3443 81.9657C30.3995 82.5993 30.9512 83.1753 31.5029 83.1177C31.9443 82.9449 32.6064 82.1385 32.6064 81.6201Z" fill="#CAD0E2"/>
+<path d="M23.1155 99.596C23.3914 99.4808 23.281 98.732 23.1707 98.444C23.0603 98.2712 22.6741 98.0408 22.4534 98.156C22.1776 98.2712 22.1776 98.7896 22.2879 99.0776C22.2879 99.308 22.8397 99.7688 23.1155 99.596Z" fill="#CAD0E2"/>
+<path d="M33.8201 78.7398C33.4339 78.7398 32.9925 79.3734 33.0477 79.7766C33.1028 80.0646 33.5994 80.4678 33.9304 80.4678C34.2063 80.4102 34.5373 80.0646 34.4821 79.7766C34.4821 79.0854 34.2063 78.6822 33.8201 78.7398Z" fill="#CAD0E2"/>
+<path d="M21.516 90.8379C21.7918 90.6651 21.9022 90.3195 21.7367 89.9739C21.5711 89.6283 21.2953 89.4555 21.0746 89.5707C20.7987 89.7435 20.6332 90.3195 20.7435 90.6075C20.7987 90.8955 21.1849 91.0107 21.516 90.8379Z" fill="#CAD0E2"/>
+<path d="M15.7242 98.6141C16.2208 98.3261 16.3863 97.9229 16.1656 97.4621C15.9449 97.0589 15.5035 96.8285 15.1725 96.9437C14.7311 97.1741 14.5104 97.9229 14.7311 98.3837C14.8966 98.6717 15.3932 98.7869 15.7242 98.6141Z" fill="#CAD0E2"/>
+<path d="M16.3303 106.624C16.6613 106.451 16.7716 106.105 16.6061 105.702C16.4958 105.414 16.1096 105.299 15.7785 105.472C15.4475 105.645 15.282 106.048 15.4475 106.336C15.613 106.681 15.9992 106.797 16.3303 106.624Z" fill="#CAD0E2"/>
+<path d="M16.7703 100.343C16.66 100.055 16.329 99.8818 16.0531 99.997C15.7772 100.112 15.6117 100.458 15.7221 100.803C15.8324 101.149 16.1083 101.264 16.3841 101.149C16.7703 101.034 16.9359 100.688 16.7703 100.343Z" fill="#CAD0E2"/>
+<path d="M13.8495 96.0806C14.015 96.023 14.1253 95.7926 14.1805 95.5622C14.2909 95.7926 14.5115 95.8502 14.7322 95.7926C14.8978 95.735 15.1184 95.5622 15.1736 95.447C15.3391 94.9862 15.0081 94.7558 14.5667 94.5254C14.4012 94.6406 14.2357 94.7558 14.1253 94.9286L14.1253 94.871C14.015 94.583 13.5184 94.3526 13.2978 94.4678C12.6909 94.7558 12.415 95.2742 12.5805 95.6774C12.8012 96.0806 13.5184 96.2534 13.8495 96.0806Z" fill="#CAD0E2"/>
+<path d="M11.9166 107.945C11.9718 107.945 11.9718 107.772 11.9718 107.714C11.9166 107.657 11.8615 107.599 11.7511 107.657C11.6408 107.714 11.5856 107.829 11.6408 107.887C11.696 107.945 11.9166 108.002 11.9166 107.945Z" fill="#CAD0E2"/>
+<path d="M18.4276 87.034C18.4276 86.2276 18.0966 85.8244 17.3793 85.7668C17.3793 85.6516 17.3793 85.594 17.3242 85.5364C17.1586 85.3636 16.9379 85.3636 16.7173 85.4212C16.4414 85.4788 16.2759 85.882 16.4414 86.1124L16.4966 86.17C16.331 86.4004 16.2207 86.6884 16.2207 86.9764C16.2207 87.2644 16.3862 87.4948 16.6621 87.7252C16.6069 87.7252 16.6069 87.7252 16.5517 87.7828C16.331 87.9556 16.3862 88.1284 16.4414 88.3588C16.5517 88.6468 16.8828 88.762 17.0483 88.5316C17.2138 88.4164 17.3242 88.2436 17.3242 88.0708C17.3793 88.0708 17.4345 88.0708 17.4897 88.0708C18.0414 88.1284 18.4276 87.61 18.4276 87.034Z" fill="#CAD0E2"/>
+<path d="M19.2543 85.5374C19.806 85.5374 20.4129 84.9038 20.4129 84.3854C20.4129 83.7518 19.9716 83.1758 19.4198 83.1758C18.9233 83.1758 18.1509 83.9246 18.0957 84.443C18.0957 84.9614 18.6474 85.5374 19.2543 85.5374Z" fill="#CAD0E2"/>
+<path d="M21.0199 92.5627C21.0199 92.1595 20.6889 91.6411 20.413 91.6411C19.9716 91.5835 19.4199 92.1019 19.4199 92.5627C19.4199 92.9659 19.8613 93.4267 20.3027 93.4843C20.7441 93.4843 20.9647 93.1387 21.0199 92.5627Z" fill="#CAD0E2"/>
+<path d="M11.6421 105.179C11.8077 104.949 12.0283 104.373 11.5318 104.085C10.5939 104.085 10.8145 103.451 10.1525 103.221C10.0421 103.163 9.87662 103.221 9.82145 103.221C9.1042 103.394 8.88352 104.027 9.32489 104.546C9.60076 104.891 9.93179 105.179 10.2628 105.41C10.649 105.698 11.3663 105.525 11.6421 105.179Z" fill="#CAD0E2"/>
+<path d="M17.4898 96.4261C17.7657 96.2533 17.876 95.9653 17.7105 95.6773C17.545 95.2741 17.214 95.1589 16.8829 95.3317C16.6071 95.5045 16.4415 95.9077 16.6071 96.1957C16.7726 96.4261 17.214 96.5989 17.4898 96.4261Z" fill="#CAD0E2"/>
+<path d="M22.6204 82.4269C23.0066 82.2541 23.2825 81.3901 23.0066 81.0445C22.7859 80.6413 21.9583 80.4109 21.4618 80.8717C21.0204 81.3325 20.9652 81.8509 21.1307 82.2541C21.3514 82.6573 22.0687 82.6573 22.6204 82.4269Z" fill="#CAD0E2"/>
+<path d="M17.9313 91.2399C17.8209 91.0671 17.5451 90.9519 17.2692 90.9519C17.214 90.4911 16.883 90.2031 16.3865 90.2031C15.7796 90.2031 15.283 90.7215 15.3382 91.4127C15.3934 91.9311 15.8347 92.3919 16.3865 92.3343C16.4968 92.3343 16.6071 92.2767 16.6623 92.2767C16.883 92.5071 17.214 92.5647 17.4899 92.4495C17.8209 92.2767 18.0968 91.5855 17.9313 91.2399Z" fill="#CAD0E2"/>
+<path d="M281.544 116.411L96.9371 116.411C71.4475 116.411 50.7578 94.8106 50.7578 68.1994C50.7578 41.5883 71.4475 19.9883 96.9371 19.9883L281.544 19.9883C307.034 19.9883 327.723 41.5883 327.723 68.1994C327.723 94.8106 307.034 116.411 281.544 116.411Z" fill="#7DE2D1"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M276.859 116.412L96.9371 116.412C71.4475 116.412 50.7578 94.8124 50.7578 68.2012C50.7578 67.0981 50.7934 66.0032 50.8634 64.918L230.785 64.918C256.275 64.918 276.965 86.518 276.965 113.129C276.965 114.233 276.929 115.328 276.859 116.412Z" fill="#00BFB3"/>
+<path d="M56.221 61.2859C56.3865 60.9403 56.1658 60.1915 55.8348 59.9611C55.3382 59.6731 54.8415 59.8459 54.6208 60.3067C54.4001 60.7675 54.5656 61.2283 55.007 61.4587C55.1173 61.5163 55.2831 61.5739 55.4486 61.5739C55.3934 61.6315 55.3382 61.6891 55.3382 61.7467C55.3382 61.8619 55.4486 62.1499 55.6141 62.1499C55.7796 62.1499 55.8348 61.8619 55.8348 61.6891C55.8348 61.6315 55.8348 61.5739 55.7796 61.5163C56.0003 61.5163 56.1658 61.4011 56.221 61.2859Z" fill="#42D4C6"/>
+<path d="M68.4697 30.9909C68.5249 31.1637 68.58 31.2789 68.8007 31.3365C68.9111 31.3941 69.1869 31.2789 69.2421 31.1637C69.3525 30.9909 69.4076 30.7029 69.2973 30.5877C69.1869 30.3573 69.0214 30.2997 68.8559 30.3573C68.8559 30.2421 68.8559 30.1845 68.8007 30.1269C68.8007 30.0693 68.7456 30.0693 68.7456 30.0117C68.4697 30.2421 68.1938 30.4725 67.918 30.7029C68.1387 30.8757 68.3042 30.9909 68.4697 30.9909Z" fill="#42D4C6"/>
+<path d="M79.3384 28.9767C79.2832 28.9767 79.2281 28.9767 79.1729 28.9767C79.2281 28.8039 79.2832 28.5159 79.2832 28.4007C79.2832 28.1127 79.0625 27.9975 78.7867 28.0551C78.5108 28.1127 78.2901 28.2855 78.4005 28.5159C78.4556 28.6311 78.5108 28.8039 78.6212 28.9191C78.2901 28.9191 77.9039 28.9191 77.5729 28.8615C77.4074 28.8039 77.1867 28.8615 76.966 28.9191C77.0212 28.8039 77.0763 28.6887 77.0763 28.5159C77.0763 28.1127 76.7453 27.8247 76.4143 27.8823C76.0832 27.9399 75.8074 28.2855 75.8625 28.5735C75.9177 28.9191 76.2487 29.2071 76.5798 29.1495C76.5246 29.2071 76.4694 29.3223 76.4694 29.3799C76.4143 29.7255 76.8556 30.0711 77.0212 30.0711C77.4625 30.0135 77.5177 30.3591 77.7384 30.5895C77.9039 30.7623 78.2349 30.8775 78.5108 30.9351C78.6763 30.9927 78.897 30.9351 79.0625 30.9351C79.2281 30.9351 79.4487 30.8775 79.6143 30.8199C80.2212 30.7047 80.4418 30.3591 80.4418 29.8983C80.2763 29.3223 79.8901 28.9767 79.3384 28.9767Z" fill="#42D4C6"/>
+<path d="M72.7183 36.865C72.8286 36.577 72.7183 36.2314 72.4424 35.9434C72.7183 35.8858 72.9941 35.7706 73.2148 35.5978C73.27 35.5402 73.3252 35.4826 73.3803 35.3674C73.4907 35.3098 73.5459 35.2522 73.5459 35.1946C73.5459 35.137 73.5459 35.0218 73.4907 34.9066C73.5459 34.6186 73.4355 34.273 73.27 34.1002C72.939 33.7546 72.1114 33.7546 71.7252 34.273C71.3941 34.7338 71.4493 35.1946 71.6148 35.5402C71.339 35.5978 71.1183 35.7706 70.9528 36.1738C70.8424 36.4042 70.9527 36.8074 71.1183 36.9802C71.0631 36.9802 71.0079 36.9226 70.8976 36.9226C70.4562 36.865 70.1803 37.0954 70.2355 37.7866C70.401 38.0746 70.5665 38.5354 70.8424 38.9386C71.0079 39.2266 71.339 39.2842 71.6148 39.1114C71.8355 38.9386 72.001 38.6506 71.8355 38.305C71.7803 38.1322 71.7252 37.9594 71.67 37.7866C71.6148 37.4986 71.5596 37.3258 71.3941 37.153C71.8907 37.3258 72.6079 37.0954 72.7183 36.865Z" fill="#42D4C6"/>
+<path d="M79.7795 31.2238C79.5036 31.051 79.0071 31.1662 78.8415 31.3966C78.5105 31.9726 78.5657 32.5486 78.8967 32.7214C79.2278 32.9518 79.8347 32.7214 80.1105 32.3182C80.3312 32.0878 80.1657 31.4542 79.7795 31.2238Z" fill="#42D4C6"/>
+<path d="M61.7933 55.1245C61.5726 54.9517 61.1864 55.0093 61.0208 55.2973C60.8553 55.5853 60.9105 55.9885 61.1864 56.1613C61.4622 56.3917 61.7381 56.3341 61.9036 55.9885C62.1243 55.6429 62.0691 55.2973 61.7933 55.1245Z" fill="#42D4C6"/>
+<path d="M62.896 51.901C63.2822 51.8434 63.7236 51.2098 63.7236 50.8066C63.6684 50.2306 63.2822 49.885 62.7856 49.9426C62.565 50.0002 62.4546 50.0578 62.2891 50.173C62.2339 50.1154 62.1787 50.0578 62.0684 50.0002C61.9029 49.8274 61.627 49.8274 61.4615 50.173C61.3512 50.461 61.296 50.6914 61.5718 50.9218C61.6822 50.9794 61.8477 50.9794 62.0132 50.9218L62.0132 50.9794C62.1236 51.4978 62.5649 51.9586 62.896 51.901Z" fill="#42D4C6"/>
+<path d="M61.6827 64.1113C61.6276 64.1689 61.6276 64.3417 61.7379 64.3417C61.8482 64.3993 61.9586 64.2841 61.9586 64.2265C61.9586 64.1689 61.9034 64.0537 61.8482 63.9961C61.8482 63.9961 61.7379 63.9961 61.6827 64.1113Z" fill="#42D4C6"/>
+<path d="M73.3784 33.5829C73.6543 33.2949 73.9853 33.0645 73.7646 32.6613C73.7094 32.5461 73.6543 32.4885 73.5439 32.4309C73.7095 32.2005 73.6543 31.9125 73.5991 31.5669C73.2129 31.5093 72.8267 31.2789 72.606 31.6821C72.4405 31.9701 72.4957 32.2581 72.7163 32.4885C72.6612 32.5461 72.606 32.6613 72.606 32.8341C72.6612 33.2949 72.9922 33.4101 73.3784 33.5829Z" fill="#42D4C6"/>
+<path d="M72.0538 30.872C72.44 30.8144 72.6607 30.584 72.6056 30.2384C72.5504 29.72 72.2193 29.3744 71.8331 29.432C71.7228 29.432 71.5021 29.6624 71.3918 29.8352C71.2262 29.7776 71.0607 29.72 70.84 29.7776C70.3987 29.8352 70.178 30.5264 70.2331 31.16C70.2331 31.3904 70.4538 31.6784 70.7297 31.8512C70.3987 32.024 70.178 32.2544 69.9021 32.5424C69.6262 32.8304 69.9021 33.2912 69.4607 33.2336C69.3504 33.2336 69.24 33.2336 69.1297 33.2336C69.0193 32.888 68.7987 32.6 68.4124 32.3696C67.8607 32.0816 67.309 32.2544 67.0331 32.8304C66.7573 33.3488 67.0331 34.2128 67.5297 34.4432C67.7504 34.5584 67.9711 34.5584 68.2469 34.5008C68.4124 34.7888 68.6883 34.9616 69.0193 35.0192C68.7987 35.2496 68.6331 35.6528 68.6883 35.9984C68.7435 36.5168 69.4056 36.9776 69.9573 36.92C70.4538 36.8048 70.84 36.344 70.7849 35.8832C70.7297 35.4224 70.178 34.9616 69.7366 34.8464C69.9021 34.7312 70.0124 34.616 70.0124 34.4432C70.0676 34.0976 70.7849 34.5008 70.9504 34.04C71.0607 33.5792 71.6676 33.5216 71.778 32.9456C71.8331 32.6 71.778 32.1968 71.5573 31.9664C71.778 31.6784 72.0538 31.2752 72.0538 30.872Z" fill="#42D4C6"/>
+<path d="M59.2553 43.7786C59.1449 44.0666 59.3105 44.7002 59.5311 44.8154C59.6415 44.873 59.807 44.873 59.9174 44.8154C59.9174 44.873 59.9725 44.9306 59.9725 44.9306C60.4139 45.5066 61.1311 45.449 61.6829 45.1034C62.2346 44.7578 62.4553 43.3178 62.1242 42.857C61.7932 42.3386 61.1311 42.569 61.0208 42.3962C60.9656 42.3386 61.0208 42.0506 61.076 41.705L61.1311 41.705C61.1311 41.6474 61.1311 41.5898 61.076 41.5322C61.076 41.3018 61.0208 41.0138 60.9105 40.7834C60.5794 40.3226 59.8622 40.1498 59.3105 40.265C58.8691 40.8986 58.4829 41.5322 58.0415 42.2234L58.0415 42.281C57.9863 42.3386 57.9311 42.3962 57.876 42.3962C57.876 42.4538 57.8208 42.4538 57.8208 42.5114C57.7656 42.6266 57.7656 42.6842 57.7656 42.7994C57.7656 42.9722 57.9311 43.145 58.0967 43.2602C58.0967 43.3754 58.0967 43.4906 58.1518 43.5482C58.2622 43.6058 58.4829 43.4906 58.538 43.3754C58.7036 43.3178 58.8139 43.2026 58.8691 43.0874C59.3105 43.2026 59.807 43.2026 59.9174 43.3178C59.9725 43.3754 59.9174 43.4906 59.9174 43.6058C59.5863 43.4906 59.3656 43.5482 59.2553 43.7786Z" fill="#42D4C6"/>
+<path d="M73.1581 27.0165C73.1581 26.9589 73.2132 26.9014 73.2132 26.8438C72.4408 27.3046 71.7236 27.8229 70.9512 28.3413C71.0615 28.5141 71.1719 28.6869 71.3374 28.7445C71.7236 28.9173 72.3857 28.6869 72.7167 28.3413C72.7167 28.5141 72.7719 28.6869 72.8822 28.8021C73.1581 29.0325 72.4408 29.4933 72.7719 29.8389C73.1029 30.1845 72.827 30.7606 73.2684 31.1638C73.7098 31.567 74.3719 31.6822 74.5925 31.1638C74.5925 31.1062 74.5925 31.1061 74.5925 31.0485C74.7029 31.2213 74.9236 31.4518 75.0339 31.4518C75.1994 31.4518 75.4201 30.9334 75.365 30.8758C75.2546 30.703 74.9788 30.4149 74.8684 30.4725C74.8132 30.4725 74.7581 30.5877 74.7029 30.6453C74.7029 30.3573 74.6477 30.0694 74.5374 29.7238C74.427 29.3206 73.9305 29.3205 74.2063 28.9749C74.4822 28.6293 74.9236 27.7077 74.1512 27.3045C73.765 27.1317 73.2132 27.3045 72.9925 27.6501C72.9925 27.5925 72.9374 27.4774 72.9374 27.4198C72.9925 27.3046 73.1029 27.1893 73.1581 27.0165Z" fill="#42D4C6"/>
+<path d="M54.7304 51.67C54.6752 51.1516 54.3993 50.7484 54.0683 50.6332C54.289 50.518 54.3993 50.3452 54.5097 50.0572C54.5648 49.942 54.5648 49.7692 54.5648 49.654C55.0062 49.7116 55.0062 49.2508 55.1717 48.8476C55.0614 48.7324 54.951 48.6748 54.8407 48.6172C54.1235 50.2876 53.4614 52.0732 52.9648 53.8588C53.1855 53.9164 53.4062 53.9164 53.5717 53.8012C54.0131 53.5132 53.9579 52.9948 53.9028 52.8796C54.3442 52.7068 54.7855 52.1884 54.7304 51.67Z" fill="#42D4C6"/>
+<path d="M76.3047 25.7493C76.1944 26.0373 76.4151 26.9013 76.6358 27.0165C76.9668 27.1893 77.4634 26.9589 77.7392 26.4405C77.9599 25.9797 77.8496 25.6917 77.2978 25.4037C76.9116 25.2309 76.4703 25.4037 76.3047 25.7493Z" fill="#42D4C6"/>
+<path d="M59.8616 49.9386C60.5237 49.9386 60.6892 49.4778 60.7995 48.9018C61.1306 48.9018 61.5168 49.1322 61.6823 48.6138C61.7926 48.3258 61.6823 48.0378 61.4616 47.865C61.0754 47.577 60.7995 47.9226 60.5237 48.153C60.3582 48.0378 60.1375 47.9226 59.972 47.8074C60.0823 47.5194 60.2478 47.289 60.3582 47.0586C60.2478 46.8282 60.1375 46.6554 59.972 46.4826C59.7513 46.2522 59.0892 46.137 58.8685 46.2522C58.5926 46.425 58.5375 46.9434 58.703 47.4042C58.7582 47.577 58.8685 47.6922 58.9237 47.865C58.703 48.2106 58.4271 48.5562 58.4271 48.9018C58.3168 48.9018 58.2616 48.9594 58.1513 48.9594C57.7099 49.0746 57.3789 49.881 57.5995 50.2842C57.8202 50.6874 58.5375 50.9754 59.034 50.6298C58.9789 50.6874 58.9789 50.6874 58.9237 50.745C58.8685 50.8602 58.8685 51.033 58.8685 51.2058C58.7582 51.2058 58.5926 51.2634 58.5375 51.321C58.4271 51.4938 58.372 51.7818 58.4271 51.9546C58.5926 52.3002 58.9237 52.185 59.1444 52.0698C59.1995 51.9546 59.2547 51.7818 59.2547 51.6666C59.5306 51.7242 59.8616 51.5514 59.972 51.321C60.0823 51.033 60.0271 50.6874 59.7513 50.5722C59.5306 50.457 59.3099 50.457 59.1444 50.5146C59.3651 50.2842 59.4754 50.0538 59.5306 49.8234C59.7513 49.9386 59.8064 49.9386 59.8616 49.9386Z" fill="#42D4C6"/>
+<path d="M76.0278 33.0625C76.1382 32.8321 75.8623 32.0833 75.5865 31.9105C75.3106 31.7377 74.9796 31.9105 74.8141 32.3137C74.5934 32.8321 74.6485 33.1201 74.9796 33.2929C75.4209 33.5809 75.8623 33.4657 76.0278 33.0625Z" fill="#42D4C6"/>
+<path d="M79.6679 24.0191C80.2748 23.8463 80.9369 23.7311 81.5438 23.6159C81.9852 24.8831 82.0955 24.9983 82.9783 24.4223C83.0334 23.7311 82.7024 23.3855 82.0955 23.2703C82.0403 23.0399 82.0403 22.8095 81.9852 22.6367C80.8817 23.0399 79.8334 23.4431 78.7852 23.9039C78.8955 24.0767 79.2265 24.1343 79.6679 24.0191Z" fill="#42D4C6"/>
+<path d="M59.9185 54.3165C60.1392 53.7981 60.0289 53.3373 59.6427 53.1069C59.2565 52.8765 58.7047 52.9917 58.5944 53.2797C58.3737 53.7405 58.5944 54.4893 59.0358 54.7197C59.3116 54.8925 59.753 54.6621 59.9185 54.3165Z" fill="#42D4C6"/>
+<path d="M66.0957 44.9302C65.7095 44.9878 65.1026 45.679 65.1578 46.0822C65.213 46.543 65.6544 46.8886 66.1509 46.8886C66.5923 46.8886 67.0888 46.3702 67.0337 45.9094C66.9785 45.391 66.482 44.8726 66.0957 44.9302Z" fill="#42D4C6"/>
+<path d="M67.2538 41.9382C67.1987 41.3622 66.978 41.0742 66.7021 41.0742C66.3711 41.0742 65.9297 41.5926 65.9297 41.9958C65.9297 42.3414 66.4814 42.6294 66.8124 42.5718C67.1435 42.5718 67.309 42.2838 67.2538 41.9382Z" fill="#42D4C6"/>
+<path d="M68.8544 42.7974C69.0199 42.5094 68.8544 42.279 68.6337 42.2214C68.4682 42.1638 67.9716 42.1638 67.8613 42.279C67.7509 42.3942 68.0268 42.855 68.1923 43.0278C68.413 43.2006 68.6889 43.0854 68.8544 42.7974Z" fill="#42D4C6"/>
+<path d="M67.697 39.4006C68.1384 39.4006 68.5246 39.055 68.5798 38.7094C68.635 38.3638 68.1936 37.7302 67.8074 37.615C67.5315 37.5574 67.1453 37.4422 67.035 37.7302C66.8143 38.191 66.4832 38.3638 66.097 38.479C65.766 38.5942 65.6556 38.8822 65.766 39.2278C65.8763 39.5734 66.3729 39.8038 66.5936 39.5734C66.9798 39.2854 67.366 39.2854 67.697 39.4006Z" fill="#42D4C6"/>
+<path d="M65.2133 42.7419C65.1582 42.2235 64.6616 41.8203 64.0547 41.8203C63.4478 41.8203 63.1168 42.2811 63.172 43.0299C63.2271 43.7787 63.5582 44.1243 64.2202 44.0667C64.8823 44.0091 65.2685 43.4907 65.2133 42.7419Z" fill="#42D4C6"/>
+<path d="M65.9308 49.708C65.7653 49.5928 65.3239 49.6504 65.1584 49.9384C64.9929 50.2264 65.3239 50.6296 65.4894 50.8024C65.5998 50.9176 66.317 50.9752 66.4825 50.6872C66.648 50.3992 66.1515 49.8808 65.9308 49.708Z" fill="#42D4C6"/>
+<path d="M66.9796 49.018C66.9796 48.73 66.5934 48.442 66.2624 48.4996C65.9313 48.5572 65.7658 48.9028 65.821 49.2484C65.8762 49.594 66.0969 49.7668 66.4279 49.7092C66.7589 49.7092 67.0348 49.3636 66.9796 49.018Z" fill="#42D4C6"/>
+<path d="M65.7104 32.8884C66.0415 32.8308 66.5932 32.1972 66.5932 31.9092C66.5932 31.9092 66.5932 31.9092 66.5932 31.8516C66.2622 32.1972 65.876 32.4852 65.5449 32.8308C65.5449 32.8884 65.6001 32.8884 65.7104 32.8884Z" fill="#42D4C6"/>
+<path d="M73.7092 43.4869C73.7644 43.3717 73.8196 43.0261 73.6541 42.9685C73.5437 42.9109 73.2679 43.0837 73.2127 43.1989C73.1575 43.3141 73.1575 43.5445 73.323 43.6021C73.4885 43.6597 73.6541 43.6021 73.7092 43.4869Z" fill="#42D4C6"/>
+<path d="M74.2609 39.1122C74.4264 39.1122 74.5919 39.1122 74.7575 38.9394C74.923 38.7666 74.7575 38.5362 74.5368 38.421C74.3161 38.3634 73.985 38.421 73.8195 38.5362C73.5988 38.709 73.7092 38.9394 73.7644 38.997C73.8747 39.1698 74.0402 39.1122 74.2609 39.1122Z" fill="#42D4C6"/>
+<path d="M68.8004 44.3531C69.0763 44.2955 69.3522 44.2379 69.3522 43.8923C69.297 43.3739 69.0211 43.0859 68.6901 43.0859C68.3039 43.1435 68.028 43.4891 68.0832 43.8923C68.1935 44.2379 68.4694 44.4683 68.8004 44.3531Z" fill="#42D4C6"/>
+<path d="M74.6485 37.0945C74.483 37.0369 74.2623 37.0369 74.0968 37.1521C74.1519 37.0369 74.2071 36.9217 74.1519 36.8065C74.1519 36.6913 73.9312 36.4609 73.8209 36.4609C73.6554 36.4609 73.3795 36.5761 73.3243 36.6913C73.1036 37.0945 73.3795 37.2673 73.6554 37.4977C73.7657 37.4977 73.8209 37.4401 73.8761 37.3825L73.8209 37.4401C73.7105 37.7281 73.8209 38.0737 74.0968 38.1889C74.4278 38.3617 74.814 38.2465 74.9795 37.9585C75.0347 37.6705 74.8692 37.2097 74.6485 37.0945Z" fill="#42D4C6"/>
+<path d="M70.235 39.8038C70.1798 39.1126 69.9039 38.8246 69.4626 38.8822C69.1315 38.9398 68.6901 39.5158 68.8005 39.8614C68.8557 40.207 69.4626 40.5526 69.7936 40.495C70.0695 40.4374 70.2901 40.1494 70.235 39.8038Z" fill="#42D4C6"/>
+<path d="M64.0547 45.9661C64.1098 45.8509 64.0547 45.6205 63.9443 45.5629C63.8892 45.5053 63.6133 45.5629 63.5581 45.6205C63.5029 45.7357 63.3926 46.0237 63.5581 46.1389C63.7788 46.2541 63.9995 46.0813 64.0547 45.9661Z" fill="#42D4C6"/>
+<path d="M70.1234 42.6811C70.6199 42.6235 70.6751 42.1627 70.7855 41.8171C70.2889 41.2987 70.013 41.1835 69.7372 41.4139C69.5165 41.5867 69.4062 41.8171 69.4613 42.1051C69.5165 42.4507 69.7924 42.7387 70.1234 42.6811Z" fill="#42D4C6"/>
+<path d="M72.992 40.2021C73.2127 40.3173 73.4334 40.2597 73.5437 39.9141C73.5989 39.6261 73.5989 39.3957 73.323 39.2805C73.1024 39.2229 72.5506 39.2229 72.4403 39.3957C72.3851 39.7413 72.8265 40.0869 72.992 40.2021Z" fill="#42D4C6"/>
+<path d="M64.3315 36.2922C64.7729 36.0042 65.0487 36.3498 65.3798 36.5226C65.8211 36.753 66.1522 36.5802 66.3177 36.1194C66.3177 36.0618 66.3177 36.0042 66.3729 36.0042C66.428 36.0042 66.4832 36.0618 66.5384 36.0618C66.5936 36.1194 66.7039 36.177 66.7039 36.2346C66.7591 36.2922 66.9798 36.177 67.0349 36.177C67.0349 36.1194 67.0349 36.0618 67.0349 36.0042C67.1453 35.9466 67.2005 35.889 67.3108 35.889L67.3108 35.9466C67.3108 35.6586 67.2556 35.3706 67.2556 35.025C67.0349 34.9674 66.8694 34.9098 66.7039 34.9098C66.4832 34.9098 66.2625 35.025 66.1522 35.1978C65.9867 35.0826 65.8211 34.9674 65.5453 35.025C65.2694 35.025 64.9936 35.1402 64.7177 34.737C64.7729 34.5642 64.9384 34.3914 64.9384 34.2186C64.8832 34.0458 64.828 33.873 64.7729 33.7578C64.3315 34.2186 63.8901 34.6794 63.5039 35.1402C63.6143 35.6586 63.8901 36.2922 64.2211 36.4074C64.2211 36.3498 64.2763 36.3498 64.3315 36.2922Z" fill="#42D4C6"/>
+<path d="M64.0547 40.2644C64.0547 39.5732 63.3926 38.9972 62.7306 39.0548C62.1237 39.1124 61.7926 39.5156 61.7375 40.1492C61.6823 40.1492 61.6271 40.2068 61.6271 40.2068C61.5719 40.322 61.6271 40.6676 61.7375 40.7252C61.8478 41.4164 62.2892 41.8196 62.8961 41.762C63.6133 41.762 64.0547 41.1284 64.0547 40.2644Z" fill="#42D4C6"/>
+<path d="M55.7798 53.7976C56.1108 53.9704 56.8281 53.74 56.9936 53.3368C57.1591 53.0488 56.9384 52.4152 56.6074 52.1848C56.3315 52.012 55.835 52.1272 55.6694 52.3576C55.3936 52.9912 55.3936 53.6248 55.7798 53.7976Z" fill="#42D4C6"/>
+<path d="M57.9306 48.2695C58.0961 47.8663 57.9857 47.1751 57.6547 47.0023C57.3788 46.8295 56.772 47.1751 56.5513 47.6359C56.3857 47.9239 56.5513 48.4423 56.8823 48.5575C57.2685 48.7303 57.7651 48.6151 57.9306 48.2695Z" fill="#42D4C6"/>
+<path d="M61.1855 37.7281C61.5718 37.7857 61.7924 37.5553 62.0683 37.1521C62.1235 37.0945 62.1786 36.9793 62.1786 36.9217C62.289 37.1521 62.4545 37.2673 62.62 37.2097C62.7855 37.1521 62.9511 36.9217 62.9511 36.7489C62.9511 36.4609 62.8407 36.2881 62.5097 36.3457C62.4545 36.3457 62.4545 36.3457 62.3993 36.3457C62.3993 36.2881 62.3993 36.2881 62.3993 36.2305C61.958 36.6913 61.5718 37.2097 61.1855 37.7281Z" fill="#42D4C6"/>
+<path d="M55.7231 47.3477C56.1645 47.2325 56.4955 47.5205 56.8817 47.2325C57.3783 46.8869 57.93 46.0805 57.5438 45.1013C57.3783 44.6405 57.1576 44.3525 56.8817 44.1797C56.33 45.2165 55.7783 46.3109 55.2266 47.4053C55.3921 47.4053 55.5576 47.3477 55.7231 47.3477Z" fill="#42D4C6"/>
+<path d="M55.9443 51.2639C56.2753 51.2639 56.5512 50.9183 56.5512 50.6303C56.496 50.2847 56.2202 49.9967 55.8891 50.0543C55.5581 50.0543 55.3926 50.2847 55.3926 50.6303C55.3926 50.9759 55.6133 51.2639 55.9443 51.2639Z" fill="#42D4C6"/>
+<path d="M63.0605 46.1406C62.7295 46.1406 62.3984 46.4862 62.3984 46.8318C62.3984 47.1774 62.895 47.6382 63.2812 47.5806C63.6122 47.5806 63.7777 47.2926 63.7777 46.947C63.8329 46.5438 63.4467 46.1406 63.0605 46.1406Z" fill="#42D4C6"/>
+<path d="M60.9666 53.5139C61.2424 53.3411 61.1873 52.5923 60.9114 52.4771C60.6355 52.4195 60.139 52.9379 60.3045 53.2259C60.4148 53.5139 60.7459 53.6291 60.9666 53.5139Z" fill="#42D4C6"/>
+<path d="M58.5944 58.8721C58.7048 58.9297 59.1461 59.0449 59.2565 58.8721C59.3668 58.6993 59.1461 58.2961 59.0358 58.1809C58.8703 58.0081 58.4289 58.1233 58.3737 58.3537C58.3186 58.5265 58.4289 58.8145 58.5944 58.8721Z" fill="#42D4C6"/>
+<path d="M57.7115 57.4839C58.0978 57.7146 58.4288 57.657 58.6495 57.3111C58.6495 57.3111 58.6495 57.3111 58.6495 57.2535C58.815 57.1383 58.8702 56.9655 58.8702 56.7351C58.8702 56.5047 58.7598 56.3319 58.5943 56.2167C58.5391 56.0439 58.484 55.9287 58.3736 55.8711C57.9874 55.6407 57.546 55.8135 57.2702 56.2743C57.0495 56.8503 57.2702 57.2535 57.7115 57.4839Z" fill="#42D4C6"/>
+<path d="M56.4972 56.9681C56.6075 56.6801 56.4972 56.2769 56.2213 56.1041C55.9454 55.9313 55.5592 56.1041 55.4489 56.3921C55.3385 56.6225 55.3937 56.8529 55.5592 57.0257C55.3385 57.1409 54.9521 57.3137 55.0073 57.6017C55.0625 57.8894 55.4489 57.947 55.6696 58.0046C55.8903 58.0622 56.111 57.947 56.1661 57.6017C56.1661 57.4865 56.1661 57.3713 56.0558 57.2561C56.2213 57.3137 56.3868 57.1985 56.4972 56.9681Z" fill="#42D4C6"/>
+<path d="M57.322 54.8387C57.2668 54.4355 56.9909 54.2051 56.6599 54.2627C56.384 54.3203 56.1082 54.7235 56.1634 55.0691C56.2185 55.4147 56.5496 55.6451 56.8806 55.5875C57.1565 55.4723 57.3771 55.1843 57.322 54.8387Z" fill="#42D4C6"/>
+<path d="M79.5029 39.5723C79.4478 39.2843 79.3374 39.0539 79.0064 39.0539C78.9512 39.0539 78.896 39.0539 78.8409 39.1115C78.896 39.0539 78.896 39.0539 78.896 38.9963C79.1167 38.6507 79.0616 38.3051 78.7857 38.1323C78.4547 37.9019 77.7926 38.0747 77.5719 38.4203C77.4064 38.7083 77.5167 39.1691 77.7926 39.3419C78.0133 39.4571 78.2891 39.4571 78.5098 39.3419C78.4547 39.4571 78.3995 39.5723 78.3995 39.6874C78.3995 39.9178 78.7857 40.0907 79.1167 40.0331C79.3926 39.9755 79.5029 39.8027 79.5029 39.5723Z" fill="#42D4C6"/>
+<path d="M78.7859 43.7763C78.7859 43.6035 78.5652 43.4883 78.4549 43.4883C78.3445 43.4883 78.0135 43.6035 78.0687 43.7763C78.1238 43.9491 78.3445 44.0067 78.3997 44.0067C78.5652 43.9491 78.8411 43.8915 78.7859 43.7763Z" fill="#42D4C6"/>
+<path d="M71.2824 50.2885C71.2272 49.8277 70.8962 49.4245 70.5652 49.4821C70.0686 49.5397 69.6272 50.1733 69.6824 50.6917C69.6824 51.0373 70.1238 51.3253 70.51 51.2677C71.0065 51.1525 71.3376 50.8069 71.2824 50.2885Z" fill="#42D4C6"/>
+<path d="M79.7783 46.0244C79.7783 46.1396 79.9439 46.1972 79.999 46.1972C80.0542 46.1972 80.1094 46.0244 80.1094 46.0244C80.1094 45.9668 80.0542 45.8516 79.9439 45.8516C79.8335 45.8516 79.7232 45.9092 79.7783 46.0244Z" fill="#42D4C6"/>
+<path d="M78.5665 46.1382C78.8976 46.0806 79.0631 45.7926 79.0631 45.3894C79.0079 44.9862 78.8424 44.7558 78.5665 44.8134C78.2355 44.871 77.8493 45.3318 77.9045 45.6198C77.8493 45.9654 78.1803 46.1958 78.5665 46.1382Z" fill="#42D4C6"/>
+<path d="M80.9375 42.107C81.1582 41.5886 80.9375 41.0702 80.3858 40.8398C79.9996 40.667 79.3927 40.955 79.2271 41.4158C79.0065 41.8766 79.2271 42.3373 79.7789 42.6253C80.2754 42.7981 80.7168 42.6254 80.9375 42.107Z" fill="#42D4C6"/>
+<path d="M69.7383 53.3412C69.7383 53.6868 69.9038 53.9172 70.29 53.9172C70.6762 53.9172 70.8969 53.6868 70.8969 53.3412C70.8969 53.0532 70.621 52.7652 70.3452 52.7652C70.0141 52.7076 69.7383 52.9956 69.7383 53.3412Z" fill="#42D4C6"/>
+<path d="M54.013 55.7005C54.2337 55.2973 54.0682 54.6061 53.7372 54.3757C53.4061 54.2029 52.9648 54.2029 52.6889 54.3757C52.5786 54.6637 52.5234 55.0093 52.413 55.2973C52.4682 55.5277 52.5786 55.7581 52.6889 55.9309C52.5234 55.9309 52.3579 55.9309 52.2475 55.9885C52.082 56.5645 51.9717 57.1405 51.8613 57.7166L51.8613 57.7742C51.8613 57.7742 51.8613 57.7742 51.8061 57.8318C51.751 58.0622 51.6958 58.2926 51.6406 58.523C51.6958 58.6382 51.751 58.7534 51.8613 58.8686C52.1372 59.0414 52.7992 58.8686 52.9648 58.523C53.0751 58.3502 53.0751 58.1774 52.9648 58.0622L52.9648 58.0046C53.0199 57.7742 53.0199 57.5437 53.1303 57.3709C53.351 57.0253 53.4061 56.6797 53.2406 56.2765L53.1855 56.2189C53.5717 56.1037 53.8475 55.9309 54.013 55.7005Z" fill="#42D4C6"/>
+<path d="M53.2416 63.8827C53.2416 63.4795 53.076 63.1915 52.9105 63.0187C52.9657 62.9611 52.9657 62.9035 53.0209 62.9035C53.3519 62.3275 53.1312 61.9243 52.745 61.5211C52.9657 61.2331 53.2967 61.0027 53.0209 60.5995C52.8554 60.3115 52.5795 60.2539 52.3036 60.3691C52.2485 60.4267 52.1933 60.4267 52.1381 60.4843C51.9174 60.3115 51.6967 60.2539 51.476 60.2539C51.3105 61.1179 51.2002 62.0395 51.0898 62.9611C51.2002 63.2491 51.3105 63.4795 51.5312 63.5947C51.476 63.7099 51.476 63.7675 51.4209 63.8827C51.3105 64.3435 51.7519 65.0347 52.1933 65.0923C52.5795 65.0347 53.2967 64.5163 53.2416 63.8827Z" fill="#42D4C6"/>
+<path d="M63.5039 58.4111C63.5039 58.5263 63.6694 58.5839 63.7246 58.5839C63.7798 58.5839 63.8349 58.4111 63.8349 58.4111C63.8349 58.3535 63.7798 58.2383 63.6694 58.2383C63.5591 58.2383 63.5039 58.2959 63.5039 58.4111Z" fill="#42D4C6"/>
+<path d="M64.4413 55.8161C64.6068 55.7009 64.8826 55.4129 64.8826 55.0673C65.0482 55.0097 65.1585 54.9521 65.2137 54.7793C65.3792 54.4913 65.2137 54.0305 64.9378 53.9153C64.662 53.8001 64.2757 53.9153 64.1102 54.2033C63.9999 53.9729 63.9999 53.6849 63.724 53.3969C63.6137 53.3393 63.5033 53.2817 63.4482 53.2817C62.7309 53.1665 62.2895 53.6849 62.5102 54.3761C62.6206 54.7793 62.8413 55.1825 63.062 55.5281C63.2826 55.9889 63.9999 56.0465 64.4413 55.8161Z" fill="#42D4C6"/>
+<path d="M64.8266 60.5374C64.9922 60.1918 64.8818 59.8462 64.5508 59.6158C64.2749 59.443 63.8887 59.6158 63.7232 59.9038C63.5577 60.2494 63.6128 60.6526 63.9439 60.8254C64.2749 60.9982 64.6611 60.8254 64.8266 60.5374Z" fill="#42D4C6"/>
+<path d="M66.9228 52.5891C66.978 52.3587 66.6469 52.0132 66.4263 52.1284C66.2607 52.186 66.1504 52.4163 66.1504 52.5891C66.1504 52.7619 66.3159 53.1651 66.5366 53.1651C66.7021 53.1651 66.8676 52.7619 66.9228 52.5891Z" fill="#42D4C6"/>
+<path d="M61.7935 58.4641C61.7935 58.1185 61.2418 57.7729 60.8004 57.8305C60.3038 57.8881 60.028 58.2913 60.0831 58.8097C60.1383 59.3281 60.4693 59.7313 60.8555 59.6737C61.4073 59.5585 61.8487 58.9825 61.7935 58.4641Z" fill="#42D4C6"/>
+<path d="M60.1919 62.1523C60.2471 61.8643 60.0815 61.2307 59.5298 61.3459C59.4195 61.4035 59.3643 61.4611 59.3091 61.5187C59.254 61.4611 59.1436 61.4035 59.0333 61.4035C58.8677 61.4035 58.8126 61.5187 58.7574 61.6339C58.5367 61.5763 58.316 61.4611 57.9298 61.5763C57.8195 61.6339 57.7091 61.7491 57.654 61.7491C57.1574 62.2675 57.3229 62.9587 57.985 63.1315C58.3712 63.2467 58.8126 63.3043 59.254 63.3043C59.6953 63.1891 60.1919 62.6131 60.1919 62.1523Z" fill="#42D4C6"/>
+<path d="M53.9594 65.1495C54.2905 65.2071 54.4008 64.8615 54.456 64.5735C54.2905 64.2279 54.0146 64.0551 53.6836 64.2279C53.5732 64.2855 53.4629 64.5735 53.4629 64.6887C53.6284 64.8615 53.7939 65.0919 53.9594 65.1495Z" fill="#42D4C6"/>
+<path d="M56.4405 63.8261C56.4957 63.4805 55.7784 63.1349 55.6129 63.3077C55.4474 63.4805 55.5577 64.2293 55.8336 64.2869C56.1095 64.2869 56.4405 64.0565 56.4405 63.8261Z" fill="#42D4C6"/>
+<path d="M68.3024 58.9816C68.6886 58.9816 68.9093 58.636 68.8541 58.2328C68.7989 57.9448 68.5231 57.6568 68.1921 57.7144C67.8058 57.772 67.53 58.06 67.5852 58.4056C67.5852 58.7512 67.9162 58.9816 68.3024 58.9816Z" fill="#42D4C6"/>
+<path d="M67.3652 51.8413C67.7514 51.8413 68.3032 51.2077 68.3032 50.8621C68.248 50.3437 67.917 50.1133 67.3652 50.1133C66.9238 50.1709 66.7032 50.5165 66.7583 51.0925C66.7583 51.5533 67.0342 51.8413 67.3652 51.8413Z" fill="#42D4C6"/>
+<path d="M70.3458 47.2342C70.3458 46.8886 69.9596 46.543 69.6838 46.543C69.0217 46.6006 68.5803 46.9462 68.6355 47.407C68.6907 47.8102 69.2424 48.271 69.6838 48.2134C69.9596 48.1558 70.3458 47.5798 70.3458 47.2342Z" fill="#42D4C6"/>
+<path d="M76.2488 37.6155C76.8557 37.5579 77.4074 36.9243 77.3523 36.3483C77.2971 35.8299 76.6902 35.2539 76.1385 35.2539C75.5316 35.2539 75.1454 35.8299 75.2005 36.5787C75.2005 37.2123 75.6419 37.6731 76.2488 37.6155Z" fill="#42D4C6"/>
+<path d="M65.8189 64.3422C66.2051 64.227 66.15 63.7086 66.0396 63.5358C65.9293 63.363 65.4327 63.3054 65.212 63.651C65.1568 63.7662 65.1569 64.0542 65.2672 64.1694C65.4327 64.227 65.7086 64.3422 65.8189 64.3422Z" fill="#42D4C6"/>
+<path d="M66.5924 61.6922C66.6476 61.5194 66.4269 61.0586 66.0407 61.0586C65.9303 61.0586 65.7096 61.2314 65.6545 61.3466C65.5993 61.5194 65.6545 61.8074 65.7648 61.9226C66.0958 62.2106 66.5372 61.865 66.5924 61.6922Z" fill="#42D4C6"/>
+<path d="M80.3857 24.9407C80.1099 24.8255 79.834 24.7103 79.6133 24.5951C79.2271 24.4223 78.6754 24.5951 78.4547 24.9407C78.2892 25.2287 78.3995 25.7471 78.6202 25.8047C79.0064 25.9199 79.3926 26.1503 79.834 25.9199C80.4961 25.7471 80.5512 25.6895 80.3857 24.9407Z" fill="#42D4C6"/>
+<path d="M77.6274 31.3969C77.5722 30.9937 76.9101 30.3601 76.6343 30.4177C76.2481 30.4753 75.917 31.0513 76.0274 31.6273C76.0825 32.1457 76.4688 32.3185 77.0205 32.2609C77.3515 32.2033 77.6825 31.7425 77.6274 31.3969Z" fill="#42D4C6"/>
+<path d="M72.1656 44.0092C72.2207 43.5484 72.2208 43.1452 71.7794 42.9724C71.6139 42.9148 71.338 43.03 71.2828 43.1452C71.1725 43.3756 71.1725 43.7212 71.2276 43.894C71.4483 44.3548 71.8345 44.1244 72.1656 44.0092Z" fill="#42D4C6"/>
+<path d="M72.8825 49.8839C73.1584 49.8263 73.3791 49.5959 73.3791 49.2503C73.3791 48.8471 73.1032 48.5591 72.717 48.6167C72.386 48.6743 72.1101 49.0199 72.1653 49.3079C72.1653 49.5959 72.5515 49.8839 72.8825 49.8839Z" fill="#42D4C6"/>
+<path d="M75.3101 47.9273C75.3653 47.8697 75.3101 47.6393 75.1998 47.5817C75.0894 47.5241 74.9239 47.6393 74.8136 47.7545C74.7584 47.8121 74.7584 48.1001 74.8688 48.1577C75.0343 48.2729 75.255 48.0425 75.3101 47.9273Z" fill="#42D4C6"/>
+<path d="M77.0215 54.9514C77.2973 54.9514 77.4628 54.2026 77.4628 53.9146C77.4628 53.7418 77.187 53.3386 76.8559 53.3962C76.5249 53.4538 76.4145 53.9146 76.3594 54.145C76.3594 54.3178 76.7456 54.9514 77.0215 54.9514Z" fill="#42D4C6"/>
+<path d="M76.4682 39.6303C76.3579 39.3999 76.1372 39.3423 75.9716 39.2847C75.6958 39.2271 75.4199 39.5151 75.4199 39.8607C75.4751 40.1487 75.6406 40.3215 75.9165 40.3791C76.1923 40.3791 76.5785 39.8607 76.4682 39.6303Z" fill="#42D4C6"/>
+<path d="M75.5864 41.9911C75.6415 41.8183 75.2002 41.3575 74.9243 41.4151C74.6484 41.4727 74.6484 41.7031 74.6484 41.9335C74.6484 42.2215 74.9243 42.4519 75.145 42.3367C75.3657 42.2791 75.5864 42.1639 75.5864 41.9911Z" fill="#42D4C6"/>
+<path d="M72.9943 56.1031C73.2701 56.0455 73.546 55.6999 73.546 55.4119C73.4908 55.1239 73.1598 54.8359 72.8839 54.8359C72.5529 54.8359 72.3322 55.1239 72.3874 55.4119C72.3874 55.8151 72.6632 56.1607 72.9943 56.1031Z" fill="#42D4C6"/>
+<path d="M74.2053 46.1401C74.6466 46.0825 75.088 45.5641 75.088 45.1609C75.0328 44.8153 74.4811 44.5273 73.9846 44.5273C73.6535 44.5849 73.3777 44.9881 73.4328 45.3337C73.488 45.8521 73.8742 46.1977 74.2053 46.1401Z" fill="#42D4C6"/>
+<path d="M74.8676 51.3788C75.0332 51.2636 75.0883 51.0332 75.0883 50.8028C75.0883 50.5724 74.978 50.342 74.6469 50.3996C74.3711 50.4572 74.1504 50.5724 74.1504 50.918C74.1504 51.1484 74.7021 51.4364 74.8676 51.3788Z" fill="#42D4C6"/>
+<path d="M78.7315 35.2558C79.0074 35.5438 79.2281 35.947 79.6695 35.6014C79.9453 35.4286 80.0557 35.1406 79.9453 34.795C79.8902 34.6798 79.7798 34.507 79.7246 34.507C79.4488 34.4494 79.1177 34.507 78.7867 34.4494C78.3453 33.8734 77.7936 33.643 77.4626 33.8734C77.1315 34.1614 77.0212 34.9678 77.3522 35.371C77.5729 35.8894 77.9039 35.8894 78.7315 35.2558Z" fill="#42D4C6"/>
+<path d="M82.0977 37.3838C82.3736 36.8078 82.3184 36.059 81.877 35.8286C81.3804 35.5406 80.3873 35.771 80.1667 36.2894C79.946 36.8078 80.1667 37.5566 80.608 37.787C81.1598 38.0174 81.8218 37.8446 82.0977 37.3838Z" fill="#42D4C6"/>
+<path d="M78.7305 36.1747C78.7305 36.2899 78.7856 36.5779 79.0063 36.5779C79.227 36.5779 79.227 36.2899 79.227 36.1171C79.227 36.0595 79.0615 35.8867 79.0063 35.8867C78.896 35.9443 78.7305 36.0595 78.7305 36.1747Z" fill="#42D4C6"/>
+<path d="M79.3924 50.1737C79.5027 50.1737 79.6682 50.0009 79.6682 49.8857C79.6682 49.7705 79.5027 49.5977 79.3924 49.5977C79.282 49.5977 78.951 49.7129 79.0062 49.8857C79.0613 50.1161 79.3372 50.1737 79.3924 50.1737Z" fill="#42D4C6"/>
+</g>
+</svg>
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_results_banner_2024.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_results_banner_2024.tsx
new file mode 100644
index 0000000000000..63a3f68254c6c
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/avc_banner/avc_results_banner_2024.tsx
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { css } from '@emotion/css';
+import { i18n } from '@kbn/i18n';
+import { EuiButton, EuiCallOut, EuiSpacer, useEuiTheme } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+
+import avcBannerBackground from './avc_banner_background.svg';
+
+export const AVCResultsBanner2024: React.FC<{ onDismiss: () => void }> = ({ onDismiss }) => {
+  const { docLinks } = useKibana().services;
+  const { euiTheme } = useEuiTheme();
+  const bannerTitle = i18n.translate(
+    'xpack.fleet.integrations.epm.elasticDefend.avcResultsBanner.title',
+    {
+      defaultMessage: '100% protection with zero false positives.',
+    }
+  );
+
+  const calloutStyles = css({
+    paddingLeft: `${euiTheme.size.xl}`,
+    backgroundImage: `url(${avcBannerBackground})`,
+    backgroundRepeat: 'no-repeat',
+    backgroundPositionX: 'right',
+    backgroundPositionY: 'bottom',
+  });
+
+  return (
+    <EuiCallOut
+      title={bannerTitle}
+      color="success"
+      iconType="cheer"
+      onDismiss={onDismiss}
+      className={calloutStyles}
+    >
+      <FormattedMessage
+        id="xpack.fleet.integrations.epm.elasticDefend.avcResultsBanner.title.avcResultsBanner.body"
+        defaultMessage="Elastic Security shines in Malware Protection Test by AV-Comparatives"
+      />
+      <EuiSpacer size="s" />
+      <EuiButton size="s" color="success" href={docLinks?.links.securitySolution.avcResults}>
+        <FormattedMessage
+          id="xpack.fleet.integrations.epm.elasticDefend.avcResultsBanner.title.avcResultsBanner.readTheBlog.link"
+          defaultMessage="Read the blog"
+        />
+      </EuiButton>
+    </EuiCallOut>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx
index 85899dc8d86c3..f9c2d80d3336e 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx
@@ -20,6 +20,8 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+
 import {
   isIntegrationPolicyTemplate,
   isPackagePrerelease,
@@ -36,6 +38,10 @@ import { isPackageUnverified } from '../../../../../../../services';
 import type { PackageInfo, RegistryPolicyTemplate } from '../../../../../types';
 import { SideBarColumn } from '../../../components/side_bar_column';
 
+import type { FleetStartServices } from '../../../../../../../plugin';
+
+import { AVCResultsBanner2024 } from './avc_banner/avc_results_banner_2024';
+
 import { Screenshots } from './screenshots';
 import { Readme } from './readme';
 import { Details } from './details';
@@ -159,9 +165,11 @@ export const OverviewPage: React.FC<Props> = memo(
       () => integrationInfo?.screenshots || packageInfo.screenshots || [],
       [integrationInfo, packageInfo.screenshots]
     );
+    const { storage } = useKibana<FleetStartServices>().services;
     const { packageVerificationKeyId } = useGetPackageVerificationKeyId();
     const isUnverified = isPackageUnverified(packageInfo, packageVerificationKeyId);
     const isPrerelease = isPackagePrerelease(packageInfo.version);
+    const isElasticDefend = packageInfo.name === 'endpoint';
     const [markdown, setMarkdown] = useState<string | undefined>(undefined);
     const [selectedItemId, setSelectedItem] = useState<string | undefined>(undefined);
     const [isSideNavOpenOnMobile, setIsSideNavOpenOnMobile] = useState(false);
@@ -283,6 +291,14 @@ export const OverviewPage: React.FC<Props> = memo(
 
     const requireAgentRootPrivileges = isRootPrivilegesRequired(packageInfo);
 
+    const [showAVCBanner, setShowAVCBanner] = useState(
+      storage.get('securitySolution.showAvcBanner') ?? true
+    );
+    const onBannerDismiss = useCallback(() => {
+      setShowAVCBanner(false);
+      storage.set('securitySolution.showAvcBanner', false);
+    }, [storage]);
+
     return (
       <EuiFlexGroup alignItems="flexStart" data-test-subj="epm.OverviewPage">
         <SideBar grow={2}>
@@ -297,6 +313,12 @@ export const OverviewPage: React.FC<Props> = memo(
         </SideBar>
         <EuiFlexItem grow={9} className="eui-textBreakWord">
           {isUnverified && <UnverifiedCallout />}
+          {isElasticDefend && showAVCBanner && (
+            <>
+              <AVCResultsBanner2024 onDismiss={onBannerDismiss} />
+              <EuiSpacer size="s" />
+            </>
+          )}
           {isPrerelease && (
             <PrereleaseCallout
               packageName={packageInfo.name}
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
index cc91af6a873a8..aa86607a84ee5 100644
--- a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
@@ -230,7 +230,7 @@ export const PackagePoliciesPage = ({ name, version }: PackagePoliciesPanelProps
       {
         field: 'packagePolicy.policy_ids',
         name: i18n.translate('xpack.fleet.epm.packageDetails.integrationList.agentPolicy', {
-          defaultMessage: 'Agent policy',
+          defaultMessage: 'Agent policies',
         }),
         truncateText: true,
         render(id, { agentPolicies, packagePolicy }) {
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
index d6ac7fdac8def..f8f1854911505 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/agent_enrollment_flyout.test.tsx
@@ -14,7 +14,7 @@ import type { RenderResult } from '@testing-library/react';
 import { createFleetTestRendererMock } from '../../mock';
 import type { AgentPolicy } from '../../../common';
 import { sendGetOneAgentPolicy } from '../../hooks/use_request';
-import { useAgentEnrollmentFlyoutData, useFleetServerStandalone } from '../../hooks';
+import { useAgentEnrollmentFlyoutData, useAuthz, useFleetServerStandalone } from '../../hooks';
 
 import { useAdvancedForm } from '../../applications/fleet/components/fleet_server_instructions/hooks';
 import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agents/hooks/use_fleet_server_unhealthy';
@@ -22,6 +22,8 @@ import { useFleetServerUnhealthy } from '../../applications/fleet/sections/agent
 import type { FlyOutProps } from './types';
 import { AgentEnrollmentFlyout } from '.';
 
+jest.mock('../../hooks/use_authz');
+
 const render = (props?: Partial<FlyOutProps>) => {
   cleanup();
   const renderer = createFleetTestRendererMock();
@@ -47,6 +49,11 @@ describe('<AgentEnrollmentFlyout />', () => {
   let results: RenderResult;
 
   beforeEach(async () => {
+    jest.mocked(useAuthz).mockReturnValue({
+      fleet: {
+        readAgentPolicies: true,
+      },
+    } as any);
     jest.mocked(useFleetServerStandalone).mockReturnValue({ isFleetServerStandalone: false });
 
     (useFleetServerUnhealthy as jest.Mock).mockReturnValue({
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
index 57b3a8e0e0ff5..ef9f9f34a7eda 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/index.tsx
@@ -28,6 +28,7 @@ import {
   useFleetStatus,
   useAgentEnrollmentFlyoutData,
   useFleetServerHostsForPolicy,
+  useAuthz,
 } from '../../hooks';
 import { FLEET_SERVER_PACKAGE, MAX_FLYOUT_WIDTH } from '../../constants';
 import type { PackagePolicy, AgentPolicy } from '../../types';
@@ -61,6 +62,8 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<FlyOutProps> = ({
     return policies.find((p) => p.id === id);
   };
 
+  const authz = useAuthz();
+
   const fleetStatus = useFleetStatus();
   const { docLinks } = useStartServices();
 
@@ -172,6 +175,8 @@ export const AgentEnrollmentFlyout: React.FunctionComponent<FlyOutProps> = ({
                 data-test-subj="standaloneTab"
                 isSelected={mode === 'standalone'}
                 onClick={() => setMode('standalone')}
+                // Standalone need read access to agent policies
+                disabled={!authz.fleet.readAgentPolicies}
               >
                 <FormattedMessage
                   id="xpack.fleet.agentEnrollment.enrollStandaloneTabLabel"
diff --git a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
index 17dc6df6926ba..a0093b9247052 100644
--- a/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
+++ b/x-pack/plugins/fleet/public/components/agent_enrollment_flyout/steps/installation_mode_selection_step.tsx
@@ -6,14 +6,34 @@
  */
 
 import React from 'react';
-import { EuiRadioGroup } from '@elastic/eui';
+import { EuiRadioGroup, EuiToolTip } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 
 import type { EuiContainedStepProps } from '@elastic/eui/src/components/steps/steps';
 
+import { useAuthz } from '../../../hooks';
 import type { FlyoutMode } from '../types';
 
+const PermissionWrapper: React.FunctionComponent<{
+  showTooltip: boolean;
+}> = ({ children, showTooltip }) => {
+  return showTooltip && children ? (
+    <EuiToolTip
+      content={
+        <FormattedMessage
+          id="xpack.fleet.agentFlyout.standaloneMissingPermissions"
+          defaultMessage="Read access to Agent Policies is required to see the standalone instructions."
+        />
+      }
+    >
+      {children as React.ReactElement}
+    </EuiToolTip>
+  ) : (
+    <>{children}</>
+  );
+};
+
 export const InstallationModeSelectionStep = ({
   selectedPolicyId,
   mode,
@@ -23,6 +43,7 @@ export const InstallationModeSelectionStep = ({
   mode: FlyoutMode;
   setMode: (v: FlyoutMode) => void;
 }): EuiContainedStepProps => {
+  const authz = useAuthz();
   // radio id has to be unique so that the component works even if appears twice in DOM
   const radioSuffix = 'installation_mode_agent_selection';
 
@@ -63,22 +84,26 @@ export const InstallationModeSelectionStep = ({
           },
           {
             id: `standalone_${radioSuffix}`,
+            // Disabled if no agentPolicies read permission
+            disabled: !authz.fleet.readAgentPolicies,
             label: (
-              <FormattedMessage
-                data-test-subj="agentFlyoutStandaloneRadioButtons"
-                id="xpack.fleet.agentFlyout.standaloneRadioOption"
-                defaultMessage="{standaloneMessage} – Run an Elastic Agent standalone to configure and update the agent manually on the host where the agent is installed."
-                values={{
-                  standaloneMessage: (
-                    <strong>
-                      <FormattedMessage
-                        id="xpack.fleet.agentFlyout.standaloneMessage"
-                        defaultMessage="Run standalone"
-                      />
-                    </strong>
-                  ),
-                }}
-              />
+              <PermissionWrapper showTooltip={!authz.fleet.readAgentPolicies}>
+                <FormattedMessage
+                  data-test-subj="agentFlyoutStandaloneRadioButtons"
+                  id="xpack.fleet.agentFlyout.standaloneRadioOption"
+                  defaultMessage="{standaloneMessage} – Run an Elastic Agent standalone to configure and update the agent manually on the host where the agent is installed."
+                  values={{
+                    standaloneMessage: (
+                      <strong>
+                        <FormattedMessage
+                          id="xpack.fleet.agentFlyout.standaloneMessage"
+                          defaultMessage="Run standalone"
+                        />
+                      </strong>
+                    ),
+                  }}
+                />
+              </PermissionWrapper>
             ),
           },
         ]}
diff --git a/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx b/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
index 35f2313f37e0a..6369d344a2d9f 100644
--- a/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
+++ b/x-pack/plugins/fleet/public/components/package_policy_delete_provider.tsx
@@ -43,6 +43,16 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
   const onSuccessCallback = useRef<OnSuccessCallback | null>(null);
   const { canUseMultipleAgentPolicies } = useMultipleAgentPolicies();
 
+  const isShared = useMemo(() => {
+    if (agentPolicies?.length !== 1) {
+      return false;
+    }
+    const packagePolicy = agentPolicies[0].package_policies?.find(
+      (policy) => policy.id === packagePolicies[0]
+    );
+    return (packagePolicy?.policy_ids?.length ?? 0) > 1;
+  }, [agentPolicies, packagePolicies]);
+
   const hasMultipleAgentPolicies =
     canUseMultipleAgentPolicies && agentPolicies && agentPolicies.length > 1;
 
@@ -59,7 +69,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
 
       const request = await sendGetAgents({
         kuery,
-        showInactive: false,
+        showInactive: true,
       });
       setAgentsCount(request.data?.total || 0);
       setIsLoadingAgentsCount(false);
@@ -196,7 +206,7 @@ export const PackagePolicyDeleteProvider: React.FunctionComponent<Props> = ({
           />
         ) : agentsCount && agentPolicies ? (
           <>
-            {hasMultipleAgentPolicies && (
+            {(hasMultipleAgentPolicies || isShared) && (
               <>
                 <EuiCallOut
                   color="warning"
diff --git a/x-pack/plugins/fleet/public/custom_logs_assets_extension.tsx b/x-pack/plugins/fleet/public/custom_logs_assets_extension.tsx
index 26668c4062981..09a101ef85b8f 100644
--- a/x-pack/plugins/fleet/public/custom_logs_assets_extension.tsx
+++ b/x-pack/plugins/fleet/public/custom_logs_assets_extension.tsx
@@ -17,6 +17,7 @@ export const CustomLogsAssetsExtension: PackageAssetsComponent = () => {
   const { http, cloud } = useStartServices();
   const isLogsUIAvailable = !cloud?.isServerlessEnabled;
   // if logs ui is not available, link to discover
+  // TODO: move away from hardcoded link and use locators instead
   const logStreamUrl = isLogsUIAvailable
     ? http.basePath.prepend('/app/logs/stream')
     : http.basePath.prepend('/app/discover');
diff --git a/x-pack/plugins/fleet/public/hooks/use_locator.ts b/x-pack/plugins/fleet/public/hooks/use_locator.ts
index a3fed97679456..25a673b694670 100644
--- a/x-pack/plugins/fleet/public/hooks/use_locator.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_locator.ts
@@ -21,3 +21,7 @@ export function useLocator<T extends SerializableRecord>(
 export function useDashboardLocator() {
   return useLocator(LOCATORS_IDS.DASHBOARD_APP);
 }
+
+export function useDiscoverLocator() {
+  return useLocator(LOCATORS_IDS.DISCOVER_APP_LOCATOR);
+}
diff --git a/x-pack/plugins/fleet/public/types/ui_extensions.ts b/x-pack/plugins/fleet/public/types/ui_extensions.ts
index ec2a5c42e3b0e..ec84b23fa4cac 100644
--- a/x-pack/plugins/fleet/public/types/ui_extensions.ts
+++ b/x-pack/plugins/fleet/public/types/ui_extensions.ts
@@ -12,7 +12,14 @@ import type { FleetServerAgentComponentUnit } from '../../common/types/models/ag
 
 import type { PackagePolicyValidationResults } from '../services';
 
-import type { Agent, AgentPolicy, NewPackagePolicy, PackageInfo, PackagePolicy } from '.';
+import type {
+  Agent,
+  AgentPolicy,
+  NewPackagePolicy,
+  PackageInfo,
+  PackagePolicy,
+  SetupTechnology,
+} from '.';
 
 /** Register a Fleet UI extension */
 export type UIExtensionRegistrationCallback = (extensionPoint: UIExtensionPoint) => void;
@@ -36,8 +43,8 @@ export type PackagePolicyReplaceDefineStepExtensionComponentProps = (
   validationResults?: PackagePolicyValidationResults;
   agentPolicies?: AgentPolicy[];
   packageInfo: PackageInfo;
-  agentlessPolicy?: AgentPolicy;
-  handleSetupTechnologyChange?: (setupTechnology: string) => void;
+  isAgentlessEnabled?: boolean;
+  handleSetupTechnologyChange?: (setupTechnology: SetupTechnology) => void;
 };
 
 /**
diff --git a/x-pack/plugins/fleet/server/collectors/agent_policies.ts b/x-pack/plugins/fleet/server/collectors/agent_policies.ts
index 5210e7f3b229d..190c43f341ff8 100644
--- a/x-pack/plugins/fleet/server/collectors/agent_policies.ts
+++ b/x-pack/plugins/fleet/server/collectors/agent_policies.ts
@@ -49,9 +49,11 @@ export const getAgentPoliciesUsage = async (
   });
 
   const uniqueOutputTypes = new Set(
-    Array.from(uniqueOutputIds).map((outputId) => {
-      return outputsById[outputId]?.attributes.type;
-    })
+    Array.from(uniqueOutputIds)
+      .map((outputId) => {
+        return outputsById[outputId]?.attributes.type;
+      })
+      .filter((outputType) => outputType)
   );
 
   const [policiesWithGlobalDataTag, totalNumberOfGlobalDataTagFields] = agentPolicies.reduce(
diff --git a/x-pack/plugins/fleet/server/routes/agent/index.ts b/x-pack/plugins/fleet/server/routes/agent/index.ts
index 640a9f69ed4d6..6c55835a1ed94 100644
--- a/x-pack/plugins/fleet/server/routes/agent/index.ts
+++ b/x-pack/plugins/fleet/server/routes/agent/index.ts
@@ -338,7 +338,7 @@ export const registerAPIRoutes = (router: FleetAuthzRouter, config: FleetConfigT
     .delete({
       path: AGENT_API_ROUTES.DELETE_UPLOAD_FILE_PATTERN,
       fleetAuthz: {
-        fleet: { readAgents: true },
+        fleet: { allAgents: true },
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
index a26fc6760397c..2fe60943b1909 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.test.ts
@@ -376,10 +376,43 @@ describe('When calling package policy', () => {
 
     it('should not throw if enterprise license and multiple policy_ids is provided', async () => {
       jest.spyOn(licenseService, 'hasAtLeast').mockReturnValue(true);
+      jest
+        .spyOn(appContextService, 'getExperimentalFeatures')
+        .mockReturnValue({ enableReusableIntegrationPolicies: true } as any);
       const request = getUpdateKibanaRequest({ policy_ids: ['1', '2'] } as any);
       await routeHandler(context, request, response);
       expect(response.ok).toHaveBeenCalled();
     });
+
+    it('should throw if enterprise license and feature flag is disabled and multiple policy_ids is provided', async () => {
+      jest.spyOn(licenseService, 'hasAtLeast').mockReturnValue(true);
+      jest
+        .spyOn(appContextService, 'getExperimentalFeatures')
+        .mockReturnValue({ enableReusableIntegrationPolicies: false } as any);
+      const request = getUpdateKibanaRequest({ policy_ids: ['1', '2'] } as any);
+      await routeHandler(context, request, response);
+      expect(response.customError).toHaveBeenCalledWith({
+        statusCode: 400,
+        body: {
+          message: 'Reusable integration policies are not supported',
+        },
+      });
+    });
+
+    it('should throw if empty policy_ids are provided', async () => {
+      jest.spyOn(licenseService, 'hasAtLeast').mockReturnValue(true);
+      jest
+        .spyOn(appContextService, 'getExperimentalFeatures')
+        .mockReturnValue({ enableReusableIntegrationPolicies: true } as any);
+      const request = getUpdateKibanaRequest({ policy_ids: [] } as any);
+      await routeHandler(context, request, response);
+      expect(response.customError).toHaveBeenCalledWith({
+        statusCode: 400,
+        body: {
+          message: 'At least one agent policy id must be provided',
+        },
+      });
+    });
   });
 
   describe('list api handler', () => {
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
index abad84ef9db9d..a40b2a41d89db 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/handlers.ts
@@ -421,6 +421,10 @@ export const updatePackagePolicyHandler: FleetRequestHandler<
       throw new PackagePolicyRequestError(errorMessage);
     }
 
+    if (newData.policy_ids && newData.policy_ids.length === 0) {
+      throw new PackagePolicyRequestError('At least one agent policy id must be provided');
+    }
+
     const updatedPackagePolicy = await packagePolicyService.update(
       soClient,
       esClient,
diff --git a/x-pack/plugins/fleet/server/routes/package_policy/utils/index.ts b/x-pack/plugins/fleet/server/routes/package_policy/utils/index.ts
index da1fca175b9cf..7a88899d8ba28 100644
--- a/x-pack/plugins/fleet/server/routes/package_policy/utils/index.ts
+++ b/x-pack/plugins/fleet/server/routes/package_policy/utils/index.ts
@@ -8,7 +8,7 @@
 import type { TypeOf } from '@kbn/config-schema';
 
 import type { CreatePackagePolicyRequestSchema, PackagePolicyInput } from '../../../types';
-import { licenseService } from '../../../services';
+import { appContextService, licenseService } from '../../../services';
 import type { SimplifiedPackagePolicy } from '../../../../common/services/simplified_package_policy_helper';
 
 export function isSimplifiedCreatePackagePolicyRequest(
@@ -44,9 +44,12 @@ const LICENCE_FOR_MULTIPLE_AGENT_POLICIES = 'enterprise';
 
 export function canUseMultipleAgentPolicies() {
   const hasEnterpriseLicence = licenseService.hasAtLeast(LICENCE_FOR_MULTIPLE_AGENT_POLICIES);
+  const { enableReusableIntegrationPolicies } = appContextService.getExperimentalFeatures();
 
   return {
-    canUseReusablePolicies: hasEnterpriseLicence,
-    errorMessage: 'Reusable integration policies are only available with an Enterprise license',
+    canUseReusablePolicies: hasEnterpriseLicence && enableReusableIntegrationPolicies,
+    errorMessage: !hasEnterpriseLicence
+      ? 'Reusable integration policies are only available with an Enterprise license'
+      : 'Reusable integration policies are not supported',
   };
 }
diff --git a/x-pack/plugins/fleet/server/routes/utils/filter_utils.test.ts b/x-pack/plugins/fleet/server/routes/utils/filter_utils.test.ts
index c73f7e8762669..5ff0e18ef35f6 100644
--- a/x-pack/plugins/fleet/server/routes/utils/filter_utils.test.ts
+++ b/x-pack/plugins/fleet/server/routes/utils/filter_utils.test.ts
@@ -388,7 +388,7 @@ describe('Filter Utils', () => {
         ]);
       });
 
-      it('Return Error if filter is using an non-existing key null key', () => {
+      it('Not return error if filter is using an non-existing key null key', () => {
         const validationObject = validateFilterKueryNode({
           astFilter: esKuery.fromKueryExpression('foo.attributes.description: hello AND bye'),
           types: ['foo'],
@@ -405,7 +405,7 @@ describe('Filter Utils', () => {
           },
           {
             astPath: 'arguments.1',
-            error: 'Invalid key',
+            error: null,
             isSavedObjectAttr: false,
             key: null,
             type: null,
diff --git a/x-pack/plugins/fleet/server/routes/utils/filter_utils.ts b/x-pack/plugins/fleet/server/routes/utils/filter_utils.ts
index fac6e40024e60..4f29f368e5140 100644
--- a/x-pack/plugins/fleet/server/routes/utils/filter_utils.ts
+++ b/x-pack/plugins/fleet/server/routes/utils/filter_utils.ts
@@ -133,6 +133,9 @@ export const hasFilterKeyError = (
   indexMapping: IndexMapping,
   skipNormalization?: boolean
 ): string | null => {
+  if (key === null) {
+    return null;
+  }
   if (!key) {
     return `Invalid key`;
   }
diff --git a/x-pack/plugins/fleet/server/routes/utils/filter_utils_real_queries.test.ts b/x-pack/plugins/fleet/server/routes/utils/filter_utils_real_queries.test.ts
index 45b0995aac078..a8765dc87327b 100644
--- a/x-pack/plugins/fleet/server/routes/utils/filter_utils_real_queries.test.ts
+++ b/x-pack/plugins/fleet/server/routes/utils/filter_utils_real_queries.test.ts
@@ -551,17 +551,6 @@ describe('validateKuery validates real kueries', () => {
       expect(validationObj?.isValid).toEqual(true);
     });
 
-    it('Invalid kuery', async () => {
-      const validationObj = validateKuery(
-        'test%3A',
-        [AGENT_POLICY_SAVED_OBJECT_TYPE],
-        AGENT_POLICY_MAPPINGS,
-        true
-      );
-      expect(validationObj?.isValid).toEqual(false);
-      expect(validationObj?.error).toContain(`KQLSyntaxError: Invalid key`);
-    });
-
     it('Kuery with non existent parameter wrapped by SO', async () => {
       const validationObj = validateKuery(
         `${AGENT_POLICY_SAVED_OBJECT_TYPE}.non_existent_parameter: 'test_id'`,
@@ -834,15 +823,15 @@ describe('validateKuery validates real kueries', () => {
       expect(validationObj?.isValid).toEqual(true);
     });
 
-    it('Invalid search by non existent parameter', async () => {
+    it('Search without field parameter', async () => {
       const validationObj = validateKuery(
         `policyId1`,
         [FLEET_ENROLLMENT_API_PREFIX],
         ENROLLMENT_API_KEY_MAPPINGS,
         true
       );
-      expect(validationObj?.isValid).toEqual(false);
-      expect(validationObj?.error).toEqual(`KQLSyntaxError: Invalid key`);
+      expect(validationObj?.isValid).toEqual(true);
+      expect(validationObj?.error).toEqual(undefined);
     });
   });
   describe('Feature flag enableStrictKQLValidation', () => {
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.test.ts b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
index 4cc816a908cdc..76deafbc12211 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.test.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.test.ts
@@ -119,6 +119,7 @@ describe('Agent policy', () => {
   beforeEach(() => {
     mockedLogger = loggerMock.create();
     mockedAppContextService.getLogger.mockReturnValue(mockedLogger);
+    mockedAppContextService.getExperimentalFeatures.mockReturnValue({ agentless: false } as any);
   });
 
   afterEach(() => {
@@ -230,7 +231,7 @@ describe('Agent policy', () => {
       );
     });
 
-    it('should throw AgentPolicyInvalidError if support_agentless is defined in stateful', async () => {
+    it('should throw AgentPolicyInvalidError if support_agentless is defined in stateful without agentless feature', async () => {
       jest
         .spyOn(appContextService, 'getExperimentalFeatures')
         .mockReturnValue({ agentless: false } as any);
@@ -249,7 +250,7 @@ describe('Agent policy', () => {
         })
       ).rejects.toThrowError(
         new AgentPolicyInvalidError(
-          'supports_agentless is only allowed in serverless environments that support the agentless feature'
+          'supports_agentless is only allowed in serverless and cloud environments that support the agentless feature'
         )
       );
     });
@@ -273,7 +274,7 @@ describe('Agent policy', () => {
         })
       ).rejects.toThrowError(
         new AgentPolicyInvalidError(
-          'supports_agentless is only allowed in serverless environments that support the agentless feature'
+          'supports_agentless is only allowed in serverless and cloud environments that support the agentless feature'
         )
       );
     });
@@ -1029,13 +1030,13 @@ describe('Agent policy', () => {
       ).rejects.toThrowError(new Error('Cannot enable Agent Tamper Protection: reason'));
     });
 
-    it('should throw AgentPolicyInvalidError if support_agentless is defined in stateful', async () => {
+    it('should not throw AgentPolicyInvalidError if support_agentless is defined in stateful', async () => {
       jest
         .spyOn(appContextService, 'getExperimentalFeatures')
-        .mockReturnValue({ agentless: false } as any);
+        .mockReturnValue({ agentless: true } as any);
       jest
         .spyOn(appContextService, 'getCloud')
-        .mockReturnValue({ isServerlessEnabled: false } as any);
+        .mockReturnValue({ isServerlessEnabled: false, isCloudEnabled: true } as any);
 
       const soClient = getAgentPolicyCreateMock();
       const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
@@ -1052,11 +1053,7 @@ describe('Agent policy', () => {
           namespace: 'default',
           supports_agentless: true,
         })
-      ).rejects.toThrowError(
-        new AgentPolicyInvalidError(
-          'supports_agentless is only allowed in serverless environments that support the agentless feature'
-        )
-      );
+      ).resolves.not.toThrow();
     });
 
     it('should throw AgentPolicyInvalidError if agentless flag is disabled in serverless', async () => {
@@ -1084,7 +1081,7 @@ describe('Agent policy', () => {
         })
       ).rejects.toThrowError(
         new AgentPolicyInvalidError(
-          'supports_agentless is only allowed in serverless environments that support the agentless feature'
+          'supports_agentless is only allowed in serverless and cloud environments that support the agentless feature'
         )
       );
     });
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index 9a455fc71640e..ed3cefb2faf94 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -1570,12 +1570,12 @@ class AgentPolicyService {
   private checkAgentless(agentPolicy: Partial<NewAgentPolicy>) {
     const cloudSetup = appContextService.getCloud();
     if (
-      (!cloudSetup?.isServerlessEnabled ||
-        !appContextService.getExperimentalFeatures().agentless) &&
-      agentPolicy?.supports_agentless !== undefined
+      (!cloudSetup?.isServerlessEnabled || !cloudSetup?.isCloudEnabled) &&
+      !appContextService.getExperimentalFeatures().agentless &&
+      agentPolicy?.supports_agentless
     ) {
       throw new AgentPolicyInvalidError(
-        'supports_agentless is only allowed in serverless environments that support the agentless feature'
+        'supports_agentless is only allowed in serverless and cloud environments that support the agentless feature'
       );
     }
   }
diff --git a/x-pack/plugins/fleet/server/services/agent_policy_create.ts b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
index dc5a57e81a16a..870cea84b36e1 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy_create.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy_create.ts
@@ -67,9 +67,9 @@ async function createPackagePolicy(
         force: true,
         user: options.user,
       });
+
       throw error;
     });
-
   if (!newPackagePolicy) return;
 
   newPackagePolicy.policy_id = agentPolicy.id;
@@ -82,7 +82,7 @@ async function createPackagePolicy(
     user: options.user,
     bumpRevision: false,
     authorizationHeader: options.authorizationHeader,
-    force: options.force,
+    force: options.force || agentPolicy.supports_agentless === true,
   });
 }
 
@@ -170,6 +170,5 @@ export async function createAgentPolicyWithPackages({
 
   await ensureDefaultEnrollmentAPIKeyForAgentPolicy(soClient, esClient, agentPolicy.id);
   await agentPolicyService.deployPolicy(soClient, agentPolicy.id);
-
   return agentPolicy;
 }
diff --git a/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts b/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts
index 1c8db8451ccfa..0a8232d6e5715 100644
--- a/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts
+++ b/x-pack/plugins/fleet/server/services/agents/update_agent_tags_action_runner.ts
@@ -131,7 +131,9 @@ export async function updateTagsBatch(
     );
   }
 
-  appContextService.getLogger().debug(JSON.stringify(res).slice(0, 1000));
+  if (appContextService.getLogger().isLevelEnabled('debug')) {
+    appContextService.getLogger().debug(JSON.stringify(res).slice(0, 1000));
+  }
 
   // creating unique ids to use as agentId, as we don't have all agent ids in case of action by kuery
   const getUuidArray = (count: number) => Array.from({ length: count }, () => uuidv4());
diff --git a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
index 43cf3f745cc6c..c6173f1eb8e89 100644
--- a/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
+++ b/x-pack/plugins/fleet/server/services/artifacts/artifacts.ts
@@ -146,9 +146,10 @@ export const bulkCreateArtifacts = async (
 
   for (let batchN = 0; batchN < batches.length; batchN++) {
     logger.debug(
-      `Creating artifacts for batch ${batchN + 1} with ${batches[batchN].length / 2} artifacts`
+      () =>
+        `Creating artifacts for batch ${batchN + 1} with ${batches[batchN].length / 2} artifacts`
     );
-    logger.debug(`Artifacts in current batch: ${JSON.stringify(batches[batchN])}`);
+    logger.debug(() => `Artifacts in current batch: ${JSON.stringify(batches[batchN])}`);
     // Generate a bulk create for the current batch of artifacts
     const res = await withPackageSpan(`Bulk create fleet artifacts batch [${batchN}]`, () =>
       esClient.bulk({
diff --git a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
index 8e47180076338..6eff632c06abb 100644
--- a/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
+++ b/x-pack/plugins/fleet/server/services/elastic_agent_manifest.ts
@@ -42,7 +42,7 @@ spec:
       #      - -c
       #      - >-
       #        mkdir -p /usr/share/elastic-agent/state/inputs.d &&
-      #        curl -sL https://github.com/elastic/elastic-agent/archive/8.15.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.15/deploy/kubernetes/elastic-agent/templates.d"
+      #        curl -sL https://github.com/elastic/elastic-agent/archive/8.16.tar.gz | tar xz -C /usr/share/elastic-agent/state/inputs.d --strip=5 "elastic-agent-8.16/deploy/kubernetes/elastic-agent/templates.d"
       #    securityContext:
       #      runAsUser: 0
       #    volumeMounts:
@@ -351,9 +351,6 @@ spec:
           effect: NoSchedule
       serviceAccountName: elastic-agent
       hostNetwork: true
-      # 'hostPID: true' enables the Elastic Security integration to observe all process exec events on the host.
-      # Sharing the host process ID namespace gives visibility of all processes running on the same host.
-      hostPID: true
       dnsPolicy: ClusterFirstWithHostNet
       containers:
         - name: elastic-agent
@@ -469,7 +466,7 @@ spec:
           hostPath:
             path: /var/lib
         # Mount /etc/machine-id from the host to determine host ID
-        # Needed for Elastic Security integration
+        # Needed for Kubernetes node autodiscovery
         - name: etc-mid
           hostPath:
             path: /etc/machine-id
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
index 654ce7ea8ed81..e44e70b85efe0 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/template.ts
@@ -39,7 +39,7 @@ import { retryTransientEsErrors } from '../retry';
 import { PackageESError, PackageInvalidArchiveError } from '../../../../errors';
 
 import { getDefaultProperties, histogram, keyword, scaledFloat } from './mappings';
-import { isUserSettingsTemplate } from './utils';
+import { isUserSettingsTemplate, fillConstantKeywordValues } from './utils';
 
 interface Properties {
   [key: string]: any;
@@ -986,7 +986,7 @@ const updateAllDataStreams = async (
       });
     },
     {
-      // Limit concurrent putMapping/rollover requests to avoid overhwhelming ES cluster
+      // Limit concurrent putMapping/rollover requests to avoid overwhelming ES cluster
       concurrency: 20,
     }
   );
@@ -1017,19 +1017,23 @@ const updateExistingDataStream = async ({
   const currentSourceType = currentBackingIndexConfig.mappings?._source?.mode;
 
   let settings: IndicesIndexSettings;
-  let mappings: MappingTypeMapping;
+  let mappings: MappingTypeMapping = {};
   let lifecycle: any;
   let subobjectsFieldChanged: boolean = false;
+  let simulateResult: any = {};
   try {
-    const simulateResult = await retryTransientEsErrors(async () =>
+    simulateResult = await retryTransientEsErrors(async () =>
       esClient.indices.simulateTemplate({
         name: await getIndexTemplate(esClient, dataStreamName),
       })
     );
 
     settings = simulateResult.template.settings;
-    mappings = simulateResult.template.mappings;
-    // @ts-expect-error template is not yet typed with DLM
+    mappings = fillConstantKeywordValues(
+      currentBackingIndexConfig?.mappings || {},
+      simulateResult.template.mappings
+    );
+
     lifecycle = simulateResult.template.lifecycle;
 
     // for now, remove from object so as not to update stream or data stream properties of the index until type and name
@@ -1063,6 +1067,7 @@ const updateExistingDataStream = async ({
       subobjectsFieldChanged
     ) {
       logger.info(`Mappings update for ${dataStreamName} failed due to ${err}`);
+      logger.trace(`Attempted mappings: ${mappings}`);
       if (options?.skipDataStreamRollover === true) {
         logger.info(
           `Skipping rollover for ${dataStreamName} as "skipDataStreamRollover" is enabled`
@@ -1075,6 +1080,7 @@ const updateExistingDataStream = async ({
       }
     }
     logger.error(`Mappings update for ${dataStreamName} failed due to unexpected error: ${err}`);
+    logger.trace(`Attempted mappings: ${mappings}`);
     if (options?.ignoreMappingUpdateErrors === true) {
       logger.info(`Ignore mapping update errors as "ignoreMappingUpdateErrors" is enabled`);
       return;
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.test.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.test.ts
new file mode 100644
index 0000000000000..a411ba32d2954
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.test.ts
@@ -0,0 +1,226 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { fillConstantKeywordValues } from './utils';
+
+describe('fillConstantKeywordValues', () => {
+  const oldMappings = {
+    dynamic: false,
+    _meta: {
+      managed_by: 'fleet',
+      managed: true,
+      package: {
+        name: 'elastic_agent',
+      },
+    },
+    dynamic_templates: [
+      {
+        ecs_timestamp: {
+          match: '@timestamp',
+          mapping: {
+            ignore_malformed: false,
+            type: 'date',
+          },
+        },
+      },
+    ],
+    date_detection: false,
+    properties: {
+      '@timestamp': {
+        type: 'date',
+        ignore_malformed: false,
+      },
+      load: {
+        properties: {
+          '1': {
+            type: 'double',
+          },
+          '5': {
+            type: 'double',
+          },
+          '15': {
+            type: 'double',
+          },
+        },
+      },
+      event: {
+        properties: {
+          agent_id_status: {
+            type: 'keyword',
+            ignore_above: 1024,
+          },
+          dataset: {
+            type: 'constant_keyword',
+            value: 'elastic_agent.metricbeat',
+          },
+          ingested: {
+            type: 'date',
+            format: 'strict_date_time_no_millis||strict_date_optional_time||epoch_millis',
+            ignore_malformed: false,
+          },
+        },
+      },
+      message: {
+        type: 'match_only_text',
+      },
+      'dot.field': {
+        type: 'keyword',
+      },
+      constant_keyword_without_value: {
+        type: 'constant_keyword',
+      },
+    },
+  };
+
+  const newMappings = {
+    dynamic: false,
+    _meta: {
+      managed_by: 'fleet',
+      managed: true,
+      package: {
+        name: 'elastic_agent',
+      },
+    },
+    dynamic_templates: [
+      {
+        ecs_timestamp: {
+          match: '@timestamp',
+          mapping: {
+            ignore_malformed: false,
+            type: 'date',
+          },
+        },
+      },
+    ],
+    date_detection: false,
+    properties: {
+      '@timestamp': {
+        type: 'date',
+        ignore_malformed: false,
+      },
+      load: {
+        properties: {
+          '1': {
+            type: 'double',
+          },
+          '5': {
+            type: 'double',
+          },
+          '15': {
+            type: 'double',
+          },
+        },
+      },
+      event: {
+        properties: {
+          agent_id_status: {
+            type: 'keyword',
+            ignore_above: 1024,
+          },
+          dataset: {
+            type: 'constant_keyword',
+          },
+          ingested: {
+            type: 'date',
+            format: 'strict_date_time_no_millis||strict_date_optional_time||epoch_millis',
+            ignore_malformed: false,
+          },
+        },
+      },
+      message: {
+        type: 'match_only_text',
+      },
+      'dot.field': {
+        type: 'keyword',
+      },
+      some_new_field: {
+        type: 'keyword',
+      },
+      constant_keyword_without_value: {
+        type: 'constant_keyword',
+      },
+    },
+  };
+
+  it('should fill in missing constant_keyword values from old mappings correctly', () => {
+    // @ts-ignore
+    expect(fillConstantKeywordValues(oldMappings, newMappings)).toEqual({
+      dynamic: false,
+      _meta: {
+        managed_by: 'fleet',
+        managed: true,
+        package: {
+          name: 'elastic_agent',
+        },
+      },
+      dynamic_templates: [
+        {
+          ecs_timestamp: {
+            match: '@timestamp',
+            mapping: {
+              ignore_malformed: false,
+              type: 'date',
+            },
+          },
+        },
+      ],
+      date_detection: false,
+      properties: {
+        '@timestamp': {
+          type: 'date',
+          ignore_malformed: false,
+        },
+        load: {
+          properties: {
+            '1': {
+              type: 'double',
+            },
+            '5': {
+              type: 'double',
+            },
+            '15': {
+              type: 'double',
+            },
+          },
+        },
+        event: {
+          properties: {
+            agent_id_status: {
+              type: 'keyword',
+              ignore_above: 1024,
+            },
+            dataset: {
+              type: 'constant_keyword',
+              value: 'elastic_agent.metricbeat',
+            },
+            ingested: {
+              type: 'date',
+              format: 'strict_date_time_no_millis||strict_date_optional_time||epoch_millis',
+              ignore_malformed: false,
+            },
+          },
+        },
+        message: {
+          type: 'match_only_text',
+        },
+        'dot.field': {
+          type: 'keyword',
+        },
+        some_new_field: {
+          type: 'keyword',
+        },
+        constant_keyword_without_value: {
+          type: 'constant_keyword',
+        },
+      },
+    });
+  });
+
+  it('should return the same mappings if old mappings are not provided', () => {
+    // @ts-ignore
+    expect(fillConstantKeywordValues({}, newMappings)).toMatchObject(newMappings);
+  });
+});
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.ts
index e435e54a828df..6a34beb371082 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/utils.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { MappingTypeMapping } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 import { USER_SETTINGS_TEMPLATE_SUFFIX } from '../../../../constants';
 
@@ -12,3 +13,34 @@ type UserSettingsTemplateName = `${TemplateBaseName}${typeof USER_SETTINGS_TEMPL
 
 export const isUserSettingsTemplate = (name: string): name is UserSettingsTemplateName =>
   name.endsWith(USER_SETTINGS_TEMPLATE_SUFFIX);
+
+// For any `constant_keyword` fields in `newMappings` that don't have a `value`, access the same field in
+// the `oldMappings` and fill in the value from there
+export const fillConstantKeywordValues = (
+  oldMappings: MappingTypeMapping,
+  newMappings: MappingTypeMapping
+) => {
+  const filledMappings = JSON.parse(JSON.stringify(newMappings)) as MappingTypeMapping;
+  const deepGet = (obj: any, keys: string[]) => keys.reduce((xs, x) => xs?.[x] ?? undefined, obj);
+
+  const fillEmptyConstantKeywordFields = (mappings: unknown, currentPath: string[] = []) => {
+    if (!mappings) return;
+    for (const [key, potentialField] of Object.entries(mappings)) {
+      const path = [...currentPath, key];
+      if (typeof potentialField === 'object') {
+        if (potentialField.type === 'constant_keyword' && potentialField.value === undefined) {
+          const valueFromOldMappings = deepGet(oldMappings.properties, [...path, 'value']);
+          if (valueFromOldMappings !== undefined) {
+            potentialField.value = valueFromOldMappings;
+          }
+        } else if (potentialField.properties && typeof potentialField.properties === 'object') {
+          fillEmptyConstantKeywordFields(potentialField.properties, [...path, 'properties']);
+        }
+      }
+    }
+  };
+
+  fillEmptyConstantKeywordFields(filledMappings.properties);
+
+  return filledMappings;
+};
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
index 740ea2af537e9..c7472c268e29c 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/transform/install.ts
@@ -648,9 +648,10 @@ export const installTransforms = async ({
     );
     if (previousInstalledTransformEsAssets.length > 0) {
       logger.debug(
-        `Found previous transform references:\n ${JSON.stringify(
-          previousInstalledTransformEsAssets
-        )}`
+        () =>
+          `Found previous transform references:\n ${JSON.stringify(
+            previousInstalledTransformEsAssets
+          )}`
       );
     }
   }
diff --git a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
index e7e453648a596..2096820e82dad 100644
--- a/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
+++ b/x-pack/plugins/fleet/server/services/epm/kibana/assets/install.ts
@@ -387,9 +387,10 @@ async function retryImportOnConflictError(
     const retryDelayMs = 1000 + Math.floor(Math.random() * 3000); // 1s + 0-3s of jitter
 
     logger?.debug(
-      `Retrying import operation after [${
-        retryDelayMs * 1000
-      }s] due to conflict errors: ${JSON.stringify(errors)}`
+      () =>
+        `Retrying import operation after [${
+          retryDelayMs * 1000
+        }s] due to conflict errors: ${JSON.stringify(errors)}`
     );
 
     await setTimeout(retryDelayMs);
@@ -458,9 +459,10 @@ export async function installKibanaSavedObjects({
     the integrations team. */
     if (referenceErrors.length) {
       logger.debug(
-        `Resolving ${
-          referenceErrors.length
-        } reference errors creating saved objects: ${formatImportErrorsForLog(referenceErrors)}`
+        () =>
+          `Resolving ${
+            referenceErrors.length
+          } reference errors creating saved objects: ${formatImportErrorsForLog(referenceErrors)}`
       );
 
       const retries = toBeSavedObjects.map(({ id, type }) => {
diff --git a/x-pack/plugins/fleet/server/services/fleet_server/index.test.ts b/x-pack/plugins/fleet/server/services/fleet_server/index.test.ts
index f00d78cd59ad9..7faea8c526819 100644
--- a/x-pack/plugins/fleet/server/services/fleet_server/index.test.ts
+++ b/x-pack/plugins/fleet/server/services/fleet_server/index.test.ts
@@ -115,6 +115,13 @@ describe('checkFleetServerVersionsForSecretsStorage', () => {
       version
     );
     expect(result).toBe(true);
+    expect(mockedGetAgentsByKuery).toHaveBeenCalledWith(
+      esClientMock,
+      soClientMock,
+      expect.objectContaining({
+        kuery: 'policy_id:("1" or "2")',
+      })
+    );
   });
 });
 
diff --git a/x-pack/plugins/fleet/server/services/fleet_server/index.ts b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
index 004a0deeea7b7..a0d508f0929e9 100644
--- a/x-pack/plugins/fleet/server/services/fleet_server/index.ts
+++ b/x-pack/plugins/fleet/server/services/fleet_server/index.ts
@@ -128,11 +128,19 @@ export async function checkFleetServerVersionsForSecretsStorage(
       hasMore = false;
     }
   }
+  if (policyIds.size === 0) {
+    return false;
+  }
+
+  const kuery = `policy_id:(${Array.from(policyIds)
+    .map((id) => `"${id}"`)
+    .join(' or ')})`;
 
   const managedAgentPolicies = await agentPolicyService.getAllManagedAgentPolicies(soClient);
   const fleetServerAgents = await getAgentsByKuery(esClient, soClient, {
     showInactive: true,
     perPage: SO_SEARCH_LIMIT,
+    kuery,
   });
 
   if (fleetServerAgents.agents.length === 0) {
diff --git a/x-pack/plugins/fleet/server/services/fleet_usage_logger.ts b/x-pack/plugins/fleet/server/services/fleet_usage_logger.ts
index 76c4aba77038c..9d36020e4655f 100644
--- a/x-pack/plugins/fleet/server/services/fleet_usage_logger.ts
+++ b/x-pack/plugins/fleet/server/services/fleet_usage_logger.ts
@@ -32,7 +32,9 @@ export function registerFleetUsageLogger(
             try {
               const usageData = await fetchUsage();
               if (appContextService.getLogger().isLevelEnabled('debug')) {
-                appContextService.getLogger().debug(`Fleet Usage: ${JSON.stringify(usageData)}`);
+                appContextService
+                  .getLogger()
+                  .debug(() => `Fleet Usage: ${JSON.stringify(usageData)}`);
               } else {
                 appContextService.getLogger().info(`Fleet Usage: ${JSON.stringify(usageData)}`);
               }
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 8fd71a76355c8..e244be59b8012 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -1678,7 +1678,7 @@ class PackagePolicyClientImpl implements PackagePolicyClient {
         .info(
           `Package policy upgrade dry run ${hasErrors ? 'resulted in errors' : 'ran successfully'}`
         );
-      appContextService.getLogger().debug(JSON.stringify(upgradeTelemetry));
+      appContextService.getLogger().debug(() => JSON.stringify(upgradeTelemetry));
     }
   }
 
@@ -2716,9 +2716,10 @@ export function _validateRestrictedFieldsNotModifiedOrThrow(opts: {
             appContextService
               .getLogger()
               .debug(
-                `Rejecting package policy update due to dataset change, old val '${
-                  oldStream?.vars[DATASET_VAR_NAME]?.value
-                }, new val '${JSON.stringify(stream?.vars?.[DATASET_VAR_NAME]?.value)}'`
+                () =>
+                  `Rejecting package policy update due to dataset change, old val '${
+                    oldStream.vars![DATASET_VAR_NAME].value
+                  }, new val '${JSON.stringify(stream?.vars?.[DATASET_VAR_NAME]?.value)}'`
               );
             throw new PackagePolicyValidationError(
               i18n.translate('xpack.fleet.updatePackagePolicy.datasetCannotBeModified', {
@@ -2745,7 +2746,10 @@ async function validateIsNotHostedPolicy(
     throw new AgentPolicyNotFoundError('Agent policy not found');
   }
 
-  if (agentPolicy.is_managed && !force) {
+  const isManagedPolicyWithoutServerlessSupport =
+    agentPolicy.is_managed && !agentPolicy.supports_agentless && !force;
+
+  if (isManagedPolicyWithoutServerlessSupport) {
     throw new HostedAgentPolicyRestrictionRelatedError(
       errorMessage ?? `Cannot update integrations of hosted agent policy ${id}`
     );
@@ -2778,7 +2782,7 @@ export function sendUpdatePackagePolicyTelemetryEvent(
           upgradeTelemetry
         );
         appContextService.getLogger().info(`Package policy upgraded successfully`);
-        appContextService.getLogger().debug(JSON.stringify(upgradeTelemetry));
+        appContextService.getLogger().debug(() => JSON.stringify(upgradeTelemetry));
       }
     }
   });
diff --git a/x-pack/plugins/fleet/server/services/preconfiguration.ts b/x-pack/plugins/fleet/server/services/preconfiguration.ts
index 0616f15c180f4..a0b633efa3746 100644
--- a/x-pack/plugins/fleet/server/services/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/services/preconfiguration.ts
@@ -296,12 +296,13 @@ export async function ensurePreconfiguredPackagesAndPolicies(
         );
       });
       logger.debug(
-        `Adding preconfigured package policies ${JSON.stringify(
-          packagePoliciesToAdd.map((pol) => ({
-            name: pol.packagePolicy.name,
-            package: pol.installedPackage.name,
-          }))
-        )}`
+        () =>
+          `Adding preconfigured package policies ${JSON.stringify(
+            packagePoliciesToAdd.map((pol) => ({
+              name: pol.packagePolicy.name,
+              package: pol.installedPackage.name,
+            }))
+          )}`
       );
       const s = apm.startSpan('Add preconfigured package policies', 'preconfiguration');
       await addPreconfiguredPolicyPackages(
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index d1e29147a2104..a1df9c7d9d609 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -133,7 +133,9 @@ async function createLock(
       },
       { id: FLEET_SETUP_LOCK_TYPE }
     );
-    logger.debug(`Fleet setup lock created: ${JSON.stringify(created)}`);
+    if (logger.isLevelEnabled('debug')) {
+      logger.debug(`Fleet setup lock created: ${JSON.stringify(created)}`);
+    }
   } catch (error) {
     logger.info(`Could not create fleet setup lock, abort setup: ${error}`);
     return { created: false, toReturn: { isInitialized: false, nonFatalErrors: [] } };
diff --git a/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts b/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
index 2d986b1e7bc6c..41c560084e050 100644
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usage_sender.ts
@@ -24,7 +24,7 @@ const FLEET_AGENTS_EVENT_TYPE = 'fleet_agents';
 
 export class FleetUsageSender {
   private taskManager?: TaskManagerStartContract;
-  private taskVersion = '1.1.6';
+  private taskVersion = '1.1.7';
   private taskType = 'Fleet-Usage-Sender';
   private wasStarted: boolean = false;
   private interval = '1h';
@@ -93,27 +93,27 @@ export class FleetUsageSender {
       } = usageData;
       appContextService
         .getLogger()
-        .debug('Fleet usage telemetry: ' + JSON.stringify(fleetUsageData));
+        .debug(() => 'Fleet usage telemetry: ' + JSON.stringify(fleetUsageData));
 
       core.analytics.reportEvent(FLEET_USAGES_EVENT_TYPE, fleetUsageData);
 
       appContextService
         .getLogger()
-        .debug('Agents per privileges telemetry: ' + JSON.stringify(agentsPerPrivileges));
+        .debug(() => 'Agents per privileges telemetry: ' + JSON.stringify(agentsPerPrivileges));
       core.analytics.reportEvent(FLEET_AGENTS_EVENT_TYPE, {
         agents_per_privileges: agentsPerPrivileges,
       });
 
       appContextService
         .getLogger()
-        .debug('Agents per version telemetry: ' + JSON.stringify(agentsPerVersion));
+        .debug(() => 'Agents per version telemetry: ' + JSON.stringify(agentsPerVersion));
       agentsPerVersion.forEach((byVersion) => {
         core.analytics.reportEvent(FLEET_AGENTS_EVENT_TYPE, { agents_per_version: byVersion });
       });
 
       appContextService
         .getLogger()
-        .debug('Agents per output type telemetry: ' + JSON.stringify(agentsPerOutputType));
+        .debug(() => 'Agents per output type telemetry: ' + JSON.stringify(agentsPerOutputType));
       agentsPerOutputType.forEach((byOutputType) => {
         core.analytics.reportEvent(FLEET_AGENTS_EVENT_TYPE, {
           agents_per_output_type: byOutputType,
@@ -122,7 +122,7 @@ export class FleetUsageSender {
 
       appContextService
         .getLogger()
-        .debug('Agents upgrade details telemetry: ' + JSON.stringify(upgradeDetails));
+        .debug(() => 'Agents upgrade details telemetry: ' + JSON.stringify(upgradeDetails));
       upgradeDetails.forEach((upgradeDetailsObj) => {
         core.analytics.reportEvent(FLEET_AGENTS_EVENT_TYPE, { upgrade_details: upgradeDetailsObj });
       });
diff --git a/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts b/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
index 1720470b65ad8..a579ba69bab83 100644
--- a/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
+++ b/x-pack/plugins/fleet/server/services/telemetry/fleet_usages_schema.ts
@@ -357,6 +357,7 @@ export const fleetUsagesSchema: RootSchema<any> = {
         _meta: {
           description:
             'Average number of global data tags defined per agent policy (accross policies using global data tags)',
+          optional: true,
         },
       },
     },
diff --git a/x-pack/plugins/fleet/server/telemetry/sender.ts b/x-pack/plugins/fleet/server/telemetry/sender.ts
index a31f97b57fbd5..8fb71683b2c9c 100644
--- a/x-pack/plugins/fleet/server/telemetry/sender.ts
+++ b/x-pack/plugins/fleet/server/telemetry/sender.ts
@@ -154,7 +154,7 @@ export class TelemetryEventsSender {
         deployment_id: appContextService.getCloud()?.deploymentId,
       }));
 
-      this.logger.debug(JSON.stringify(toSend));
+      this.logger.debug(() => JSON.stringify(toSend));
 
       await this.send(
         toSend,
@@ -199,10 +199,12 @@ export class TelemetryEventsSender {
         },
         timeout: 5000,
       });
-      this.logger.debug(`Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`);
+      this.logger.debug(
+        () => `Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`
+      );
     } catch (err) {
       this.logger.debug(
-        `Error sending events: ${err?.response?.status} ${JSON.stringify(err.response.data)}`
+        () => `Error sending events: ${err?.response?.status} ${JSON.stringify(err.response.data)}`
       );
     }
   }
diff --git a/x-pack/plugins/fleet/server/types/models/preconfiguration.test.ts b/x-pack/plugins/fleet/server/types/models/preconfiguration.test.ts
index 085714b67244d..a436f799fc171 100644
--- a/x-pack/plugins/fleet/server/types/models/preconfiguration.test.ts
+++ b/x-pack/plugins/fleet/server/types/models/preconfiguration.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { PreconfiguredOutputsSchema } from './preconfiguration';
+import { PreconfiguredOutputsSchema, PreconfiguredAgentPoliciesSchema } from './preconfiguration';
 
 describe('Test preconfiguration schema', () => {
   describe('PreconfiguredOutputsSchema', () => {
@@ -147,4 +147,17 @@ describe('Test preconfiguration schema', () => {
       }).not.toThrowError();
     });
   });
+
+  describe('PreconfiguredAgentPoliciesSchema', () => {
+    it('should allow basic agent policy only with id and name', () => {
+      expect(() => {
+        PreconfiguredAgentPoliciesSchema.validate([
+          {
+            id: 'agent-default-policy',
+            name: 'test agent policy',
+          },
+        ]);
+      }).not.toThrowError();
+    });
+  });
 });
diff --git a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
index 090d74b38a412..37786ab207249 100644
--- a/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
+++ b/x-pack/plugins/fleet/server/types/models/preconfiguration.ts
@@ -142,51 +142,53 @@ export const PreconfiguredAgentPoliciesSchema = schema.arrayOf(
     has_fleet_server: schema.maybe(schema.boolean()),
     data_output_id: schema.maybe(schema.string()),
     monitoring_output_id: schema.maybe(schema.string()),
-    package_policies: schema.arrayOf(
-      schema.oneOf([
-        schema.object({
-          id: schema.maybe(schema.oneOf([schema.string(), schema.number()])),
-          name: schema.string(),
-          package: schema.object({
-            name: schema.string({
-              validate: (value) => {
-                if (value === 'synthetics') {
-                  return i18n.translate('xpack.fleet.config.disableSynthetics', {
-                    defaultMessage:
-                      'Synthetics package is not supported via kibana.yml config. Please use Synthetics App to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
-                  });
-                }
-              },
+    package_policies: schema.maybe(
+      schema.arrayOf(
+        schema.oneOf([
+          schema.object({
+            id: schema.maybe(schema.oneOf([schema.string(), schema.number()])),
+            name: schema.string(),
+            package: schema.object({
+              name: schema.string({
+                validate: (value) => {
+                  if (value === 'synthetics') {
+                    return i18n.translate('xpack.fleet.config.disableSynthetics', {
+                      defaultMessage:
+                        'Synthetics package is not supported via kibana.yml config. Please use Synthetics App to create monitors in private locations. https://www.elastic.co/guide/en/observability/current/synthetics-private-location.html',
+                    });
+                  }
+                },
+              }),
             }),
+            description: schema.maybe(schema.string()),
+            namespace: schema.maybe(PackagePolicyNamespaceSchema),
+            inputs: schema.maybe(
+              schema.arrayOf(
+                schema.object({
+                  type: schema.string(),
+                  enabled: schema.maybe(schema.boolean()),
+                  keep_enabled: schema.maybe(schema.boolean()),
+                  vars: varsSchema,
+                  streams: schema.maybe(
+                    schema.arrayOf(
+                      schema.object({
+                        data_stream: schema.object({
+                          type: schema.maybe(schema.string()),
+                          dataset: schema.string(),
+                        }),
+                        enabled: schema.maybe(schema.boolean()),
+                        keep_enabled: schema.maybe(schema.boolean()),
+                        vars: varsSchema,
+                      })
+                    )
+                  ),
+                })
+              )
+            ),
           }),
-          description: schema.maybe(schema.string()),
-          namespace: schema.maybe(PackagePolicyNamespaceSchema),
-          inputs: schema.maybe(
-            schema.arrayOf(
-              schema.object({
-                type: schema.string(),
-                enabled: schema.maybe(schema.boolean()),
-                keep_enabled: schema.maybe(schema.boolean()),
-                vars: varsSchema,
-                streams: schema.maybe(
-                  schema.arrayOf(
-                    schema.object({
-                      data_stream: schema.object({
-                        type: schema.maybe(schema.string()),
-                        dataset: schema.string(),
-                      }),
-                      enabled: schema.maybe(schema.boolean()),
-                      keep_enabled: schema.maybe(schema.boolean()),
-                      vars: varsSchema,
-                    })
-                  )
-                ),
-              })
-            )
-          ),
-        }),
-        SimplifiedPackagePolicyPreconfiguredSchema,
-      ])
+          SimplifiedPackagePolicyPreconfiguredSchema,
+        ])
+      )
     ),
   }),
   {
diff --git a/x-pack/plugins/fleet/tsconfig.json b/x-pack/plugins/fleet/tsconfig.json
index 8986527bed977..b45bd90010b42 100644
--- a/x-pack/plugins/fleet/tsconfig.json
+++ b/x-pack/plugins/fleet/tsconfig.json
@@ -64,7 +64,6 @@
     "@kbn/utility-types-jest",
     "@kbn/es-query",
     "@kbn/ui-theme",
-    "@kbn/rison",
     "@kbn/config-schema",
     "@kbn/telemetry-plugin",
     "@kbn/task-manager-plugin",
diff --git a/x-pack/plugins/global_search_bar/kibana.jsonc b/x-pack/plugins/global_search_bar/kibana.jsonc
index 552ee46e6e41d..6412f7c8ed890 100644
--- a/x-pack/plugins/global_search_bar/kibana.jsonc
+++ b/x-pack/plugins/global_search_bar/kibana.jsonc
@@ -4,7 +4,7 @@
   "owner": "@elastic/appex-sharedux",
   "plugin": {
     "id": "globalSearchBar",
-    "server": false,
+    "server": true,
     "browser": true,
     "configPath": [
       "xpack",
diff --git a/x-pack/plugins/global_search_bar/public/components/popover_placeholder.tsx b/x-pack/plugins/global_search_bar/public/components/popover_placeholder.tsx
index 7783cc94cfdba..748d3ba18ca03 100644
--- a/x-pack/plugins/global_search_bar/public/components/popover_placeholder.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/popover_placeholder.tsx
@@ -12,9 +12,13 @@ import { FormattedMessage } from '@kbn/i18n-react';
 
 interface PopoverPlaceholderProps {
   basePath: string;
+  customPlaceholderMessage?: React.ReactNode;
 }
 
-export const PopoverPlaceholder: FC<PopoverPlaceholderProps> = ({ basePath }) => {
+export const PopoverPlaceholder: FC<PopoverPlaceholderProps> = ({
+  basePath,
+  customPlaceholderMessage,
+}) => {
   const { colorMode } = useEuiTheme();
 
   return (
@@ -37,21 +41,25 @@ export const PopoverPlaceholder: FC<PopoverPlaceholderProps> = ({ basePath }) =>
           }.svg`}
         />
 
-        <EuiText size="m">
-          <p>
-            <FormattedMessage
-              id="xpack.globalSearchBar.searchBar.noResultsHeading"
-              defaultMessage="No results found"
-            />
-          </p>
-        </EuiText>
+        {customPlaceholderMessage ?? (
+          <>
+            <EuiText size="m">
+              <p>
+                <FormattedMessage
+                  id="xpack.globalSearchBar.searchBar.noResultsHeading"
+                  defaultMessage="No results found"
+                />
+              </p>
+            </EuiText>
 
-        <p>
-          <FormattedMessage
-            id="xpack.globalSearchBar.searchBar.noResults"
-            defaultMessage="Try searching for applications, dashboards, visualizations, and more."
-          />
-        </p>
+            <p>
+              <FormattedMessage
+                id="xpack.globalSearchBar.searchBar.noResults"
+                defaultMessage="Try searching for applications, dashboards, visualizations, and more."
+              />
+            </p>
+          </>
+        )}
       </EuiFlexItem>
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
index 479c3e546dc9c..e9faef5e7073d 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.test.tsx
@@ -45,6 +45,9 @@ const createResult = (result: Result): GlobalSearchResult => {
 const createBatch = (...results: Result[]): GlobalSearchBatchedResults => ({
   results: results.map(createResult),
 });
+
+const searchCharLimit = 1000;
+
 jest.useFakeTimers({ legacyFakeTimers: true });
 
 describe('SearchBar', () => {
@@ -89,6 +92,37 @@ describe('SearchBar', () => {
     expect(await screen.findAllByTestId('nav-search-option')).toHaveLength(list.length);
   };
 
+  describe('default behavior', () => {
+    it('displays an error message without making a network call when the search input exceeds the specified char limit', async () => {
+      const chromeStyle$ = of<ChromeStyle>('classic');
+
+      render(
+        <IntlProvider locale="en">
+          <SearchBar
+            globalSearch={{ ...searchService, searchCharLimit }}
+            navigateToUrl={applications.navigateToUrl}
+            basePathUrl={basePathUrl}
+            chromeStyle$={chromeStyle$}
+            reportEvent={eventReporter}
+          />
+        </IntlProvider>
+      );
+
+      expect(searchService.find).toHaveBeenCalledTimes(0);
+
+      await focusAndUpdate();
+
+      expect(searchService.find).toHaveBeenCalledTimes(1);
+
+      simulateTypeChar(Array.from(new Array(searchCharLimit + 1)).reduce((acc) => acc + 'a', ''));
+
+      // we use allBy because EUI renders a screen reader only version, along side the visual one
+      expect(await screen.findAllByTestId('searchCharLimitExceededMessageHeading')).toHaveLength(2);
+
+      expect(searchService.find).toHaveBeenCalledTimes(1);
+    });
+  });
+
   describe('chromeStyle: classic', () => {
     const chromeStyle$ = of<ChromeStyle>('classic');
 
@@ -105,7 +139,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -133,7 +167,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -165,7 +199,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -196,7 +230,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -219,7 +253,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
diff --git a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
index 726c41f399450..b1473c56b37ed 100644
--- a/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
+++ b/x-pack/plugins/global_search_bar/public/components/search_bar.tsx
@@ -12,6 +12,7 @@ import {
   EuiFormLabel,
   EuiHeaderSectionItemButton,
   EuiIcon,
+  EuiText,
   EuiLoadingSpinner,
   EuiSelectableTemplateSitewide,
   EuiSelectableTemplateSitewideOption,
@@ -20,6 +21,7 @@ import {
 } from '@elastic/eui';
 import { EuiSelectableOnChangeEvent } from '@elastic/eui/src/components/selectable/selectable';
 import { css } from '@emotion/react';
+import { FormattedMessage } from '@kbn/i18n-react';
 import type { GlobalSearchFindParams, GlobalSearchResult } from '@kbn/global-search-plugin/public';
 import React, { FC, useCallback, useEffect, useRef, useState } from 'react';
 import useDebounce from 'react-use/lib/useDebounce';
@@ -41,6 +43,31 @@ const NoMatchesMessage = (props: { basePathUrl: string }) => {
   return <PopoverPlaceholder basePath={props.basePathUrl} />;
 };
 
+const SearchCharLimitExceededMessage = (props: { basePathUrl: string }) => {
+  const charLimitMessage = (
+    <>
+      <EuiText size="m">
+        <p data-test-subj="searchCharLimitExceededMessageHeading">
+          <FormattedMessage
+            id="xpack.globalSearchBar.searchBar.searchCharLimitExceededHeading"
+            defaultMessage="Search character limit exceeded"
+          />
+        </p>
+      </EuiText>
+      <p>
+        <FormattedMessage
+          id="xpack.globalSearchBar.searchBar.searchCharLimitExceeded"
+          defaultMessage="Try searching for applications, dashboards, visualizations, and more."
+        />
+      </p>
+    </>
+  );
+
+  return (
+    <PopoverPlaceholder basePath={props.basePathUrl} customPlaceholderMessage={charLimitMessage} />
+  );
+};
+
 const EmptyMessage = () => (
   <EuiFlexGroup direction="column" justifyContent="center" style={{ minHeight: '300px' }}>
     <EuiFlexItem grow={false}>
@@ -72,6 +99,7 @@ export const SearchBar: FC<SearchBarProps> = (opts) => {
   const [showAppend, setShowAppend] = useState<boolean>(true);
   const UNKNOWN_TAG_ID = '__unknown__';
   const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [searchCharLimitExceeded, setSearchCharLimitExceeded] = useState(false);
 
   useEffect(() => {
     if (initialLoad) {
@@ -127,11 +155,20 @@ export const SearchBar: FC<SearchBarProps> = (opts) => {
           searchSubscription.current = null;
         }
 
+        if (searchValue.length > globalSearch.searchCharLimit) {
+          // setting this will display an error message to the user
+          setSearchCharLimitExceeded(true);
+          return;
+        } else {
+          setSearchCharLimitExceeded(false);
+        }
+
         setIsLoading(true);
         const suggestions = loadSuggestions(searchValue.toLowerCase());
         setIsLoading(false);
 
         let aggregatedResults: GlobalSearchResult[] = [];
+
         if (searchValue.length !== 0) {
           reportEvent.searchRequest();
         }
@@ -361,6 +398,7 @@ export const SearchBar: FC<SearchBarProps> = (opts) => {
         fullWidth: true,
         append: getAppendForChromeStyle(),
       }}
+      errorMessage={searchCharLimitExceeded ? <SearchCharLimitExceededMessage {...props} /> : null}
       emptyMessage={<EmptyMessage />}
       noMatchesMessage={<NoMatchesMessage {...props} />}
       popoverProps={{
diff --git a/x-pack/plugins/global_search_bar/public/components/types.ts b/x-pack/plugins/global_search_bar/public/components/types.ts
index de0af36624db2..fbcf7c523053b 100644
--- a/x-pack/plugins/global_search_bar/public/components/types.ts
+++ b/x-pack/plugins/global_search_bar/public/components/types.ts
@@ -14,7 +14,7 @@ import { EventReporter } from '../telemetry';
 
 /* @internal */
 export interface SearchBarProps {
-  globalSearch: GlobalSearchPluginStart;
+  globalSearch: GlobalSearchPluginStart & { searchCharLimit: number };
   navigateToUrl: ApplicationStart['navigateToUrl'];
   reportEvent: EventReporter;
   taggingApi?: SavedObjectTaggingPluginStart;
diff --git a/x-pack/plugins/global_search_bar/public/index.ts b/x-pack/plugins/global_search_bar/public/index.ts
index f6676587f83a4..c092380665563 100644
--- a/x-pack/plugins/global_search_bar/public/index.ts
+++ b/x-pack/plugins/global_search_bar/public/index.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { PluginInitializer } from '@kbn/core/public';
+import type { PluginInitializer } from '@kbn/core/public';
 import { GlobalSearchBarPlugin } from './plugin';
 
-export const plugin: PluginInitializer<{}, {}, {}, {}> = () => new GlobalSearchBarPlugin();
+export const plugin: PluginInitializer<{}, {}, {}, {}> = (initializerContext) =>
+  new GlobalSearchBarPlugin(initializerContext);
diff --git a/x-pack/plugins/global_search_bar/public/plugin.test.ts b/x-pack/plugins/global_search_bar/public/plugin.test.ts
new file mode 100644
index 0000000000000..f665fbb1e2818
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/public/plugin.test.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { coreMock } from '@kbn/core/public/mocks';
+import { globalSearchPluginMock } from '@kbn/global-search-plugin/public/mocks';
+import { GlobalSearchBarPlugin } from './plugin';
+
+describe('GlobalSearchBarPlugin', () => {
+  describe('start', () => {
+    it('registers nav controls', async () => {
+      const coreSetup = coreMock.createSetup();
+
+      const service = new GlobalSearchBarPlugin(
+        coreMock.createPluginInitializerContext({
+          input_max_limit: 2000,
+        })
+      );
+
+      service.setup(coreSetup);
+
+      const coreStart = coreMock.createStart();
+
+      const navControlsRegisterSpy = jest.spyOn(coreStart.chrome.navControls, 'registerCenter');
+
+      const start = service.start(coreStart, {
+        globalSearch: globalSearchPluginMock.createStartContract(),
+      });
+
+      expect(start).toEqual({});
+
+      expect(navControlsRegisterSpy).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/global_search_bar/public/plugin.tsx b/x-pack/plugins/global_search_bar/public/plugin.tsx
index 00cddfb65534f..e8fbe2f7e2bf1 100644
--- a/x-pack/plugins/global_search_bar/public/plugin.tsx
+++ b/x-pack/plugins/global_search_bar/public/plugin.tsx
@@ -5,7 +5,13 @@
  * 2.0.
  */
 
-import { ChromeNavControl, CoreSetup, CoreStart, Plugin } from '@kbn/core/public';
+import {
+  ChromeNavControl,
+  CoreSetup,
+  CoreStart,
+  Plugin,
+  PluginInitializerContext,
+} from '@kbn/core/public';
 import { GlobalSearchPluginStart } from '@kbn/global-search-plugin/public';
 import { KibanaRenderContextProvider } from '@kbn/react-kibana-context-render';
 import { SavedObjectTaggingPluginStart } from '@kbn/saved-objects-tagging-plugin/public';
@@ -13,6 +19,7 @@ import { UsageCollectionSetup } from '@kbn/usage-collection-plugin/public';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { SearchBar } from './components/search_bar';
+import type { GlobalSearchBarConfigType } from './types';
 import { EventReporter, eventTypes } from './telemetry';
 
 export interface GlobalSearchBarPluginStartDeps {
@@ -22,6 +29,12 @@ export interface GlobalSearchBarPluginStartDeps {
 }
 
 export class GlobalSearchBarPlugin implements Plugin<{}, {}, {}, GlobalSearchBarPluginStartDeps> {
+  private config: GlobalSearchBarConfigType;
+
+  constructor(initializerContext: PluginInitializerContext) {
+    this.config = initializerContext.config.get<GlobalSearchBarConfigType>();
+  }
+
   public setup({ analytics }: CoreSetup) {
     eventTypes.forEach((eventType) => {
       analytics.registerEventType(eventType);
@@ -46,7 +59,7 @@ export class GlobalSearchBarPlugin implements Plugin<{}, {}, {}, GlobalSearchBar
         ReactDOM.render(
           <KibanaRenderContextProvider theme={theme} i18n={i18n}>
             <SearchBar
-              globalSearch={globalSearch}
+              globalSearch={{ ...globalSearch, searchCharLimit: this.config.input_max_limit }}
               navigateToUrl={application.navigateToUrl}
               taggingApi={savedObjectsTagging}
               basePathUrl={http.basePath.prepend('/plugins/globalSearchBar/assets/')}
diff --git a/x-pack/plugins/global_search_bar/public/telemetry/telmetry.test.tsx b/x-pack/plugins/global_search_bar/public/telemetry/telmetry.test.tsx
index f44612a382972..ddeca0a718870 100644
--- a/x-pack/plugins/global_search_bar/public/telemetry/telmetry.test.tsx
+++ b/x-pack/plugins/global_search_bar/public/telemetry/telmetry.test.tsx
@@ -46,6 +46,8 @@ const createBatch = (...results: Result[]): GlobalSearchBatchedResults => ({
   results: results.map(createResult),
 });
 
+const searchCharLimit = 1000;
+
 describe('SearchBar', () => {
   const usageCollection = usageCollectionPluginMock.createSetupContract();
   const core = coreMock.createStart();
@@ -110,7 +112,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -132,7 +134,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -159,7 +161,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -196,7 +198,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -232,7 +234,7 @@ describe('SearchBar', () => {
       render(
         <IntlProvider locale="en">
           <SearchBar
-            globalSearch={searchService}
+            globalSearch={{ ...searchService, searchCharLimit }}
             navigateToUrl={applications.navigateToUrl}
             basePathUrl={basePathUrl}
             chromeStyle$={chromeStyle$}
@@ -261,7 +263,7 @@ describe('SearchBar', () => {
         render(
           <IntlProvider locale="en">
             <SearchBar
-              globalSearch={searchService}
+              globalSearch={{ ...searchService, searchCharLimit }}
               navigateToUrl={applications.navigateToUrl}
               basePathUrl={basePathUrl}
               chromeStyle$={chromeStyle$}
@@ -290,7 +292,7 @@ describe('SearchBar', () => {
         render(
           <IntlProvider locale="en">
             <SearchBar
-              globalSearch={searchService}
+              globalSearch={{ ...searchService, searchCharLimit }}
               navigateToUrl={applications.navigateToUrl}
               basePathUrl={basePathUrl}
               chromeStyle$={chromeStyle$}
diff --git a/x-pack/plugins/global_search_bar/public/types.ts b/x-pack/plugins/global_search_bar/public/types.ts
index 2a5a0a52c81aa..24e9b333b298b 100644
--- a/x-pack/plugins/global_search_bar/public/types.ts
+++ b/x-pack/plugins/global_search_bar/public/types.ts
@@ -66,3 +66,7 @@ export interface TrackedError {
   message: string | Error;
   searchValue?: string;
 }
+
+export interface GlobalSearchBarConfigType {
+  input_max_limit: number;
+}
diff --git a/x-pack/plugins/global_search_bar/server/config.ts b/x-pack/plugins/global_search_bar/server/config.ts
new file mode 100644
index 0000000000000..a5b27d1bc6120
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/server/config.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PluginConfigDescriptor } from '@kbn/core/server';
+import { schema, TypeOf } from '@kbn/config-schema';
+
+export const configSchema = schema.object({
+  input_max_limit: schema.number({
+    defaultValue: 1000,
+  }),
+});
+
+export type ConfigSchema = TypeOf<typeof configSchema>;
+
+export const config: PluginConfigDescriptor<ConfigSchema> = {
+  schema: configSchema,
+  exposeToBrowser: {
+    input_max_limit: true,
+  },
+};
diff --git a/x-pack/plugins/global_search_bar/server/index.ts b/x-pack/plugins/global_search_bar/server/index.ts
new file mode 100644
index 0000000000000..6d9d80cadf884
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/server/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const plugin = async () => {
+  const { GlobalSearchBarPlugin } = await import('./plugin');
+  return new GlobalSearchBarPlugin();
+};
+
+export { config } from './config';
diff --git a/x-pack/plugins/global_search_bar/server/plugin.ts b/x-pack/plugins/global_search_bar/server/plugin.ts
new file mode 100644
index 0000000000000..6fb323de8a3bf
--- /dev/null
+++ b/x-pack/plugins/global_search_bar/server/plugin.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Plugin } from '@kbn/core/server';
+
+export class GlobalSearchBarPlugin implements Plugin {
+  setup() {}
+
+  start() {}
+
+  stop() {}
+}
diff --git a/x-pack/plugins/global_search_bar/tsconfig.json b/x-pack/plugins/global_search_bar/tsconfig.json
index f566b0d86eddc..188f9e005c893 100644
--- a/x-pack/plugins/global_search_bar/tsconfig.json
+++ b/x-pack/plugins/global_search_bar/tsconfig.json
@@ -15,6 +15,7 @@
     "@kbn/saved-objects-tagging-oss-plugin",
     "@kbn/core-chrome-browser",
     "@kbn/react-kibana-context-render",
+    "@kbn/config-schema",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
index f83c6405369b7..fdbde1c58de81 100644
--- a/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/get_app_results.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import levenshtein from 'js-levenshtein';
 import { PublicAppInfo, PublicAppDeepLinkInfo, AppCategory } from '@kbn/core/public';
+import { distance } from 'fastest-levenshtein';
 import { GlobalSearchProviderResult } from '@kbn/global-search-plugin/public';
 
 /** Type used internally to represent an application unrolled into its separate deepLinks */
@@ -80,10 +80,10 @@ const scoreAppByTerms = (term: string, title: string): number => {
     return 75;
   }
   const length = Math.max(term.length, title.length);
-  const distance = levenshtein(term, title);
+  const dist = distance(term, title);
 
   // maximum lev distance is length, we compute the match ratio (lower distance is better)
-  const ratio = Math.floor((1 - distance / length) * 100);
+  const ratio = Math.floor((1 - dist / length) * 100);
   if (ratio >= 60) {
     return ratio;
   }
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
index 19490125e8840..633ed96ec8225 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/helpers/setup_environment.tsx
@@ -86,7 +86,7 @@ const appDependencies = {
     editableIndexSettings: 'all',
     enableMappingsSourceFieldSection: true,
     enableTogglingDataRetention: true,
-    enableSemanticText: false,
+    enableSemanticText: true,
   },
   overlays: {
     openConfirm: jest.fn(),
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.helpers.ts b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.helpers.ts
index 91dd4d26c2a5b..d80b08b96dacc 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.helpers.ts
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.helpers.ts
@@ -61,7 +61,7 @@ export interface IndexDetailsPageTestBed extends TestBed {
       selectInferenceIdButtonExists: () => void;
       openSelectInferencePopover: () => void;
       expectDefaultInferenceModelToExists: () => void;
-      expectCustomInferenceModelToExists: (customInference: string) => Promise<void>;
+      expectCustomInferenceModelToExists: (customInference: string) => void;
     };
     settings: {
       getCodeBlockContent: () => string;
@@ -317,23 +317,23 @@ export const setup = async ({
         expect(exists('fieldTypesOptions-semantic_text')).toBe(false);
       });
     },
-    isReferenceFieldVisible: async () => {
-      expect(exists('referenceField.select')).toBe(true);
+    isReferenceFieldVisible: () => {
+      expect(exists('referenceFieldSelect')).toBe(true);
     },
-    selectInferenceIdButtonExists: async () => {
+    selectInferenceIdButtonExists: () => {
       expect(exists('selectInferenceId')).toBe(true);
       expect(exists('inferenceIdButton')).toBe(true);
       find('inferenceIdButton').simulate('click');
     },
-    openSelectInferencePopover: async () => {
+    openSelectInferencePopover: () => {
       expect(exists('addInferenceEndpointButton')).toBe(true);
       expect(exists('manageInferenceEndpointButton')).toBe(true);
     },
-    expectDefaultInferenceModelToExists: async () => {
-      expect(exists('default-inference_elser_model_2')).toBe(true);
-      expect(exists('default-inference_e5')).toBe(true);
+    expectDefaultInferenceModelToExists: () => {
+      expect(exists('custom-inference_elser_model_2')).toBe(true);
+      expect(exists('custom-inference_e5')).toBe(true);
     },
-    expectCustomInferenceModelToExists: async (customInference: string) => {
+    expectCustomInferenceModelToExists: (customInference: string) => {
       expect(exists(customInference)).toBe(true);
     },
   };
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx
index c79efbbf53f53..298ad1f9af02c 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/index_details_page.test.tsx
@@ -69,6 +69,7 @@ describe('<IndexDetailsPage />', () => {
     httpRequestsMockHelpers.setLoadIndexStatsResponse(testIndexName, testIndexStats);
     httpRequestsMockHelpers.setLoadIndexMappingResponse(testIndexName, testIndexMappings);
     httpRequestsMockHelpers.setLoadIndexSettingsResponse(testIndexName, testIndexSettings);
+    httpRequestsMockHelpers.setInferenceModels([]);
 
     await act(async () => {
       testBed = await setup({
@@ -671,7 +672,6 @@ describe('<IndexDetailsPage />', () => {
             testBed = await setup({
               httpSetup,
               dependencies: {
-                config: { enableSemanticText: true },
                 docLinks: {
                   links: {
                     ml: '',
@@ -693,6 +693,7 @@ describe('<IndexDetailsPage />', () => {
                   ml: {
                     mlApi: {
                       trainedModels: {
+                        getModelsDownloadStatus: jest.fn().mockResolvedValue({}),
                         getTrainedModels: jest.fn().mockResolvedValue([
                           {
                             model_id: '.elser_model_2',
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx
index c734943ec4592..43bf8073de0aa 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/select_inference_id.test.tsx
@@ -5,13 +5,20 @@
  * 2.0.
  */
 
+import {
+  Form,
+  useForm,
+} from '../../../public/application/components/mappings_editor/shared_imports';
 import { registerTestBed } from '@kbn/test-jest-helpers';
 import { act } from 'react-dom/test-utils';
-import { SelectInferenceId } from '../../../public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id';
+import {
+  SelectInferenceId,
+  SelectInferenceIdProps,
+} from '../../../public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id';
+import React from 'react';
 
-const onChangeMock = jest.fn();
-const setValueMock = jest.fn();
-const setNewInferenceEndpointMock = jest.fn();
+const createInferenceEndpointMock = jest.fn();
+const mockDispatch = jest.fn();
 
 jest.mock('../../../public/application/app_context', () => ({
   useAppContext: jest.fn().mockReturnValue({
@@ -41,23 +48,40 @@ jest.mock(
     }),
   })
 );
+
+jest.mock('../../../public/application/components/mappings_editor/mappings_state_context', () => ({
+  useMappingsState: () => ({ inferenceToModelIdMap: {} }),
+  useDispatch: () => mockDispatch,
+}));
+
+function getTestForm(Component: React.FC<SelectInferenceIdProps>) {
+  return (defaultProps: SelectInferenceIdProps) => {
+    const { form } = useForm();
+    form.setFieldValue('inference_id', 'elser_model_2');
+    return (
+      <Form form={form}>
+        <Component {...(defaultProps as any)} />
+      </Form>
+    );
+  };
+}
+
 describe('SelectInferenceId', () => {
   let exists: any;
   let find: any;
 
   beforeAll(async () => {
-    const setup = registerTestBed(SelectInferenceId, {
-      defaultProps: {
-        onChange: onChangeMock,
-        'data-test-subj': 'data-inference-endpoint-list',
-        setValue: setValueMock,
-        setNewInferenceEndpoint: setNewInferenceEndpointMock,
-      },
+    const defaultProps: SelectInferenceIdProps = {
+      'data-test-subj': 'data-inference-endpoint-list',
+      createInferenceEndpoint: createInferenceEndpointMock,
+    };
+    const setup = registerTestBed(getTestForm(SelectInferenceId), {
+      defaultProps,
       memoryRouter: { wrapComponent: false },
     });
 
     await act(async () => {
-      const testBed = setup();
+      const testBed = await setup();
       exists = testBed.exists;
       find = testBed.find;
     });
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/trained_models_deployment_modal.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/trained_models_deployment_modal.test.tsx
index 17299a0f04b4f..cd9d099ee92f8 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/trained_models_deployment_modal.test.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_details_page/trained_models_deployment_modal.test.tsx
@@ -6,26 +6,159 @@
  */
 
 import { registerTestBed } from '@kbn/test-jest-helpers';
-import { TrainedModelsDeploymentModal } from '../../../public/application/sections/home/index_list/details_page/trained_models_deployment_modal';
+import {
+  TrainedModelsDeploymentModal,
+  TrainedModelsDeploymentModalProps,
+} from '../../../public/application/sections/home/index_list/details_page/trained_models_deployment_modal';
 import { act } from 'react-dom/test-utils';
+import * as mappingsContext from '../../../public/application/components/mappings_editor/mappings_state_context';
+import { NormalizedField } from '../../../public/application/components/mappings_editor/types';
 
-const refreshModal = jest.fn();
-const setIsModalVisible = jest.fn();
-const tryAgainForErrorModal = jest.fn();
-const setIsVisibleForErrorModal = jest.fn();
+jest.mock('../../../public/hooks/use_ml_model_status_toasts', () => ({
+  useMLModelNotificationToasts: jest.fn().mockReturnValue({
+    showErrorToasts: jest.fn(),
+  }),
+}));
 
-describe('When semantic_text is enabled', () => {
-  describe('When there is no error in the model deployment', () => {
-    const setup = registerTestBed(TrainedModelsDeploymentModal, {
-      defaultProps: {
-        setIsModalVisible,
-        refreshModal,
-        pendingDeployments: ['.elser-test-3'],
-        errorsInTrainedModelDeployment: [],
+jest.mock('../../../public/application/app_context', () => ({
+  useAppContext: jest.fn().mockReturnValue({
+    url: undefined,
+    plugins: {
+      ml: {
+        mlApi: {
+          trainedModels: {
+            getModelsDownloadStatus: jest.fn().mockResolvedValue({}),
+            getTrainedModels: jest.fn().mockResolvedValue([
+              {
+                model_id: '.elser_model_2',
+                model_type: 'pytorch',
+                model_package: {
+                  packaged_model_id: 'elser_model_2',
+                  model_repository: 'https://ml-models.elastic.co',
+                  minimum_version: '11.0.0',
+                  size: 438123914,
+                  sha256: '',
+                  metadata: {},
+                  tags: [],
+                  vocabulary_file: 'elser_model_2.vocab.json',
+                },
+                description: 'Elastic Learned Sparse EncodeR v2',
+                tags: ['elastic'],
+              },
+            ]),
+            getTrainedModelStats: jest.fn().mockResolvedValue({
+              count: 1,
+              trained_model_stats: [
+                {
+                  model_id: '.elser_model_2',
+
+                  deployment_stats: {
+                    deployment_id: 'elser_model_2',
+                    model_id: '.elser_model_2',
+                    threads_per_allocation: 1,
+                    number_of_allocations: 1,
+                    queue_capacity: 1024,
+                    state: 'started',
+                  },
+                },
+              ],
+            }),
+          },
+        },
       },
+    },
+  }),
+}));
+
+jest.mock('../../../public/application/components/mappings_editor/mappings_state_context');
+
+const mappingsContextMocked = jest.mocked(mappingsContext);
+
+const defaultState = {
+  inferenceToModelIdMap: {
+    e5: {
+      isDeployed: false,
+      isDeployable: true,
+      trainedModelId: '.multilingual-e5-small',
+    },
+    elser_model_2: {
+      isDeployed: false,
+      isDeployable: true,
+      trainedModelId: '.elser_model_2',
+    },
+    openai: {
+      isDeployed: false,
+      isDeployable: false,
+      trainedModelId: '',
+    },
+    my_elser_endpoint: {
+      isDeployed: false,
+      isDeployable: true,
+      trainedModelId: '.elser_model_2',
+    },
+  },
+  fields: {
+    aliases: {},
+    byId: {},
+    rootLevelFields: [],
+    maxNestedDepth: 0,
+  },
+  mappingViewFields: { byId: {} },
+} as any;
+
+const setErrorsInTrainedModelDeployment = jest.fn().mockReturnValue(undefined);
+const fetchData = jest.fn().mockReturnValue(undefined);
+
+describe('When semantic_text is enabled', () => {
+  const setup = (defaultProps: Partial<TrainedModelsDeploymentModalProps>) =>
+    registerTestBed(TrainedModelsDeploymentModal, {
+      defaultProps,
       memoryRouter: { wrapComponent: false },
+    })();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('When there are no pending deployments and no errors in the model deployment', () => {
+    mappingsContextMocked.useMappingsState.mockReturnValue(defaultState);
+    const { exists } = setup({
+      errorsInTrainedModelDeployment: {},
+      fetchData,
+      setErrorsInTrainedModelDeployment: () => undefined,
+    });
+
+    it('should not display the modal', () => {
+      expect(exists('trainedModelsDeploymentModal')).toBe(false);
+    });
+  });
+
+  describe('When there are pending deployments in the model deployment', () => {
+    mappingsContextMocked.useMappingsState.mockReturnValue({
+      ...defaultState,
+      fields: {
+        ...defaultState.fields,
+        byId: {
+          new_field: {
+            id: 'new_field',
+            isMultiField: false,
+            path: ['new_field'],
+            source: {
+              name: 'new_field',
+              type: 'semantic_text',
+              reference_field: 'title',
+              inference_id: 'elser_model_2',
+            },
+          } as NormalizedField,
+        },
+        rootLevelFields: ['new_field'],
+      },
+    } as any);
+    const { exists, find } = setup({
+      errorsInTrainedModelDeployment: {},
+      fetchData,
+      setErrorsInTrainedModelDeployment,
     });
-    const { exists, find } = setup();
 
     it('should display the modal', () => {
       expect(exists('trainedModelsDeploymentModal')).toBe(true);
@@ -37,55 +170,61 @@ describe('When semantic_text is enabled', () => {
       );
     });
 
-    it('should call refresh method if refresh button is pressed', async () => {
+    it('should call fetch data if refresh button is pressed', async () => {
       await act(async () => {
         find('confirmModalConfirmButton').simulate('click');
       });
-      expect(refreshModal.mock.calls).toHaveLength(1);
-    });
-
-    it('should call setIsModalVisible method if cancel button is pressed', async () => {
-      await act(async () => {
-        find('confirmModalCancelButton').simulate('click');
-      });
-      expect(setIsModalVisible).toHaveBeenLastCalledWith(false);
+      expect(fetchData.mock.calls).toHaveLength(1);
     });
   });
 
   describe('When there is error in the model deployment', () => {
-    const setup = registerTestBed(TrainedModelsDeploymentModal, {
-      defaultProps: {
-        setIsModalVisible: setIsVisibleForErrorModal,
-        refreshModal: tryAgainForErrorModal,
-        pendingDeployments: ['.elser-test-3'],
-        errorsInTrainedModelDeployment: ['.elser-test-3'],
+    mappingsContextMocked.useMappingsState.mockReturnValue({
+      ...defaultState,
+      fields: {
+        ...defaultState.fields,
+        byId: {
+          new_field: {
+            id: 'new_field',
+            isMultiField: false,
+            path: ['new_field'],
+            source: {
+              name: 'new_field',
+              type: 'semantic_text',
+              reference_field: 'title',
+              inference_id: 'elser_model_2',
+            },
+          } as NormalizedField,
+        },
+        rootLevelFields: ['new_field'],
       },
-      memoryRouter: { wrapComponent: false },
+    } as any);
+    const { find } = setup({
+      fetchData,
+      errorsInTrainedModelDeployment: { '.elser_model_2': 'Error' },
+      setErrorsInTrainedModelDeployment,
     });
-    const { exists, find } = setup();
 
-    it('should display the modal', () => {
-      expect(exists('trainedModelsErroredDeploymentModal')).toBe(true);
+    it('should display text related to errored deployments', () => {
+      expect(find('trainedModelsDeploymentModalText').text()).toContain('There was an error');
     });
 
-    it('should contain content related to semantic_text', () => {
-      expect(find('trainedModelsErrorDeploymentModalText').text()).toContain(
-        'There was an error when trying to deploy'
-      );
+    it('should display only the errored deployment', () => {
+      expect(find('trainedModelsDeploymentModal').text()).toContain('.elser_model_2');
+      expect(find('trainedModelsDeploymentModal').text()).not.toContain('valid-model');
     });
 
     it("should call refresh method if 'Try again' button is pressed", async () => {
       await act(async () => {
         find('confirmModalConfirmButton').simulate('click');
       });
-      expect(tryAgainForErrorModal.mock.calls).toHaveLength(1);
+      expect(fetchData.mock.calls).toHaveLength(1);
     });
 
     it('should call setIsVisibleForErrorModal method if cancel button is pressed', async () => {
       await act(async () => {
         find('confirmModalCancelButton').simulate('click');
       });
-      expect(setIsVisibleForErrorModal).toHaveBeenLastCalledWith(false);
     });
   });
 });
diff --git a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.test.tsx b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.test.tsx
index eb9e6c793aa5a..dac7dadfa2557 100644
--- a/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.test.tsx
+++ b/x-pack/plugins/index_management/__jest__/client_integration/index_template_wizard/template_edit.test.tsx
@@ -12,7 +12,13 @@ import * as fixtures from '../../../test/fixtures';
 import { API_BASE_PATH } from '../../../common/constants';
 import { setupEnvironment, kibanaVersion } from '../helpers';
 
-import { TEMPLATE_NAME, SETTINGS, ALIASES, MAPPINGS as DEFAULT_MAPPING } from './constants';
+import {
+  TEMPLATE_NAME,
+  SETTINGS,
+  ALIASES,
+  MAPPINGS as DEFAULT_MAPPING,
+  INDEX_PATTERNS,
+} from './constants';
 import { setup } from './template_edit.helpers';
 import { TemplateFormTestBed } from './template_form.helpers';
 
@@ -26,6 +32,22 @@ const MAPPING = {
     },
   },
 };
+const NONEXISTENT_COMPONENT_TEMPLATE = {
+  name: 'component_template@custom',
+  hasMappings: false,
+  hasAliases: false,
+  hasSettings: false,
+  usedBy: [],
+};
+
+const EXISTING_COMPONENT_TEMPLATE = {
+  name: 'test_component_template',
+  hasMappings: true,
+  hasAliases: false,
+  hasSettings: false,
+  usedBy: [],
+  isManaged: false,
+};
 
 jest.mock('@kbn/code-editor', () => {
   const original = jest.requireActual('@kbn/code-editor');
@@ -70,6 +92,7 @@ describe('<TemplateEdit />', () => {
   beforeAll(() => {
     jest.useFakeTimers({ legacyFakeTimers: true });
     httpRequestsMockHelpers.setLoadComponentTemplatesResponse([]);
+    httpRequestsMockHelpers.setLoadComponentTemplatesResponse([EXISTING_COMPONENT_TEMPLATE]);
   });
 
   afterAll(() => {
@@ -296,6 +319,84 @@ describe('<TemplateEdit />', () => {
     });
   });
 
+  describe('when composed of a nonexistent component template', () => {
+    const templateToEdit = fixtures.getTemplate({
+      name: TEMPLATE_NAME,
+      indexPatterns: INDEX_PATTERNS,
+      composedOf: [NONEXISTENT_COMPONENT_TEMPLATE.name],
+      ignoreMissingComponentTemplates: [NONEXISTENT_COMPONENT_TEMPLATE.name],
+    });
+
+    beforeAll(() => {
+      httpRequestsMockHelpers.setLoadTemplateResponse('my_template', templateToEdit);
+    });
+
+    beforeEach(async () => {
+      await act(async () => {
+        testBed = await setup(httpSetup);
+      });
+      testBed.component.update();
+    });
+
+    it('the nonexistent component template should be selected in the Component templates selector', async () => {
+      const { actions, exists } = testBed;
+
+      // Complete step 1: Logistics
+      await actions.completeStepOne();
+      jest.advanceTimersByTime(0); // advance timers to allow the form to validate
+
+      // Should be at the Component templates step
+      expect(exists('stepComponents')).toBe(true);
+
+      const {
+        actions: {
+          componentTemplates: { getComponentTemplatesSelected },
+        },
+      } = testBed;
+
+      expect(exists('componentTemplatesSelection.emptyPrompt')).toBe(false);
+      expect(getComponentTemplatesSelected()).toEqual([NONEXISTENT_COMPONENT_TEMPLATE.name]);
+    });
+
+    it('the composedOf and ignoreMissingComponentTemplates fields should be included in the final payload', async () => {
+      const { component, actions, find } = testBed;
+
+      // Complete step 1: Logistics
+      await actions.completeStepOne();
+      // Complete step 2: Component templates
+      await actions.completeStepTwo();
+      // Complete step 3: Index settings
+      await actions.completeStepThree();
+      // Complete step 4: Mappings
+      await actions.completeStepFour();
+      // Complete step 5: Aliases
+      await actions.completeStepFive();
+
+      expect(find('stepTitle').text()).toEqual(`Review details for '${TEMPLATE_NAME}'`);
+
+      await act(async () => {
+        actions.clickNextButton();
+      });
+      component.update();
+
+      expect(httpSetup.put).toHaveBeenLastCalledWith(
+        `${API_BASE_PATH}/index_templates/${TEMPLATE_NAME}`,
+        expect.objectContaining({
+          body: JSON.stringify({
+            name: TEMPLATE_NAME,
+            indexPatterns: INDEX_PATTERNS,
+            version: templateToEdit.version,
+            allowAutoCreate: templateToEdit.allowAutoCreate,
+            _kbnMeta: templateToEdit._kbnMeta,
+            composedOf: [NONEXISTENT_COMPONENT_TEMPLATE.name],
+            template: {},
+            ignoreMissingComponentTemplates: [NONEXISTENT_COMPONENT_TEMPLATE.name],
+          }),
+        })
+      );
+    });
+  });
+
   if (kibanaVersion.major < 8) {
     describe('legacy index templates', () => {
       const legacyTemplateToEdit = fixtures.getTemplate({
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
index 49b4e1b201a19..858bd44781683 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/component_template_details.test.ts
@@ -33,6 +33,10 @@ const COMPONENT_TEMPLATE_ONLY_REQUIRED_FIELDS: ComponentTemplateDeserialized = {
   _kbnMeta: { usedBy: [], isManaged: false },
 };
 
+const CUSTOM_COMPONENT_TEMPLATE = {
+  name: 'test@custom',
+};
+
 describe('<ComponentTemplateDetails />', () => {
   const { httpSetup, httpRequestsMockHelpers } = setupEnvironment();
   let testBed: ComponentTemplateDetailsTestBed;
@@ -204,6 +208,35 @@ describe('<ComponentTemplateDetails />', () => {
     });
   });
 
+  describe('Error handling for @custom templates', () => {
+    const error = {
+      statusCode: 404,
+      error: 'Not Found',
+      message: 'Not Found',
+    };
+
+    beforeEach(async () => {
+      httpRequestsMockHelpers.setLoadComponentTemplateResponse(
+        encodeURIComponent(CUSTOM_COMPONENT_TEMPLATE.name),
+        undefined,
+        error
+      );
+
+      await act(async () => {
+        testBed = setup(httpSetup, {
+          componentTemplateName: CUSTOM_COMPONENT_TEMPLATE.name,
+          onClose: () => {},
+        });
+      });
+
+      testBed.component.update();
+    });
+
+    test('shows custom callout to create missing @custom template', () => {
+      expect(testBed.exists('missingCustomComponentTemplate')).toBe(true);
+    });
+  });
+
   describe('Error handling', () => {
     const error = {
       statusCode: 500,
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
index 98d9003dc307d..f0513dce68abd 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/component_template_details.helpers.ts
@@ -89,4 +89,5 @@ export type ComponentTemplateDetailsTestSubjects =
   | 'deprecatedComponentTemplateBadge'
   | 'manageComponentTemplateButton'
   | 'manageComponentTemplateContextMenu'
+  | 'missingCustomComponentTemplate'
   | 'manageComponentTemplateContextMenu.action';
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
index ee3c359a8195a..00554b9ec1a14 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/__jest__/client_integration/helpers/setup_environment.tsx
@@ -6,11 +6,17 @@
  */
 
 import React from 'react';
+import { LocationDescriptorObject } from 'history';
 
 import type { CoreStart, HttpSetup } from '@kbn/core/public';
 import { docLinksServiceMock } from '@kbn/core-doc-links-browser-mocks';
 import { executionContextServiceMock } from '@kbn/core-execution-context-browser-mocks';
-import { notificationServiceMock, applicationServiceMock, coreMock } from '@kbn/core/public/mocks';
+import {
+  notificationServiceMock,
+  applicationServiceMock,
+  coreMock,
+  scopedHistoryMock,
+} from '@kbn/core/public/mocks';
 import { GlobalFlyout } from '@kbn/es-ui-shared-plugin/public';
 
 import { breadcrumbService } from '../../../../../services/breadcrumbs';
@@ -23,10 +29,16 @@ import { API_BASE_PATH } from './constants';
 
 const { GlobalFlyoutProvider } = GlobalFlyout;
 
+const history = scopedHistoryMock.create();
+history.createHref.mockImplementation((location: LocationDescriptorObject) => {
+  return `${location.pathname}?${location.search}`;
+});
+
 // We provide the minimum deps required to make the tests pass
 const appDependencies = {
   docLinks: {} as any,
   plugins: { ml: {} as any },
+  history,
 } as any;
 
 export const componentTemplatesDependencies = (httpSetup: HttpSetup, coreStart?: CoreStart) => {
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/component_template_details.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/component_template_details.tsx
index 60324997ab11b..0db0c9dd0f7c9 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/component_template_details.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_details/component_template_details.tsx
@@ -19,6 +19,8 @@ import {
   EuiSpacer,
   EuiCallOut,
   EuiBadge,
+  EuiButton,
+  EuiCode,
 } from '@elastic/eui';
 
 import {
@@ -27,7 +29,9 @@ import {
   TabAliases,
   TabMappings,
   attemptToURIDecode,
+  reactRouterNavigate,
 } from '../shared_imports';
+import { useAppContext } from '../../../app_context';
 import { useComponentTemplatesContext } from '../component_templates_context';
 import { DeprecatedBadge } from '../components';
 import { TabSummary } from './tab_summary';
@@ -46,12 +50,18 @@ export const defaultFlyoutProps = {
   'aria-labelledby': 'componentTemplateDetailsFlyoutTitle',
 };
 
+// All component templates for integrations end in @custom
+const isIntegrationsComponentTemplate = (name: string) => {
+  return name.toLowerCase().endsWith('@custom');
+};
+
 export const ComponentTemplateDetailsFlyoutContent: React.FunctionComponent<Props> = ({
   componentTemplateName,
   onClose,
   actions,
   showSummaryCallToAction,
 }) => {
+  const { history } = useAppContext();
   const { api } = useComponentTemplatesContext();
 
   const decodedComponentTemplateName = attemptToURIDecode(componentTemplateName)!;
@@ -76,21 +86,62 @@ export const ComponentTemplateDetailsFlyoutContent: React.FunctionComponent<Prop
       </SectionLoading>
     );
   } else if (error) {
-    content = (
-      <EuiCallOut
-        title={
-          <FormattedMessage
-            id="xpack.idxMgmt.componentTemplateDetails.loadingErrorMessage"
-            defaultMessage="Error loading component template"
-          />
-        }
-        color="danger"
-        iconType="warning"
-        data-test-subj="sectionError"
-      >
-        <p>{error.message}</p>
-      </EuiCallOut>
-    );
+    if (
+      error?.error === 'Not Found' &&
+      isIntegrationsComponentTemplate(decodedComponentTemplateName)
+    ) {
+      content = (
+        <EuiCallOut
+          title={
+            <FormattedMessage
+              id="xpack.idxMgmt.componentTemplateDetails.createMissingIntegrationTemplate.calloutTitle"
+              defaultMessage="Custom template doesn't exist"
+            />
+          }
+          color="warning"
+          iconType="warning"
+          data-test-subj="missingCustomComponentTemplate"
+        >
+          <p>
+            <FormattedMessage
+              id="xpack.idxMgmt.componentTemplateDetails.createMissingIntegrationTemplate.text"
+              defaultMessage="The custom template {templateName} doesn't exist."
+              values={{
+                templateName: <EuiCode>{decodedComponentTemplateName}</EuiCode>,
+              }}
+            />
+          </p>
+          <EuiButton
+            color="warning"
+            {...reactRouterNavigate(
+              history,
+              `/create_component_template?name=${decodedComponentTemplateName}`
+            )}
+          >
+            <FormattedMessage
+              id="xpack.idxMgmt.componentTemplateDetails.createMissingIntegrationTemplate.button"
+              defaultMessage="Create component template"
+            />
+          </EuiButton>
+        </EuiCallOut>
+      );
+    } else {
+      content = (
+        <EuiCallOut
+          title={
+            <FormattedMessage
+              id="xpack.idxMgmt.componentTemplateDetails.loadingErrorMessage"
+              defaultMessage="Error loading component template"
+            />
+          }
+          color="danger"
+          iconType="warning"
+          data-test-subj="sectionError"
+        >
+          <p>{error.message}</p>
+        </EuiCallOut>
+      );
+    }
   } else if (componentTemplateDetails) {
     const {
       template: { settings, mappings, aliases },
diff --git a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
index 71c2f09072dac..1c727265fd1f1 100644
--- a/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
+++ b/x-pack/plugins/index_management/public/application/components/component_templates/component_template_selector/component_templates_selector.tsx
@@ -87,8 +87,20 @@ export const ComponentTemplatesSelector = ({
           .map((name) => components.find((comp) => comp.name === name))
           .filter(Boolean) as ComponentTemplateListItem[];
 
-        setComponentsSelected(nextComponentsSelected);
-        onChange(nextComponentsSelected.map(({ name }) => name));
+        // Add the non-existing templates from the "defaultValue" prop
+        const missingDefaultComponents: ComponentTemplateListItem[] = defaultValue
+          .filter((name) => !components.find((comp) => comp.name === name))
+          .map((name) => ({
+            name,
+            usedBy: [],
+            hasMappings: false,
+            hasAliases: false,
+            hasSettings: false,
+            isManaged: false,
+          }));
+
+        setComponentsSelected([...nextComponentsSelected, ...missingDefaultComponents]);
+        onChange([...nextComponentsSelected, ...missingDefaultComponents].map(({ name }) => name));
         isInitialized.current = true;
       } else {
         onChange(componentsSelected.map(({ name }) => name));
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/mappings_editor.helpers.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/mappings_editor.helpers.tsx
index e1c3ea7dc6179..094fd40ab1e32 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/mappings_editor.helpers.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/helpers/mappings_editor.helpers.tsx
@@ -380,8 +380,11 @@ export const setup = (
   props: any = { onUpdate() {} },
   appDependencies?: any
 ): MappingsEditorTestBed => {
+  const defaultAppDependencies = {
+    plugins: {},
+  };
   const setupTestBed = registerTestBed<TestSubjects>(
-    WithAppDependencies(MappingsEditor, appDependencies),
+    WithAppDependencies(MappingsEditor, appDependencies ?? defaultAppDependencies),
     {
       memoryRouter: {
         wrapComponent: false,
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx
index 1347aaeade4f8..685aa4963edc4 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/__jest__/client_integration/mappings_editor.test.tsx
@@ -28,6 +28,7 @@ describe('Mappings editor: core', () => {
   let onChangeHandler: jest.Mock = jest.fn();
   let getMappingsEditorData = getMappingsEditorDataFactory(onChangeHandler);
   let testBed: MappingsEditorTestBed;
+  const appDependencies = { plugins: { ml: { mlApi: {} } } };
 
   beforeAll(() => {
     jest.useFakeTimers({ legacyFakeTimers: true });
@@ -55,7 +56,7 @@ describe('Mappings editor: core', () => {
     };
 
     await act(async () => {
-      testBed = setup({ value: defaultMappings, onChange: onChangeHandler });
+      testBed = setup({ value: defaultMappings, onChange: onChangeHandler }, appDependencies);
     });
 
     const { component } = testBed;
@@ -95,7 +96,7 @@ describe('Mappings editor: core', () => {
       };
 
       await act(async () => {
-        testBed = setup({ onChange: onChangeHandler, value });
+        testBed = setup({ onChange: onChangeHandler, value }, appDependencies);
       });
 
       const { component, exists } = testBed;
@@ -115,7 +116,7 @@ describe('Mappings editor: core', () => {
         },
       };
       await act(async () => {
-        testBed = setup({ onChange: onChangeHandler, value });
+        testBed = setup({ onChange: onChangeHandler, value }, appDependencies);
       });
 
       const { component, exists } = testBed;
@@ -137,6 +138,7 @@ describe('Mappings editor: core', () => {
       config: {
         enableMappingsSourceFieldSection: true,
       },
+      ...appDependencies,
     };
 
     beforeEach(async () => {
@@ -295,6 +297,7 @@ describe('Mappings editor: core', () => {
       config: {
         enableMappingsSourceFieldSection: true,
       },
+      ...appDependencies,
     };
 
     beforeEach(async () => {
@@ -472,7 +475,7 @@ describe('Mappings editor: core', () => {
         },
       };
       await act(async () => {
-        testBed = setup({ onChange: onChangeHandler, value });
+        testBed = setup({ onChange: onChangeHandler, value }, appDependencies);
       });
 
       const { component, exists } = testBed;
@@ -494,7 +497,7 @@ describe('Mappings editor: core', () => {
         },
       };
       await act(async () => {
-        testBed = setup({ onChange: onChangeHandler, value });
+        testBed = setup({ onChange: onChangeHandler, value }, appDependencies);
       });
 
       const { component } = testBed;
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
index e895a00b9f6d8..6fe58e7ba26da 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/name_parameter.tsx
@@ -7,6 +7,7 @@
 
 import React, { useCallback, useMemo } from 'react';
 
+import { i18n } from '@kbn/i18n';
 import { TextField, UseField, FieldConfig } from '../../../shared_imports';
 import { validateUniqueName } from '../../../lib';
 import { PARAMETERS_DEFINITION } from '../../../constants';
@@ -14,7 +15,11 @@ import { useMappingsState } from '../../../mappings_state_context';
 
 const { validations, ...rest } = PARAMETERS_DEFINITION.name.fieldConfig as FieldConfig;
 
-export const NameParameter = () => {
+interface NameParameterProps {
+  isSemanticText?: boolean;
+}
+
+export const NameParameter: React.FC<NameParameterProps> = ({ isSemanticText }) => {
   const {
     fields: { rootLevelFields, byId },
     documentFields: { fieldToAddFieldTo, fieldToEdit },
@@ -32,6 +37,11 @@ export const NameParameter = () => {
   const nameConfig: FieldConfig = useMemo(
     () => ({
       ...rest,
+      label: isSemanticText
+        ? i18n.translate('xpack.idxMgmt.mappingsEditor.semanticTextNameFieldLabel', {
+            defaultMessage: 'New field name',
+          })
+        : rest.label,
       validations: [
         ...validations!,
         {
@@ -39,7 +49,7 @@ export const NameParameter = () => {
         },
       ],
     }),
-    [uniqueNameValidator]
+    [isSemanticText, uniqueNameValidator]
   );
 
   return (
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/reference_field_selects.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/reference_field_selects.tsx
index b8f5e866b68a9..9d923f529931b 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/reference_field_selects.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/reference_field_selects.tsx
@@ -5,65 +5,45 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
+import React from 'react';
 
-import { useLoadIndexMappings } from '../../../../../services';
 import { getFieldConfig } from '../../../lib';
-import { Form, SuperSelectField, UseField, useForm } from '../../../shared_imports';
+import { useMappingsState } from '../../../mappings_state_context';
+import { SuperSelectField, UseField } from '../../../shared_imports';
 import { SuperSelectOption } from '../../../types';
 
-interface Props {
-  onChange(value: string): void;
-  'data-test-subj'?: string;
-  indexName?: string;
-}
+export const ReferenceFieldSelects = () => {
+  const { fields, mappingViewFields } = useMappingsState();
 
-export const ReferenceFieldSelects = ({
-  onChange,
-  'data-test-subj': dataTestSubj,
-  indexName,
-}: Props) => {
-  const { form } = useForm();
-  const { subscribe } = form;
+  const allFields = {
+    byId: {
+      ...mappingViewFields.byId,
+      ...fields.byId,
+    },
+    rootLevelFields: [],
+    aliases: {},
+    maxNestedDepth: 0,
+  };
 
-  const { data } = useLoadIndexMappings(indexName ?? '');
-  const referenceFieldOptions: SuperSelectOption[] = [];
-  if (data && data.mappings && data.mappings.properties) {
-    Object.keys(data.mappings.properties).forEach((key) => {
-      const field = data.mappings.properties[key];
-      if (field.type === 'text') {
-        referenceFieldOptions.push({
-          value: key,
-          inputDisplay: key,
-          'data-test-subj': `select-reference-field-${key}`,
-        });
-      }
-    });
-  }
+  const referenceFieldOptions: SuperSelectOption[] = Object.values(allFields.byId)
+    .filter((field) => field.source.type === 'text')
+    .map((field) => ({
+      value: field.path.join('.'),
+      inputDisplay: field.path.join('.'),
+      'data-test-subj': `select-reference-field-${field.path.join('.')}}`,
+    }));
   const fieldConfigReferenceField = getFieldConfig('reference_field');
-
-  useEffect(() => {
-    const subscription = subscribe((updateData) => {
-      const formData = updateData.data.internal;
-      const value = formData.main;
-      onChange(value);
-    });
-
-    return subscription.unsubscribe;
-  }, [subscribe, onChange]);
   return (
-    <Form form={form} data-test-subj="referenceField">
-      <UseField path="main" config={fieldConfigReferenceField}>
-        {(field) => (
-          <SuperSelectField
-            field={field}
-            euiFieldProps={{
-              options: referenceFieldOptions,
-            }}
-            data-test-subj={dataTestSubj}
-          />
-        )}
-      </UseField>
-    </Form>
+    <UseField path="reference_field" config={fieldConfigReferenceField}>
+      {(field) => (
+        <SuperSelectField
+          field={field}
+          euiFieldProps={{
+            options: referenceFieldOptions,
+          }}
+          data-test-subj="referenceFieldSelect"
+        />
+      )}
+    </UseField>
   );
 };
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx
index e9a4387f91206..c4da2d30ac4fd 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/field_parameters/select_inference_id.tsx
@@ -24,63 +24,74 @@ import {
 import { i18n } from '@kbn/i18n';
 import React, { useEffect, useState, useCallback, useMemo } from 'react';
 
-import {
-  InferenceAPIConfigResponse,
-  SUPPORTED_PYTORCH_TASKS,
-  TRAINED_MODEL_TYPE,
-} from '@kbn/ml-trained-models-utils';
+import { SUPPORTED_PYTORCH_TASKS, TRAINED_MODEL_TYPE } from '@kbn/ml-trained-models-utils';
 import { InferenceTaskType } from '@elastic/elasticsearch/lib/api/types';
-import {
-  ElasticsearchModelDefaultOptions,
-  ModelConfig,
-  Service,
-} from '@kbn/inference_integration_flyout/types';
+import { ModelConfig } from '@kbn/inference_integration_flyout/types';
 import { InferenceFlyoutWrapper } from '@kbn/inference_integration_flyout/components/inference_flyout_wrapper';
 import { TrainedModelConfigResponse } from '@kbn/ml-plugin/common/types/trained_models';
 import { getFieldConfig } from '../../../lib';
 import { useAppContext } from '../../../../../app_context';
-import { Form, UseField, useForm } from '../../../shared_imports';
 import { useLoadInferenceEndpoints } from '../../../../../services/api';
-import { getTrainedModelStats } from '../../../../../../hooks/use_details_page_mappings_model_management';
-import { InferenceToModelIdMap } from '../fields';
 import { useMLModelNotificationToasts } from '../../../../../../hooks/use_ml_model_status_toasts';
-import {
-  CustomInferenceEndpointConfig,
-  DefaultInferenceModels,
-  DeploymentState,
-} from '../../../types';
+import { CustomInferenceEndpointConfig } from '../../../types';
+import { UseField } from '../../../shared_imports';
 
-const inferenceServiceTypeElasticsearchModelMap: Record<string, ElasticsearchModelDefaultOptions> =
-  {
-    elser: ElasticsearchModelDefaultOptions.elser,
-    elasticsearch: ElasticsearchModelDefaultOptions.e5,
-  };
-const uncheckSelectedModelOption = (options: EuiSelectableOption[]) => {
-  const checkedOption = options.find(({ checked }) => checked === 'on');
-  if (checkedOption) {
-    checkedOption.checked = undefined;
-  }
-};
-interface Props {
-  onChange(value: string): void;
+export interface SelectInferenceIdProps {
+  createInferenceEndpoint: (
+    trainedModelId: string,
+    inferenceId: string,
+    modelConfig: CustomInferenceEndpointConfig
+  ) => Promise<void>;
   'data-test-subj'?: string;
-  setValue: (value: string) => void;
-  setNewInferenceEndpoint: (
-    newInferenceEndpoint: InferenceToModelIdMap,
-    customInferenceEndpointConfig: CustomInferenceEndpointConfig
-  ) => void;
 }
-export const SelectInferenceId = ({
-  onChange,
+
+type SelectInferenceIdContentProps = SelectInferenceIdProps & {
+  setValue: (value: string) => void;
+  value: string;
+};
+
+const defaultEndpoints = [
+  {
+    model_id: 'elser_model_2',
+  },
+  {
+    model_id: 'e5',
+  },
+];
+
+export const SelectInferenceId: React.FC<SelectInferenceIdProps> = ({
+  createInferenceEndpoint,
+  'data-test-subj': dataTestSubj,
+}: SelectInferenceIdProps) => {
+  const config = getFieldConfig('inference_id');
+  return (
+    <UseField path="inference_id" fieldConfig={config}>
+      {(field) => {
+        return (
+          <SelectInferenceIdContent
+            createInferenceEndpoint={createInferenceEndpoint}
+            data-test-subj={dataTestSubj}
+            value={field.value as string}
+            setValue={field.setValue}
+          />
+        );
+      }}
+    </UseField>
+  );
+};
+
+const SelectInferenceIdContent: React.FC<SelectInferenceIdContentProps> = ({
+  createInferenceEndpoint,
   'data-test-subj': dataTestSubj,
   setValue,
-  setNewInferenceEndpoint,
-}: Props) => {
+  value,
+}) => {
   const {
     core: { application },
     docLinks,
     plugins: { ml },
   } = useAppContext();
+  const config = getFieldConfig('inference_id');
 
   const getMlTrainedModelPageUrl = useCallback(async () => {
     return await ml?.locator?.getUrl({
@@ -88,9 +99,6 @@ export const SelectInferenceId = ({
     });
   }, [ml]);
 
-  const { form } = useForm({ defaultValue: { main: DefaultInferenceModels.elser_model_2 } });
-  const { subscribe } = form;
-
   const [isInferenceFlyoutVisible, setIsInferenceFlyoutVisible] = useState<boolean>(false);
   const [availableTrainedModels, setAvailableTrainedModels] = useState<
     TrainedModelConfigResponse[]
@@ -118,101 +126,57 @@ export const SelectInferenceId = ({
 
     return availableTrainedModelsList;
   }, [availableTrainedModels]);
+  const [isSaveInferenceLoading, setIsSaveInferenceLoading] = useState<boolean>(false);
 
-  const fieldConfigModelId = getFieldConfig('inference_id');
-  const defaultInferenceIds: EuiSelectableOption[] = useMemo(() => {
-    return [
-      {
-        checked: 'on',
-        label: 'elser_model_2',
-        'data-test-subj': 'default-inference_elser_model_2',
-      },
-      {
-        label: 'e5',
-        'data-test-subj': 'default-inference_e5',
-      },
-    ];
-  }, []);
-
-  const { isLoading, data: models } = useLoadInferenceEndpoints();
-
-  const [options, setOptions] = useState<EuiSelectableOption[]>([...defaultInferenceIds]);
-  const inferenceIdOptionsFromModels = useMemo(() => {
-    const inferenceIdOptions =
-      models?.map((model: InferenceAPIConfigResponse) => ({
-        label: model.model_id,
-        'data-test-subj': `custom-inference_${model.model_id}`,
-      })) || [];
+  const { isLoading, data: endpoints, resendRequest } = useLoadInferenceEndpoints();
 
-    return inferenceIdOptions;
-  }, [models]);
-
-  useEffect(() => {
-    const mergedOptions = {
-      ...inferenceIdOptionsFromModels.reduce(
-        (acc, option) => ({ ...acc, [option.label]: option }),
-        {}
-      ),
-      ...defaultInferenceIds.reduce((acc, option) => ({ ...acc, [option.label]: option }), {}),
-    };
-    setOptions(Object.values(mergedOptions));
-  }, [inferenceIdOptionsFromModels, defaultInferenceIds]);
+  const options: EuiSelectableOption[] = useMemo(() => {
+    const missingDefaultEndpoints = defaultEndpoints.filter(
+      (endpoint) => !(endpoints || []).find((e) => e.model_id === endpoint.model_id)
+    );
+    const newOptions: EuiSelectableOption[] = [
+      ...(endpoints || []),
+      ...missingDefaultEndpoints,
+    ].map((endpoint) => ({
+      label: endpoint.model_id,
+      'data-test-subj': `custom-inference_${endpoint.model_id}`,
+      checked: value === endpoint.model_id ? 'on' : undefined,
+    }));
+    if (value && !newOptions.find((option) => option.label === value)) {
+      // Sometimes we create a new endpoint but the backend is slow in updating so we need to optimistically update
+      const newOption: EuiSelectableOption = {
+        label: value,
+        checked: 'on',
+        'data-test-subj': `custom-inference_${value}`,
+      };
+      return [...newOptions, newOption];
+    }
+    return newOptions;
+  }, [endpoints, value]);
 
   const { showErrorToasts } = useMLModelNotificationToasts();
 
   const onSaveInferenceCallback = useCallback(
     async (inferenceId: string, taskType: InferenceTaskType, modelConfig: ModelConfig) => {
-      setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
       try {
-        const isDeployable =
-          modelConfig.service === Service.elser || modelConfig.service === Service.elasticsearch;
-
-        const newOption: EuiSelectableOption[] = [
-          {
-            label: inferenceId,
-            checked: 'on',
-            'data-test-subj': `custom-inference_${inferenceId}`,
-          },
-        ];
-        // uncheck selected endpoint id
-        uncheckSelectedModelOption(options);
-
-        setOptions([...options, ...newOption]);
-
-        const trainedModelStats = await ml?.mlApi?.trainedModels.getTrainedModelStats();
-        const defaultEndpointId =
-          inferenceServiceTypeElasticsearchModelMap[modelConfig.service] || '';
-        const newModelId: InferenceToModelIdMap = {};
-        newModelId[inferenceId] = {
-          trainedModelId: defaultEndpointId,
-          isDeployable,
-          isDeployed:
-            getTrainedModelStats(trainedModelStats)[defaultEndpointId] === DeploymentState.DEPLOYED,
-        };
-        const customInferenceEndpointConfig: CustomInferenceEndpointConfig = {
+        const trainedModelId = modelConfig.service_settings.model_id || '';
+        const customModelConfig = {
           taskType,
           modelConfig,
         };
-        setNewInferenceEndpoint(newModelId, customInferenceEndpointConfig);
+        setIsSaveInferenceLoading(true);
+        await createInferenceEndpoint(trainedModelId, inferenceId, customModelConfig);
+        resendRequest();
+        setValue(inferenceId);
+        setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
+        setIsSaveInferenceLoading(false);
       } catch (error) {
         showErrorToasts(error);
+        setIsSaveInferenceLoading(false);
       }
     },
-    [isInferenceFlyoutVisible, ml, setNewInferenceEndpoint, options, showErrorToasts]
+    [createInferenceEndpoint, setValue, isInferenceFlyoutVisible, showErrorToasts, resendRequest]
   );
-  useEffect(() => {
-    const subscription = subscribe((updateData) => {
-      const formData = updateData.data.internal;
-      const value = formData.main;
-      onChange(value);
-    });
-
-    return subscription.unsubscribe;
-  }, [subscribe, onChange]);
-  const selectedOptionLabel = options.find((option) => option.checked)?.label;
-  useEffect(() => {
-    setValue(selectedOptionLabel ?? DefaultInferenceModels.elser_model_2);
-  }, [selectedOptionLabel, setValue]);
   const [isInferencePopoverVisible, setIsInferencePopoverVisible] = useState<boolean>(false);
   const [inferenceEndpointError, setInferenceEndpointError] = useState<string | undefined>(
     undefined
@@ -221,7 +185,15 @@ export const SelectInferenceId = ({
     async (inferenceId: string) => {
       const modelsExist = options.some((i) => i.label === inferenceId);
       if (modelsExist) {
-        setInferenceEndpointError('Inference Endpoint id already exists');
+        setInferenceEndpointError(
+          i18n.translate(
+            'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.defaultLabel',
+            {
+              defaultMessage: 'Inference endpoint {inferenceId} already exists',
+              values: { inferenceId },
+            }
+          )
+        );
       } else {
         setInferenceEndpointError(undefined);
       }
@@ -229,139 +201,133 @@ export const SelectInferenceId = ({
     [options]
   );
 
-  const inferencePopover = () => {
-    return (
-      <EuiPopover
-        button={
-          <>
-            <UseField path="main" config={fieldConfigModelId}>
-              {(field) => (
-                <>
-                  <EuiText size="xs">
-                    <p>
-                      <strong>{field.label}</strong>
-                    </p>
-                  </EuiText>
-                  <EuiSpacer size="xs" />
-                  <EuiButton
-                    iconType="arrowDown"
-                    iconSide="right"
-                    color="text"
-                    data-test-subj="inferenceIdButton"
-                    onClick={() => {
-                      setIsInferencePopoverVisible(!isInferencePopoverVisible);
-                    }}
-                  >
-                    {selectedOptionLabel ||
-                      i18n.translate(
-                        'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.defaultLabel',
-                        {
-                          defaultMessage: 'No model selected',
-                        }
-                      )}
-                  </EuiButton>
-                </>
-              )}
-            </UseField>
-          </>
-        }
-        isOpen={isInferencePopoverVisible}
-        panelPaddingSize="m"
-        closePopover={() => setIsInferencePopoverVisible(!isInferencePopoverVisible)}
-      >
-        <EuiContextMenuPanel>
-          <EuiContextMenuItem
-            key="addInferenceEndpoint"
-            icon="plusInCircle"
-            size="s"
-            data-test-subj="addInferenceEndpointButton"
+  const selectedOptionLabel = options.find((option) => option.checked)?.label;
+
+  const inferencePopover = () => (
+    <EuiPopover
+      button={
+        <>
+          <EuiText size="xs">
+            <p>
+              <strong>{config.label}</strong>
+            </p>
+          </EuiText>
+          <EuiSpacer size="xs" />
+          <EuiButton
+            iconType="arrowDown"
+            iconSide="right"
+            color="text"
+            data-test-subj="inferenceIdButton"
             onClick={() => {
-              setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
-              setInferenceEndpointError(undefined);
               setIsInferencePopoverVisible(!isInferencePopoverVisible);
             }}
           >
+            {selectedOptionLabel ||
+              i18n.translate(
+                'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.alreadyExistsLabel',
+                {
+                  defaultMessage: 'No inference endpoint selected',
+                }
+              )}
+          </EuiButton>
+        </>
+      }
+      isOpen={isInferencePopoverVisible}
+      panelPaddingSize="m"
+      closePopover={() => setIsInferencePopoverVisible(!isInferencePopoverVisible)}
+    >
+      <EuiContextMenuPanel>
+        <EuiContextMenuItem
+          key="addInferenceEndpoint"
+          icon="plusInCircle"
+          size="s"
+          data-test-subj="addInferenceEndpointButton"
+          onClick={() => {
+            setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
+            setInferenceEndpointError(undefined);
+            setIsInferencePopoverVisible(!isInferencePopoverVisible);
+          }}
+        >
+          {i18n.translate(
+            'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.addInferenceEndpointButton',
+            {
+              defaultMessage: 'Add Inference Endpoint',
+            }
+          )}
+        </EuiContextMenuItem>
+        <EuiHorizontalRule margin="none" />
+        <EuiContextMenuItem
+          key="manageInferenceEndpointButton"
+          icon="gear"
+          size="s"
+          data-test-subj="manageInferenceEndpointButton"
+          onClick={async () => {
+            const mlTrainedPageUrl = await getMlTrainedModelPageUrl();
+            if (typeof mlTrainedPageUrl === 'string') {
+              application.navigateToUrl(mlTrainedPageUrl);
+            }
+          }}
+        >
+          {i18n.translate(
+            'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.manageInferenceEndpointButton',
+            {
+              defaultMessage: 'Manage Inference Endpoints',
+            }
+          )}
+        </EuiContextMenuItem>
+      </EuiContextMenuPanel>
+      <EuiHorizontalRule margin="none" />
+      <EuiPanel color="transparent" paddingSize="s">
+        <EuiTitle size="xxxs">
+          <h3>
             {i18n.translate(
-              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.addInferenceEndpointButton',
-              {
-                defaultMessage: 'Add inference Endpoint',
-              }
-            )}
-          </EuiContextMenuItem>
-          <EuiHorizontalRule margin="none" />
-          <EuiContextMenuItem
-            key="manageInferenceEndpointButton"
-            icon="gear"
-            size="s"
-            data-test-subj="manageInferenceEndpointButton"
-            onClick={async () => {
-              const mlTrainedPageUrl = await getMlTrainedModelPageUrl();
-              if (typeof mlTrainedPageUrl === 'string') {
-                application.navigateToUrl(mlTrainedPageUrl);
-              }
-            }}
-          >
-            {i18n.translate(
-              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.manageInferenceEndpointButton',
+              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.Label',
               {
-                defaultMessage: 'Manage Inference Endpoint',
+                defaultMessage: 'Existing endpoints',
               }
             )}
-          </EuiContextMenuItem>
-        </EuiContextMenuPanel>
-        <EuiHorizontalRule margin="none" />
-        <EuiPanel color="transparent" paddingSize="s">
-          <EuiTitle size="xxxs">
-            <h3>
-              {i18n.translate(
-                'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.Label',
-                {
-                  defaultMessage: 'Existing endpoints',
-                }
-              )}
-            </h3>
-          </EuiTitle>
-          <EuiSpacer size="xs" />
+          </h3>
+        </EuiTitle>
+        <EuiSpacer size="xs" />
 
-          <EuiSelectable
-            aria-label={i18n.translate(
-              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.ariaLabel',
+        <EuiSelectable
+          aria-label={i18n.translate(
+            'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.ariaLabel',
+            {
+              defaultMessage: 'Existing endpoints',
+            }
+          )}
+          data-test-subj={dataTestSubj}
+          searchable
+          isLoading={isLoading}
+          singleSelection="always"
+          searchProps={{
+            compressed: true,
+            placeholder: i18n.translate(
+              'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.placeholder',
               {
                 defaultMessage: 'Search',
               }
-            )}
-            data-test-subj={dataTestSubj}
-            searchable
-            isLoading={isLoading}
-            singleSelection="always"
-            searchProps={{
-              compressed: true,
-              placeholder: i18n.translate(
-                'xpack.idxMgmt.mappingsEditor.parameters.inferenceId.popover.selectable.placeholder',
-                {
-                  defaultMessage: 'Search',
-                }
-              ),
-            }}
-            options={options}
-            onChange={(newOptions) => {
-              setOptions(newOptions);
-              setIsInferencePopoverVisible(!isInferencePopoverVisible);
-            }}
-          >
-            {(list, search) => (
-              <>
-                {search}
-                {list}
-              </>
-            )}
-          </EuiSelectable>
-        </EuiPanel>
-      </EuiPopover>
-    );
-  };
+            ),
+          }}
+          options={options}
+          onChange={(newOptions) => {
+            setValue(newOptions.find((option) => option.checked)?.label || '');
+          }}
+        >
+          {(list, search) => (
+            <>
+              {search}
+              {list}
+            </>
+          )}
+        </EuiSelectable>
+      </EuiPanel>
+    </EuiPopover>
+  );
   return (
-    <Form form={form}>
+    <>
+      <EuiSpacer />
       <EuiFlexGroup data-test-subj="selectInferenceId">
         <EuiFlexItem grow={false}>
           {inferencePopover()}
@@ -378,6 +344,7 @@ export const SelectInferenceId = ({
               supportedNlpModels={docLinks.links.enterpriseSearch.supportedNlpModels}
               nlpImportModel={docLinks.links.ml.nlpImportModel}
               setInferenceEndpointError={setInferenceEndpointError}
+              isCreateInferenceApiLoading={isSaveInferenceLoading}
             />
           )}
         </EuiFlexItem>
@@ -395,6 +362,6 @@ export const SelectInferenceId = ({
           />
         </EuiFlexItem>
       </EuiFlexGroup>
-    </Form>
+    </>
   );
 };
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
index 4a3f600753dd4..4f8e6557e334f 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/create_field.tsx
@@ -14,20 +14,16 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ElasticsearchModelDefaultOptions } from '@kbn/inference_integration_flyout/types';
+import { TrainedModelStat } from '@kbn/ml-plugin/common/types/trained_models';
 import { MlPluginStart } from '@kbn/ml-plugin/public';
 import classNames from 'classnames';
-import React, { useCallback, useEffect, useState } from 'react';
+import React, { useEffect } from 'react';
 import { EUI_SIZE, TYPE_DEFINITION } from '../../../../constants';
 import { fieldSerializer } from '../../../../lib';
-import { useDispatch, useMappingsState } from '../../../../mappings_state_context';
-import { Form, FormDataProvider, UseField, useForm, useFormData } from '../../../../shared_imports';
-import {
-  CustomInferenceEndpointConfig,
-  Field,
-  MainType,
-  NormalizedFields,
-} from '../../../../types';
+import { isSemanticTextField } from '../../../../lib/utils';
+import { useDispatch } from '../../../../mappings_state_context';
+import { Form, FormDataProvider, useForm, useFormData } from '../../../../shared_imports';
+import { Field, MainType, NormalizedFields } from '../../../../types';
 import { NameParameter, SubTypeParameter, TypeParameter } from '../../field_parameters';
 import { ReferenceFieldSelects } from '../../field_parameters/reference_field_selects';
 import { SelectInferenceId } from '../../field_parameters/select_inference_id';
@@ -38,9 +34,11 @@ import { useSemanticText } from './semantic_text/use_semantic_text';
 const formWrapper = (props: any) => <form {...props} />;
 export interface InferenceToModelIdMap {
   [key: string]: {
-    trainedModelId: ElasticsearchModelDefaultOptions | string;
+    trainedModelId: string;
     isDeployed: boolean;
     isDeployable: boolean;
+    isDownloading: boolean;
+    modelStats?: TrainedModelStat; // third-party models don't have model stats
   };
 }
 
@@ -48,7 +46,9 @@ export interface SemanticTextInfo {
   isSemanticTextEnabled?: boolean;
   indexName?: string;
   ml?: MlPluginStart;
-  setErrorsInTrainedModelDeployment: React.Dispatch<React.SetStateAction<string[]>>;
+  setErrorsInTrainedModelDeployment: React.Dispatch<
+    React.SetStateAction<Record<string, string | undefined>>
+  >;
 }
 interface Props {
   allFields: NormalizedFields['byId'];
@@ -73,13 +73,13 @@ export const CreateField = React.memo(function CreateFieldComponent({
   isAddingFields,
   semanticTextInfo,
 }: Props) {
-  const { isSemanticTextEnabled, indexName, ml, setErrorsInTrainedModelDeployment } =
-    semanticTextInfo ?? {};
+  const { isSemanticTextEnabled, ml, setErrorsInTrainedModelDeployment } = semanticTextInfo ?? {};
   const dispatch = useDispatch();
 
   const { form } = useForm<Field>({
     serializer: fieldSerializer,
     options: { stripEmptyFields: false },
+    id: 'create-field',
   });
 
   useFormData({ form });
@@ -93,9 +93,6 @@ export const CreateField = React.memo(function CreateFieldComponent({
 
     return subscription.unsubscribe;
   }, [dispatch, subscribe]);
-  const [customInferenceEndpointConfig, setCustomInferenceEndpointConfig] = useState<
-    CustomInferenceEndpointConfig | undefined
-  >(undefined);
   const cancel = () => {
     if (isAddingFields && onCancelAddingNewFields) {
       onCancelAddingNewFields();
@@ -104,19 +101,14 @@ export const CreateField = React.memo(function CreateFieldComponent({
     }
   };
 
-  const {
-    referenceFieldComboValue,
-    nameValue,
-    inferenceIdComboValue,
-    setInferenceValue,
-    semanticFieldType,
-    handleSemanticText,
-  } = useSemanticText({
+  const { createInferenceEndpoint, handleSemanticText } = useSemanticText({
     form,
     setErrorsInTrainedModelDeployment,
     ml,
   });
 
+  const isSemanticText = form.getFormData().type === 'semantic_text';
+
   const submitForm = async (
     e?: React.FormEvent,
     exitAfter: boolean = false,
@@ -128,11 +120,9 @@ export const CreateField = React.memo(function CreateFieldComponent({
 
     const { isValid, data } = await form.submit();
 
-    if (isValid) {
-      form.reset();
-
-      if (data.type === 'semantic_text' && !clickOutside) {
-        handleSemanticText(data, customInferenceEndpointConfig);
+    if (isValid && !clickOutside) {
+      if (isSemanticTextField(data)) {
+        handleSemanticText(data);
       } else {
         dispatch({ type: 'field.add', value: data });
       }
@@ -140,6 +130,7 @@ export const CreateField = React.memo(function CreateFieldComponent({
       if (exitAfter) {
         cancel();
       }
+      form.reset();
     }
   };
 
@@ -187,23 +178,19 @@ export const CreateField = React.memo(function CreateFieldComponent({
       </FormDataProvider>
 
       {/* Field reference_field for semantic_text field type */}
-      <ReferenceFieldCombo indexName={indexName} />
+      {isSemanticText && (
+        <EuiFlexItem grow={false}>
+          <ReferenceFieldSelects />
+        </EuiFlexItem>
+      )}
 
       {/* Field name */}
       <EuiFlexItem>
-        <NameParameter />
+        <NameParameter isSemanticText={isSemanticText} />
       </EuiFlexItem>
     </EuiFlexGroup>
   );
 
-  const isAddFieldButtonDisabled = (): boolean => {
-    if (semanticFieldType) {
-      return !referenceFieldComboValue || !nameValue || !inferenceIdComboValue;
-    }
-
-    return false;
-  };
-
   const renderFormActions = () => (
     <EuiFlexGroup gutterSize="s" justifyContent="flexEnd">
       {(isCancelable !== false || isAddingFields) && (
@@ -222,7 +209,7 @@ export const CreateField = React.memo(function CreateFieldComponent({
           onClick={submitForm}
           type="submit"
           data-test-subj="addButton"
-          isDisabled={isAddFieldButtonDisabled()}
+          isDisabled={form.getErrors().length > 0}
         >
           {isMultiField
             ? i18n.translate('xpack.idxMgmt.mappingsEditor.createField.addMultiFieldButtonLabel', {
@@ -289,11 +276,10 @@ export const CreateField = React.memo(function CreateFieldComponent({
                   );
                 }}
               </FormDataProvider>
-              {/* Field inference_id for semantic_text field type */}
-              <InferenceIdCombo
-                setValue={setInferenceValue}
-                setCustomInferenceEndpointConfig={setCustomInferenceEndpointConfig}
-              />
+
+              {isSemanticText && (
+                <SelectInferenceId createInferenceEndpoint={createInferenceEndpoint} />
+              )}
               {renderFormActions()}
             </div>
           </div>
@@ -302,69 +288,3 @@ export const CreateField = React.memo(function CreateFieldComponent({
     </>
   );
 });
-
-function ReferenceFieldCombo({ indexName }: { indexName?: string }) {
-  const [{ type }] = useFormData({ watch: 'type' });
-
-  if (type === undefined || type[0]?.value !== 'semantic_text') {
-    return null;
-  }
-
-  return (
-    <EuiFlexItem grow={false}>
-      <UseField path="referenceField">
-        {(field) => <ReferenceFieldSelects onChange={field.setValue} indexName={indexName} />}
-      </UseField>
-    </EuiFlexItem>
-  );
-}
-
-interface InferenceProps {
-  setValue: (value: string) => void;
-  setCustomInferenceEndpointConfig: (config: CustomInferenceEndpointConfig) => void;
-}
-
-function InferenceIdCombo({ setValue, setCustomInferenceEndpointConfig }: InferenceProps) {
-  const { inferenceToModelIdMap } = useMappingsState();
-  const dispatch = useDispatch();
-  const [{ type }] = useFormData({ watch: 'type' });
-
-  // update new inferenceEndpoint
-  const setNewInferenceEndpoint = useCallback(
-    (
-      newInferenceEndpoint: InferenceToModelIdMap,
-      customInferenceEndpointConfig: CustomInferenceEndpointConfig
-    ) => {
-      dispatch({
-        type: 'inferenceToModelIdMap.update',
-        value: {
-          inferenceToModelIdMap: {
-            ...inferenceToModelIdMap,
-            ...newInferenceEndpoint,
-          },
-        },
-      });
-      setCustomInferenceEndpointConfig(customInferenceEndpointConfig);
-    },
-    [dispatch, inferenceToModelIdMap, setCustomInferenceEndpointConfig]
-  );
-
-  if (type === undefined || type[0]?.value !== 'semantic_text') {
-    return null;
-  }
-
-  return (
-    <>
-      <EuiSpacer />
-      <UseField path="inferenceId">
-        {(field) => (
-          <SelectInferenceId
-            onChange={field.setValue}
-            setValue={setValue}
-            setNewInferenceEndpoint={setNewInferenceEndpoint}
-          />
-        )}
-      </UseField>
-    </>
-  );
-}
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts
index f9bc12a9022fd..72e007b86f786 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.test.ts
@@ -6,10 +6,37 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { CustomInferenceEndpointConfig, Field } from '../../../../../types';
+import { CustomInferenceEndpointConfig, SemanticTextField } from '../../../../../types';
 import { useSemanticText } from './use_semantic_text';
 import { act } from 'react-dom/test-utils';
 
+jest.mock('../../../../../../../../hooks/use_details_page_mappings_model_management', () => ({
+  useDetailsPageMappingsModelManagement: () => ({
+    fetchInferenceToModelIdMap: () => ({
+      e5: {
+        isDeployed: false,
+        isDeployable: true,
+        trainedModelId: '.multilingual-e5-small',
+      },
+      elser_model_2: {
+        isDeployed: false,
+        isDeployable: true,
+        trainedModelId: '.elser_model_2',
+      },
+      openai: {
+        isDeployed: false,
+        isDeployable: false,
+        trainedModelId: '',
+      },
+      my_elser_endpoint: {
+        isDeployed: false,
+        isDeployable: true,
+        trainedModelId: '.elser_model_2',
+      },
+    }),
+  }),
+}));
+
 const mlMock: any = {
   mlApi: {
     inferenceModels: {
@@ -18,26 +45,30 @@ const mlMock: any = {
   },
 };
 
-const mockField: Record<string, Field> = {
+const mockField: Record<string, SemanticTextField> = {
   elser_model_2: {
     name: 'name',
     type: 'semantic_text',
-    inferenceId: 'elser_model_2',
+    inference_id: 'elser_model_2',
+    reference_field: 'title',
   },
   e5: {
     name: 'name',
     type: 'semantic_text',
-    inferenceId: 'e5',
+    inference_id: 'e5',
+    reference_field: 'title',
   },
   openai: {
     name: 'name',
     type: 'semantic_text',
-    inferenceId: 'openai',
+    inference_id: 'openai',
+    reference_field: 'title',
   },
   my_elser_endpoint: {
     name: 'name',
     type: 'semantic_text',
-    inferenceId: 'my_elser_endpoint',
+    inference_id: 'my_elser_endpoint',
+    reference_field: 'title',
   },
 };
 
@@ -90,6 +121,10 @@ jest.mock('../../../../../mappings_state_context', () => ({
         trainedModelId: '.elser_model_2',
       },
     },
+    fields: {
+      byId: {},
+    },
+    mappingViewFields: { byId: {} },
   }),
   useDispatch: () => mockDispatch,
 }));
@@ -128,28 +163,31 @@ describe('useSemanticText', () => {
     jest.clearAllMocks();
     mockForm = {
       form: {
-        getFields: jest.fn().mockReturnValue({
-          referenceField: { value: 'title' },
-          name: { value: 'sem' },
-          type: { value: [{ value: 'semantic_text' }] },
-          inferenceId: { value: 'e5' },
+        getFormData: jest.fn().mockReturnValue({
+          referenceField: 'title',
+          name: 'sem',
+          type: 'semantic_text',
+          inferenceId: 'e5',
         }),
+        setFieldValue: jest.fn(),
       },
       thirdPartyModel: {
-        getFields: jest.fn().mockReturnValue({
-          referenceField: { value: 'title' },
-          name: { value: 'semantic_text_openai_endpoint' },
-          type: { value: [{ value: 'semantic_text' }] },
-          inferenceId: { value: 'openai' },
+        getFormData: jest.fn().mockReturnValue({
+          referenceField: 'title',
+          name: 'semantic_text_openai_endpoint',
+          type: 'semantic_text',
+          inferenceId: 'openai',
         }),
+        setFieldValue: jest.fn(),
       },
       elasticModelEndpointCreatedfromFlyout: {
-        getFields: jest.fn().mockReturnValue({
-          referenceField: { value: 'title' },
-          name: { value: 'semantic_text_elserServiceType_endpoint' },
-          type: { value: [{ value: 'semantic_text' }] },
-          inferenceId: { value: 'my_elser_endpoint' },
+        getFormData: jest.fn().mockReturnValue({
+          referenceField: 'title',
+          name: 'semantic_text_elserServiceType_endpoint',
+          type: 'semantic_text',
+          inferenceId: 'my_elser_endpoint',
         }),
+        setFieldValue: jest.fn(),
       },
     };
   });
@@ -162,11 +200,10 @@ describe('useSemanticText', () => {
       })
     );
     await act(async () => {
-      result.current.setInferenceValue('openai');
       result.current.handleSemanticText(mockField.openai, mockConfig.openai);
     });
     expect(mockDispatch).toHaveBeenCalledWith({
-      type: 'field.addSemanticText',
+      type: 'field.add',
       value: mockField.openai,
     });
     expect(mlMock.mlApi.inferenceModels.createInferenceEndpoint).toHaveBeenCalledWith(
@@ -184,12 +221,11 @@ describe('useSemanticText', () => {
       })
     );
     await act(async () => {
-      result.current.setInferenceValue('my_elser_endpoint');
       result.current.handleSemanticText(mockField.my_elser_endpoint, mockConfig.elser);
     });
 
     expect(mockDispatch).toHaveBeenCalledWith({
-      type: 'field.addSemanticText',
+      type: 'field.add',
       value: mockField.my_elser_endpoint,
     });
     expect(mlMock.mlApi.inferenceModels.createInferenceEndpoint).toHaveBeenCalledWith(
@@ -198,20 +234,6 @@ describe('useSemanticText', () => {
       mockConfig.elser.modelConfig
     );
   });
-  it('should populate the values from the form', () => {
-    const { result } = renderHook(() =>
-      useSemanticText({
-        form: mockForm.form,
-        setErrorsInTrainedModelDeployment: jest.fn(),
-        ml: mlMock,
-      })
-    );
-
-    expect(result.current.referenceFieldComboValue).toBe('title');
-    expect(result.current.nameValue).toBe('sem');
-    expect(result.current.inferenceIdComboValue).toBe('e5');
-    expect(result.current.semanticFieldType).toBe('semantic_text');
-  });
 
   it('should handle semantic text correctly', async () => {
     const { result } = renderHook(() =>
@@ -227,7 +249,7 @@ describe('useSemanticText', () => {
     });
 
     expect(mockDispatch).toHaveBeenCalledWith({
-      type: 'field.addSemanticText',
+      type: 'field.add',
       value: mockField.elser_model_2,
     });
     expect(mlMock.mlApi.inferenceModels.createInferenceEndpoint).toHaveBeenCalledWith(
@@ -253,12 +275,11 @@ describe('useSemanticText', () => {
     );
 
     await act(async () => {
-      result.current.setInferenceValue('e5');
       result.current.handleSemanticText(mockField.e5);
     });
 
     expect(mockDispatch).toHaveBeenCalledWith({
-      type: 'field.addSemanticText',
+      type: 'field.add',
       value: mockField.e5,
     });
 
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts
index 72be2636329a2..2eb4343d0c7a4 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/components/document_fields/fields/create_field/semantic_text/use_semantic_text.ts
@@ -5,23 +5,26 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import { useCallback } from 'react';
 import { MlPluginStart } from '@kbn/ml-plugin/public';
-import React, { useEffect, useState } from 'react';
-import { ElasticsearchModelDefaultOptions } from '@kbn/inference_integration_flyout/types';
+import React, { useEffect } from 'react';
 import { InferenceTaskType } from '@elastic/elasticsearch/lib/api/types';
-import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import { ElserModels } from '@kbn/ml-trained-models-utils';
+import { i18n } from '@kbn/i18n';
+import { useDetailsPageMappingsModelManagement } from '../../../../../../../../hooks/use_details_page_mappings_model_management';
 import { useDispatch, useMappingsState } from '../../../../../mappings_state_context';
 import { FormHook } from '../../../../../shared_imports';
-import { CustomInferenceEndpointConfig, DefaultInferenceModels, Field } from '../../../../../types';
+import { CustomInferenceEndpointConfig, Field, SemanticTextField } from '../../../../../types';
 import { useMLModelNotificationToasts } from '../../../../../../../../hooks/use_ml_model_status_toasts';
 
 import { getInferenceEndpoints } from '../../../../../../../services/api';
+import { getFieldByPathName } from '../../../../../lib/utils';
 interface UseSemanticTextProps {
   form: FormHook<Field, Field>;
   ml?: MlPluginStart;
-  setErrorsInTrainedModelDeployment: React.Dispatch<React.SetStateAction<string[]>> | undefined;
+  setErrorsInTrainedModelDeployment?: React.Dispatch<
+    React.SetStateAction<Record<string, string | undefined>>
+  >;
 }
 interface DefaultInferenceEndpointConfig {
   taskType: InferenceTaskType;
@@ -30,70 +33,52 @@ interface DefaultInferenceEndpointConfig {
 
 export function useSemanticText(props: UseSemanticTextProps) {
   const { form, setErrorsInTrainedModelDeployment, ml } = props;
-  const { inferenceToModelIdMap } = useMappingsState();
+  const { fields, mappingViewFields } = useMappingsState();
+  const { fetchInferenceToModelIdMap } = useDetailsPageMappingsModelManagement();
   const dispatch = useDispatch();
-  const [referenceFieldComboValue, setReferenceFieldComboValue] = useState<string>();
-  const [nameValue, setNameValue] = useState<string>();
-  const [inferenceIdComboValue, setInferenceIdComboValue] = useState<string>();
-  const [semanticFieldType, setSemanticTextFieldType] = useState<string>();
-  const [inferenceValue, setInferenceValue] = useState<string>(
-    DefaultInferenceModels.elser_model_2
-  );
-  const { showSuccessToasts, showErrorToasts } = useMLModelNotificationToasts();
+  const { showSuccessToasts, showErrorToasts, showSuccessfullyDeployedToast } =
+    useMLModelNotificationToasts();
 
-  const useFieldEffect = (
-    semanticTextform: FormHook,
-    fieldName: string,
-    setState: React.Dispatch<React.SetStateAction<string | undefined>>
-  ) => {
-    const fieldValue = semanticTextform.getFields()?.[fieldName]?.value;
-    useEffect(() => {
-      if (typeof fieldValue === 'string') {
-        setState(fieldValue);
-      }
-    }, [semanticTextform, fieldValue, setState]);
-  };
-
-  useFieldEffect(form, 'referenceField', setReferenceFieldComboValue);
-  useFieldEffect(form, 'name', setNameValue);
-
-  const fieldTypeValue = form.getFields()?.type?.value;
+  const fieldTypeValue = form.getFormData()?.type;
   useEffect(() => {
-    if (!Array.isArray(fieldTypeValue) || fieldTypeValue.length === 0) {
-      return;
-    }
-    setSemanticTextFieldType(
-      fieldTypeValue[0]?.value === 'semantic_text' ? fieldTypeValue[0].value : undefined
-    );
-  }, [form, fieldTypeValue]);
-
-  const inferenceId = form.getFields()?.inferenceId?.value;
-  useEffect(() => {
-    if (typeof inferenceId === 'string') {
-      setInferenceIdComboValue(inferenceId);
+    if (fieldTypeValue === 'semantic_text') {
+      const allFields = {
+        byId: {
+          ...fields.byId,
+          ...mappingViewFields.byId,
+        },
+        rootLevelFields: [],
+        aliases: {},
+        maxNestedDepth: 0,
+      };
+      const defaultName = getFieldByPathName(allFields, 'semantic_text') ? '' : 'semantic_text';
+      const referenceField =
+        Object.values(allFields.byId)
+          .find((field) => field.source.type === 'text')
+          ?.path.join('.') || '';
+      if (!form.getFormData().name) {
+        form.setFieldValue('name', defaultName);
+      }
+      if (!form.getFormData().reference_field) {
+        form.setFieldValue('reference_field', referenceField);
+      }
+      if (!form.getFormData().inference_id) {
+        form.setFieldValue('inference_id', 'elser_model_2');
+      }
     }
-  }, [form, inferenceId, inferenceToModelIdMap]);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fieldTypeValue]);
 
   const createInferenceEndpoint = useCallback(
     async (
-      trainedModelId: ElasticsearchModelDefaultOptions | string,
-      data: Field,
+      trainedModelId: string,
+      inferenceId: string,
       customInferenceEndpointConfig?: CustomInferenceEndpointConfig
     ) => {
-      if (data.inferenceId === undefined) {
-        throw new Error(
-          i18n.translate('xpack.idxMgmt.mappingsEditor.createField.undefinedInferenceIdError', {
-            defaultMessage: 'Inference ID is undefined',
-          })
-        );
-      }
+      const isElser = ElserModels.includes(trainedModelId);
       const defaultInferenceEndpointConfig: DefaultInferenceEndpointConfig = {
-        service:
-          trainedModelId === ElasticsearchModelDefaultOptions.elser ? 'elser' : 'elasticsearch',
-        taskType:
-          trainedModelId === ElasticsearchModelDefaultOptions.elser
-            ? 'sparse_embedding'
-            : 'text_embedding',
+        service: isElser ? 'elser' : 'elasticsearch',
+        taskType: isElser ? 'sparse_embedding' : 'text_embedding',
       };
 
       const modelConfig = customInferenceEndpointConfig
@@ -108,65 +93,69 @@ export function useSemanticText(props: UseSemanticTextProps) {
           };
       const taskType: InferenceTaskType =
         customInferenceEndpointConfig?.taskType ?? defaultInferenceEndpointConfig.taskType;
-      try {
-        await ml?.mlApi?.inferenceModels?.createInferenceEndpoint(
-          data.inferenceId,
-          taskType,
-          modelConfig
-        );
-      } catch (error) {
-        throw error;
-      }
+
+      await ml?.mlApi?.inferenceModels?.createInferenceEndpoint(inferenceId, taskType, modelConfig);
     },
     [ml?.mlApi?.inferenceModels]
   );
 
   const handleSemanticText = async (
-    data: Field,
+    data: SemanticTextField,
     customInferenceEndpointConfig?: CustomInferenceEndpointConfig
   ) => {
-    data.inferenceId = inferenceValue;
-    if (data.inferenceId === undefined) {
-      return;
-    }
-    const inferenceData = inferenceToModelIdMap?.[data.inferenceId];
+    const modelIdMap = await fetchInferenceToModelIdMap();
+    const inferenceId = data.inference_id;
+    const inferenceData = modelIdMap?.[inferenceId];
     if (!inferenceData) {
-      return;
+      throw new Error(
+        i18n.translate('xpack.idxMgmt.mappingsEditor.semanticText.inferenceError', {
+          defaultMessage: 'No inference model found for inference ID {inferenceId}',
+        })
+      );
     }
 
     const { trainedModelId } = inferenceData;
-    dispatch({ type: 'field.addSemanticText', value: data });
-
+    dispatch({ type: 'field.add', value: data });
+    const inferenceEndpoints = await getInferenceEndpoints();
+    const hasInferenceEndpoint = inferenceEndpoints.data?.some(
+      (inference) => inference.model_id === inferenceId
+    );
+    // if inference endpoint exists already, do not create new inference endpoint
+    if (hasInferenceEndpoint) {
+      return;
+    }
     try {
-      // if inference endpoint exists already, do not create inference endpoint
-      const inferenceModels = await getInferenceEndpoints();
-      const inferenceModel: InferenceAPIConfigResponse[] = inferenceModels.data.some(
-        (e: InferenceAPIConfigResponse) => e.model_id === inferenceValue
-      );
-      if (inferenceModel) {
-        return;
-      }
       // Only show toast if it's an internal Elastic model that hasn't been deployed yet
       if (trainedModelId && inferenceData.isDeployable && !inferenceData.isDeployed) {
         showSuccessToasts(trainedModelId);
       }
-
-      await createInferenceEndpoint(trainedModelId, data, customInferenceEndpointConfig);
+      await createInferenceEndpoint(
+        trainedModelId,
+        data.inference_id,
+        customInferenceEndpointConfig
+      );
+      if (trainedModelId) {
+        // clear error because we've succeeded here
+        setErrorsInTrainedModelDeployment?.((prevItems) => ({
+          ...prevItems,
+          [trainedModelId]: undefined,
+        }));
+      }
+      showSuccessfullyDeployedToast(trainedModelId);
     } catch (error) {
       // trainedModelId is empty string when it's a third party model
       if (trainedModelId) {
-        setErrorsInTrainedModelDeployment?.((prevItems) => [...prevItems, trainedModelId]);
+        setErrorsInTrainedModelDeployment?.((prevItems) => ({
+          ...prevItems,
+          [trainedModelId]: error,
+        }));
       }
       showErrorToasts(error);
     }
   };
 
   return {
-    referenceFieldComboValue,
-    nameValue,
-    inferenceIdComboValue,
-    semanticFieldType,
+    createInferenceEndpoint,
     handleSemanticText,
-    setInferenceValue,
   };
 }
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/constants/parameters_definition.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/constants/parameters_definition.tsx
index 790b4560000f7..0be09876b63f2 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/constants/parameters_definition.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/constants/parameters_definition.tsx
@@ -1041,7 +1041,6 @@ export const PARAMETERS_DEFINITION: { [key in ParameterName]: ParameterDefinitio
     },
     schema: t.number,
   },
-
   dims: {
     fieldConfig: {
       defaultValue: '',
@@ -1070,20 +1069,46 @@ export const PARAMETERS_DEFINITION: { [key in ParameterName]: ParameterDefinitio
   },
   reference_field: {
     fieldConfig: {
+      defaultValue: '',
       label: i18n.translate('xpack.idxMgmt.mappingsEditor.parameters.referenceFieldLabel', {
         defaultMessage: 'Reference field',
       }),
       helpText: i18n.translate('xpack.idxMgmt.mappingsEditor.parameters.referenceFieldHelpText', {
         defaultMessage: 'Reference field for model inference.',
       }),
+      validations: [
+        {
+          validator: emptyField(
+            i18n.translate(
+              'xpack.idxMgmt.mappingsEditor.parameters.validations.referenceFieldIsRequiredErrorMessage',
+              {
+                defaultMessage: 'Reference field is required.',
+              }
+            )
+          ),
+        },
+      ],
     },
     schema: t.string,
   },
   inference_id: {
     fieldConfig: {
+      defaultValue: 'elser_model_2',
       label: i18n.translate('xpack.idxMgmt.mappingsEditor.parameters.inferenceIdLabel', {
         defaultMessage: 'Select an inference endpoint:',
       }),
+      validations: [
+        {
+          validator: emptyField(
+            i18n.translate(
+              'xpack.idxMgmt.mappingsEditor.parameters.validations.inferenceIdIsRequiredErrorMessage',
+              {
+                defaultMessage: 'Inference ID is required.',
+              }
+            )
+          ),
+        },
+      ],
     },
     schema: t.string,
   },
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts
index be00b71b58ea1..3a4f71a8d533b 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.test.ts
@@ -18,6 +18,7 @@ import {
   getFieldsFromState,
   getAllFieldTypesFromState,
   getFieldsMatchingFilterFromState,
+  getStateWithCopyToFields,
 } from './utils';
 
 const fieldsWithnestedFields: NormalizedFields = {
@@ -420,6 +421,7 @@ describe('utils', () => {
         selectedDataTypes: ['Boolean'],
       },
       inferenceToModelIdMap: {},
+      mappingViewFields: { byId: {}, rootLevelFields: [], aliases: {}, maxNestedDepth: 0 },
     };
     test('returns list of matching fields with search term', () => {
       expect(getFieldsMatchingFilterFromState(sampleState, ['Boolean'])).toEqual({
@@ -442,5 +444,203 @@ describe('utils', () => {
         },
       });
     });
+    describe('getStateWithCopyToFields', () => {
+      test('returns state if there is no semantic text field', () => {
+        const state = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                source: {
+                  name: 'title',
+                  type: 'text',
+                },
+              },
+            },
+          },
+        } as any;
+        expect(getStateWithCopyToFields(state)).toEqual(state);
+      });
+      test('returns state if semantic text field has no reference field', () => {
+        const state = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                source: {
+                  name: 'title',
+                  type: 'semantic_text',
+                  inference_id: 'id',
+                },
+              },
+            },
+          },
+        } as any;
+        expect(getStateWithCopyToFields(state)).toEqual(state);
+      });
+      test('adds text field with copy to to state if semantic text field has reference field', () => {
+        const state = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                path: ['title'],
+                source: {
+                  name: 'title',
+                  type: 'semantic_text',
+                  inference_id: 'id',
+                  reference_field: 'new',
+                },
+              },
+              'new-field': {
+                id: 'new-field',
+                isMultiField: false,
+                path: ['new'],
+                source: {
+                  name: 'new',
+                  type: 'text',
+                },
+              },
+            },
+            rootLevelFields: ['88ebcfdb-19b7-4458-9ea2-9488df54453d'],
+          },
+        } as any;
+        const expectedState = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                path: ['title'],
+                source: {
+                  name: 'title',
+                  type: 'semantic_text',
+                  inference_id: 'id',
+                },
+              },
+              'new-field': {
+                id: 'new-field',
+                isMultiField: false,
+                path: ['new'],
+                source: {
+                  name: 'new',
+                  type: 'text',
+                  copy_to: ['title'],
+                },
+              },
+            },
+            rootLevelFields: ['88ebcfdb-19b7-4458-9ea2-9488df54453d', 'new-field'],
+          },
+        } as any;
+        expect(getStateWithCopyToFields(state)).toEqual(expectedState);
+      });
+      test('adds nested text field with copy to to state if semantic text field has reference field', () => {
+        const state = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                path: ['title'],
+                source: {
+                  name: 'title',
+                  type: 'semantic_text',
+                  inference_id: 'id',
+                  reference_field: 'existing.new',
+                },
+              },
+            },
+            rootLevelFields: ['88ebcfdb-19b7-4458-9ea2-9488df54453d'],
+          },
+          mappingViewFields: {
+            byId: {
+              existing: {
+                id: 'existing',
+                isMultiField: false,
+                path: ['existing'],
+                source: {
+                  name: 'existing',
+                  type: 'object',
+                },
+              },
+              'new-field': {
+                id: 'new-field',
+                parentId: 'existing',
+                isMultiField: false,
+                path: ['existing', 'new'],
+                source: {
+                  name: 'new',
+                  type: 'text',
+                },
+              },
+            },
+          },
+        } as any;
+        const expectedState = {
+          fields: {
+            byId: {
+              '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+                id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+                isMultiField: false,
+                path: ['title'],
+                source: {
+                  name: 'title',
+                  type: 'semantic_text',
+                  inference_id: 'id',
+                },
+              },
+              existing: {
+                id: 'existing',
+                isMultiField: false,
+                path: ['existing'],
+                source: {
+                  name: 'existing',
+                  type: 'object',
+                },
+              },
+              'new-field': {
+                id: 'new-field',
+                isMultiField: false,
+                parentId: 'existing',
+                path: ['existing', 'new'],
+                source: {
+                  name: 'new',
+                  type: 'text',
+                  copy_to: ['title'],
+                },
+              },
+            },
+            rootLevelFields: ['88ebcfdb-19b7-4458-9ea2-9488df54453d', 'existing'],
+          },
+          mappingViewFields: {
+            byId: {
+              existing: {
+                id: 'existing',
+                isMultiField: false,
+                path: ['existing'],
+                source: {
+                  name: 'existing',
+                  type: 'object',
+                },
+              },
+              'new-field': {
+                id: 'new-field',
+                parentId: 'existing',
+                isMultiField: false,
+                path: ['existing', 'new'],
+                source: {
+                  name: 'new',
+                  type: 'text',
+                },
+              },
+            },
+          },
+        } as any;
+        expect(getStateWithCopyToFields(state)).toEqual(expectedState);
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts
index cb95da745a30d..ed966805c0f2e 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/lib/utils.ts
@@ -7,6 +7,7 @@
 
 import { v4 as uuidv4 } from 'uuid';
 
+import { cloneDeep } from 'lodash';
 import {
   ChildFieldName,
   ComboBoxOption,
@@ -23,6 +24,7 @@ import {
   ParameterName,
   RuntimeFields,
   SubType,
+  SemanticTextField,
 } from '../types';
 
 import {
@@ -685,3 +687,88 @@ export const getAllFieldTypesFromState = (allFields: Fields): DataType[] => {
   const fields: DataType[] = [];
   return getallFieldsIncludingNestedFields(allFields, fields).filter(filterUnique);
 };
+
+export function isSemanticTextField(field: Partial<Field>): field is SemanticTextField {
+  return Boolean(field.inference_id && field.type === 'semantic_text');
+}
+
+/**
+ * Returns deep copy of state with `copy_to` added to text fields that are referenced by new semantic text fields
+ * @param state
+ * @returns state
+ */
+
+export function getStateWithCopyToFields(state: State): State {
+  // Make sure we don't accidentally modify existing state
+  let updatedState = cloneDeep(state);
+  for (const field of Object.values(updatedState.fields.byId)) {
+    if (field.source.type === 'semantic_text' && field.source.reference_field) {
+      // Check fields already added to the list of to-update fields first
+      // API will not accept reference_field so removing it now
+      const { reference_field: referenceField, ...source } = field.source;
+      if (typeof referenceField !== 'string') {
+        // should never happen
+        throw new Error('Reference field is not a string');
+      }
+      field.source = source;
+      const existingTextField =
+        getFieldByPathName(updatedState.fields, referenceField) ||
+        getFieldByPathName(updatedState.mappingViewFields || { byId: {} }, referenceField);
+      if (existingTextField) {
+        // Add copy_to to existing text field's copy_to array
+        const updatedTextField: NormalizedField = {
+          ...existingTextField,
+          source: {
+            ...existingTextField.source,
+            copy_to: existingTextField.source.copy_to
+              ? [
+                  ...(Array.isArray(existingTextField.source.copy_to)
+                    ? existingTextField.source.copy_to
+                    : [existingTextField.source.copy_to]),
+                  field.path.join('.'),
+                ]
+              : [field.path.join('.')],
+          },
+        };
+        updatedState = {
+          ...updatedState,
+          fields: {
+            ...updatedState.fields,
+            byId: {
+              ...updatedState.fields.byId,
+              [existingTextField.id]: updatedTextField,
+            },
+          },
+        };
+        if (existingTextField.parentId) {
+          let currentField = existingTextField;
+          let hasParent = true;
+          while (hasParent) {
+            if (!currentField.parentId) {
+              // reached the top of the tree, push current field to root level fields
+              updatedState.fields.rootLevelFields.push(currentField.id);
+              hasParent = false;
+            } else if (updatedState.fields.byId[currentField.parentId]) {
+              // parent is already in state, don't need to do anything
+              hasParent = false;
+            } else {
+              // parent is not in state yet
+              updatedState.fields.byId[currentField.parentId] =
+                updatedState.mappingViewFields.byId[currentField.parentId];
+              currentField = updatedState.fields.byId[currentField.parentId];
+            }
+          }
+        } else {
+          updatedState.fields.rootLevelFields.push(existingTextField.id);
+        }
+      } else {
+        throw new Error(`Semantic text field ${field.path.join('.')} has invalid reference field`);
+      }
+    }
+  }
+  return updatedState;
+}
+
+export const getFieldByPathName = (fields: NormalizedFields, name: string) => {
+  return Object.values(fields.byId).find((field) => field.path.join('.') === name);
+};
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/mappings_state_context.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/mappings_state_context.tsx
index 2b132d377918d..ac19c5395f974 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/mappings_state_context.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/mappings_state_context.tsx
@@ -60,6 +60,7 @@ export const StateProvider: React.FC<{ children?: React.ReactNode }> = ({ childr
       selectedDataTypes: [],
     },
     inferenceToModelIdMap: {},
+    mappingViewFields: { byId: {}, rootLevelFields: [], aliases: {}, maxNestedDepth: 0 },
   };
 
   const [state, dispatch] = useReducer(reducer, initialState);
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/reducer.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/reducer.ts
index 0e972e9900b9c..626ee0e839a8a 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/reducer.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/reducer.ts
@@ -214,6 +214,9 @@ export const reducer = (state: State, action: Action): State => {
         },
       };
     }
+    case 'editor.replaceViewMappings': {
+      return { ...state, mappingViewFields: action.value.fields };
+    }
     case 'configuration.update': {
       const nextState = {
         ...state,
@@ -323,28 +326,6 @@ export const reducer = (state: State, action: Action): State => {
     case 'field.add': {
       return addFieldToState(action.value, state);
     }
-    case 'field.addSemanticText': {
-      const addTexFieldWithCopyToActionValue: Field = {
-        name: action.value.referenceField as string,
-        type: 'text',
-        copy_to: [action.value.name],
-      };
-
-      // Add text field to state with copy_to of semantic_text field
-      let updatedState = addFieldToState(addTexFieldWithCopyToActionValue, state);
-
-      const addSemanticTextFieldActionValue: Field = {
-        name: action.value.name,
-        inference_id: action.value.inferenceId,
-        type: 'semantic_text',
-      };
-
-      // Add semantic_text field to state and reset fieldToAddFieldTo
-      updatedState = addFieldToState(addSemanticTextFieldActionValue, updatedState);
-      updatedState.documentFields.fieldToAddFieldTo = undefined;
-
-      return updatedState;
-    }
     case 'field.remove': {
       const field = state.fields.byId[action.value];
       const { id, hasChildFields, hasMultiFields } = field;
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/types/document_fields.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/types/document_fields.ts
index 767d29aaaeda8..7ff156f6817f1 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/types/document_fields.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/types/document_fields.ts
@@ -186,9 +186,6 @@ interface FieldBasic {
   subType?: SubType;
   properties?: { [key: string]: Omit<Field, 'name'> };
   fields?: { [key: string]: Omit<Field, 'name'> };
-  referenceField?: string;
-  inferenceId?: string;
-  inference_id?: string;
 
   // other* exist together as a holder of types that the mappings editor does not yet know about but
   // enables the user to create mappings with them.
@@ -201,6 +198,8 @@ type FieldParams = {
 
 export type Field = FieldBasic & Partial<FieldParams>;
 
+export type SemanticTextField = Field & { inference_id: string; reference_field: string };
+
 export interface FieldMeta {
   childFieldsName: ChildFieldName | undefined;
   canHaveChildFields: boolean;
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/types/state.ts b/x-pack/plugins/index_management/public/application/components/mappings_editor/types/state.ts
index a0e7247c39bc1..f40fe420eb3be 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/types/state.ts
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/types/state.ts
@@ -108,10 +108,12 @@ export interface State {
   };
   templates: TemplatesFormState;
   inferenceToModelIdMap?: InferenceToModelIdMap;
+  mappingViewFields: NormalizedFields; // state of the incoming index mappings, separate from the editor state above
 }
 
 export type Action =
   | { type: 'editor.replaceMappings'; value: { [key: string]: any } }
+  | { type: 'editor.replaceViewMappings'; value: { fields: NormalizedFields } }
   | {
       type: 'inferenceToModelIdMap.update';
       value: { inferenceToModelIdMap?: InferenceToModelIdMap };
@@ -122,7 +124,6 @@ export type Action =
   | { type: 'templates.save'; value: MappingsTemplates }
   | { type: 'fieldForm.update'; value: OnFormUpdateArg<any> }
   | { type: 'field.add'; value: Field }
-  | { type: 'field.addSemanticText'; value: Field }
   | { type: 'field.remove'; value: string }
   | { type: 'field.edit'; value: Field }
   | { type: 'field.toggleExpand'; value: { fieldId: string; isExpanded?: boolean } }
diff --git a/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx b/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
index 1bd58bcc8e5f0..5c5e1c6a289fa 100644
--- a/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
+++ b/x-pack/plugins/index_management/public/application/components/mappings_editor/use_state_listener.tsx
@@ -8,6 +8,7 @@
 import { useEffect, useMemo } from 'react';
 
 import { EuiSelectableOption } from '@elastic/eui';
+import { cloneDeep } from 'lodash';
 import {
   DocumentFieldsStatus,
   Field,
@@ -182,6 +183,12 @@ export const useMappingsStateListener = ({ onChange, value, status }: Args) => {
         },
       },
     });
+    dispatch({
+      type: 'editor.replaceViewMappings',
+      value: {
+        fields: cloneDeep(parsedFieldsDefaultValue),
+      },
+    });
   }, [
     value,
     parsedFieldsDefaultValue,
diff --git a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
index be1fdbaa47315..ac247500e3248 100644
--- a/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
+++ b/x-pack/plugins/index_management/public/application/components/template_form/template_form.tsx
@@ -218,6 +218,7 @@ export const TemplateForm = ({
               ? serializeAsESLifecycle(wizardData.logistics.lifecycle)
               : undefined,
           },
+          ignoreMissingComponentTemplates: initialTemplate.ignoreMissingComponentTemplates,
         };
 
         return cleanupTemplateObject(outputTemplate as TemplateDeserialized);
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/details_page_mappings_content.tsx b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/details_page_mappings_content.tsx
index 88902ff517c35..f1a625dafbbda 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/details_page_mappings_content.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/details_page_mappings_content.tsx
@@ -29,6 +29,10 @@ import { FormattedMessage } from '@kbn/i18n-react';
 import React, { FunctionComponent, useCallback, useEffect, useMemo, useState } from 'react';
 import { ILicense } from '@kbn/licensing-plugin/public';
 import { useUnsavedChangesPrompt } from '@kbn/unsaved-changes-prompt';
+import {
+  getStateWithCopyToFields,
+  isSemanticTextField,
+} from '../../../../components/mappings_editor/lib/utils';
 import { Index } from '../../../../../../common';
 import { useDetailsPageMappingsModelManagement } from '../../../../../hooks/use_details_page_mappings_model_management';
 import { useAppContext } from '../../../../app_context';
@@ -73,7 +77,6 @@ export const DetailsPageMappingsContent: FunctionComponent<{
       http,
     },
     plugins: { ml, licensing },
-    url,
     config,
     overlays,
     history,
@@ -89,9 +92,9 @@ export const DetailsPageMappingsContent: FunctionComponent<{
   }, [licensing]);
 
   const { enableSemanticText: isSemanticTextEnabled } = config;
-  const [errorsInTrainedModelDeployment, setErrorsInTrainedModelDeployment] = useState<string[]>(
-    []
-  );
+  const [errorsInTrainedModelDeployment, setErrorsInTrainedModelDeployment] = useState<
+    Record<string, string | undefined>
+  >({});
 
   const hasMLPermissions = capabilities?.ml?.canGetTrainedModels ? true : false;
 
@@ -151,11 +154,10 @@ export const DetailsPageMappingsContent: FunctionComponent<{
     [jsonData]
   );
 
+  const [hasSavedFields, setHasSavedFields] = useState<boolean>(false);
+
   useMappingsStateListener({ value: parsedDefaultValue, status: 'disabled' });
-  const { fetchInferenceToModelIdMap, pendingDeployments } = useDetailsPageMappingsModelManagement(
-    state.fields,
-    state.inferenceToModelIdMap
-  );
+  const { fetchInferenceToModelIdMap } = useDetailsPageMappingsModelManagement();
 
   const onCancelAddingNewFields = useCallback(() => {
     setAddingFields(!isAddingFields);
@@ -198,8 +200,6 @@ export const DetailsPageMappingsContent: FunctionComponent<{
     });
   }, [dispatch, isAddingFields, state]);
 
-  const [isModalVisible, setIsModalVisible] = useState(false);
-
   useEffect(() => {
     if (!isSemanticTextEnabled || !hasMLPermissions) {
       return;
@@ -213,7 +213,7 @@ export const DetailsPageMappingsContent: FunctionComponent<{
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
-  const refreshModal = useCallback(async () => {
+  const fetchInferenceData = useCallback(async () => {
     try {
       if (!isSemanticTextEnabled) {
         return;
@@ -230,35 +230,45 @@ export const DetailsPageMappingsContent: FunctionComponent<{
   }, [fetchInferenceToModelIdMap, isSemanticTextEnabled, hasMLPermissions]);
 
   const updateMappings = useCallback(async () => {
+    const hasSemanticText = hasSemanticTextField(state.fields);
     try {
-      if (isSemanticTextEnabled && hasMLPermissions) {
+      if (isSemanticTextEnabled && hasMLPermissions && hasSemanticText) {
         await fetchInferenceToModelIdMap();
-
-        if (pendingDeployments.length > 0) {
-          setIsModalVisible(true);
-          return;
-        }
       }
 
-      const denormalizedFields = deNormalize(state.fields);
+      const fields = hasSemanticText ? getStateWithCopyToFields(state).fields : state.fields;
 
-      const { error } = await updateIndexMappings(indexName, denormalizedFields);
+      const denormalizedFields = deNormalize(fields);
 
-      if (!error) {
-        notificationService.showSuccessToast(
-          i18n.translate('xpack.idxMgmt.indexDetails.mappings.successfullyUpdatedIndexMappings', {
-            defaultMessage: 'Updated index mapping',
-          })
+      const inferenceIdsInPendingList = Object.values(deNormalize(fields))
+        .filter(isSemanticTextField)
+        .map((field) => field.inference_id)
+        .filter(
+          (inferenceId: string) =>
+            state.inferenceToModelIdMap?.[inferenceId] &&
+            !state.inferenceToModelIdMap?.[inferenceId].isDeployed
         );
-        refetchMapping();
-      } else {
-        setSaveMappingError(error.message);
+      setHasSavedFields(true);
+      if (inferenceIdsInPendingList.length === 0) {
+        const { error } = await updateIndexMappings(indexName, denormalizedFields);
+
+        if (!error) {
+          notificationService.showSuccessToast(
+            i18n.translate('xpack.idxMgmt.indexDetails.mappings.successfullyUpdatedIndexMappings', {
+              defaultMessage: 'Updated index mapping',
+            })
+          );
+          refetchMapping();
+          setHasSavedFields(false);
+        } else {
+          setSaveMappingError(error.message);
+        }
       }
     } catch (exception) {
       setSaveMappingError(exception.message);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [state.fields, pendingDeployments]);
+  }, [state.fields]);
 
   const onSearchChange = useCallback(
     (value: string) => {
@@ -494,7 +504,7 @@ export const DetailsPageMappingsContent: FunctionComponent<{
                   >
                     <FormattedMessage
                       id="xpack.idxMgmt.indexDetails.mappings.saveMappings"
-                      defaultMessage="Save mappings"
+                      defaultMessage="Save mapping"
                     />
                   </EuiButton>
                 )}
@@ -601,15 +611,17 @@ export const DetailsPageMappingsContent: FunctionComponent<{
           </EuiFlexItem>
         </EuiFlexGroup>
       </EuiFlexGroup>
-      {isModalVisible && isSemanticTextEnabled && (
+      {isSemanticTextEnabled && isAddingFields && hasSavedFields && (
         <TrainedModelsDeploymentModal
-          pendingDeployments={pendingDeployments}
+          fetchData={fetchInferenceData}
           errorsInTrainedModelDeployment={errorsInTrainedModelDeployment}
-          setIsModalVisible={setIsModalVisible}
-          refreshModal={refreshModal}
-          url={url}
+          setErrorsInTrainedModelDeployment={setErrorsInTrainedModelDeployment}
         />
       )}
     </>
   );
 };
+
+function hasSemanticTextField(fields: NormalizedFields): boolean {
+  return Object.values(fields.byId).some((field) => field.source.type === 'semantic_text');
+}
diff --git a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
index 8c2bfbbbef96d..4bba408197661 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/index_list/details_page/trained_models_deployment_modal.tsx
@@ -8,179 +8,175 @@ import { EuiConfirmModal, useGeneratedHtmlId, EuiHealth } from '@elastic/eui';
 import React from 'react';
 
 import { EuiLink } from '@elastic/eui';
-import { useEffect, useState } from 'react';
-import type { SharePluginStart } from '@kbn/share-plugin/public';
+import { useEffect, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
+import { isSemanticTextField } from '../../../../components/mappings_editor/lib/utils';
+import { deNormalize } from '../../../../components/mappings_editor/lib';
+import { useMLModelNotificationToasts } from '../../../../../hooks/use_ml_model_status_toasts';
+import { useMappingsState } from '../../../../components/mappings_editor/mappings_state_context';
+import { useAppContext } from '../../../../app_context';
 
-interface SemanticTextProps {
-  setIsModalVisible: (isVisible: boolean) => void;
-  refreshModal: () => void;
-  pendingDeployments: Array<string | undefined>;
-  errorsInTrainedModelDeployment: string[];
-  url?: SharePluginStart['url'];
+export interface TrainedModelsDeploymentModalProps {
+  fetchData: () => void;
+  errorsInTrainedModelDeployment: Record<string, string | undefined>;
+  setErrorsInTrainedModelDeployment: React.Dispatch<
+    React.SetStateAction<Record<string, string | undefined>>
+  >;
 }
 
 const ML_APP_LOCATOR = 'ML_APP_LOCATOR';
 const TRAINED_MODELS_MANAGE = 'trained_models';
 
 export function TrainedModelsDeploymentModal({
-  setIsModalVisible,
-  refreshModal,
-  pendingDeployments = [],
-  errorsInTrainedModelDeployment = [],
-  url,
-}: SemanticTextProps) {
+  errorsInTrainedModelDeployment = {},
+  fetchData,
+  setErrorsInTrainedModelDeployment,
+}: TrainedModelsDeploymentModalProps) {
+  const { fields, inferenceToModelIdMap } = useMappingsState();
+  const {
+    plugins: { ml },
+    url,
+  } = useAppContext();
   const modalTitleId = useGeneratedHtmlId();
+  const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
   const closeModal = () => setIsModalVisible(false);
   const [mlManagementPageUrl, setMlManagementPageUrl] = useState<string>('');
+  const { showErrorToasts } = useMLModelNotificationToasts();
 
   useEffect(() => {
-    setIsModalVisible(pendingDeployments.length > 0);
-  }, [pendingDeployments, setIsModalVisible]);
-
-  useEffect(() => {
-    let isCancelled = false;
     const mlLocator = url?.locators.get(ML_APP_LOCATOR);
     const generateUrl = async () => {
       if (mlLocator) {
         const mlURL = await mlLocator.getUrl({
           page: TRAINED_MODELS_MANAGE,
         });
-        if (!isCancelled) {
-          setMlManagementPageUrl(mlURL);
-        }
+        setMlManagementPageUrl(mlURL);
       }
     };
     generateUrl();
-    return () => {
-      isCancelled = true;
-    };
   }, [url]);
 
-  const ErroredDeployments = pendingDeployments.filter(
-    (deployment) => deployment !== undefined && errorsInTrainedModelDeployment.includes(deployment)
-  );
+  const inferenceIdsInPendingList = useMemo(() => {
+    return Object.values(deNormalize(fields))
+      .filter(isSemanticTextField)
+      .map((field) => field.inference_id);
+  }, [fields]);
 
-  const PendingModelsDeploymentModal = () => {
-    const pendingDeploymentsList = pendingDeployments.map((deployment, index) => (
-      <li key={index}>
-        <EuiHealth textSize="xs" color="warning">
-          {deployment}
-        </EuiHealth>
-      </li>
-    ));
+  const [pendingDeployments, setPendingDeployments] = useState<string[]>([]);
 
-    return (
-      <EuiConfirmModal
-        aria-labelledby={modalTitleId}
-        style={{ width: 600 }}
-        title={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.titleLabel',
-          {
-            defaultMessage: 'Models still deploying',
-          }
-        )}
-        titleProps={{ id: modalTitleId }}
-        onCancel={closeModal}
-        onConfirm={refreshModal}
-        cancelButtonText={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.closeButtonLabel',
-          {
-            defaultMessage: 'Close',
-          }
-        )}
-        confirmButtonText={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.refreshButtonLabel',
-          {
-            defaultMessage: 'Refresh',
-          }
-        )}
-        defaultFocusedButton="confirm"
-        data-test-subj="trainedModelsDeploymentModal"
-      >
-        <p data-test-subj="trainedModelsDeploymentModalText">
-          {i18n.translate(
-            'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.textAboutDeploymentsNotCompleted',
-            {
-              defaultMessage:
-                'Some fields are referencing models that have not yet completed deployment. Deployment may take a few minutes to complete.',
-            }
-          )}
-        </p>
-        <ul style={{ listStyleType: 'none' }}>{pendingDeploymentsList}</ul>
-        <EuiLink href={mlManagementPageUrl} target="_blank">
-          {i18n.translate(
-            'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.textTrainedModelManagementLink',
-            {
-              defaultMessage: 'Go to Trained Model Management',
-            }
-          )}
-        </EuiLink>
-      </EuiConfirmModal>
-    );
+  const startModelAllocation = async (trainedModelId: string) => {
+    try {
+      await ml?.mlApi?.trainedModels.startModelAllocation(trainedModelId);
+    } catch (error) {
+      setErrorsInTrainedModelDeployment((previousState) => ({
+        ...previousState,
+        [trainedModelId]: error.message,
+      }));
+      showErrorToasts(error);
+      setIsModalVisible(true);
+    }
   };
 
-  const ErroredModelsDeploymentModal = () => {
-    const pendingDeploymentsList = pendingDeployments.map((deployment, index) => (
-      <li key={index}>
-        <EuiHealth textSize="xs" color="danger">
-          {deployment}
-        </EuiHealth>
-      </li>
-    ));
+  useEffect(() => {
+    const models = inferenceIdsInPendingList.map(
+      (inferenceId) => inferenceToModelIdMap?.[inferenceId]
+    );
+    for (const model of models) {
+      if (model && !model.isDownloading && !model.isDeployed) {
+        // Sometimes the model gets stuck in a ready to deploy state, so we need to trigger deployment manually
+        startModelAllocation(model.trainedModelId);
+      }
+    }
+    const pendingModels = models
+      .map((model) => {
+        return model?.trainedModelId && !model?.isDeployed ? model?.trainedModelId : '';
+      })
+      .filter((trainedModelId) => !!trainedModelId);
+    const uniqueDeployments = pendingModels.filter(
+      (deployment, index) => pendingModels.indexOf(deployment) === index
+    );
+    setPendingDeployments(uniqueDeployments);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [inferenceIdsInPendingList, inferenceToModelIdMap]);
+
+  const erroredDeployments = pendingDeployments.filter(
+    (deployment) => errorsInTrainedModelDeployment[deployment]
+  );
 
-    return (
-      <EuiConfirmModal
-        aria-labelledby={modalTitleId}
-        style={{ width: 600 }}
-        title={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorTitle',
-          {
-            defaultMessage: 'Models could not be deployed',
-          }
-        )}
-        titleProps={{ id: modalTitleId }}
-        onCancel={closeModal}
-        onConfirm={refreshModal}
-        cancelButtonText={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorCancelButtonLabel',
-          {
-            defaultMessage: 'Cancel',
-          }
+  useEffect(() => {
+    if (erroredDeployments.length > 0 || pendingDeployments.length > 0) {
+      setIsModalVisible(true);
+    }
+  }, [erroredDeployments.length, pendingDeployments.length]);
+  return isModalVisible ? (
+    <EuiConfirmModal
+      aria-labelledby={modalTitleId}
+      style={{ width: 600 }}
+      title={
+        erroredDeployments.length > 0
+          ? i18n.translate(
+              'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorTitle',
+              {
+                defaultMessage: 'Models could not be deployed',
+              }
+            )
+          : i18n.translate('xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.titleLabel', {
+              defaultMessage: 'Models still deploying',
+            })
+      }
+      titleProps={{ id: modalTitleId }}
+      onCancel={closeModal}
+      onConfirm={fetchData}
+      cancelButtonText={i18n.translate(
+        'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.closeButtonLabel',
+        {
+          defaultMessage: 'Close',
+        }
+      )}
+      confirmButtonText={i18n.translate(
+        'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.refreshButtonLabel',
+        {
+          defaultMessage: 'Refresh',
+        }
+      )}
+      defaultFocusedButton="confirm"
+      data-test-subj="trainedModelsDeploymentModal"
+    >
+      <p data-test-subj="trainedModelsDeploymentModalText">
+        {erroredDeployments.length > 0
+          ? i18n.translate(
+              'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorText',
+              {
+                defaultMessage: 'There was an error when trying to deploy the following models.',
+              }
+            )
+          : i18n.translate(
+              'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.textAboutDeploymentsNotCompleted',
+              {
+                defaultMessage:
+                  'Some fields are referencing models that have not yet completed deployment. Deployment may take a few minutes to complete.',
+              }
+            )}
+      </p>
+      <ul style={{ listStyleType: 'none' }}>
+        {(erroredDeployments.length > 0 ? erroredDeployments : pendingDeployments).map(
+          (deployment) => (
+            <li key={deployment}>
+              <EuiHealth textSize="xs" color="danger">
+                {deployment}
+              </EuiHealth>
+            </li>
+          )
         )}
-        confirmButtonText={i18n.translate(
-          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorTryAgainButtonLabel',
+      </ul>
+      <EuiLink href={mlManagementPageUrl} target="_blank">
+        {i18n.translate(
+          'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.textTrainedModelManagementLink',
           {
-            defaultMessage: 'Try again',
+            defaultMessage: 'Go to Trained Model Management',
           }
         )}
-        defaultFocusedButton="confirm"
-        data-test-subj="trainedModelsErroredDeploymentModal"
-      >
-        <p data-test-subj="trainedModelsErrorDeploymentModalText">
-          {i18n.translate(
-            'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorText',
-            {
-              defaultMessage: 'There was an error when trying to deploy the following models.',
-            }
-          )}
-        </p>
-        <ul style={{ listStyleType: 'none' }}>{pendingDeploymentsList}</ul>
-        <EuiLink href={mlManagementPageUrl} target="_blank">
-          {i18n.translate(
-            'xpack.idxMgmt.indexDetails.trainedModelsDeploymentModal.deploymentErrorTrainedModelManagementLink',
-            {
-              defaultMessage: 'Go to Trained Model Management',
-            }
-          )}
-        </EuiLink>
-      </EuiConfirmModal>
-    );
-  };
-
-  return ErroredDeployments.length > 0 ? (
-    <ErroredModelsDeploymentModal />
-  ) : (
-    <PendingModelsDeploymentModal />
-  );
+      </EuiLink>
+    </EuiConfirmModal>
+  ) : null;
 }
diff --git a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
index 3f451217f8413..c2aa548100b57 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/template_list/template_details/tabs/tab_summary.tsx
@@ -20,6 +20,8 @@ import {
   EuiCodeBlock,
   EuiSpacer,
 } from '@elastic/eui';
+import { reactRouterNavigate } from '../../../../../../shared_imports';
+import { useAppContext } from '../../../../../app_context';
 import { serializeAsESLifecycle } from '../../../../../../../common/lib/data_stream_serialization';
 import { getLifecycleValue } from '../../../../../lib/data_streams';
 import { TemplateDeserialized } from '../../../../../../../common';
@@ -59,6 +61,7 @@ export const TabSummary: React.FunctionComponent<Props> = ({ templateDetails })
 
   const numIndexPatterns = indexPatterns.length;
 
+  const { history } = useAppContext();
   const ilmPolicyLink = useIlmLocator(ILM_PAGES_POLICY_EDIT, ilmPolicy?.name);
 
   return (
@@ -135,9 +138,11 @@ export const TabSummary: React.FunctionComponent<Props> = ({ templateDetails })
                     <ul>
                       {composedOf.map((component) => (
                         <li key={component}>
-                          <EuiTitle size="xs">
+                          <EuiLink
+                            {...reactRouterNavigate(history, `/component_templates/${component}`)}
+                          >
                             <span>{component}</span>
-                          </EuiTitle>
+                          </EuiLink>
                         </li>
                       ))}
                     </ul>
diff --git a/x-pack/plugins/index_management/public/application/services/api.ts b/x-pack/plugins/index_management/public/application/services/api.ts
index e071e0bf3c68c..e68335b8e0ba5 100644
--- a/x-pack/plugins/index_management/public/application/services/api.ts
+++ b/x-pack/plugins/index_management/public/application/services/api.ts
@@ -434,6 +434,7 @@ export function createIndex(indexName: string) {
     }),
   });
 }
+
 export function updateIndexMappings(indexName: string, newFields: Fields) {
   return sendRequest({
     path: `${API_BASE_PATH}/mapping/${encodeURIComponent(indexName)}`,
@@ -443,7 +444,7 @@ export function updateIndexMappings(indexName: string, newFields: Fields) {
 }
 
 export function getInferenceEndpoints() {
-  return sendRequest({
+  return sendRequest<InferenceAPIConfigResponse[]>({
     path: `${API_BASE_PATH}/inference/all`,
     method: 'get',
   });
diff --git a/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.test.ts b/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.test.ts
index c3d74c21ec528..6e80bcea5c349 100644
--- a/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.test.ts
+++ b/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.test.ts
@@ -6,7 +6,6 @@
  */
 
 import { renderHook } from '@testing-library/react-hooks';
-import { InferenceToModelIdMap } from '../application/components/mappings_editor/components/document_fields/fields';
 import { NormalizedFields } from '../application/components/mappings_editor/types';
 import { useDetailsPageMappingsModelManagement } from './use_details_page_mappings_model_management';
 
@@ -16,13 +15,24 @@ jest.mock('../application/app_context', () => ({
       ml: {
         mlApi: {
           trainedModels: {
+            getModelsDownloadStatus: jest.fn().mockResolvedValue({
+              '.elser_model_2_linux-x86_64': {},
+            }),
             getTrainedModelStats: jest.fn().mockResolvedValue({
               trained_model_stats: [
                 {
-                  model_id: '.elser_model_2',
+                  model_id: '.elser_model_2-x86_64',
                   deployment_stats: {
                     deployment_id: 'elser_model_2',
-                    model_id: '.elser_model_2',
+                    model_id: '.elser_model_2-x86_64',
+                    state: 'not started',
+                  },
+                },
+                {
+                  model_id: '.multilingual-e5-small',
+                  deployment_stats: {
+                    deployment_id: 'e5',
+                    model_id: '.multilingual-e5-small',
                     state: 'started',
                   },
                 },
@@ -55,68 +65,73 @@ jest.mock('../application/services/api', () => ({
 
 jest.mock('../application/components/mappings_editor/mappings_state_context', () => ({
   useDispatch: () => mockDispatch,
-}));
-const mockDispatch = jest.fn();
-const fields = {
-  byId: {
-    '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
-      id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
-      isMultiField: false,
-      source: {
-        name: 'title',
-        type: 'text',
-        copy_to: ['semantic'],
+  useMappingsState: () => ({
+    fields: {
+      byId: {
+        '88ebcfdb-19b7-4458-9ea2-9488df54453d': {
+          id: '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+          isMultiField: false,
+          source: {
+            name: 'title',
+            type: 'text',
+            copy_to: ['semantic'],
+          },
+          path: ['title'],
+          nestedDepth: 0,
+          childFieldsName: 'fields',
+          canHaveChildFields: false,
+          hasChildFields: false,
+          canHaveMultiFields: true,
+          hasMultiFields: false,
+          isExpanded: false,
+        },
+        'c5d86c82-ea07-4457-b469-3ffd4b96db81': {
+          id: 'c5d86c82-ea07-4457-b469-3ffd4b96db81',
+          isMultiField: false,
+          source: {
+            name: 'semantic',
+            inference_id: 'elser_model_2',
+            type: 'semantic_text',
+          },
+          path: ['semantic'],
+          nestedDepth: 0,
+          childFieldsName: 'fields',
+          canHaveChildFields: false,
+          hasChildFields: false,
+          canHaveMultiFields: true,
+          hasMultiFields: false,
+          isExpanded: false,
+        },
       },
-      path: ['title'],
-      nestedDepth: 0,
-      childFieldsName: 'fields',
-      canHaveChildFields: false,
-      hasChildFields: false,
-      canHaveMultiFields: true,
-      hasMultiFields: false,
-      isExpanded: false,
-    },
-    'c5d86c82-ea07-4457-b469-3ffd4b96db81': {
-      id: 'c5d86c82-ea07-4457-b469-3ffd4b96db81',
-      isMultiField: false,
-      source: {
-        name: 'semantic',
-        inference_id: 'elser_model_2',
-        type: 'semantic_text',
+      aliases: {},
+      rootLevelFields: [
+        '88ebcfdb-19b7-4458-9ea2-9488df54453d',
+        'c5d86c82-ea07-4457-b469-3ffd4b96db81',
+      ],
+      maxNestedDepth: 2,
+    } as NormalizedFields,
+    inferenceToModelIdMap: {
+      elser_model_2: {
+        trainedModelId: '.elser_model_2',
+        isDeployed: false,
+        isDeployable: true,
+        isDownloading: false,
+      },
+      e5: {
+        trainedModelId: '.multilingual-e5-small',
+        isDeployed: true,
+        isDeployable: true,
+        isDownloading: false,
       },
-      path: ['semantic'],
-      nestedDepth: 0,
-      childFieldsName: 'fields',
-      canHaveChildFields: false,
-      hasChildFields: false,
-      canHaveMultiFields: true,
-      hasMultiFields: false,
-      isExpanded: false,
     },
-  },
-  aliases: {},
-  rootLevelFields: ['88ebcfdb-19b7-4458-9ea2-9488df54453d', 'c5d86c82-ea07-4457-b469-3ffd4b96db81'],
-  maxNestedDepth: 2,
-} as NormalizedFields;
+  }),
+}));
 
-const inferenceToModelIdMap = {
-  elser_model_2: {
-    trainedModelId: '.elser_model_2',
-    isDeployed: true,
-    isDeployable: true,
-  },
-  e5: {
-    trainedModelId: '.multilingual-e5-small',
-    isDeployed: true,
-    isDeployable: true,
-  },
-} as InferenceToModelIdMap;
+const mockDispatch = jest.fn();
 
 describe('useDetailsPageMappingsModelManagement', () => {
   it('should call the dispatch with correct parameters', async () => {
-    const { result } = renderHook(() =>
-      useDetailsPageMappingsModelManagement(fields, inferenceToModelIdMap)
-    );
+    const { result } = renderHook(() => useDetailsPageMappingsModelManagement());
 
     await result.current.fetchInferenceToModelIdMap();
 
@@ -125,14 +140,22 @@ describe('useDetailsPageMappingsModelManagement', () => {
       value: {
         inferenceToModelIdMap: {
           e5: {
-            isDeployed: false,
+            isDeployed: true,
             isDeployable: true,
             trainedModelId: '.multilingual-e5-small',
+            isDownloading: false,
+            modelStats: {
+              deployment_id: 'e5',
+              model_id: '.multilingual-e5-small',
+              state: 'started',
+            },
           },
           elser_model_2: {
-            isDeployed: true,
+            isDeployed: false,
             isDeployable: true,
-            trainedModelId: '.elser_model_2',
+            trainedModelId: '.elser_model_2_linux-x86_64',
+            isDownloading: true,
+            modelStats: undefined,
           },
         },
       },
diff --git a/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.ts b/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.ts
index 125892bdf6979..2d920a2d18ee0 100644
--- a/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.ts
+++ b/x-pack/plugins/index_management/public/hooks/use_details_page_mappings_model_management.ts
@@ -5,134 +5,130 @@
  * 2.0.
  */
 
-import { ElasticsearchModelDefaultOptions, Service } from '@kbn/inference_integration_flyout/types';
-import { InferenceStatsResponse } from '@kbn/ml-plugin/public/application/services/ml_api_service/trained_models';
-import type { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
-import { useCallback, useMemo } from 'react';
-import { useAppContext } from '../application/app_context';
+import { Service } from '@kbn/inference_integration_flyout/types';
+import { ModelDownloadState, TrainedModelStat } from '@kbn/ml-plugin/common/types/trained_models';
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import {
+  LATEST_ELSER_VERSION,
+  InferenceServiceSettings,
+  LocalInferenceServiceSettings,
+  LATEST_ELSER_MODEL_ID,
+  LATEST_E5_MODEL_ID,
+  ElserVersion,
+} from '@kbn/ml-trained-models-utils/src/constants/trained_models';
+import { useCallback } from 'react';
+import { AppDependencies, useAppContext } from '../application/app_context';
 import { InferenceToModelIdMap } from '../application/components/mappings_editor/components/document_fields/fields';
-import { deNormalize } from '../application/components/mappings_editor/lib';
 import { useDispatch } from '../application/components/mappings_editor/mappings_state_context';
-import {
-  DefaultInferenceModels,
-  DeploymentState,
-  NormalizedFields,
-} from '../application/components/mappings_editor/types';
+import { DefaultInferenceModels } from '../application/components/mappings_editor/types';
 import { getInferenceEndpoints } from '../application/services/api';
 
-interface InferenceModel {
-  data: InferenceAPIConfigResponse[];
+function isLocalModel(model: InferenceServiceSettings): model is LocalInferenceServiceSettings {
+  return Boolean((model as LocalInferenceServiceSettings).service_settings.model_id);
 }
 
-type DeploymentStatusType = Record<string, DeploymentState>;
-
 const getCustomInferenceIdMap = (
-  deploymentStatsByModelId: DeploymentStatusType,
-  models?: InferenceModel
-) => {
-  return models?.data.reduce<InferenceToModelIdMap>((inferenceMap, model) => {
-    const inferenceId = model.model_id;
-
-    const trainedModelId =
-      'model_id' in model.service_settings &&
-      (model.service_settings.model_id === ElasticsearchModelDefaultOptions.elser ||
-        model.service_settings.model_id === ElasticsearchModelDefaultOptions.e5)
-        ? model.service_settings.model_id
-        : '';
-    inferenceMap[inferenceId] = {
-      trainedModelId,
-      isDeployable: model.service === Service.elser || model.service === Service.elasticsearch,
-      isDeployed: deploymentStatsByModelId[trainedModelId] === 'deployed',
-    };
+  models: InferenceAPIConfigResponse[],
+  modelStatsById: Record<string, TrainedModelStat['deployment_stats'] | undefined>,
+  downloadStates: Record<string, ModelDownloadState | undefined>,
+  elser: string,
+  e5: string
+): InferenceToModelIdMap => {
+  const inferenceIdMap = models.reduce<InferenceToModelIdMap>((inferenceMap, model) => {
+    const inferenceEntry = isLocalModel(model)
+      ? {
+          trainedModelId: model.service_settings.model_id, // third-party models don't have trained model ids
+          isDeployable: model.service === Service.elser || model.service === Service.elasticsearch,
+          isDeployed: modelStatsById[model.service_settings.model_id]?.state === 'started',
+          isDownloading: Boolean(downloadStates[model.service_settings.model_id]),
+          modelStats: modelStatsById[model.service_settings.model_id],
+        }
+      : {
+          trainedModelId: '',
+          isDeployable: false,
+          isDeployed: false,
+          isDownloading: false,
+          modelStats: undefined,
+        };
+    inferenceMap[model.model_id] = inferenceEntry;
     return inferenceMap;
   }, {});
-};
-
-export const getTrainedModelStats = (modelStats?: InferenceStatsResponse): DeploymentStatusType => {
-  return (
-    modelStats?.trained_model_stats.reduce<DeploymentStatusType>((acc, modelStat) => {
-      if (modelStat.model_id) {
-        acc[modelStat.model_id] =
-          modelStat?.deployment_stats?.state === 'started'
-            ? DeploymentState.DEPLOYED
-            : DeploymentState.NOT_DEPLOYED;
-      }
-      return acc;
-    }, {}) || {}
-  );
-};
-
-const getDefaultInferenceIds = (deploymentStatsByModelId: DeploymentStatusType) => {
-  return {
+  const defaultInferenceIds = {
     [DefaultInferenceModels.elser_model_2]: {
-      trainedModelId: ElasticsearchModelDefaultOptions.elser,
+      trainedModelId: elser,
       isDeployable: true,
-      isDeployed:
-        deploymentStatsByModelId[ElasticsearchModelDefaultOptions.elser] ===
-        DeploymentState.DEPLOYED,
+      isDeployed: modelStatsById[elser]?.state === 'started',
+      isDownloading: Boolean(downloadStates[elser]),
+      modelStats: modelStatsById[elser],
     },
     [DefaultInferenceModels.e5]: {
-      trainedModelId: ElasticsearchModelDefaultOptions.e5,
+      trainedModelId: e5,
       isDeployable: true,
-      isDeployed:
-        deploymentStatsByModelId[ElasticsearchModelDefaultOptions.e5] === DeploymentState.DEPLOYED,
+      isDeployed: modelStatsById[e5]?.state === 'started',
+      isDownloading: Boolean(downloadStates[e5]),
+      modelStats: modelStatsById[e5],
     },
   };
+  return { ...defaultInferenceIds, ...inferenceIdMap };
 };
 
-export const useDetailsPageMappingsModelManagement = (
-  fields: NormalizedFields,
-  inferenceToModelIdMap?: InferenceToModelIdMap
-) => {
+async function getCuratedModelConfig(
+  ml: AppDependencies['plugins']['ml'] | undefined,
+  model: string,
+  version?: ElserVersion
+) {
+  if (ml?.mlApi) {
+    try {
+      const result = await ml.mlApi.trainedModels.getCuratedModelConfig(
+        model,
+        version ? { version } : undefined
+      );
+      return result.model_id;
+    } catch (e) {
+      // pass through and return default models below
+    }
+  }
+  return model === 'elser' ? LATEST_ELSER_MODEL_ID : LATEST_E5_MODEL_ID;
+}
+
+export const useDetailsPageMappingsModelManagement = () => {
   const {
     plugins: { ml },
   } = useAppContext();
 
   const dispatch = useDispatch();
 
-  const fetchInferenceModelsAndTrainedModelStats = useCallback(async () => {
+  const fetchInferenceToModelIdMap = useCallback<() => Promise<InferenceToModelIdMap>>(async () => {
     const inferenceModels = await getInferenceEndpoints();
-
     const trainedModelStats = await ml?.mlApi?.trainedModels.getTrainedModelStats();
-
-    return { inferenceModels, trainedModelStats };
-  }, [ml]);
-
-  const fetchInferenceToModelIdMap = useCallback(async () => {
-    const { inferenceModels, trainedModelStats } = await fetchInferenceModelsAndTrainedModelStats();
-    const deploymentStatsByModelId = getTrainedModelStats(trainedModelStats);
-    const defaultInferenceIds = getDefaultInferenceIds(deploymentStatsByModelId);
-    const modelIdMap = getCustomInferenceIdMap(deploymentStatsByModelId, inferenceModels);
+    const downloadStates = await ml?.mlApi?.trainedModels.getModelsDownloadStatus();
+    const elser = await getCuratedModelConfig(ml, 'elser', LATEST_ELSER_VERSION);
+    const e5 = await getCuratedModelConfig(ml, 'e5');
+    const modelStatsById =
+      trainedModelStats?.trained_model_stats.reduce<
+        Record<string, TrainedModelStat['deployment_stats'] | undefined>
+      >((acc, { model_id: modelId, deployment_stats: stats }) => {
+        if (modelId && stats) {
+          acc[modelId] = stats;
+        }
+        return acc;
+      }, {}) || {};
+    const modelIdMap = getCustomInferenceIdMap(
+      inferenceModels.data || [],
+      modelStatsById,
+      downloadStates || {},
+      elser,
+      e5
+    );
 
     dispatch({
       type: 'inferenceToModelIdMap.update',
-      value: { inferenceToModelIdMap: { ...defaultInferenceIds, ...modelIdMap } },
+      value: { inferenceToModelIdMap: modelIdMap },
     });
-  }, [dispatch, fetchInferenceModelsAndTrainedModelStats]);
-
-  const inferenceIdsInPendingList = useMemo(() => {
-    return Object.values(deNormalize(fields))
-      .filter((field) => field.type === 'semantic_text' && field.inference_id)
-      .map((field) => field.inference_id);
-  }, [fields]);
-
-  const pendingDeployments = useMemo(() => {
-    return inferenceIdsInPendingList
-      .map((inferenceId) => {
-        if (inferenceId === undefined) {
-          return undefined;
-        }
-        const trainedModelId = inferenceToModelIdMap?.[inferenceId]?.trainedModelId ?? '';
-        return trainedModelId && !inferenceToModelIdMap?.[inferenceId]?.isDeployed
-          ? trainedModelId
-          : undefined;
-      })
-      .filter((trainedModelId) => !!trainedModelId);
-  }, [inferenceIdsInPendingList, inferenceToModelIdMap]);
+    return modelIdMap;
+  }, [dispatch, ml]);
 
   return {
-    pendingDeployments,
     fetchInferenceToModelIdMap,
-    fetchInferenceModelsAndTrainedModelStats,
   };
 };
diff --git a/x-pack/plugins/index_management/public/hooks/use_ml_model_status_toasts.ts b/x-pack/plugins/index_management/public/hooks/use_ml_model_status_toasts.ts
index cba440186a1d0..7b553f37498d5 100644
--- a/x-pack/plugins/index_management/public/hooks/use_ml_model_status_toasts.ts
+++ b/x-pack/plugins/index_management/public/hooks/use_ml_model_status_toasts.ts
@@ -27,6 +27,22 @@ export function useMLModelNotificationToasts() {
       }),
     });
   };
+  const showSuccessfullyDeployedToast = (modelName: string) => {
+    return toasts.addSuccess({
+      title: i18n.translate(
+        'xpack.idxMgmt.mappingsEditor.createField.modelDeploymentStartedNotification',
+        {
+          defaultMessage: 'Model deployment started',
+        }
+      ),
+      text: i18n.translate('xpack.idxMgmt.mappingsEditor.createField.modelDeployedNotification', {
+        defaultMessage: 'Model {modelName} has been deployed on your machine learning node.',
+        values: {
+          modelName,
+        },
+      }),
+    });
+  };
   const showErrorToasts = (error: ErrorType) => {
     const errorObj = extractErrorProperties(error);
     return toasts.addError(new MLRequestFailure(errorObj, error), {
@@ -35,5 +51,5 @@ export function useMLModelNotificationToasts() {
       }),
     });
   };
-  return { showSuccessToasts, showErrorToasts };
+  return { showSuccessToasts, showErrorToasts, showSuccessfullyDeployedToast };
 }
diff --git a/x-pack/plugins/index_management/public/plugin.ts b/x-pack/plugins/index_management/public/plugin.ts
index f6ae66d8e52bc..136174dfac165 100644
--- a/x-pack/plugins/index_management/public/plugin.ts
+++ b/x-pack/plugins/index_management/public/plugin.ts
@@ -74,7 +74,7 @@ export class IndexMgmtUIPlugin
       editableIndexSettings: editableIndexSettings ?? 'all',
       enableMappingsSourceFieldSection: enableMappingsSourceFieldSection ?? true,
       enableTogglingDataRetention: enableTogglingDataRetention ?? true,
-      enableSemanticText: enableSemanticText ?? false,
+      enableSemanticText: enableSemanticText ?? true,
     };
   }
 
diff --git a/x-pack/plugins/index_management/server/config.ts b/x-pack/plugins/index_management/server/config.ts
index 8625274e31d2a..f2d1808a44286 100644
--- a/x-pack/plugins/index_management/server/config.ts
+++ b/x-pack/plugins/index_management/server/config.ts
@@ -36,7 +36,7 @@ const schemaLatest = schema.object(
       // deprecated as unused after index details page has been implemented
       enableIndexDetailsPage: schema.boolean({ defaultValue: false }),
       // deprecate as unused after semantic text is enabled everywhere
-      enableSemanticText: schema.boolean({ defaultValue: false }),
+      enableSemanticText: schema.boolean({ defaultValue: true }),
     }),
     enableIndexStats: offeringBasedSchema({
       // Index stats information is disabled in serverless; refer to the serverless.yml file as the source of truth
diff --git a/x-pack/plugins/index_management/test/fixtures/template.ts b/x-pack/plugins/index_management/test/fixtures/template.ts
index ca7f625d61bb9..54df4410352b6 100644
--- a/x-pack/plugins/index_management/test/fixtures/template.ts
+++ b/x-pack/plugins/index_management/test/fixtures/template.ts
@@ -67,6 +67,8 @@ export const getTemplate = ({
   indexPatterns = [],
   template: { settings, aliases, mappings } = {},
   dataStream,
+  composedOf,
+  ignoreMissingComponentTemplates,
   hasDatastream = false,
   isLegacy = false,
   type = 'default',
@@ -98,6 +100,8 @@ export const getTemplate = ({
       hasDatastream: dataStream !== undefined ? true : hasDatastream,
       isLegacy,
     },
+    composedOf,
+    ignoreMissingComponentTemplates,
   };
 
   return indexTemplate;
diff --git a/x-pack/plugins/integration_assistant/__jest__/fixtures/ecs_mapping.ts b/x-pack/plugins/integration_assistant/__jest__/fixtures/ecs_mapping.ts
index 167995931b568..bfb05e2980b6a 100644
--- a/x-pack/plugins/integration_assistant/__jest__/fixtures/ecs_mapping.ts
+++ b/x-pack/plugins/integration_assistant/__jest__/fixtures/ecs_mapping.ts
@@ -86,9 +86,19 @@ export const ecsMappingExpectedResults = {
           target_field: 'mysql_enterprise.audit',
         },
       },
+      {
+        script: {
+          description: 'Ensures the date processor does not receive an array value.',
+          lang: 'painless',
+          source:
+            'if (ctx.mysql_enterprise.audit.timestamp instanceof ArrayList){\n    ctx.mysql_enterprise.audit.timestamp = ctx.mysql_enterprise.audit.timestamp[0];\n}\n',
+          tag: 'script_convert_array_to_string',
+        },
+      },
       {
         date: {
           field: 'mysql_enterprise.audit.timestamp',
+          tag: 'date_processor_mysql_enterprise.audit.timestamp',
           target_field: '@timestamp',
           formats: ['yyyy-MM-dd HH:mm:ss'],
           if: 'ctx.mysql_enterprise?.audit?.timestamp != null',
diff --git a/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.schema.yaml b/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.schema.yaml
index 37b5750e01aca..e04a41b88e564 100644
--- a/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.schema.yaml
+++ b/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.schema.yaml
@@ -34,6 +34,8 @@ paths:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Pipeline"
                 connectorId:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Connector"
+                langSmithOptions:
+                  $ref: "../model/common_attributes.schema.yaml#/components/schemas/LangSmithOptions"
       responses:
         200:
           description: Indicates a successful call.
diff --git a/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts b/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts
index 067c3c88a07ed..c8e56a2af2f5e 100644
--- a/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts
+++ b/x-pack/plugins/integration_assistant/common/api/categorization/categorization_route.ts
@@ -10,6 +10,7 @@ import { z } from 'zod';
 import {
   Connector,
   DataStreamName,
+  LangSmithOptions,
   PackageName,
   Pipeline,
   RawSamples,
@@ -23,6 +24,7 @@ export const CategorizationRequestBody = z.object({
   rawSamples: RawSamples,
   currentPipeline: Pipeline,
   connectorId: Connector,
+  langSmithOptions: LangSmithOptions.optional(),
 });
 export type CategorizationRequestBodyInput = z.input<typeof CategorizationRequestBody>;
 
diff --git a/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.schema.yaml b/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.schema.yaml
index d539ae5877da8..57505f64ebf2a 100644
--- a/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.schema.yaml
+++ b/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.schema.yaml
@@ -33,6 +33,8 @@ paths:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Mapping"
                 connectorId:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Connector"
+                langSmithOptions:
+                  $ref: "../model/common_attributes.schema.yaml#/components/schemas/LangSmithOptions"
       responses:
         200:
           description: Indicates a successful call.
diff --git a/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts b/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts
index b1973159f9304..fd1dca194ae59 100644
--- a/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts
+++ b/x-pack/plugins/integration_assistant/common/api/ecs/ecs_route.ts
@@ -10,6 +10,7 @@ import { z } from 'zod';
 import {
   Connector,
   DataStreamName,
+  LangSmithOptions,
   Mapping,
   PackageName,
   RawSamples,
@@ -23,6 +24,7 @@ export const EcsMappingRequestBody = z.object({
   rawSamples: RawSamples,
   mapping: Mapping.optional(),
   connectorId: Connector,
+  langSmithOptions: LangSmithOptions.optional(),
 });
 export type EcsMappingRequestBodyInput = z.input<typeof EcsMappingRequestBody>;
 
diff --git a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
index 24cb71ed5274c..527899dc33727 100644
--- a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
+++ b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.schema.yaml
@@ -143,3 +143,17 @@ components:
         logo:
           type: string
           description: The logo of the integration.
+
+    LangSmithOptions:
+      type: object
+      description: The LangSmith options object.
+      required:
+        - projectName
+        - apiKey
+      properties:
+        projectName:
+          type: string
+          description: The project name.
+        apiKey:
+          type: string
+          description: The apiKey to use for tracing.
diff --git a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
index fdb20931ccce0..bde01d8bae245 100644
--- a/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
+++ b/x-pack/plugins/integration_assistant/common/api/model/common_attributes.ts
@@ -156,3 +156,18 @@ export const Integration = z.object({
    */
   logo: z.string().optional(),
 });
+
+/**
+ * The LangSmith options object.
+ */
+export type LangSmithOptions = z.infer<typeof LangSmithOptions>;
+export const LangSmithOptions = z.object({
+  /**
+   * The project name to use with tracing.
+   */
+  projectName: z.string(),
+  /**
+   * The api key for the project
+   */
+  apiKey: z.string(),
+});
diff --git a/x-pack/plugins/integration_assistant/common/api/related/related_route.schema.yaml b/x-pack/plugins/integration_assistant/common/api/related/related_route.schema.yaml
index 13990dc1b66d8..a588ac5852822 100644
--- a/x-pack/plugins/integration_assistant/common/api/related/related_route.schema.yaml
+++ b/x-pack/plugins/integration_assistant/common/api/related/related_route.schema.yaml
@@ -34,6 +34,8 @@ paths:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Pipeline"
                 connectorId:
                   $ref: "../model/common_attributes.schema.yaml#/components/schemas/Connector"
+                langSmithOptions:
+                  $ref: "../model/common_attributes.schema.yaml#/components/schemas/LangSmithOptions"
       responses:
         200:
           description: Indicates a successful call.
diff --git a/x-pack/plugins/integration_assistant/common/api/related/related_route.ts b/x-pack/plugins/integration_assistant/common/api/related/related_route.ts
index 4c5242e48d2c3..961bc007adcd8 100644
--- a/x-pack/plugins/integration_assistant/common/api/related/related_route.ts
+++ b/x-pack/plugins/integration_assistant/common/api/related/related_route.ts
@@ -10,6 +10,7 @@ import { z } from 'zod';
 import {
   Connector,
   DataStreamName,
+  LangSmithOptions,
   PackageName,
   Pipeline,
   RawSamples,
@@ -23,6 +24,7 @@ export const RelatedRequestBody = z.object({
   rawSamples: RawSamples,
   currentPipeline: Pipeline,
   connectorId: Connector,
+  langSmithOptions: LangSmithOptions.optional(),
 });
 export type RelatedRequestBodyInput = z.input<typeof RelatedRequestBody>;
 
diff --git a/x-pack/plugins/integration_assistant/kibana.jsonc b/x-pack/plugins/integration_assistant/kibana.jsonc
index b2ef3045e12be..d8d6e17026230 100644
--- a/x-pack/plugins/integration_assistant/kibana.jsonc
+++ b/x-pack/plugins/integration_assistant/kibana.jsonc
@@ -18,5 +18,8 @@
       "actions",
       "stackConnectors",
     ],
+    "requiredBundles": [
+      "kibanaUtils",
+    ]
   }
 }
diff --git a/x-pack/plugins/integration_assistant/public/common/components/authorization/authorization_wrapper.tsx b/x-pack/plugins/integration_assistant/public/common/components/authorization/authorization_wrapper.tsx
index 3890cd3b797cd..36e2fc727d674 100644
--- a/x-pack/plugins/integration_assistant/public/common/components/authorization/authorization_wrapper.tsx
+++ b/x-pack/plugins/integration_assistant/public/common/components/authorization/authorization_wrapper.tsx
@@ -25,7 +25,11 @@ export const AuthorizationWrapper = React.memo<AuthorizationWrapperProps>(
 
     if (!isAuthorized) {
       return (
-        <EuiCallOut title={i18n.PRIVILEGES_MISSING_TITLE} iconType="iInCircle">
+        <EuiCallOut
+          title={i18n.PRIVILEGES_MISSING_TITLE}
+          iconType="iInCircle"
+          data-test-subj="missingPrivilegesCallOut"
+        >
           <MissingPrivilegesDescription {...authRequired} />
         </EuiCallOut>
       );
diff --git a/x-pack/plugins/integration_assistant/public/common/components/buttons_footer.tsx b/x-pack/plugins/integration_assistant/public/common/components/buttons_footer.tsx
index d70e2bcb288cb..d27d1381b6e25 100644
--- a/x-pack/plugins/integration_assistant/public/common/components/buttons_footer.tsx
+++ b/x-pack/plugins/integration_assistant/public/common/components/buttons_footer.tsx
@@ -44,7 +44,12 @@ export const ButtonsFooter = React.memo<ButtonsFooterProps>(
     const integrationsUrl = useKibana().services.application.getUrlForApp('integrations');
     return (
       <KibanaPageTemplate.BottomBar paddingSize="s" position="sticky" css={bottomBarCss}>
-        <EuiFlexGroup direction="column" alignItems="center" css={containerCss}>
+        <EuiFlexGroup
+          direction="column"
+          alignItems="center"
+          css={containerCss}
+          data-test-subj="buttonsFooter"
+        >
           <EuiFlexItem css={contentCss}>
             <EuiFlexGroup
               direction="row"
@@ -54,7 +59,11 @@ export const ButtonsFooter = React.memo<ButtonsFooterProps>(
             >
               <EuiFlexItem>
                 {!hideCancel && (
-                  <EuiLink href={integrationsUrl} color="text">
+                  <EuiLink
+                    href={integrationsUrl}
+                    color="text"
+                    data-test-subj="buttonsFooter-cancelButton"
+                  >
                     {cancelButtonText || (
                       <FormattedMessage
                         id="xpack.integrationAssistant.footer.cancel"
@@ -73,7 +82,11 @@ export const ButtonsFooter = React.memo<ButtonsFooterProps>(
                 >
                   <EuiFlexItem grow={false}>
                     {onBack && (
-                      <EuiLink onClick={onBack} color="text">
+                      <EuiLink
+                        onClick={onBack}
+                        color="text"
+                        data-test-subj="buttonsFooter-backButton"
+                      >
                         {backButtonText || (
                           <FormattedMessage
                             id="xpack.integrationAssistant.footer.back"
@@ -85,7 +98,13 @@ export const ButtonsFooter = React.memo<ButtonsFooterProps>(
                   </EuiFlexItem>
                   <EuiFlexItem grow={false}>
                     {onNext && (
-                      <EuiButton fill color="primary" onClick={onNext} isDisabled={isNextDisabled}>
+                      <EuiButton
+                        fill
+                        color="primary"
+                        onClick={onNext}
+                        isDisabled={isNextDisabled}
+                        data-test-subj="buttonsFooter-nextButton"
+                      >
                         {nextButtonText || (
                           <FormattedMessage
                             id="xpack.integrationAssistant.footer.next"
diff --git a/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_authorization.ts b/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_authorization.ts
new file mode 100644
index 0000000000000..cf3871e073ece
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_authorization.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Authorization, RoutesAuthorization } from '../use_authorization';
+
+export const useAuthorization = jest.fn(
+  (): Authorization => ({
+    canCreateIntegrations: true,
+    canExecuteConnectors: true,
+    canCreateConnectors: true,
+  })
+);
+
+export const useRoutesAuthorization = jest.fn(
+  (): RoutesAuthorization => ({
+    canUseIntegrationAssistant: true,
+    canUseIntegrationUpload: true,
+  })
+);
diff --git a/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_availability.ts b/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_availability.ts
new file mode 100644
index 0000000000000..4f820b1ae1f52
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/common/hooks/__mocks__/use_availability.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Availability } from '../use_availability';
+
+export const useAvailability = jest.fn((): Availability => {
+  return { hasLicense: true, renderUpselling: undefined };
+});
+
+export const useIsAvailable = jest.fn((): boolean => true);
diff --git a/x-pack/plugins/integration_assistant/public/common/hooks/use_availability.ts b/x-pack/plugins/integration_assistant/public/common/hooks/use_availability.ts
index 9681ea7000623..02f523fcde226 100644
--- a/x-pack/plugins/integration_assistant/public/common/hooks/use_availability.ts
+++ b/x-pack/plugins/integration_assistant/public/common/hooks/use_availability.ts
@@ -11,10 +11,12 @@ import { MINIMUM_LICENSE_TYPE } from '../../../common/constants';
 import { useKibana } from './use_kibana';
 import type { RenderUpselling } from '../../services';
 
-export const useAvailability = (): {
+export interface Availability {
   hasLicense: boolean;
   renderUpselling: RenderUpselling | undefined;
-} => {
+}
+
+export const useAvailability = (): Availability => {
   const { licensing, renderUpselling$ } = useKibana().services;
   const licenseService = useObservable(licensing.license$);
   const renderUpselling = useObservable(renderUpselling$);
diff --git a/x-pack/plugins/integration_assistant/public/common/lib/api_parsers.test.ts b/x-pack/plugins/integration_assistant/public/common/lib/api_parsers.test.ts
new file mode 100644
index 0000000000000..c7d427cb5b01a
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/common/lib/api_parsers.test.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { EpmPackageResponse } from './api';
+import { getIntegrationNameFromResponse } from './api_parsers';
+
+describe('getIntegrationNameFromResponse', () => {
+  it.each([
+    ['audit-security.data-stream-1.0.0', 'security-1.0.0'],
+    ['audit-endpoint_security.data_stream-1.0.0', 'endpoint_security-1.0.0'],
+    ['audit-endpoint_security_2.data_stream-1.0.0', 'endpoint_security_2-1.0.0'],
+  ])(
+    'should return the integration name from the ingest pipeline name %s',
+    (ingestPipelineName, expected) => {
+      const response = { response: [{ id: ingestPipelineName }] } as EpmPackageResponse;
+      expect(getIntegrationNameFromResponse(response)).toEqual(expected);
+    }
+  );
+  it('should return an empty string if the response is empty', () => {
+    const response = { response: [] } as unknown as EpmPackageResponse;
+    expect(getIntegrationNameFromResponse(response)).toEqual('');
+  });
+  it('should return an empty string if the response is undefined', () => {
+    const response = {} as EpmPackageResponse;
+    expect(getIntegrationNameFromResponse(response)).toEqual('');
+  });
+  it('should return an empty string if the response is null', () => {
+    const response = { response: null } as unknown as EpmPackageResponse;
+    expect(getIntegrationNameFromResponse(response)).toEqual('');
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/common/lib/lang_smith.ts b/x-pack/plugins/integration_assistant/public/common/lib/lang_smith.ts
new file mode 100644
index 0000000000000..7234870439930
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/common/lib/lang_smith.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  DEFAULT_ASSISTANT_NAMESPACE,
+  TRACE_OPTIONS_SESSION_STORAGE_KEY,
+} from '@kbn/elastic-assistant/impl/assistant_context/constants';
+import { Storage } from '@kbn/kibana-utils-plugin/public';
+import type { TraceOptions } from '@kbn/elastic-assistant/impl/assistant/types';
+import type { LangSmithOptions } from '../../../common/api/model/common_attributes';
+
+const sessionStorage = new Storage(window.sessionStorage);
+
+/**
+ * Retrieves the LangSmith options from the AI Settings.
+ */
+export const getLangSmithOptions = (
+  nameSpace: string = DEFAULT_ASSISTANT_NAMESPACE
+): LangSmithOptions | undefined => {
+  // Get the LangSmith options stored by the AI Settings using the assistant context
+  // TODO: Encapsulate all AI Settings logic in a generic place.
+  const sessionStorageTraceOptions: TraceOptions = sessionStorage.get(
+    `${nameSpace}.${TRACE_OPTIONS_SESSION_STORAGE_KEY}`
+  );
+
+  if (!sessionStorageTraceOptions) {
+    return;
+  }
+  return {
+    projectName: sessionStorageTraceOptions.langSmithProject,
+    apiKey: sessionStorageTraceOptions.langSmithApiKey,
+  };
+};
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration.test.tsx
new file mode 100644
index 0000000000000..dca18a90f3a65
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration.test.tsx
@@ -0,0 +1,174 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PropsWithChildren } from 'react';
+import React from 'react';
+import { MemoryRouter } from 'react-router-dom';
+import { render } from '@testing-library/react';
+import { TestProvider } from '../../mocks/test_provider';
+import { CreateIntegration } from './create_integration';
+import { mockServices } from '../../services/mocks/services';
+import { useRoutesAuthorization } from '../../common/hooks/use_authorization';
+import { useIsAvailable } from '../../common/hooks/use_availability';
+
+jest.mock('../../common/hooks/use_authorization');
+jest.mock('../../common/hooks/use_availability');
+const mockUseRoutesAuthorization = useRoutesAuthorization as jest.Mock;
+const mockUseIsAvailable = useIsAvailable as jest.Mock;
+
+jest.mock('./create_integration_landing', () => ({
+  CreateIntegrationLanding: jest.fn(() => <div data-test-subj="landingMock" />),
+}));
+jest.mock('./create_integration_upload', () => ({
+  CreateIntegrationUpload: jest.fn(() => <div data-test-subj="uploadMock" />),
+}));
+jest.mock('./create_integration_assistant', () => ({
+  CreateIntegrationAssistant: jest.fn(() => <div data-test-subj="assistantMock" />),
+}));
+
+const getWrapper = (pathname: string): React.FC<PropsWithChildren<{}>> =>
+  function wrapper({ children }) {
+    return (
+      <TestProvider>
+        <MemoryRouter initialEntries={[{ pathname }]}>{children}</MemoryRouter>
+      </TestProvider>
+    );
+  };
+
+const getElement = () => <CreateIntegration services={mockServices} />;
+
+describe('CreateIntegration', () => {
+  describe('when url is /create', () => {
+    let wrapper: React.ComponentType;
+    beforeEach(() => {
+      wrapper = getWrapper('/create');
+    });
+
+    it('should render the landing page', () => {
+      const result = render(getElement(), { wrapper });
+      expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+    });
+
+    describe('and user is not authorized', () => {
+      beforeEach(() => {
+        mockUseRoutesAuthorization.mockReturnValueOnce({
+          canUseIntegrationAssistant: false,
+          canUseIntegrationUpload: false,
+        });
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+
+    describe('and the product is not available', () => {
+      beforeEach(() => {
+        mockUseIsAvailable.mockReturnValueOnce(false);
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when url is /create/assistant', () => {
+    let wrapper: React.ComponentType;
+
+    beforeEach(() => {
+      wrapper = getWrapper('/create/assistant');
+    });
+
+    it('should render the assistant page', () => {
+      const result = render(getElement(), { wrapper });
+      expect(result.queryByTestId('assistantMock')).toBeInTheDocument();
+    });
+
+    describe('and user is not authorized', () => {
+      beforeEach(() => {
+        mockUseRoutesAuthorization.mockReturnValueOnce({
+          canUseIntegrationAssistant: false,
+          canUseIntegrationUpload: true,
+        });
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('assistantMock')).not.toBeInTheDocument();
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+
+    describe('and the product is not available', () => {
+      beforeEach(() => {
+        mockUseIsAvailable.mockReturnValueOnce(false);
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('assistantMock')).not.toBeInTheDocument();
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when url is /create/upload', () => {
+    let wrapper: React.ComponentType;
+
+    beforeEach(() => {
+      wrapper = getWrapper('/create/upload');
+    });
+
+    it('should render the upload page', () => {
+      const result = render(getElement(), { wrapper });
+      expect(result.queryByTestId('uploadMock')).toBeInTheDocument();
+    });
+
+    describe('and user is not authorized', () => {
+      beforeEach(() => {
+        mockUseRoutesAuthorization.mockReturnValueOnce({
+          canUseIntegrationAssistant: true,
+          canUseIntegrationUpload: false,
+        });
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('uploadMock')).not.toBeInTheDocument();
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+
+    describe('and the product is not available', () => {
+      beforeEach(() => {
+        mockUseIsAvailable.mockReturnValueOnce(false);
+      });
+
+      it('should render the landing page', () => {
+        const result = render(getElement(), { wrapper });
+        expect(result.queryByTestId('uploadMock')).not.toBeInTheDocument();
+        expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when url is not exact', () => {
+    let wrapper: React.ComponentType;
+
+    beforeEach(() => {
+      wrapper = getWrapper('/create/something_else');
+    });
+
+    it('should render the landing page', () => {
+      const result = render(getElement(), { wrapper });
+      expect(result.queryByTestId('landingMock')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.test.tsx
new file mode 100644
index 0000000000000..496f34a943bed
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.test.tsx
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TestProvider } from '../../../mocks/test_provider';
+import { CreateIntegrationAssistant } from './create_integration_assistant';
+import type { State } from './state';
+
+export const defaultInitialState: State = {
+  step: 1,
+  connector: undefined,
+  integrationSettings: undefined,
+  isGenerating: false,
+  result: undefined,
+};
+const mockInitialState = jest.fn((): State => defaultInitialState);
+jest.mock('./state', () => ({
+  ...jest.requireActual('./state'),
+  get initialState() {
+    return mockInitialState();
+  },
+}));
+
+const mockConnectorStep = jest.fn(() => <div data-test-subj="connectorStepMock" />);
+const mockIntegrationStep = jest.fn(() => <div data-test-subj="integrationStepMock" />);
+const mockDataStreamStep = jest.fn(() => <div data-test-subj="dataStreamStepMock" />);
+const mockReviewStep = jest.fn(() => <div data-test-subj="reviewStepMock" />);
+const mockDeployStep = jest.fn(() => <div data-test-subj="deployStepMock" />);
+
+const mockIsConnectorStepReady = jest.fn();
+const mockIsIntegrationStepReady = jest.fn();
+const mockIsDataStreamStepReady = jest.fn();
+const mockIsReviewStepReady = jest.fn();
+
+jest.mock('./steps/connector_step', () => ({
+  ConnectorStep: () => mockConnectorStep(),
+  isConnectorStepReady: () => mockIsConnectorStepReady(),
+}));
+jest.mock('./steps/integration_step', () => ({
+  IntegrationStep: () => mockIntegrationStep(),
+  isIntegrationStepReady: () => mockIsIntegrationStepReady(),
+}));
+jest.mock('./steps/data_stream_step', () => ({
+  DataStreamStep: () => mockDataStreamStep(),
+  isDataStreamStepReady: () => mockIsDataStreamStepReady(),
+}));
+jest.mock('./steps/review_step', () => ({
+  ReviewStep: () => mockReviewStep(),
+  isReviewStepReady: () => mockIsReviewStepReady(),
+}));
+jest.mock('./steps/deploy_step', () => ({ DeployStep: () => mockDeployStep() }));
+
+const renderIntegrationAssistant = () =>
+  render(<CreateIntegrationAssistant />, { wrapper: TestProvider });
+
+describe('CreateIntegration', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when step is 1', () => {
+    beforeEach(() => {
+      mockInitialState.mockReturnValueOnce({ ...defaultInitialState, step: 1 });
+    });
+
+    it('should render connector', () => {
+      const result = renderIntegrationAssistant();
+      expect(result.queryByTestId('connectorStepMock')).toBeInTheDocument();
+    });
+
+    it('should call isConnectorStepReady', () => {
+      renderIntegrationAssistant();
+      expect(mockIsConnectorStepReady).toHaveBeenCalled();
+    });
+  });
+
+  describe('when step is 2', () => {
+    beforeEach(() => {
+      mockInitialState.mockReturnValueOnce({ ...defaultInitialState, step: 2 });
+    });
+
+    it('should render integration', () => {
+      const result = renderIntegrationAssistant();
+      expect(result.queryByTestId('integrationStepMock')).toBeInTheDocument();
+    });
+
+    it('should call isIntegrationStepReady', () => {
+      renderIntegrationAssistant();
+      expect(mockIsIntegrationStepReady).toHaveBeenCalled();
+    });
+  });
+
+  describe('when step is 3', () => {
+    beforeEach(() => {
+      mockInitialState.mockReturnValueOnce({ ...defaultInitialState, step: 3 });
+    });
+
+    it('should render data stream', () => {
+      const result = renderIntegrationAssistant();
+      expect(result.queryByTestId('dataStreamStepMock')).toBeInTheDocument();
+    });
+
+    it('should call isDataStreamStepReady', () => {
+      renderIntegrationAssistant();
+      expect(mockIsDataStreamStepReady).toHaveBeenCalled();
+    });
+  });
+
+  describe('when step is 4', () => {
+    beforeEach(() => {
+      mockInitialState.mockReturnValueOnce({ ...defaultInitialState, step: 4 });
+    });
+
+    it('should render review', () => {
+      const result = renderIntegrationAssistant();
+      expect(result.queryByTestId('reviewStepMock')).toBeInTheDocument();
+    });
+
+    it('should call isReviewStepReady', () => {
+      renderIntegrationAssistant();
+      expect(mockIsReviewStepReady).toHaveBeenCalled();
+    });
+  });
+
+  describe('when step is 5', () => {
+    beforeEach(() => {
+      mockInitialState.mockReturnValueOnce({ ...defaultInitialState, step: 5 });
+    });
+
+    it('should render deploy', () => {
+      const result = renderIntegrationAssistant();
+      expect(result.queryByTestId('deployStepMock')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.tsx
index d2aec8dd2a661..adc8a05654551 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/create_integration_assistant.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useReducer, useMemo, useCallback, useEffect } from 'react';
+import React, { useReducer, useMemo, useEffect } from 'react';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 import { Header } from './header';
 import { Footer } from './footer';
@@ -59,8 +59,6 @@ export const CreateIntegrationAssistant = React.memo(() => {
     return false;
   }, [state]);
 
-  const onGenerate = useCallback(() => actions.setIsGenerating(true), [actions]);
-
   return (
     <ActionsProvider value={actions}>
       <KibanaPageTemplate>
@@ -92,7 +90,6 @@ export const CreateIntegrationAssistant = React.memo(() => {
         </KibanaPageTemplate.Section>
         <Footer
           currentStep={state.step}
-          onGenerate={onGenerate}
           isGenerating={state.isGenerating}
           isNextStepEnabled={isNextStepEnabled}
         />
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.test.tsx
new file mode 100644
index 0000000000000..91ecb8a13defa
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.test.tsx
@@ -0,0 +1,268 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult } from '@testing-library/react';
+import { TestProvider } from '../../../../mocks/test_provider';
+import { Footer } from './footer';
+import { ActionsProvider } from '../state';
+import { mockActions } from '../mocks/state';
+import { mockReportEvent } from '../../../../services/telemetry/mocks/service';
+import { TelemetryEventType } from '../../../../services/telemetry/types';
+
+const mockNavigate = jest.fn();
+jest.mock('../../../../common/hooks/use_navigate', () => ({
+  ...jest.requireActual('../../../../common/hooks/use_navigate'),
+  useNavigate: () => mockNavigate,
+}));
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('Footer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when rendered', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<Footer currentStep={1} isGenerating={false} isNextStepEnabled />, {
+        wrapper,
+      });
+    });
+    it('should render footer buttons component', () => {
+      expect(result.queryByTestId('buttonsFooter')).toBeInTheDocument();
+    });
+
+    it('should render cancel button', () => {
+      expect(result.queryByTestId('buttonsFooter-cancelButton')).toBeInTheDocument();
+    });
+
+    it('should render back button', () => {
+      expect(result.queryByTestId('buttonsFooter-backButton')).toBeInTheDocument();
+    });
+
+    it('should render next button', () => {
+      expect(result.queryByTestId('buttonsFooter-nextButton')).toBeInTheDocument();
+    });
+  });
+
+  describe('when step is 1', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<Footer currentStep={1} isGenerating={false} isNextStepEnabled />, {
+        wrapper,
+      });
+    });
+
+    describe('when next button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-nextButton').click();
+        });
+      });
+
+      it('should set step 2', () => {
+        expect(mockActions.setStep).toHaveBeenCalledWith(2);
+      });
+
+      it('should report telemetry', () => {
+        expect(mockReportEvent).toHaveBeenCalledWith(
+          TelemetryEventType.IntegrationAssistantStepComplete,
+          {
+            sessionId: expect.any(String),
+            step: 1,
+            stepName: 'Connector Step',
+            durationMs: expect.any(Number),
+            sessionElapsedTime: expect.any(Number),
+          }
+        );
+      });
+    });
+
+    describe('when back button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-backButton').click();
+        });
+      });
+
+      it('should navigate to landing', () => {
+        expect(mockNavigate).toHaveBeenCalledWith('landing');
+      });
+    });
+  });
+
+  describe('when step is 2', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<Footer currentStep={2} isGenerating={false} isNextStepEnabled />, {
+        wrapper,
+      });
+    });
+
+    describe('when next button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-nextButton').click();
+        });
+      });
+
+      it('should set step 3', () => {
+        expect(mockActions.setStep).toHaveBeenCalledWith(3);
+      });
+
+      it('should report telemetry', () => {
+        expect(mockReportEvent).toHaveBeenCalledWith(
+          TelemetryEventType.IntegrationAssistantStepComplete,
+          {
+            sessionId: expect.any(String),
+            step: 2,
+            stepName: 'Integration Step',
+            durationMs: expect.any(Number),
+            sessionElapsedTime: expect.any(Number),
+          }
+        );
+      });
+    });
+
+    describe('when back button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-backButton').click();
+        });
+      });
+
+      it('should set step 1', () => {
+        expect(mockActions.setStep).toHaveBeenCalledWith(1);
+      });
+    });
+  });
+
+  describe('when step is 3', () => {
+    describe('when it is not generating', () => {
+      let result: RenderResult;
+      beforeEach(() => {
+        result = render(<Footer currentStep={3} isGenerating={false} isNextStepEnabled />, {
+          wrapper,
+        });
+      });
+
+      describe('when next button is clicked', () => {
+        beforeEach(() => {
+          act(() => {
+            result.getByTestId('buttonsFooter-nextButton').click();
+          });
+        });
+
+        it('should set step 4', () => {
+          expect(mockActions.setIsGenerating).toHaveBeenCalledWith(true);
+        });
+
+        it('should report telemetry', () => {
+          expect(mockReportEvent).toHaveBeenCalledWith(
+            TelemetryEventType.IntegrationAssistantStepComplete,
+            {
+              sessionId: expect.any(String),
+              step: 3,
+              stepName: 'DataStream Step',
+              durationMs: expect.any(Number),
+              sessionElapsedTime: expect.any(Number),
+            }
+          );
+        });
+      });
+
+      describe('when back button is clicked', () => {
+        beforeEach(() => {
+          act(() => {
+            result.getByTestId('buttonsFooter-backButton').click();
+          });
+        });
+
+        it('should set step 2', () => {
+          expect(mockActions.setStep).toHaveBeenCalledWith(2);
+        });
+      });
+    });
+
+    describe('when it is generating', () => {
+      let result: RenderResult;
+      beforeEach(() => {
+        result = render(<Footer currentStep={3} isGenerating={true} isNextStepEnabled />, {
+          wrapper,
+        });
+      });
+
+      it('should render the loader', () => {
+        expect(result.queryByTestId('generatingLoader')).toBeInTheDocument();
+      });
+    });
+  });
+
+  describe('when step is 4', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<Footer currentStep={4} isGenerating={false} isNextStepEnabled />, {
+        wrapper,
+      });
+    });
+
+    describe('when next button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-nextButton').click();
+        });
+      });
+
+      it('should set step 5', () => {
+        expect(mockActions.setStep).toHaveBeenCalledWith(5);
+      });
+
+      it('should report telemetry', () => {
+        expect(mockReportEvent).toHaveBeenCalledWith(
+          TelemetryEventType.IntegrationAssistantStepComplete,
+          {
+            sessionId: expect.any(String),
+            step: 4,
+            stepName: 'Review Step',
+            durationMs: expect.any(Number),
+            sessionElapsedTime: expect.any(Number),
+          }
+        );
+      });
+    });
+
+    describe('when back button is clicked', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('buttonsFooter-backButton').click();
+        });
+      });
+
+      it('should set step 3', () => {
+        expect(mockActions.setStep).toHaveBeenCalledWith(3);
+      });
+    });
+  });
+
+  describe('when next step is disabled', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<Footer currentStep={1} isGenerating={false} />, {
+        wrapper,
+      });
+    });
+    it('should render next button disabled', () => {
+      expect(result.queryByTestId('buttonsFooter-nextButton')).toBeDisabled();
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.tsx
index bcb3cf8ad21f8..eefbbb6b385c3 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/footer/footer.tsx
@@ -20,7 +20,7 @@ const AnalyzeButtonText = React.memo<{ isGenerating: boolean }>(({ isGenerating
   }
   return (
     <>
-      <EuiLoadingSpinner size="s" />
+      <EuiLoadingSpinner size="s" data-test-subj="generatingLoader" />
       {i18n.LOADING}
     </>
   );
@@ -30,14 +30,13 @@ AnalyzeButtonText.displayName = 'AnalyzeButtonText';
 interface FooterProps {
   currentStep: State['step'];
   isGenerating: State['isGenerating'];
-  onGenerate: () => void;
   isNextStepEnabled?: boolean;
 }
 
 export const Footer = React.memo<FooterProps>(
-  ({ currentStep, onGenerate, isGenerating, isNextStepEnabled = false }) => {
+  ({ currentStep, isGenerating, isNextStepEnabled = false }) => {
     const telemetry = useTelemetry();
-    const { setStep } = useActions();
+    const { setStep, setIsGenerating } = useActions();
     const navigate = useNavigate();
 
     const onBack = useCallback(() => {
@@ -51,11 +50,11 @@ export const Footer = React.memo<FooterProps>(
     const onNext = useCallback(() => {
       telemetry.reportAssistantStepComplete({ step: currentStep });
       if (currentStep === 3) {
-        onGenerate();
+        setIsGenerating(true);
       } else {
         setStep(currentStep + 1);
       }
-    }, [currentStep, onGenerate, setStep, telemetry]);
+    }, [currentStep, setIsGenerating, setStep, telemetry]);
 
     const nextButtonText = useMemo(() => {
       if (currentStep === 3) {
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/mocks/state.ts b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/mocks/state.ts
new file mode 100644
index 0000000000000..29f574776e295
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/mocks/state.ts
@@ -0,0 +1,434 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Pipeline, Docs } from '../../../../../common';
+import type { Actions, State } from '../state';
+import type { AIConnector } from '../types';
+
+const result: { pipeline: Pipeline; docs: Docs } = {
+  pipeline: {
+    description: 'Pipeline to process my_integration my_data_stream_title logs',
+    processors: [
+      {
+        set: {
+          field: 'ecs.version',
+          tag: 'set_ecs_version',
+          value: '8.11.0',
+        },
+      },
+      {
+        rename: {
+          field: 'message',
+          target_field: 'event.original',
+          tag: 'rename_message',
+          ignore_missing: true,
+          if: 'ctx.event?.original == null',
+        },
+      },
+      {
+        remove: {
+          field: 'message',
+          ignore_missing: true,
+          tag: 'remove_message',
+          if: 'ctx.event?.original != null',
+        },
+      },
+      {
+        json: {
+          field: 'event.original',
+          tag: 'json_original',
+          target_field: 'my_integration.my_data_stream_title',
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.event',
+          target_field: 'event.action',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.uid',
+          target_field: 'event.id',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.code',
+          target_field: 'event.code',
+          ignore_missing: true,
+        },
+      },
+      {
+        date: {
+          field: 'my_integration.my_data_stream_title.time',
+          target_field: '@timestamp',
+          formats: ['ISO8601'],
+          if: 'ctx.my_integration?.my_data_stream_title?.time != null',
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.user',
+          target_field: 'user.name',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.user_agent',
+          target_field: 'user_agent.original',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.addr.remote',
+          target_field: 'source.address',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.server_hostname',
+          target_field: 'destination.domain',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'my_integration.my_data_stream_title.proto',
+          target_field: 'network.transport',
+          ignore_missing: true,
+        },
+      },
+      {
+        script: {
+          description: 'Drops null/empty values recursively.',
+          tag: 'script_drop_null_empty_values',
+          lang: 'painless',
+          source:
+            'boolean dropEmptyFields(Object object) {\n  if (object == null || object == "") {\n    return true;\n  } else if (object instanceof Map) {\n    ((Map) object).values().removeIf(value -> dropEmptyFields(value));\n    return (((Map) object).size() == 0);\n  } else if (object instanceof List) {\n    ((List) object).removeIf(value -> dropEmptyFields(value));\n    return (((List) object).length == 0);\n  }\n  return false;\n}\ndropEmptyFields(ctx);\n',
+        },
+      },
+      {
+        geoip: {
+          field: 'source.ip',
+          tag: 'geoip_source_ip',
+          target_field: 'source.geo',
+          ignore_missing: true,
+        },
+      },
+      {
+        geoip: {
+          ignore_missing: true,
+          database_file: 'GeoLite2-ASN.mmdb',
+          field: 'source.ip',
+          tag: 'geoip_source_asn',
+          target_field: 'source.as',
+          properties: ['asn', 'organization_name'],
+        },
+      },
+      {
+        rename: {
+          field: 'source.as.asn',
+          tag: 'rename_source_as_asn',
+          target_field: 'source.as.number',
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'source.as.organization_name',
+          tag: 'rename_source_as_organization_name',
+          target_field: 'source.as.organization.name',
+          ignore_missing: true,
+        },
+      },
+      {
+        geoip: {
+          field: 'destination.ip',
+          tag: 'geoip_destination_ip',
+          target_field: 'destination.geo',
+          ignore_missing: true,
+        },
+      },
+      {
+        geoip: {
+          database_file: 'GeoLite2-ASN.mmdb',
+          field: 'destination.ip',
+          tag: 'geoip_destination_asn',
+          target_field: 'destination.as',
+          properties: ['asn', 'organization_name'],
+          ignore_missing: true,
+        },
+      },
+      {
+        rename: {
+          field: 'destination.as.asn',
+          tag: 'rename_destination_as_asn',
+          target_field: 'destination.as.number',
+          ignore_missing: true,
+        },
+      },
+      {
+        append: {
+          field: 'event.type',
+          value: ['start'],
+          allow_duplicates: false,
+          if: "ctx.event?.action == 'user.login'",
+        },
+      },
+      {
+        append: {
+          field: 'event.category',
+          value: ['authentication'],
+          allow_duplicates: false,
+          if: "ctx.event?.action == 'user.login'",
+        },
+      },
+      {
+        append: {
+          field: 'event.type',
+          value: ['start'],
+          allow_duplicates: false,
+          if: "ctx.event?.action == 'session.start'",
+        },
+      },
+      {
+        append: {
+          field: 'event.category',
+          value: ['session'],
+          allow_duplicates: false,
+          if: "ctx.event?.action == 'session.start'",
+        },
+      },
+      {
+        append: {
+          field: 'event.type',
+          value: ['info'],
+          allow_duplicates: false,
+          if: 'ctx.my_integration?.my_data_stream_title?.mfa_device != null',
+        },
+      },
+      {
+        append: {
+          field: 'event.category',
+          value: ['authentication'],
+          allow_duplicates: false,
+          if: 'ctx.my_integration?.my_data_stream_title?.mfa_device != null',
+        },
+      },
+      {
+        append: {
+          field: 'related.ip',
+          value: ['{{{my_integration.my_data_stream_title.addr.remote}}}'],
+          if: 'ctx?.my_integration?.my_data_stream_title?.addr?.remote != null',
+          allow_duplicates: false,
+        },
+      },
+      {
+        append: {
+          field: 'related.user',
+          value: ['{{{user.name}}}'],
+          allow_duplicates: false,
+        },
+      },
+      {
+        append: {
+          field: 'related.hosts',
+          value: ['{{{destination.domain}}}'],
+          if: 'ctx?.destination?.domain != null',
+          allow_duplicates: false,
+        },
+      },
+      {
+        append: {
+          field: 'related.hosts',
+          value: ['{{{my_integration.my_data_stream_title.server_labels.hostname}}}'],
+          if: 'ctx?.my_integration?.my_data_stream_title?.server_labels?.hostname != null',
+          allow_duplicates: false,
+        },
+      },
+      {
+        rename: {
+          field: 'destination.as.organization_name',
+          tag: 'rename_destination_as_organization_name',
+          target_field: 'destination.as.organization.name',
+          ignore_missing: true,
+        },
+      },
+      {
+        remove: {
+          field: 'event.original',
+          tag: 'remove_original_event',
+          if: 'ctx?.tags == null || !(ctx.tags.contains("preserve_original_event"))',
+          ignore_failure: true,
+          ignore_missing: true,
+        },
+      },
+    ],
+    on_failure: [
+      {
+        append: {
+          field: 'error.message',
+          value:
+            'Processor {{{_ingest.on_failure_processor_type}}} with tag {{{_ingest.on_failure_processor_tag}}} in pipeline {{{_ingest.on_failure_pipeline}}} failed with message: {{{_ingest.on_failure_message}}}',
+        },
+      },
+      {
+        set: {
+          field: 'event.kind',
+          value: 'pipeline_error',
+        },
+      },
+    ],
+  },
+  docs: [
+    {
+      '@timestamp': '2024-02-23T18:56:50.628Z',
+      ecs: {
+        version: '8.11.0',
+      },
+      my_integration: {
+        my_data_stream_title: {
+          cluster_name: 'teleport.ericbeahan.com',
+          'addr.remote': '136.61.214.196:50332',
+          ei: 0,
+          method: 'local',
+          required_private_key_policy: 'none',
+          success: true,
+          time: '2024-02-23T18:56:50.628Z',
+          mfa_device: {
+            mfa_device_type: 'TOTP',
+            mfa_device_uuid: 'd07bf388-af49-4ec2-b8a4-c8a9e785b70b',
+            mfa_device_name: 'otp-device',
+          },
+        },
+      },
+      related: {
+        user: ['teleport-admin'],
+      },
+      event: {
+        action: 'user.login',
+        code: 'T1000I',
+        id: 'b675d102-fc25-4f7a-bf5d-96468cc176ea',
+        type: ['start', 'info'],
+        category: ['authentication'],
+      },
+      user: {
+        name: 'teleport-admin',
+      },
+      user_agent: {
+        original:
+          'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36',
+      },
+      tags: [
+        '_geoip_database_unavailable_GeoLite2-City.mmdb',
+        '_geoip_database_unavailable_GeoLite2-ASN.mmdb',
+        '_geoip_database_unavailable_GeoLite2-City.mmdb',
+        '_geoip_database_unavailable_GeoLite2-ASN.mmdb',
+      ],
+    },
+    {
+      '@timestamp': '2024-02-23T18:56:57.199Z',
+      ecs: {
+        version: '8.11.0',
+      },
+      my_integration: {
+        my_data_stream_title: {
+          cluster_name: 'teleport.ericbeahan.com',
+          'addr.remote': '136.61.214.196:50339',
+          ei: 0,
+          private_key_policy: 'none',
+          login: 'ec2-user',
+          server_id: 'face0091-2bf1-43fd-a16a-f1514b4119f4',
+          sid: '293fda2d-2266-4d4d-b9d1-bd5ea9dd9fc3',
+          user_kind: 1,
+          server_labels: {
+            'teleport.internal/resource-id': 'dccb2999-9fb8-4169-aded-ec7a1c0a26de',
+            hostname: 'ip-172-31-8-163.us-east-2.compute.internal',
+          },
+          size: '80:25',
+          namespace: 'default',
+          session_recording: 'node',
+          time: '2024-02-23T18:56:57.199Z',
+        },
+      },
+      related: {
+        user: ['teleport-admin'],
+        hosts: ['ip-172-31-8-163.us-east-2.compute.internal'],
+      },
+      destination: {
+        domain: 'ip-172-31-8-163.us-east-2.compute.internal',
+      },
+      event: {
+        action: 'session.start',
+        code: 'T2000I',
+        id: 'fff30583-13be-49e8-b159-32952c6ea34f',
+        type: ['start'],
+        category: ['session'],
+      },
+      user: {
+        name: 'teleport-admin',
+      },
+      network: {
+        transport: 'ssh',
+      },
+      tags: [
+        '_geoip_database_unavailable_GeoLite2-City.mmdb',
+        '_geoip_database_unavailable_GeoLite2-ASN.mmdb',
+        '_geoip_database_unavailable_GeoLite2-City.mmdb',
+        '_geoip_database_unavailable_GeoLite2-ASN.mmdb',
+      ],
+    },
+  ],
+};
+
+const rawSamples = [
+  '{"ei":0,"event":"user.login","uid":"b675d102-fc25-4f7a-bf5d-96468cc176ea","code":"T1000I","time":"2024-02-23T18:56:50.628Z","cluster_name":"teleport.ericbeahan.com","user":"teleport-admin","required_private_key_policy":"none","success":true,"method":"local","mfa_device.mfa_device_name":"otp-device","mfa_device.mfa_device_uuid":"d07bf388-af49-4ec2-b8a4-c8a9e785b70b","mfa_device.mfa_device_type":"TOTP","user_agent":"Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/121.0.0.0 Safari/537.36","addr.remote":"136.61.214.196:50332"}',
+  '{"ei":0,"event":"cert.create","uid":"efd326fc-dd13-4df8-acef-3102c2d717d3","code":"TC000I","time":"2024-02-23T18:56:50.653Z","cluster_name":"teleport.ericbeahan.com","cert_type":"user","identity.user":"teleport-admin","identity.roles":["access","editor"],"identity.logins":["root","ubuntu","ec2-user","-teleport-internal-join"],"identity.expires":"2024-02-24T06:56:50.648137154Z","identity.route_to_cluster":"teleport.ericbeahan.com","identity.traits.aws_role_arns":null,"identity.traits.azure_identities":null,"identity.traits.db_names":null,"identity.traits.db_roles":null,"identity.traits.db_users":null,"identity.traits.gcp_service_accounts":null,"identity.traits.host_user_gid":[""],"identity.traits.host_user_uid":[""],"identity.traits.kubernetes_groups":null,"identity.traits.kubernetes_users":null,"identity.traits.logins":["root","ubuntu","ec2-user"],"identity.traits.windows_logins":null,"identity.teleport_cluster":"teleport.ericbeahan.com","identity.client_ip":"136.61.214.196","identity.prev_identity_expires":"0001-01-01T00:00:00Z","identity.private_key_policy":"none"}',
+  '{"ei":0,"event":"session.start","uid":"fff30583-13be-49e8-b159-32952c6ea34f","code":"T2000I","time":"2024-02-23T18:56:57.199Z","cluster_name":"teleport.ericbeahan.com","user":"teleport-admin","login":"ec2-user","user_kind":1,"sid":"293fda2d-2266-4d4d-b9d1-bd5ea9dd9fc3","private_key_policy":"none","namespace":"default","server_id":"face0091-2bf1-43fd-a16a-f1514b4119f4","server_hostname":"ip-172-31-8-163.us-east-2.compute.internal","server_labels.hostname":"ip-172-31-8-163.us-east-2.compute.internal","server_labels.teleport.internal/resource-id":"dccb2999-9fb8-4169-aded-ec7a1c0a26de","addr.remote":"136.61.214.196:50339","proto":"ssh","size":"80:25","initial_command":[""],"session_recording":"node"}',
+];
+const logo =
+  'PHN2ZyB3aWR0aD0iMjQiIGhlaWdodD0iMjQiIHZpZXdCb3g9IjAgMCAyNCAyNCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPGcgY2xpcC1wYXRoPSJ1cmwoI2NsaXAwXzMyNjlfMjExOTMpIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMC41IDExLjk5OTdMNC40MDQgMS42ODQyMUMzLjM4Nzc1IC0wLjAzNzA0MDIgMC43NSAwLjY4NDQ2IDAuNzUgMi42ODMyMVYyMS4zMTYyQzAuNzUgMjMuMzE1IDMuMzg3NzUgMjQuMDM2NSA0LjQwNCAyMi4zMTUyTDEwLjUgMTEuOTk5N1oiIGZpbGw9IiNGMDRFOTgiLz4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xMy4xMTMzIDEyTDEyLjQzNzYgMTMuMTQ0NUw2LjM0MTU2IDIzLjQ2QzYuMjI2ODEgMjMuNjUzNSA2LjA5NzA2IDIzLjgzMDUgNS45NTgzMSAyNEgxMi44NDAzQzE0LjY1MDggMjQgMTYuMzMzMSAyMy4wNjc3IDE3LjI5MjMgMjEuNTMyNUwyMy4yNTAzIDEySDEzLjExMzNaIiBmaWxsPSIjRkE3NDRFIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNMTcuMjkyNCAyLjQ2NzVDMTYuMzMzMiAwLjkzMjI1IDE0LjY1MDkgMCAxMi44Mzk3IDBINS45NTg0NEM2LjA5NjQ0IDAuMTY5NSA2LjIyNjk0IDAuMzQ2NSA2LjM0MDk0IDAuNTRMMTIuNDM2OSAxMC44NTU1TDEzLjExMzQgMTJIMjMuMjQ5N0wxNy4yOTI0IDIuNDY3NVoiIGZpbGw9IiMzNDM3NDEiLz4KPC9nPgo8ZGVmcz4KPGNsaXBQYXRoIGlkPSJjbGlwMF8zMjY5XzIxMTkzIj4KPHJlY3Qgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSIvPgo8L2NsaXBQYXRoPgo8L2RlZnM+Cjwvc3ZnPgo=';
+
+export const mockState: State = {
+  step: 4,
+  connector: {
+    id: 'claudeV3OpusUsWest2',
+    name: 'Claude 3 Opus US-WEST-2',
+    actionTypeId: '.bedrock',
+    config: {
+      apiUrl: 'https://bedrock-runtime.us-west-2.amazonaws.com',
+      defaultModel: 'anthropic.claude-3-opus-20240229-v1:0',
+    },
+  } as AIConnector,
+  integrationSettings: {
+    title: 'Mocked Integration title',
+    name: 'mocked_integration',
+    logo,
+    description: 'Mocked Integration description',
+    dataStreamTitle: 'Mocked Data Stream Title',
+    dataStreamName: 'mocked_datastream_name',
+    dataStreamDescription: 'Mocked Data Stream Description',
+    inputType: 'filestream',
+    logsSampleParsed: rawSamples,
+  },
+  isGenerating: false,
+  result,
+};
+
+export const mockActions: Actions = {
+  setStep: jest.fn(),
+  setConnector: jest.fn(),
+  setIntegrationSettings: jest.fn(),
+  setIsGenerating: jest.fn(),
+  setResult: jest.fn(),
+};
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_selector.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_selector.tsx
index 6684ed95dde2f..4ea33cc8668e3 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_selector.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_selector.tsx
@@ -45,7 +45,12 @@ export const ConnectorSelector = React.memo<ConnectorSelectorProps>(
     const { setConnector } = useActions();
     const rowCss = useRowCss();
     return (
-      <>
+      <EuiFlexGroup
+        alignItems="stretch"
+        direction="column"
+        gutterSize="s"
+        data-test-subj="connectorSelector"
+      >
         {connectors.map((connector) => (
           <EuiFlexItem key={connector.id}>
             <EuiPanel
@@ -55,6 +60,7 @@ export const ConnectorSelector = React.memo<ConnectorSelectorProps>(
               hasBorder
               paddingSize="l"
               css={rowCss}
+              data-test-subj={`connectorSelector-${connector.id}`}
             >
               <EuiFlexGroup direction="row" alignItems="center" justifyContent="spaceBetween">
                 <EuiFlexItem>
@@ -63,6 +69,9 @@ export const ConnectorSelector = React.memo<ConnectorSelectorProps>(
                     id={connector.id}
                     checked={selectedConnectorId === connector.id}
                     onChange={noop}
+                    data-test-subj={`connectorSelectorRadio-${connector.id}${
+                      selectedConnectorId === connector.id ? '-selected' : ''
+                    }`}
                   />
                 </EuiFlexItem>
                 <EuiFlexItem grow={false}>
@@ -74,7 +83,7 @@ export const ConnectorSelector = React.memo<ConnectorSelectorProps>(
             </EuiPanel>
           </EuiFlexItem>
         ))}
-      </>
+      </EuiFlexGroup>
     );
   }
 );
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_setup.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_setup.tsx
index ffcff21bd673f..8715f42eb8f58 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_setup.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_setup.tsx
@@ -50,7 +50,6 @@ export const ConnectorSetup = React.memo<ConnectorSetupProps>(
       notifications: { toasts },
     } = useKibana().services;
     const [selectedActionType, setSelectedActionType] = useState<ActionType | null>(null);
-
     const onModalClose = useCallback(() => {
       setSelectedActionType(null);
       onClose?.();
@@ -74,6 +73,7 @@ export const ConnectorSetup = React.memo<ConnectorSetupProps>(
         {compressed ? (
           <EuiListGroup
             flush
+            data-test-subj="connectorSetupCompressed"
             listItems={actionTypes.map((actionType) => ({
               id: actionType.id,
               label: actionType.name,
@@ -90,10 +90,13 @@ export const ConnectorSetup = React.memo<ConnectorSetupProps>(
             }))}
           />
         ) : (
-          <EuiFlexGroup direction="column" gutterSize="s">
+          <EuiFlexGroup direction="column" gutterSize="s" data-test-subj="connectorSetupPage">
             {actionTypes?.map((actionType: ActionType) => (
-              <EuiFlexItem data-test-subj="action-option" key={actionType.id}>
-                <EuiLink onClick={() => setSelectedActionType(actionType)}>
+              <EuiFlexItem key={actionType.id}>
+                <EuiLink
+                  onClick={() => setSelectedActionType(actionType)}
+                  data-test-subj={`actionType-${actionType.id}`}
+                >
                   <EuiPanel hasShadow={false} hasBorder paddingSize="l" css={panelCss}>
                     <EuiFlexGroup direction="row" alignItems="center" gutterSize="s">
                       <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.test.tsx
new file mode 100644
index 0000000000000..121f8da98143a
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.test.tsx
@@ -0,0 +1,187 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult } from '@testing-library/react';
+import type { ActionTypeModel } from '@kbn/triggers-actions-ui-plugin/public';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { ConnectorStep } from './connector_step';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+import { useAuthorization } from '../../../../../common/hooks/use_authorization';
+import { mockServices } from '../../../../../services/mocks/services';
+import type { AIConnector } from '../../types';
+
+jest.mock('../../../../../common/hooks/use_authorization');
+const mockUseAuthorization = useAuthorization as jest.Mock;
+
+const connector = mockState.connector!;
+const defaultUseMockConnectors: { data: AIConnector[]; isLoading: boolean; refetch: Function } = {
+  data: [],
+  isLoading: false,
+  refetch: jest.fn(),
+};
+const mockUseLoadConnectors = jest.fn(() => defaultUseMockConnectors);
+jest.mock('@kbn/elastic-assistant', () => ({
+  useLoadConnectors: () => mockUseLoadConnectors(),
+}));
+
+const actionType = { id: '.bedrock', name: 'Bedrock', iconClass: 'logoBedrock' };
+mockServices.triggersActionsUi.actionTypeRegistry.register(
+  actionType as unknown as ActionTypeModel
+);
+jest.mock('@kbn/elastic-assistant/impl/connectorland/use_load_action_types', () => ({
+  useLoadActionTypes: jest.fn(() => ({ data: [actionType] })),
+}));
+jest.mock('@kbn/triggers-actions-ui-plugin/public/common/constants', () => ({
+  ConnectorAddModal: () => <div data-test-subj="connectorAddModal" />,
+}));
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('ConnectorStep', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when no connector selected', () => {
+    describe('when no connector exists', () => {
+      let result: RenderResult;
+      beforeEach(() => {
+        mockUseLoadConnectors.mockReturnValue({ ...defaultUseMockConnectors, data: [] });
+        result = render(<ConnectorStep connector={undefined} />, { wrapper });
+      });
+
+      it('should render connector setup page', () => {
+        expect(result.queryByTestId('connectorSetupPage')).toBeInTheDocument();
+        expect(result.queryByTestId('connectorSetupCompressed')).not.toBeInTheDocument();
+      });
+
+      it('should not render connector selector page', () => {
+        expect(result.queryByTestId('connectorSelector')).not.toBeInTheDocument();
+      });
+
+      it('should not render connector setup popover', () => {
+        expect(result.queryByTestId('createConnectorPopover')).not.toBeInTheDocument();
+      });
+
+      describe('when connector type selected clicked', () => {
+        beforeEach(() => {
+          act(() => {
+            result.getByTestId(`actionType-${actionType.id}`).click();
+          });
+        });
+        it('should render connector creation modal', () => {
+          expect(result.queryByTestId('connectorAddModal')).toBeInTheDocument();
+        });
+      });
+    });
+
+    describe('when connectors exist', () => {
+      let result: RenderResult;
+      beforeEach(() => {
+        mockUseLoadConnectors.mockReturnValue({ ...defaultUseMockConnectors, data: [connector] });
+        result = render(<ConnectorStep connector={undefined} />, { wrapper });
+      });
+
+      it('should render connector selector page', () => {
+        expect(result.queryByTestId('connectorSelector')).toBeInTheDocument();
+      });
+
+      it('should not render connector setup page', () => {
+        expect(result.queryByTestId('connectorSetup')).not.toBeInTheDocument();
+      });
+
+      it('should render connector setup popover', () => {
+        expect(result.queryByTestId('createConnectorPopover')).toBeInTheDocument();
+      });
+
+      describe('when connector clicked', () => {
+        beforeEach(() => {
+          act(() => {
+            result.getByTestId(`connectorSelector-${connector.id}`).click();
+          });
+        });
+        it('should dispatch setConnector', () => {
+          expect(mockActions.setConnector).toHaveBeenCalledWith(connector);
+        });
+      });
+
+      describe('when add connector popover is clicked', () => {
+        beforeEach(() => {
+          act(() => {
+            result.getByTestId('createConnectorPopoverButton').click();
+          });
+        });
+
+        it('should render connector setup compressed', () => {
+          expect(result.queryByTestId('connectorSetupCompressed')).toBeInTheDocument();
+          expect(result.queryByTestId('connectorSetupPage')).not.toBeInTheDocument();
+        });
+      });
+    });
+  });
+
+  describe('when connector selected', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      mockUseLoadConnectors.mockReturnValue({ ...defaultUseMockConnectors, data: [connector] });
+      result = render(<ConnectorStep connector={connector} />, { wrapper });
+    });
+
+    it('should render connector selector page', () => {
+      expect(result.queryByTestId('connectorSelector')).toBeInTheDocument();
+    });
+
+    it('should render connector selected', () => {
+      expect(
+        result.queryByTestId(`connectorSelectorRadio-${connector.id}-selected`)
+      ).toBeInTheDocument();
+    });
+  });
+
+  describe('when create connector privileges missing', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      mockUseAuthorization.mockReturnValue({ canCreateConnectors: false });
+    });
+
+    describe('when no connector exists', () => {
+      beforeEach(() => {
+        mockUseLoadConnectors.mockReturnValue({ ...defaultUseMockConnectors, data: [] });
+        result = render(<ConnectorStep connector={undefined} />, { wrapper });
+      });
+
+      it('should not render connector setup page', () => {
+        expect(result.queryByTestId('connectorSetup')).not.toBeInTheDocument();
+      });
+
+      it('should render the missing privilege callout', () => {
+        expect(result.queryByTestId('missingPrivilegesCallOut')).toBeInTheDocument();
+      });
+    });
+
+    describe('when connectors exist', () => {
+      beforeEach(() => {
+        mockUseLoadConnectors.mockReturnValue({ ...defaultUseMockConnectors, data: [connector] });
+        result = render(<ConnectorStep connector={undefined} />, { wrapper });
+      });
+
+      it('should render connector selector page', () => {
+        expect(result.queryByTestId('connectorSelector')).toBeInTheDocument();
+      });
+
+      it('should render the disabled create connector link', () => {
+        expect(result.queryByTestId('createConnectorPopoverButtonDisabled')).toBeInTheDocument();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.tsx
index 8b2ec53406a06..58090aec1b6cc 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/connector_step/connector_step.tsx
@@ -70,9 +70,7 @@ export const ConnectorStep = React.memo<ConnectorStepProps>(({ connector }) => {
           ) : (
             <>
               {hasConnectors ? (
-                <EuiFlexGroup alignItems="stretch" direction="column" gutterSize="s">
-                  <ConnectorSelector connectors={connectors} selectedConnectorId={connector?.id} />
-                </EuiFlexGroup>
+                <ConnectorSelector connectors={connectors} selectedConnectorId={connector?.id} />
               ) : (
                 <AuthorizationWrapper canCreateConnectors>
                   <ConnectorSetup
@@ -107,15 +105,22 @@ const CreateConnectorPopover = React.memo<CreateConnectorPopoverProps>(({ onConn
   if (!canCreateConnectors) {
     return (
       <MissingPrivilegesTooltip canCreateConnectors>
-        <EuiLink disabled>{i18n.CREATE_CONNECTOR}</EuiLink>
+        <EuiLink data-test-subj="createConnectorPopoverButtonDisabled" disabled>
+          {i18n.CREATE_CONNECTOR}
+        </EuiLink>
       </MissingPrivilegesTooltip>
     );
   }
   return (
     <EuiPopover
-      button={<EuiLink onClick={openPopover}>{i18n.CREATE_CONNECTOR}</EuiLink>}
+      button={
+        <EuiLink data-test-subj="createConnectorPopoverButton" onClick={openPopover}>
+          {i18n.CREATE_CONNECTOR}
+        </EuiLink>
+      }
       isOpen={isOpen}
       closePopover={closePopover}
+      data-test-subj="createConnectorPopover"
     >
       <EuiFlexGroup alignItems="flexStart">
         <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.test.tsx
new file mode 100644
index 0000000000000..b71fa6c5cabf1
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.test.tsx
@@ -0,0 +1,230 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult, fireEvent } from '@testing-library/react';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { DataStreamStep } from './data_stream_step';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+
+jest.mock('./generation_modal', () => ({
+  GenerationModal: jest.fn(() => <div data-test-subj="generationModal" />),
+}));
+
+const duplicatePackageName = 'valid_but_duplicate_package_name';
+jest.mock('./use_load_package_names', () => {
+  return {
+    useLoadPackageNames: jest.fn(() => ({
+      isLoading: false,
+      packageNames: new Set([duplicatePackageName]),
+    })),
+  };
+});
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('DataStreamStep', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when open with initial state', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      jest.clearAllMocks();
+      result = render(
+        <DataStreamStep
+          integrationSettings={undefined}
+          connector={mockState.connector}
+          isGenerating={false}
+        />,
+        { wrapper }
+      );
+    });
+
+    it('should render data stream step page', () => {
+      expect(result.queryByTestId('dataStreamStep')).toBeInTheDocument();
+    });
+
+    describe('when package name changes', () => {
+      let input: HTMLElement;
+      beforeEach(() => {
+        input = result.getByTestId('nameInput');
+      });
+
+      describe('with a valid name', () => {
+        const name = 'valid_package_name_1';
+        beforeEach(() => {
+          act(() => {
+            fireEvent.change(input, { target: { value: name } });
+          });
+        });
+
+        it('should not render invalid input', () => {
+          expect(input).not.toHaveAttribute('aria-invalid');
+        });
+
+        it('should call setIntegrationSettings', () => {
+          expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ name });
+        });
+      });
+
+      describe('with an invalid name', () => {
+        describe.each(['package name', 'package-name', 'packageName', 'package.name'])(
+          'should render error for %s',
+          (name) => {
+            beforeEach(() => {
+              act(() => {
+                fireEvent.change(input, { target: { value: name } });
+              });
+            });
+            it('should render invalid input', () => {
+              expect(input).toHaveAttribute('aria-invalid');
+            });
+            it('should call setIntegrationSettings with undefined', () => {
+              expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({
+                name: undefined,
+              });
+            });
+          }
+        );
+      });
+
+      describe('with a duplicate name', () => {
+        beforeEach(() => {
+          act(() => {
+            fireEvent.change(input, { target: { value: duplicatePackageName } });
+          });
+        });
+
+        it('should render invalid input', () => {
+          expect(input).toHaveAttribute('aria-invalid');
+        });
+        it('should call setIntegrationSettings with undefined', () => {
+          expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ name: undefined });
+        });
+      });
+    });
+
+    describe('when dataStreamTitle changes', () => {
+      const dataStreamTitle = 'Data stream title';
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('dataStreamTitleInput'), {
+            target: { value: dataStreamTitle },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', () => {
+        expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ dataStreamTitle });
+      });
+    });
+
+    describe('when dataStreamDescription changes', () => {
+      const dataStreamDescription = 'Data stream description';
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('dataStreamDescriptionInput'), {
+            target: { value: dataStreamDescription },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', () => {
+        expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({
+          dataStreamDescription,
+        });
+      });
+    });
+
+    describe('when dataStreamName changes', () => {
+      let input: HTMLElement;
+      beforeEach(() => {
+        input = result.getByTestId('dataStreamNameInput');
+      });
+
+      describe('with a valid name', () => {
+        const dataStreamName = 'valid_data_stream_name_1';
+        beforeEach(() => {
+          act(() => {
+            fireEvent.change(input, { target: { value: dataStreamName } });
+          });
+        });
+
+        it('should not render invalid input', () => {
+          expect(input).not.toHaveAttribute('aria-invalid');
+        });
+
+        it('should call setIntegrationSettings', () => {
+          expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ dataStreamName });
+        });
+      });
+
+      describe('with an invalid name', () => {
+        describe.each([
+          'data stream name',
+          'data-stream-name',
+          'dataStreamName',
+          'data.stream.name',
+        ])('should render error for %s', (dataStreamName) => {
+          beforeEach(() => {
+            act(() => {
+              fireEvent.change(input, { target: { value: dataStreamName } });
+            });
+          });
+          it('should render invalid input', () => {
+            expect(input).toHaveAttribute('aria-invalid');
+          });
+          it('should call setIntegrationSettings with undefined', () => {
+            expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ name: undefined });
+          });
+        });
+      });
+    });
+
+    describe('when dataCollectionMethod changes', () => {
+      const dataCollectionMethod = 'kafka';
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('dataCollectionMethodInput'), {
+            target: { value: dataCollectionMethod },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', () => {
+        expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({
+          inputType: dataCollectionMethod,
+        });
+      });
+    });
+  });
+
+  describe('when is generating', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(
+        <DataStreamStep
+          integrationSettings={mockState.integrationSettings}
+          connector={mockState.connector}
+          isGenerating={true}
+        />,
+        { wrapper }
+      );
+    });
+
+    it('should render generation modal', () => {
+      expect(result.queryByTestId('generationModal')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
index 24b290a158f04..fbaf315374e92 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/data_stream_step.tsx
@@ -136,7 +136,7 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
     }, [packageNames, name]);
 
     return (
-      <EuiFlexGroup direction="column" gutterSize="l">
+      <EuiFlexGroup direction="column" gutterSize="l" data-test-subj="dataStreamStep">
         <EuiFlexItem>
           <StepContentWrapper
             title={i18n.INTEGRATION_NAME_TITLE}
@@ -154,6 +154,7 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
                 >
                   <EuiFieldText
                     name="name"
+                    data-test-subj="nameInput"
                     value={name}
                     onChange={onChange.name}
                     isInvalid={invalidFields.name}
@@ -176,6 +177,7 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
                 <EuiFormRow label={i18n.DATA_STREAM_TITLE_LABEL}>
                   <EuiFieldText
                     name="dataStreamTitle"
+                    data-test-subj="dataStreamTitleInput"
                     value={integrationSettings?.dataStreamTitle ?? ''}
                     onChange={onChange.dataStreamTitle}
                   />
@@ -183,6 +185,7 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
                 <EuiFormRow label={i18n.DATA_STREAM_DESCRIPTION_LABEL}>
                   <EuiFieldText
                     name="dataStreamDescription"
+                    data-test-subj="dataStreamDescriptionInput"
                     value={integrationSettings?.dataStreamDescription ?? ''}
                     onChange={onChange.dataStreamDescription}
                   />
@@ -195,6 +198,7 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
                 >
                   <EuiFieldText
                     name="dataStreamName"
+                    data-test-subj="dataStreamNameInput"
                     value={dataStreamName}
                     onChange={onChange.dataStreamName}
                     isInvalid={invalidFields.dataStreamName}
@@ -203,15 +207,13 @@ export const DataStreamStep = React.memo<DataStreamStepProps>(
                 <EuiFormRow label={i18n.DATA_COLLECTION_METHOD_LABEL}>
                   <EuiSelect
                     name="dataCollectionMethod"
+                    data-test-subj="dataCollectionMethodInput"
                     options={InputTypeOptions}
                     value={integrationSettings?.inputType ?? ''}
                     onChange={onChange.inputType}
                   />
                 </EuiFormRow>
-                <SampleLogsInput
-                  integrationSettings={integrationSettings}
-                  setIntegrationSettings={setIntegrationSettings}
-                />
+                <SampleLogsInput integrationSettings={integrationSettings} />
               </EuiForm>
             </EuiPanel>
           </StepContentWrapper>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.test.tsx
new file mode 100644
index 0000000000000..1c1cf3c881cdf
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.test.tsx
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult, waitFor } from '@testing-library/react';
+import { mockReportEvent } from '../../../../../services/telemetry/mocks/service';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { GenerationModal } from './generation_modal';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+import { TelemetryEventType } from '../../../../../services/telemetry/types';
+
+const integrationSettings = mockState.integrationSettings!;
+const connector = mockState.connector!;
+
+const mockEcsMappingResults = { pipeline: { test: 'ecsMappingResponse' }, docs: [] };
+const mockCategorizationResults = { pipeline: { test: 'categorizationResponse' }, docs: [] };
+const mockRelatedResults = { pipeline: { test: 'relatedResponse' }, docs: [] };
+const mockRunEcsGraph = jest.fn((_: unknown) => ({ results: mockEcsMappingResults }));
+const mockRunCategorizationGraph = jest.fn((_: unknown) => ({
+  results: mockCategorizationResults,
+}));
+const mockRunRelatedGraph = jest.fn((_: unknown) => ({ results: mockRelatedResults }));
+
+const defaultRequest = {
+  packageName: integrationSettings.name ?? '',
+  dataStreamName: integrationSettings.dataStreamName ?? '',
+  rawSamples: integrationSettings.logsSampleParsed ?? [],
+  connectorId: connector.id,
+};
+
+jest.mock('../../../../../common/lib/api', () => ({
+  runEcsGraph: (params: unknown) => mockRunEcsGraph(params),
+  runCategorizationGraph: (params: unknown) => mockRunCategorizationGraph(params),
+  runRelatedGraph: (params: unknown) => mockRunRelatedGraph(params),
+}));
+
+const mockOnComplete = jest.fn();
+const mockOnClose = jest.fn();
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('GenerationModal', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when there are no errors', () => {
+    let result: RenderResult;
+    beforeEach(async () => {
+      await act(async () => {
+        result = render(
+          <GenerationModal
+            integrationSettings={integrationSettings}
+            connector={connector}
+            onComplete={mockOnComplete}
+            onClose={mockOnClose}
+          />,
+          { wrapper }
+        );
+        await waitFor(() => expect(mockOnComplete).toBeCalled());
+      });
+    });
+
+    it('should render generation modal', () => {
+      expect(result.queryByTestId('generationModal')).toBeInTheDocument();
+    });
+
+    it('should call runEcsGraph with correct parameters', () => {
+      expect(mockRunEcsGraph).toHaveBeenCalledWith(defaultRequest);
+    });
+
+    it('should call runCategorizationGraph with correct parameters', () => {
+      expect(mockRunCategorizationGraph).toHaveBeenCalledWith({
+        ...defaultRequest,
+        currentPipeline: mockEcsMappingResults.pipeline,
+      });
+    });
+
+    it('should call runRelatedGraph with correct parameters', () => {
+      expect(mockRunRelatedGraph).toHaveBeenCalledWith({
+        ...defaultRequest,
+        currentPipeline: mockCategorizationResults.pipeline,
+      });
+    });
+
+    it('should call onComplete with the results', () => {
+      expect(mockOnComplete).toHaveBeenCalledWith(mockRelatedResults);
+    });
+
+    it('should report telemetry for generation complete', () => {
+      expect(mockReportEvent).toHaveBeenCalledWith(
+        TelemetryEventType.IntegrationAssistantGenerationComplete,
+        {
+          sessionId: expect.any(String),
+          sampleRows: integrationSettings.logsSampleParsed?.length ?? 0,
+          actionTypeId: connector.actionTypeId,
+          model: expect.anything(),
+          provider: connector.apiProvider ?? 'unknown',
+          durationMs: expect.any(Number),
+          errorMessage: undefined,
+        }
+      );
+    });
+  });
+
+  describe('when there are errors', () => {
+    const errorMessage = 'error message';
+    let result: RenderResult;
+    beforeEach(async () => {
+      mockRunEcsGraph.mockImplementationOnce(() => {
+        throw new Error(errorMessage);
+      });
+
+      await act(async () => {
+        result = render(
+          <GenerationModal
+            integrationSettings={integrationSettings}
+            connector={connector}
+            onComplete={mockOnComplete}
+            onClose={mockOnClose}
+          />,
+          { wrapper }
+        );
+        await waitFor(() =>
+          expect(result.queryByTestId('generationErrorCallout')).toBeInTheDocument()
+        );
+      });
+    });
+
+    it('should show the error text', () => {
+      expect(result.queryByText(errorMessage)).toBeInTheDocument();
+    });
+    it('should render the retry button', () => {
+      expect(result.queryByTestId('retryButton')).toBeInTheDocument();
+    });
+    it('should report telemetry for generation error', () => {
+      expect(mockReportEvent).toHaveBeenCalledWith(
+        TelemetryEventType.IntegrationAssistantGenerationComplete,
+        {
+          sessionId: expect.any(String),
+          sampleRows: integrationSettings.logsSampleParsed?.length ?? 0,
+          actionTypeId: connector.actionTypeId,
+          model: expect.anything(),
+          provider: connector.apiProvider ?? 'unknown',
+          durationMs: expect.any(Number),
+          errorMessage,
+        }
+      );
+    });
+
+    describe('when the retrying successfully', () => {
+      beforeEach(async () => {
+        await act(async () => {
+          result.getByTestId('retryButton').click();
+          await waitFor(() => expect(mockOnComplete).toBeCalled());
+        });
+      });
+
+      it('should not render the error callout', () => {
+        expect(result.queryByTestId('generationErrorCallout')).not.toBeInTheDocument();
+      });
+      it('should not render the retry button', () => {
+        expect(result.queryByTestId('retryButton')).not.toBeInTheDocument();
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.tsx
index fe5a1dabb1374..99cf17152ac8e 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/generation_modal.tsx
@@ -24,6 +24,7 @@ import {
 import { isEmpty } from 'lodash/fp';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { css } from '@emotion/react';
+import { getLangSmithOptions } from '../../../../../common/lib/lang_smith';
 import type {
   CategorizationRequestBody,
   EcsMappingRequestBody,
@@ -87,6 +88,7 @@ export const useGeneration = ({
           dataStreamName: integrationSettings.dataStreamName ?? '',
           rawSamples: integrationSettings.logsSampleParsed ?? [],
           connectorId: connector.id,
+          langSmithOptions: getLangSmithOptions(),
         };
 
         setProgress('ecs');
@@ -161,11 +163,7 @@ export const useGeneration = ({
     setIsRequesting(true);
   }, []);
 
-  return {
-    progress,
-    error,
-    retry,
-  };
+  return { progress, error, retry };
 };
 
 const useModalCss = () => {
@@ -203,7 +201,7 @@ export const GenerationModal = React.memo<GenerationModalProps>(
     );
 
     return (
-      <EuiModal onClose={onClose}>
+      <EuiModal onClose={onClose} data-test-subj="generationModal">
         <EuiModalHeader css={headerCss}>
           <EuiModalHeaderTitle>{i18n.ANALYZING}</EuiModalHeaderTitle>
         </EuiModalHeader>
@@ -217,6 +215,7 @@ export const GenerationModal = React.memo<GenerationModalProps>(
                       title={i18n.GENERATION_ERROR(progressText[progress])}
                       color="danger"
                       iconType="alert"
+                      data-test-subj="generationErrorCallout"
                     >
                       {error}
                     </EuiCallOut>
@@ -254,7 +253,7 @@ export const GenerationModal = React.memo<GenerationModalProps>(
           {error ? (
             <EuiFlexGroup justifyContent="center">
               <EuiFlexItem grow={false}>
-                <EuiButtonEmpty iconType="refresh" onClick={retry}>
+                <EuiButtonEmpty iconType="refresh" onClick={retry} data-test-subj="retryButton">
                   {i18n.RETRY}
                 </EuiButtonEmpty>
               </EuiFlexItem>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.test.tsx
new file mode 100644
index 0000000000000..af21526b7f14d
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.test.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { act, fireEvent, render, waitFor, type RenderResult } from '@testing-library/react';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { SampleLogsInput } from './sample_logs_input';
+import { ActionsProvider } from '../../state';
+import { mockActions } from '../../mocks/state';
+import { mockServices } from '../../../../../services/mocks/services';
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+const changeFile = async (input: HTMLElement, file: File) => {
+  await act(async () => {
+    fireEvent.change(input, { target: { files: [file] } });
+    await waitFor(() => expect(input).toHaveAttribute('data-loading', 'true'));
+    await waitFor(() => expect(input).toHaveAttribute('data-loading', 'false'));
+  });
+};
+
+describe('SampleLogsInput', () => {
+  let result: RenderResult;
+  let input: HTMLElement;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    result = render(<SampleLogsInput integrationSettings={undefined} />, { wrapper });
+    input = result.getByTestId('logsSampleFilePicker');
+  });
+
+  describe('when uploading a json logs sample', () => {
+    const type = 'application/json';
+
+    describe('when the file is valid', () => {
+      const logsSampleRaw = `{"message":"test message 1"},{"message":"test message 2"}`;
+      beforeEach(async () => {
+        await changeFile(input, new File([`[${logsSampleRaw}]`], 'test.json', { type }));
+      });
+
+      it('should set the integrationSetting correctly', () => {
+        expect(mockActions.setIntegrationSettings).toBeCalledWith({
+          logsSampleParsed: logsSampleRaw.split(','),
+        });
+      });
+
+      describe('when the file has too many rows', () => {
+        const tooLargeLogsSample = Array(6).fill(logsSampleRaw).join(','); // 12 entries
+        beforeEach(async () => {
+          await changeFile(input, new File([`[${tooLargeLogsSample}]`], 'test.json', { type }));
+        });
+
+        it('should truncate the logs sample', () => {
+          expect(mockActions.setIntegrationSettings).toBeCalledWith({
+            logsSampleParsed: tooLargeLogsSample.split(',').slice(0, 10),
+          });
+        });
+        it('should add a notification toast', () => {
+          expect(mockServices.notifications.toasts.addInfo).toBeCalledWith(
+            `The logs sample has been truncated to 10 rows.`
+          );
+        });
+      });
+    });
+
+    describe('when the file is invalid', () => {
+      describe.each([
+        ['[{"message":"test message 1"}', `The logs sample file has not a valid ${type} format`],
+        ['["test message 1"]', 'The logs sample file contains non-object entries'],
+        ['{"message":"test message 1"}', 'The logs sample file is not an array'],
+        ['[]', 'The logs sample file is empty'],
+      ])('with logs content %s', (logsSample, errorMessage) => {
+        beforeEach(async () => {
+          await changeFile(input, new File([logsSample], 'test.json', { type }));
+        });
+
+        it('should render error message', () => {
+          expect(result.queryByText(errorMessage)).toBeInTheDocument();
+        });
+
+        it('should set the integrationSetting correctly', () => {
+          expect(mockActions.setIntegrationSettings).toBeCalledWith({
+            logsSampleParsed: undefined,
+          });
+        });
+      });
+    });
+  });
+
+  describe('when setting a ndjson logs sample', () => {
+    const type = 'application/x-ndjson';
+
+    describe('when the file is valid', () => {
+      const logsSampleRaw = `{"message":"test message 1"}\n{"message":"test message 2"}`;
+      beforeEach(async () => {
+        await changeFile(input, new File([logsSampleRaw], 'test.json', { type }));
+      });
+
+      it('should set the integrationSetting correctly', () => {
+        expect(mockActions.setIntegrationSettings).toBeCalledWith({
+          logsSampleParsed: logsSampleRaw.split('\n'),
+        });
+      });
+
+      describe('when the file has too many rows', () => {
+        const tooLargeLogsSample = Array(6).fill(logsSampleRaw).join('\n'); // 12 entries
+        beforeEach(async () => {
+          await changeFile(input, new File([tooLargeLogsSample], 'test.json', { type }));
+        });
+
+        it('should truncate the logs sample', () => {
+          expect(mockActions.setIntegrationSettings).toBeCalledWith({
+            logsSampleParsed: tooLargeLogsSample.split('\n').slice(0, 10),
+          });
+        });
+        it('should add a notification toast', () => {
+          expect(mockServices.notifications.toasts.addInfo).toBeCalledWith(
+            `The logs sample has been truncated to 10 rows.`
+          );
+        });
+      });
+    });
+
+    describe('when the file is invalid', () => {
+      describe.each([
+        ['{"message":"test message 1"]', `The logs sample file has not a valid ${type} format`],
+        ['"test message 1"', 'The logs sample file contains non-object entries'],
+        ['', 'The logs sample file is empty'],
+      ])('with logs content %s', (logsSample, errorMessage) => {
+        beforeEach(async () => {
+          await changeFile(input, new File([logsSample], 'test.json', { type }));
+        });
+
+        it('should render error message', () => {
+          expect(result.queryByText(errorMessage)).toBeInTheDocument();
+        });
+
+        it('should set the integrationSetting correctly', () => {
+          expect(mockActions.setIntegrationSettings).toBeCalledWith({
+            logsSampleParsed: undefined,
+          });
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.tsx
index fd3a185edcc7a..072669a6bdd1d 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/data_stream_step/sample_logs_input.tsx
@@ -11,6 +11,7 @@ import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { isPlainObject } from 'lodash/fp';
 import type { IntegrationSettings } from '../../types';
 import * as i18n from './translations';
+import { useActions } from '../../state';
 
 const MaxLogsSampleRows = 10;
 
@@ -61,88 +62,88 @@ const parseLogsContent = (
 
 interface SampleLogsInputProps {
   integrationSettings: IntegrationSettings | undefined;
-  setIntegrationSettings: (param: IntegrationSettings) => void;
 }
-export const SampleLogsInput = React.memo<SampleLogsInputProps>(
-  ({ integrationSettings, setIntegrationSettings }) => {
-    const { notifications } = useKibana().services;
-    const [isParsing, setIsParsing] = useState(false);
-    const [sampleFileError, setSampleFileError] = useState<string>();
+export const SampleLogsInput = React.memo<SampleLogsInputProps>(({ integrationSettings }) => {
+  const { notifications } = useKibana().services;
+  const { setIntegrationSettings } = useActions();
+  const [isParsing, setIsParsing] = useState(false);
+  const [sampleFileError, setSampleFileError] = useState<string>();
 
-    const onChangeLogsSample = useCallback(
-      (files: FileList | null) => {
-        const logsSampleFile = files?.[0];
-        if (logsSampleFile == null) {
-          setSampleFileError(undefined);
+  const onChangeLogsSample = useCallback(
+    (files: FileList | null) => {
+      const logsSampleFile = files?.[0];
+      if (logsSampleFile == null) {
+        setSampleFileError(undefined);
+        setIntegrationSettings({ ...integrationSettings, logsSampleParsed: undefined });
+        return;
+      }
+
+      const reader = new FileReader();
+      reader.onload = function (e) {
+        const fileContent = e.target?.result as string | undefined; // We can safely cast to string since we call `readAsText` to load the file.
+        const { error, isTruncated, logsSampleParsed } = parseLogsContent(
+          fileContent,
+          logsSampleFile.type
+        );
+        setIsParsing(false);
+        setSampleFileError(error);
+        if (error) {
           setIntegrationSettings({ ...integrationSettings, logsSampleParsed: undefined });
           return;
         }
 
-        const reader = new FileReader();
-        reader.onload = function (e) {
-          const fileContent = e.target?.result as string | undefined; // We can safely cast to string since we call `readAsText` to load the file.
-          const { error, isTruncated, logsSampleParsed } = parseLogsContent(
-            fileContent,
-            logsSampleFile.type
-          );
-          setIsParsing(false);
-          setSampleFileError(error);
-          if (error) {
-            setIntegrationSettings({ ...integrationSettings, logsSampleParsed: undefined });
-            return;
-          }
-
-          if (isTruncated) {
-            notifications?.toasts.addInfo(i18n.LOGS_SAMPLE_TRUNCATED(MaxLogsSampleRows));
-          }
-
-          setIntegrationSettings({
-            ...integrationSettings,
-            logsSampleParsed,
-          });
-        };
-        setIsParsing(true);
-        reader.readAsText(logsSampleFile);
-      },
-      [integrationSettings, setIntegrationSettings, notifications?.toasts, setIsParsing]
-    );
-    return (
-      <EuiFormRow
-        label={i18n.LOGS_SAMPLE_LABEL}
-        helpText={
-          <EuiText color="danger" size="xs">
-            {sampleFileError}
-          </EuiText>
+        if (isTruncated) {
+          notifications?.toasts.addInfo(i18n.LOGS_SAMPLE_TRUNCATED(MaxLogsSampleRows));
         }
-        isInvalid={sampleFileError != null}
-      >
-        <>
-          <EuiCallOut iconType="iInCircle" color="warning">
-            {i18n.LOGS_SAMPLE_WARNING}
-          </EuiCallOut>
-          <EuiSpacer size="s" />
 
-          <EuiFilePicker
-            id="logsSampleFilePicker"
-            initialPromptText={
-              <>
-                <EuiText size="s" textAlign="center">
-                  {i18n.LOGS_SAMPLE_DESCRIPTION}
-                </EuiText>
-                <EuiText size="xs" color="subdued" textAlign="center">
-                  {i18n.LOGS_SAMPLE_DESCRIPTION_2}
-                </EuiText>
-              </>
-            }
-            onChange={onChangeLogsSample}
-            display="large"
-            aria-label="Upload logs sample file"
-            accept="application/json,application/x-ndjson"
-            isLoading={isParsing}
-          />
-        </>
-      </EuiFormRow>
-    );
-  }
-);
+        setIntegrationSettings({
+          ...integrationSettings,
+          logsSampleParsed,
+        });
+      };
+      setIsParsing(true);
+      reader.readAsText(logsSampleFile);
+    },
+    [integrationSettings, setIntegrationSettings, notifications?.toasts, setIsParsing]
+  );
+  return (
+    <EuiFormRow
+      label={i18n.LOGS_SAMPLE_LABEL}
+      helpText={
+        <EuiText color="danger" size="xs">
+          {sampleFileError}
+        </EuiText>
+      }
+      isInvalid={sampleFileError != null}
+    >
+      <>
+        <EuiCallOut iconType="iInCircle" color="warning">
+          {i18n.LOGS_SAMPLE_WARNING}
+        </EuiCallOut>
+        <EuiSpacer size="s" />
+
+        <EuiFilePicker
+          id="logsSampleFilePicker"
+          initialPromptText={
+            <>
+              <EuiText size="s" textAlign="center">
+                {i18n.LOGS_SAMPLE_DESCRIPTION}
+              </EuiText>
+              <EuiText size="xs" color="subdued" textAlign="center">
+                {i18n.LOGS_SAMPLE_DESCRIPTION_2}
+              </EuiText>
+            </>
+          }
+          onChange={onChangeLogsSample}
+          display="large"
+          aria-label="Upload logs sample file"
+          accept="application/json,application/x-ndjson"
+          isLoading={isParsing}
+          data-test-subj="logsSampleFilePicker"
+          data-loading={isParsing}
+        />
+      </>
+    </EuiFormRow>
+  );
+});
 SampleLogsInput.displayName = 'SampleLogsInput';
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.test.tsx
new file mode 100644
index 0000000000000..703a381a96e3b
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.test.tsx
@@ -0,0 +1,238 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult, waitFor } from '@testing-library/react';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { DeployStep } from './deploy_step';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+import type { BuildIntegrationRequestBody } from '../../../../../../common';
+import { mockReportEvent } from '../../../../../services/telemetry/mocks/service';
+import { TelemetryEventType } from '../../../../../services/telemetry/types';
+
+const integrationSettings = mockState.integrationSettings!;
+const connector = mockState.connector!;
+const results = mockState.result!;
+
+const parameters: BuildIntegrationRequestBody = {
+  integration: {
+    title: integrationSettings.title!,
+    description: integrationSettings.description!,
+    name: integrationSettings.name!,
+    logo: integrationSettings.logo,
+    dataStreams: [
+      {
+        title: integrationSettings.dataStreamTitle!,
+        description: integrationSettings.dataStreamDescription!,
+        name: integrationSettings.dataStreamName!,
+        inputTypes: [integrationSettings.inputType!],
+        rawSamples: integrationSettings.logsSampleParsed!,
+        docs: results.docs!,
+        pipeline: results.pipeline,
+      },
+    ],
+  },
+};
+
+const builtIntegration = new Blob();
+const mockRunBuildIntegration = jest.fn((_: unknown) => builtIntegration);
+const integrationName = 'my_integration_33-1.0.0';
+const mockRunInstallPackage = jest.fn((_: unknown) => ({
+  response: [{ id: 'audit-my_integration_33.data-stream-1.0.0' }],
+}));
+jest.mock('../../../../../common/lib/api', () => ({
+  runBuildIntegration: (params: unknown) => mockRunBuildIntegration(params),
+  runInstallPackage: (params: unknown) => mockRunInstallPackage(params),
+}));
+
+const mockSaveAs = jest.fn();
+jest.mock('@elastic/filesaver', () => ({
+  saveAs: (...params: unknown[]) => mockSaveAs(...params),
+}));
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('DeployStep', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when deploy is successful', () => {
+    let result: RenderResult;
+    beforeEach(async () => {
+      await act(async () => {
+        result = render(
+          <DeployStep
+            integrationSettings={integrationSettings}
+            connector={connector}
+            result={results}
+          />,
+          { wrapper }
+        );
+        await waitFor(() => expect(result.queryByTestId('deployStep-loading')).toBeInTheDocument());
+        await waitFor(() =>
+          expect(result.queryByTestId('deployStep-loading')).not.toBeInTheDocument()
+        );
+      });
+    });
+
+    it('should call build integration api', () => {
+      expect(mockRunBuildIntegration).toHaveBeenCalledWith(parameters);
+    });
+
+    it('should call install package api', () => {
+      expect(mockRunInstallPackage).toHaveBeenCalledWith(builtIntegration);
+    });
+
+    it('should render success deploy message', () => {
+      expect(result.queryByTestId('deployStep-success')).toBeInTheDocument();
+    });
+
+    it('should report telemetry for integration complete', () => {
+      expect(mockReportEvent).toHaveBeenCalledWith(
+        TelemetryEventType.IntegrationAssistantComplete,
+        {
+          sessionId: expect.any(String),
+          integrationName,
+          integrationDescription: integrationSettings.description,
+          dataStreamName: integrationSettings.dataStreamName,
+          inputType: integrationSettings.inputType,
+          model: expect.any(String),
+          actionTypeId: connector.actionTypeId,
+          provider: connector.apiProvider ?? 'unknown',
+          durationMs: expect.any(Number),
+          errorMessage: undefined,
+        }
+      );
+    });
+
+    it('should render the save button', () => {
+      expect(result.queryByTestId('saveZipButton')).toBeInTheDocument();
+    });
+
+    describe('when save button is clicked', () => {
+      beforeEach(() => {
+        result.getByTestId('saveZipButton').click();
+      });
+
+      it('should save file', () => {
+        expect(mockSaveAs).toHaveBeenCalledWith(builtIntegration, `${integrationName}.zip`);
+      });
+    });
+  });
+
+  describe('when deploy fails', () => {
+    describe('when build integration throws errors', () => {
+      const errorMessage = 'build integration failed';
+      let result: RenderResult;
+      beforeEach(async () => {
+        mockRunBuildIntegration.mockImplementationOnce(() => {
+          throw new Error(errorMessage);
+        });
+        await act(async () => {
+          result = render(
+            <DeployStep
+              integrationSettings={integrationSettings}
+              connector={connector}
+              result={results}
+            />,
+            { wrapper }
+          );
+          await waitFor(() => expect(result.queryByTestId('deployStep-error')).toBeInTheDocument());
+        });
+      });
+
+      it('should not render success deploy message', () => {
+        expect(result.queryByTestId('deployStep-success')).not.toBeInTheDocument();
+      });
+
+      it('should render the error message', () => {
+        expect(result.queryByTestId('deployStep-error')).toBeInTheDocument();
+        expect(result.queryByText(errorMessage)).toBeInTheDocument();
+      });
+
+      it('should not render the save button', () => {
+        expect(result.queryByTestId('saveZipButton')).not.toBeInTheDocument();
+      });
+
+      it('should report telemetry for integration complete with error', () => {
+        expect(mockReportEvent).toHaveBeenCalledWith(
+          TelemetryEventType.IntegrationAssistantComplete,
+          {
+            sessionId: expect.any(String),
+            integrationName: integrationSettings.name,
+            integrationDescription: integrationSettings.description,
+            dataStreamName: integrationSettings.dataStreamName,
+            inputType: integrationSettings.inputType,
+            model: expect.any(String),
+            actionTypeId: connector.actionTypeId,
+            provider: connector.apiProvider ?? 'unknown',
+            durationMs: expect.any(Number),
+            errorMessage,
+          }
+        );
+      });
+    });
+
+    describe('when install integration throws errors', () => {
+      const errorMessage = 'install integration failed';
+      let result: RenderResult;
+      beforeEach(async () => {
+        mockRunInstallPackage.mockImplementationOnce(() => {
+          throw new Error(errorMessage);
+        });
+        await act(async () => {
+          result = render(
+            <DeployStep
+              integrationSettings={integrationSettings}
+              connector={connector}
+              result={results}
+            />,
+            { wrapper }
+          );
+          await waitFor(() => expect(result.queryByTestId('deployStep-error')).toBeInTheDocument());
+        });
+      });
+
+      it('should not render success deploy message', () => {
+        expect(result.queryByTestId('deployStep-success')).not.toBeInTheDocument();
+      });
+
+      it('should render the error message', () => {
+        expect(result.queryByTestId('deployStep-error')).toBeInTheDocument();
+        expect(result.queryByText(errorMessage)).toBeInTheDocument();
+      });
+
+      it('should not render the save button', () => {
+        expect(result.queryByTestId('saveZipButton')).not.toBeInTheDocument();
+      });
+
+      it('should report telemetry for integration complete with error', () => {
+        expect(mockReportEvent).toHaveBeenCalledWith(
+          TelemetryEventType.IntegrationAssistantComplete,
+          {
+            sessionId: expect.any(String),
+            integrationName: integrationSettings.name,
+            integrationDescription: integrationSettings.description,
+            dataStreamName: integrationSettings.dataStreamName,
+            inputType: integrationSettings.inputType,
+            model: expect.any(String),
+            actionTypeId: connector.actionTypeId,
+            provider: connector.apiProvider ?? 'unknown',
+            durationMs: expect.any(Number),
+            errorMessage,
+          }
+        );
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.tsx
index dcf353a00727e..81f211de80b1e 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/deploy_step.tsx
@@ -47,9 +47,9 @@ export const DeployStep = React.memo<DeployStepProps>(
           <EuiSpacer size="m" />
           <EuiFlexGroup direction="row" justifyContent="center">
             <EuiFlexItem grow={false}>
-              {isLoading && <EuiLoadingSpinner size="xl" />}
+              {isLoading && <EuiLoadingSpinner size="xl" data-test-subj="deployStep-loading" />}
               {error && (
-                <EuiText color="danger" size="s">
+                <EuiText color="danger" size="s" data-test-subj="deployStep-error">
                   {error}
                 </EuiText>
               )}
@@ -62,7 +62,7 @@ export const DeployStep = React.memo<DeployStepProps>(
       return (
         <SuccessSection integrationName={integrationName}>
           <EuiSpacer size="m" />
-          <EuiPanel hasShadow={false} hasBorder paddingSize="l">
+          <EuiPanel hasShadow={false} hasBorder paddingSize="l" data-test-subj="deployStep-success">
             <EuiFlexGroup direction="row" alignItems="center">
               <EuiFlexItem>
                 <EuiFlexGroup direction="row" alignItems="flexStart" justifyContent="flexStart">
@@ -86,7 +86,9 @@ export const DeployStep = React.memo<DeployStepProps>(
                 </EuiFlexGroup>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <EuiLink onClick={onSaveZip}>{i18n.DOWNLOAD_ZIP_LINK}</EuiLink>
+                <EuiLink onClick={onSaveZip} data-test-subj="saveZipButton">
+                  {i18n.DOWNLOAD_ZIP_LINK}
+                </EuiLink>
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiPanel>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/use_deploy_integration.ts b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/use_deploy_integration.ts
index ca5385d701964..1de53e160efb1 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/use_deploy_integration.ts
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/deploy_step/use_deploy_integration.ts
@@ -88,7 +88,18 @@ export const useDeployIntegration = ({
         }
       } catch (e) {
         if (abortController.signal.aborted) return;
-        setError(`Error: ${e.body?.message ?? e.message}`);
+        const errorMessage = `${e.message}${
+          e.body ? ` (${e.body.statusCode}): ${e.body.message}` : ''
+        }`;
+
+        telemetry.reportAssistantComplete({
+          integrationName: integrationSettings.name ?? '',
+          integrationSettings,
+          connector,
+          error: errorMessage,
+        });
+
+        setError(errorMessage);
       } finally {
         setIsLoading(false);
       }
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.test.tsx
new file mode 100644
index 0000000000000..daeb3ce39b825
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.test.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult, fireEvent, waitFor } from '@testing-library/react';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { IntegrationStep } from './integration_step';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+
+const integrationSettings = mockState.integrationSettings!;
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('IntegrationStep', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  describe('when settings are undefined', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<IntegrationStep integrationSettings={undefined} />, { wrapper });
+    });
+
+    it('should render integration step page', () => {
+      expect(result.queryByTestId('integrationStep')).toBeInTheDocument();
+    });
+
+    describe('when title changes', () => {
+      const title = 'My Integration';
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('integrationTitleInput'), {
+            target: { value: title },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', () => {
+        expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ title });
+      });
+    });
+
+    describe('when description changes', () => {
+      const description = 'My Integration description';
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('integrationDescriptionInput'), {
+            target: { value: description },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', () => {
+        expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({ description });
+      });
+    });
+
+    describe('when logo is set', () => {
+      describe('when logo is valid', () => {
+        const file = new File(['(⌐□_□)'], 'test.svg', { type: 'image/svg+xml' });
+        beforeEach(() => {
+          act(() => {
+            fireEvent.change(result.getByTestId('integrationLogoFilePicker'), {
+              target: { files: [file] },
+            });
+          });
+        });
+
+        it('should call setIntegrationSettings', async () => {
+          await waitFor(() => {
+            expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({
+              logo: expect.any(String),
+            });
+          });
+        });
+      });
+
+      describe('when logo is too large', () => {
+        const file = new File(['(⌐□_□)'], 'test.svg', { type: 'image/svg+xml' });
+        Object.defineProperty(file, 'size', { value: 1024 * 1024 * 2 }); // override Blob size getter value by 2Mb
+        beforeEach(() => {
+          act(() => {
+            fireEvent.change(result.getByTestId('integrationLogoFilePicker'), {
+              target: { files: [file] },
+            });
+          });
+        });
+
+        it('should render logo error', async () => {
+          await waitFor(() => {
+            expect(
+              result.queryByText('test.svg is too large, maximum size is 1Mb.')
+            ).toBeInTheDocument();
+          });
+          expect(mockActions.setIntegrationSettings).not.toHaveBeenCalledWith();
+        });
+      });
+    });
+
+    describe('when logo is removed', () => {
+      beforeEach(() => {
+        act(() => {
+          fireEvent.change(result.getByTestId('integrationLogoFilePicker'), {
+            target: { files: [] },
+          });
+        });
+      });
+
+      it('should call setIntegrationSettings', async () => {
+        await waitFor(() => {
+          expect(mockActions.setIntegrationSettings).toHaveBeenCalledWith({
+            logo: undefined,
+          });
+        });
+      });
+    });
+  });
+
+  describe('when settings are defined', () => {
+    let result: RenderResult;
+    beforeEach(() => {
+      result = render(<IntegrationStep integrationSettings={integrationSettings} />, { wrapper });
+    });
+
+    it('should render preview integration title', () => {
+      expect(result.queryByTestId('packageCardPreview')).toHaveTextContent(
+        integrationSettings.title!
+      );
+    });
+
+    it('should render preview integration description', () => {
+      expect(result.queryByTestId('packageCardPreview')).toHaveTextContent(
+        integrationSettings.description!
+      );
+    });
+
+    it('should render preview integration logo', () => {
+      expect(result.queryByTestId('packageCardPreviewIcon')).toHaveAttribute(
+        'data-euiicon-type',
+        `data:image/svg+xml;base64,${integrationSettings.logo}`
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.tsx
index b7fa1902821c0..dc27abd9529cd 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/integration_step.tsx
@@ -27,7 +27,7 @@ import { PackageCardPreview } from './package_card_preview';
 import { useActions } from '../../state';
 import * as i18n from './translations';
 
-const MaxLogoSize = 1048576; // One megabyte
+const MaxLogoSize = 1024 * 1024; // One megabyte
 
 const useLayoutStyles = () => {
   const { euiTheme } = useEuiTheme();
@@ -92,7 +92,7 @@ export const IntegrationStep = React.memo<IntegrationStepProps>(({ integrationSe
 
   return (
     <StepContentWrapper title={i18n.TITLE} subtitle={i18n.DESCRIPTION}>
-      <EuiPanel paddingSize="none" hasShadow={false} hasBorder>
+      <EuiPanel paddingSize="none" hasShadow={false} hasBorder data-test-subj="integrationStep">
         <EuiFlexGroup direction="row" gutterSize="none">
           <EuiFlexItem css={styles.left}>
             <EuiForm component="form" fullWidth>
@@ -101,6 +101,7 @@ export const IntegrationStep = React.memo<IntegrationStepProps>(({ integrationSe
                   name="title"
                   value={integrationSettings?.title ?? ''}
                   onChange={onChange.title}
+                  data-test-subj="integrationTitleInput"
                 />
               </EuiFormRow>
               <EuiFormRow label={i18n.DESCRIPTION_LABEL}>
@@ -108,6 +109,7 @@ export const IntegrationStep = React.memo<IntegrationStepProps>(({ integrationSe
                   name="description"
                   value={integrationSettings?.description ?? ''}
                   onChange={onChange.description}
+                  data-test-subj="integrationDescriptionInput"
                 />
               </EuiFormRow>
               <EuiFormRow label={i18n.LOGO_LABEL}>
@@ -120,6 +122,7 @@ export const IntegrationStep = React.memo<IntegrationStepProps>(({ integrationSe
                     aria-label="Upload an svg logo image"
                     accept="image/svg+xml"
                     isInvalid={logoError != null}
+                    data-test-subj="integrationLogoFilePicker"
                   />
                   <EuiSpacer size="xs" />
                   {logoError && (
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/package_card_preview.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/package_card_preview.tsx
index 9ca163f44b7d5..03763a2d6d5c7 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/package_card_preview.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/integration_step/package_card_preview.tsx
@@ -40,7 +40,7 @@ export const PackageCardPreview = React.memo<PackageCardPreviewProps>(({ integra
   return (
     <EuiCard
       css={cardCss}
-      data-test-subj="package-card-preview"
+      data-test-subj="packageCardPreview"
       layout="horizontal"
       title={integrationSettings?.title ?? ''}
       description={integrationSettings?.description ?? ''}
@@ -49,6 +49,7 @@ export const PackageCardPreview = React.memo<PackageCardPreviewProps>(({ integra
       icon={
         <EuiIcon
           size={'xl'}
+          data-test-subj="packageCardPreviewIcon"
           type={
             integrationSettings?.logo
               ? `data:image/svg+xml;base64,${integrationSettings.logo}`
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.test.tsx
new file mode 100644
index 0000000000000..2c8fd73f16998
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.test.tsx
@@ -0,0 +1,176 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, act, type RenderResult, fireEvent, waitFor } from '@testing-library/react';
+import { TestProvider } from '../../../../../mocks/test_provider';
+import { ReviewStep } from './review_step';
+import { ActionsProvider } from '../../state';
+import { mockActions, mockState } from '../../mocks/state';
+
+const integrationSettings = mockState.integrationSettings!;
+const results = mockState.result!;
+
+const mockResults = {
+  pipeline: { test: 'checkPipelineResponse' },
+  docs: [{ id: 'testDoc' }],
+};
+const customPipeline = {
+  ...mockResults.pipeline,
+  description: 'testing',
+};
+const defaultRequest = {
+  pipeline: customPipeline,
+  rawSamples: integrationSettings.logsSampleParsed!,
+};
+const mockRunCheckPipelineResults = jest.fn((_: unknown) => ({ results: mockResults }));
+jest.mock('../../../../../common/lib/api', () => ({
+  runCheckPipelineResults: (params: unknown) => mockRunCheckPipelineResults(params),
+}));
+jest.mock('@kbn/code-editor', () => ({
+  ...jest.requireActual('@kbn/code-editor'),
+  CodeEditor: (props: { value: string; onChange: Function }) => (
+    <input
+      data-test-subj={'mockCodeEditor'}
+      value={props.value}
+      onChange={(e) => {
+        props.onChange(e.target.value);
+      }}
+    />
+  ),
+}));
+
+const wrapper: React.FC = ({ children }) => (
+  <TestProvider>
+    <ActionsProvider value={mockActions}>{children}</ActionsProvider>
+  </TestProvider>
+);
+
+describe('ReviewStep', () => {
+  let result: RenderResult;
+  beforeEach(() => {
+    jest.clearAllMocks();
+    result = render(
+      <ReviewStep
+        integrationSettings={integrationSettings}
+        isGenerating={false}
+        result={results}
+      />,
+      { wrapper }
+    );
+  });
+
+  it('should render integration step page', () => {
+    expect(result.queryByTestId('reviewStep')).toBeInTheDocument();
+  });
+
+  describe('when edit pipeline button is clicked', () => {
+    beforeEach(() => {
+      act(() => {
+        result.getByTestId('editPipelineButton').click();
+      });
+    });
+
+    it('should open pipeline editor', () => {
+      expect(result.queryByTestId('mockCodeEditor')).toBeInTheDocument();
+    });
+
+    describe('when saving pipeline without changes', () => {
+      beforeEach(() => {
+        act(() => {
+          result.getByTestId('savePipelineButton').click();
+        });
+      });
+
+      it('should call setResults', () => {
+        expect(mockActions.setResult).not.toHaveBeenCalled();
+      });
+    });
+
+    describe('when saving pipeline with changes', () => {
+      beforeEach(async () => {
+        act(() => {
+          fireEvent.change(result.getByTestId('mockCodeEditor'), {
+            target: { value: JSON.stringify(customPipeline) },
+          });
+        });
+      });
+
+      describe('when check pipeline is successful', () => {
+        beforeEach(async () => {
+          await act(async () => {
+            result.getByTestId('savePipelineButton').click();
+            await waitFor(() => expect(mockActions.setIsGenerating).toHaveBeenCalledWith(false));
+          });
+        });
+
+        it('should call setIsGenerating', () => {
+          expect(mockActions.setIsGenerating).toHaveBeenCalledWith(true);
+        });
+
+        it('should check pipeline', () => {
+          expect(mockRunCheckPipelineResults).toHaveBeenCalledWith(defaultRequest);
+        });
+
+        it('should call setResults', () => {
+          expect(mockActions.setResult).toHaveBeenCalledWith({
+            ...mockResults,
+            pipeline: customPipeline,
+          });
+        });
+      });
+
+      describe('when check pipeline fails', () => {
+        beforeEach(async () => {
+          mockRunCheckPipelineResults.mockImplementationOnce(() => {
+            throw new Error('test error');
+          });
+          await act(async () => {
+            result.getByTestId('savePipelineButton').click();
+            await waitFor(() => expect(mockActions.setIsGenerating).toHaveBeenCalledWith(false));
+          });
+        });
+
+        it('should check pipeline', () => {
+          expect(mockRunCheckPipelineResults).toHaveBeenCalledWith(defaultRequest);
+        });
+
+        it('should not call setResults', () => {
+          expect(mockActions.setResult).not.toHaveBeenCalled();
+        });
+
+        it('should show error', () => {
+          expect(result.queryByText('Error: test error')).toBeInTheDocument();
+        });
+      });
+
+      describe('when check pipeline has no docs', () => {
+        beforeEach(async () => {
+          mockRunCheckPipelineResults.mockReturnValueOnce({
+            results: { ...mockResults, docs: [] },
+          });
+          await act(async () => {
+            result.getByTestId('savePipelineButton').click();
+            await waitFor(() => expect(mockActions.setIsGenerating).toHaveBeenCalledWith(false));
+          });
+        });
+
+        it('should check pipeline', () => {
+          expect(mockRunCheckPipelineResults).toHaveBeenCalledWith(defaultRequest);
+        });
+
+        it('should not call setResults', () => {
+          expect(mockActions.setResult).not.toHaveBeenCalled();
+        });
+
+        it('should show error', () => {
+          expect(result.queryByText('No results for the pipeline')).toBeInTheDocument();
+        });
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.tsx
index ab958eb4a7a53..3cafb2f7f8b93 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/review_step.tsx
@@ -73,12 +73,15 @@ export const ReviewStep = React.memo<ReviewStepProps>(
         title={i18n.TITLE}
         subtitle={i18n.DESCRIPTION}
         right={
-          <EuiButton onClick={() => setIsPipelineEditionVisible(true)}>
+          <EuiButton
+            onClick={() => setIsPipelineEditionVisible(true)}
+            data-test-subj="editPipelineButton"
+          >
             {i18n.EDIT_PIPELINE_BUTTON}
           </EuiButton>
         }
       >
-        <EuiPanel hasShadow={false} hasBorder>
+        <EuiPanel hasShadow={false} hasBorder data-test-subj="reviewStep">
           {isGenerating ? (
             <EuiLoadingSpinner size="l" />
           ) : (
@@ -106,7 +109,7 @@ export const ReviewStep = React.memo<ReviewStepProps>(
                   responsive={false}
                   css={{ height: '100%' }}
                 >
-                  <EuiFlexItem grow={true} data-test-subj="inspectorRequestCodeViewerContainer">
+                  <EuiFlexItem grow={true}>
                     <CodeEditor
                       languageId={XJsonLang.ID}
                       value={JSON.stringify(result?.pipeline, null, 2)}
@@ -129,7 +132,11 @@ export const ReviewStep = React.memo<ReviewStepProps>(
               <EuiFlyoutFooter>
                 <EuiFlexGroup direction="row" gutterSize="none" justifyContent="flexEnd">
                   <EuiFlexItem grow={false}>
-                    <EuiButton fill onClick={saveCustomPipeline}>
+                    <EuiButton
+                      fill
+                      onClick={saveCustomPipeline}
+                      data-test-subj="savePipelineButton"
+                    >
                       {i18n.SAVE_BUTTON}
                     </EuiButton>
                   </EuiFlexItem>
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/use_check_pipeline.ts b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/use_check_pipeline.ts
index 83975d97b8085..953b8c442abb0 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/use_check_pipeline.ts
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/create_integration_assistant/steps/review_step/use_check_pipeline.ts
@@ -42,19 +42,19 @@ export const useCheckPipeline = ({ integrationSettings, customPipeline }: CheckP
         };
         setIsGenerating(true);
 
-        const ecsGraphResult = await runCheckPipelineResults(parameters, deps);
+        const checkPipelineResults = await runCheckPipelineResults(parameters, deps);
         if (abortController.signal.aborted) return;
-        if (isEmpty(ecsGraphResult?.results.docs)) {
+        if (isEmpty(checkPipelineResults?.results.docs)) {
           setError('No results for the pipeline');
           return;
         }
         setResult({
           pipeline: customPipeline,
-          docs: ecsGraphResult.results.docs,
+          docs: checkPipelineResults.results.docs,
         });
       } catch (e) {
         if (abortController.signal.aborted) return;
-        setError(`Error: ${e.body.message ?? e.message}`);
+        setError(`Error: ${e.body?.message ?? e.message}`);
       } finally {
         setIsGenerating(false);
       }
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration/telemetry.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration/telemetry.tsx
index fd62e54b20c83..f596964deb6ba 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration/telemetry.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration/telemetry.tsx
@@ -39,6 +39,7 @@ type ReportAssistantComplete = (params: {
   integrationName: string;
   integrationSettings: IntegrationSettings;
   connector: AIConnector;
+  error?: string;
 }) => void;
 
 interface TelemetryContextProps {
@@ -113,7 +114,7 @@ export const TelemetryContextProvider = React.memo<PropsWithChildren<{}>>(({ chi
   );
 
   const reportAssistantComplete = useCallback<ReportAssistantComplete>(
-    ({ integrationName, integrationSettings, connector }) => {
+    ({ integrationName, integrationSettings, connector, error }) => {
       telemetry.reportEvent(TelemetryEventType.IntegrationAssistantComplete, {
         sessionId: sessionData.current.sessionId,
         integrationName,
@@ -124,6 +125,7 @@ export const TelemetryContextProvider = React.memo<PropsWithChildren<{}>>(({ chi
         model: getConnectorModel(connector),
         provider: connector.apiProvider ?? 'unknown',
         durationMs: Date.now() - sessionData.current.startedAt,
+        errorMessage: error,
       });
     },
     [telemetry]
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.test.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.test.tsx
new file mode 100644
index 0000000000000..25ad4468fbc00
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.test.tsx
@@ -0,0 +1,76 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '@testing-library/react';
+import { TestProvider } from '../../mocks/test_provider';
+import { CreateIntegrationCardButton } from './create_integration_card_button';
+import { mockServices } from '../../services/mocks/services';
+
+const renderOptions = { wrapper: TestProvider };
+
+describe('CreateIntegrationCardButton', () => {
+  describe('when not compressed (default)', () => {
+    let element: React.ReactElement;
+
+    beforeEach(() => {
+      element = <CreateIntegrationCardButton />;
+    });
+
+    it('should render the link button', () => {
+      const result = render(element, renderOptions);
+      expect(result.queryByTestId('createIntegrationLink')).toBeInTheDocument();
+    });
+
+    it('should render the sub-title', () => {
+      const result = render(element, renderOptions);
+      expect(
+        result.queryByText('Create a custom one to fit your requirements')
+      ).toBeInTheDocument();
+    });
+
+    it('should navigate when button clicked', () => {
+      const url = '/app/integrations';
+      mockServices.application.getUrlForApp.mockReturnValueOnce(url);
+
+      const result = render(element, renderOptions);
+      result.queryByTestId('createIntegrationLink')?.click();
+
+      expect(mockServices.application.navigateToUrl).toHaveBeenCalledWith(url);
+    });
+  });
+
+  describe('when compressed', () => {
+    let element: React.ReactElement;
+
+    beforeEach(() => {
+      element = <CreateIntegrationCardButton compressed />;
+    });
+
+    it('should render the link button', () => {
+      const result = render(element, renderOptions);
+      expect(result.queryByTestId('createIntegrationLink')).toBeInTheDocument();
+    });
+
+    it('should not render the sub-title', () => {
+      const result = render(element, renderOptions);
+      expect(
+        result.queryByText('Create a custom one to fit your requirements')
+      ).not.toBeInTheDocument();
+    });
+
+    it('should navigate when button clicked', () => {
+      const url = '/app/integrations';
+      mockServices.application.getUrlForApp.mockReturnValueOnce(url);
+
+      const result = render(element, renderOptions);
+
+      result.queryByTestId('createIntegrationLink')?.click();
+      expect(mockServices.application.navigateToUrl).toHaveBeenCalledWith(url);
+    });
+  });
+});
diff --git a/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.tsx b/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.tsx
index 55baee561bb4a..d4922142e76f2 100644
--- a/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.tsx
+++ b/x-pack/plugins/integration_assistant/public/components/create_integration_card_button/create_integration_card_button.tsx
@@ -93,7 +93,12 @@ export const CreateIntegrationCardButton = React.memo<CreateIntegrationCardButto
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
                 {/* eslint-disable-next-line @elastic/eui/href-or-on-click */}
-                <EuiLink color="primary" href={href} onClick={navigate}>
+                <EuiLink
+                  color="primary"
+                  href={href}
+                  onClick={navigate}
+                  data-test-subj="createIntegrationLink"
+                >
                   <EuiFlexGroup
                     justifyContent="center"
                     alignItems="center"
diff --git a/x-pack/plugins/integration_assistant/public/mocks/test_provider.tsx b/x-pack/plugins/integration_assistant/public/mocks/test_provider.tsx
new file mode 100644
index 0000000000000..0f772242d5b61
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/mocks/test_provider.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PropsWithChildren } from 'react';
+import React from 'react';
+import { I18nProvider } from '@kbn/i18n-react';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { mockServices } from '../services/mocks/services';
+import { TelemetryContextProvider } from '../components/create_integration/telemetry';
+
+export const TestProvider: React.FC<PropsWithChildren<{}>> = ({ children }) => {
+  return (
+    <I18nProvider>
+      <KibanaContextProvider services={mockServices}>
+        <TelemetryContextProvider>{children}</TelemetryContextProvider>
+      </KibanaContextProvider>
+    </I18nProvider>
+  );
+};
diff --git a/x-pack/plugins/integration_assistant/public/services/index.ts b/x-pack/plugins/integration_assistant/public/services/index.ts
index d3a5e7e0f6885..36eb75a3e61b4 100644
--- a/x-pack/plugins/integration_assistant/public/services/index.ts
+++ b/x-pack/plugins/integration_assistant/public/services/index.ts
@@ -4,17 +4,5 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { Observable } from 'rxjs';
-import type { CoreStart } from '@kbn/core/public';
-import type { IntegrationAssistantPluginStartDependencies } from '../types';
-import type { TelemetryService } from './telemetry/service';
-
+export * from './types';
 export { Telemetry } from './telemetry/service';
-
-export type RenderUpselling = React.ReactNode;
-
-export type Services = CoreStart &
-  IntegrationAssistantPluginStartDependencies & {
-    telemetry: TelemetryService;
-    renderUpselling$: Observable<RenderUpselling | undefined>;
-  };
diff --git a/x-pack/plugins/integration_assistant/public/services/mocks/services.ts b/x-pack/plugins/integration_assistant/public/services/mocks/services.ts
new file mode 100644
index 0000000000000..5f71a99df523c
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/services/mocks/services.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { of } from 'rxjs';
+import { coreMock } from '@kbn/core/public/mocks';
+import { triggersActionsUiMock } from '@kbn/triggers-actions-ui-plugin/public/mocks';
+import { licensingMock } from '@kbn/licensing-plugin/public/mocks';
+import { telemetryServiceMock } from '../telemetry/mocks/service';
+
+export const mockServices = {
+  ...coreMock.createStart(),
+  triggersActionsUi: triggersActionsUiMock.createStart(),
+  licensing: licensingMock.createStart(),
+  telemetry: telemetryServiceMock.createStart(),
+  renderUpselling$: of(undefined),
+};
diff --git a/x-pack/plugins/integration_assistant/public/services/telemetry/mocks/service.ts b/x-pack/plugins/integration_assistant/public/services/telemetry/mocks/service.ts
new file mode 100644
index 0000000000000..63b7aa1fa4ba5
--- /dev/null
+++ b/x-pack/plugins/integration_assistant/public/services/telemetry/mocks/service.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const mockReportEvent = jest.fn();
+
+export const telemetryServiceMock = {
+  createStart: () => ({
+    reportEvent: mockReportEvent,
+  }),
+};
diff --git a/x-pack/plugins/integration_assistant/public/services/types.ts b/x-pack/plugins/integration_assistant/public/services/types.ts
index 0221da63b2676..43e398151661f 100644
--- a/x-pack/plugins/integration_assistant/public/services/types.ts
+++ b/x-pack/plugins/integration_assistant/public/services/types.ts
@@ -5,8 +5,14 @@
  * 2.0.
  */
 import type { CoreStart } from '@kbn/core/public';
+import type { Observable } from 'rxjs';
 import type { IntegrationAssistantPluginStartDependencies } from '../types';
 import type { TelemetryService } from './telemetry/service';
 
+export type RenderUpselling = React.ReactNode;
+
 export type Services = CoreStart &
-  IntegrationAssistantPluginStartDependencies & { telemetry: TelemetryService };
+  IntegrationAssistantPluginStartDependencies & {
+    telemetry: TelemetryService;
+    renderUpselling$: Observable<RenderUpselling | undefined>;
+  };
diff --git a/x-pack/plugins/integration_assistant/server/graphs/ecs/constants.ts b/x-pack/plugins/integration_assistant/server/graphs/ecs/constants.ts
index 607655541ca9d..dcbe1c10356b5 100644
--- a/x-pack/plugins/integration_assistant/server/graphs/ecs/constants.ts
+++ b/x-pack/plugins/integration_assistant/server/graphs/ecs/constants.ts
@@ -1688,13 +1688,61 @@ export const ECS_TYPES: EcsFields = {
 };
 
 export const ECS_FIELDS: EcsFields = {
+  'as.number': 'Unique number allocated to the autonomous system.',
+  'as.organization.name': 'Organization name of the autonomous system.',
+  'client.address': 'Client network address.',
+  'client.bytes': 'Bytes sent from the client to the server.',
+  'client.domain': 'Client domain.',
+  'client.geo.city_name': 'City name of the client.',
+  'client.geo.continent_name': 'Name of the continent of the client.',
+  'client.geo.country_name': 'Country name of the client.',
+  'client.geo.location': 'Longitude and latitude of the client.',
+  'client.geo.region_name': 'Region name of the client.',
+  'client.ip': 'Client IP address.',
+  'client.mac': 'MAC address of the client.',
+  'client.nat.ip': 'Translated IP client address.',
+  'client.nat.port': 'Translated port of client address.',
+  'client.packets': 'Packets sent from the client to the server.',
+  'client.port': 'Client port.',
+  'client.registered_domain': 'The highest registered client domain, stripped of the subdomain.',
+  'client.subdomain': 'Subdomain of the client.',
+  'client.top_level_domain': 'Top level domain of the client.',
+  'cloud.account.id': 'The cloud account or organization id.',
+  'cloud.availability_zone': 'Availability zone in which this host is running.',
+  'cloud.instance.id': 'Instance ID of the host machine.',
+  'cloud.instance.name': 'Instance name of the host machine.',
+  'cloud.machine.type': 'Machine type of the host machine.',
+  'cloud.project.id': 'The cloud project id.',
+  'cloud.project.name': 'The cloud project name.',
+  'cloud.provider': 'Name of the cloud provider.',
+  'cloud.region': 'Region in which this host is running.',
+  'container.id': 'Unique container id.',
+  'container.image.name': 'Name of the image the container is built on.',
+  'container.image.tag': 'Container image tag.',
+  'container.labels': 'Image labels.',
+  'container.name': 'Container name.',
+  'container.runtime': 'Runtime managing this container.',
+  'data_stream.dataset': 'Data stream dataset.',
+  'data_stream.namespace': 'Data stream namespace.',
+  'data_stream.type': 'Data stream type.',
   'destination.address': 'Destination network address.',
   'destination.bytes': 'Bytes sent from the destination to the source.',
-  'destination.domain': 'The domain name of the destination.',
-  'destination.ip': 'IP address of the destination.',
+  'destination.domain': 'Destination domain.',
+  'destination.geo.city_name': 'City name of the destination.',
+  'destination.geo.continent_name': 'Name of the continent of the destination.',
+  'destination.geo.country_name': 'Country name of the destination.',
+  'destination.geo.location': 'Longitude and latitude of the destination.',
+  'destination.geo.region_name': 'Region name of the destination.',
+  'destination.ip': 'Destination IP address.',
   'destination.mac': 'MAC address of the destination.',
+  'destination.nat.ip': 'Translated IP destination address.',
+  'destination.nat.port': 'Translated port of destination address.',
   'destination.packets': 'Packets sent from the destination to the source.',
-  'destination.port': 'Port of the destination.',
+  'destination.port': 'Destination port.',
+  'destination.registered_domain':
+    'The highest registered destination domain, stripped of the subdomain.',
+  'destination.subdomain': 'Subdomain of the destination.',
+  'destination.top_level_domain': 'Top level domain of the destination.',
   'destination.user.domain': 'Name of the directory the user is a member of.',
   'destination.user.email': 'User email address.',
   'destination.user.full_name': 'Users full name, if available.',
@@ -1703,92 +1751,305 @@ export const ECS_FIELDS: EcsFields = {
   'destination.user.group.name': 'Name of the group.',
   'destination.user.id': 'Unique identifier of the user.',
   'destination.user.name': 'Short name or login of the user.',
+  'dll.code_signature.status': 'Status of the DLL code signature.',
+  'dll.code_signature.subject_name': 'Subject name of the DLL code signer.',
+  'dll.code_signature.trusted': 'Flag indicating if the DLL code signature is trusted.',
+  'dll.code_signature.valid': 'Flag indicating if the DLL code signature is valid.',
+  'dll.hash.md5': 'MD5 hash of the DLL.',
+  'dll.hash.sha1': 'SHA1 hash of the DLL.',
+  'dll.hash.sha256': 'SHA256 hash of the DLL.',
+  'dll.name': 'Name of the DLL.',
+  'dll.path': 'Full path to the DLL file.',
+  'dll.pe.company': 'PE company name of the DLL.',
+  'dll.pe.description': 'PE description of the DLL.',
+  'dll.pe.file_version': 'PE file version of the DLL.',
+  'dll.pe.imphash': 'PE import hash of the DLL.',
+  'dll.pe.original_file_name': 'PE original file name of the DLL.',
+  'dll.pe.product': 'PE product name of the DLL.',
+  'dll.size': 'Size of the DLL in bytes.',
+  'dll.type': 'Type of the DLL.',
+  'dns.answers': 'DNS answers.',
+  'dns.header_flags': 'DNS header flags.',
+  'dns.id': 'DNS message ID.',
+  'dns.op_code': 'DNS operation code.',
+  'dns.question.class': 'DNS question class.',
+  'dns.question.name': 'DNS question name.',
+  'dns.question.registered_domain':
+    'The highest registered DNS question domain, stripped of the subdomain.',
+  'dns.question.subdomain': 'Subdomain of the DNS question.',
+  'dns.question.top_level_domain': 'Top level domain of the DNS question.',
+  'dns.question.type': 'DNS question type.',
+  'dns.resolved_ip': 'Resolved IP addresses from DNS query.',
+  'dns.response_code': 'DNS response code.',
+  'dns.type': 'DNS query type.',
+  'email.attachments': 'Email attachments.',
+  'email.bcc.address': 'Email addresses of BCC recipients.',
+  'email.bcc.domain': 'Domain of BCC recipients.',
+  'email.bcc.local': 'Local part of the BCC recipients.',
+  'email.bcc.registered_domain': 'The highest registered BCC domain, stripped of the subdomain.',
+  'email.bcc.subdomain': 'Subdomain of the BCC recipients.',
+  'email.bcc.top_level_domain': 'Top level domain of the BCC recipients.',
+  'email.cc.address': 'Email addresses of CC recipients.',
+  'email.cc.domain': 'Domain of CC recipients.',
+  'email.cc.local': 'Local part of the CC recipients.',
+  'email.cc.registered_domain': 'The highest registered CC domain, stripped of the subdomain.',
+  'email.cc.subdomain': 'Subdomain of the CC recipients.',
+  'email.cc.top_level_domain': 'Top level domain of the CC recipients.',
+  'email.content_type': 'Content type of the email.',
+  'email.delivery_timestamp': 'Time the email was delivered.',
+  'email.direction': 'Direction of the email.',
+  'email.from.address': 'Email address of the sender.',
+  'email.from.domain': 'Domain of the sender.',
+  'email.from.local': 'Local part of the sender.',
+  'email.from.registered_domain':
+    'The highest registered sender domain, stripped of the subdomain.',
+  'email.from.subdomain': 'Subdomain of the sender.',
+  'email.from.top_level_domain': 'Top level domain of the sender.',
+  'email.local_id': 'Local identifier of the email.',
+  'email.message_id': 'Message ID of the email.',
+  'email.origination_timestamp': 'Time the email was originated.',
+  'email.reply_to.address': 'Email address of the reply-to.',
+  'email.reply_to.domain': 'Domain of the reply-to.',
+  'email.reply_to.local': 'Local part of the reply-to.',
+  'email.reply_to.registered_domain':
+    'The highest registered reply-to domain, stripped of the subdomain.',
+  'email.reply_to.subdomain': 'Subdomain of the reply-to.',
+  'email.reply_to.top_level_domain': 'Top level domain of the reply-to.',
+  'email.sender.address': 'Email address of the sender.',
+  'email.sender.domain': 'Domain of the sender.',
+  'email.sender.local': 'Local part of the sender.',
+  'email.sender.registered_domain':
+    'The highest registered sender domain, stripped of the subdomain.',
+  'email.sender.subdomain': 'Subdomain of the sender.',
+  'email.sender.top_level_domain': 'Top level domain of the sender.',
+  'email.size': 'Size of the email in bytes.',
+  'email.subject': 'Subject of the email.',
+  'email.to.address': 'Email addresses of recipients.',
+  'email.to.domain': 'Domain of recipients.',
+  'email.to.local': 'Local part of the recipients.',
+  'email.to.registered_domain':
+    'The highest registered recipient domain, stripped of the subdomain.',
+  'email.to.subdomain': 'Subdomain of the recipients.',
+  'email.to.top_level_domain': 'Top level domain of the recipients.',
+  'error.code': 'Error code describing the error.',
+  'error.id': 'Unique identifier for the error.',
+  'error.stack_trace': 'Error stack trace.',
+  'error.type': 'Error type.',
   'event.action': 'The action captured by the event.',
-  'event.created': 'Time when the event was first read by an agent or by your pipeline.',
   'event.code': 'Identification code for this event.',
   'event.duration': 'Duration of the event in nanoseconds.',
-  'event.end':
-    'event.end contains the date when the event ended or when the activity was last observed.',
+  'event.end': 'Date when the event ended.',
+  'event.hash': 'Hash of the event.',
   'event.id': 'Unique ID to describe the event.',
+  'event.module': 'Name of the module this data is coming from.',
+  'event.outcome': 'The outcome of the event.',
+  'event.provider': 'Source of the event.',
+  'event.reason': 'Reason why this event happened.',
+  'event.reference': 'Reference URL describing this event.',
+  'event.result': 'The result of the event.',
+  'event.risk_score': 'Risk score or priority of the event.',
+  'event.risk_score_norm': 'Normalized risk score or priority of the event.',
+  'event.sequence': 'Sequence number of the event.',
   'event.severity': 'Numeric severity of the event.',
-  'file.directory': 'Directory where the file is located.',
-  'file.extension': 'File extension, excluding the leading dot.',
-  'file.gid': 'Primary group ID (GID) of the file.',
-  'file.group': 'Primary group name of the file.',
-  'file.hash.md5': 'MD5 hash.',
-  'file.hash.sha1': 'SHA1 hash.',
-  'file.hash.sha256': 'SHA256 hash.',
+  'event.start': 'Date when the event started.',
+  'event.timezone': 'Timezone in which the event was captured.',
+  'faas.coldstart': 'Indicator of a cold start invocation.',
+  'faas.execution': 'Execution identifier.',
+  'faas.id': 'Function ID.',
+  'faas.name': 'Function name.',
+  'faas.version': 'Function version.',
+  'file.accessed': 'Last time the file was accessed.',
+  'file.attributes': 'File attributes.',
+  'file.created': 'Date/time when the file was created.',
+  'file.ctime': 'Last time the file attributes or metadata changed.',
+  'file.device': 'Device that is the source of the file.',
+  'file.directory': 'Directory containing the file.',
+  'file.drive_letter': 'Drive letter where the file is located.',
+  'file.extension': 'File extension.',
+  'file.gid': 'GID or group ID of the file.',
+  'file.group': 'Group that owns the file.',
+  'file.hash.md5': 'MD5 hash of the file.',
+  'file.hash.sha1': 'SHA1 hash of the file.',
+  'file.hash.sha256': 'SHA256 hash of the file.',
   'file.inode': 'Inode representing the file in the filesystem.',
-  'file.name': 'Name of the file including the extension, without the directory.',
-  'file.path': 'Full path to the file, including the file name.',
+  'file.mime_type': 'File MIME type.',
+  'file.mode': 'File mode.',
+  'file.mtime': 'Last time the file content was modified.',
+  'file.name': 'File name.',
+  'file.owner': 'File owner.',
+  'file.path': 'File path.',
+  'file.puid': 'PUID or platform user ID of the file.',
   'file.size': 'File size in bytes.',
-  'file.uid': 'The user ID (UID) or security identifier (SID) of the file owner.',
-  'group.domain': 'Name of the directory the group is a member of.',
+  'file.target_path': 'Target path for symbolic links.',
+  'file.type': 'File type (file, dir, symlink, etc).',
+  'file.uid': 'UID or user ID of the file.',
+  'group.domain': 'Domain of the group.',
   'group.id': 'Unique identifier for the group on the system/platform.',
   'group.name': 'Name of the group.',
+  'host.architecture': 'Operating system architecture.',
+  'host.boot.id': 'Unique host boot identifier.',
+  'host.cpu.usage': 'Percent CPU usage.',
+  'host.disk.read.bytes': 'Total bytes read.',
+  'host.disk.write.bytes': 'Total bytes written.',
+  'host.geo.city_name': 'City name of the host.',
+  'host.geo.continent_name': 'Name of the continent of the host.',
+  'host.geo.country_name': 'Country name of the host.',
+  'host.geo.location': 'Longitude and latitude of the host.',
+  'host.geo.region_name': 'Region name of the host.',
+  'host.hostname': 'Hostname of the host.',
+  'host.id': 'Unique host id.',
+  'host.ip': 'IP address of the host.',
+  'host.mac': 'MAC address of the host.',
+  'host.name': 'Name of the host.',
+  'host.os.build': 'OS build information.',
+  'host.os.family': 'OS family (e.g., redhat, debian, freebsd, windows).',
+  'host.os.full': 'Operating system name, including the version or code name.',
+  'host.os.kernel': 'Operating system kernel version.',
+  'host.os.name': 'Operating system name.',
+  'host.os.platform': 'Operating system platform (e.g., centos, ubuntu, windows).',
+  'host.os.type': 'Operating system type (linux, macos, unix, windows).',
+  'host.os.version': 'Operating system version.',
+  'http.request.body.bytes': 'Size in bytes of the request body.',
+  'http.request.body.content': 'The full HTTP request body.',
+  'http.request.headers': 'HTTP request headers.',
   'http.request.method': 'HTTP request method.',
+  'http.request.mime_type': 'MIME type of the HTTP request.',
+  'http.request.referrer': 'Referrer for this HTTP request.',
+  'http.response.body.bytes': 'Size in bytes of the response body.',
+  'http.response.body.content': 'The full HTTP response body.',
+  'http.response.headers': 'HTTP response headers.',
+  'http.response.mime_type': 'MIME type of the HTTP response.',
   'http.response.status_code': 'HTTP response status code.',
   'http.version': 'HTTP version.',
-  'network.application': 'Application level protocol name.',
-  'network.bytes': 'Total bytes transferred in both directions.',
-  'network.direction': 'Direction of the network traffic.',
-  'network.packets': 'Total packets transferred in both directions.',
-  'network.protocol': 'Application protocol name.',
-  'network.transport': 'Protocol Name corresponding to the field `iana_number`.',
-  'network.type': 'In the OSI Model this would be the Network Layer. ipv4, ipv6, ipsec, pim, etc',
+  'interface.alias': 'Interface alias name.',
+  'interface.id': 'Unique identifier for the interface.',
+  'interface.name': 'Interface name.',
+  'interface.type': 'Interface type.',
+  'log.file.path': 'Path to the log file.',
+  'log.level': 'Log level of the log event.',
+  'log.logger': 'Name of the logger.',
+  'log.origin.file.line':
+    'Line number of the file containing the source code which originated the log.',
+  'log.origin.file.name': 'Name of the file containing the source code which originated the log.',
+  'log.origin.function': 'Name of the function which originated the log.',
+  'log.original': 'The original log message before any modification.',
+  'log.syslog.facility.code': 'Syslog facility code.',
+  'log.syslog.facility.name': 'Syslog facility name.',
+  'log.syslog.severity.code': 'Syslog severity code.',
+  'log.syslog.severity.name': 'Syslog severity name.',
+  'metricset.name': 'Name of the metricset.',
+  'network.application': 'Network application.',
+  'network.bytes': 'Total bytes transferred in the network event.',
+  'network.community_id': 'A hash of source and destination IPs, ports, and protocol.',
+  'network.direction': 'Network traffic direction (inbound, outbound).',
+  'network.forwarded_ip':
+    'The field is used to store the original source IP when a proxy or load balancer is in place.',
+  'network.iana_number': 'IANA Protocol Number.',
+  'network.name': 'Name given by operators to sections of their network.',
+  'network.packets': 'Total packets transferred in the network event.',
+  'network.protocol': 'L7 Network protocol name.',
+  'network.transport': 'L4 Network transport protocol.',
+  'network.type': 'Type of the network.',
   'organization.id': 'Unique identifier for the organization.',
-  'organization.name': 'Organization name.',
+  'organization.name': 'Name of the organization.',
+  'package.architecture': 'Package architecture.',
+  'package.checksum': 'Checksum of the package.',
+  'package.description': 'Package description.',
+  'package.install_scope': 'Scope of the package installation.',
+  'package.license': 'Package license.',
+  'package.name': 'Package name.',
+  'package.path': 'Package path.',
+  'package.reference': 'Package reference.',
+  'package.size': 'Package size.',
+  'package.version': 'Package version.',
   'process.args': 'Array of process arguments.',
   'process.args_count': 'Length of the process.args array.',
+  'process.code_signature.status': 'Status of the process code signature.',
+  'process.code_signature.subject_name': 'Subject name of the process code signer.',
+  'process.code_signature.trusted': 'Flag indicating if the process code signature is trusted.',
+  'process.code_signature.valid': 'Flag indicating if the process code signature is valid.',
   'process.command_line': 'Full command line that started the process.',
   'process.end': 'The time the process ended.',
   'process.executable': 'Absolute path to the process executable.',
-  'process.hash.md5': 'MD5 hash.',
-  'process.hash.sha1': 'SHA1 hash.',
-  'process.hash.sha256': 'SHA256 hash.',
+  'process.exit_code': 'Exit code of the process.',
+  'process.hash.md5': 'MD5 hash of the process executable.',
+  'process.hash.sha1': 'SHA1 hash of the process executable.',
+  'process.hash.sha256': 'SHA256 hash of the process executable.',
   'process.name': 'Process name.',
-  'process.parent.args': 'Array of process arguments.',
+  'process.parent.args': 'Array of parent process arguments.',
   'process.parent.args_count': 'Length of the process.args array.',
-  'process.parent.command_line': 'Full command line that started the process.',
-  'process.parent.end': 'The time the process ended.',
-  'process.parent.executable': 'Absolute path to the process executable.',
+  'process.parent.code_signature.status': 'Status of the parent process code signature.',
+  'process.parent.code_signature.subject_name': 'Subject name of the parent process code signer.',
+  'process.parent.code_signature.trusted':
+    'Flag indicating if the parent process code signature is trusted.',
+  'process.parent.code_signature.valid':
+    'Flag indicating if the parent process code signature is valid.',
+  'process.parent.command_line': 'Full command line that started the parent process.',
+  'process.parent.end': 'The time the parent process ended.',
+  'process.parent.executable': 'Absolute path to the parent process executable.',
+  'process.parent.exit_code': 'Exit code of the parent process.',
   'process.parent.group.id': 'Unique identifier for the group on the system/platform.',
   'process.parent.group.name': 'Name of the group.',
-  'process.parent.hash.md5': 'MD5 hash.',
-  'process.parent.hash.sha1': 'SHA1 hash.',
-  'process.parent.hash.sha256': 'SHA256 hash.',
-  'process.parent.name': 'Process name.',
+  'process.parent.hash.md5': 'MD5 hash of the parent process executable.',
+  'process.parent.hash.sha1': 'SHA1 hash of the parent process executable.',
+  'process.parent.hash.sha256': 'SHA256 hash of the parent process executable.',
+  'process.parent.name': 'Parent process name.',
   'process.parent.pgid': 'Deprecated identifier of the group of processes the process belongs to.',
-  'process.parent.pid': 'Process id.',
-  'process.parent.start': 'The time the process started.',
-  'process.parent.thread.id': 'Thread ID.',
-  'process.parent.thread.name': 'Thread name.',
-  'process.parent.user.id': 'Unique identifier of the user.',
+  'process.parent.pid': 'Parent process ID.',
+  'process.parent.start': 'The date/time when the parent process started.',
+  'process.parent.working_directory': 'The working directory of the parent process.',
   'process.parent.user.name': 'Short name or login of the user.',
   'process.pgid': 'Deprecated identifier of the group of processes the process belongs to.',
-  'process.pid': 'Process id.',
-  'process.start': 'The time the process started.',
+  'process.pid': 'Process ID.',
+  'process.start': 'The date/time when the process started.',
   'process.thread.id': 'Thread ID.',
   'process.thread.name': 'Thread name.',
-  'process.user.id': 'Unique identifier of the user.',
-  'process.user.name': 'Short name or login of the user.',
-  'rule.author': 'Rule author',
-  'rule.category': 'Rule category',
-  'rule.description': 'Rule description',
-  'rule.id': 'Rule ID',
+  'process.title': 'Process title.',
+  'process.working_directory': 'The working directory of the process.',
+  'rule.author': 'Author of the rule.',
+  'rule.category': 'Rule category.',
+  'rule.description': 'Rule description.',
+  'rule.id': 'Unique rule ID.',
   'rule.license': 'Rule license',
-  'rule.name': 'Rule name',
+  'rule.name': 'Name of the rule.',
   'rule.reference': 'Rule reference URL',
-  'rule.ruleset': 'Rule ruleset',
-  'rule.uuid': 'Rule UUID',
   'rule.version': 'Rule version',
+  'rule.ruleset': 'Rule set to which the rule belongs.',
+  'rule.uuid': 'Rule UUID.',
+  'server.address': 'Server network address.',
+  'server.bytes': 'Bytes sent from the server to the client.',
+  'server.domain': 'Server domain.',
+  'server.geo.city_name': 'City name of the server.',
+  'server.geo.continent_name': 'Name of the continent of the server.',
+  'server.geo.country_name': 'Country name of the server.',
+  'server.geo.location': 'Longitude and latitude of the server.',
+  'server.geo.region_name': 'Region name of the server.',
+  'server.ip': 'Server IP address.',
+  'server.mac': 'MAC address of the server.',
+  'server.nat.ip': 'Translated IP server address.',
+  'server.nat.port': 'Translated port of server address.',
+  'server.packets': 'Packets sent from the server to the client.',
+  'server.port': 'Server port.',
+  'server.registered_domain': 'The highest registered server domain, stripped of the subdomain.',
+  'server.subdomain': 'Subdomain of the server.',
+  'server.top_level_domain': 'Top level domain of the server.',
   'source.address': 'Source network address.',
   'source.bytes': 'Bytes sent from the source to the destination.',
-  'source.domain': 'The domain name of the source.',
-  'source.ip': 'IP address of the source.',
+  'source.domain': 'Source domain.',
+  'source.geo.city_name': 'City name of the source.',
+  'source.geo.continent_name': 'Name of the continent of the source.',
+  'source.geo.country_name': 'Country name of the source.',
+  'source.geo.location': 'Longitude and latitude of the source.',
+  'source.geo.region_name': 'Region name of the source.',
+  'source.ip': 'Source IP address.',
   'source.mac': 'MAC address of the source.',
+  'source.nat.ip': 'Translated IP source address.',
+  'source.nat.port': 'Translated port of source address.',
   'source.packets': 'Packets sent from the source to the destination.',
-  'source.port': 'Port of the source.',
+  'source.port': 'Source port.',
+  'source.registered_domain': 'The highest registered source domain, stripped of the subdomain.',
+  'source.subdomain': 'Subdomain of the source.',
+  'source.top_level_domain': 'Top level domain of the source.',
   'source.user.domain': 'Name of the directory the user is a member of.',
   'source.user.email': 'User email address.',
   'source.user.full_name': 'Users full name, if available.',
@@ -1798,33 +2059,92 @@ export const ECS_FIELDS: EcsFields = {
   'source.user.id': 'Unique identifier of the user.',
   'source.user.name': 'Short name or login of the user.',
   'source.user.roles': 'Array of user roles at the time of the event.',
+  'threat.framework': 'Name of the threat framework used.',
+  'threat.tactic.id': 'The ID of the tactic.',
+  'threat.tactic.name': 'Name of the tactic.',
+  'threat.tactic.reference': 'Reference URL of the tactic.',
+  'threat.technique.id': 'The ID of the technique.',
+  'threat.technique.name': 'Name of the technique.',
+  'threat.technique.reference': 'Reference URL of the technique.',
+  'threat.technique.subtechnique.id': 'The ID of the subtechnique.',
+  'threat.technique.subtechnique.name': 'Name of the subtechnique.',
+  'threat.technique.subtechnique.reference': 'Reference URL of the subtechnique.',
   'tls.server.x509.alternative_names': 'List of subject alternative names (SAN).',
   'tls.server.x509.issuer.common_name':
     'List of common name (CN) of issuing certificate authority.',
-  'threat.framework': 'Threat classification framework.',
-  'threat.tactic.id': 'Threat tactic id.',
-  'threat.tactic.name': 'Threat tactic.',
-  'threat.technique.id': 'Threat technique id.',
-  'threat.technique.name': 'Threat technique name.',
-  'url.domain': 'Domain of the url.',
-  'url.extension': 'File extension from the request url, excluding the leading dot.',
-  'url.fragment': 'Portion of the url after the `#`.',
-  'url.full': 'Full unparsed URL.',
-  'url.original': 'Unmodified original url as seen in the event source.',
-  'url.path': 'Path of the request, such as "/search".',
-  'url.port': 'Port of the request, such as 443.',
-  'url.query': 'Query string of the request.',
-  'url.scheme': 'Scheme of the url.',
-  'user.domain': 'Name of the directory the user is a member of.',
-  'user.email': 'User email address.',
-  'user.full_name': 'Users full name, if available.',
-  'user.group.domain': 'Name of the directory the group is a member of.',
-  'user.group.id': 'Unique identifier for the group on the system/platform.',
-  'user.group.name': 'Name of the group.',
+  'trace.id': 'Unique identifier for a trace.',
+  'transaction.id': 'Unique identifier for a transaction.',
+  'url.domain': 'Domain of the URL.',
+  'url.extension': 'File extension from the URL.',
+  'url.fragment': 'Fragment identifier of the URL.',
+  'url.full': 'Full URL.',
+  'url.original': 'Original URL.',
+  'url.password': 'Password from the URL.',
+  'url.path': 'Path of the URL.',
+  'url.port': 'Port of the URL.',
+  'url.query': 'Query string of the URL.',
+  'url.registered_domain': 'The highest registered domain, stripped of the subdomain.',
+  'url.scheme': 'Scheme of the URL.',
+  'url.subdomain': 'Subdomain of the URL.',
+  'url.top_level_domain': 'Top level domain of the URL.',
+  'url.username': 'Username from the URL.',
+  'user.changes.domain': 'Domain of the target user.',
+  'user.changes.email': "Target user's email address.",
+  'user.changes.full_name': "Target user's full name.",
+  'user.changes.group.id': "Unique identifier for the target user's group.",
+  'user.changes.group.name': "Target user's group name.",
+  'user.changes.id': 'Unique identifier of the target user.',
+  'user.changes.name': "Target user's name.",
+  'user.domain': 'Domain of the user.',
+  'user.effective.domain': 'Domain of the effective user.',
+  'user.effective.email': "Effective user's email address.",
+  'user.effective.full_name': "Effective user's full name.",
+  'user.effective.group.id': "Unique identifier for the effective user's group.",
+  'user.effective.group.name': "Effective user's group name.",
+  'user.effective.id': 'Unique identifier of the effective user.',
+  'user.effective.name': "Effective user's name.",
+  'user.email': "User's email address.",
+  'user.full_name': "User's full name.",
+  'user.group.domain': "Domain of the user's group.",
+  'user.group.id': "Unique identifier for the user's group.",
+  'user.group.name': "User's group name.",
+  'user.hash': 'User hash.',
   'user.id': 'Unique identifier of the user.',
-  'user.name': 'Short name or login of the user.',
-  'user.roles': 'Array of user roles at the time of the event.',
-  'user_agent.original': 'Unparsed user_agent string.',
+  'user.name': "User's name.",
+  'user.target.domain': 'Domain of the target user.',
+  'user.target.email': "Target user's email address.",
+  'user.target.full_name': "Target user's full name.",
+  'user.target.group.id': "Unique identifier for the target user's group.",
+  'user.target.group.name': "Target user's group name.",
+  'user.target.id': 'Unique identifier of the target user.',
+  'user.target.name': "Target user's name.",
+  'user_agent.device.name': 'Device name from the user agent string.',
+  'user_agent.name': 'Name of the user agent.',
+  'user_agent.original': 'Original user agent string.',
+  'user_agent.os.family': 'OS family from the user agent string.',
+  'user_agent.os.full': 'Full OS information from the user agent string.',
+  'user_agent.os.name': 'OS name from the user agent string.',
+  'user_agent.os.version': 'OS version from the user agent string.',
+  'user_agent.version': 'Version of the user agent.',
+  'vlan.id': 'VLAN ID.',
+  'vlan.name': 'VLAN name.',
+  'vulnerability.category': 'Vulnerability category.',
+  'vulnerability.classification': 'Vulnerability classification.',
+  'vulnerability.description': 'Vulnerability description.',
+  'vulnerability.enumeration': 'Vulnerability enumeration.',
+  'vulnerability.id': 'Unique vulnerability identifier.',
+  'vulnerability.reference': 'Vulnerability reference URL.',
+  'vulnerability.report_id': 'The report or scan identification number.',
+  'vulnerability.scanner.vendor': 'Name of the vulnerability scanner vendor.',
+  'vulnerability.score.base':
+    'Scores can range from 0.0 to 10.0, with 10.0 being the most severe. Base scores cover an assessment for exploitability metrics (attack vector, complexity, privileges, and user interaction), impact metrics (confidentiality, integrity, and availability), and scope..',
+  'vulnerability.score.environmental':
+    'Scores can range from 0.0 to 10.0, with 10.0 being the most severe. Environmental scores cover an assessment for any modified Base metrics, confidentiality, integrity, and availability requirements.',
+  'vulnerability.score.temporal':
+    'Scores can range from 0.0 to 10.0, with 10.0 being the most severe. Temporal scores cover an assessment for code maturity, remediation level, and confidence.',
+  'vulnerability.score.version':
+    'The National Vulnerability Database (NVD) provides qualitative severity rankings of "Low", "Medium", and "High" for CVSS v2.0 base score ranges in addition to the severity ratings for CVSS v3.0 as they are defined in the CVSS v3.0 specification.',
+  'vulnerability.severity': 'Vulnerability severity.',
 };
 
 export const ECS_EXAMPLE_ANSWER = {
diff --git a/x-pack/plugins/integration_assistant/server/routes/categorization_routes.ts b/x-pack/plugins/integration_assistant/server/routes/categorization_routes.ts
index 2dbdc63210a59..80ebe9eb65258 100644
--- a/x-pack/plugins/integration_assistant/server/routes/categorization_routes.ts
+++ b/x-pack/plugins/integration_assistant/server/routes/categorization_routes.ts
@@ -11,6 +11,8 @@ import {
   ActionsClientChatOpenAI,
   ActionsClientSimpleChatModel,
 } from '@kbn/langchain/server/language_models';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import {
   CATEGORIZATION_GRAPH_PATH,
   CategorizationRequestBody,
@@ -46,7 +48,8 @@ export function registerCategorizationRoutes(
       },
       withAvailability(
         async (context, req, res): Promise<IKibanaResponse<CategorizationResponse>> => {
-          const { packageName, dataStreamName, rawSamples, currentPipeline } = req.body;
+          const { packageName, dataStreamName, rawSamples, currentPipeline, langSmithOptions } =
+            req.body;
           const services = await context.resolve(['core']);
           const { client } = services.core.elasticsearch;
           const { getStartServices, logger } = await context.integrationAssistant;
@@ -76,13 +79,22 @@ export function registerCategorizationRoutes(
               streaming: false,
             });
 
-            const graph = await getCategorizationGraph(client, model);
-            const results = await graph.invoke({
+            const parameters = {
               packageName,
               dataStreamName,
               rawSamples,
               currentPipeline,
-            });
+            };
+            const options = {
+              callbacks: [
+                new APMTracer({ projectName: langSmithOptions?.projectName ?? 'default' }, logger),
+                ...getLangSmithTracer({ ...langSmithOptions, logger }),
+              ],
+            };
+
+            const graph = await getCategorizationGraph(client, model);
+            const results = await graph.invoke(parameters, options);
+
             return res.ok({ body: CategorizationResponse.parse(results) });
           } catch (e) {
             return res.badRequest({ body: e });
diff --git a/x-pack/plugins/integration_assistant/server/routes/ecs_routes.ts b/x-pack/plugins/integration_assistant/server/routes/ecs_routes.ts
index d177aeb4b2cdf..69b13a004e98e 100644
--- a/x-pack/plugins/integration_assistant/server/routes/ecs_routes.ts
+++ b/x-pack/plugins/integration_assistant/server/routes/ecs_routes.ts
@@ -11,6 +11,8 @@ import {
   ActionsClientChatOpenAI,
   ActionsClientSimpleChatModel,
 } from '@kbn/langchain/server/language_models';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import { ECS_GRAPH_PATH, EcsMappingRequestBody, EcsMappingResponse } from '../../common';
 import { ROUTE_HANDLER_TIMEOUT } from '../constants';
 import { getEcsGraph } from '../graphs/ecs';
@@ -39,7 +41,7 @@ export function registerEcsRoutes(router: IRouter<IntegrationAssistantRouteHandl
         },
       },
       withAvailability(async (context, req, res): Promise<IKibanaResponse<EcsMappingResponse>> => {
-        const { packageName, dataStreamName, rawSamples, mapping } = req.body;
+        const { packageName, dataStreamName, rawSamples, mapping, langSmithOptions } = req.body;
         const { getStartServices, logger } = await context.integrationAssistant;
 
         const [, { actions: actionsPlugin }] = await getStartServices();
@@ -53,6 +55,7 @@ export function registerEcsRoutes(router: IRouter<IntegrationAssistantRouteHandl
 
           const abortSignal = getRequestAbortedSignal(req.events.aborted$);
           const isOpenAI = connector.actionTypeId === '.gen-ai';
+
           const llmClass = isOpenAI ? ActionsClientChatOpenAI : ActionsClientSimpleChatModel;
 
           const model = new llmClass({
@@ -67,22 +70,23 @@ export function registerEcsRoutes(router: IRouter<IntegrationAssistantRouteHandl
             streaming: false,
           });
 
+          const parameters = {
+            packageName,
+            dataStreamName,
+            rawSamples,
+            ...(mapping && { mapping }),
+          };
+
+          const options = {
+            callbacks: [
+              new APMTracer({ projectName: langSmithOptions?.projectName ?? 'default' }, logger),
+              ...getLangSmithTracer({ ...langSmithOptions, logger }),
+            ],
+          };
+
           const graph = await getEcsGraph(model);
+          const results = await graph.invoke(parameters, options);
 
-          let results;
-          if (req.body?.mapping) {
-            results = await graph.invoke({
-              packageName,
-              dataStreamName,
-              rawSamples,
-              mapping,
-            });
-          } else
-            results = await graph.invoke({
-              packageName,
-              dataStreamName,
-              rawSamples,
-            });
           return res.ok({ body: EcsMappingResponse.parse(results) });
         } catch (e) {
           return res.badRequest({ body: e });
diff --git a/x-pack/plugins/integration_assistant/server/routes/related_routes.ts b/x-pack/plugins/integration_assistant/server/routes/related_routes.ts
index 16c4fba5ac8dc..8db09a8aae2b6 100644
--- a/x-pack/plugins/integration_assistant/server/routes/related_routes.ts
+++ b/x-pack/plugins/integration_assistant/server/routes/related_routes.ts
@@ -11,6 +11,8 @@ import {
   ActionsClientChatOpenAI,
   ActionsClientSimpleChatModel,
 } from '@kbn/langchain/server/language_models';
+import { APMTracer } from '@kbn/langchain/server/tracers/apm';
+import { getLangSmithTracer } from '@kbn/langchain/server/tracers/langsmith';
 import { RELATED_GRAPH_PATH, RelatedRequestBody, RelatedResponse } from '../../common';
 import { ROUTE_HANDLER_TIMEOUT } from '../constants';
 import { getRelatedGraph } from '../graphs/related';
@@ -39,7 +41,8 @@ export function registerRelatedRoutes(router: IRouter<IntegrationAssistantRouteH
         },
       },
       withAvailability(async (context, req, res): Promise<IKibanaResponse<RelatedResponse>> => {
-        const { packageName, dataStreamName, rawSamples, currentPipeline } = req.body;
+        const { packageName, dataStreamName, rawSamples, currentPipeline, langSmithOptions } =
+          req.body;
         const services = await context.resolve(['core']);
         const { client } = services.core.elasticsearch;
         const { getStartServices, logger } = await context.integrationAssistant;
@@ -68,13 +71,21 @@ export function registerRelatedRoutes(router: IRouter<IntegrationAssistantRouteH
             streaming: false,
           });
 
-          const graph = await getRelatedGraph(client, model);
-          const results = await graph.invoke({
+          const parameters = {
             packageName,
             dataStreamName,
             rawSamples,
             currentPipeline,
-          });
+          };
+          const options = {
+            callbacks: [
+              new APMTracer({ projectName: langSmithOptions?.projectName ?? 'default' }, logger),
+              ...getLangSmithTracer({ ...langSmithOptions, logger }),
+            ],
+          };
+
+          const graph = await getRelatedGraph(client, model);
+          const results = await graph.invoke(parameters, options);
           return res.ok({ body: RelatedResponse.parse(results) });
         } catch (e) {
           return res.badRequest({ body: e });
diff --git a/x-pack/plugins/integration_assistant/server/templates/pipeline.yml.njk b/x-pack/plugins/integration_assistant/server/templates/pipeline.yml.njk
index ba4bee23cf633..d0289f234ef56 100644
--- a/x-pack/plugins/integration_assistant/server/templates/pipeline.yml.njk
+++ b/x-pack/plugins/integration_assistant/server/templates/pipeline.yml.njk
@@ -27,6 +27,14 @@ processors:
       target_field: {% if value.target_field | startswith('@') %}"{{ value.target_field }}"{% else %}{{ value.target_field }}{% endif %}
       ignore_missing: true{% endif %}
   {% if key == 'date' %}
+  - script:
+      description: Ensures the date processor does not receive an array value.
+      tag: script_convert_array_to_string
+      lang: painless
+      {% raw %}source: |
+        if (ctx.{% endraw %}{{ value.field }}{% raw %} instanceof ArrayList){
+            ctx.{% endraw %}{{ value.field }}{% raw %} = ctx.{% endraw %}{{ value.field }}{% raw %}[0];
+        }{% endraw %}
   - {{ key }}:
       field: {{ value.field }}
       target_field: {% if value.target_field | startswith('@') %}"{{ value.target_field }}"{% else %}{{ value.target_field }}{% endif %}
@@ -34,6 +42,7 @@ processors:
       {% for format in value.formats %}
         - {{ format }}
       {% endfor %}
+      tag: date_processor_{{ value.field}}
       if: "ctx.{{ value.if }} != null"{% endif %}
   {% if key == 'convert' %}
   - {{ key }}:
diff --git a/x-pack/plugins/integration_assistant/tsconfig.json b/x-pack/plugins/integration_assistant/tsconfig.json
index 47087c83731a0..9880fb1f93402 100644
--- a/x-pack/plugins/integration_assistant/tsconfig.json
+++ b/x-pack/plugins/integration_assistant/tsconfig.json
@@ -36,6 +36,7 @@
     "@kbn/licensing-plugin",
     "@kbn/core-http-request-handler-context-server",
     "@kbn/core-http-router-server-mocks",
-    "@kbn/core-http-server"
+    "@kbn/core-http-server",
+    "@kbn/kibana-utils-plugin"
   ]
 }
diff --git a/x-pack/plugins/lens/kibana.jsonc b/x-pack/plugins/lens/kibana.jsonc
index 367260bae0f00..10eb3721414fe 100644
--- a/x-pack/plugins/lens/kibana.jsonc
+++ b/x-pack/plugins/lens/kibana.jsonc
@@ -56,7 +56,7 @@
       "embeddable",
       "fieldFormats",
       "charts",
-      "textBasedLanguages",
+      "esql",
     ],
     "extraPublicDirs": [
       "common/constants"
diff --git a/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx b/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx
index 5c163df2c0715..98233c7ebffef 100644
--- a/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx
+++ b/x-pack/plugins/lens/public/app_plugin/shared/edit_on_the_fly/lens_configuration_flyout.tsx
@@ -26,7 +26,7 @@ import {
   getLanguageDisplayName,
 } from '@kbn/es-query';
 import type { AggregateQuery, Query } from '@kbn/es-query';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import { DefaultInspectorAdapters } from '@kbn/expressions-plugin/common';
 import { buildExpression } from '../../../editor_frame_service/editor_frame/expression_helpers';
 import { MAX_NUM_OF_COLUMNS } from '../../../datasources/text_based/utils';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
index e049da2c30965..f6caf22b075b0 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
@@ -18,7 +18,7 @@ import {
   EuiLink,
   useEuiTheme,
 } from '@elastic/eui';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import {
   DEFAULT_DURATION_INPUT_FORMAT,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
index 97bb7270d3431..ad9a1067dcae7 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile.tsx
@@ -15,7 +15,7 @@ import {
   ExpressionAstExpressionBuilder,
   ExpressionAstFunctionBuilder,
 } from '@kbn/expressions-plugin/public';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { PERCENTILE_ID, PERCENTILE_NAME } from '@kbn/lens-formula-docs';
 import { OperationDefinition } from '.';
 import {
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
index f1abee52f68c9..575bcc2ec0ed0 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/percentile_ranks.tsx
@@ -10,7 +10,7 @@ import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { AggFunctionsMapping } from '@kbn/data-plugin/public';
 import { buildExpressionFunction } from '@kbn/expressions-plugin/public';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { PERCENTILE_RANK_ID, PERCENTILE_RANK_NAME } from '@kbn/lens-formula-docs';
 import { OperationDefinition } from '.';
 import {
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
index 34cbd2398eab2..73096d12404a3 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/shared_components/label_input.tsx
@@ -8,7 +8,7 @@
 import React, { useRef } from 'react';
 import { EuiFieldText, keys } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 export const LabelInput = ({
   value,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
index eef9ee2e9017d..715889b896ced 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/static_value.tsx
@@ -7,7 +7,7 @@
 import React, { useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { OperationDefinition } from '.';
 import {
   ReferenceBasedIndexPatternColumn,
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
index 428747b6cda75..2a88a72029648 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/field_inputs.tsx
@@ -9,12 +9,12 @@ import React, { useCallback, useMemo } from 'react';
 import { htmlIdGenerator } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import {
-  useDebouncedValue,
   DragDropBuckets,
   FieldsBucketContainer,
   NewBucketButton,
   DraggableBucketContainer,
 } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { IndexPattern } from '../../../../../types';
 import { FieldSelect } from '../../../dimension_panel/field_select';
 import type { TermsIndexPatternColumn } from './types';
diff --git a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
index 3c61d0aae580a..7591385256862 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/operations/definitions/terms/include_exclude_options.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { uniq } from 'lodash';
 import { EuiComboBox, EuiFormRow, EuiSpacer, EuiSwitch, EuiFieldText, EuiText } from '@elastic/eui';
 import type { DatatableRow } from '@kbn/expressions-plugin/common';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 export interface IncludeExcludeOptions {
   label: string;
diff --git a/x-pack/plugins/lens/public/embeddable/interfaces/lens_api.ts b/x-pack/plugins/lens/public/embeddable/interfaces/lens_api.ts
index d61ddf0448415..3a03e63ded311 100644
--- a/x-pack/plugins/lens/public/embeddable/interfaces/lens_api.ts
+++ b/x-pack/plugins/lens/public/embeddable/interfaces/lens_api.ts
@@ -22,12 +22,13 @@ export type HasLensConfig = HasType<'lens'> & {
   getSavedVis: () => Readonly<LensSavedObjectAttributes | undefined>;
   canViewUnderlyingData: () => Promise<boolean>;
   getViewUnderlyingDataArgs: () => ViewUnderlyingDataArgs;
+  getFullAttributes: () => LensSavedObjectAttributes | undefined;
 };
 
 export type LensApi = HasLensConfig &
   PublishesPanelTitle &
   PublishesUnifiedSearch &
-  Partial<HasParentApi<unknown>>;
+  Partial<HasParentApi<Partial<PublishesUnifiedSearch>>>;
 
 export const isLensApi = (api: unknown): api is LensApi => {
   return Boolean(
@@ -36,6 +37,7 @@ export const isLensApi = (api: unknown): api is LensApi => {
       typeof (api as HasLensConfig).getSavedVis === 'function' &&
       typeof (api as HasLensConfig).canViewUnderlyingData === 'function' &&
       typeof (api as HasLensConfig).getViewUnderlyingDataArgs === 'function' &&
+      typeof (api as HasLensConfig).getFullAttributes === 'function' &&
       apiPublishesPanelTitle(api) &&
       apiPublishesUnifiedSearch(api)
   );
diff --git a/x-pack/plugins/lens/public/shared_components/axis/title/toolbar_title_settings.tsx b/x-pack/plugins/lens/public/shared_components/axis/title/toolbar_title_settings.tsx
index 258e41624402d..8305b8f98bd4c 100644
--- a/x-pack/plugins/lens/public/shared_components/axis/title/toolbar_title_settings.tsx
+++ b/x-pack/plugins/lens/public/shared_components/axis/title/toolbar_title_settings.tsx
@@ -8,7 +8,7 @@
 import React, { useCallback, useMemo } from 'react';
 import { EuiSpacer, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import type { AxesSettingsConfig } from '../../../visualizations/xy/types';
 import { type LabelMode, VisLabel } from '../..';
 
diff --git a/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx b/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
index 81d1acd84e0fe..9e71dcf8b5322 100644
--- a/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend/layout/columns_number_setting.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFieldNumber, EuiFormRow } from '@elastic/eui';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 export const DEFAULT_FLOATING_COLUMNS = 1;
 
diff --git a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
index 80389e041763f..9498927dec722 100644
--- a/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/shared_components/legend/legend_settings_popover.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import { Position, VerticalAlignment, HorizontalAlignment, LegendValue } from '@elastic/charts';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { XYLegendValue } from '@kbn/visualizations-plugin/common/constants';
 import { ToolbarPopover, type ToolbarPopoverProps } from '../toolbar_popover';
 import { LegendLocationSettings } from './location/legend_location_settings';
diff --git a/x-pack/plugins/lens/public/shared_components/toolbar_popover.scss b/x-pack/plugins/lens/public/shared_components/toolbar_popover.scss
index c06f13dfc2eb1..823859866eb2a 100644
--- a/x-pack/plugins/lens/public/shared_components/toolbar_popover.scss
+++ b/x-pack/plugins/lens/public/shared_components/toolbar_popover.scss
@@ -1,3 +1,3 @@
 .lnsVisToolbar__popover {
-  width: 404px;
+  width: 410px;
 }
diff --git a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
index fca5e37ccc200..45dc8cbe32898 100644
--- a/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
+++ b/x-pack/plugins/lens/public/trigger_actions/open_in_discover_action.test.ts
@@ -23,6 +23,7 @@ describe('open in discover action', () => {
     timeRange$: new BehaviorSubject({ from: 'now-15m', to: 'now' }),
     getSavedVis: jest.fn(() => undefined),
     canViewUnderlyingData: () => Promise.resolve(true),
+    getFullAttributes: jest.fn(() => undefined),
     getViewUnderlyingDataArgs: jest.fn(() => ({
       dataViewSpec: { id: 'index-pattern-id' },
       timeRange: { from: 'now-7d', to: 'now' },
diff --git a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
index 62cd0a6252923..62e038d71090c 100644
--- a/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
+++ b/x-pack/plugins/lens/public/visualizations/datatable/components/dimension_editor_addtional_section.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { css } from '@emotion/react';
 import { EuiFormRow, EuiFieldText, EuiText, useEuiTheme, EuiComboBox } from '@elastic/eui';
 import { PaletteRegistry } from '@kbn/coloring';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import type { VisualizationDimensionEditorProps } from '../../../types';
 import type { DatatableVisualizationState } from '../visualization';
 
diff --git a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
index 7ce2f02a0b140..a0009e4ec6861 100644
--- a/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/gauge/toolbar_component/index.tsx
@@ -9,7 +9,7 @@ import React, { memo, useState } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { GaugeLabelMajorMode } from '@kbn/expression-gauge-plugin/common';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import type { VisualizationToolbarProps } from '../../../types';
 import { ToolbarPopover, VisLabel } from '../../../shared_components';
 import './gauge_config_panel.scss';
diff --git a/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx b/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
index 327bdef6c5bc4..9d5e081ba351d 100644
--- a/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
+++ b/x-pack/plugins/lens/public/visualizations/heatmap/toolbar_component.tsx
@@ -60,7 +60,7 @@ export const HeatmapToolbar = memo(
         <EuiFlexItem grow={false}>
           <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
             <ToolbarPopover
-              title={i18n.translate('xpack.lens.shared.curveLabel', {
+              title={i18n.translate('xpack.lens.shared.visualOptionsLabel', {
                 defaultMessage: 'Visual options',
               })}
               type="visualOptions"
diff --git a/x-pack/plugins/lens/public/visualizations/metric/constants.ts b/x-pack/plugins/lens/public/visualizations/metric/constants.ts
index 9aed58ccfe44c..ea99904963dfe 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/constants.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/constants.ts
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
+import { OptionalKeys } from 'utility-types';
+import { MetricVisualizationState } from './types';
+
 export const LENS_METRIC_ID = 'lnsMetric';
 
 export const GROUP_ID = {
@@ -17,3 +20,23 @@ export const GROUP_ID = {
   TREND_TIME: 'trendTime',
   TREND_BREAKDOWN_BY: 'trendBreakdownBy',
 } as const;
+
+type MetricVisualizationStateOptionals = Pick<
+  MetricVisualizationState,
+  OptionalKeys<MetricVisualizationState>
+>;
+
+/**
+ * Defaults for select optional Metric vis state options
+ */
+export const metricStateDefaults: Required<
+  Pick<
+    MetricVisualizationStateOptionals,
+    'titlesTextAlign' | 'valuesTextAlign' | 'iconAlign' | 'valueFontMode'
+  >
+> = {
+  titlesTextAlign: 'left',
+  valuesTextAlign: 'right',
+  iconAlign: 'left',
+  valueFontMode: 'default',
+};
diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
index 429a681027e63..a239b12deb5be 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.test.tsx
@@ -13,7 +13,7 @@ import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { euiLightVars } from '@kbn/ui-theme';
 import { CustomPaletteParams, PaletteOutput, PaletteRegistry } from '@kbn/coloring';
 import { VisualizationDimensionEditorProps } from '../../types';
-import { MetricVisualizationState } from './visualization';
+import { MetricVisualizationState } from './types';
 import {
   DimensionEditor,
   DimensionEditorAdditionalSection,
@@ -59,6 +59,10 @@ describe('dimension editor', () => {
     palette,
     icon: 'tag',
     showBar: true,
+    titlesTextAlign: 'left',
+    valuesTextAlign: 'right',
+    iconAlign: 'left',
+    valueFontMode: 'default',
     trendlineLayerId: 'second',
     trendlineLayerType: 'metricTrendline',
     trendlineMetricAccessor: 'trendline-metric-col-id',
diff --git a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
index 43179e9cba51d..f040c6dc86fa4 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/dimension_editor.tsx
@@ -28,19 +28,16 @@ import {
 import { getDataBoundsForPalette } from '@kbn/expression-metric-vis-plugin/public';
 import { getColumnByAccessor } from '@kbn/visualizations-plugin/common/utils';
 import { css } from '@emotion/react';
-import { DebouncedInput, useDebouncedValue, IconSelect } from '@kbn/visualization-ui-components';
+import { DebouncedInput, IconSelect } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { isNumericFieldForDatatable } from '../../../common/expressions/datatable/utils';
 import { applyPaletteParams, PalettePanelContainer } from '../../shared_components';
 import type { VisualizationDimensionEditorProps } from '../../types';
 import { defaultNumberPaletteParams, defaultPercentagePaletteParams } from './palette_config';
-import {
-  DEFAULT_MAX_COLUMNS,
-  getDefaultColor,
-  MetricVisualizationState,
-  showingBar,
-} from './visualization';
+import { DEFAULT_MAX_COLUMNS, getDefaultColor, showingBar } from './visualization';
 import { CollapseSetting } from '../../shared_components/collapse_setting';
 import { iconsSet } from './icon_set';
+import { MetricVisualizationState } from './types';
 
 export type SupportingVisType = 'none' | 'bar' | 'trendline';
 
diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
index 22d701cee570b..fff365e0e89dd 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.test.ts
@@ -7,7 +7,7 @@
 
 import { getSuggestions } from './suggestions';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
-import { MetricVisualizationState } from './visualization';
+import { MetricVisualizationState } from './types';
 import { IconChartMetric } from '@kbn/chart-icons';
 
 const metricColumn = {
diff --git a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
index a4077b4aca450..b405ea646d980 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/suggestions.ts
@@ -8,7 +8,8 @@
 import { IconChartMetric } from '@kbn/chart-icons';
 import { LayerTypes } from '@kbn/expression-xy-plugin/public';
 import type { TableSuggestion, Visualization } from '../../types';
-import { metricLabel, MetricVisualizationState, supportedDataTypes } from './visualization';
+import { MetricVisualizationState } from './types';
+import { metricLabel, supportedDataTypes } from './visualization';
 
 const MAX_BUCKETED_COLUMNS = 1;
 const MAX_METRIC_COLUMNS = 2; // primary and secondary metric
diff --git a/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts b/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
index c37ae2d57544e..d0ff261653e1f 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/to_expression.ts
@@ -17,7 +17,9 @@ import { CollapseArgs, CollapseFunction } from '../../../common/expressions';
 import { CollapseExpressionFunction } from '../../../common/expressions/collapse/types';
 import { DatasourceLayers } from '../../types';
 import { showingBar } from './metric_visualization';
-import { DEFAULT_MAX_COLUMNS, getDefaultColor, MetricVisualizationState } from './visualization';
+import { DEFAULT_MAX_COLUMNS, getDefaultColor } from './visualization';
+import { MetricVisualizationState } from './types';
+import { metricStateDefaults } from './constants';
 
 // TODO - deduplicate with gauges?
 function computePaletteParams(params: CustomPaletteParams) {
@@ -148,6 +150,10 @@ export const toExpression = (
     progressDirection: showingBar(state)
       ? state.progressDirection || LayoutDirection.Vertical
       : undefined,
+    titlesTextAlign: state.titlesTextAlign ?? metricStateDefaults.titlesTextAlign,
+    valuesTextAlign: state.valuesTextAlign ?? metricStateDefaults.valuesTextAlign,
+    iconAlign: state.iconAlign ?? metricStateDefaults.iconAlign,
+    valueFontSize: state.valueFontMode ?? metricStateDefaults.valueFontMode,
     color: state.color || getDefaultColor(state, isMetricNumeric),
     icon: state.icon,
     palette:
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar.test.tsx
deleted file mode 100644
index 8b4ea8a39f3ab..0000000000000
--- a/x-pack/plugins/lens/public/visualizations/metric/toolbar.test.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { CustomPaletteParams, PaletteOutput } from '@kbn/coloring';
-import { Toolbar } from './toolbar';
-import { MetricVisualizationState } from './visualization';
-import { createMockFramePublicAPI } from '../../mocks';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
-
-describe('metric toolbar', () => {
-  const palette: PaletteOutput<CustomPaletteParams> = {
-    type: 'palette',
-    name: 'foo',
-    params: {
-      rangeType: 'percent',
-    },
-  };
-
-  const fullState: Required<MetricVisualizationState> = {
-    layerId: 'first',
-    layerType: 'data',
-    metricAccessor: 'metric-col-id',
-    secondaryMetricAccessor: 'secondary-metric-col-id',
-    maxAccessor: 'max-metric-col-id',
-    breakdownByAccessor: 'breakdown-col-id',
-    collapseFn: 'sum',
-    subtitle: 'subtitle',
-    secondaryPrefix: 'extra-text',
-    progressDirection: 'vertical',
-    maxCols: 5,
-    color: 'static-color',
-    icon: 'compute',
-    palette,
-    showBar: true,
-    trendlineLayerId: 'second',
-    trendlineLayerType: 'metricTrendline',
-    trendlineMetricAccessor: 'trendline-metric-col-id',
-    trendlineSecondaryMetricAccessor: 'trendline-secondary-metric-col-id',
-    trendlineTimeAccessor: 'trendline-time-col-id',
-    trendlineBreakdownByAccessor: 'trendline-breakdown-col-id',
-  };
-
-  const frame = createMockFramePublicAPI();
-
-  const mockSetState = jest.fn();
-
-  const renderToolbar = (state: MetricVisualizationState) => {
-    return { ...render(<Toolbar state={state} setState={mockSetState} frame={frame} />) };
-  };
-
-  afterEach(() => mockSetState.mockClear());
-
-  describe('text options', () => {
-    it('sets a subtitle', async () => {
-      renderToolbar({
-        ...fullState,
-        breakdownByAccessor: undefined,
-      });
-      const textOptionsButton = screen.getByTestId('lnsLabelsButton');
-      textOptionsButton.click();
-
-      const newSubtitle = 'new subtitle hey';
-      const subtitleField = screen.getByDisplayValue('subtitle');
-      // cannot use userEvent because the element cannot be clicked on
-      fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 1' } });
-      await waitFor(() => expect(mockSetState).toHaveBeenCalled());
-      fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 2' } });
-      await waitFor(() => expect(mockSetState).toHaveBeenCalledTimes(2));
-      fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 3' } });
-      await waitFor(() => expect(mockSetState).toHaveBeenCalledTimes(3));
-      expect(mockSetState.mock.calls.map(([state]) => state.subtitle)).toMatchInlineSnapshot(`
-        Array [
-          "new subtitle hey 1",
-          "new subtitle hey 2",
-          "new subtitle hey 3",
-        ]
-      `);
-    });
-
-    it('hides text options when has breakdown by', () => {
-      renderToolbar({
-        ...fullState,
-        breakdownByAccessor: 'some-accessor',
-      });
-      expect(screen.queryByTestId('lnsLabelsButton')).not.toBeInTheDocument();
-    });
-  });
-});
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx
deleted file mode 100644
index 8cd949381cf3d..0000000000000
--- a/x-pack/plugins/lens/public/visualizations/metric/toolbar.tsx
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useCallback } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiFlexGroup, EuiFormRow, EuiFieldText } from '@elastic/eui';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
-import { VisualizationToolbarProps } from '../../types';
-import { ToolbarPopover } from '../../shared_components';
-import { MetricVisualizationState } from './visualization';
-
-export function Toolbar(props: VisualizationToolbarProps<MetricVisualizationState>) {
-  const { state, setState } = props;
-
-  const setSubtitle = useCallback(
-    (prefix: string) => setState({ ...state, subtitle: prefix }),
-    [setState, state]
-  );
-
-  const { inputValue: subtitleInputVal, handleInputChange: handleSubtitleChange } =
-    useDebouncedValue<string>(
-      {
-        onChange: setSubtitle,
-        value: state.subtitle || '',
-      },
-      { allowFalsyValue: true }
-    );
-
-  const hasBreakdownBy = Boolean(state.breakdownByAccessor);
-
-  return (
-    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
-      {!hasBreakdownBy && (
-        <ToolbarPopover
-          title={i18n.translate('xpack.lens.metric.labels', {
-            defaultMessage: 'Labels',
-          })}
-          type="labels"
-          groupPosition="none"
-          buttonDataTestSubj="lnsLabelsButton"
-        >
-          <EuiFormRow
-            label={i18n.translate('xpack.lens.metric.subtitleLabel', {
-              defaultMessage: 'Subtitle',
-            })}
-            fullWidth
-            display="columnCompressed"
-          >
-            <EuiFieldText
-              value={subtitleInputVal}
-              onChange={({ target: { value } }) => handleSubtitleChange(value)}
-            />
-          </EuiFormRow>
-        </ToolbarPopover>
-      )}
-    </EuiFlexGroup>
-  );
-}
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/index.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/index.tsx
new file mode 100644
index 0000000000000..503039f627974
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/index.tsx
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { Toolbar } from './toolbar';
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.test.tsx
new file mode 100644
index 0000000000000..1f205c60f6916
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.test.tsx
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { CustomPaletteParams, PaletteOutput } from '@kbn/coloring';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { MetricVisualizationState } from '../types';
+import { LabelOptionsPopover } from './label_options_popover';
+
+describe('LabelOptionsPopover', () => {
+  const palette: PaletteOutput<CustomPaletteParams> = {
+    type: 'palette',
+    name: 'foo',
+    params: {
+      rangeType: 'percent',
+    },
+  };
+
+  const fullState: Required<MetricVisualizationState> = {
+    layerId: 'first',
+    layerType: 'data',
+    metricAccessor: 'metric-col-id',
+    secondaryMetricAccessor: 'secondary-metric-col-id',
+    maxAccessor: 'max-metric-col-id',
+    breakdownByAccessor: 'breakdown-col-id',
+    collapseFn: 'sum',
+    subtitle: 'subtitle',
+    secondaryPrefix: 'extra-text',
+    progressDirection: 'vertical',
+    maxCols: 5,
+    color: 'static-color',
+    icon: 'compute',
+    palette,
+    showBar: true,
+    trendlineLayerId: 'second',
+    trendlineLayerType: 'metricTrendline',
+    trendlineMetricAccessor: 'trendline-metric-col-id',
+    trendlineSecondaryMetricAccessor: 'trendline-secondary-metric-col-id',
+    trendlineTimeAccessor: 'trendline-time-col-id',
+    trendlineBreakdownByAccessor: 'trendline-breakdown-col-id',
+    titlesTextAlign: 'left',
+    valuesTextAlign: 'right',
+    iconAlign: 'left',
+    valueFontMode: 'default',
+  };
+
+  const mockSetState = jest.fn();
+
+  const renderToolbarOptions = (state: MetricVisualizationState) => {
+    return {
+      ...render(<LabelOptionsPopover state={state} setState={mockSetState} />),
+    };
+  };
+
+  afterEach(() => mockSetState.mockClear());
+
+  it('should set a subtitle', async () => {
+    renderToolbarOptions({
+      ...fullState,
+      breakdownByAccessor: undefined,
+    });
+    const labelOptionsButton = screen.getByTestId('lnsLabelsButton');
+    labelOptionsButton.click();
+
+    const newSubtitle = 'new subtitle hey';
+    const subtitleField = screen.getByDisplayValue('subtitle');
+    // cannot use userEvent because the element cannot be clicked on
+    fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 1' } });
+    await waitFor(() => expect(mockSetState).toHaveBeenCalled());
+    fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 2' } });
+    await waitFor(() => expect(mockSetState).toHaveBeenCalledTimes(2));
+    fireEvent.change(subtitleField, { target: { value: newSubtitle + ' 3' } });
+    await waitFor(() => expect(mockSetState).toHaveBeenCalledTimes(3));
+    expect(mockSetState.mock.calls.map(([state]) => state.subtitle)).toMatchInlineSnapshot(`
+      Array [
+        "new subtitle hey 1",
+        "new subtitle hey 2",
+        "new subtitle hey 3",
+      ]
+    `);
+  });
+
+  it('should disable labels options when Metric has breakdown by', () => {
+    renderToolbarOptions({
+      ...fullState,
+      breakdownByAccessor: 'some-accessor',
+    });
+    expect(screen.getByTestId('lnsLabelsButton')).toBeDisabled();
+  });
+});
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.tsx
new file mode 100644
index 0000000000000..ec7101a8dedb8
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/label_options_popover.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useCallback } from 'react';
+
+import { EuiFormRow, EuiFieldText } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { useDebouncedValue } from '@kbn/visualization-utils';
+import { TooltipWrapper } from '@kbn/visualization-utils';
+import { ToolbarPopover } from '../../../shared_components';
+import { MetricVisualizationState } from '../types';
+
+export interface LabelOptionsPopoverProps {
+  state: MetricVisualizationState;
+  setState: (newState: MetricVisualizationState) => void;
+}
+
+export const LabelOptionsPopover: FC<LabelOptionsPopoverProps> = ({ state, setState }) => {
+  const setSubtitle = useCallback(
+    (prefix: string) => setState({ ...state, subtitle: prefix }),
+    [setState, state]
+  );
+
+  const { inputValue: subtitleInputVal, handleInputChange: handleSubtitleChange } =
+    useDebouncedValue<string>(
+      {
+        onChange: setSubtitle,
+        value: state.subtitle || '',
+      },
+      { allowFalsyValue: true }
+    );
+
+  const hasBreakdownBy = Boolean(state.breakdownByAccessor);
+
+  return (
+    <TooltipWrapper
+      tooltipContent={i18n.translate('xpack.lens.metric.toolbarLabelOptions.disabled', {
+        defaultMessage: 'Not supported with Break down by',
+      })}
+      condition={hasBreakdownBy}
+      position="bottom"
+    >
+      <ToolbarPopover
+        title={i18n.translate('xpack.lens.metric.labels', {
+          defaultMessage: 'Labels',
+        })}
+        type="labels"
+        groupPosition="right"
+        buttonDataTestSubj="lnsLabelsButton"
+        isDisabled={hasBreakdownBy}
+      >
+        <EuiFormRow
+          label={i18n.translate('xpack.lens.metric.subtitleLabel', {
+            defaultMessage: 'Subtitle',
+          })}
+          fullWidth
+          display="columnCompressed"
+        >
+          <EuiFieldText
+            value={subtitleInputVal}
+            onChange={({ target: { value } }) => handleSubtitleChange(value)}
+          />
+        </EuiFormRow>
+      </ToolbarPopover>
+    </TooltipWrapper>
+  );
+};
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/toolbar.tsx
new file mode 100644
index 0000000000000..1593d2dce5bf0
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/toolbar.tsx
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { VisualizationToolbarProps } from '../../../types';
+import { LabelOptionsPopover } from './label_options_popover';
+import { VisualOptionsPopover } from './visual_options_popover';
+import { MetricVisualizationState } from '../types';
+
+export function Toolbar(props: VisualizationToolbarProps<MetricVisualizationState>) {
+  const { state, setState } = props;
+
+  return (
+    <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
+          <VisualOptionsPopover state={state} setState={setState} />
+          <LabelOptionsPopover state={state} setState={setState} />
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.test.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.test.tsx
new file mode 100644
index 0000000000000..06b253dc862b9
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.test.tsx
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { CustomPaletteParams, PaletteOutput } from '@kbn/coloring';
+import { render, screen } from '@testing-library/react';
+import { MetricVisualizationState } from '../types';
+import { VisualOptionsPopover } from './visual_options_popover';
+import { EuiButtonGroupTestHarness } from '@kbn/test-eui-helpers';
+
+jest.mock('lodash', () => ({
+  ...jest.requireActual('lodash'),
+  debounce: (fn: unknown) => fn,
+}));
+
+describe('VisualOptionsPopover', () => {
+  const palette: PaletteOutput<CustomPaletteParams> = {
+    type: 'palette',
+    name: 'foo',
+    params: {
+      rangeType: 'percent',
+    },
+  };
+
+  const fullState: Required<MetricVisualizationState> = {
+    layerId: 'first',
+    layerType: 'data',
+    metricAccessor: 'metric-col-id',
+    secondaryMetricAccessor: 'secondary-metric-col-id',
+    maxAccessor: 'max-metric-col-id',
+    breakdownByAccessor: 'breakdown-col-id',
+    collapseFn: 'sum',
+    subtitle: 'subtitle',
+    secondaryPrefix: 'extra-text',
+    progressDirection: 'vertical',
+    maxCols: 5,
+    color: 'static-color',
+    icon: 'compute',
+    palette,
+    showBar: true,
+    trendlineLayerId: 'second',
+    trendlineLayerType: 'metricTrendline',
+    trendlineMetricAccessor: 'trendline-metric-col-id',
+    trendlineSecondaryMetricAccessor: 'trendline-secondary-metric-col-id',
+    trendlineTimeAccessor: 'trendline-time-col-id',
+    trendlineBreakdownByAccessor: 'trendline-breakdown-col-id',
+    titlesTextAlign: 'left',
+    valuesTextAlign: 'right',
+    iconAlign: 'left',
+    valueFontMode: 'default',
+  };
+
+  const mockSetState = jest.fn();
+
+  const renderToolbarOptions = (state: MetricVisualizationState) => {
+    return {
+      ...render(<VisualOptionsPopover state={state} setState={mockSetState} />),
+    };
+  };
+
+  afterEach(() => mockSetState.mockClear());
+
+  it('should set titlesTextAlign', async () => {
+    renderToolbarOptions({ ...fullState });
+    const textOptionsButton = screen.getByTestId('lnsVisualOptionsButton');
+    textOptionsButton.click();
+
+    const titlesAlignBtnGroup = new EuiButtonGroupTestHarness('lens-titles-alignment-btn');
+
+    titlesAlignBtnGroup.select('Right');
+    titlesAlignBtnGroup.select('Center');
+    titlesAlignBtnGroup.select('Left');
+
+    expect(mockSetState.mock.calls.map(([s]) => s.titlesTextAlign)).toEqual([
+      'right',
+      'center',
+      'left',
+    ]);
+  });
+
+  it('should set valuesTextAlign', async () => {
+    renderToolbarOptions({ ...fullState });
+    const textOptionsButton = screen.getByTestId('lnsVisualOptionsButton');
+    textOptionsButton.click();
+
+    const valueAlignBtnGroup = new EuiButtonGroupTestHarness('lens-values-alignment-btn');
+
+    valueAlignBtnGroup.select('Center');
+    valueAlignBtnGroup.select('Left');
+    valueAlignBtnGroup.select('Right');
+
+    expect(mockSetState.mock.calls.map(([s]) => s.valuesTextAlign)).toEqual([
+      'center',
+      'left',
+      'right',
+    ]);
+  });
+
+  it('should set valueFontMode', async () => {
+    renderToolbarOptions({ ...fullState });
+    const textOptionsButton = screen.getByTestId('lnsVisualOptionsButton');
+    textOptionsButton.click();
+
+    const modeBtnGroup = new EuiButtonGroupTestHarness('lens-value-font-mode-btn');
+
+    expect(modeBtnGroup.selected.textContent).toBe('Default');
+
+    modeBtnGroup.select('Fit');
+    modeBtnGroup.select('Default');
+
+    expect(mockSetState.mock.calls.map(([s]) => s.valueFontMode)).toEqual(['fit', 'default']);
+  });
+
+  it('should set iconAlign', async () => {
+    renderToolbarOptions({ ...fullState, icon: 'sortUp' });
+    const textOptionsButton = screen.getByTestId('lnsVisualOptionsButton');
+    textOptionsButton.click();
+
+    const iconAlignBtnGroup = new EuiButtonGroupTestHarness('lens-icon-alignment-btn');
+
+    expect(iconAlignBtnGroup.selected.textContent).toBe('Left');
+
+    iconAlignBtnGroup.select('Right');
+    iconAlignBtnGroup.select('Left');
+
+    expect(mockSetState.mock.calls.map(([s]) => s.iconAlign)).toEqual(['right', 'left']);
+  });
+
+  it.each([undefined, 'empty'])('should hide iconAlign option when icon is %j', async (icon) => {
+    renderToolbarOptions({ ...fullState, icon });
+    const textOptionsButton = screen.getByTestId('lnsVisualOptionsButton');
+    textOptionsButton.click();
+
+    expect(screen.queryByTestId('lens-icon-alignment-btn')).not.toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.tsx b/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.tsx
new file mode 100644
index 0000000000000..607bba17afc24
--- /dev/null
+++ b/x-pack/plugins/lens/public/visualizations/metric/toolbar/visual_options_popover.tsx
@@ -0,0 +1,290 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+
+import { EuiFormRow, EuiIconTip, EuiButtonGroup } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { MetricStyle } from '@elastic/charts';
+import { ToolbarPopover } from '../../../shared_components';
+import { MetricVisualizationState, ValueFontMode } from '../types';
+import { metricStateDefaults } from '../constants';
+
+export interface VisualOptionsPopoverProps {
+  state: MetricVisualizationState;
+  setState: (newState: MetricVisualizationState) => void;
+}
+
+export const VisualOptionsPopover: FC<VisualOptionsPopoverProps> = ({ state, setState }) => {
+  return (
+    <ToolbarPopover
+      title={i18n.translate('xpack.lens.shared.visualOptionsLabel', {
+        defaultMessage: 'Visual options',
+      })}
+      type="visualOptions"
+      groupPosition="left"
+      buttonDataTestSubj="lnsVisualOptionsButton"
+    >
+      <TitlesAlignmentOption
+        value={state.titlesTextAlign ?? metricStateDefaults.titlesTextAlign}
+        onChange={(titlesTextAlign) => {
+          setState({ ...state, titlesTextAlign });
+        }}
+      />
+      <ValuesAlignmentOption
+        value={state.valuesTextAlign ?? metricStateDefaults.valuesTextAlign}
+        onChange={(valuesTextAlign) => {
+          setState({ ...state, valuesTextAlign });
+        }}
+      />
+      {state.icon && state.icon !== 'empty' && (
+        <IconAlignmentOption
+          value={state.iconAlign ?? metricStateDefaults.iconAlign}
+          onChange={(iconAlign) => {
+            setState({ ...state, iconAlign });
+          }}
+        />
+      )}
+      <ValueFontOption
+        value={state.valueFontMode ?? metricStateDefaults.valueFontMode}
+        onChange={(value) => {
+          setState({ ...state, valueFontMode: value });
+        }}
+      />
+    </ToolbarPopover>
+  );
+};
+
+const valueFontModes: Array<{
+  id: ValueFontMode;
+  label: string;
+}> = [
+  {
+    id: 'default',
+    label: i18n.translate('xpack.lens.metric.toolbarVisOptions.default', {
+      defaultMessage: 'Default',
+    }),
+  },
+  {
+    id: 'fit',
+    label: i18n.translate('xpack.lens.metric.toolbarVisOptions.fit', {
+      defaultMessage: 'Fit',
+    }),
+  },
+];
+
+function ValueFontOption({
+  value,
+  onChange,
+}: {
+  value: typeof valueFontModes[number]['id'];
+  onChange: (mode: ValueFontMode) => void;
+}) {
+  const label = i18n.translate('xpack.lens.metric.toolbarVisOptions.valueFontSize', {
+    defaultMessage: 'Value fontSize',
+  });
+
+  return (
+    <EuiFormRow
+      display="columnCompressed"
+      label={
+        <span>
+          {label}{' '}
+          <EuiIconTip
+            content={i18n.translate('xpack.lens.metric.toolbarVisOptions.valueFontSizeTip', {
+              defaultMessage: 'Font size of the Primary metric value',
+            })}
+            iconProps={{
+              className: 'eui-alignTop',
+            }}
+            color="subdued"
+            position="top"
+            size="s"
+            type="questionInCircle"
+          />
+        </span>
+      }
+    >
+      <EuiButtonGroup
+        isFullWidth
+        legend={label}
+        data-test-subj="lens-value-font-mode-btn"
+        buttonSize="compressed"
+        idSelected={value}
+        options={valueFontModes}
+        onChange={(mode) => {
+          onChange(mode as ValueFontMode);
+        }}
+      />
+    </EuiFormRow>
+  );
+}
+
+const alignmentOptions: Array<{
+  id: MetricStyle['titlesTextAlign'] | MetricStyle['valuesTextAlign'];
+  label: string;
+}> = [
+  {
+    id: 'left',
+    label: i18n.translate('xpack.lens.shared.left', {
+      defaultMessage: 'Left',
+    }),
+  },
+  {
+    id: 'center',
+    label: i18n.translate('xpack.lens.shared.center', {
+      defaultMessage: 'Center',
+    }),
+  },
+  {
+    id: 'right',
+    label: i18n.translate('xpack.lens.shared.right', {
+      defaultMessage: 'Right',
+    }),
+  },
+];
+
+function TitlesAlignmentOption({
+  value,
+  onChange,
+}: {
+  value: MetricStyle['titlesTextAlign'];
+  onChange: (alignment: MetricStyle['titlesTextAlign']) => void;
+}) {
+  const label = i18n.translate('xpack.lens.metric.toolbarVisOptions.titlesAlignment', {
+    defaultMessage: 'Titles alignment',
+  });
+
+  return (
+    <EuiFormRow
+      display="columnCompressed"
+      label={
+        <span>
+          {label}{' '}
+          <EuiIconTip
+            content={i18n.translate('xpack.lens.metric.toolbarVisOptions.titlesAlignmentTip', {
+              defaultMessage: 'Alignment of the Title and Subtitle',
+            })}
+            iconProps={{
+              className: 'eui-alignTop',
+            }}
+            color="subdued"
+            position="top"
+            size="s"
+            type="questionInCircle"
+          />
+        </span>
+      }
+    >
+      <EuiButtonGroup
+        isFullWidth
+        legend={label}
+        data-test-subj="lens-titles-alignment-btn"
+        buttonSize="compressed"
+        options={alignmentOptions}
+        idSelected={value}
+        onChange={(alignment) => {
+          onChange(alignment as MetricStyle['titlesTextAlign']);
+        }}
+      />
+    </EuiFormRow>
+  );
+}
+
+function ValuesAlignmentOption({
+  value,
+  onChange,
+}: {
+  value: MetricStyle['valuesTextAlign'];
+  onChange: (alignment: MetricStyle['valuesTextAlign']) => void;
+}) {
+  const label = i18n.translate('xpack.lens.metric.toolbarVisOptions.valuesAlignment', {
+    defaultMessage: 'Values alignment',
+  });
+
+  return (
+    <EuiFormRow
+      display="columnCompressed"
+      label={
+        <span>
+          {label}{' '}
+          <EuiIconTip
+            color="subdued"
+            content={i18n.translate('xpack.lens.metric.toolbarVisOptions.valuesAlignmentTip', {
+              defaultMessage: 'Alignment of the Primary and Secondary Metric',
+            })}
+            iconProps={{
+              className: 'eui-alignTop',
+            }}
+            position="top"
+            size="s"
+            type="questionInCircle"
+          />
+        </span>
+      }
+    >
+      <EuiButtonGroup
+        isFullWidth
+        legend={label}
+        data-test-subj="lens-values-alignment-btn"
+        buttonSize="compressed"
+        options={alignmentOptions}
+        idSelected={value}
+        onChange={(alignment) => {
+          onChange(alignment as MetricStyle['valuesTextAlign']);
+        }}
+      />
+    </EuiFormRow>
+  );
+}
+
+const iconAlignmentOptions: Array<{
+  id: MetricStyle['titlesTextAlign'] | MetricStyle['valuesTextAlign'];
+  label: string;
+}> = [
+  {
+    id: 'left',
+    label: i18n.translate('xpack.lens.shared.left', {
+      defaultMessage: 'Left',
+    }),
+  },
+  {
+    id: 'right',
+    label: i18n.translate('xpack.lens.shared.right', {
+      defaultMessage: 'Right',
+    }),
+  },
+];
+
+function IconAlignmentOption({
+  value,
+  onChange,
+}: {
+  value: MetricStyle['iconAlign'];
+  onChange: (alignment: MetricStyle['iconAlign']) => void;
+}) {
+  const label = i18n.translate('xpack.lens.metric.toolbarVisOptions.iconAlignment', {
+    defaultMessage: 'Icon alignment',
+  });
+
+  return (
+    <EuiFormRow display="columnCompressed" label={label}>
+      <EuiButtonGroup
+        isFullWidth
+        legend={label}
+        data-test-subj="lens-icon-alignment-btn"
+        buttonSize="compressed"
+        options={iconAlignmentOptions}
+        idSelected={value}
+        onChange={(alignment) => {
+          onChange(alignment as MetricStyle['iconAlign']);
+        }}
+      />
+    </EuiFormRow>
+  );
+}
diff --git a/x-pack/plugins/lens/public/visualizations/metric/types.ts b/x-pack/plugins/lens/public/visualizations/metric/types.ts
index d25a4b1b33396..774c1572ce73b 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/types.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/types.ts
@@ -5,11 +5,13 @@
  * 2.0.
  */
 
-import type { LayoutDirection } from '@elastic/charts';
+import type { LayoutDirection, MetricStyle } from '@elastic/charts';
 import type { PaletteOutput, CustomPaletteParams } from '@kbn/coloring';
 import type { CollapseFunction } from '@kbn/visualizations-plugin/common';
 import type { LayerType } from '../../../common/types';
 
+export type ValueFontMode = Exclude<MetricStyle['valueFontSize'], number>;
+
 export interface MetricVisualizationState {
   layerId: string;
   layerType: LayerType;
@@ -24,7 +26,12 @@ export interface MetricVisualizationState {
   secondaryPrefix?: string;
   progressDirection?: LayoutDirection;
   showBar?: boolean;
+  titlesTextAlign?: MetricStyle['titlesTextAlign'];
+  valuesTextAlign?: MetricStyle['valuesTextAlign'];
+  iconAlign?: MetricStyle['iconAlign'];
+  valueFontMode?: ValueFontMode;
   color?: string;
+  icon?: string;
   palette?: PaletteOutput<CustomPaletteParams>;
   maxCols?: number;
 
diff --git a/x-pack/plugins/lens/public/visualizations/metric/visualization.test.ts b/x-pack/plugins/lens/public/visualizations/metric/visualization.test.ts
index a907fa0cae917..af9039740f3eb 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/visualization.test.ts
+++ b/x-pack/plugins/lens/public/visualizations/metric/visualization.test.ts
@@ -19,10 +19,11 @@ import {
   Visualization,
 } from '../../types';
 import { GROUP_ID } from './constants';
-import { getMetricVisualization, MetricVisualizationState } from './visualization';
+import { getMetricVisualization } from './visualization';
 import { themeServiceMock } from '@kbn/core/public/mocks';
 import { Ast } from '@kbn/interpreter';
 import { LayoutDirection } from '@elastic/charts';
+import { MetricVisualizationState } from './types';
 
 const paletteService = chartPluginMock.createPaletteRegistry();
 const theme = themeServiceMock.createStartContract();
@@ -76,6 +77,10 @@ describe('metric visualization', () => {
     color: 'static-color',
     palette,
     showBar: false,
+    titlesTextAlign: 'left',
+    valuesTextAlign: 'right',
+    iconAlign: 'left',
+    valueFontMode: 'default',
   };
 
   const fullStateWTrend: Required<MetricVisualizationState> = {
@@ -316,6 +321,9 @@ describe('metric visualization', () => {
                 "icon": Array [
                   "empty",
                 ],
+                "iconAlign": Array [
+                  "left",
+                ],
                 "inspectorTableId": Array [
                   "first",
                 ],
@@ -353,7 +361,16 @@ describe('metric visualization', () => {
                 "subtitle": Array [
                   "subtitle",
                 ],
+                "titlesTextAlign": Array [
+                  "left",
+                ],
                 "trendline": Array [],
+                "valueFontSize": Array [
+                  "default",
+                ],
+                "valuesTextAlign": Array [
+                  "right",
+                ],
               },
               "function": "metricVis",
               "type": "function",
@@ -380,6 +397,9 @@ describe('metric visualization', () => {
                 "icon": Array [
                   "empty",
                 ],
+                "iconAlign": Array [
+                  "left",
+                ],
                 "inspectorTableId": Array [
                   "first",
                 ],
@@ -420,7 +440,16 @@ describe('metric visualization', () => {
                 "subtitle": Array [
                   "subtitle",
                 ],
+                "titlesTextAlign": Array [
+                  "left",
+                ],
                 "trendline": Array [],
+                "valueFontSize": Array [
+                  "default",
+                ],
+                "valuesTextAlign": Array [
+                  "right",
+                ],
               },
               "function": "metricVis",
               "type": "function",
@@ -778,8 +807,12 @@ describe('metric visualization', () => {
     expect(visualization.clearLayer(fullState, 'some-id', 'indexPattern1')).toMatchInlineSnapshot(`
       Object {
         "icon": "empty",
+        "iconAlign": "left",
         "layerId": "first",
         "layerType": "data",
+        "titlesTextAlign": "left",
+        "valueFontMode": "default",
+        "valuesTextAlign": "right",
       }
     `);
   });
diff --git a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
index f60b1da51505d..3a780e5a20f75 100644
--- a/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
+++ b/x-pack/plugins/lens/public/visualizations/metric/visualization.tsx
@@ -7,16 +7,13 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { PaletteOutput, PaletteRegistry, CustomPaletteParams } from '@kbn/coloring';
+import { PaletteRegistry } from '@kbn/coloring';
 import { ThemeServiceStart } from '@kbn/core/public';
 import { VIS_EVENT_TO_TRIGGER } from '@kbn/visualizations-plugin/public';
-import { LayoutDirection } from '@elastic/charts';
 import { euiLightVars, euiThemeVars } from '@kbn/ui-theme';
 import { IconChartMetric } from '@kbn/chart-icons';
 import { AccessorConfig } from '@kbn/visualization-ui-components';
 import { isNumericFieldForDatatable } from '../../../common/expressions/datatable/utils';
-import { CollapseFunction } from '../../../common/expressions';
-import type { LayerType } from '../../../common/types';
 import { layerTypes } from '../../../common/layer_types';
 import type { FormBasedPersistedState } from '../../datasources/form_based/types';
 import { getSuggestions } from './suggestions';
@@ -35,6 +32,7 @@ import { generateId } from '../../id_generator';
 import { toExpression } from './to_expression';
 import { nonNullable } from '../../utils';
 import { METRIC_NUMERIC_MAX } from '../../user_messages_ids';
+import { MetricVisualizationState } from './types';
 
 export const DEFAULT_MAX_COLUMNS = 3;
 
@@ -49,33 +47,6 @@ export const getDefaultColor = (state: MetricVisualizationState, isMetricNumeric
     : euiThemeVars.euiColorEmptyShade;
 };
 
-export interface MetricVisualizationState {
-  layerId: string;
-  layerType: LayerType;
-  metricAccessor?: string;
-  secondaryMetricAccessor?: string;
-  maxAccessor?: string;
-  breakdownByAccessor?: string;
-  // the dimensions can optionally be single numbers
-  // computed by collapsing all rows
-  collapseFn?: CollapseFunction;
-  subtitle?: string;
-  secondaryPrefix?: string;
-  progressDirection?: LayoutDirection;
-  showBar?: boolean;
-  color?: string;
-  icon?: string;
-  palette?: PaletteOutput<CustomPaletteParams>;
-  maxCols?: number;
-
-  trendlineLayerId?: string;
-  trendlineLayerType?: LayerType;
-  trendlineTimeAccessor?: string;
-  trendlineMetricAccessor?: string;
-  trendlineSecondaryMetricAccessor?: string;
-  trendlineBreakdownByAccessor?: string;
-}
-
 export const supportedDataTypes = new Set(['string', 'boolean', 'number', 'ip', 'date']);
 
 const isSupportedMetric = (op: OperationMetadata) =>
diff --git a/x-pack/plugins/lens/public/visualizations/partition/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/partition/dimension_editor.tsx
index 9b82d07d785c5..a45faa1d5aaf1 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/dimension_editor.tsx
@@ -17,7 +17,8 @@ import {
   AVAILABLE_PALETTES,
   getColorsFromMapping,
 } from '@kbn/coloring';
-import { ColorPicker, useDebouncedValue } from '@kbn/visualization-ui-components';
+import { ColorPicker } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { EuiFormRow, EuiFlexGroup, EuiFlexItem, EuiSwitch, EuiText, EuiBadge } from '@elastic/eui';
 import { useState, useCallback } from 'react';
 import { getColorCategories } from '@kbn/chart-expressions-common';
diff --git a/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx b/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
index dfccdccc9f85f..69e138beb1695 100644
--- a/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
+++ b/x-pack/plugins/lens/public/visualizations/partition/toolbar.tsx
@@ -18,7 +18,7 @@ import {
 } from '@elastic/eui';
 import { LegendValue, Position } from '@elastic/charts';
 import { LegendSize } from '@kbn/visualizations-plugin/public';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { type PartitionLegendValue } from '@kbn/visualizations-plugin/common/constants';
 import { DEFAULT_PERCENT_DECIMALS } from './constants';
 import { PartitionChartsMeta } from './partition_charts_meta';
diff --git a/x-pack/plugins/lens/public/visualizations/tagcloud/tags_dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/tagcloud/tags_dimension_editor.tsx
index 77fab257eb03b..244af0359b20a 100644
--- a/x-pack/plugins/lens/public/visualizations/tagcloud/tags_dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/tagcloud/tags_dimension_editor.tsx
@@ -19,7 +19,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiSwitch, EuiFormRow, EuiText, EuiBadge } from '@elastic/eui';
 import { useState, MutableRefObject, useCallback } from 'react';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { getColorCategories } from '@kbn/chart-expressions-common';
 import type { TagcloudState } from './types';
 import { PalettePanelContainer, PalettePicker } from '../../shared_components';
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
index 20390f322fd90..47178886dc531 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/axis_settings_popover.tsx
@@ -17,7 +17,7 @@ import {
   EuiIconAxisRight,
   EuiIconAxisTop,
 } from '@kbn/chart-icons';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { isHorizontalChart } from '../state_helpers';
 import {
   ToolbarPopover,
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
index 2ee2fa6ac2f80..e53bc9164b0c3 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/dimension_editor.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useMemo, useState } from 'react';
 import { i18n } from '@kbn/i18n';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import { ColorPicker } from '@kbn/visualization-ui-components';
 
 import {
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
index 83c28544913b4..fa75cc530864c 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/reference_line_config_panel/reference_line_panel.tsx
@@ -11,12 +11,12 @@ import { EuiButtonGroup, EuiFormRow } from '@elastic/eui';
 import type { PaletteRegistry } from '@kbn/coloring';
 import { FillStyle } from '@kbn/expression-xy-plugin/common';
 import {
-  useDebouncedValue,
   IconSelectSetting,
   ColorPicker,
   LineStyleSettings,
   TextDecorationSetting,
 } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 import type { VisualizationDimensionEditorProps } from '../../../../types';
 import { State, XYState, XYReferenceLineLayerConfig, YConfig } from '../../types';
 import { FormatFactory } from '../../../../../common/types';
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
index 1eca01672964e..8e71ace4f8bed 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/fill_opacity_option.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiRange } from '@elastic/eui';
-import { useDebouncedValue } from '@kbn/visualization-ui-components';
+import { useDebouncedValue } from '@kbn/visualization-utils';
 
 export interface FillOpacityOptionProps {
   /**
diff --git a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
index b8b244daf85d2..5fd35a780cda5 100644
--- a/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
+++ b/x-pack/plugins/lens/public/visualizations/xy/xy_config_panel/visual_options_popover/index.tsx
@@ -79,7 +79,7 @@ export const VisualOptionsPopover: React.FC<VisualOptionsPopoverProps> = ({
   return (
     <TooltipWrapper tooltipContent={valueLabelsDisabledReason} condition={isDisabled}>
       <ToolbarPopover
-        title={i18n.translate('xpack.lens.shared.curveLabel', {
+        title={i18n.translate('xpack.lens.shared.visualOptionsLabel', {
           defaultMessage: 'Visual options',
         })}
         type="visualOptions"
diff --git a/x-pack/plugins/lens/tsconfig.json b/x-pack/plugins/lens/tsconfig.json
index 0f485a3c0c259..90801e8687c61 100644
--- a/x-pack/plugins/lens/tsconfig.json
+++ b/x-pack/plugins/lens/tsconfig.json
@@ -86,7 +86,7 @@
     "@kbn/search-response-warnings",
     "@kbn/logging",
     "@kbn/core-plugins-server",
-    "@kbn/text-based-languages",
+    "@kbn/esql",
     "@kbn/field-utils",
     "@kbn/panel-loader",
     "@kbn/shared-ux-button-toolbar",
diff --git a/x-pack/plugins/licensing/server/license_fetcher.test.ts b/x-pack/plugins/licensing/server/license_fetcher.test.ts
index efd9b001fa0ff..a8a64d300e9f4 100644
--- a/x-pack/plugins/licensing/server/license_fetcher.test.ts
+++ b/x-pack/plugins/licensing/server/license_fetcher.test.ts
@@ -169,4 +169,48 @@ describe('LicenseFetcher', () => {
     license = await fetcher();
     expect(license.error).toEqual('woups');
   });
+
+  it('logs a warning in case of successful call without license', async () => {
+    clusterClient.asInternalUser.xpack.info.mockResponse({
+      license: undefined,
+      features: {},
+    } as any);
+
+    const fetcher = getLicenseFetcher({
+      logger,
+      clusterClient,
+      cacheDurationMs: 50_000,
+    });
+
+    const license = await fetcher();
+    expect(license.isAvailable).toEqual(false);
+    expect(loggerMock.collect(logger).warn.map((args) => args[0])).toMatchInlineSnapshot(`
+      Array [
+        "License information fetched from Elasticsearch, but no license is available",
+      ]
+    `);
+  });
+
+  it('logs a warning in case of successful call with a missing license', async () => {
+    clusterClient.asInternalUser.xpack.info.mockResponse({
+      license: buildRawLicense({
+        type: 'missing',
+      }),
+      features: {},
+    } as any);
+
+    const fetcher = getLicenseFetcher({
+      logger,
+      clusterClient,
+      cacheDurationMs: 50_000,
+    });
+
+    const license = await fetcher();
+    expect(license.isAvailable).toEqual(false);
+    expect(loggerMock.collect(logger).warn.map((args) => args[0])).toMatchInlineSnapshot(`
+      Array [
+        "License information fetched from Elasticsearch, but no license is available",
+      ]
+    `);
+  });
 });
diff --git a/x-pack/plugins/licensing/server/license_fetcher.ts b/x-pack/plugins/licensing/server/license_fetcher.ts
index 43d9c204bbf66..56a89fe221c9d 100644
--- a/x-pack/plugins/licensing/server/license_fetcher.ts
+++ b/x-pack/plugins/licensing/server/license_fetcher.ts
@@ -45,6 +45,10 @@ export const getLicenseFetcher = ({
         ? normalizeFeatures(response.features)
         : undefined;
 
+      if (!normalizedLicense) {
+        logger.warn('License information fetched from Elasticsearch, but no license is available');
+      }
+
       const signature = sign({
         license: normalizedLicense,
         features: normalizedFeatures,
diff --git a/x-pack/plugins/licensing/server/plugin.ts b/x-pack/plugins/licensing/server/plugin.ts
index b38128e838fab..60bf0d7d1d210 100644
--- a/x-pack/plugins/licensing/server/plugin.ts
+++ b/x-pack/plugins/licensing/server/plugin.ts
@@ -134,7 +134,8 @@ export class LicensingPlugin implements Plugin<LicensingPluginSetup, LicensingPl
 
     this.loggingSubscription = license$.subscribe((license) =>
       this.logger.debug(
-        'Imported license information from Elasticsearch:' +
+        () =>
+          'Imported license information from Elasticsearch:' +
           [
             `type: ${license.type}`,
             `status: ${license.status}`,
diff --git a/x-pack/plugins/maps/kibana.jsonc b/x-pack/plugins/maps/kibana.jsonc
index 881d557e5e305..b042d0250b0c2 100644
--- a/x-pack/plugins/maps/kibana.jsonc
+++ b/x-pack/plugins/maps/kibana.jsonc
@@ -49,7 +49,7 @@
       "usageCollection",
       "unifiedSearch",
       "fieldFormats",
-      "textBasedLanguages",
+      "esql",
       "savedObjects",
     ],
     "extraPublicDirs": [
diff --git a/x-pack/plugins/maps/public/classes/sources/esql_source/esql_editor.tsx b/x-pack/plugins/maps/public/classes/sources/esql_source/esql_editor.tsx
index 8ed04f61adb5d..5cfaf5abfcb72 100644
--- a/x-pack/plugins/maps/public/classes/sources/esql_source/esql_editor.tsx
+++ b/x-pack/plugins/maps/public/classes/sources/esql_source/esql_editor.tsx
@@ -11,7 +11,7 @@ import { isEqual } from 'lodash';
 import useMountedState from 'react-use/lib/useMountedState';
 import type { AggregateQuery } from '@kbn/es-query';
 import type { ESQLColumn } from '@kbn/es-types';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import { getESQLMeta, verifyGeometryColumn } from './esql_utils';
 
 interface Props {
diff --git a/x-pack/plugins/maps/tsconfig.json b/x-pack/plugins/maps/tsconfig.json
index 5821e1e82a21e..cfd635f23d58d 100644
--- a/x-pack/plugins/maps/tsconfig.json
+++ b/x-pack/plugins/maps/tsconfig.json
@@ -78,7 +78,7 @@
     "@kbn/search-response-warnings",
     "@kbn/calculate-width-from-char-count",
     "@kbn/content-management-table-list-view-common",
-    "@kbn/text-based-languages",
+    "@kbn/esql",
     "@kbn/es-types",
     "@kbn/data-service",
     "@kbn/code-editor",
diff --git a/x-pack/plugins/ml/public/application/model_management/deployment_setup.tsx b/x-pack/plugins/ml/public/application/model_management/deployment_setup.tsx
index cef8c87cdea29..96152e6726ba8 100644
--- a/x-pack/plugins/ml/public/application/model_management/deployment_setup.tsx
+++ b/x-pack/plugins/ml/public/application/model_management/deployment_setup.tsx
@@ -39,6 +39,7 @@ import {
   requiredValidator,
 } from '../../../common/util/validators';
 import type { ModelItem } from './models_list';
+import { useEnabledFeatures } from '../contexts/ml';
 
 interface DeploymentSetupProps {
   config: ThreadingParams;
@@ -373,6 +374,8 @@ export const StartUpdateDeploymentModal: FC<StartDeploymentModalProps> = ({
   initialParams,
   modelAndDeploymentIds,
 }) => {
+  const { showNodeInfo } = useEnabledFeatures();
+
   const isUpdate = !!initialParams;
 
   const { total_ml_processors: totalMlProcessors } = getNewJobLimits();
@@ -441,18 +444,22 @@ export const StartUpdateDeploymentModal: FC<StartDeploymentModalProps> = ({
       </EuiModalHeader>
 
       <EuiModalBody>
-        <EuiCallOut
-          size={'s'}
-          title={
-            <FormattedMessage
-              id="xpack.ml.trainedModels.modelsList.startDeployment.maxNumOfProcessorsWarning"
-              defaultMessage="The product of the number of allocations and threads per allocation should be less than the total number of processors on your ML nodes."
+        {showNodeInfo ? (
+          <>
+            <EuiCallOut
+              size={'s'}
+              title={
+                <FormattedMessage
+                  id="xpack.ml.trainedModels.modelsList.startDeployment.maxNumOfProcessorsWarning"
+                  defaultMessage="The product of the number of allocations and threads per allocation should be less than the total number of processors on your ML nodes."
+                />
+              }
+              iconType="iInCircle"
+              color={'primary'}
             />
-          }
-          iconType="iInCircle"
-          color={'primary'}
-        />
-        <EuiSpacer size={'m'} />
+            <EuiSpacer size={'m'} />
+          </>
+        ) : null}
 
         <DeploymentSetup
           config={config}
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/inference_models.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/inference_models.ts
index 7f4ba9dbf23f7..2895d1fed4336 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/inference_models.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/inference_models.ts
@@ -18,17 +18,18 @@ export function inferenceModelsApiProvider(httpService: HttpService) {
      * @param taskType - Inference Task type. Either sparse_embedding or text_embedding
      * @param modelConfig - Model configuration based on service type
      */
-    createInferenceEndpoint(
+    async createInferenceEndpoint(
       inferenceId: string,
       taskType: InferenceTaskType,
       modelConfig: ModelConfig
     ) {
-      return httpService.http<estypes.InferencePutModelResponse>({
+      const result = await httpService.http<estypes.InferencePutModelResponse>({
         path: `${ML_INTERNAL_BASE_PATH}/_inference/${taskType}/${inferenceId}`,
         method: 'PUT',
         body: JSON.stringify(modelConfig),
         version: '1',
       });
+      return result;
     },
   };
 }
diff --git a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
index 3070c3a4b7441..1d3e0f97ff4ab 100644
--- a/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
+++ b/x-pack/plugins/ml/public/application/services/ml_api_service/trained_models.ts
@@ -177,6 +177,18 @@ export function trainedModelsApiProvider(httpService: HttpService) {
       });
     },
 
+    /**
+     * Gets model config based on the cluster OS and CPU architecture.
+     */
+    getCuratedModelConfig(modelName: string, options?: GetModelDownloadConfigOptions) {
+      return httpService.http<ModelDefinitionResponse>({
+        path: `${ML_INTERNAL_BASE_PATH}/trained_models/curated_model_config/${modelName}`,
+        method: 'GET',
+        ...(options ? { query: options as HttpFetchQuery } : {}),
+        version: '1',
+      });
+    },
+
     getTrainedModelsNodesOverview() {
       return httpService.http<NodesOverviewResponse>({
         path: `${ML_INTERNAL_BASE_PATH}/model_management/nodes_overview`,
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 0a7e44959a262..ae41b31d3eaaf 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -269,7 +269,7 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
               );
             }
 
-            if (fullLicense) {
+            if (fullLicense && mlCapabilities.canGetMlInfo) {
               registerMlUiActions(pluginsSetup.uiActions, core);
 
               if (this.enabledFeatures.ad) {
diff --git a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
index 9bde3c5106386..04db54521680b 100644
--- a/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/models/data_visualizer/data_visualizer.ts
@@ -217,14 +217,16 @@ export class DataVisualizer {
     samplerShardSize: number,
     runtimeMappings?: RuntimeMappings
   ): Promise<any> {
-    return await fetchHistogramsForFields(
-      this._asCurrentUser,
-      indexPattern,
-      query,
-      fields,
-      samplerShardSize,
-      runtimeMappings
-    );
+    return await fetchHistogramsForFields({
+      esClient: this._asCurrentUser,
+      arguments: {
+        indexPattern,
+        query,
+        fields,
+        samplerShardSize,
+        runtimeMappings,
+      },
+    });
   }
 
   // Obtains statistics for supplied list of fields. The statistics for each field in the
diff --git a/x-pack/plugins/ml/server/routes/inference_models.ts b/x-pack/plugins/ml/server/routes/inference_models.ts
index 1ab5d576181ef..29f687ede932d 100644
--- a/x-pack/plugins/ml/server/routes/inference_models.ts
+++ b/x-pack/plugins/ml/server/routes/inference_models.ts
@@ -12,6 +12,7 @@ import { createInferenceSchema } from './schemas/inference_schema';
 import { modelsProvider } from '../models/model_management';
 import { wrapError } from '../client/error_wrapper';
 import { ML_INTERNAL_BASE_PATH } from '../../common/constants/app';
+import { syncSavedObjectsFactory } from '../saved_objects';
 
 export function inferenceModelRoutes(
   { router, routeGuard }: RouteInitialization,
@@ -42,20 +43,24 @@ export function inferenceModelRoutes(
           },
         },
       },
-      routeGuard.fullLicenseAPIGuard(async ({ client, mlClient, request, response }) => {
-        try {
-          const { inferenceId, taskType } = request.params;
-          const body = await modelsProvider(client, mlClient, cloud).createInferenceEndpoint(
-            inferenceId,
-            taskType as InferenceTaskType,
-            request.body as InferenceModelConfig
-          );
-          return response.ok({
-            body,
-          });
-        } catch (e) {
-          return response.customError(wrapError(e));
+      routeGuard.fullLicenseAPIGuard(
+        async ({ client, mlClient, request, response, mlSavedObjectService }) => {
+          try {
+            const { inferenceId, taskType } = request.params;
+            const body = await modelsProvider(client, mlClient, cloud).createInferenceEndpoint(
+              inferenceId,
+              taskType as InferenceTaskType,
+              request.body as InferenceModelConfig
+            );
+            const { syncSavedObjects } = syncSavedObjectsFactory(client, mlSavedObjectService);
+            await syncSavedObjects(false);
+            return response.ok({
+              body,
+            });
+          } catch (e) {
+            return response.customError(wrapError(e));
+          }
         }
-      })
+      )
     );
 }
diff --git a/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts b/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
index a69b1384e2c7e..662b3313a06e3 100644
--- a/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
+++ b/x-pack/plugins/ml/server/routes/schemas/inference_schema.ts
@@ -96,3 +96,9 @@ export const createIngestPipelineSchema = schema.object({
 export const modelDownloadsQuery = schema.object({
   version: schema.maybe(schema.oneOf([schema.literal('1'), schema.literal('2')])),
 });
+
+export const curatedModelsParamsSchema = schema.object({
+  modelName: schema.string(),
+});
+
+export const curatedModelsQuerySchema = schema.object({ version: schema.maybe(schema.number()) });
diff --git a/x-pack/plugins/ml/server/routes/system.ts b/x-pack/plugins/ml/server/routes/system.ts
index 1d186a66893ae..ba985c8b0d395 100644
--- a/x-pack/plugins/ml/server/routes/system.ts
+++ b/x-pack/plugins/ml/server/routes/system.ts
@@ -147,7 +147,7 @@ export function systemRoutes(
       path: `${ML_INTERNAL_BASE_PATH}/ml_node_count`,
       access: 'internal',
       options: {
-        tags: ['access:ml:canGetJobs', 'access:ml:canGetDatafeeds'],
+        tags: ['access:ml:canGetMlInfo'],
       },
     })
     .addVersion(
diff --git a/x-pack/plugins/ml/server/routes/trained_models.ts b/x-pack/plugins/ml/server/routes/trained_models.ts
index cdd4d8128c219..5b2441435268d 100644
--- a/x-pack/plugins/ml/server/routes/trained_models.ts
+++ b/x-pack/plugins/ml/server/routes/trained_models.ts
@@ -10,7 +10,11 @@ import { groupBy } from 'lodash';
 import { schema } from '@kbn/config-schema';
 import type { ErrorType } from '@kbn/ml-error-utils';
 import type { CloudSetup } from '@kbn/cloud-plugin/server';
-import type { ElserVersion, InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import type {
+  ElasticCuratedModelName,
+  ElserVersion,
+  InferenceAPIConfigResponse,
+} from '@kbn/ml-trained-models-utils';
 import { isDefined } from '@kbn/ml-is-defined';
 import type { IScopedClusterClient } from '@kbn/core-elasticsearch-server';
 import { type MlFeatures, ML_INTERNAL_BASE_PATH } from '../../common/constants/app';
@@ -30,6 +34,8 @@ import {
   updateDeploymentParamsSchema,
   createIngestPipelineSchema,
   modelDownloadsQuery,
+  curatedModelsParamsSchema,
+  curatedModelsQuerySchema,
 } from './schemas/inference_schema';
 import type { PipelineDefinition } from '../../common/types/trained_models';
 import { type TrainedModelConfigResponse } from '../../common/types/trained_models';
@@ -920,6 +926,49 @@ export function trainedModelsRoutes(
           try {
             const body = await modelsProvider(client, mlClient, cloud).getModelsDownloadStatus();
 
+            return response.ok({
+              body,
+            });
+          } catch (e) {
+            return response.customError(wrapError(e));
+          }
+        }
+      )
+    );
+
+  /**
+   * @apiGroup TrainedModels
+   *
+   * @api {get} /internal/ml/trained_models/curated_model_config Gets curated model config
+   * @apiName ModelsCuratedConfigs
+   * @apiDescription Gets curated model config for the specified model based on cluster architecture
+   */
+  router.versioned
+    .get({
+      path: `${ML_INTERNAL_BASE_PATH}/trained_models/curated_model_config/{modelName}`,
+      access: 'internal',
+      options: {
+        tags: ['access:ml:canGetTrainedModels'],
+      },
+    })
+    .addVersion(
+      {
+        version: '1',
+        validate: {
+          request: {
+            params: curatedModelsParamsSchema,
+            query: curatedModelsQuerySchema,
+          },
+        },
+      },
+      routeGuard.fullLicenseAPIGuard(
+        async ({ client, mlClient, request, response, mlSavedObjectService }) => {
+          try {
+            const body = await modelsProvider(client, mlClient, cloud).getCuratedModelConfig(
+              request.params.modelName as ElasticCuratedModelName,
+              { version: request.query.version as ElserVersion }
+            );
+
             return response.ok({
               body,
             });
diff --git a/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap b/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap
index 6e0623564bab3..24d9d52224fa4 100644
--- a/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap
+++ b/x-pack/plugins/monitoring/server/lib/metrics/__snapshots__/metrics.test.js.snap
@@ -36,7 +36,7 @@ Object {
     "dateHistogramSubAggs": undefined,
     "derivative": true,
     "derivativeNormalizedUnits": true,
-    "description": "HTTP Requests received by agent configuration managemen",
+    "description": "HTTP Requests received by agent configuration management",
     "docType": undefined,
     "field": "beats_stats.metrics.apm-server.acm.request.count",
     "fieldSource": undefined,
diff --git a/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.ts b/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.ts
index 8cd3941be1338..1593ecd2beba4 100644
--- a/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.ts
+++ b/x-pack/plugins/monitoring/server/lib/metrics/apm/metrics.ts
@@ -612,7 +612,7 @@ export const metrics = {
       defaultMessage: 'Count',
     }),
     description: i18n.translate('xpack.monitoring.metrics.apm.acmRequest.countTitleDescription', {
-      defaultMessage: 'HTTP Requests received by agent configuration managemen',
+      defaultMessage: 'HTTP Requests received by agent configuration management',
     }),
   }),
   apm_cgroup_memory_usage: new ApmMetric({
diff --git a/x-pack/plugins/monitoring/server/rules/base_rule.ts b/x-pack/plugins/monitoring/server/rules/base_rule.ts
index da9f8edb94b2e..f04ca15be27dd 100644
--- a/x-pack/plugins/monitoring/server/rules/base_rule.ts
+++ b/x-pack/plugins/monitoring/server/rules/base_rule.ts
@@ -264,7 +264,8 @@ export class BaseRule {
     DefaultAlert
   >): Promise<any> {
     this.scopedLogger.debug(
-      `Executing alert with params: ${JSON.stringify(params)} and state: ${JSON.stringify(state)}`
+      () =>
+        `Executing alert with params: ${JSON.stringify(params)} and state: ${JSON.stringify(state)}`
     );
 
     const { alertsClient } = services;
diff --git a/x-pack/plugins/observability_solution/apm/common/entities/types.ts b/x-pack/plugins/observability_solution/apm/common/entities/types.ts
index 7b6d6fa7467c1..43b5531d211a9 100644
--- a/x-pack/plugins/observability_solution/apm/common/entities/types.ts
+++ b/x-pack/plugins/observability_solution/apm/common/entities/types.ts
@@ -9,6 +9,7 @@ import { AgentName } from '../../typings/es_schemas/ui/fields/agent';
 
 export enum SignalTypes {
   METRICS = 'metrics',
+  TRACES = 'traces',
   LOGS = 'logs',
 }
 
diff --git a/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts b/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts
index 5093f22ee7542..b19afc1efb3da 100644
--- a/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts
+++ b/x-pack/plugins/observability_solution/apm/common/utils/formatters/formatters.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { asPercent as obltAsPercent } from '@kbn/observability-plugin/common';
 import numeral from '@elastic/numeral';
 import { Maybe } from '../../../typings/common';
 import { NOT_AVAILABLE_LABEL } from '../../i18n';
@@ -82,3 +83,7 @@ export function asBigNumber(value: number): string {
 
   return `${asInteger(value / 1e12)}t`;
 }
+
+export const yLabelAsPercent = (y?: number | null) => {
+  return obltAsPercent(y || 0, 1);
+};
diff --git a/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts
index 7fdb8724243a3..3d7882176f64e 100644
--- a/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts
+++ b/x-pack/plugins/observability_solution/apm/ftr_e2e/cypress/e2e/service_inventory/service_inventory.cy.ts
@@ -91,7 +91,7 @@ describe('Service inventory', () => {
     it('with the correct environment when changing the environment', () => {
       cy.wait(mainAliasNames);
 
-      cy.getByTestSubj('environmentFilter').type('production');
+      cy.getByTestSubj('environmentFilter').type('{selectall}production');
 
       cy.contains('button', 'production').click();
 
@@ -103,6 +103,7 @@ describe('Service inventory', () => {
 
     it('when selecting a different time range and clicking the update button', () => {
       cy.wait(mainAliasNames);
+      cy.getByTestSubj('apmServiceGroupsTourDismissButton').click();
 
       cy.selectAbsoluteTimeRange(
         moment(timeRange.rangeFrom).subtract(5, 'm').toISOString(),
diff --git a/x-pack/plugins/observability_solution/apm/kibana.jsonc b/x-pack/plugins/observability_solution/apm/kibana.jsonc
index aa87258afbe36..c6a53232aaec0 100644
--- a/x-pack/plugins/observability_solution/apm/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/apm/kibana.jsonc
@@ -30,7 +30,8 @@
       "lens",
       "maps",
       "uiActions",
-      "logsDataAccess"
+      "logsDataAccess",
+      "entityManager"
     ],
     "optionalPlugins": [
       "actions",
@@ -52,13 +53,6 @@
       "cases",
       "observabilityAIAssistant"
     ],
-    "requiredBundles": [
-      "fleet",
-      "kibanaReact",
-      "kibanaUtils",
-      "ml",
-      "observability",
-      "maps"
-    ]
+    "requiredBundles": ["fleet", "kibanaReact", "kibanaUtils", "ml", "observability", "maps"]
   }
 }
diff --git a/x-pack/plugins/observability_solution/apm/public/assets/services_inventory.png b/x-pack/plugins/observability_solution/apm/public/assets/services_inventory.png
new file mode 100644
index 0000000000000..fc9347c5b5430
Binary files /dev/null and b/x-pack/plugins/observability_solution/apm/public/assets/services_inventory.png differ
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_error_rate_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_error_rate_chart.tsx
new file mode 100644
index 0000000000000..56daf2d42d797
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_error_rate_chart.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiPanel, EuiTitle, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+import { useApmParams } from '../../../../hooks/use_apm_params';
+import { useFetcher } from '../../../../hooks/use_fetcher';
+import { useTimeRange } from '../../../../hooks/use_time_range';
+import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
+import { getTimeSeriesColor, ChartType } from '../../../shared/charts/helper/get_timeseries_color';
+import { TimeseriesChartWithContext } from '../../../shared/charts/timeseries_chart_with_context';
+import { yLabelAsPercent } from '../../../../../common/utils/formatters';
+
+type LogErrorRateReturnType =
+  APIReturnType<'GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries'>;
+
+const INITIAL_STATE: LogErrorRateReturnType = {
+  currentPeriod: {},
+};
+
+export function LogErrorRateChart({ height }: { height: number }) {
+  const {
+    query: { rangeFrom, rangeTo, environment, kuery },
+    path: { serviceName },
+  } = useApmParams('/logs-services/{serviceName}');
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
+  const { data = INITIAL_STATE, status } = useFetcher(
+    (callApmApi) => {
+      if (start && end) {
+        return callApmApi(
+          'GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries',
+          {
+            params: {
+              path: {
+                serviceName,
+              },
+              query: {
+                environment,
+                kuery,
+                start,
+                end,
+              },
+            },
+          }
+        );
+      }
+    },
+    [environment, kuery, serviceName, start, end]
+  );
+  const { currentPeriodColor } = getTimeSeriesColor(ChartType.LOG_ERROR_RATE);
+
+  const timeseries = [
+    {
+      data: data?.currentPeriod?.[serviceName] ?? [],
+      type: 'linemark',
+      color: currentPeriodColor,
+      title: i18n.translate('xpack.apm.logs.chart.logsErrorRate', {
+        defaultMessage: 'Log Error Rate',
+      }),
+    },
+  ];
+
+  return (
+    <EuiPanel hasBorder>
+      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h2>
+              {i18n.translate('xpack.apm.logErrorRate', {
+                defaultMessage: 'Log error rate',
+              })}
+            </h2>
+          </EuiTitle>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <TimeseriesChartWithContext
+        id="logErrorRate"
+        height={height}
+        showAnnotations={false}
+        fetchStatus={status}
+        timeseries={timeseries}
+        yLabelFormat={yLabelAsPercent}
+        yDomain={{ min: 0, max: 1 }}
+      />
+    </EuiPanel>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_rate_chart.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_rate_chart.tsx
new file mode 100644
index 0000000000000..a52b4c9f73d4c
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/entities/charts/log_rate_chart.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiPanel, EuiTitle, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+import { useApmParams } from '../../../../hooks/use_apm_params';
+import { useFetcher } from '../../../../hooks/use_fetcher';
+import { useTimeRange } from '../../../../hooks/use_time_range';
+import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
+import { getTimeSeriesColor, ChartType } from '../../../shared/charts/helper/get_timeseries_color';
+import { TimeseriesChartWithContext } from '../../../shared/charts/timeseries_chart_with_context';
+import { yLabelAsPercent } from '../../../../../common/utils/formatters';
+
+type LogRateReturnType =
+  APIReturnType<'GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries'>;
+
+const INITIAL_STATE: LogRateReturnType = {
+  currentPeriod: {},
+};
+
+export function LogRateChart({ height }: { height: number }) {
+  const {
+    query: { rangeFrom, rangeTo, environment, kuery },
+    path: { serviceName },
+  } = useApmParams('/logs-services/{serviceName}');
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
+  const { data = INITIAL_STATE, status } = useFetcher(
+    (callApmApi) => {
+      if (start && end) {
+        return callApmApi(
+          'GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries',
+          {
+            params: {
+              path: {
+                serviceName,
+              },
+              query: {
+                environment,
+                kuery,
+                start,
+                end,
+              },
+            },
+          }
+        );
+      }
+    },
+    [environment, kuery, serviceName, start, end]
+  );
+  const { currentPeriodColor } = getTimeSeriesColor(ChartType.LOG_RATE);
+
+  const timeseries = [
+    {
+      data: data?.currentPeriod?.[serviceName] ?? [],
+      type: 'linemark',
+      color: currentPeriodColor,
+      title: i18n.translate('xpack.apm.logs.chart.logRate', {
+        defaultMessage: 'Log Rate',
+      }),
+    },
+  ];
+
+  return (
+    <EuiPanel hasBorder>
+      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="xs">
+            <h2>
+              {i18n.translate('xpack.apm.logRate', {
+                defaultMessage: 'Log rate',
+              })}
+            </h2>
+          </EuiTitle>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+
+      <TimeseriesChartWithContext
+        id="logRate"
+        height={height}
+        showAnnotations={false}
+        fetchStatus={status}
+        timeseries={timeseries}
+        yLabelFormat={yLabelAsPercent}
+        yDomain={{ min: 0, max: 1 }}
+      />
+    </EuiPanel>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/add_apm_callout.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/add_apm_callout.tsx
new file mode 100644
index 0000000000000..77bec8cebb188
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/add_apm_callout.tsx
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiImage,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+  EuiButtonEmpty,
+  useEuiTheme,
+} from '@elastic/eui';
+import { apmLight } from '@kbn/shared-svg';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
+
+export function AddAPMCallOut() {
+  const { core } = useApmPluginContext();
+  const { euiTheme } = useEuiTheme();
+
+  return (
+    <EuiPanel color="subdued" hasShadow={false}>
+      <EuiFlexGroup alignItems="center" gutterSize="s" justifyContent="flexStart">
+        <EuiFlexItem grow={0}>
+          <EuiImage
+            css={{
+              background: euiTheme.colors.emptyShade,
+            }}
+            width="160"
+            height="100"
+            size="m"
+            src={apmLight}
+            alt="apm-logo"
+          />
+        </EuiFlexItem>
+        <EuiFlexItem grow={4}>
+          <EuiTitle size="xs">
+            <h1>
+              <FormattedMessage
+                id="xpack.apm.addAPMCallOut.title"
+                defaultMessage="Detect and resolve issues faster with deep visibility into your application"
+              />
+            </h1>
+          </EuiTitle>
+
+          <EuiSpacer size="m" />
+
+          <EuiText size="s">
+            <p>
+              <FormattedMessage
+                id="xpack.apm.addAPMCallOut.description"
+                defaultMessage="Understanding your application performance, relationships and dependencies by
+    instrumenting with APM."
+              />
+            </p>
+          </EuiText>
+          <EuiSpacer size="s" />
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiFlexGroup alignItems="center" gutterSize="s" justifyContent="flexEnd">
+        <EuiFlexItem grow={false}>
+          <div>
+            <EuiButton
+              data-test-subj="apmAddApmCallOutButton"
+              href={core.http.basePath.prepend('/app/apm/tutorial')}
+            >
+              {i18n.translate('xpack.apm.logsServiceOverview.callout.addApm', {
+                defaultMessage: 'Add APM',
+              })}
+            </EuiButton>
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem grow={false}>
+          <EuiButtonEmpty
+            data-test-subj="apmAddApmCallOutLearnMoreButton"
+            iconType="popout"
+            iconSide="right"
+            href="https://www.elastic.co/observability/application-performance-monitoring"
+          >
+            {i18n.translate('xpack.apm.addAPMCallOut.linkToElasticcoButtonEmptyLabel', {
+              defaultMessage: 'Learn more',
+            })}
+          </EuiButtonEmpty>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/logs_service_overview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/logs_service_overview.tsx
new file mode 100644
index 0000000000000..d1f08b16eaf15
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/entities/logs/logs_service_overview.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiFlexGroupProps, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { AnnotationsContextProvider } from '../../../../context/annotations/annotations_context';
+import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
+import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
+import { useBreakpoints } from '../../../../hooks/use_breakpoints';
+import { useApmParams } from '../../../../hooks/use_apm_params';
+import { useTimeRange } from '../../../../hooks/use_time_range';
+import { AddAPMCallOut } from './add_apm_callout';
+import { LogRateChart } from '../charts/log_rate_chart';
+import { LogErrorRateChart } from '../charts/log_error_rate_chart';
+/**
+ * The height a chart should be if it's next to a table with 5 rows and a title.
+ * Add the height of the pagination row.
+ */
+
+const chartHeight = 400;
+
+export function LogsServiceOverview() {
+  const { serviceName } = useApmServiceContext();
+
+  const {
+    query: { environment, rangeFrom, rangeTo },
+  } = useApmParams('/logs-services/{serviceName}/overview');
+
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
+  const { isLarge } = useBreakpoints();
+  const isSingleColumn = isLarge;
+
+  const rowDirection: EuiFlexGroupProps['direction'] = isSingleColumn ? 'column' : 'row';
+
+  return (
+    <AnnotationsContextProvider
+      serviceName={serviceName}
+      environment={environment}
+      start={start}
+      end={end}
+    >
+      <ChartPointerEventContextProvider>
+        <AddAPMCallOut />
+        <EuiSpacer size="l" />
+
+        <EuiFlexGroup direction="column" gutterSize="s">
+          <EuiFlexItem>
+            <EuiFlexGroup direction={rowDirection} gutterSize="s" responsive={false}>
+              <EuiFlexItem grow={4}>
+                <LogRateChart height={chartHeight} />
+              </EuiFlexItem>
+              <EuiFlexItem grow={4}>
+                <LogErrorRateChart height={chartHeight} />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </ChartPointerEventContextProvider>
+    </AnnotationsContextProvider>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx
index 0a9a86f7cbd7f..db8a2c1bac8cc 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_dashboards/index.tsx
@@ -45,13 +45,14 @@ export interface MergedServiceDashboard extends SavedApmCustomDashboard {
   title: string;
 }
 
-export function ServiceDashboards() {
+export function ServiceDashboards({ checkForEntities = false }: { checkForEntities?: boolean }) {
   const {
     path: { serviceName },
     query: { environment, kuery, rangeFrom, rangeTo, dashboardId },
   } = useAnyOfApmParams(
     '/services/{serviceName}/dashboards',
-    '/mobile-services/{serviceName}/dashboards'
+    '/mobile-services/{serviceName}/dashboards',
+    '/logs-services/{serviceName}/dashboards'
   );
   const [dashboard, setDashboard] = useState<AwaitingDashboardAPI>();
   const [serviceDashboards, setServiceDashboards] = useState<MergedServiceDashboard[]>([]);
@@ -68,12 +69,12 @@ export function ServiceDashboards() {
           isCachable: false,
           params: {
             path: { serviceName },
-            query: { start, end },
+            query: { start, end, checkFor: checkForEntities ? 'entities' : 'services' },
           },
         });
       }
     },
-    [serviceName, start, end]
+    [serviceName, start, end, checkForEntities]
   );
 
   useEffect(() => {
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx
index f5c87a8d17f4b..77694d60c84e8 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_groups/service_group_save/service_list_preview.tsx
@@ -84,7 +84,7 @@ export function ServiceListPreview({ items, isLoading }: Props) {
           content={
             <EuiFlexGroup gutterSize="s" justifyContent="flexStart">
               <EuiFlexItem grow={false}>
-                <AgentIcon agentName={agentName} size="l" />
+                <AgentIcon agentName={agentName} size="l" role="presentation" />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>{serviceName}</EuiFlexItem>
             </EuiFlexGroup>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
index d00dc0a6e2d6a..ed8f9e361c321 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/index.tsx
@@ -5,24 +5,39 @@
  * 2.0.
  */
 import React from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiEmptyPrompt, EuiLoadingLogo } from '@elastic/eui';
 import { isEmpty } from 'lodash';
-import { apmEnableMultiSignal } from '@kbn/observability-plugin/common';
-import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 import { ApmServiceInventory } from './apm_signal_inventory';
 import { MultiSignalInventory } from './multi_signal_inventory';
 import { useApmParams } from '../../../hooks/use_apm_params';
+import { useEntityManagerEnablementContext } from '../../../context/entity_manager_context/use_entity_manager_enablement_context';
 
-export const ServiceInventory = () => {
-  const { core } = useApmPluginContext();
-  const isMultiSignalEnabled = core.uiSettings.get<boolean>(apmEnableMultiSignal, false);
+export function ServiceInventory() {
+  const { isEntityManagerEnabled, isEnablementPending } = useEntityManagerEnablementContext();
 
   const {
     query: { serviceGroup },
   } = useApmParams('/services');
 
-  return isMultiSignalEnabled && isEmpty(serviceGroup) ? (
+  if (isEnablementPending) {
+    return (
+      <EuiEmptyPrompt
+        icon={<EuiLoadingLogo logo="logoObservability" size="xl" />}
+        title={
+          <h2>
+            {i18n.translate('xpack.apm.loadingService', {
+              defaultMessage: 'Loading services',
+            })}
+          </h2>
+        }
+      />
+    );
+  }
+
+  return isEntityManagerEnabled && isEmpty(serviceGroup) ? (
     <MultiSignalInventory />
   ) : (
     <ApmServiceInventory />
   );
-};
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/index.tsx
index af2282ea19219..01b8b9af7985f 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/index.tsx
@@ -8,9 +8,10 @@ import { EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { v4 as uuidv4 } from 'uuid';
+import { ApmDocumentType } from '../../../../../common/document_type';
 import { APIReturnType } from '../../../../services/rest/create_call_apm_api';
 import { useApmParams } from '../../../../hooks/use_apm_params';
-import { useFetcher } from '../../../../hooks/use_fetcher';
+import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
 import { useTimeRange } from '../../../../hooks/use_time_range';
 import { EmptyMessage } from '../../../shared/empty_message';
 import { SearchBar } from '../../../shared/search_bar/search_bar';
@@ -22,6 +23,9 @@ import {
   MultiSignalServicesTable,
   ServiceInventoryFieldName,
 } from './table/multi_signal_services_table';
+import { ServiceListItem } from '../../../../../common/service_inventory';
+import { usePreferredDataSourceAndBucketSize } from '../../../../hooks/use_preferred_data_source_and_bucket_size';
+import { useProgressiveFetcher } from '../../../../hooks/use_progressive_fetcher';
 
 type MainStatisticsApiResponse = APIReturnType<'GET /internal/apm/entities/services'>;
 
@@ -74,9 +78,72 @@ function useServicesEntitiesMainStatisticsFetcher() {
   return { mainStatisticsData: data, mainStatisticsStatus: status };
 }
 
-export const MultiSignalInventory = () => {
+function useServicesEntitiesDetailedStatisticsFetcher({
+  mainStatisticsFetch,
+  services,
+}: {
+  mainStatisticsFetch: ReturnType<typeof useServicesEntitiesMainStatisticsFetcher>;
+  services: ServiceListItem[];
+}) {
+  const {
+    query: { rangeFrom, rangeTo, environment, kuery },
+  } = useApmParams('/services');
+
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
+  const dataSourceOptions = usePreferredDataSourceAndBucketSize({
+    start,
+    end,
+    kuery,
+    type: ApmDocumentType.ServiceTransactionMetric,
+    numBuckets: 20,
+  });
+
+  const { mainStatisticsData, mainStatisticsStatus } = mainStatisticsFetch;
+
+  const timeseriesDataFetch = useProgressiveFetcher(
+    (callApmApi) => {
+      const serviceNames = services.map(({ serviceName }) => serviceName);
+
+      if (
+        start &&
+        end &&
+        serviceNames.length > 0 &&
+        mainStatisticsStatus === FETCH_STATUS.SUCCESS &&
+        dataSourceOptions
+      ) {
+        return callApmApi('POST /internal/apm/entities/services/detailed_statistics', {
+          params: {
+            query: {
+              environment,
+              kuery,
+              start,
+              end,
+              documentType: dataSourceOptions.source.documentType,
+              rollupInterval: dataSourceOptions.source.rollupInterval,
+              bucketSizeInSeconds: dataSourceOptions.bucketSizeInSeconds,
+            },
+            body: {
+              // Service name is sorted to guarantee the same order every time this API is called so the result can be cached.
+              serviceNames: JSON.stringify(serviceNames.sort()),
+            },
+          },
+        });
+      }
+    },
+    // only fetches detailed statistics when requestId is invalidated by main statistics api call or offset is changed
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [mainStatisticsData.requestId, services],
+    { preservePreviousData: false }
+  );
+
+  return { timeseriesDataFetch };
+}
+
+export function MultiSignalInventory() {
   const [searchQuery, setSearchQuery] = React.useState('');
   const { mainStatisticsData, mainStatisticsStatus } = useServicesEntitiesMainStatisticsFetcher();
+  const mainStatisticsFetch = useServicesEntitiesMainStatisticsFetcher();
 
   const initialSortField = ServiceInventoryFieldName.Throughput;
 
@@ -86,6 +153,11 @@ export const MultiSignalInventory = () => {
     fieldsToSearch: [ServiceInventoryFieldName.ServiceName],
   });
 
+  const { timeseriesDataFetch } = useServicesEntitiesDetailedStatisticsFetcher({
+    mainStatisticsFetch,
+    services: mainStatisticsData.services,
+  });
+
   return (
     <>
       <EuiFlexGroup gutterSize="m">
@@ -110,6 +182,8 @@ export const MultiSignalInventory = () => {
             initialSortField={initialSortField}
             initialPageSize={INITIAL_PAGE_SIZE}
             initialSortDirection={INITIAL_SORT_DIRECTION}
+            timeseriesData={timeseriesDataFetch?.data}
+            timeseriesDataLoading={timeseriesDataFetch.status === FETCH_STATUS.LOADING}
             noItemsMessage={
               <EmptyMessage
                 heading={i18n.translate('xpack.apm.servicesTable.notFoundLabel', {
@@ -122,4 +196,4 @@ export const MultiSignalInventory = () => {
       </EuiFlexGroup>
     </>
   );
-};
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/get_service_columns.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/get_service_columns.tsx
index 48667b7834656..a5661e36141ac 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/get_service_columns.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/get_service_columns.tsx
@@ -30,15 +30,27 @@ import { NotAvailableApmMetrics } from '../../../../shared/not_available_apm_met
 import { TruncateWithTooltip } from '../../../../shared/truncate_with_tooltip';
 import { ServiceInventoryFieldName } from './multi_signal_services_table';
 import { EntityServiceListItem, SignalTypes } from '../../../../../../common/entities/types';
+import { isApmSignal } from '../../../../../utils/get_signal_type';
+import { APIReturnType } from '../../../../../services/rest/create_call_apm_api';
+
+type ServicesDetailedStatisticsAPIResponse =
+  APIReturnType<'POST /internal/apm/entities/services/detailed_statistics'>;
+
 export function getServiceColumns({
   query,
   breakpoints,
   link,
+  timeseriesDataLoading,
+  timeseriesData,
 }: {
   query: TypeOf<ApmRoutes, '/services'>['query'];
   breakpoints: Breakpoints;
   link: any;
+  timeseriesDataLoading: boolean;
+  timeseriesData?: ServicesDetailedStatisticsAPIResponse;
 }): Array<ITableColumn<EntityServiceListItem>> {
+  const { isSmall, isLarge } = breakpoints;
+  const showWhenSmallOrGreaterThanLarge = isSmall || !isLarge;
   return [
     {
       field: ServiceInventoryFieldName.ServiceName,
@@ -46,14 +58,19 @@ export function getServiceColumns({
         defaultMessage: 'Name',
       }),
       sortable: true,
-      render: (_, { serviceName, agentName }) => (
+      render: (_, { serviceName, agentName, signalTypes }) => (
         <TruncateWithTooltip
           data-test-subj="apmServiceListAppLink"
           text={serviceName}
           content={
             <EuiFlexGroup gutterSize="s" justifyContent="flexStart">
               <EuiFlexItem grow={false}>
-                <ServiceLink serviceName={serviceName} agentName={agentName} query={query} />
+                <ServiceLink
+                  signalTypes={signalTypes}
+                  serviceName={serviceName}
+                  agentName={agentName}
+                  query={query}
+                />
               </EuiFlexItem>
             </EuiFlexGroup>
           }
@@ -84,17 +101,18 @@ export function getServiceColumns({
       sortable: true,
       dataType: 'number',
       align: RIGHT_ALIGNMENT,
-      render: (_, { metrics, signalTypes }) => {
+      render: (_, { metrics, serviceName, signalTypes }) => {
         const { currentPeriodColor } = getTimeSeriesColor(ChartType.LATENCY_AVG);
 
-        return !signalTypes.includes(SignalTypes.METRICS) ? (
+        return !isApmSignal(signalTypes) ? (
           <NotAvailableApmMetrics />
         ) : (
           <ListMetric
-            isLoading={false}
+            isLoading={timeseriesDataLoading}
+            series={timeseriesData?.currentPeriod?.apm[serviceName]?.latency}
             color={currentPeriodColor}
-            hideSeries
             valueLabel={asMillisecondDuration(metrics.latency)}
+            hideSeries={!showWhenSmallOrGreaterThanLarge}
           />
         );
       },
@@ -107,17 +125,18 @@ export function getServiceColumns({
       sortable: true,
       dataType: 'number',
       align: RIGHT_ALIGNMENT,
-      render: (_, { metrics, signalTypes }) => {
+      render: (_, { metrics, serviceName, signalTypes }) => {
         const { currentPeriodColor } = getTimeSeriesColor(ChartType.THROUGHPUT);
 
-        return !signalTypes.includes(SignalTypes.METRICS) ? (
+        return !isApmSignal(signalTypes) ? (
           <NotAvailableApmMetrics />
         ) : (
           <ListMetric
-            isLoading={false}
             color={currentPeriodColor}
-            hideSeries
             valueLabel={asTransactionRate(metrics.throughput)}
+            isLoading={timeseriesDataLoading}
+            series={timeseriesData?.currentPeriod?.apm[serviceName]?.throughput}
+            hideSeries={!showWhenSmallOrGreaterThanLarge}
           />
         );
       },
@@ -130,17 +149,18 @@ export function getServiceColumns({
       sortable: true,
       dataType: 'number',
       align: RIGHT_ALIGNMENT,
-      render: (_, { metrics, signalTypes }) => {
+      render: (_, { metrics, serviceName, signalTypes }) => {
         const { currentPeriodColor } = getTimeSeriesColor(ChartType.FAILED_TRANSACTION_RATE);
 
-        return !signalTypes.includes(SignalTypes.METRICS) ? (
+        return !isApmSignal(signalTypes) ? (
           <NotAvailableApmMetrics />
         ) : (
           <ListMetric
-            isLoading={false}
             color={currentPeriodColor}
-            hideSeries
             valueLabel={asPercent(metrics.failedTransactionRate, 1)}
+            isLoading={timeseriesDataLoading}
+            series={timeseriesData?.currentPeriod?.apm[serviceName]?.transactionErrorRate}
+            hideSeries={!showWhenSmallOrGreaterThanLarge}
           />
         );
       },
@@ -153,15 +173,16 @@ export function getServiceColumns({
       sortable: true,
       dataType: 'number',
       align: RIGHT_ALIGNMENT,
-      render: (_, { metrics }) => {
+      render: (_, { metrics, serviceName }) => {
         const { currentPeriodColor } = getTimeSeriesColor(ChartType.LOG_RATE);
 
         return (
           <ListMetric
             isLoading={false}
             color={currentPeriodColor}
-            hideSeries
+            series={timeseriesData?.currentPeriod?.logRate[serviceName] ?? []}
             valueLabel={asDecimalOrInteger(metrics.logRatePerMinute)}
+            hideSeries={!showWhenSmallOrGreaterThanLarge}
           />
         );
       },
@@ -174,15 +195,16 @@ export function getServiceColumns({
       sortable: true,
       dataType: 'number',
       align: RIGHT_ALIGNMENT,
-      render: (_, { metrics }) => {
+      render: (_, { metrics, serviceName }) => {
         const { currentPeriodColor } = getTimeSeriesColor(ChartType.LOG_ERROR_RATE);
 
         return (
           <ListMetric
             isLoading={false}
             color={currentPeriodColor}
-            hideSeries
+            series={timeseriesData?.currentPeriod?.logErrorRate[serviceName] ?? []}
             valueLabel={asPercent(metrics.logErrorRate, 1)}
+            hideSeries={!showWhenSmallOrGreaterThanLarge}
           />
         );
       },
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/multi_signal_services_table.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/multi_signal_services_table.tsx
index deffe7a1de5ba..5320fef8f22db 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/multi_signal_services_table.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_inventory/multi_signal_inventory/table/multi_signal_services_table.tsx
@@ -17,6 +17,8 @@ import { ManagedTable } from '../../../../shared/managed_table';
 import { getServiceColumns } from './get_service_columns';
 
 type MainStatisticsApiResponse = APIReturnType<'GET /internal/apm/entities/services'>;
+type ServicesDetailedStatisticsAPIResponse =
+  APIReturnType<'POST /internal/apm/entities/services/detailed_statistics'>;
 
 export enum ServiceInventoryFieldName {
   ServiceName = 'serviceName',
@@ -35,6 +37,8 @@ interface Props {
   initialSortDirection: 'asc' | 'desc';
   noItemsMessage: React.ReactNode;
   data: MainStatisticsApiResponse['services'];
+  timeseriesDataLoading: boolean;
+  timeseriesData?: ServicesDetailedStatisticsAPIResponse;
 }
 
 export function MultiSignalServicesTable({
@@ -44,6 +48,8 @@ export function MultiSignalServicesTable({
   initialPageSize,
   initialSortDirection,
   noItemsMessage,
+  timeseriesDataLoading,
+  timeseriesData,
 }: Props) {
   const breakpoints = useBreakpoints();
   const { query } = useApmParams('/services');
@@ -55,8 +61,10 @@ export function MultiSignalServicesTable({
       query: omit(query, 'page', 'pageSize', 'sortDirection', 'sortField'),
       breakpoints,
       link,
+      timeseriesDataLoading,
+      timeseriesData,
     });
-  }, [query, link, breakpoints]);
+  }, [query, breakpoints, link, timeseriesDataLoading, timeseriesData]);
 
   return (
     <EuiFlexGroup gutterSize="xs" direction="column" responsive={false}>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx
index ab237154aea76..90f31e29b5960 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_logs/index.tsx
@@ -14,7 +14,7 @@ import { useApmServiceContext } from '../../../context/apm_service/use_apm_servi
 import { APIReturnType } from '../../../services/rest/create_call_apm_api';
 
 import { CONTAINER_ID, SERVICE_ENVIRONMENT, SERVICE_NAME } from '../../../../common/es_fields/apm';
-import { useApmParams } from '../../../hooks/use_apm_params';
+import { useAnyOfApmParams } from '../../../hooks/use_apm_params';
 import { useTimeRange } from '../../../hooks/use_time_range';
 
 export function ServiceLogs() {
@@ -22,7 +22,7 @@ export function ServiceLogs() {
 
   const {
     query: { environment, kuery, rangeFrom, rangeTo },
-  } = useApmParams('/services/{serviceName}/logs');
+  } = useAnyOfApmParams('/services/{serviceName}/logs', '/logs-services/{serviceName}/logs');
 
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
 
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
index 301e01662090d..1327a58cc0e86 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/service_overview/service_overview_dependencies_table/index.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiIcon, EuiToolTip } from '@elastic/eui';
+import { EuiIconTip } from '@elastic/eui';
 import { METRIC_TYPE } from '@kbn/analytics';
 import { i18n } from '@kbn/i18n';
 import React, { ReactNode } from 'react';
@@ -131,20 +131,22 @@ export function ServiceOverviewDependenciesTable({
       dependencies={dependencies}
       fixedHeight={fixedHeight}
       title={
-        <EuiToolTip
-          content={i18n.translate('xpack.apm.serviceOverview.dependenciesTableTitleTip', {
-            defaultMessage:
-              'Downstream services and external connections to uninstrumented services',
+        <>
+          {i18n.translate('xpack.apm.serviceOverview.dependenciesTableTitle', {
+            defaultMessage: 'Dependencies',
           })}
-        >
-          <>
-            {i18n.translate('xpack.apm.serviceOverview.dependenciesTableTitle', {
-              defaultMessage: 'Dependencies',
+          &nbsp;
+          <EuiIconTip
+            size="s"
+            color="subdued"
+            type="questionInCircle"
+            className="eui-alignCenter"
+            content={i18n.translate('xpack.apm.serviceOverview.dependenciesTableTitleTip', {
+              defaultMessage:
+                'Downstream services and external connections to uninstrumented services',
             })}
-            &nbsp;
-            <EuiIcon size="s" color="subdued" type="questionInCircle" className="eui-alignCenter" />
-          </>
-        </EuiToolTip>
+          />
+        </>
       }
       nameColumnTitle={i18n.translate('xpack.apm.serviceOverview.dependenciesTableColumn', {
         defaultMessage: 'Dependency',
diff --git a/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx
index ddabc454cf072..7c3210dabbfea 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/app/settings/agent_explorer/agent_list/index.tsx
@@ -87,7 +87,7 @@ export function getAgentsColumns({
           content={
             <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
               <EuiFlexItem grow={false}>
-                <AgentIcon agentName={agentName} size="l" />
+                <AgentIcon agentName={agentName} size="l" role="presentation" />
               </EuiFlexItem>
               <EuiFlexItem className="eui-textTruncate">
                 <span className="eui-textTruncate">{serviceName}</span>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
index 3433f09907070..bd87c7b616312 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/fleet_integration/apm_agents/agent_instructions_accordion.tsx
@@ -38,7 +38,7 @@ function AccordionButtonContent({ agentName, title }: { agentName: AgentName; ti
   return (
     <EuiFlexGroup justifyContent="flexStart" alignItems="center">
       <EuiFlexItem grow={false}>
-        <AgentIcon size="xl" agentName={agentName} />
+        <AgentIcon size="xl" agentName={agentName} role="presentation" />
       </EuiFlexItem>
       <EuiFlexItem grow={1}>
         <EuiFlexGroup direction="column" gutterSize="none">
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx
index 36857d601082e..05d6b5f227e39 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/apm_route_config.tsx
@@ -16,6 +16,7 @@ import { TransactionLink } from '../app/transaction_link';
 import { homeRoute } from './home';
 import { serviceDetailRoute } from './service_detail';
 import { mobileServiceDetailRoute } from './mobile_service_detail';
+import { logsServiceDetailsRoute } from './entities/logs_service_details';
 import { settingsRoute } from './settings';
 import { onboarding } from './onboarding';
 import { tutorialRedirectRoute } from './onboarding/redirect';
@@ -100,6 +101,7 @@ const apmRoutes = {
               environmentFilter={false}
               showServiceGroupSaveButton={false}
               showServiceGroupsNav
+              showEnablementCallout
               selectedNavButton="serviceGroups"
             >
               <ServiceGroupsList />
@@ -130,6 +132,7 @@ const apmRoutes = {
       ...settingsRoute,
       ...serviceDetailRoute,
       ...mobileServiceDetailRoute,
+      ...logsServiceDetailsRoute,
       ...homeRoute,
     },
   },
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx
index b331027a79d0f..02d73e7df75bc 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/app_root/index.tsx
@@ -42,6 +42,7 @@ import { RedirectWithDefaultEnvironment } from './redirect_with_default_environm
 import { RedirectWithOffset } from './redirect_with_offset';
 import { ScrollToTopOnPathChange } from './scroll_to_top_on_path_change';
 import { UpdateExecutionContextOnRouteChange } from './update_execution_context_on_route_change';
+import { EntityManagerEnablementContextProvider } from '../../../context/entity_manager_context/entity_manager_context';
 
 const storage = new Storage(localStorage);
 
@@ -83,15 +84,17 @@ export function ApmAppRoot({
                                     <BreadcrumbsContextProvider>
                                       <UrlParamsProvider>
                                         <LicenseProvider>
-                                          <AnomalyDetectionJobsContextProvider>
-                                            <InspectorContextProvider>
-                                              <ApmThemeProvider>
-                                                <MountApmHeaderActionMenu />
-                                                <Route component={ScrollToTopOnPathChange} />
-                                                <RouteRenderer />
-                                              </ApmThemeProvider>
-                                            </InspectorContextProvider>
-                                          </AnomalyDetectionJobsContextProvider>
+                                          <EntityManagerEnablementContextProvider>
+                                            <AnomalyDetectionJobsContextProvider>
+                                              <InspectorContextProvider>
+                                                <ApmThemeProvider>
+                                                  <MountApmHeaderActionMenu />
+                                                  <Route component={ScrollToTopOnPathChange} />
+                                                  <RouteRenderer />
+                                                </ApmThemeProvider>
+                                              </InspectorContextProvider>
+                                            </AnomalyDetectionJobsContextProvider>
+                                          </EntityManagerEnablementContextProvider>
                                         </LicenseProvider>
                                       </UrlParamsProvider>
                                     </BreadcrumbsContextProvider>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/entities/logs_service_details/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/entities/logs_service_details/index.tsx
new file mode 100644
index 0000000000000..90cf280688eca
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/entities/logs_service_details/index.tsx
@@ -0,0 +1,149 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { toBooleanRt, toNumberRt } from '@kbn/io-ts-utils';
+import { Outlet } from '@kbn/typed-react-router-config';
+import * as t from 'io-ts';
+import React from 'react';
+import { LogsServiceTemplate } from '../../templates/entities/logs_service_template';
+import { offsetRt } from '../../../../../common/comparison_rt';
+import { ENVIRONMENT_ALL } from '../../../../../common/environment_filter_values';
+import { environmentRt } from '../../../../../common/environment_rt';
+import { ApmTimeRangeMetadataContextProvider } from '../../../../context/time_range_metadata/time_range_metadata_context';
+import { ServiceDashboards } from '../../../app/service_dashboards';
+import { ServiceLogs } from '../../../app/service_logs';
+import { LogsServiceOverview } from '../../../app/entities/logs/logs_service_overview';
+import { RedirectToDefaultLogsServiceRouteView } from '../../service_detail/redirect_to_default_service_route_view';
+
+export function page({
+  title,
+  tabKey,
+  element,
+  searchBarOptions,
+}: {
+  title: string;
+  tabKey: React.ComponentProps<typeof LogsServiceTemplate>['selectedTabKey'];
+  element: React.ReactElement<any, any>;
+  searchBarOptions?: {
+    showUnifiedSearchBar?: boolean;
+    showTransactionTypeSelector?: boolean;
+    showTimeComparison?: boolean;
+    showMobileFilters?: boolean;
+    hidden?: boolean;
+  };
+}): {
+  element: React.ReactElement<any, any>;
+} {
+  return {
+    element: (
+      <LogsServiceTemplate
+        title={title}
+        selectedTabKey={tabKey}
+        searchBarOptions={searchBarOptions}
+      >
+        {element}
+      </LogsServiceTemplate>
+    ),
+  };
+}
+
+export const logsServiceDetailsRoute = {
+  '/logs-services/{serviceName}': {
+    element: (
+      <ApmTimeRangeMetadataContextProvider>
+        <Outlet />
+      </ApmTimeRangeMetadataContextProvider>
+    ),
+    params: t.intersection([
+      t.type({
+        path: t.type({
+          serviceName: t.string,
+        }),
+      }),
+      t.type({
+        query: t.intersection([
+          environmentRt,
+          t.type({
+            rangeFrom: t.string,
+            rangeTo: t.string,
+            kuery: t.string,
+            serviceGroup: t.string,
+            comparisonEnabled: toBooleanRt,
+          }),
+          t.partial({
+            transactionType: t.string,
+            refreshPaused: t.union([t.literal('true'), t.literal('false')]),
+            refreshInterval: t.string,
+          }),
+          offsetRt,
+        ]),
+      }),
+    ]),
+    defaults: {
+      query: {
+        kuery: '',
+        environment: ENVIRONMENT_ALL.value,
+        serviceGroup: '',
+      },
+    },
+    children: {
+      '/logs-services/{serviceName}/overview': {
+        ...page({
+          element: <LogsServiceOverview />,
+          tabKey: 'overview',
+          title: i18n.translate('xpack.apm.views.overview.title', {
+            defaultMessage: 'Overview',
+          }),
+          searchBarOptions: {
+            showUnifiedSearchBar: true,
+          },
+        }),
+        params: t.partial({
+          query: t.partial({
+            page: toNumberRt,
+            pageSize: toNumberRt,
+            sortField: t.string,
+            sortDirection: t.union([t.literal('asc'), t.literal('desc')]),
+          }),
+        }),
+      },
+      '/logs-services/{serviceName}/logs': {
+        ...page({
+          tabKey: 'logs',
+          title: i18n.translate('xpack.apm.views.logs.title', {
+            defaultMessage: 'Logs',
+          }),
+          element: <ServiceLogs />,
+          searchBarOptions: {
+            showUnifiedSearchBar: false,
+          },
+        }),
+      },
+      '/logs-services/{serviceName}/dashboards': {
+        ...page({
+          tabKey: 'dashboards',
+          title: i18n.translate('xpack.apm.views.dashboard.title', {
+            defaultMessage: 'Dashboards',
+          }),
+          element: <ServiceDashboards checkForEntities />,
+          searchBarOptions: {
+            showUnifiedSearchBar: false,
+          },
+        }),
+        params: t.partial({
+          query: t.partial({
+            dashboardId: t.string,
+          }),
+        }),
+      },
+      '/logs-services/{serviceName}/': {
+        element: <RedirectToDefaultLogsServiceRouteView />,
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx
index bcf0fbd435ae9..4a61888b919f3 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/service_detail/redirect_to_default_service_route_view.tsx
@@ -19,3 +19,14 @@ export function RedirectToDefaultServiceRouteView() {
 
   return <Redirect to={{ pathname: `/services/${serviceName}/overview`, search }} />;
 }
+
+export function RedirectToDefaultLogsServiceRouteView() {
+  const {
+    path: { serviceName },
+    query,
+  } = useApmParams('/logs-services/{serviceName}/*');
+
+  const search = qs.stringify(query);
+
+  return <Redirect to={{ pathname: `/logs-services/${serviceName}/overview`, search }} />;
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
index afe1de2490e07..36ab11d45851a 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/apm_main_template.tsx
@@ -23,6 +23,7 @@ import { ServiceGroupsButtonGroup } from '../../app/service_groups/service_group
 import { ApmEnvironmentFilter } from '../../shared/environment_filter';
 import { getNoDataConfig } from './no_data_config';
 import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { EntityEnablement } from '../../shared/entity_enablement';
 
 // Paths that must skip the no data screen
 const bypassNoDataScreenPaths = ['/settings', '/diagnostics'];
@@ -45,6 +46,7 @@ export function ApmMainTemplate({
   environmentFilter = true,
   showServiceGroupSaveButton = false,
   showServiceGroupsNav = false,
+  showEnablementCallout = false,
   environmentFilterInTemplate = true,
   selectedNavButton,
   ...pageTemplateProps
@@ -55,6 +57,7 @@ export function ApmMainTemplate({
   environmentFilter?: boolean;
   showServiceGroupSaveButton?: boolean;
   showServiceGroupsNav?: boolean;
+  showEnablementCallout?: boolean;
   selectedNavButton?: 'serviceGroups' | 'allServices';
 } & KibanaPageTemplateProps &
   Pick<ObservabilityPageTemplateProps, 'pageSectionProps'>) {
@@ -126,6 +129,7 @@ export function ApmMainTemplate({
   const pageHeaderTitle = (
     <EuiFlexGroup justifyContent="spaceBetween" wrap={true}>
       {pageHeader?.pageTitle ?? pageTitle}
+      <EuiFlexItem grow={false} />
       <EuiFlexItem grow={false}>
         <EuiFlexGroup justifyContent="center">
           <EuiFlexItem grow={false}>
@@ -152,10 +156,14 @@ export function ApmMainTemplate({
         rightSideItems,
         ...pageHeader,
         pageTitle: pageHeaderTitle,
-        children:
-          showServiceGroupsNav && selectedNavButton ? (
-            <ServiceGroupsButtonGroup selectedNavButton={selectedNavButton} />
-          ) : null,
+        children: (
+          <EuiFlexGroup direction="column">
+            {showEnablementCallout && selectedNavButton === 'allServices' && <EntityEnablement />}
+            {showServiceGroupsNav && selectedNavButton && (
+              <ServiceGroupsButtonGroup selectedNavButton={selectedNavButton} />
+            )}
+          </EuiFlexGroup>
+        ),
       }}
       {...pageTemplateProps}
     >
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx
index 1095162bd854a..3881558557316 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/dependency_detail_template.tsx
@@ -92,7 +92,11 @@ export function DependencyDetailTemplate({ children }: Props) {
               </EuiTitle>
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <SpanIcon type={metadata?.spanType} subtype={metadata?.spanSubtype} />
+              <SpanIcon
+                type={metadata?.spanType}
+                subtype={metadata?.spanSubtype}
+                role="presentation"
+              />
             </EuiFlexItem>
           </EuiFlexGroup>
         ),
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/entities/logs_service_template/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/entities/logs_service_template/index.tsx
new file mode 100644
index 0000000000000..71aca162c1ae6
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/entities/logs_service_template/index.tsx
@@ -0,0 +1,177 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiPageHeaderProps, EuiTitle } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { omit } from 'lodash';
+import React from 'react';
+import { ApmServiceContextProvider } from '../../../../../context/apm_service/apm_service_context';
+import { useBreadcrumb } from '../../../../../context/breadcrumbs/use_breadcrumb';
+import { ServiceAnomalyTimeseriesContextProvider } from '../../../../../context/service_anomaly_timeseries/service_anomaly_timeseries_context';
+import { useApmParams } from '../../../../../hooks/use_apm_params';
+import { useApmRouter } from '../../../../../hooks/use_apm_router';
+import { useTimeRange } from '../../../../../hooks/use_time_range';
+import { MobileSearchBar } from '../../../../app/mobile/search_bar';
+import { SearchBar } from '../../../../shared/search_bar/search_bar';
+import { ServiceIcons } from '../../../../shared/service_icons';
+import { TechnicalPreviewBadge } from '../../../../shared/technical_preview_badge';
+import { ApmMainTemplate } from '../../apm_main_template';
+
+type Tab = NonNullable<EuiPageHeaderProps['tabs']>[0] & {
+  key: 'overview' | 'logs' | 'dashboards';
+  hidden?: boolean;
+};
+
+interface Props {
+  title: string;
+  children: React.ReactChild;
+  selectedTabKey: Tab['key'];
+  searchBarOptions?: React.ComponentProps<typeof MobileSearchBar>;
+}
+
+export function LogsServiceTemplate(props: Props) {
+  return (
+    <ApmServiceContextProvider>
+      <TemplateWithContext {...props} />
+    </ApmServiceContextProvider>
+  );
+}
+
+function TemplateWithContext({ title, children, selectedTabKey, searchBarOptions }: Props) {
+  const {
+    path: { serviceName },
+    query,
+    query: { rangeFrom, rangeTo, environment },
+  } = useApmParams('/logs-services/{serviceName}/*');
+
+  const { start, end } = useTimeRange({ rangeFrom, rangeTo });
+
+  const router = useApmRouter();
+
+  const tabs = useTabs({ selectedTabKey });
+  const selectedTab = tabs?.find(({ isSelected }) => isSelected);
+
+  const servicesLink = router.link('/services', {
+    query: { ...query },
+  });
+
+  useBreadcrumb(
+    () => [
+      {
+        title: i18n.translate('xpack.apm.logServices.breadcrumb.title', {
+          defaultMessage: 'Services',
+        }),
+        href: servicesLink,
+      },
+      ...(selectedTab
+        ? [
+            {
+              title: serviceName,
+              href: router.link('/logs-services/{serviceName}', {
+                path: { serviceName },
+                query,
+              }),
+            },
+            {
+              title: selectedTab.label,
+              href: selectedTab.href,
+            } as { title: string; href: string },
+          ]
+        : []),
+    ],
+    [query, router, selectedTab, serviceName, servicesLink]
+  );
+
+  return (
+    <ApmMainTemplate
+      pageHeader={{
+        tabs,
+        pageTitle: (
+          <EuiFlexGroup justifyContent="spaceBetween">
+            <EuiFlexItem>
+              <EuiFlexGroup alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiTitle size="l">
+                    <h1 data-test-subj="apmMainTemplateHeaderServiceName">
+                      {serviceName} <TechnicalPreviewBadge icon="beaker" />
+                    </h1>
+                  </EuiTitle>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <ServiceIcons
+                    serviceName={serviceName}
+                    environment={environment}
+                    start={start}
+                    end={end}
+                  />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        ),
+      }}
+    >
+      <SearchBar {...searchBarOptions} />
+      <ServiceAnomalyTimeseriesContextProvider>{children}</ServiceAnomalyTimeseriesContextProvider>
+    </ApmMainTemplate>
+  );
+}
+
+function useTabs({ selectedTabKey }: { selectedTabKey: Tab['key'] }) {
+  const router = useApmRouter();
+
+  const {
+    path: { serviceName },
+    query: queryFromUrl,
+  } = useApmParams(`/logs-services/{serviceName}/${selectedTabKey}` as const);
+
+  const query = omit(queryFromUrl, 'page', 'pageSize', 'sortField', 'sortDirection');
+
+  const tabs: Tab[] = [
+    {
+      key: 'overview',
+      href: router.link('/logs-services/{serviceName}/overview', {
+        path: { serviceName },
+        query,
+      }),
+      label: i18n.translate('xpack.apm.logsServiceDetails.overviewTabLabel', {
+        defaultMessage: 'Overview',
+      }),
+    },
+    {
+      key: 'logs',
+      href: router.link('/logs-services/{serviceName}/logs', {
+        path: { serviceName },
+        query,
+      }),
+      label: i18n.translate('xpack.apm.logsServiceDetails.logsTabLabel', {
+        defaultMessage: 'Logs',
+      }),
+    },
+    {
+      key: 'dashboards',
+      href: router.link('/logs-services/{serviceName}/dashboards', {
+        path: { serviceName },
+        query,
+      }),
+      append: <TechnicalPreviewBadge icon="beaker" />,
+      label: i18n.translate('xpack.apm.logsServiceDetails.dashboardsTabLabel', {
+        defaultMessage: 'Dashboards',
+      }),
+    },
+  ];
+
+  return tabs
+    .filter((t) => !t.hidden)
+    .map(({ href, key, label, append }) => ({
+      href,
+      label,
+      append,
+      isSelected: key === selectedTabKey,
+      'data-test-subj': `${key}Tab`,
+    }));
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx
index b34de178192d2..1f5074f6b0c78 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/routing/templates/service_group_template.tsx
@@ -137,6 +137,7 @@ export function ServiceGroupTemplate({
       environmentFilter={environmentFilter}
       showServiceGroupSaveButton={!isAllServices}
       showServiceGroupsNav={isAllServices}
+      showEnablementCallout
       selectedNavButton={isAllServices ? 'allServices' : 'serviceGroups'}
       {...pageTemplateProps}
     >
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx
index 7e80a102c649b..da4e98922785a 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/critical_path_flamegraph/critical_path_flamegraph_tooltip.tsx
@@ -63,7 +63,11 @@ export function CriticalPathFlamegraphTooltip({
               alignItems="center"
             >
               <EuiFlexItem grow={false}>
-                <SpanIcon type={metadata[SPAN_TYPE]} subtype={metadata[SPAN_SUBTYPE]} />
+                <SpanIcon
+                  type={metadata[SPAN_TYPE]}
+                  subtype={metadata[SPAN_SUBTYPE]}
+                  role="presentation"
+                />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>{metadata[SPAN_NAME]}</EuiFlexItem>
             </EuiFlexGroup>
@@ -75,7 +79,7 @@ export function CriticalPathFlamegraphTooltip({
         <EuiFlexItem>
           <EuiFlexGroup direction="row" gutterSize="xs" alignItems="center">
             <EuiFlexItem grow={false}>
-              <AgentIcon agentName={metadata[AGENT_NAME]} size="l" />
+              <AgentIcon agentName={metadata[AGENT_NAME]} size="l" role="presentation" />
             </EuiFlexItem>
             <EuiFlexItem grow={false}>{metadata[SERVICE_NAME]}</EuiFlexItem>
           </EuiFlexGroup>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/feedback_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/feedback_modal.tsx
new file mode 100644
index 0000000000000..e44dc8ae3a72b
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/feedback_modal.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useContext } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  useEuiTheme,
+  EuiButtonEmpty,
+  EuiConfirmModal,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiPanel,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { getSurveyFeedbackURL } from '@kbn/observability-shared-plugin/public';
+import { KibanaEnvironmentContext } from '../../../context/kibana_environment_context/kibana_environment_context';
+import { getPathForFeedback } from '../../../utils/get_path_for_feedback';
+
+export function FeedbackModal({
+  isFeedbackModalVisible = false,
+  onClose,
+}: {
+  isFeedbackModalVisible?: boolean;
+  onClose: () => void;
+}) {
+  const kibanaEnvironment = useContext(KibanaEnvironmentContext);
+  const { kibanaVersion, isCloudEnv, isServerlessEnv } = kibanaEnvironment;
+  const sanitizedPath = getPathForFeedback(window.location.pathname);
+  const { euiTheme } = useEuiTheme();
+
+  return (
+    <>
+      {isFeedbackModalVisible && (
+        <EuiConfirmModal
+          style={{
+            width: '600px',
+          }}
+          onCancel={onClose}
+          onConfirm={onClose}
+          confirmButtonText={
+            <EuiButtonEmpty
+              css={{
+                color: euiTheme.colors.emptyShade,
+              }}
+              data-test-subj="xpack.apm.eemFeedback.button.open"
+              iconType="discuss"
+              target="_blank"
+              size="s"
+              href={getSurveyFeedbackURL({
+                formUrl: 'https://ela.st/new-o11y-experience',
+                kibanaVersion,
+                isCloudEnv,
+                isServerlessEnv,
+                sanitizedPath,
+              })}
+            >
+              {i18n.translate('xpack.apm.eemFeedback.button.openSurvey', {
+                defaultMessage: 'Tell us what you think!',
+              })}
+            </EuiButtonEmpty>
+          }
+          defaultFocusedButton="confirm"
+        >
+          <EuiPanel hasShadow={false}>
+            <EuiFlexGroup
+              direction="column"
+              justifyContent="center"
+              alignItems="center"
+              gutterSize="s"
+            >
+              <EuiFlexItem>
+                <EuiIcon type="heart" size="l" />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiTitle>
+                  <h2>
+                    {i18n.translate('xpack.apm.eemFeedback.title', {
+                      defaultMessage: 'Let us know what you think!',
+                    })}
+                  </h2>
+                </EuiTitle>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPanel>
+
+          <EuiPanel hasShadow={false} paddingSize="s">
+            <EuiText grow={false} size="s">
+              <p>
+                {i18n.translate('xpack.apm.feedbackModal.body.thanks', {
+                  defaultMessage:
+                    "Thank you for trying our new experience. We'll be continuing to improve on this so please come back often.",
+                })}
+              </p>
+            </EuiText>
+          </EuiPanel>
+        </EuiConfirmModal>
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx
new file mode 100644
index 0000000000000..e305743243a4b
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/index.tsx
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { useState } from 'react';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { ERROR_USER_NOT_AUTHORIZED } from '@kbn/entityManager-plugin/public';
+import useToggle from 'react-use/lib/useToggle';
+import {
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiPopover,
+  EuiPopoverFooter,
+  EuiSkeletonText,
+  EuiText,
+  EuiTextColor,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { TechnicalPreviewBadge } from '../technical_preview_badge';
+import { ApmPluginStartDeps } from '../../../plugin';
+import { useEntityManagerEnablementContext } from '../../../context/entity_manager_context/use_entity_manager_enablement_context';
+import { FeedbackModal } from './feedback_modal';
+import { UnauthorisedModal } from './unauthorized_modal';
+
+export function EntityEnablement() {
+  const [isFeedbackModalVisible, setsIsFeedbackModalVisible] = useState(false);
+  const [isUnauthorizedModalVisible, setsIsUnauthorizedModalVisible] = useState(false);
+
+  const {
+    services: { entityManager },
+  } = useKibana<ApmPluginStartDeps>();
+
+  const { isEntityManagerEnabled, isEnablementPending, refetch } =
+    useEntityManagerEnablementContext();
+
+  const [isPopoverOpen, togglePopover] = useToggle(false);
+  const [isLoading, setIsLoading] = useToggle(false);
+
+  const handleRestoreView = async () => {
+    setIsLoading(true);
+    try {
+      const response = await entityManager.entityClient.disableManagedEntityDiscovery();
+      if (response.success) {
+        setIsLoading(false);
+        setsIsFeedbackModalVisible(true);
+      }
+    } catch (error) {
+      setIsLoading(false);
+      setsIsFeedbackModalVisible(true);
+      console.error(error);
+    }
+  };
+
+  const handleEnableblement = async () => {
+    setIsLoading(true);
+    try {
+      const response = await entityManager.entityClient.enableManagedEntityDiscovery();
+      if (response.success) {
+        setIsLoading(false);
+        refetch();
+      }
+
+      if (response.reason === ERROR_USER_NOT_AUTHORIZED) {
+        setIsLoading(false);
+        setsIsUnauthorizedModalVisible(true);
+      }
+    } catch (error) {
+      setIsLoading(false);
+      console.error(error);
+    }
+  };
+
+  const handdleOnCloseFeedback = () => {
+    setsIsFeedbackModalVisible(false);
+    refetch();
+  };
+
+  return isEnablementPending ? (
+    <EuiFlexItem grow={false} css={{ maxWidth: '500px' }}>
+      <EuiSkeletonText lines={1} data-test-sub="loading-content" />
+    </EuiFlexItem>
+  ) : (
+    <EuiFlexGroup direction="row" alignItems="center" gutterSize="xs">
+      <EuiFlexItem grow={false}>
+        {isLoading ? <EuiLoadingSpinner size="m" /> : <TechnicalPreviewBadge icon="beaker" />}
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiLink
+          disabled={isEntityManagerEnabled}
+          data-test-subj="tryOutEEMLink"
+          onClick={handleEnableblement}
+        >
+          {isEntityManagerEnabled
+            ? i18n.translate('xpack.apm.eemEnablement.enabled.', {
+                defaultMessage: 'Viewing our new experience',
+              })
+            : i18n.translate('xpack.apm.eemEnablement.tryItButton.', {
+                defaultMessage: 'Try our new experience!',
+              })}
+        </EuiLink>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiPopover
+          button={
+            <EuiButtonIcon
+              onClick={togglePopover}
+              data-test-subj="apmEntityEnablementWithFooterButton"
+              iconType="iInCircle"
+              size="xs"
+              aria-label={i18n.translate('xpack.apm.entityEnablement.euiButtonIcon.arial', {
+                defaultMessage: 'click to find more for the new ui experience',
+              })}
+            />
+          }
+          isOpen={isPopoverOpen}
+          closePopover={togglePopover}
+          anchorPosition="downLeft"
+        >
+          <div style={{ width: '300px' }}>
+            <EuiText size="s">
+              <p>
+                {i18n.translate('xpack.apm.entityEnablement.content', {
+                  defaultMessage:
+                    'Our new experience combines both APM-instrumented services with services detected from logs in a single service inventory.',
+                })}
+              </p>
+            </EuiText>
+          </div>
+          <EuiPopoverFooter>
+            <EuiTextColor color="subdued">
+              <EuiLink
+                data-test-subj="apmEntityEnablementLink"
+                href="https://ela.st/new-experience-services"
+                external
+                target="_blank"
+              >
+                {i18n.translate('xpack.apm.entityEnablement.footer', {
+                  defaultMessage: 'Learn more',
+                })}
+              </EuiLink>
+            </EuiTextColor>
+          </EuiPopoverFooter>
+        </EuiPopover>
+      </EuiFlexItem>
+      {isEntityManagerEnabled && (
+        <EuiFlexItem grow={false}>
+          <EuiLink data-test-subj="restoreClassiView" onClick={handleRestoreView}>
+            {i18n.translate('xpack.apm.eemEnablement.restoveClassicView.', {
+              defaultMessage: 'Restore classic view',
+            })}
+          </EuiLink>
+        </EuiFlexItem>
+      )}
+      <FeedbackModal
+        isFeedbackModalVisible={isFeedbackModalVisible}
+        onClose={handdleOnCloseFeedback}
+      />
+      <UnauthorisedModal
+        isUnauthorizedModalVisible={isUnauthorizedModalVisible}
+        onClose={() => setsIsUnauthorizedModalVisible(false)}
+      />
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx
new file mode 100644
index 0000000000000..f728790f8c50f
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/entity_enablement/unauthorized_modal.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiButton,
+  EuiConfirmModal,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiImage,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { useKibanaUrl } from '../../../hooks/use_kibana_url';
+
+export function UnauthorisedModal({
+  isUnauthorizedModalVisible = false,
+  onClose,
+}: {
+  isUnauthorizedModalVisible?: boolean;
+  onClose: () => void;
+}) {
+  const servicesInventory = useKibanaUrl('/plugins/apm/assets/services_inventory.png');
+
+  return (
+    <>
+      {isUnauthorizedModalVisible && (
+        <EuiConfirmModal
+          style={{
+            width: '630px',
+          }}
+          onCancel={onClose}
+          onConfirm={onClose}
+          confirmButtonText={
+            <EuiButton data-test-subj="xpack.apm.unauthorised.button.open" fill size="s">
+              {i18n.translate('xpack.apm.unauthorised.button.openSurvey', {
+                defaultMessage: 'OK',
+              })}
+            </EuiButton>
+          }
+          defaultFocusedButton="confirm"
+        >
+          <EuiPanel hasShadow={false}>
+            <EuiFlexGroup
+              direction="column"
+              justifyContent="center"
+              alignItems="center"
+              gutterSize="m"
+            >
+              <EuiFlexItem>
+                <EuiIcon type="lock" size="l" />
+              </EuiFlexItem>
+              <EuiFlexItem>
+                <EuiTitle>
+                  <h2>
+                    {i18n.translate('xpack.apm.unauthorised.title', {
+                      defaultMessage: 'This feature is turned off',
+                    })}
+                  </h2>
+                </EuiTitle>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPanel>
+
+          <EuiPanel hasShadow={false} paddingSize="s">
+            <EuiText grow={false} textAlign="center">
+              <p>
+                {i18n.translate('xpack.apm.unauthorised.body', {
+                  defaultMessage:
+                    'To see services detected from logs and APM-instrumented services in our new service inventory, please ask an administrator to visit this page and try our new experience. ',
+                })}
+              </p>
+            </EuiText>
+          </EuiPanel>
+          <EuiSpacer size="m" />
+          <EuiPanel hasBorder paddingSize="none">
+            <EuiImage
+              size="xl"
+              src={servicesInventory}
+              alt={i18n.translate('xpack.apm.unauthorised.image.at,', {
+                defaultMessage:
+                  'Image of the new experience of the service inventory, showing services detected from logs and APM-instrumented services',
+              })}
+            />
+          </EuiPanel>
+        </EuiConfirmModal>
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts b/x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts
index f5ec673745939..f27b00dfc0c03 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/is_route_with_time_range.ts
@@ -25,6 +25,7 @@ export function isRouteWithTimeRange({
       route.path === '/dependencies/inventory' ||
       route.path === '/services/{serviceName}' ||
       route.path === '/mobile-services/{serviceName}' ||
+      route.path === '/logs-services/{serviceName}' ||
       route.path === '/service-groups' ||
       route.path === '/storage-explorer' ||
       location.pathname === '/' ||
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx
index f031448b5d716..992dda3d88fbd 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/links/apm/service_link/index.tsx
@@ -12,9 +12,11 @@ import { euiStyled } from '@kbn/kibana-react-plugin/common';
 import { TypeOf } from '@kbn/typed-react-router-config';
 import React from 'react';
 import { isMobileAgentName } from '../../../../../../common/agent_name';
+import { SignalTypes } from '../../../../../../common/entities/types';
 import { NOT_AVAILABLE_LABEL } from '../../../../../../common/i18n';
 import { AgentName } from '../../../../../../typings/es_schemas/ui/fields/agent';
 import { useApmRouter } from '../../../../../hooks/use_apm_router';
+import { isLogsSignal } from '../../../../../utils/get_signal_type';
 import { truncate, unit } from '../../../../../utils/style';
 import { ApmRoutes } from '../../../../routing/apm_route_config';
 import { PopoverTooltip } from '../../../popover_tooltip';
@@ -32,12 +34,20 @@ interface ServiceLinkProps {
   query: TypeOf<ApmRoutes, '/services/{serviceName}/overview'>['query'];
   serviceName: string;
   serviceOverflowCount?: number;
+  signalTypes?: SignalTypes[];
 }
-export function ServiceLink({ agentName, query, serviceName }: ServiceLinkProps) {
-  const { link } = useApmRouter();
+export function ServiceLink({
+  agentName,
+  query,
+  serviceName,
+  signalTypes = [SignalTypes.METRICS],
+}: ServiceLinkProps) {
+  const apmRouter = useApmRouter();
 
   const serviceLink = isMobileAgentName(agentName)
     ? '/mobile-services/{serviceName}/overview'
+    : isLogsSignal(signalTypes)
+    ? '/logs-services/{serviceName}/overview'
     : '/services/{serviceName}/overview';
 
   if (serviceName === OTHER_SERVICE_NAME) {
@@ -74,14 +84,14 @@ export function ServiceLink({ agentName, query, serviceName }: ServiceLinkProps)
       content={
         <StyledLink
           data-test-subj={`serviceLink_${agentName}`}
-          href={link(serviceLink, {
+          href={apmRouter.link(serviceLink, {
             path: { serviceName },
             query,
           })}
         >
           <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
             <EuiFlexItem grow={false}>
-              <AgentIcon agentName={agentName} size="l" />
+              <AgentIcon agentName={agentName} size="l" role="presentation" />
             </EuiFlexItem>
             <EuiFlexItem className="eui-textTruncate">
               <span className="eui-textTruncate">{serviceName}</span>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx
index 824e08752e095..696f987ea2b63 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/links/dependency_link.tsx
@@ -35,7 +35,7 @@ export function DependencyLink({ query, subtype, type, onClick }: Props) {
     >
       <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
         <EuiFlexItem grow={false}>
-          <SpanIcon type={type} subtype={subtype} />
+          <SpanIcon type={type} subtype={subtype} role="presentation" />
         </EuiFlexItem>
         <EuiFlexItem className="eui-textTruncate">
           <span className="eui-textTruncate">{query.dependencyName}</span>
diff --git a/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx
index 42be10d1468d4..34e0b88d235f8 100644
--- a/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/components/shared/span_icon/index.tsx
@@ -6,16 +6,16 @@
  */
 
 import React from 'react';
-import { EuiIcon } from '@elastic/eui';
+import { EuiIcon, type EuiIconProps } from '@elastic/eui';
 import { getSpanIcon } from './get_span_icon';
 
-interface Props {
+interface Props extends Omit<EuiIconProps, 'type'> {
   type?: string;
   subtype?: string;
 }
 
-export function SpanIcon({ type, subtype }: Props) {
+export function SpanIcon({ type, subtype, ...props }: Props) {
   const icon = getSpanIcon(type, subtype);
 
-  return <EuiIcon type={icon} size="l" title={type || subtype} />;
+  return <EuiIcon type={icon} size="l" title={type || subtype} {...props} />;
 }
diff --git a/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx
index 3c2dd7006570c..3fe833e6d9c64 100644
--- a/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/context/apm_service/apm_service_context.tsx
@@ -47,7 +47,11 @@ export function ApmServiceContextProvider({ children }: { children: ReactNode })
     path: { serviceName },
     query,
     query: { kuery, rangeFrom, rangeTo },
-  } = useAnyOfApmParams('/services/{serviceName}', '/mobile-services/{serviceName}');
+  } = useAnyOfApmParams(
+    '/services/{serviceName}',
+    '/mobile-services/{serviceName}',
+    '/logs-services/{serviceName}'
+  );
 
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
 
diff --git a/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/entity_manager_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/entity_manager_context.tsx
new file mode 100644
index 0000000000000..9fd41de01d8fe
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/entity_manager_context.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { createContext } from 'react';
+import { ENTITY_FETCH_STATUS, useEntityManager } from '../../hooks/use_entity_manager';
+
+export interface EntityManagerEnablementContextValue {
+  isEntityManagerEnabled: boolean;
+  entityManagerEnablementStatus: ENTITY_FETCH_STATUS;
+  isEnablementPending: boolean;
+  refetch: () => void;
+}
+
+export const EntityManagerEnablementContext = createContext(
+  {} as EntityManagerEnablementContextValue
+);
+
+export function EntityManagerEnablementContextProvider({
+  children,
+}: {
+  children: React.ReactChild;
+}) {
+  const { isEnabled, status, refetch } = useEntityManager();
+
+  return (
+    <EntityManagerEnablementContext.Provider
+      value={{
+        isEntityManagerEnabled: isEnabled,
+        entityManagerEnablementStatus: status,
+        isEnablementPending: status === ENTITY_FETCH_STATUS.LOADING,
+        refetch,
+      }}
+    >
+      {children}
+    </EntityManagerEnablementContext.Provider>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/use_entity_manager_enablement_context.ts b/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/use_entity_manager_enablement_context.ts
new file mode 100644
index 0000000000000..83942af2e7715
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/context/entity_manager_context/use_entity_manager_enablement_context.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useContext } from 'react';
+import { EntityManagerEnablementContext } from './entity_manager_context';
+
+export function useEntityManagerEnablementContext() {
+  return useContext(EntityManagerEnablementContext);
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx b/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx
index 986730c99691e..30e6481b951b9 100644
--- a/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx
+++ b/x-pack/plugins/observability_solution/apm/public/context/service_anomaly_timeseries/service_anomaly_timeseries_context.tsx
@@ -41,7 +41,11 @@ export function ServiceAnomalyTimeseriesContextProvider({
 
   const {
     query: { rangeFrom, rangeTo },
-  } = useAnyOfApmParams('/services/{serviceName}', '/mobile-services/{serviceName}');
+  } = useAnyOfApmParams(
+    '/services/{serviceName}',
+    '/mobile-services/{serviceName}',
+    '/logs-services/{serviceName}'
+  );
 
   const { start, end } = useTimeRange({ rangeFrom, rangeTo });
   const { preferredEnvironment } = useEnvironmentsContext();
diff --git a/x-pack/plugins/observability_solution/apm/public/hooks/use_entity_manager.ts b/x-pack/plugins/observability_solution/apm/public/hooks/use_entity_manager.ts
new file mode 100644
index 0000000000000..554d58fe4cf10
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/hooks/use_entity_manager.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { useEffect, useMemo, useState } from 'react';
+import { ApmPluginStartDeps } from '../plugin';
+
+export enum ENTITY_FETCH_STATUS {
+  LOADING = 'loading',
+  SUCCESS = 'success',
+  FAILURE = 'failure',
+  NOT_INITIATED = 'not_initiated',
+}
+
+export function useEntityManager() {
+  const {
+    services: { entityManager },
+  } = useKibana<ApmPluginStartDeps>();
+  const [counter, setCounter] = useState(0);
+  const [result, setResult] = useState({
+    isEnabled: false,
+    status: ENTITY_FETCH_STATUS.NOT_INITIATED,
+  });
+
+  useEffect(() => {
+    async function isManagedEntityDiscoveryEnabled() {
+      setResult({ isEnabled: false, status: ENTITY_FETCH_STATUS.LOADING });
+
+      try {
+        const response = await entityManager.entityClient.isManagedEntityDiscoveryEnabled();
+        setResult({ isEnabled: response?.enabled, status: ENTITY_FETCH_STATUS.SUCCESS });
+      } catch (err) {
+        setResult({ isEnabled: false, status: ENTITY_FETCH_STATUS.FAILURE });
+
+        console.error(err);
+      }
+    }
+
+    isManagedEntityDiscoveryEnabled();
+  }, [entityManager, counter]);
+
+  return useMemo(() => {
+    return {
+      ...result,
+      refetch: () => {
+        // this will invalidate the deps to `useEffect` and will result in a new request
+        setCounter((count) => count + 1);
+      },
+    };
+  }, [result]);
+}
diff --git a/x-pack/plugins/observability_solution/apm/public/plugin.ts b/x-pack/plugins/observability_solution/apm/public/plugin.ts
index 087718436afa8..70a2176fdc595 100644
--- a/x-pack/plugins/observability_solution/apm/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/apm/public/plugin.ts
@@ -19,6 +19,7 @@ import {
   PluginInitializerContext,
   SecurityServiceStart,
 } from '@kbn/core/public';
+import { EntityManagerPublicPluginSetup } from '@kbn/entityManager-plugin/public';
 import type { DataPublicPluginSetup, DataPublicPluginStart } from '@kbn/data-plugin/public';
 import { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import { DiscoverSetup, DiscoverStart } from '@kbn/discover-plugin/public';
@@ -105,6 +106,7 @@ export interface ApmPluginSetupDeps {
   uiActions: UiActionsSetup;
   profiling?: ProfilingPluginSetup;
   cloud?: CloudSetup;
+  entityManager: EntityManagerPublicPluginSetup;
 }
 
 export interface ApmServices {
@@ -140,6 +142,7 @@ export interface ApmPluginStartDeps {
   dashboard: DashboardStart;
   metricsDataAccess: MetricsDataPluginStart;
   uiSettings: IUiSettingsClient;
+  entityManager: EntityManagerPublicPluginSetup;
 }
 
 const servicesTitle = i18n.translate('xpack.apm.navigation.servicesTitle', {
diff --git a/x-pack/plugins/observability_solution/apm/public/utils/get_signal_type.ts b/x-pack/plugins/observability_solution/apm/public/utils/get_signal_type.ts
new file mode 100644
index 0000000000000..a72bb4d782e9c
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/public/utils/get_signal_type.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { SignalTypes } from '../../common/entities/types';
+
+export function isApmSignal(signalTypes: SignalTypes[]) {
+  return signalTypes.includes(SignalTypes.METRICS) || signalTypes.includes(SignalTypes.TRACES);
+}
+export function isLogsSignal(signalTypes: SignalTypes[]) {
+  return signalTypes.includes(SignalTypes.LOGS) && !isApmSignal(signalTypes);
+}
diff --git a/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts
index db2e58806da81..9b80d694151ff 100644
--- a/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts
+++ b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_downstream_dependencies.ts
@@ -38,11 +38,11 @@ export function registerGetApmDownstreamDependenciesFunction({
       parameters: {
         type: 'object',
         properties: {
-          'service.name': {
+          serviceName: {
             type: 'string',
             description: 'The name of the service',
           },
-          'service.environment': {
+          serviceEnvironment: {
             type: 'string',
             description:
               'The environment that the service is running in. Leave empty to query for all environments.',
@@ -56,7 +56,7 @@ export function registerGetApmDownstreamDependenciesFunction({
             description: 'The end of the time range, in Elasticsearch date math, like `now-24h`.',
           },
         },
-        required: ['service.name', 'start', 'end'],
+        required: ['serviceName', 'start', 'end'],
       } as const,
     },
     async ({ arguments: args }, signal) => {
diff --git a/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts
index 1ca34117f5f9d..b24c24425b413 100644
--- a/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts
+++ b/x-pack/plugins/observability_solution/apm/server/assistant_functions/get_apm_services_list.ts
@@ -32,7 +32,7 @@ export function registerGetApmServicesListFunction({
       parameters: {
         type: 'object',
         properties: {
-          'service.environment': {
+          serviceEnvironment: {
             ...NON_EMPTY_STRING,
             description:
               'Optionally filter the services by the environments that they are running in',
diff --git a/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients.ts b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients.ts
index f7838cd36fbe2..8b31141601d92 100644
--- a/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients.ts
+++ b/x-pack/plugins/observability_solution/apm/server/lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients.ts
@@ -8,9 +8,13 @@ import { ESSearchRequest, InferSearchResponseOf } from '@kbn/es-types';
 import type { KibanaRequest } from '@kbn/core/server';
 import { ElasticsearchClient } from '@kbn/core/server';
 import { unwrapEsResponse } from '@kbn/observability-plugin/common/utils/unwrap_es_response';
+import {
+  MsearchMultisearchBody,
+  MsearchMultisearchHeader,
+} from '@elastic/elasticsearch/lib/api/types';
 import { withApmSpan } from '../../../../utils/with_apm_span';
 
-const ENTITIES_INDEX_NAME = '.entities-observability.latest-*';
+const ENTITIES_INDEX_NAME = '.entities.v1.latest.builtin_services*';
 
 export function cancelEsRequestOnAbort<T extends Promise<any>>(
   promise: T,
@@ -29,6 +33,9 @@ export interface EntitiesESClient {
     operationName: string,
     searchRequest: TSearchRequest
   ): Promise<InferSearchResponseOf<TDocument, TSearchRequest>>;
+  msearch<TDocument = unknown, TSearchRequest extends ESSearchRequest = ESSearchRequest>(
+    allSearches: TSearchRequest[]
+  ): Promise<{ responses: Array<InferSearchResponseOf<TDocument, TSearchRequest>> }>;
 }
 
 export async function createEntitiesESClient({
@@ -63,5 +70,36 @@ export async function createEntitiesESClient({
 
       return unwrapEsResponse(promise);
     },
+
+    async msearch<TDocument = unknown, TSearchRequest extends ESSearchRequest = ESSearchRequest>(
+      allSearches: TSearchRequest[]
+    ): Promise<{ responses: Array<InferSearchResponseOf<TDocument, TSearchRequest>> }> {
+      const searches = allSearches
+        .map((params) => {
+          const searchParams: [MsearchMultisearchHeader, MsearchMultisearchBody] = [
+            {
+              index: [ENTITIES_INDEX_NAME],
+            },
+            {
+              ...params.body,
+            },
+          ];
+
+          return searchParams;
+        })
+        .flat();
+
+      const promise = esClient.msearch(
+        { searches },
+        {
+          meta: true,
+        }
+      ) as unknown as Promise<{
+        body: { responses: Array<InferSearchResponseOf<TDocument, TSearchRequest>> };
+      }>;
+
+      const { body } = await promise;
+      return { responses: body.responses };
+    },
   };
 }
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts
index 1ceed34367422..6d8fae8afafe2 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_downstream_dependencies/index.ts
@@ -17,12 +17,12 @@ import { NodeType } from '../../../../common/connections';
 
 export const downstreamDependenciesRouteRt = t.intersection([
   t.type({
-    'service.name': t.string,
+    serviceName: t.string,
     start: t.string,
     end: t.string,
   }),
   t.partial({
-    'service.environment': t.string,
+    serviceEnvironment: t.string,
   }),
 ]);
 
@@ -50,8 +50,8 @@ export async function getAssistantDownstreamDependencies({
     end,
     apmEventClient,
     filter: [
-      ...termQuery(SERVICE_NAME, args['service.name']),
-      ...environmentQuery(args['service.environment'] ?? ENVIRONMENT_ALL.value),
+      ...termQuery(SERVICE_NAME, args.serviceName),
+      ...environmentQuery(args.serviceEnvironment ?? ENVIRONMENT_ALL.value),
     ],
     randomSampler,
   });
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_list/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_list/index.ts
index b05ea4fee699c..39f2a77ad9c92 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_list/index.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_apm_service_list/index.ts
@@ -35,7 +35,7 @@ export async function getApmServiceList({
   randomSampler,
 }: {
   arguments: {
-    'service.environment'?: string | undefined;
+    serviceEnvironment?: string | undefined;
     healthStatus?: ServiceHealthStatus[] | undefined;
     start: string;
     end: string;
@@ -57,7 +57,7 @@ export async function getApmServiceList({
     documentType: ApmDocumentType.TransactionMetric,
     start,
     end,
-    environment: args['service.environment'] || ENVIRONMENT_ALL.value,
+    environment: args.serviceEnvironment || ENVIRONMENT_ALL.value,
     kuery: '',
     logger,
     randomSampler,
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_observability_alert_details_context/index.ts b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_observability_alert_details_context/index.ts
index 4e9ae1b546aa7..64141a7f533ee 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_observability_alert_details_context/index.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/assistant_functions/get_observability_alert_details_context/index.ts
@@ -111,8 +111,8 @@ export const getAlertDetailsContextHandler = (
       ? getAssistantDownstreamDependencies({
           apmEventClient,
           arguments: {
-            'service.name': serviceName,
-            'service.environment': serviceEnvironment,
+            serviceName,
+            serviceEnvironment,
             start: moment(alertStartedAt).subtract(24, 'hours').toISOString(),
             end: alertStartedAt,
           },
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_entities_with_dashboards.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_entities_with_dashboards.ts
new file mode 100644
index 0000000000000..0d5b443ae6d45
--- /dev/null
+++ b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/get_entities_with_dashboards.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { kqlQuery, termQuery } from '@kbn/observability-plugin/server';
+import { estypes } from '@elastic/elasticsearch';
+import { SERVICE_NAME } from '../../../common/es_fields/apm';
+import { SavedApmCustomDashboard } from '../../../common/custom_dashboards';
+import { EntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+
+function getSearchRequest(filters: estypes.QueryDslQueryContainer[]) {
+  return {
+    body: {
+      track_total_hits: false,
+      terminate_after: 1,
+      size: 1,
+      query: {
+        bool: {
+          filter: filters,
+        },
+      },
+    },
+  };
+}
+export async function getEntitiesWithDashboards({
+  entitiesESClient,
+  allLinkedCustomDashboards,
+  serviceName,
+}: {
+  entitiesESClient: EntitiesESClient;
+  allLinkedCustomDashboards: SavedApmCustomDashboard[];
+  serviceName: string;
+}): Promise<SavedApmCustomDashboard[]> {
+  const allKueryPerDashboard = allLinkedCustomDashboards.map(({ kuery }) => ({
+    kuery,
+  }));
+
+  const allSearches = allKueryPerDashboard.map((dashboard) =>
+    getSearchRequest([...kqlQuery(dashboard.kuery), ...termQuery(SERVICE_NAME, serviceName)])
+  );
+
+  const filteredDashboards = [];
+
+  if (allSearches.length > 0) {
+    const allResponses = (await entitiesESClient.msearch(allSearches)).responses;
+
+    for (let index = 0; index < allLinkedCustomDashboards.length; index++) {
+      const responsePerDashboard = allResponses[index];
+      const dashboard = allLinkedCustomDashboards[index];
+
+      if (responsePerDashboard.hits.hits.length > 0) {
+        filteredDashboards.push(dashboard);
+      }
+    }
+  }
+
+  return filteredDashboards;
+}
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts
index 75039a0adafd9..4fcc1508715d1 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/custom_dashboards/route.ts
@@ -14,6 +14,8 @@ import { getCustomDashboards } from './get_custom_dashboards';
 import { getServicesWithDashboards } from './get_services_with_dashboards';
 import { getApmEventClient } from '../../lib/helpers/get_apm_event_client';
 import { rangeRt } from '../default_api_types';
+import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
+import { getEntitiesWithDashboards } from './get_entities_with_dashboards';
 
 const serviceDashboardSaveRoute = createApmServerRoute({
   endpoint: 'POST /internal/apm/custom-dashboard',
@@ -53,14 +55,20 @@ const serviceDashboardsRoute = createApmServerRoute({
     path: t.type({
       serviceName: t.string,
     }),
-    query: rangeRt,
+    query: t.intersection([
+      rangeRt,
+      t.partial({
+        checkFor: t.union([t.literal('entities'), t.literal('services')]),
+      }),
+    ]),
   }),
   options: {
     tags: ['access:apm'],
   },
   handler: async (resources): Promise<{ serviceDashboards: SavedApmCustomDashboard[] }> => {
-    const { context, params } = resources;
-    const { start, end } = params.query;
+    const { context, params, request } = resources;
+    const coreContext = await context.core;
+    const { start, end, checkFor } = params.query;
 
     const { serviceName } = params.path;
 
@@ -74,6 +82,21 @@ const serviceDashboardsRoute = createApmServerRoute({
       savedObjectsClient,
     });
 
+    if (checkFor === 'entities') {
+      const entitiesESClient = await createEntitiesESClient({
+        request,
+        esClient: coreContext.elasticsearch.client.asCurrentUser,
+      });
+
+      const entitiesWithDashboards = await getEntitiesWithDashboards({
+        entitiesESClient,
+        allLinkedCustomDashboards,
+        serviceName,
+      });
+
+      return { serviceDashboards: entitiesWithDashboards };
+    }
+
     const servicesWithDashboards = await getServicesWithDashboards({
       apmEventClient,
       allLinkedCustomDashboards,
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts b/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
index c4a68c8c8a21e..52c8e6983384c 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/entities/services/routes.ts
@@ -4,12 +4,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import Boom from '@hapi/boom';
+import { toNumberRt, jsonRt } from '@kbn/io-ts-utils';
 import * as t from 'io-ts';
+import { offsetRt } from '../../../../common/comparison_rt';
+import { getApmEventClient } from '../../../lib/helpers/get_apm_event_client';
+import { getRandomSampler } from '../../../lib/helpers/get_random_sampler';
 import { EntityServiceListItem } from '../../../../common/entities/types';
+import { environmentQuery } from '../../../../common/utils/environment_query';
 import { createEntitiesESClient } from '../../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
-import { getApmEventClient } from '../../../lib/helpers/get_apm_event_client';
 import { createApmServerRoute } from '../../apm_routes/create_apm_server_route';
-import { environmentRt, kueryRt, rangeRt } from '../../default_api_types';
+import {
+  environmentRt,
+  kueryRt,
+  probabilityRt,
+  rangeRt,
+  serviceTransactionDataSourceRt,
+} from '../../default_api_types';
+import { getServiceTransactionDetailedStatsPeriods } from '../../services/get_services_detailed_statistics/get_service_transaction_detailed_statistics';
 import { getServiceEntities } from './get_service_entities';
 
 export interface EntityServicesResponse {
@@ -23,12 +35,8 @@ const servicesEntitiesRoute = createApmServerRoute({
   }),
   options: { tags: ['access:apm'] },
   async handler(resources): Promise<EntityServicesResponse> {
-    const { context, params, request, plugins } = resources;
-    const [coreContext] = await Promise.all([
-      context.core,
-      getApmEventClient(resources),
-      plugins.logsDataAccess.start(),
-    ]);
+    const { context, params, request } = resources;
+    const coreContext = await context.core;
 
     const entitiesESClient = await createEntitiesESClient({
       request,
@@ -50,6 +58,169 @@ const servicesEntitiesRoute = createApmServerRoute({
   },
 });
 
+const servicesEntitiesDetailedStatisticsRoute = createApmServerRoute({
+  endpoint: 'POST /internal/apm/entities/services/detailed_statistics',
+  params: t.type({
+    query: t.intersection([
+      environmentRt,
+      kueryRt,
+      rangeRt,
+      t.intersection([offsetRt, probabilityRt, serviceTransactionDataSourceRt]),
+      t.type({
+        bucketSizeInSeconds: toNumberRt,
+      }),
+    ]),
+    body: t.type({ serviceNames: jsonRt.pipe(t.array(t.string)) }),
+  }),
+  options: { tags: ['access:apm'] },
+  handler: async (resources) => {
+    const {
+      context,
+      params,
+      request,
+      plugins: { security, logsDataAccess },
+    } = resources;
+
+    const [coreContext, logsDataAccessStart] = await Promise.all([
+      context.core,
+      logsDataAccess.start(),
+    ]);
+
+    const {
+      environment,
+      kuery,
+      offset,
+      start,
+      end,
+      probability,
+      documentType,
+      rollupInterval,
+      bucketSizeInSeconds,
+    } = params.query;
+
+    const { serviceNames } = params.body;
+
+    if (!serviceNames.length) {
+      throw Boom.badRequest(`serviceNames cannot be empty`);
+    }
+
+    const [apmEventClient, randomSampler] = await Promise.all([
+      getApmEventClient(resources),
+      getRandomSampler({ security, request, probability }),
+    ]);
+
+    const logsParams = {
+      esClient: coreContext.elasticsearch.client.asCurrentUser,
+      identifyingMetadata: 'service.name',
+      timeFrom: start,
+      timeTo: end,
+      kuery,
+      serviceEnvironmentQuery: environmentQuery(environment),
+      serviceNames,
+    };
+
+    const [
+      currentPeriodLogsRateTimeseries,
+      currentPeriodLogsErrorRateTimeseries,
+      apmServiceTransactionDetailedStatsPeriods,
+    ] = await Promise.all([
+      logsDataAccessStart.services.getLogsRateTimeseries(logsParams),
+      logsDataAccessStart.services.getLogsErrorRateTimeseries(logsParams),
+      getServiceTransactionDetailedStatsPeriods({
+        environment,
+        kuery,
+        apmEventClient,
+        documentType,
+        rollupInterval,
+        bucketSizeInSeconds,
+        offset,
+        serviceNames,
+        start,
+        end,
+        randomSampler,
+      }),
+    ]);
+
+    return {
+      currentPeriod: {
+        apm: { ...apmServiceTransactionDetailedStatsPeriods.currentPeriod },
+        logErrorRate: { ...currentPeriodLogsErrorRateTimeseries },
+        logRate: { ...currentPeriodLogsRateTimeseries },
+      },
+    };
+  },
+});
+
+const serviceLogRateTimeseriesRoute = createApmServerRoute({
+  endpoint: 'GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries',
+  params: t.type({
+    path: t.type({
+      serviceName: t.string,
+    }),
+    query: t.intersection([environmentRt, kueryRt, rangeRt]),
+  }),
+  options: { tags: ['access:apm'] },
+  async handler(resources) {
+    const { context, params, plugins } = resources;
+    const [coreContext, logsDataAccessStart] = await Promise.all([
+      context.core,
+      plugins.logsDataAccess.start(),
+    ]);
+
+    const { serviceName } = params.path;
+    const { start, end, kuery, environment } = params.query;
+
+    const currentPeriodLogsRateTimeseries =
+      await logsDataAccessStart.services.getLogsRateTimeseries({
+        esClient: coreContext.elasticsearch.client.asCurrentUser,
+        identifyingMetadata: 'service.name',
+        timeFrom: start,
+        timeTo: end,
+        kuery,
+        serviceEnvironmentQuery: environmentQuery(environment),
+        serviceNames: [serviceName],
+      });
+
+    return { currentPeriod: currentPeriodLogsRateTimeseries };
+  },
+});
+
+const serviceLogErrorRateTimeseriesRoute = createApmServerRoute({
+  endpoint: 'GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries',
+  params: t.type({
+    path: t.type({
+      serviceName: t.string,
+    }),
+    query: t.intersection([environmentRt, kueryRt, rangeRt]),
+  }),
+  options: { tags: ['access:apm'] },
+  async handler(resources) {
+    const { context, params, plugins } = resources;
+    const [coreContext, logsDataAccessStart] = await Promise.all([
+      context.core,
+      plugins.logsDataAccess.start(),
+    ]);
+
+    const { serviceName } = params.path;
+    const { start, end, kuery, environment } = params.query;
+
+    const logsErrorRateTimeseries = await logsDataAccessStart.services.getLogsErrorRateTimeseries({
+      esClient: coreContext.elasticsearch.client.asCurrentUser,
+      identifyingMetadata: 'service.name',
+      timeFrom: start,
+      timeTo: end,
+      kuery,
+      serviceEnvironmentQuery: environmentQuery(environment),
+      serviceNames: [serviceName],
+    });
+
+    return { currentPeriod: logsErrorRateTimeseries };
+  },
+});
+
 export const servicesEntitiesRoutesRepository = {
   ...servicesEntitiesRoute,
+  ...serviceLogRateTimeseriesRoute,
+  ...serviceLogErrorRateTimeseriesRoute,
+  ...servicesEntitiesDetailedStatisticsRoute,
 };
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts b/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts
index 97f8f8c253033..c3513417cc565 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/historical_data/route.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 
-import { apmEnableMultiSignal } from '@kbn/observability-plugin/common';
 import { createEntitiesESClient } from '../../lib/helpers/create_es_client/create_assets_es_client/create_assets_es_clients';
 import { getApmEventClient } from '../../lib/helpers/get_apm_event_client';
 import { createApmServerRoute } from '../apm_routes/create_apm_server_route';
 import { hasHistoricalAgentData } from './has_historical_agent_data';
-import { hasEntitiesData } from './has_historical_entities_data';
 
 const hasDataRoute = createApmServerRoute({
   endpoint: 'GET /internal/apm/has_data',
@@ -19,24 +17,14 @@ const hasDataRoute = createApmServerRoute({
     const { context, request } = resources;
     const coreContext = await context.core;
 
-    const {
-      uiSettings: { client: uiSettingsClient },
-    } = coreContext;
-
-    const [apmEventClient, entitiesESClient, isApmEnableMultiSignal] = await Promise.all([
+    const [apmEventClient] = await Promise.all([
       getApmEventClient(resources),
       createEntitiesESClient({
         request,
         esClient: coreContext.elasticsearch.client.asCurrentUser,
       }),
-      uiSettingsClient.get<boolean>(apmEnableMultiSignal),
     ]);
 
-    if (isApmEnableMultiSignal) {
-      const hasData = await hasEntitiesData(entitiesESClient);
-      return { hasData };
-    }
-
     const hasData = await hasHistoricalAgentData(apmEventClient);
     return { hasData };
   },
diff --git a/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
index 1ef359016c4d9..fd425d62fcb38 100644
--- a/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
+++ b/x-pack/plugins/observability_solution/apm/server/routes/services/get_services_detailed_statistics/get_service_transaction_detailed_statistics.ts
@@ -24,7 +24,7 @@ import {
 import { withApmSpan } from '../../../utils/with_apm_span';
 import { maybe } from '../../../../common/utils/maybe';
 
-interface ServiceTransactionDetailedStat {
+export interface ServiceTransactionDetailedStat {
   serviceName: string;
   latency: Array<{ x: number; y: number | null }>;
   transactionErrorRate?: Array<{ x: number; y: number }>;
diff --git a/x-pack/plugins/observability_solution/apm/tsconfig.json b/x-pack/plugins/observability_solution/apm/tsconfig.json
index 375283b72f6b6..fc7fccbded5dd 100644
--- a/x-pack/plugins/observability_solution/apm/tsconfig.json
+++ b/x-pack/plugins/observability_solution/apm/tsconfig.json
@@ -121,7 +121,8 @@
     "@kbn/react-kibana-context-render",
     "@kbn/react-kibana-context-theme",
     "@kbn/test-jest-helpers",
-    "@kbn/security-plugin-types-common"
+    "@kbn/security-plugin-types-common",
+    "@kbn/entityManager-plugin"
   ],
   "exclude": [
     "target/**/*"
diff --git a/x-pack/plugins/observability_solution/dataset_quality/README.md b/x-pack/plugins/observability_solution/dataset_quality/README.md
index d000c5697b1d3..25f01ceb6fa60 100755
--- a/x-pack/plugins/observability_solution/dataset_quality/README.md
+++ b/x-pack/plugins/observability_solution/dataset_quality/README.md
@@ -47,7 +47,7 @@ Once the tests finish, the instances will be terminated.
 node x-pack/plugins/observability_solution/dataset_quality/scripts/api --server
 
 # run tests
-node x-pack/plugins/observability_solution/dataset_quality/scripts/api --runner --grep-files=error_group_list
+node x-pack/plugins/observability_solution/dataset_quality/scripts/api --runner --grep-files=data_stream_settings.spec.ts
 ```
 
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
index ce84985a39405..a88b2d531b9bc 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/api_types.ts
@@ -11,8 +11,6 @@ const userPrivilegesRt = rt.type({
   canMonitor: rt.boolean,
 });
 
-export type DataStreamUserPrivileges = rt.TypeOf<typeof userPrivilegesRt>;
-
 const datasetUserPrivilegesRt = rt.intersection([
   userPrivilegesRt,
   rt.type({
@@ -44,14 +42,13 @@ export const dashboardRT = rt.type({
   title: rt.string,
 });
 
+export type Dashboard = rt.TypeOf<typeof dashboardRT>;
+
 export const integrationDashboardsRT = rt.type({
   dashboards: rt.array(dashboardRT),
 });
 
-export type IntegrationDashboards = rt.TypeOf<typeof integrationDashboardsRT>;
-export type Dashboard = rt.TypeOf<typeof dashboardRT>;
-
-export const getIntegrationDashboardsResponseRt = rt.exact(integrationDashboardsRT);
+export type IntegrationDashboardsResponse = rt.TypeOf<typeof integrationDashboardsRT>;
 
 export const integrationIconRt = rt.intersection([
   rt.type({
@@ -74,11 +71,10 @@ export const integrationRt = rt.intersection([
     version: rt.string,
     icons: rt.array(integrationIconRt),
     datasets: rt.record(rt.string, rt.string),
-    dashboards: rt.array(dashboardRT),
   }),
 ]);
 
-export type Integration = rt.TypeOf<typeof integrationRt>;
+export type IntegrationType = rt.TypeOf<typeof integrationRt>;
 
 export const getIntegrationsResponseRt = rt.exact(
   rt.type({
@@ -86,6 +82,8 @@ export const getIntegrationsResponseRt = rt.exact(
   })
 );
 
+export type IntegrationResponse = rt.TypeOf<typeof getIntegrationsResponseRt>;
+
 export const degradedDocsRt = rt.type({
   dataset: rt.string,
   count: rt.number,
@@ -117,6 +115,7 @@ export type DegradedFieldResponse = rt.TypeOf<typeof getDataStreamDegradedFields
 
 export const dataStreamSettingsRt = rt.partial({
   createdOn: rt.union([rt.null, rt.number]), // rt.null is needed because `createdOn` is not available on Serverless
+  integration: rt.string,
 });
 
 export type DataStreamSettings = rt.TypeOf<typeof dataStreamSettingsRt>;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_stream_details/types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_stream_details/types.ts
new file mode 100644
index 0000000000000..74f0653396447
--- /dev/null
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_stream_details/types.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DataStreamType } from '../types';
+
+export interface GetDataStreamIntegrationParams {
+  type: DataStreamType;
+  integrationName: string;
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
index 5968c369732de..164a43c625fb1 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/data_stream_stat.ts
@@ -17,7 +17,7 @@ export class DataStreamStat {
   type: DataStreamType;
   name: DataStreamStatType['name'];
   namespace: string;
-  title: string;
+  title?: string;
   size?: DataStreamStatType['size']; // total datastream size
   sizeBytes?: DataStreamStatType['sizeBytes']; // total datastream size
   lastActivity?: DataStreamStatType['lastActivity'];
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
index ad8fecd91c7e0..8a3a9d4b5e8b0 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/integration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DashboardType, IntegrationType } from './types';
+import { IntegrationType } from '../api_types';
 
 export class Integration {
   name: IntegrationType['name'];
@@ -13,14 +13,12 @@ export class Integration {
   version: string;
   datasets: Record<string, string>;
   icons?: IntegrationType['icons'];
-  dashboards?: DashboardType[];
 
   private constructor(integration: Integration) {
     this.name = integration.name;
     this.title = integration.title || integration.name;
     this.version = integration.version || '1.0.0';
     this.icons = integration.icons;
-    this.dashboards = integration.dashboards || [];
     this.datasets = integration.datasets || {};
   }
 
@@ -29,7 +27,6 @@ export class Integration {
       ...integration,
       title: integration.title || integration.name,
       version: integration.version || '1.0.0',
-      dashboards: integration.dashboards || [],
       datasets: integration.datasets || {},
     };
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
index 42fbeeb2cff52..9fe23f6ceef6f 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/data_streams_stats/types.ts
@@ -17,9 +17,6 @@ export type DataStreamStatServiceResponse = GetDataStreamsStatsResponse;
 
 export type GetIntegrationsParams =
   APIClientRequestParamsOf<`GET /internal/dataset_quality/integrations`>['params'];
-export type GetIntegrationsResponse = APIReturnType<`GET /internal/dataset_quality/integrations`>;
-export type IntegrationType = GetIntegrationsResponse['integrations'][0];
-export type IntegrationsResponse = IntegrationType[];
 
 export type GetDataStreamsDegradedDocsStatsParams =
   APIClientRequestParamsOf<`GET /internal/dataset_quality/data_streams/degraded_docs`>['params'];
@@ -69,9 +66,6 @@ export type GetNonAggregatableDataStreamsResponse =
 
 export type GetIntegrationDashboardsParams =
   APIClientRequestParamsOf<`GET /internal/dataset_quality/integrations/{integration}/dashboards`>['params']['path'];
-export type GetIntegrationDashboardsResponse =
-  APIReturnType<`GET /internal/dataset_quality/integrations/{integration}/dashboards`>;
-export type DashboardType = GetIntegrationDashboardsResponse['dashboards'][0];
 
 export type { DataStreamStat } from './data_stream_stat';
 export type {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/common/types/common.ts b/x-pack/plugins/observability_solution/dataset_quality/common/types/common.ts
index d7e5c4d78bbef..82d7b64e25f63 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/common/types/common.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/common/types/common.ts
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
+import { DataStreamStatType } from '../data_streams_stats';
+import { Integration } from '../data_streams_stats/integration';
+
 export type SortDirection = 'asc' | 'desc';
 
 export type Maybe<T> = T | null | undefined;
@@ -13,3 +16,11 @@ export interface Coordinate {
   x: number;
   y: Maybe<number>;
 }
+
+export interface BasicDataStream {
+  type: string;
+  name: DataStreamStatType['name'];
+  rawName: string;
+  namespace: string;
+  integration?: Integration;
+}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx
index 1fb5134b0a92c..7dc455b280444 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/flyout.tsx
@@ -26,6 +26,7 @@ import { Header } from './header';
 import { IntegrationSummary } from './integration_summary';
 import { FlyoutProps } from './types';
 import { FlyoutSummary } from './flyout_summary/flyout_summary';
+import { BasicDataStream } from '../../../common/types';
 
 // Allow for lazy loading
 // eslint-disable-next-line import/no-default-export
@@ -39,8 +40,19 @@ export default function Flyout({ dataset, closeFlyout }: FlyoutProps) {
     timeRange,
     loadingState,
     flyoutLoading,
+    integration,
   } = useDatasetQualityFlyout();
 
+  const linkDetails: BasicDataStream = {
+    name: dataset.name,
+    rawName: dataset.rawName,
+    integration: integration?.integrationDetails,
+    type: dataset.type,
+    namespace: dataset.namespace,
+  };
+
+  const title = integration?.integrationDetails?.datasets?.[dataset.name] ?? dataset.name;
+
   const { startTracking } = useDatasetDetailsTelemetry();
 
   useEffect(() => {
@@ -58,7 +70,11 @@ export default function Flyout({ dataset, closeFlyout }: FlyoutProps) {
         <EuiSkeletonRectangle width="100%" height={80} />
       ) : (
         <>
-          <Header dataStreamStat={dataset} />
+          <Header
+            linkDetails={linkDetails}
+            loading={!loadingState.datasetIntegrationDone}
+            title={title}
+          />
           <EuiFlyoutBody css={flyoutBodyStyles} data-test-subj="datasetQualityFlyoutBody">
             <EuiPanel hasBorder={false} hasShadow={false} paddingSize="l">
               <FlyoutSummary
@@ -86,12 +102,13 @@ export default function Flyout({ dataset, closeFlyout }: FlyoutProps) {
                     fieldFormats={fieldFormats}
                   />
 
-                  {dataStreamStat.integration && (
+                  {integration?.integrationDetails && (
                     <>
                       <EuiSpacer />
                       <IntegrationSummary
-                        integration={dataStreamStat.integration}
-                        dashboardsLoading={loadingState.datasetIntegrationsLoading}
+                        integration={integration.integrationDetails}
+                        dashboards={integration?.dashboards ?? []}
+                        dashboardsLoading={loadingState.datasetIntegrationDashboardLoading}
                       />
                     </>
                   )}
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx
index 60d88992c979e..10d0c96a057bd 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/header.tsx
@@ -10,6 +10,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiFlyoutHeader,
+  EuiSkeletonTitle,
   EuiTitle,
   useEuiShadow,
   useEuiTheme,
@@ -22,15 +23,23 @@ import {
 } from '../../../common/translations';
 import { NavigationSource } from '../../services/telemetry';
 import { useRedirectLink } from '../../hooks';
-import { FlyoutDataset } from '../../state_machines/dataset_quality_controller';
 import { IntegrationIcon } from '../common';
+import { BasicDataStream } from '../../../common/types';
 
-export function Header({ dataStreamStat }: { dataStreamStat: FlyoutDataset }) {
-  const { integration, title } = dataStreamStat;
+export function Header({
+  linkDetails,
+  loading,
+  title,
+}: {
+  linkDetails: BasicDataStream;
+  loading: boolean;
+  title: string;
+}) {
+  const { integration } = linkDetails;
   const euiShadow = useEuiShadow('s');
   const { euiTheme } = useEuiTheme();
   const redirectLinkProps = useRedirectLink({
-    dataStreamStat,
+    dataStreamStat: linkDetails,
     telemetry: {
       page: 'details',
       navigationSource: NavigationSource.Header,
@@ -39,47 +48,55 @@ export function Header({ dataStreamStat }: { dataStreamStat: FlyoutDataset }) {
 
   return (
     <EuiFlyoutHeader hasBorder>
-      <EuiFlexGroup justifyContent="flexStart">
-        <EuiFlexItem grow>
-          <EuiFlexGroup gutterSize="m" justifyContent="flexStart" alignItems="center">
-            <EuiTitle data-test-subj="datasetQualityFlyoutTitle">
-              <h3>{title}</h3>
-            </EuiTitle>
-            <div
+      {loading ? (
+        <EuiSkeletonTitle
+          size="s"
+          data-test-subj="datasetQualityFlyoutIntegrationLoading"
+          className="datasetQualityFlyoutIntegrationLoading"
+        />
+      ) : (
+        <EuiFlexGroup justifyContent="flexStart">
+          <EuiFlexItem grow>
+            <EuiFlexGroup gutterSize="m" justifyContent="flexStart" alignItems="center">
+              <EuiTitle data-test-subj="datasetQualityFlyoutTitle">
+                <h3>{title}</h3>
+              </EuiTitle>
+              <div
+                css={css`
+                  ${euiShadow};
+                  padding: ${euiTheme.size.xs};
+                  border-radius: ${euiTheme.size.xxs};
+                `}
+              >
+                <IntegrationIcon integration={integration} />
+              </div>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup
               css={css`
-                ${euiShadow};
-                padding: ${euiTheme.size.xs};
-                border-radius: ${euiTheme.size.xxs};
+                margin-right: ${euiTheme.size.l};
               `}
+              gutterSize="s"
+              justifyContent="flexEnd"
+              alignItems="center"
             >
-              <IntegrationIcon integration={integration} />
-            </div>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup
-            css={css`
-              margin-right: ${euiTheme.size.l};
-            `}
-            gutterSize="s"
-            justifyContent="flexEnd"
-            alignItems="center"
-          >
-            <EuiButton
-              data-test-subj="datasetQualityHeaderButton"
-              size="s"
-              {...redirectLinkProps.linkProps}
-              iconType={
-                redirectLinkProps.isLogsExplorerAvailable ? 'logoObservability' : 'discoverApp'
-              }
-            >
-              {redirectLinkProps.isLogsExplorerAvailable
-                ? flyoutOpenInLogsExplorerText
-                : flyoutOpenInDiscoverText}
-            </EuiButton>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      </EuiFlexGroup>
+              <EuiButton
+                data-test-subj="datasetQualityHeaderButton"
+                size="s"
+                {...redirectLinkProps.linkProps}
+                iconType={
+                  redirectLinkProps.isLogsExplorerAvailable ? 'logoObservability' : 'discoverApp'
+                }
+              >
+                {redirectLinkProps.isLogsExplorerAvailable
+                  ? flyoutOpenInLogsExplorerText
+                  : flyoutOpenInDiscoverText}
+              </EuiButton>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      )}
     </EuiFlyoutHeader>
   );
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
index 9b0e45ce27e90..99afb7f269df5 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_actions_menu.tsx
@@ -18,9 +18,10 @@ import {
 } from '@elastic/eui';
 import { css } from '@emotion/react';
 import { RouterLinkProps } from '@kbn/router-utils/src/get_router_link_props';
-import { Integration } from '../../../common/data_streams_stats/integration';
 import { useDatasetQualityFlyout } from '../../hooks';
 import { useFlyoutIntegrationActions } from '../../hooks/use_flyout_integration_actions';
+import { Integration } from '../../../common/data_streams_stats/integration';
+import { Dashboard } from '../../../common/api_types';
 
 const integrationActionsText = i18n.translate('xpack.datasetQuality.flyoutIntegrationActionsText', {
   defaultMessage: 'Integration actions',
@@ -40,15 +41,17 @@ const viewDashboardsText = i18n.translate('xpack.datasetQuality.flyoutViewDashbo
 
 export function IntegrationActionsMenu({
   integration,
+  dashboards,
   dashboardsLoading,
 }: {
   integration: Integration;
+  dashboards: Dashboard[];
   dashboardsLoading: boolean;
 }) {
   const { dataStreamStat, canUserAccessDashboards, canUserViewIntegrations } =
     useDatasetQualityFlyout();
+  const { version, name: integrationName } = integration;
   const { type, name } = dataStreamStat!;
-  const { dashboards = [], version, name: integrationName } = integration;
   const {
     isOpen,
     handleCloseMenu,
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
index 1450e830eac1e..6ac94411098a6 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/components/flyout/integration_summary.tsx
@@ -13,22 +13,29 @@ import {
   flyoutIntegrationNameText,
   flyoutIntegrationVersionText,
 } from '../../../common/translations';
-import { Integration } from '../../../common/data_streams_stats/integration';
 import { IntegrationIcon } from '../common';
 import { FieldsList } from './fields_list';
 import { IntegrationActionsMenu } from './integration_actions_menu';
+import { Integration } from '../../../common/data_streams_stats/integration';
+import { Dashboard } from '../../../common/api_types';
 
 export function IntegrationSummary({
   integration,
+  dashboards,
   dashboardsLoading,
 }: {
   integration: Integration;
+  dashboards: Dashboard[];
   dashboardsLoading: boolean;
 }) {
   const { name, version } = integration;
 
   const integrationActionsMenu = (
-    <IntegrationActionsMenu integration={integration} dashboardsLoading={dashboardsLoading} />
+    <IntegrationActionsMenu
+      integration={integration}
+      dashboards={dashboards}
+      dashboardsLoading={dashboardsLoading}
+    />
   );
   return (
     <FieldsList
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
index 4cc164b6b92c9..88bf869a5a2a9 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_dataset_quality_flyout.tsx
@@ -23,6 +23,7 @@ export const useDatasetQualityFlyout = () => {
     insightsTimeRange,
     breakdownField,
     isNonAggregatable,
+    integration,
   } = useSelector(service, (state) => state.context.flyout) ?? {};
 
   const { timeRange } = useSelector(service, (state) => state.context.filters);
@@ -30,12 +31,20 @@ export const useDatasetQualityFlyout = () => {
   const loadingState = useSelector(service, (state) => ({
     dataStreamDetailsLoading: state.matches('flyout.initializing.dataStreamDetails.fetching'),
     dataStreamSettingsLoading: state.matches('flyout.initializing.dataStreamSettings.fetching'),
-    datasetIntegrationsLoading: state.matches('flyout.initializing.integrationDashboards.fetching'),
+    datasetIntegrationDashboardLoading: state.matches(
+      'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDashboards.fetching'
+    ),
+    datasetIntegrationDone: state.matches(
+      'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDetails.done'
+    ),
   }));
 
   const canUserAccessDashboards = useSelector(
     service,
-    (state) => !state.matches('flyout.initializing.integrationDashboards.unauthorized')
+    (state) =>
+      !state.matches(
+        'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDashboards.unauthorized'
+      )
   );
 
   const canUserViewIntegrations = useSelector(
@@ -48,6 +57,7 @@ export const useDatasetQualityFlyout = () => {
     dataStreamSettings,
     dataStreamDetails,
     isNonAggregatable,
+    integration,
     fieldFormats,
     timeRange: insightsTimeRange ?? timeRange,
     breakdownField,
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_degraded_docs_chart.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_degraded_docs_chart.tsx
index 03da29c7e04ea..9d459f8227a40 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_degraded_docs_chart.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_degraded_docs_chart.tsx
@@ -14,7 +14,6 @@ import { useEuiTheme } from '@elastic/eui';
 import { type DataView, DataViewField } from '@kbn/data-views-plugin/common';
 import { useDatasetQualityContext } from '../components/dataset_quality/context';
 import { DEFAULT_LOGS_DATA_VIEW } from '../../common/constants';
-import { indexNameToDataStreamParts } from '../../common/utils';
 import { getLensAttributes } from '../components/flyout/degraded_docs_trend/lens_attributes';
 import { useCreateDataView } from './use_create_dataview';
 import { useRedirectLink } from './use_redirect_link';
@@ -193,7 +192,7 @@ export const useDegradedDocsChart = ({ dataStream }: DegradedDocsChartDeps) => {
 };
 
 function getDataViewIndexPattern(dataStream: string | undefined) {
-  return dataStream ? `${indexNameToDataStreamParts(dataStream).type}-*-*` : DEFAULT_LOGS_DATA_VIEW;
+  return dataStream ?? DEFAULT_LOGS_DATA_VIEW;
 }
 
 function getDataViewField(dataView: DataView | undefined, fieldName: string | undefined) {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
index 518b8f84aedd8..b0f47716100b4 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_flyout_integration_actions.tsx
@@ -10,8 +10,8 @@ import { useMemo, useCallback } from 'react';
 import useToggle from 'react-use/lib/useToggle';
 import { MANAGEMENT_APP_LOCATOR } from '@kbn/deeplinks-management/constants';
 import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
-import { DashboardType } from '../../common/data_streams_stats';
 import { useKibanaContextForPlugin } from '../utils';
+import { Dashboard } from '../../common/api_types';
 import { useDatasetDetailsTelemetry } from './use_telemetry';
 
 export const useFlyoutIntegrationActions = () => {
@@ -79,7 +79,7 @@ export const useFlyoutIntegrationActions = () => {
     ]
   );
   const getDashboardLinkProps = useCallback(
-    (dashboard: DashboardType) =>
+    (dashboard: Dashboard) =>
       wrapLinkPropsForTelemetry(
         getRouterLinkProps({
           href: dashboardLocator?.getRedirectUrl({ dashboardId: dashboard?.id } || ''),
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_redirect_link.ts b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_redirect_link.ts
index 5e2b39ba7a8b6..4a4c6772c412c 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_redirect_link.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/hooks/use_redirect_link.ts
@@ -17,20 +17,20 @@ import { RouterLinkProps } from '@kbn/router-utils/src/get_router_link_props';
 import { LocatorPublic } from '@kbn/share-plugin/common';
 import { LocatorClient } from '@kbn/shared-ux-prompt-no-data-views-types';
 import { useSelector } from '@xstate/react';
-import { DataStreamStat } from '../../common/data_streams_stats/data_stream_stat';
 import { useDatasetQualityContext } from '../components/dataset_quality/context';
-import { FlyoutDataset, TimeRangeConfig } from '../state_machines/dataset_quality_controller';
+import { TimeRangeConfig } from '../state_machines/dataset_quality_controller';
 import { useKibanaContextForPlugin } from '../utils';
+import { BasicDataStream } from '../../common/types';
 import { useRedirectLinkTelemetry } from './use_telemetry';
 
-export const useRedirectLink = ({
+export const useRedirectLink = <T extends BasicDataStream>({
   dataStreamStat,
   query,
   timeRangeConfig,
   breakdownField,
   telemetry,
 }: {
-  dataStreamStat: DataStreamStat | FlyoutDataset;
+  dataStreamStat: T;
   query?: Query | AggregateQuery;
   timeRangeConfig?: TimeRangeConfig;
   breakdownField?: string;
@@ -109,7 +109,7 @@ export const useRedirectLink = ({
   ]);
 };
 
-const buildLogsExplorerConfig = ({
+const buildLogsExplorerConfig = <T extends BasicDataStream>({
   locator,
   dataStreamStat,
   query,
@@ -118,7 +118,7 @@ const buildLogsExplorerConfig = ({
   breakdownField,
 }: {
   locator: LocatorPublic<SingleDatasetLocatorParams>;
-  dataStreamStat: DataStreamStat | FlyoutDataset;
+  dataStreamStat: T;
   query?: Query | AggregateQuery;
   from: string;
   to: string;
@@ -158,7 +158,7 @@ const buildLogsExplorerConfig = ({
   return { routerLinkProps: logsExplorerLinkProps, navigate: navigateToLogsExplorer };
 };
 
-const buildDiscoverConfig = ({
+const buildDiscoverConfig = <T extends BasicDataStream>({
   locatorClient,
   dataStreamStat,
   query,
@@ -167,7 +167,7 @@ const buildDiscoverConfig = ({
   breakdownField,
 }: {
   locatorClient: LocatorClient;
-  dataStreamStat: DataStreamStat | FlyoutDataset;
+  dataStreamStat: T;
   query?: Query | AggregateQuery;
   from: string;
   to: string;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts
index 52bdf3c53ea51..a5813b3190351 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/data_stream_details_client.ts
@@ -11,7 +11,10 @@ import {
   getDataStreamDegradedFieldsResponseRt,
   getDataStreamsDetailsResponseRt,
   getDataStreamsSettingsResponseRt,
+  getIntegrationsResponseRt,
+  IntegrationDashboardsResponse,
   integrationDashboardsRT,
+  IntegrationResponse,
 } from '../../../common/api_types';
 import {
   DataStreamDetails,
@@ -24,10 +27,11 @@ import {
   GetDataStreamSettingsResponse,
   GetDataStreamsStatsError,
   GetIntegrationDashboardsParams,
-  GetIntegrationDashboardsResponse,
 } from '../../../common/data_streams_stats';
 import { IDataStreamDetailsClient } from './types';
 import { GetDataStreamsDetailsError } from '../../../common/data_stream_details';
+import { Integration } from '../../../common/data_streams_stats/integration';
+import { GetDataStreamIntegrationParams } from '../../../common/data_stream_details/types';
 
 export class DataStreamDetailsClient implements IDataStreamDetailsClient {
   constructor(private readonly http: HttpStart) {}
@@ -107,7 +111,7 @@ export class DataStreamDetailsClient implements IDataStreamDetailsClient {
 
   public async getIntegrationDashboards({ integration }: GetIntegrationDashboardsParams) {
     const response = await this.http
-      .get<GetIntegrationDashboardsResponse>(
+      .get<IntegrationDashboardsResponse>(
         `/internal/dataset_quality/integrations/${integration}/dashboards`
       )
       .catch((error) => {
@@ -117,7 +121,7 @@ export class DataStreamDetailsClient implements IDataStreamDetailsClient {
         );
       });
 
-    const integrationDashboards = decodeOrThrow(
+    const { dashboards } = decodeOrThrow(
       integrationDashboardsRT,
       (message: string) =>
         new GetDataStreamsStatsError(
@@ -125,6 +129,32 @@ export class DataStreamDetailsClient implements IDataStreamDetailsClient {
         )
     )(response);
 
-    return integrationDashboards;
+    return dashboards;
+  }
+
+  public async getDataStreamIntegration(
+    params: GetDataStreamIntegrationParams
+  ): Promise<Integration | undefined> {
+    const { type, integrationName } = params;
+    const response = await this.http
+      .get<IntegrationResponse>('/internal/dataset_quality/integrations', {
+        query: { type },
+      })
+      .catch((error) => {
+        throw new GetDataStreamsStatsError(
+          `Failed to fetch integrations: ${error}`,
+          error.body.statusCode
+        );
+      });
+
+    const { integrations } = decodeOrThrow(
+      getIntegrationsResponseRt,
+      (message: string) =>
+        new GetDataStreamsStatsError(`Failed to decode integrations response: ${message}`)
+    )(response);
+
+    const integration = integrations.find((i) => i.name === integrationName);
+
+    if (integration) return Integration.create(integration);
   }
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts
index 708c1ba8a6c4c..40eaf499a3032 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_stream_details/types.ts
@@ -6,16 +6,18 @@
  */
 
 import { HttpStart } from '@kbn/core/public';
+import { Integration } from '../../../common/data_streams_stats/integration';
 import {
   GetDataStreamSettingsParams,
   DataStreamSettings,
   GetDataStreamDetailsParams,
   DataStreamDetails,
   GetIntegrationDashboardsParams,
-  GetIntegrationDashboardsResponse,
   GetDataStreamDegradedFieldsParams,
   DegradedFieldResponse,
 } from '../../../common/data_streams_stats';
+import { GetDataStreamIntegrationParams } from '../../../common/data_stream_details/types';
+import { Dashboard } from '../../../common/api_types';
 
 export type DataStreamDetailsServiceSetup = void;
 
@@ -33,7 +35,8 @@ export interface IDataStreamDetailsClient {
   getDataStreamDegradedFields(
     params: GetDataStreamDegradedFieldsParams
   ): Promise<DegradedFieldResponse>;
-  getIntegrationDashboards(
-    params: GetIntegrationDashboardsParams
-  ): Promise<GetIntegrationDashboardsResponse>;
+  getIntegrationDashboards(params: GetIntegrationDashboardsParams): Promise<Dashboard[]>;
+  getDataStreamIntegration(
+    params: GetDataStreamIntegrationParams
+  ): Promise<Integration | undefined>;
 }
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
index 6ffa91e7151da..bbce86404e1dd 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/data_streams_stats_client.ts
@@ -12,6 +12,7 @@ import {
   getDataStreamsStatsResponseRt,
   getIntegrationsResponseRt,
   getNonAggregatableDatasetsRt,
+  IntegrationResponse,
 } from '../../../common/api_types';
 import { DEFAULT_DATASET_TYPE } from '../../../common/constants';
 import {
@@ -24,7 +25,6 @@ import {
   GetIntegrationsParams,
   GetNonAggregatableDataStreamsParams,
   GetNonAggregatableDataStreamsResponse,
-  IntegrationsResponse,
 } from '../../../common/data_streams_stats';
 import { Integration } from '../../../common/data_streams_stats/integration';
 import { IDataStreamsStatsClient } from './types';
@@ -113,9 +113,9 @@ export class DataStreamsStatsClient implements IDataStreamsStatsClient {
 
   public async getIntegrations(
     params: GetIntegrationsParams['query'] = { type: DEFAULT_DATASET_TYPE }
-  ): Promise<IntegrationsResponse> {
+  ): Promise<Integration[]> {
     const response = await this.http
-      .get<GetDataStreamsStatsResponse>('/internal/dataset_quality/integrations', {
+      .get<IntegrationResponse>('/internal/dataset_quality/integrations', {
         query: params,
       })
       .catch((error) => {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
index 7e3ee958b4074..ba1f9077f45b0 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/services/data_streams_stats/types.ts
@@ -14,8 +14,8 @@ import {
   GetIntegrationsParams,
   GetNonAggregatableDataStreamsParams,
   GetNonAggregatableDataStreamsResponse,
-  IntegrationsResponse,
 } from '../../../common/data_streams_stats';
+import { Integration } from '../../../common/data_streams_stats/integration';
 
 export type DataStreamsStatsServiceSetup = void;
 
@@ -32,7 +32,7 @@ export interface IDataStreamsStatsClient {
   getDataStreamsDegradedStats(
     params?: GetDataStreamsDegradedDocsStatsQuery
   ): Promise<DataStreamDegradedDocsStatServiceResponse>;
-  getIntegrations(params: GetIntegrationsParams['query']): Promise<IntegrationsResponse>;
+  getIntegrations(params: GetIntegrationsParams['query']): Promise<Integration[]>;
   getNonAggregatableDatasets(
     params: GetNonAggregatableDataStreamsParams
   ): Promise<GetNonAggregatableDataStreamsResponse>;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
index d2077f20ad9d2..f92db44eb516c 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/notifications.ts
@@ -71,6 +71,22 @@ export const fetchIntegrationsFailedNotifier = (toasts: IToasts, error: Error) =
   });
 };
 
+export const fetchDataStreamIntegrationFailedNotifier = (
+  toasts: IToasts,
+  error: Error,
+  integrationName?: string
+) => {
+  toasts.addDanger({
+    title: i18n.translate('xpack.datasetQuality.flyout.fetchIntegrationsFailed', {
+      defaultMessage: "We couldn't get {integrationName} integration info.",
+      values: {
+        integrationName,
+      },
+    }),
+    text: error.message,
+  });
+};
+
 export const noDatasetSelected = i18n.translate(
   'xpack.datasetQuality.fetchDatasetDetailsFailed.noDatasetSelected',
   {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
index 4c2b516fc4662..6cad5ae252c0f 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/state_machine.ts
@@ -8,11 +8,10 @@
 import { IToasts } from '@kbn/core/public';
 import { getDateISORange } from '@kbn/timerange';
 import { assign, createMachine, DoneInvokeEvent, InterpreterFrom } from 'xstate';
-import { DataStreamStat, DegradedFieldResponse } from '../../../../common/api_types';
+import { Dashboard, DataStreamStat, DegradedFieldResponse } from '../../../../common/api_types';
 import { Integration } from '../../../../common/data_streams_stats/integration';
 import { IDataStreamDetailsClient } from '../../../services/data_stream_details';
 import {
-  DashboardType,
   DataStreamSettings,
   DataStreamDetails,
   GetDataStreamsStatsQuery,
@@ -35,6 +34,7 @@ import {
   fetchIntegrationsFailedNotifier,
   noDatasetSelected,
   fetchNonAggregatableDatasetsFailedNotifier,
+  fetchDataStreamIntegrationFailedNotifier,
 } from './notifications';
 import {
   DatasetQualityControllerContext,
@@ -261,7 +261,7 @@ export const createPureDatasetQualityControllerStateMachine = (
                       invoke: {
                         src: 'loadDataStreamSettings',
                         onDone: {
-                          target: 'done',
+                          target: 'initializeIntegrations',
                           actions: ['storeDataStreamSettings'],
                         },
                         onError: {
@@ -270,6 +270,62 @@ export const createPureDatasetQualityControllerStateMachine = (
                         },
                       },
                     },
+                    initializeIntegrations: {
+                      type: 'parallel',
+                      states: {
+                        integrationDetails: {
+                          initial: 'fetching',
+                          states: {
+                            fetching: {
+                              invoke: {
+                                src: 'loadDataStreamIntegration',
+                                onDone: {
+                                  target: 'done',
+                                  actions: ['storeDataStreamIntegration'],
+                                },
+                                onError: {
+                                  target: 'done',
+                                  actions: ['notifyFetchDatasetIntegrationsFailed'],
+                                },
+                              },
+                            },
+                            done: {
+                              type: 'final',
+                            },
+                          },
+                        },
+                        integrationDashboards: {
+                          initial: 'fetching',
+                          states: {
+                            fetching: {
+                              invoke: {
+                                src: 'loadIntegrationDashboards',
+                                onDone: {
+                                  target: 'done',
+                                  actions: ['storeIntegrationDashboards'],
+                                },
+                                onError: [
+                                  {
+                                    target: 'unauthorized',
+                                    cond: 'checkIfActionForbidden',
+                                  },
+                                  {
+                                    target: 'done',
+                                    actions: ['notifyFetchIntegrationDashboardsFailed'],
+                                  },
+                                ],
+                              },
+                            },
+                            done: {
+                              type: 'final',
+                            },
+                            unauthorized: {
+                              type: 'final',
+                            },
+                          },
+                        },
+                      },
+                    },
                     done: {
                       type: 'final',
                     },
@@ -304,36 +360,6 @@ export const createPureDatasetQualityControllerStateMachine = (
                     },
                   },
                 },
-                integrationDashboards: {
-                  initial: 'fetching',
-                  states: {
-                    fetching: {
-                      invoke: {
-                        src: 'loadIntegrationDashboards',
-                        onDone: {
-                          target: 'done',
-                          actions: ['storeIntegrationDashboards'],
-                        },
-                        onError: [
-                          {
-                            target: 'unauthorized',
-                            cond: 'checkIfActionForbidden',
-                          },
-                          {
-                            target: 'done',
-                            actions: ['notifyFetchIntegrationDashboardsFailed'],
-                          },
-                        ],
-                      },
-                    },
-                    done: {
-                      type: 'final',
-                    },
-                    unauthorized: {
-                      type: 'final',
-                    },
-                  },
-                },
                 dataStreamDegradedFields: {
                   initial: 'fetching',
                   states: {
@@ -623,18 +649,28 @@ export const createPureDatasetQualityControllerStateMachine = (
             integrations: [],
           };
         }),
-        storeIntegrationDashboards: assign((context, event) => {
-          return 'data' in event && 'dashboards' in event.data
+        storeDataStreamIntegration: assign((context, event: DoneInvokeEvent<Integration>) => {
+          return 'data' in event
             ? {
                 flyout: {
                   ...context.flyout,
-                  dataset: {
-                    ...context.flyout.dataset,
-                    integration: {
-                      ...context.flyout.dataset?.integration,
-                      dashboards: event.data.dashboards as DashboardType[],
-                    },
-                  } as FlyoutDataset,
+                  integration: {
+                    ...context.flyout.integration,
+                    integrationDetails: event.data,
+                  },
+                },
+              }
+            : {};
+        }),
+        storeIntegrationDashboards: assign((context, event: DoneInvokeEvent<Dashboard[]>) => {
+          return 'data' in event
+            ? {
+                flyout: {
+                  ...context.flyout,
+                  integration: {
+                    ...context.flyout.integration,
+                    dashboards: event.data,
+                  },
                 },
               }
             : {};
@@ -688,6 +724,10 @@ export const createDatasetQualityControllerStateMachine = ({
         fetchIntegrationDashboardsFailedNotifier(toasts, event.data),
       notifyFetchIntegrationsFailed: (_context, event: DoneInvokeEvent<Error>) =>
         fetchIntegrationsFailedNotifier(toasts, event.data),
+      notifyFetchDatasetIntegrationsFailed: (context, event: DoneInvokeEvent<Error>) => {
+        const integrationName = context.flyout.datasetSettings?.integration;
+        return fetchDataStreamIntegrationFailedNotifier(toasts, event.data, integrationName);
+      },
     },
     services: {
       loadDataStreamStats: (context) =>
@@ -757,6 +797,16 @@ export const createDatasetQualityControllerStateMachine = ({
           }),
         });
       },
+      loadDataStreamIntegration: (context) => {
+        if (context.flyout.datasetSettings?.integration && context.flyout.dataset) {
+          const { type } = context.flyout.dataset;
+          return dataStreamDetailsClient.getDataStreamIntegration({
+            type: type as DataStreamType,
+            integrationName: context.flyout.datasetSettings.integration,
+          });
+        }
+        return Promise.resolve();
+      },
       loadDataStreamDetails: (context) => {
         if (!context.flyout.dataset || !context.flyout.insightsTimeRange) {
           fetchDatasetDetailsFailedNotifier(toasts, new Error(noDatasetSelected));
@@ -780,17 +830,13 @@ export const createDatasetQualityControllerStateMachine = ({
         });
       },
       loadIntegrationDashboards: (context) => {
-        if (!context.flyout.dataset) {
-          fetchDatasetDetailsFailedNotifier(toasts, new Error(noDatasetSelected));
-
-          return Promise.resolve({});
+        if (context.flyout.datasetSettings?.integration) {
+          return dataStreamDetailsClient.getIntegrationDashboards({
+            integration: context.flyout.datasetSettings.integration,
+          });
         }
 
-        const { integration } = context.flyout.dataset;
-
-        return integration
-          ? dataStreamDetailsClient.getIntegrationDashboards({ integration: integration.name })
-          : Promise.resolve({});
+        return Promise.resolve();
       },
       loadDatasetIsNonAggregatable: async (context) => {
         if (!context.flyout.dataset || !context.flyout.insightsTimeRange) {
diff --git a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
index c75c648020d61..1454c098f9783 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/public/state_machines/dataset_quality_controller/src/types.ts
@@ -8,17 +8,15 @@
 import { DoneInvokeEvent } from 'xstate';
 import { RefreshInterval, TimeRange } from '@kbn/data-plugin/common';
 import { QualityIndicators, SortDirection } from '../../../../common/types';
-import { DatasetUserPrivileges } from '../../../../common/api_types';
+import { Dashboard, DatasetUserPrivileges } from '../../../../common/api_types';
 import { Integration } from '../../../../common/data_streams_stats/integration';
 import { DatasetTableSortField, DegradedFieldSortField } from '../../../hooks';
 import { DegradedDocsStat } from '../../../../common/data_streams_stats/malformed_docs_stat';
 import {
-  DashboardType,
   DataStreamDegradedDocsStatServiceResponse,
   DataStreamSettings,
   DataStreamDetails,
   DataStreamStatServiceResponse,
-  IntegrationsResponse,
   DataStreamStat,
   DataStreamStatType,
   GetNonAggregatableDataStreamsResponse,
@@ -59,6 +57,11 @@ interface FiltersCriteria {
   query?: string;
 }
 
+export interface DataStreamIntegrations {
+  integrationDetails?: Integration;
+  dashboards?: Dashboard[];
+}
+
 export interface WithTableOptions {
   table: TableCriteria<DatasetTableSortField>;
 }
@@ -72,6 +75,7 @@ export interface WithFlyoutOptions {
     breakdownField?: string;
     degradedFields: DegradedFields;
     isNonAggregatable?: boolean;
+    integration?: DataStreamIntegrations;
   };
 }
 
@@ -146,6 +150,18 @@ export type DatasetQualityControllerTypeState =
       value: 'flyout.initializing.dataStreamSettings.fetching';
       context: DefaultDatasetQualityStateContext;
     }
+  | {
+      value: 'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDashboards.fetching';
+      context: DefaultDatasetQualityStateContext;
+    }
+  | {
+      value: 'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDashboards.unauthorized';
+      context: DefaultDatasetQualityStateContext;
+    }
+  | {
+      value: 'flyout.initializing.dataStreamSettings.initializeIntegrations.integrationDetails.done';
+      context: DefaultDatasetQualityStateContext;
+    }
   | {
       value: 'flyout.initializing.dataStreamDetails.fetching';
       context: DefaultDatasetQualityStateContext;
@@ -222,10 +238,10 @@ export type DatasetQualityControllerEvent =
     }
   | DoneInvokeEvent<DataStreamDegradedDocsStatServiceResponse>
   | DoneInvokeEvent<GetNonAggregatableDataStreamsResponse>
-  | DoneInvokeEvent<DashboardType>
+  | DoneInvokeEvent<Dashboard[]>
   | DoneInvokeEvent<DataStreamDetails>
   | DoneInvokeEvent<DegradedFieldResponse>
   | DoneInvokeEvent<DataStreamSettings>
   | DoneInvokeEvent<DataStreamStatServiceResponse>
-  | DoneInvokeEvent<IntegrationsResponse>
+  | DoneInvokeEvent<Integration>
   | DoneInvokeEvent<Error>;
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_details.test.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_details.test.ts
deleted file mode 100644
index c3758a4b2100c..0000000000000
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_details.test.ts
+++ /dev/null
@@ -1,427 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  IndicesDataStreamsStatsResponse,
-  SearchTotalHitsRelation,
-} from '@elastic/elasticsearch/lib/api/types';
-import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
-import {
-  findInventoryFields,
-  InventoryItemType,
-  inventoryModels,
-} from '@kbn/metrics-data-access-plugin/common';
-import { DataStreamDetails } from '../../../../common/api_types';
-
-import { getDataStreamDetails } from '.';
-const accessLogsDataStream = 'logs-nginx.access-default';
-const errorLogsDataStream = 'logs-nginx.error-default';
-const nonExistentDataStream = 'non-existent';
-
-const defaultSummaryStats: DataStreamDetails = {
-  degradedDocsCount: 98841,
-  docsCount: 617680,
-  hosts: {
-    'aws.rds.db_instance.arn': [],
-    'aws.s3.bucket.name': [],
-    'aws.sqs.queue.name': [],
-    'cloud.instance.id': ['0000000000009121', '0000000000009127', '0000000000009133'],
-    'container.id': [],
-    'host.name': ['synth-host'],
-    'kubernetes.pod.uid': [],
-  },
-  services: {
-    'service.name': ['synth-service-0', 'synth-service-1', 'synth-service-2'],
-  },
-  sizeBytes: 72596354,
-  lastActivity: 1715941303175,
-  userPrivileges: {
-    canMonitor: true,
-  },
-};
-
-const start = Number(new Date('2020-01-01T00:00:00.000Z'));
-const end = Number(new Date('2020-01-30T00:00:00.000Z'));
-
-describe('getDataStreamDetails', () => {
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
-
-  it('returns {} if index is not found', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.getSettings.mockRejectedValue(MOCK_INDEX_ERROR);
-    esClientMock.search.mockRejectedValue(MOCK_INDEX_ERROR);
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: nonExistentDataStream,
-      start,
-      end,
-    });
-
-    expect(dataStreamDetails).toEqual({});
-  });
-
-  it('returns summary of a data stream', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.stats.mockReturnValue(Promise.resolve(MOCK_STATS_RESPONSE));
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-    esClientMock.search.mockReturnValue(Promise.resolve(MOCK_SEARCH_RESPONSE));
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: errorLogsDataStream,
-      start,
-      end,
-    });
-
-    expect(dataStreamDetails).toEqual(defaultSummaryStats);
-  });
-
-  it('returns the correct service.name list', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.stats.mockReturnValue(Promise.resolve(MOCK_STATS_RESPONSE));
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-
-    const serviceName = 'service.name';
-    const testServiceName = ['tst-srv-0', 'tst-srv-1'];
-    const mockSearchResponse = { ...MOCK_SEARCH_RESPONSE };
-    mockSearchResponse.aggregations[serviceName].buckets = testServiceName.map((name) => ({
-      key: name,
-      doc_count: 1,
-    }));
-    esClientMock.search.mockReturnValue(Promise.resolve(MOCK_SEARCH_RESPONSE));
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-      start,
-      end,
-    });
-    expect(dataStreamDetails.services).toEqual({ [serviceName]: testServiceName });
-  });
-
-  it('returns the correct host.name list', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.stats.mockReturnValue(Promise.resolve(MOCK_STATS_RESPONSE));
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-
-    const hostName = 'host.name';
-    const testHostName = ['tst-host-0', 'tst-host-1'];
-    const hostFields = inventoryModels.map(
-      (model) => findInventoryFields(model.id as InventoryItemType).id
-    );
-    const mockSearchResponse = { ...MOCK_SEARCH_RESPONSE };
-    // Make all hosts buckets to []
-    hostFields.forEach((field) => {
-      mockSearchResponse.aggregations[field as 'host.name'] = { buckets: [] } as any;
-    });
-
-    // Set the host.name buckets to testHostName
-    mockSearchResponse.aggregations[hostName].buckets = testHostName.map((name) => ({
-      key: name,
-      doc_count: 1,
-    }));
-
-    esClientMock.search.mockReturnValue(Promise.resolve(MOCK_SEARCH_RESPONSE));
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-      start,
-      end,
-    });
-
-    // Expect all host fields to be empty
-    const emptyHosts = hostFields.reduce((acc, field) => ({ ...acc, [field]: [] }), {});
-
-    expect(dataStreamDetails.hosts).toEqual({ ...emptyHosts, [hostName]: testHostName });
-  });
-
-  it('returns correct size in bytes', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-
-    const docsCount = 536;
-    const storeDocsCount = 1220;
-    const storeSizeInBytes = 2048;
-    const expectedSizeInBytes = Math.ceil((storeSizeInBytes / storeDocsCount) * docsCount);
-
-    const testStatsResponse = { ...MOCK_STATS_RESPONSE };
-    testStatsResponse._all.total.docs.count = storeDocsCount;
-    testStatsResponse._all.total.store.size_in_bytes = storeSizeInBytes;
-    esClientMock.indices.stats.mockReturnValue(Promise.resolve(testStatsResponse));
-
-    const mockSearchResponse = { ...MOCK_SEARCH_RESPONSE };
-    mockSearchResponse.aggregations.total_count.value = docsCount;
-    esClientMock.search.mockReturnValue(Promise.resolve(mockSearchResponse));
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-      start,
-      end,
-    });
-    expect(dataStreamDetails.sizeBytes).toEqual(expectedSizeInBytes);
-  });
-
-  // This covers https://github.com/elastic/kibana/issues/178954
-  it('returns size as NaN for when sizeStatsAvailable is false (serverless mode)', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.security.hasPrivileges.mockResolvedValue(MOCK_HAS_PRIVILEGES_RESPONSE);
-
-    esClientMock.indices.stats.mockReturnValue(Promise.resolve(MOCK_STATS_RESPONSE));
-    esClientMock.search.mockReturnValue(Promise.resolve(MOCK_SEARCH_RESPONSE));
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-      start,
-      end,
-      sizeStatsAvailable: false,
-    });
-    expect(dataStreamDetails.sizeBytes).toBeNaN();
-  });
-
-  it('returns empty lastActivity and correct user privileges for an underprivileged user', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.security.hasPrivileges.mockResolvedValue({
-      ...MOCK_HAS_PRIVILEGES_RESPONSE,
-      index: {
-        [accessLogsDataStream]: {
-          monitor: false,
-        },
-      },
-    });
-    esClientMock.search.mockReturnValue(Promise.resolve(MOCK_SEARCH_RESPONSE));
-    esClientMock.indices.dataStreamsStats.mockReturnValue(
-      Promise.resolve(MOCK_DATA_STREAM_RESPONSE as IndicesDataStreamsStatsResponse)
-    );
-
-    const dataStreamDetails = await getDataStreamDetails({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-      start,
-      end,
-    });
-
-    expect(dataStreamDetails.userPrivileges?.canMonitor ?? true).toBe(false);
-  });
-});
-
-const MOCK_INDEX_ERROR = {
-  error: {
-    root_cause: [
-      {
-        type: 'index_not_found_exception',
-        reason: 'no such index [logs-nginx.error-default-01]',
-        'resource.type': 'index_or_alias',
-        'resource.id': 'logs-nginx.error-default-01',
-        index_uuid: '_na_',
-        index: 'logs-nginx.error-default-01',
-      },
-    ],
-    type: 'index_not_found_exception',
-    reason: 'no such index [logs-nginx.error-default-01]',
-    'resource.type': 'index_or_alias',
-    'resource.id': 'logs-nginx.error-default-01',
-    index_uuid: '_na_',
-    index: 'logs-nginx.error-default-01',
-  },
-  statusCode: 404,
-};
-
-const MOCK_SEARCH_RESPONSE = {
-  took: 2,
-  timed_out: false,
-  _shards: {
-    total: 1,
-    successful: 1,
-    skipped: 0,
-    failed: 0,
-  },
-  hits: {
-    total: {
-      value: 10000,
-      relation: 'gte' as SearchTotalHitsRelation,
-    },
-    max_score: null,
-    hits: [],
-  },
-  aggregations: {
-    total_count: {
-      value: 617680,
-    },
-    degraded_count: {
-      doc_count: 98841,
-    },
-    'service.name': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [
-        {
-          key: 'synth-service-0',
-          doc_count: 206116,
-        },
-        {
-          key: 'synth-service-1',
-          doc_count: 206012,
-        },
-        {
-          key: 'synth-service-2',
-          doc_count: 205552,
-        },
-      ],
-    },
-    'host.name': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [
-        {
-          key: 'synth-host',
-          doc_count: 617680,
-        },
-      ],
-    },
-    'kubernetes.pod.uid': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [],
-    },
-    'container.id': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [],
-    },
-    'cloud.instance.id': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 614630,
-      buckets: [
-        {
-          key: '0000000000009121',
-          doc_count: 61,
-        },
-        {
-          key: '0000000000009127',
-          doc_count: 61,
-        },
-        {
-          key: '0000000000009133',
-          doc_count: 61,
-        },
-      ],
-    },
-    'aws.s3.bucket.name': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [],
-    },
-    'aws.rds.db_instance.arn': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [],
-    },
-    'aws.sqs.queue.name': {
-      doc_count_error_upper_bound: 0,
-      sum_other_doc_count: 0,
-      buckets: [],
-    },
-  },
-};
-
-const MOCK_STATS_RESPONSE = {
-  _shards: {
-    total: 2,
-    successful: 2,
-    failed: 0,
-  },
-  _all: {
-    primaries: {},
-    total: {
-      docs: {
-        count: 1235360,
-        deleted: 0,
-      },
-      shard_stats: {
-        total_count: 2,
-      },
-      store: {
-        size_in_bytes: 145192707,
-        total_data_set_size_in_bytes: 145192707,
-        reserved_in_bytes: 0,
-      },
-      indexing: {
-        index_total: 1235059,
-        index_time_in_millis: 98509,
-        index_current: 0,
-        index_failed: 0,
-        delete_total: 0,
-        delete_time_in_millis: 0,
-        delete_current: 0,
-        noop_update_total: 0,
-        is_throttled: false,
-        throttle_time_in_millis: 0,
-        write_load: 0.00022633763414114222,
-      },
-    },
-  },
-  indices: {},
-};
-
-const MOCK_DATA_STREAM_RESPONSE = {
-  data_streams: [
-    {
-      data_stream: errorLogsDataStream,
-      backing_indices: 1,
-      store_size: '19.1mb',
-      store_size_bytes: 20070975,
-      maximum_timestamp: 1715941303175,
-    },
-    {
-      data_stream: accessLogsDataStream,
-      backing_indices: 1,
-      store_size: '11.3mb',
-      store_size_bytes: 20078875,
-      maximum_timestamp: 1715941304573,
-    },
-  ],
-};
-
-const MOCK_HAS_PRIVILEGES_RESPONSE = {
-  username: 'elastic',
-  has_all_requested: true,
-  cluster: {},
-  index: {
-    [nonExistentDataStream]: {
-      monitor: false,
-    },
-    [accessLogsDataStream]: {
-      monitor: true,
-    },
-    [errorLogsDataStream]: {
-      monitor: true,
-    },
-  },
-  application: {},
-};
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_settings.test.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_settings.test.ts
deleted file mode 100644
index dd2548d033c71..0000000000000
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/get_data_stream_settings.test.ts
+++ /dev/null
@@ -1,227 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
-
-import { getDataStreamSettings } from '.';
-const accessLogsDataStream = 'logs-nginx.access-default';
-const errorLogsDataStream = 'logs-nginx.error-default';
-const dateStr1 = '1702998651925'; // .ds-logs-nginx.access-default-2023.12.19-000001
-const dateStr2 = '1703110671019'; // .ds-logs-nginx.access-default-2023.12.20-000002
-const dateStr3 = '1702998866744'; // .ds-logs-nginx.error-default-2023.12.19-000001
-
-describe('getDataStreamSettings', () => {
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
-
-  it('throws error if index is not found', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.getSettings.mockRejectedValue(MOCK_INDEX_ERROR);
-
-    try {
-      await getDataStreamSettings({
-        esClient: esClientMock,
-        dataStream: 'non-existent',
-      });
-    } catch (e) {
-      expect(e).toBe(MOCK_INDEX_ERROR);
-    }
-  });
-
-  it('returns creation date of a data stream', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.getSettings.mockReturnValue(
-      Promise.resolve(MOCK_NGINX_ERROR_INDEX_SETTINGS)
-    );
-
-    const dataStreamSettings = await getDataStreamSettings({
-      esClient: esClientMock,
-      dataStream: errorLogsDataStream,
-    });
-    expect(dataStreamSettings).toEqual({ createdOn: Number(dateStr3) });
-  });
-
-  it('returns the earliest creation date of a data stream with multiple backing indices', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    esClientMock.indices.getSettings.mockReturnValue(
-      Promise.resolve(MOCK_NGINX_ACCESS_INDEX_SETTINGS)
-    );
-
-    const dataStreamSettings = await getDataStreamSettings({
-      esClient: esClientMock,
-      dataStream: accessLogsDataStream,
-    });
-    expect(dataStreamSettings).toEqual({ createdOn: Number(dateStr1) });
-  });
-});
-
-const MOCK_NGINX_ACCESS_INDEX_SETTINGS = {
-  [`.ds-${accessLogsDataStream}-2023.12.19-000001`]: {
-    settings: {
-      index: {
-        mapping: {
-          total_fields: {
-            limit: 10000,
-          },
-          ignore_malformed: true,
-        },
-        hidden: true,
-        provided_name: '.ds-logs-nginx.access-default-2023.12.19-000001',
-        final_pipeline: '.fleet_final_pipeline-1',
-        query: {
-          default_field: [
-            'cloud.account.id',
-            'cloud.availability_zone',
-            'cloud.instance.id',
-            'cloud.instance.name',
-            'cloud.machine.type',
-            'cloud.provider',
-            'cloud.region',
-          ],
-        },
-        creation_date: dateStr1,
-        number_of_replicas: '1',
-        uuid: 'uml9fMQqQUibZi2pKkc5sQ',
-        version: {
-          created: '8500007',
-        },
-        lifecycle: {
-          name: 'logs',
-          indexing_complete: true,
-        },
-        codec: 'best_compression',
-        routing: {
-          allocation: {
-            include: {
-              _tier_preference: 'data_hot',
-            },
-          },
-        },
-        number_of_shards: '1',
-        default_pipeline: 'logs-nginx.access-1.17.0',
-      },
-    },
-  },
-  [`.ds-${accessLogsDataStream}-2023.12.20-000002`]: {
-    settings: {
-      index: {
-        mapping: {
-          total_fields: {
-            limit: 10000,
-          },
-          ignore_malformed: true,
-        },
-        hidden: true,
-        provided_name: '.ds-logs-nginx.access-default-2023.12.20-000002',
-        final_pipeline: '.fleet_final_pipeline-1',
-        query: {
-          default_field: [
-            'user.name',
-            'user_agent.device.name',
-            'user_agent.name',
-            'user_agent.original',
-            'user_agent.os.full',
-            'user_agent.os.name',
-            'user_agent.os.version',
-            'user_agent.version',
-            'nginx.access.remote_ip_list',
-          ],
-        },
-        creation_date: dateStr2,
-        number_of_replicas: '1',
-        uuid: 'il9vJlOXRdiv44wU6WNtUQ',
-        version: {
-          created: '8500007',
-        },
-        lifecycle: {
-          name: 'logs',
-        },
-        codec: 'best_compression',
-        routing: {
-          allocation: {
-            include: {
-              _tier_preference: 'data_hot',
-            },
-          },
-        },
-        number_of_shards: '1',
-        default_pipeline: 'logs-nginx.access-1.17.0',
-      },
-    },
-  },
-};
-
-const MOCK_NGINX_ERROR_INDEX_SETTINGS = {
-  [`.ds-${errorLogsDataStream}-2023.12.19-000001`]: {
-    settings: {
-      index: {
-        mapping: {
-          total_fields: {
-            limit: 10000,
-          },
-          ignore_malformed: true,
-        },
-        hidden: true,
-        provided_name: '.ds-logs-nginx.error-default-2023.12.19-000001',
-        final_pipeline: '.fleet_final_pipeline-1',
-        query: {
-          default_field: [
-            'host.type',
-            'input.type',
-            'log.file.path',
-            'log.level',
-            'ecs.version',
-            'message',
-            'tags',
-          ],
-        },
-        creation_date: dateStr3,
-        number_of_replicas: '1',
-        uuid: 'fGPYUppSRU62MZ3toF0MkQ',
-        version: {
-          created: '8500007',
-        },
-        lifecycle: {
-          name: 'logs',
-        },
-        codec: 'best_compression',
-        routing: {
-          allocation: {
-            include: {
-              _tier_preference: 'data_hot',
-            },
-          },
-        },
-        number_of_shards: '1',
-        default_pipeline: 'logs-nginx.error-1.17.0',
-      },
-    },
-  },
-};
-
-const MOCK_INDEX_ERROR = {
-  error: {
-    root_cause: [
-      {
-        type: 'index_not_found_exception',
-        reason: 'no such index [logs-nginx.error-default-01]',
-        'resource.type': 'index_or_alias',
-        'resource.id': 'logs-nginx.error-default-01',
-        index_uuid: '_na_',
-        index: 'logs-nginx.error-default-01',
-      },
-    ],
-    type: 'index_not_found_exception',
-    reason: 'no such index [logs-nginx.error-default-01]',
-    'resource.type': 'index_or_alias',
-    'resource.id': 'logs-nginx.error-default-01',
-    index_uuid: '_na_',
-    index: 'logs-nginx.error-default-01',
-  },
-  status: 404,
-};
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts
index 52804c5d9369c..d89bb83867d10 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_stream_details/index.ts
@@ -32,8 +32,13 @@ export async function getDataStreamSettings({
 
   const createdOn = await getDataStreamCreatedOn(esClient, dataStream);
 
+  // Getting the 1st item from the data streams endpoint as we will be passing the exact DS name
+  const [dataStreamInfo] = await dataStreamService.getMatchingDataStreams(esClient, dataStream);
+  const integration = dataStreamInfo?._meta?.package?.name;
+
   return {
     createdOn,
+    integration,
   };
 }
 
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams/get_data_streams.test.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams/get_data_streams.test.ts
index 13e889cefc684..ae28384e7a160 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams/get_data_streams.test.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams/get_data_streams.test.ts
@@ -36,26 +36,6 @@ describe('getDataStreams', () => {
     jest.restoreAllMocks();
   });
 
-  it('Returns empty list when user doesnt have access to dataset', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    mockGetDatasetPrivileges.mockImplementationOnce(() => ({
-      canRead: false,
-      canMonitor: false,
-      canViewIntegrations: false,
-    }));
-
-    const result = await getDataStreams({
-      esClient: esClientMock,
-      type: 'logs',
-      datasetQuery: 'nginx',
-      uncategorisedOnly: false,
-    });
-    expect(result.items).toEqual([]);
-    expect(result.datasetUserPrivileges.canMonitor).toBe(false);
-
-    expect(dataStreamService.getMatchingDataStreams).not.toHaveBeenCalled();
-  });
-
   it('Passes the correct parameters to the DataStreamService', async () => {
     const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
     const result = await getDataStreams({
@@ -72,53 +52,7 @@ describe('getDataStreams', () => {
     expect(result.datasetUserPrivileges.canMonitor).toBe(true);
   });
 
-  it('Formats the items correctly', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-
-    const results = await getDataStreams({
-      esClient: esClientMock,
-      type: 'logs',
-      uncategorisedOnly: false,
-    });
-    expect(results.items.sort()).toEqual([
-      {
-        name: 'logs-elastic_agent-default',
-        integration: 'elastic_agent',
-        userPrivileges: {
-          canMonitor: true,
-        },
-      },
-      {
-        name: 'logs-elastic_agent.filebeat-default',
-        integration: 'elastic_agent',
-        userPrivileges: {
-          canMonitor: true,
-        },
-      },
-      {
-        name: 'logs-elastic_agent.fleet_server-default',
-        integration: 'elastic_agent',
-        userPrivileges: {
-          canMonitor: true,
-        },
-      },
-      {
-        name: 'logs-elastic_agent.metricbeat-default',
-        integration: 'elastic_agent',
-        userPrivileges: {
-          canMonitor: true,
-        },
-      },
-      {
-        name: 'logs-test.test-default',
-        userPrivileges: {
-          canMonitor: true,
-        },
-      },
-    ]);
-  });
-
-  describe('uncategorisedOnly option', () => {
+  describe('uncategorized only option', () => {
     it('Returns the correct number of results when true', async () => {
       const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
       const results = await getDataStreams({
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/get_data_streams_stats.test.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/get_data_streams_stats.test.ts
deleted file mode 100644
index 5aa429ea52f9a..0000000000000
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/get_data_streams_stats.test.ts
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
-import { dataStreamService } from '../../../services';
-
-import { getDataStreamsStats } from '.';
-
-jest.mock('../../../services/data_stream', () => {
-  return {
-    dataStreamService: {
-      getStreamsStats: jest.fn().mockImplementation(() => {
-        return [
-          {
-            data_stream: 'logs-elastic_agent-default',
-            backing_indices: 1,
-            store_size: '1gb',
-            store_size_bytes: 1170805528,
-            maximum_timestamp: 1698916071000,
-          },
-          {
-            data_stream: 'logs-elastic_agent.filebeat-default',
-            backing_indices: 1,
-            store_size: '1.3mb',
-            store_size_bytes: 1459100,
-            maximum_timestamp: 1698902209996,
-          },
-          {
-            data_stream: 'logs-elastic_agent.fleet_server-default',
-            backing_indices: 1,
-            store_size: '2.9mb',
-            store_size_bytes: 3052148,
-            maximum_timestamp: 1698914110010,
-          },
-          {
-            data_stream: 'logs-elastic_agent.metricbeat-default',
-            backing_indices: 1,
-            store_size: '1.6mb',
-            store_size_bytes: 1704807,
-            maximum_timestamp: 1698672046707,
-          },
-          {
-            data_stream: 'logs-test.test-default',
-            backing_indices: 1,
-            store_size: '6.2mb',
-            store_size_bytes: 6570447,
-            maximum_timestamp: 1698913802000,
-          },
-        ];
-      }),
-    },
-  };
-});
-jest.mock('../../../services/index_stats', () => {
-  return {
-    indexStatsService: {
-      getIndicesDocCounts: jest.fn().mockImplementation(() => {
-        return {
-          docsCountPerDataStream: {
-            'logs-elastic_agent-default': 100,
-            'logs-elastic_agent.filebeat-default': 200,
-            'logs-elastic_agent.fleet_server-default': 0,
-            'logs-elastic_agent.metricbeat-default': 245,
-          },
-        };
-      }),
-    },
-  };
-});
-
-const dataStream = 'logs-nginx.access-default';
-
-describe('getDataStreams', () => {
-  it('Passes the correct parameters to the DataStreamService', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    await getDataStreamsStats({
-      esClient: esClientMock,
-      dataStreams: [dataStream],
-    });
-    expect(dataStreamService.getStreamsStats).toHaveBeenCalledWith(expect.anything(), [dataStream]);
-  });
-
-  it('returns an empty list when no dataStreams are provided', async () => {
-    jest.clearAllMocks();
-
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    const results = await getDataStreamsStats({
-      esClient: esClientMock,
-      dataStreams: [],
-    });
-    expect(dataStreamService.getStreamsStats).not.toHaveBeenCalled();
-    expect(results.items).toEqual([]);
-  });
-
-  it('Formats the items correctly', async () => {
-    const esClientMock = elasticsearchServiceMock.createElasticsearchClient();
-    const results = await getDataStreamsStats({
-      esClient: esClientMock,
-      dataStreams: [
-        'logs-elastic_agent-default',
-        'logs-elastic_agent.filebeat-default',
-        'logs-elastic_agent.fleet_server-default',
-        'logs-elastic_agent.metricbeat-default',
-        'logs-test.test-default',
-      ],
-    });
-    expect(results.items.sort()).toEqual([
-      {
-        name: 'logs-elastic_agent-default',
-        size: '1gb',
-        sizeBytes: 1170805528,
-        lastActivity: 1698916071000,
-        totalDocs: 100,
-      },
-      {
-        name: 'logs-elastic_agent.filebeat-default',
-        size: '1.3mb',
-        sizeBytes: 1459100,
-        lastActivity: 1698902209996,
-        totalDocs: 200,
-      },
-      {
-        name: 'logs-elastic_agent.fleet_server-default',
-        size: '2.9mb',
-        sizeBytes: 3052148,
-        lastActivity: 1698914110010,
-        totalDocs: 0,
-      },
-      {
-        name: 'logs-elastic_agent.metricbeat-default',
-        size: '1.6mb',
-        sizeBytes: 1704807,
-        lastActivity: 1698672046707,
-        totalDocs: 245,
-      },
-      {
-        name: 'logs-test.test-default',
-        size: '6.2mb',
-        sizeBytes: 6570447,
-        lastActivity: 1698913802000,
-        totalDocs: 0,
-      },
-    ]);
-  });
-});
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/index.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/index.ts
index 41f89fa7ac156..8c7878f244862 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/index.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/data_streams/get_data_streams_stats/index.ts
@@ -24,7 +24,7 @@ export async function getDataStreamsStats({
     };
   }
 
-  const matchingDataStreamsStats = await dataStreamService.getStreamsStats(esClient, dataStreams);
+  const matchingDataStreamsStats = dataStreamService.getStreamsStats(esClient, dataStreams);
 
   const indicesDocsCount = sizeStatsAvailable
     ? indexStatsService.getIndicesDocCounts(esClient, dataStreams)
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/get_integrations.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/get_integrations.ts
index 70aa86f08efc3..208ed7e70ab32 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/get_integrations.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/get_integrations.ts
@@ -11,13 +11,13 @@ import { PackageNotFoundError } from '@kbn/fleet-plugin/server/errors';
 import { PackageListItem, RegistryDataStream } from '@kbn/fleet-plugin/common';
 import { DEFAULT_DATASET_TYPE } from '../../../common/constants';
 import { DataStreamType } from '../../../common/types';
-import { Integration } from '../../../common/api_types';
+import { IntegrationType } from '../../../common/api_types';
 
 export async function getIntegrations(options: {
   packageClient: PackageClient;
   logger: Logger;
   type?: DataStreamType;
-}): Promise<Integration[]> {
+}): Promise<IntegrationType[]> {
   const { packageClient, logger, type = DEFAULT_DATASET_TYPE } = options;
 
   const packages = await packageClient.getPackages();
diff --git a/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/routes.ts b/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/routes.ts
index dfc0b8a2824e3..1a21d7e1a14c4 100644
--- a/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/routes.ts
+++ b/x-pack/plugins/observability_solution/dataset_quality/server/routes/integrations/routes.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { Integration, IntegrationDashboards } from '../../../common/api_types';
+import { IntegrationType, IntegrationDashboardsResponse } from '../../../common/api_types';
 import { typeRt } from '../../types/default_api_types';
 import { createDatasetQualityServerRoute } from '../create_datasets_quality_server_route';
 import { getIntegrations } from './get_integrations';
@@ -21,7 +21,7 @@ const integrationsRoute = createDatasetQualityServerRoute({
     tags: [],
   },
   async handler(resources): Promise<{
-    integrations: Integration[];
+    integrations: IntegrationType[];
   }> {
     const { params, plugins, logger } = resources;
 
@@ -44,7 +44,7 @@ const integrationDashboardsRoute = createDatasetQualityServerRoute({
   options: {
     tags: [],
   },
-  async handler(resources): Promise<IntegrationDashboards> {
+  async handler(resources): Promise<IntegrationDashboardsResponse> {
     const { context, params, plugins } = resources;
     const { integration } = params.path;
     const { savedObjects } = await context.core;
diff --git a/x-pack/plugins/observability_solution/entity_manager/common/constants_entities.ts b/x-pack/plugins/observability_solution/entity_manager/common/constants_entities.ts
index d03084ed875ef..9892c757fad3d 100644
--- a/x-pack/plugins/observability_solution/entity_manager/common/constants_entities.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/common/constants_entities.ts
@@ -5,17 +5,48 @@
  * 2.0.
  */
 
-export const ENTITY_VERSION = 'v1';
-export const ENTITY_BASE_PREFIX = '.entities-observability';
-export const ENTITY_HISTORY_BASE_PREFIX = `${ENTITY_BASE_PREFIX}.history-${ENTITY_VERSION}`;
-export const ENTITY_LATEST_BASE_PREFIX = `${ENTITY_BASE_PREFIX}.latest-${ENTITY_VERSION}`;
-export const ENTITY_HISTORY_TRANSFORM_PREFIX = `entity-history-${ENTITY_VERSION}`;
-export const ENTITY_LATEST_TRANSFORM_PREFIX = `entity-latest-${ENTITY_VERSION}`;
+// Base constants
+export const ENTITY_BASE_PREFIX = 'entities';
+export const ENTITY_SCHEMA_VERSION_V1 = 'v1';
+export const ENTITY_INDEX_PREFIX = `.${ENTITY_BASE_PREFIX}` as const;
+export const ENTITY_INDICES_PATTERN = `${ENTITY_INDEX_PREFIX}*` as const;
+
+export const ENTITY_ENTITY_COMPONENT_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_entity` as const;
+export const ENTITY_EVENT_COMPONENT_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_event` as const;
+
+// History constants
+export const ENTITY_HISTORY = 'history' as const;
+export const ENTITY_HISTORY_INDEX_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_${ENTITY_HISTORY}_index_template` as const;
+export const ENTITY_HISTORY_BASE_COMPONENT_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_${ENTITY_HISTORY}_base` as const;
+export const ENTITY_HISTORY_PREFIX_V1 =
+  `${ENTITY_BASE_PREFIX}-${ENTITY_SCHEMA_VERSION_V1}-${ENTITY_HISTORY}` as const;
+export const ENTITY_HISTORY_INDEX_PREFIX_V1 =
+  `${ENTITY_INDEX_PREFIX}.${ENTITY_SCHEMA_VERSION_V1}.${ENTITY_HISTORY}` as const;
+
+// Latest constants
+export const ENTITY_LATEST = 'latest' as const;
+export const ENTITY_LATEST_INDEX_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_${ENTITY_LATEST}_index_template` as const;
+export const ENTITY_LATEST_BASE_COMPONENT_TEMPLATE_V1 =
+  `${ENTITY_BASE_PREFIX}_${ENTITY_SCHEMA_VERSION_V1}_${ENTITY_LATEST}_base` as const;
+export const ENTITY_LATEST_PREFIX_V1 =
+  `${ENTITY_BASE_PREFIX}-${ENTITY_SCHEMA_VERSION_V1}-${ENTITY_LATEST}` as const;
+export const ENTITY_LATEST_INDEX_PREFIX_V1 =
+  `${ENTITY_INDEX_PREFIX}.${ENTITY_SCHEMA_VERSION_V1}.${ENTITY_LATEST}` as const;
+
+// Transform constants
 export const ENTITY_DEFAULT_HISTORY_FREQUENCY = '1m';
 export const ENTITY_DEFAULT_HISTORY_SYNC_DELAY = '60s';
 export const ENTITY_DEFAULT_LATEST_FREQUENCY = '30s';
 export const ENTITY_DEFAULT_LATEST_SYNC_DELAY = '1s';
 export const ENTITY_DEFAULT_METADATA_LIMIT = 1000;
+
+// API route constants
 export const ENTITY_API_PREFIX = '/api/entities';
 export const ENTITY_INTERNAL_API_PREFIX = '/internal/api/entities';
-export const MANAGED_ENTITY_ENABLEMENT_ROUTE = `${ENTITY_INTERNAL_API_PREFIX}/managed/enablement`;
+export const MANAGED_ENTITY_ENABLEMENT_ROUTE =
+  `${ENTITY_INTERNAL_API_PREFIX}/managed/enablement` as const;
diff --git a/x-pack/plugins/observability_solution/entity_manager/kibana.jsonc b/x-pack/plugins/observability_solution/entity_manager/kibana.jsonc
index b13c51630469e..1b9a56cd77da5 100644
--- a/x-pack/plugins/observability_solution/entity_manager/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/entity_manager/kibana.jsonc
@@ -5,20 +5,10 @@
   "description": "Entity manager plugin for entity assets (inventory, topology, etc)",
   "plugin": {
     "id": "entityManager",
-    "configPath": [
-      "xpack",
-      "entityManager"
-    ],
-    "optionalPlugins": [
-      "spaces"
-    ],
-    "requiredPlugins": [
-      "security",
-      "encryptedSavedObjects",
-    ],
+    "configPath": ["xpack", "entityManager"],
+    "requiredPlugins": ["security", "encryptedSavedObjects"],
     "browser": true,
     "server": true,
-    "requiredBundles": [
-    ]
+    "requiredBundles": []
   }
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/public/index.ts b/x-pack/plugins/observability_solution/entity_manager/public/index.ts
index e17edb959595d..e8b77529c2eac 100644
--- a/x-pack/plugins/observability_solution/entity_manager/public/index.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/public/index.ts
@@ -18,3 +18,12 @@ export const plugin: PluginInitializer<
 
 export type { EntityManagerPublicPluginSetup, EntityManagerPublicPluginStart };
 export type EntityManagerAppId = 'entityManager';
+
+export {
+  ERROR_API_KEY_NOT_FOUND,
+  ERROR_API_KEY_NOT_VALID,
+  ERROR_USER_NOT_AUTHORIZED,
+  ERROR_API_KEY_SERVICE_DISABLED,
+  ERROR_PARTIAL_BUILTIN_INSTALLATION,
+  ERROR_DEFINITION_STOPPED,
+} from '../common/errors';
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/auth/privileges.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/auth/privileges.ts
index 453e0935e4fb4..00f09209fb3b6 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/auth/privileges.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/auth/privileges.ts
@@ -6,18 +6,18 @@
  */
 
 import { ElasticsearchClient } from '@kbn/core/server';
-import { ENTITY_BASE_PREFIX } from '../../../common/constants_entities';
+import { ENTITY_INDICES_PATTERN } from '../../../common/constants_entities';
 import { BUILT_IN_ALLOWED_INDICES } from '../entities/built_in/constants';
 
 export const requiredRunTimePrivileges = {
   // all of
   index: [
     {
-      names: [`${ENTITY_BASE_PREFIX}*`],
+      names: [ENTITY_INDICES_PATTERN],
       privileges: ['create_index', 'index', 'create_doc', 'auto_configure', 'read'],
     },
     {
-      names: [...BUILT_IN_ALLOWED_INDICES, `${ENTITY_BASE_PREFIX}*`],
+      names: [...BUILT_IN_ALLOWED_INDICES, ENTITY_INDICES_PATTERN],
       privileges: ['read', 'view_index_metadata'],
     },
   ],
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/built_in/services.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/built_in/services.ts
index 916fef586e4d5..29d501de8312f 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/built_in/services.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/built_in/services.ts
@@ -10,6 +10,7 @@ import { BUILT_IN_ID_PREFIX } from './constants';
 
 export const builtInServicesEntityDefinition: EntityDefinition = entityDefinitionSchema.parse({
   id: `${BUILT_IN_ID_PREFIX}services`,
+  version: '0.1.0',
   name: 'Services from logs',
   type: 'service',
   managed: true,
@@ -24,6 +25,7 @@ export const builtInServicesEntityDefinition: EntityDefinition = entityDefinitio
   identityFields: ['service.name', { field: 'service.environment', optional: true }],
   displayNameTemplate: '{{service.name}}{{#service.environment}}:{{.}}{{/service.environment}}',
   metadata: [
+    { source: '_index', destination: 'sourceIndex' },
     'data_stream.type',
     'service.instance.id',
     'service.namespace',
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/create_and_install_ingest_pipeline.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/create_and_install_ingest_pipeline.ts
index c6fbc127230a6..360f416cd5a00 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/create_and_install_ingest_pipeline.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/create_and_install_ingest_pipeline.ts
@@ -7,26 +7,31 @@
 
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
+import {
+  generateHistoryIngestPipelineId,
+  generateLatestIngestPipelineId,
+} from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
-import { generateLatestProcessors } from './ingest_pipeline/generate_latest_processors';
-import { generateLatestIngestPipelineId } from './ingest_pipeline/generate_latest_ingest_pipeline_id';
 import { generateHistoryProcessors } from './ingest_pipeline/generate_history_processors';
-import { generateHistoryIngestPipelineId } from './ingest_pipeline/generate_history_ingest_pipeline_id';
+import { generateLatestProcessors } from './ingest_pipeline/generate_latest_processors';
 
 export async function createAndInstallHistoryIngestPipeline(
   esClient: ElasticsearchClient,
   definition: EntityDefinition,
-  logger: Logger,
-  spaceId: string
+  logger: Logger
 ) {
   try {
-    const historyProcessors = generateHistoryProcessors(definition, spaceId);
+    const historyProcessors = generateHistoryProcessors(definition);
     const historyId = generateHistoryIngestPipelineId(definition);
     await retryTransientEsErrors(
       () =>
         esClient.ingest.putPipeline({
           id: historyId,
           processors: historyProcessors,
+          _meta: {
+            definitionVersion: definition.version,
+            managed: definition.managed,
+          },
         }),
       { logger }
     );
@@ -40,17 +45,20 @@ export async function createAndInstallHistoryIngestPipeline(
 export async function createAndInstallLatestIngestPipeline(
   esClient: ElasticsearchClient,
   definition: EntityDefinition,
-  logger: Logger,
-  spaceId: string
+  logger: Logger
 ) {
   try {
-    const latestProcessors = generateLatestProcessors(definition, spaceId);
+    const latestProcessors = generateLatestProcessors(definition);
     const latestId = generateLatestIngestPipelineId(definition);
     await retryTransientEsErrors(
       () =>
         esClient.ingest.putPipeline({
           id: latestId,
           processors: latestProcessors,
+          _meta: {
+            definitionVersion: definition.version,
+            managed: definition.managed,
+          },
         }),
       { logger }
     );
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_index.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_index.ts
index dec1ef3b585dc..a371962833de6 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_index.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_index.ts
@@ -7,7 +7,7 @@
 
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
-import { generateHistoryIndexName, generateLatestIndexName } from './helpers/generate_index_name';
+import { generateHistoryIndexName, generateLatestIndexName } from './helpers/generate_component_id';
 
 export async function deleteIndices(
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_ingest_pipeline.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_ingest_pipeline.ts
index 80fa96b8109ef..c1516e342ac1d 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_ingest_pipeline.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/delete_ingest_pipeline.ts
@@ -7,9 +7,11 @@
 
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
+import {
+  generateHistoryIngestPipelineId,
+  generateLatestIngestPipelineId,
+} from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
-import { generateLatestIngestPipelineId } from './ingest_pipeline/generate_latest_ingest_pipeline_id';
-import { generateHistoryIngestPipelineId } from './ingest_pipeline/generate_history_ingest_pipeline_id';
 
 export async function deleteHistoryIngestPipeline(
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_too_long_error.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_invalid.ts
similarity index 75%
rename from x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_too_long_error.ts
rename to x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_invalid.ts
index fb78f237bee37..4d6110f661aa0 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_too_long_error.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/errors/entity_definition_id_invalid.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
-export class EntityDefinitionIdTooLong extends Error {
+export class EntityDefinitionIdInvalid extends Error {
   constructor(message: string) {
     super(message);
-    this.name = 'EntityDefinitionIdTooLong';
+    this.name = 'EntityDefinitionIdInvalid';
   }
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/find_entity_definition.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/find_entity_definition.ts
index fbca1362491a5..ccc28db103153 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/find_entity_definition.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/find_entity_definition.ts
@@ -9,10 +9,12 @@ import { compact } from 'lodash';
 import { ElasticsearchClient, SavedObjectsClientContract } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
 import { SO_ENTITY_DEFINITION_TYPE } from '../../saved_objects';
-import { generateHistoryIngestPipelineId } from './ingest_pipeline/generate_history_ingest_pipeline_id';
-import { generateLatestIngestPipelineId } from './ingest_pipeline/generate_latest_ingest_pipeline_id';
-import { generateHistoryTransformId } from './transform/generate_history_transform_id';
-import { generateLatestTransformId } from './transform/generate_latest_transform_id';
+import {
+  generateHistoryTransformId,
+  generateHistoryIngestPipelineId,
+  generateLatestTransformId,
+  generateLatestIngestPipelineId,
+} from './helpers/generate_component_id';
 import { BUILT_IN_ID_PREFIX } from './built_in';
 import { EntityDefinitionWithState } from './types';
 
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/fixtures/entity_definition.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/fixtures/entity_definition.ts
index d284e0a2b1a68..137560df13385 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/fixtures/entity_definition.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/fixtures/entity_definition.ts
@@ -8,6 +8,7 @@
 import { entityDefinitionSchema } from '@kbn/entities-schema';
 export const entityDefinition = entityDefinitionSchema.parse({
   id: 'admin-console-services',
+  version: '999.999.999',
   name: 'Services for Admin Console',
   type: 'service',
   indexPatterns: ['kbn-data-forge-fake_stack.*'],
@@ -17,7 +18,7 @@ export const entityDefinition = entityDefinitionSchema.parse({
   },
   identityFields: ['log.logger', { field: 'event.category', optional: true }],
   displayNameTemplate: '{{log.logger}}{{#event.category}}:{{.}}{{/event.category}}',
-  metadata: ['tags', 'host.name', 'host.os.name'],
+  metadata: ['tags', 'host.name', 'host.os.name', { source: '_index', destination: 'sourceIndex' }],
   metrics: [
     {
       name: 'logRate',
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_component_id.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_component_id.ts
new file mode 100644
index 0000000000000..c41aae4f21347
--- /dev/null
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_component_id.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EntityDefinition } from '@kbn/entities-schema';
+import {
+  ENTITY_HISTORY_INDEX_PREFIX_V1,
+  ENTITY_HISTORY_PREFIX_V1,
+  ENTITY_LATEST_INDEX_PREFIX_V1,
+  ENTITY_LATEST_PREFIX_V1,
+} from '../../../../common/constants_entities';
+
+// History
+function generateHistoryId(definition: EntityDefinition) {
+  return `${ENTITY_HISTORY_PREFIX_V1}-${definition.id}`;
+}
+
+export const generateHistoryTransformId = generateHistoryId;
+export const generateHistoryIngestPipelineId = generateHistoryId;
+
+export function generateHistoryIndexName(definition: EntityDefinition) {
+  return `${ENTITY_HISTORY_INDEX_PREFIX_V1}.${definition.id}`;
+}
+
+// Latest
+function generateLatestId(definition: EntityDefinition) {
+  return `${ENTITY_LATEST_PREFIX_V1}-${definition.id}`;
+}
+
+export const generateLatestTransformId = generateLatestId;
+export const generateLatestIngestPipelineId = generateLatestId;
+
+export function generateLatestIndexName(definition: EntityDefinition) {
+  return `${ENTITY_LATEST_INDEX_PREFIX_V1}.${definition.id}`;
+}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_index_name.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_index_name.ts
deleted file mode 100644
index 151ebe75c7065..0000000000000
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/helpers/generate_index_name.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EntityDefinition } from '@kbn/entities-schema';
-import {
-  ENTITY_HISTORY_BASE_PREFIX,
-  ENTITY_LATEST_BASE_PREFIX,
-} from '../../../../common/constants_entities';
-
-export function generateLatestIndexName(definition: EntityDefinition) {
-  return `${ENTITY_LATEST_BASE_PREFIX}.${definition.id}`;
-}
-
-export function generateHistoryIndexName(definition: EntityDefinition) {
-  return `${ENTITY_HISTORY_BASE_PREFIX}.${definition.id}`;
-}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_history_processors.test.ts.snap b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_history_processors.test.ts.snap
index 361807a707713..eb74937a7e8c8 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_history_processors.test.ts.snap
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_history_processors.test.ts.snap
@@ -16,14 +16,20 @@ Array [
   },
   Object {
     "set": Object {
-      "field": "entity.spaceId",
-      "value": "default",
+      "field": "entity.definitionId",
+      "value": "admin-console-services",
     },
   },
   Object {
     "set": Object {
-      "field": "entity.definitionId",
-      "value": "admin-console-services",
+      "field": "entity.definitionVersion",
+      "value": "999.999.999",
+    },
+  },
+  Object {
+    "set": Object {
+      "field": "entity.schemaVersion",
+      "value": "v1",
     },
   },
   Object {
@@ -97,6 +103,9 @@ if (ctx.entity?.metadata?.host?.os?.name != null) {
  if(ctx.host.os == null)  ctx[\\"host\\"][\\"os\\"] = new HashMap();
   ctx[\\"host\\"][\\"os\\"][\\"name\\"] = ctx.entity.metadata.host.os.name.keySet();
 }
+if (ctx.entity?.metadata?.sourceIndex != null) {
+  ctx[\\"sourceIndex\\"] = ctx.entity.metadata.sourceIndex.keySet();
+}
 ",
     },
   },
@@ -115,7 +124,7 @@ if (ctx.entity?.metadata?.host?.os?.name != null) {
       ],
       "date_rounding": "M",
       "field": "@timestamp",
-      "index_name_prefix": ".entities-observability.history-v1.admin-console-services.default.",
+      "index_name_prefix": ".entities.v1.history.admin-console-services.",
     },
   },
 ]
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_latest_processors.test.ts.snap b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_latest_processors.test.ts.snap
index afd85802323e9..c66bd8337da47 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_latest_processors.test.ts.snap
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/__snapshots__/generate_latest_processors.test.ts.snap
@@ -16,14 +16,20 @@ Array [
   },
   Object {
     "set": Object {
-      "field": "entity.spaceId",
-      "value": "default",
+      "field": "entity.definitionId",
+      "value": "admin-console-services",
     },
   },
   Object {
     "set": Object {
-      "field": "entity.definitionId",
-      "value": "admin-console-services",
+      "field": "entity.definitionVersion",
+      "value": "999.999.999",
+    },
+  },
+  Object {
+    "set": Object {
+      "field": "entity.schemaVersion",
+      "value": "v1",
     },
   },
   Object {
@@ -40,6 +46,9 @@ if (ctx.entity?.metadata?.host?.os?.name.data != null) {
  if(ctx.host.os == null)  ctx[\\"host\\"][\\"os\\"] = new HashMap();
   ctx[\\"host\\"][\\"os\\"][\\"name\\"] = ctx.entity.metadata.host.os.name.data.keySet();
 }
+if (ctx.entity?.metadata?.sourceIndex.data != null) {
+  ctx[\\"sourceIndex\\"] = ctx.entity.metadata.sourceIndex.data.keySet();
+}
 ",
     },
   },
@@ -52,7 +61,7 @@ if (ctx.entity?.metadata?.host?.os?.name.data != null) {
   Object {
     "set": Object {
       "field": "_index",
-      "value": ".entities-observability.latest-v1.admin-console-services.default",
+      "value": ".entities.v1.latest.admin-console-services",
     },
   },
 ]
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_ingest_pipeline_id.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_ingest_pipeline_id.ts
deleted file mode 100644
index 103e0950d58ff..0000000000000
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_ingest_pipeline_id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EntityDefinition } from '@kbn/entities-schema';
-import { ENTITY_HISTORY_BASE_PREFIX } from '../../../../common/constants_entities';
-
-export function generateHistoryIngestPipelineId(definition: EntityDefinition) {
-  return `${ENTITY_HISTORY_BASE_PREFIX}.${definition.id}`;
-}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.test.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.test.ts
index 8203d06c1f8ed..697b3a5223f9f 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.test.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.test.ts
@@ -10,7 +10,7 @@ import { generateHistoryProcessors } from './generate_history_processors';
 
 describe('generateHistoryProcessors(definition)', () => {
   it('should genearte a valid pipeline', () => {
-    const processors = generateHistoryProcessors(entityDefinition, 'default');
+    const processors = generateHistoryProcessors(entityDefinition);
     expect(processors).toMatchSnapshot();
   });
 });
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.ts
index a915f7f161ecc..b273be780910b 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_history_processors.ts
@@ -6,7 +6,8 @@
  */
 
 import { EntityDefinition } from '@kbn/entities-schema';
-import { generateHistoryIndexName } from '../helpers/generate_index_name';
+import { ENTITY_SCHEMA_VERSION_V1 } from '../../../../common/constants_entities';
+import { generateHistoryIndexName } from '../helpers/generate_component_id';
 
 function createIdTemplate(definition: EntityDefinition) {
   return definition.identityFields.reduce((template, id) => {
@@ -14,13 +15,13 @@ function createIdTemplate(definition: EntityDefinition) {
   }, definition.displayNameTemplate);
 }
 
-function mapDestinationToPainless(destination: string, source: string) {
+function mapDestinationToPainless(destination: string) {
   const fieldParts = destination.split('.');
   return fieldParts.reduce((acc, _part, currentIndex, parts) => {
     if (currentIndex + 1 === parts.length) {
       return `${acc}\n  ctx${parts
         .map((s) => `["${s}"]`)
-        .join('')} = ctx.entity.metadata.${source}.keySet();`;
+        .join('')} = ctx.entity.metadata.${destination}.keySet();`;
     }
     return `${acc}\n if(ctx.${parts.slice(0, currentIndex + 1).join('.')} == null)  ctx${parts
       .slice(0, currentIndex + 1)
@@ -34,16 +35,15 @@ function createMetadataPainlessScript(definition: EntityDefinition) {
     return '';
   }
   return definition.metadata.reduce((script, def) => {
-    const source = def.source;
     const destination = def.destination || def.source;
-    return `${script}if (ctx.entity?.metadata?.${source.replaceAll(
+    return `${script}if (ctx.entity?.metadata?.${destination.replaceAll(
       '.',
       '?.'
-    )} != null) {${mapDestinationToPainless(destination, source)}\n}\n`;
+    )} != null) {${mapDestinationToPainless(destination)}\n}\n`;
   }, '');
 }
 
-export function generateHistoryProcessors(definition: EntityDefinition, spaceId: string) {
+export function generateHistoryProcessors(definition: EntityDefinition) {
   return [
     {
       set: {
@@ -59,14 +59,20 @@ export function generateHistoryProcessors(definition: EntityDefinition, spaceId:
     },
     {
       set: {
-        field: 'entity.spaceId',
-        value: spaceId,
+        field: 'entity.definitionId',
+        value: definition.id,
       },
     },
     {
       set: {
-        field: 'entity.definitionId',
-        value: definition.id,
+        field: 'entity.definitionVersion',
+        value: definition.version,
+      },
+    },
+    {
+      set: {
+        field: 'entity.schemaVersion',
+        value: ENTITY_SCHEMA_VERSION_V1,
       },
     },
     {
@@ -141,7 +147,7 @@ export function generateHistoryProcessors(definition: EntityDefinition, spaceId:
     {
       date_index_name: {
         field: '@timestamp',
-        index_name_prefix: `${generateHistoryIndexName(definition)}.${spaceId}.`,
+        index_name_prefix: `${generateHistoryIndexName(definition)}.`,
         date_rounding: 'M',
         date_formats: ['UNIX_MS', 'ISO8601', "yyyy-MM-dd'T'HH:mm:ss.SSSXX"],
       },
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_ingest_pipeline_id.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_ingest_pipeline_id.ts
deleted file mode 100644
index 27ed87dcfb84d..0000000000000
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_ingest_pipeline_id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EntityDefinition } from '@kbn/entities-schema';
-import { ENTITY_LATEST_BASE_PREFIX } from '../../../../common/constants_entities';
-
-export function generateLatestIngestPipelineId(definition: EntityDefinition) {
-  return `${ENTITY_LATEST_BASE_PREFIX}.${definition.id}`;
-}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.test.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.test.ts
index 63cab821b472a..b6a10ce3db347 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.test.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.test.ts
@@ -10,7 +10,7 @@ import { generateLatestProcessors } from './generate_latest_processors';
 
 describe('generateLatestProcessors(definition)', () => {
   it('should genearte a valid pipeline', () => {
-    const processors = generateLatestProcessors(entityDefinition, 'default');
+    const processors = generateLatestProcessors(entityDefinition);
     expect(processors).toMatchSnapshot();
   });
 });
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.ts
index b4a78a9cd17dd..056fb043ab05c 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/ingest_pipeline/generate_latest_processors.ts
@@ -6,15 +6,16 @@
  */
 
 import { EntityDefinition } from '@kbn/entities-schema';
-import { generateLatestIndexName } from '../helpers/generate_index_name';
+import { ENTITY_SCHEMA_VERSION_V1 } from '../../../../common/constants_entities';
+import { generateLatestIndexName } from '../helpers/generate_component_id';
 
-function mapDestinationToPainless(destination: string, source: string) {
+function mapDestinationToPainless(destination: string) {
   const fieldParts = destination.split('.');
   return fieldParts.reduce((acc, _part, currentIndex, parts) => {
     if (currentIndex + 1 === parts.length) {
       return `${acc}\n  ctx${parts
         .map((s) => `["${s}"]`)
-        .join('')} = ctx.entity.metadata.${source}.data.keySet();`;
+        .join('')} = ctx.entity.metadata.${destination}.data.keySet();`;
     }
     return `${acc}\n if(ctx.${parts.slice(0, currentIndex + 1).join('.')} == null)  ctx${parts
       .slice(0, currentIndex + 1)
@@ -28,16 +29,15 @@ function createMetadataPainlessScript(definition: EntityDefinition) {
     return '';
   }
   return definition.metadata.reduce((script, def) => {
-    const source = def.source;
     const destination = def.destination || def.source;
-    return `${script}if (ctx.entity?.metadata?.${source.replaceAll(
+    return `${script}if (ctx.entity?.metadata?.${destination.replaceAll(
       '.',
       '?.'
-    )}.data != null) {${mapDestinationToPainless(destination, source)}\n}\n`;
+    )}.data != null) {${mapDestinationToPainless(destination)}\n}\n`;
   }, '');
 }
 
-export function generateLatestProcessors(definition: EntityDefinition, spaceId: string) {
+export function generateLatestProcessors(definition: EntityDefinition) {
   return [
     {
       set: {
@@ -53,14 +53,20 @@ export function generateLatestProcessors(definition: EntityDefinition, spaceId:
     },
     {
       set: {
-        field: 'entity.spaceId',
-        value: spaceId,
+        field: 'entity.definitionId',
+        value: definition.id,
       },
     },
     {
       set: {
-        field: 'entity.definitionId',
-        value: definition.id,
+        field: 'entity.definitionVersion',
+        value: definition.version,
+      },
+    },
+    {
+      set: {
+        field: 'entity.schemaVersion',
+        value: ENTITY_SCHEMA_VERSION_V1,
       },
     },
     ...(definition.staticFields != null
@@ -80,7 +86,7 @@ export function generateLatestProcessors(definition: EntityDefinition, spaceId:
     {
       set: {
         field: '_index',
-        value: `${generateLatestIndexName(definition)}.${spaceId}`,
+        value: `${generateLatestIndexName(definition)}`,
       },
     },
   ];
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.test.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.test.ts
index 02de8754e6afc..7df61543f227f 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.test.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.test.ts
@@ -14,12 +14,14 @@ import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import { installBuiltInEntityDefinitions } from './install_entity_definition';
 import { builtInServicesEntityDefinition } from './built_in/services';
 import { SO_ENTITY_DEFINITION_TYPE } from '../../saved_objects';
-import { generateHistoryIngestPipelineId } from './ingest_pipeline/generate_history_ingest_pipeline_id';
-import { generateLatestIngestPipelineId } from './ingest_pipeline/generate_latest_ingest_pipeline_id';
+import {
+  generateHistoryIngestPipelineId,
+  generateHistoryTransformId,
+  generateLatestIngestPipelineId,
+  generateLatestTransformId,
+} from './helpers/generate_component_id';
 import { generateHistoryTransform } from './transform/generate_history_transform';
 import { generateLatestTransform } from './transform/generate_latest_transform';
-import { generateHistoryTransformId } from './transform/generate_history_transform_id';
-import { generateLatestTransformId } from './transform/generate_latest_transform_id';
 
 const assertHasCreatedDefinition = (
   definition: EntityDefinition,
@@ -36,10 +38,18 @@ const assertHasCreatedDefinition = (
   expect(esClient.ingest.putPipeline).toBeCalledWith({
     id: generateHistoryIngestPipelineId(builtInServicesEntityDefinition),
     processors: expect.anything(),
+    _meta: {
+      definitionVersion: '0.1.0',
+      managed: true,
+    },
   });
   expect(esClient.ingest.putPipeline).toBeCalledWith({
     id: generateLatestIngestPipelineId(builtInServicesEntityDefinition),
     processors: expect.anything(),
+    _meta: {
+      definitionVersion: '0.1.0',
+      managed: true,
+    },
   });
 
   expect(esClient.transform.putTransform).toBeCalledTimes(2);
@@ -116,7 +126,6 @@ describe('install_entity_definition', () => {
         soClient,
         builtInDefinitions,
         logger: loggerMock.create(),
-        spaceId: 'default',
       });
 
       assertHasCreatedDefinition(builtInServicesEntityDefinition, soClient, esClient);
@@ -159,7 +168,6 @@ describe('install_entity_definition', () => {
         soClient,
         builtInDefinitions,
         logger: loggerMock.create(),
-        spaceId: 'default',
       });
 
       assertHasUninstalledDefinition(builtInServicesEntityDefinition, soClient, esClient);
@@ -200,7 +208,6 @@ describe('install_entity_definition', () => {
         soClient,
         builtInDefinitions,
         logger: loggerMock.create(),
-        spaceId: 'default',
       });
 
       expect(soClient.create).toHaveBeenCalledTimes(0);
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts
index 4f3c64dc53d34..980c743575fe2 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/install_entity_definition.ts
@@ -34,7 +34,6 @@ export interface InstallDefinitionParams {
   soClient: SavedObjectsClientContract;
   definition: EntityDefinition;
   logger: Logger;
-  spaceId: string;
 }
 
 export async function installEntityDefinition({
@@ -42,7 +41,6 @@ export async function installEntityDefinition({
   soClient,
   definition,
   logger,
-  spaceId,
 }: InstallDefinitionParams): Promise<EntityDefinition> {
   const installState = {
     ingestPipelines: {
@@ -57,7 +55,7 @@ export async function installEntityDefinition({
   };
 
   try {
-    logger.debug(`Installing definition ${JSON.stringify(definition)}`);
+    logger.debug(() => `Installing definition ${JSON.stringify(definition)}`);
 
     validateDefinitionCanCreateValidTransformIds(definition);
 
@@ -66,9 +64,9 @@ export async function installEntityDefinition({
 
     // install ingest pipelines
     logger.debug(`Installing ingest pipelines for definition ${definition.id}`);
-    await createAndInstallHistoryIngestPipeline(esClient, entityDefinition, logger, spaceId);
+    await createAndInstallHistoryIngestPipeline(esClient, entityDefinition, logger);
     installState.ingestPipelines.history = true;
-    await createAndInstallLatestIngestPipeline(esClient, entityDefinition, logger, spaceId);
+    await createAndInstallLatestIngestPipeline(esClient, entityDefinition, logger);
     installState.ingestPipelines.latest = true;
 
     // install transforms
@@ -110,7 +108,6 @@ export async function installBuiltInEntityDefinitions({
   soClient,
   logger,
   builtInDefinitions,
-  spaceId,
 }: Omit<InstallDefinitionParams, 'definition'> & {
   builtInDefinitions: EntityDefinition[];
 }): Promise<EntityDefinition[]> {
@@ -130,7 +127,6 @@ export async function installBuiltInEntityDefinitions({
         esClient,
         soClient,
         logger,
-        spaceId,
       });
     }
 
@@ -144,7 +140,6 @@ export async function installBuiltInEntityDefinitions({
         esClient,
         soClient,
         logger,
-        spaceId,
       });
     }
 
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/start_transform.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/start_transform.ts
index 0ded4adf39436..7de64394fabee 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/start_transform.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/start_transform.ts
@@ -7,9 +7,11 @@
 
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
+import {
+  generateHistoryTransformId,
+  generateLatestTransformId,
+} from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
-import { generateLatestTransformId } from './transform/generate_latest_transform_id';
-import { generateHistoryTransformId } from './transform/generate_history_transform_id';
 
 export async function startTransform(
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_and_delete_transform.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_and_delete_transform.ts
index 23d05d3f736e0..2b978217fdf98 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_and_delete_transform.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/stop_and_delete_transform.ts
@@ -7,9 +7,11 @@
 
 import { ElasticsearchClient, Logger } from '@kbn/core/server';
 import { EntityDefinition } from '@kbn/entities-schema';
+import {
+  generateHistoryTransformId,
+  generateLatestTransformId,
+} from './helpers/generate_component_id';
 import { retryTransientEsErrors } from './helpers/retry';
-import { generateLatestTransformId } from './transform/generate_latest_transform_id';
-import { generateHistoryTransformId } from './transform/generate_history_transform_id';
 
 export async function stopAndDeleteHistoryTransform(
   esClient: ElasticsearchClient,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_history_transform.test.ts.snap b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_history_transform.test.ts.snap
index e32b30a757add..722084ceb1a80 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_history_transform.test.ts.snap
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_history_transform.test.ts.snap
@@ -2,10 +2,14 @@
 
 exports[`generateHistoryTransform(definition) should generate a valid latest transform 1`] = `
 Object {
+  "_meta": Object {
+    "definitionVersion": "999.999.999",
+    "managed": false,
+  },
   "defer_validation": true,
   "dest": Object {
-    "index": ".entities-observability.history-v1.noop",
-    "pipeline": ".entities-observability.history-v1.admin-console-services",
+    "index": ".entities.v1.history.noop",
+    "pipeline": "entities-v1-history-admin-console-services",
   },
   "frequency": "1m",
   "pivot": Object {
@@ -55,6 +59,12 @@ Object {
           "size": 1000,
         },
       },
+      "entity.metadata.sourceIndex": Object {
+        "terms": Object {
+          "field": "_index",
+          "size": 1000,
+        },
+      },
       "entity.metadata.tags": Object {
         "terms": Object {
           "field": "tags",
@@ -120,6 +130,6 @@ Object {
       "field": "@timestamp",
     },
   },
-  "transform_id": "entity-history-v1-admin-console-services",
+  "transform_id": "entities-v1-history-admin-console-services",
 }
 `;
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_latest_transform.test.ts.snap b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_latest_transform.test.ts.snap
index 959c45f20d601..16a0aa7dcdcf7 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_latest_transform.test.ts.snap
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/__snapshots__/generate_latest_transform.test.ts.snap
@@ -2,10 +2,14 @@
 
 exports[`generateLatestTransform(definition) should generate a valid latest transform 1`] = `
 Object {
+  "_meta": Object {
+    "definitionVersion": "999.999.999",
+    "managed": false,
+  },
   "defer_validation": true,
   "dest": Object {
-    "index": ".entities-observability.latest-v1.admin-console-services",
-    "pipeline": ".entities-observability.latest-v1.admin-console-services",
+    "index": ".entities.v1.latest.noop",
+    "pipeline": "entities-v1-latest-admin-console-services",
   },
   "frequency": "30s",
   "pivot": Object {
@@ -82,6 +86,23 @@ Object {
           },
         },
       },
+      "entity.metadata.sourceIndex": Object {
+        "aggs": Object {
+          "data": Object {
+            "terms": Object {
+              "field": "sourceIndex",
+              "size": 1000,
+            },
+          },
+        },
+        "filter": Object {
+          "range": Object {
+            "event.ingested": Object {
+              "gte": "now-1m",
+            },
+          },
+        },
+      },
       "entity.metadata.tags": Object {
         "aggs": Object {
           "data": Object {
@@ -146,7 +167,7 @@ Object {
     "unattended": true,
   },
   "source": Object {
-    "index": ".entities-observability.history-v1.admin-console-services.*",
+    "index": ".entities.v1.history.admin-console-services.*",
   },
   "sync": Object {
     "time": Object {
@@ -154,6 +175,6 @@ Object {
       "field": "event.ingested",
     },
   },
-  "transform_id": "entity-latest-v1-admin-console-services",
+  "transform_id": "entities-v1-latest-admin-console-services",
 }
 `;
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform.ts
index 0e98040e4285f..9881d5f3a899f 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform.ts
@@ -15,11 +15,13 @@ import { generateHistoryMetricAggregations } from './generate_metric_aggregation
 import {
   ENTITY_DEFAULT_HISTORY_FREQUENCY,
   ENTITY_DEFAULT_HISTORY_SYNC_DELAY,
-  ENTITY_HISTORY_BASE_PREFIX,
 } from '../../../../common/constants_entities';
 import { generateHistoryMetadataAggregations } from './generate_metadata_aggregations';
-import { generateHistoryTransformId } from './generate_history_transform_id';
-import { generateHistoryIngestPipelineId } from '../ingest_pipeline/generate_history_ingest_pipeline_id';
+import {
+  generateHistoryTransformId,
+  generateHistoryIngestPipelineId,
+  generateHistoryIndexName,
+} from '../helpers/generate_component_id';
 
 export function generateHistoryTransform(
   definition: EntityDefinition
@@ -32,6 +34,10 @@ export function generateHistoryTransform(
 
   return {
     transform_id: generateHistoryTransformId(definition),
+    _meta: {
+      definitionVersion: definition.version,
+      managed: definition.managed,
+    },
     defer_validation: true,
     source: {
       index: definition.indexPatterns,
@@ -44,7 +50,7 @@ export function generateHistoryTransform(
       }),
     },
     dest: {
-      index: `${ENTITY_HISTORY_BASE_PREFIX}.noop`,
+      index: `${generateHistoryIndexName({ id: 'noop' } as EntityDefinition)}`,
       pipeline: generateHistoryIngestPipelineId(definition),
     },
     frequency: definition.history.settings?.frequency ?? ENTITY_DEFAULT_HISTORY_FREQUENCY,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform_id.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform_id.ts
deleted file mode 100644
index 60f48af97ada6..0000000000000
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_history_transform_id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EntityDefinition } from '@kbn/entities-schema';
-import { ENTITY_HISTORY_TRANSFORM_PREFIX } from '../../../../common/constants_entities';
-
-export function generateHistoryTransformId(definition: EntityDefinition) {
-  return `${ENTITY_HISTORY_TRANSFORM_PREFIX}-${definition.id}`;
-}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform.ts
index d7781edc3a1c7..aeb6bac9479f9 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform.ts
@@ -12,9 +12,12 @@ import {
   ENTITY_DEFAULT_LATEST_SYNC_DELAY,
 } from '../../../../common/constants_entities';
 import { generateLatestMetadataAggregations } from './generate_metadata_aggregations';
-import { generateLatestIngestPipelineId } from '../ingest_pipeline/generate_latest_ingest_pipeline_id';
-import { generateLatestTransformId } from './generate_latest_transform_id';
-import { generateHistoryIndexName, generateLatestIndexName } from '../helpers/generate_index_name';
+import {
+  generateHistoryIndexName,
+  generateLatestTransformId,
+  generateLatestIngestPipelineId,
+  generateLatestIndexName,
+} from '../helpers/generate_component_id';
 import { generateLatestMetricAggregations } from './generate_metric_aggregations';
 
 export function generateLatestTransform(
@@ -22,12 +25,16 @@ export function generateLatestTransform(
 ): TransformPutTransformRequest {
   return {
     transform_id: generateLatestTransformId(definition),
+    _meta: {
+      definitionVersion: definition.version,
+      managed: definition.managed,
+    },
     defer_validation: true,
     source: {
       index: `${generateHistoryIndexName(definition)}.*`,
     },
     dest: {
-      index: generateLatestIndexName(definition),
+      index: `${generateLatestIndexName({ id: 'noop' } as EntityDefinition)}`,
       pipeline: generateLatestIngestPipelineId(definition),
     },
     frequency: definition.latest?.settings?.frequency ?? ENTITY_DEFAULT_LATEST_FREQUENCY,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform_id.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform_id.ts
deleted file mode 100644
index 1aefc24e5ee2f..0000000000000
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/generate_latest_transform_id.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EntityDefinition } from '@kbn/entities-schema';
-import { ENTITY_LATEST_TRANSFORM_PREFIX } from '../../../../common/constants_entities';
-
-export function generateLatestTransformId(definition: EntityDefinition) {
-  return `${ENTITY_LATEST_TRANSFORM_PREFIX}-${definition.id}`;
-}
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.test.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.test.ts
index 9a8d23b16c973..9320cd1324b75 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.test.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EntityDefinitionIdTooLong } from '../errors/entity_definition_id_too_long_error';
+import { EntityDefinitionIdInvalid } from '../errors/entity_definition_id_invalid';
 import { entityDefinition } from '../helpers/fixtures/entity_definition';
 import { validateDefinitionCanCreateValidTransformIds } from './validate_transform_ids';
 
@@ -20,7 +20,25 @@ describe('validateDefinitionCanCreateValidTransformIds(definition)', () => {
       'a-really-really-really-really-really-really-really-really-really-really-long-id';
 
     expect(() => {
-      validateDefinitionCanCreateValidTransformIds(entityDefinition);
-    }).toThrow(EntityDefinitionIdTooLong);
+      validateDefinitionCanCreateValidTransformIds(entityDefinitionWithLongID);
+    }).toThrow(EntityDefinitionIdInvalid);
+  });
+
+  it('should throw an error for a definition ID which contains invalid characters', () => {
+    const entityDefinitionWithDots = entityDefinition;
+    entityDefinitionWithDots.id = 'dots.are.not.allowed';
+
+    expect(() => {
+      validateDefinitionCanCreateValidTransformIds(entityDefinitionWithDots);
+    }).toThrow(EntityDefinitionIdInvalid);
+  });
+
+  it('should throw an error for a definition ID which ends with dash or underscore', () => {
+    const entityDefinitionEndingInUnderscore = entityDefinition;
+    entityDefinitionEndingInUnderscore.id = 'looking-good-but_';
+
+    expect(() => {
+      validateDefinitionCanCreateValidTransformIds(entityDefinitionEndingInUnderscore);
+    }).toThrow(EntityDefinitionIdInvalid);
   });
 });
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.ts
index 320505134dd9b..c124870da8591 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/transform/validate_transform_ids.ts
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-const TRANSFORM_ID_MAX_LENGTH = 64;
-
 import { EntityDefinition } from '@kbn/entities-schema';
-import { EntityDefinitionIdTooLong } from '../errors/entity_definition_id_too_long_error';
-import { generateHistoryTransformId } from './generate_history_transform_id';
-import { generateLatestTransformId } from './generate_latest_transform_id';
+import { EntityDefinitionIdInvalid } from '../errors/entity_definition_id_invalid';
+import {
+  generateHistoryTransformId,
+  generateLatestTransformId,
+} from '../helpers/generate_component_id';
+
+const TRANSFORM_ID_MAX_LENGTH = 64;
 
 export function validateDefinitionCanCreateValidTransformIds(definition: EntityDefinition) {
   const historyTransformId = generateHistoryTransformId(definition);
@@ -20,10 +22,17 @@ export function validateDefinitionCanCreateValidTransformIds(definition: EntityD
     TRANSFORM_ID_MAX_LENGTH - Math.max(historyTransformId.length, latestTransformId.length);
 
   if (spareChars < 0) {
-    throw new EntityDefinitionIdTooLong(
+    throw new EntityDefinitionIdInvalid(
       `Entity definition ID is too long (max = ${
         definition.id.length + spareChars
       }); the resulting transform ID will be invalid`
     );
   }
+
+  const transformIdRegex = /^[a-z0-9][a-z0-9_-]*[a-z0-9]$/;
+  if (!transformIdRegex.test(definition.id)) {
+    throw new EntityDefinitionIdInvalid(
+      'Entity definition ID must contain only lowercase alphanumeric characters (a-z and 0-9), hyphens, and underscores. It must also start and end with alphanumeric characters.'
+    );
+  }
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts
index 2d5b4bee83a6d..8642ebafa904b 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/entities/uninstall_entity_definition.ts
@@ -10,6 +10,7 @@ import { SavedObjectsClientContract } from '@kbn/core-saved-objects-api-server';
 import { EntityDefinition } from '@kbn/entities-schema';
 import { Logger } from '@kbn/logging';
 import { deleteEntityDefinition } from './delete_entity_definition';
+import { deleteIndices } from './delete_index';
 import { deleteHistoryIngestPipeline, deleteLatestIngestPipeline } from './delete_ingest_pipeline';
 import { findEntityDefinitions } from './find_entity_definition';
 import {
@@ -22,27 +23,34 @@ export async function uninstallEntityDefinition({
   esClient,
   soClient,
   logger,
+  deleteData = false,
 }: {
   definition: EntityDefinition;
   esClient: ElasticsearchClient;
   soClient: SavedObjectsClientContract;
   logger: Logger;
+  deleteData?: boolean;
 }) {
   await stopAndDeleteHistoryTransform(esClient, definition, logger);
   await stopAndDeleteLatestTransform(esClient, definition, logger);
   await deleteHistoryIngestPipeline(esClient, definition, logger);
   await deleteLatestIngestPipeline(esClient, definition, logger);
   await deleteEntityDefinition(soClient, definition, logger);
+  if (deleteData) {
+    await deleteIndices(esClient, definition, logger);
+  }
 }
 
 export async function uninstallBuiltInEntityDefinitions({
   esClient,
   soClient,
   logger,
+  deleteData = false,
 }: {
   esClient: ElasticsearchClient;
   soClient: SavedObjectsClientContract;
   logger: Logger;
+  deleteData?: boolean;
 }): Promise<EntityDefinition[]> {
   const definitions = await findEntityDefinitions({
     soClient,
@@ -52,7 +60,7 @@ export async function uninstallBuiltInEntityDefinitions({
 
   await Promise.all(
     definitions.map(async (definition) => {
-      await uninstallEntityDefinition({ definition, esClient, soClient, logger });
+      await uninstallEntityDefinition({ definition, esClient, soClient, logger, deleteData });
     })
   );
 
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/lib/manage_index_templates.ts b/x-pack/plugins/observability_solution/entity_manager/server/lib/manage_index_templates.ts
index f3591d82e0d25..0f73ba7715bfd 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/lib/manage_index_templates.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/lib/manage_index_templates.ts
@@ -34,7 +34,7 @@ export async function upsertTemplate({ esClient, template, logger }: TemplateMan
   logger.info(
     `Entity manager index template is up to date (use debug logging to see what was installed)`
   );
-  logger.debug(`Entity manager index template: ${JSON.stringify(template)}`);
+  logger.debug(() => `Entity manager index template: ${JSON.stringify(template)}`);
 }
 
 export async function upsertComponent({ esClient, component, logger }: ComponentManagementOptions) {
@@ -48,5 +48,5 @@ export async function upsertComponent({ esClient, component, logger }: Component
   logger.info(
     `Entity manager component template is up to date (use debug logging to see what was installed)`
   );
-  logger.debug(`Entity manager component template: ${JSON.stringify(component)}`);
+  logger.debug(() => `Entity manager component template: ${JSON.stringify(component)}`);
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/plugin.ts b/x-pack/plugins/observability_solution/entity_manager/server/plugin.ts
index e71f5b36bb468..3a51988841766 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/plugin.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/plugin.ts
@@ -22,11 +22,13 @@ import {
   EntityManagerServerSetup,
 } from './types';
 import { EntityManagerConfig, configSchema, exposeToBrowserConfig } from '../common/config';
-import { entitiesBaseComponentTemplateConfig } from './templates/components/base';
 import { entitiesEventComponentTemplateConfig } from './templates/components/event';
-import { entitiesIndexTemplateConfig } from './templates/entities_template';
 import { entityDefinition, EntityDiscoveryApiKeyType } from './saved_objects';
 import { entitiesEntityComponentTemplateConfig } from './templates/components/entity';
+import { entitiesLatestBaseComponentTemplateConfig } from './templates/components/base_latest';
+import { entitiesHistoryBaseComponentTemplateConfig } from './templates/components/base_history';
+import { entitiesHistoryIndexTemplateConfig } from './templates/entities_history_template';
+import { entitiesLatestIndexTemplateConfig } from './templates/entities_latest_template';
 
 export type EntityManagerServerPluginSetup = ReturnType<EntityManagerServerPlugin['setup']>;
 export type EntityManagerServerPluginStart = ReturnType<EntityManagerServerPlugin['start']>;
@@ -73,7 +75,6 @@ export class EntityManagerServerPlugin
     setupRoutes<RequestHandlerContext>({
       router,
       logger: this.logger,
-      spaces: plugins.spaces,
       server: this.server,
     });
 
@@ -95,7 +96,12 @@ export class EntityManagerServerPlugin
       upsertComponent({
         esClient,
         logger: this.logger,
-        component: entitiesBaseComponentTemplateConfig,
+        component: entitiesHistoryBaseComponentTemplateConfig,
+      }),
+      upsertComponent({
+        esClient,
+        logger: this.logger,
+        component: entitiesLatestBaseComponentTemplateConfig,
       }),
       upsertComponent({
         esClient,
@@ -109,7 +115,18 @@ export class EntityManagerServerPlugin
       }),
     ])
       .then(() =>
-        upsertTemplate({ esClient, logger: this.logger, template: entitiesIndexTemplateConfig })
+        upsertTemplate({
+          esClient,
+          logger: this.logger,
+          template: entitiesHistoryIndexTemplateConfig,
+        })
+      )
+      .then(() =>
+        upsertTemplate({
+          esClient,
+          logger: this.logger,
+          template: entitiesLatestIndexTemplateConfig,
+        })
       )
       .catch(() => {});
 
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/check.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/check.ts
index 251c3ccfefada..fca2e1070afda 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/check.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/check.ts
@@ -9,7 +9,6 @@ import { RequestHandlerContext } from '@kbn/core/server';
 import { getFakeKibanaRequest } from '@kbn/security-plugin/server/authentication/api_keys/fake_kibana_request';
 import { SetupRouteOptions } from '../types';
 import { ENTITY_INTERNAL_API_PREFIX } from '../../../common/constants_entities';
-import { ManagedEntityEnabledResponse } from '../../../common/types_api';
 import { checkIfEntityDiscoveryAPIKeyIsValid, readEntityDiscoveryAPIKey } from '../../lib/auth';
 import {
   ERROR_API_KEY_NOT_FOUND,
@@ -25,7 +24,7 @@ export function checkEntityDiscoveryEnabledRoute<T extends RequestHandlerContext
   server,
   logger,
 }: SetupRouteOptions<T>) {
-  router.get<unknown, unknown, ManagedEntityEnabledResponse>(
+  router.get<unknown, unknown, unknown>(
     {
       path: `${ENTITY_INTERNAL_API_PREFIX}/managed/enablement`,
       validate: false,
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/disable.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/disable.ts
index 33a1b60dab293..9af237e22d597 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/disable.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/disable.ts
@@ -7,6 +7,7 @@
 
 import { RequestHandlerContext } from '@kbn/core/server';
 import { getFakeKibanaRequest } from '@kbn/security-plugin/server/authentication/api_keys/fake_kibana_request';
+import { schema } from '@kbn/config-schema';
 import { SetupRouteOptions } from '../types';
 import { ENTITY_INTERNAL_API_PREFIX } from '../../../common/constants_entities';
 import {
@@ -16,17 +17,20 @@ import {
 } from '../../lib/auth';
 import { ERROR_API_KEY_NOT_FOUND, ERROR_API_KEY_NOT_VALID } from '../../../common/errors';
 import { uninstallBuiltInEntityDefinitions } from '../../lib/entities/uninstall_entity_definition';
-import { DisableManagedEntityResponse } from '../../../common/types_api';
 
 export function disableEntityDiscoveryRoute<T extends RequestHandlerContext>({
   router,
   server,
   logger,
 }: SetupRouteOptions<T>) {
-  router.delete<unknown, unknown, DisableManagedEntityResponse>(
+  router.delete<unknown, { deleteData?: boolean }, unknown>(
     {
       path: `${ENTITY_INTERNAL_API_PREFIX}/managed/enablement`,
-      validate: false,
+      validate: {
+        query: schema.object({
+          deleteData: schema.maybe(schema.boolean({ defaultValue: false })),
+        }),
+      },
     },
     async (context, req, res) => {
       try {
@@ -48,7 +52,12 @@ export function disableEntityDiscoveryRoute<T extends RequestHandlerContext>({
         const soClient = server.core.savedObjects.getScopedClient(fakeRequest);
         const esClient = server.core.elasticsearch.client.asScoped(fakeRequest).asCurrentUser;
 
-        await uninstallBuiltInEntityDefinitions({ soClient, esClient, logger });
+        await uninstallBuiltInEntityDefinitions({
+          soClient,
+          esClient,
+          logger,
+          deleteData: req.query.deleteData,
+        });
 
         await deleteEntityDiscoveryAPIKey((await context.core).savedObjects.client);
         await server.security.authc.apiKeys.invalidateAsInternalUser({
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts
index 392ec48c29b23..91ca36b1caa59 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/enablement/enable.ts
@@ -9,7 +9,6 @@ import { RequestHandlerContext } from '@kbn/core/server';
 import { getFakeKibanaRequest } from '@kbn/security-plugin/server/authentication/api_keys/fake_kibana_request';
 import { SetupRouteOptions } from '../types';
 import { ENTITY_INTERNAL_API_PREFIX } from '../../../common/constants_entities';
-import { EnableManagedEntityResponse } from '../../../common/types_api';
 import {
   canEnableEntityDiscovery,
   checkIfAPIKeysAreEnabled,
@@ -29,7 +28,7 @@ export function enableEntityDiscoveryRoute<T extends RequestHandlerContext>({
   server,
   logger,
 }: SetupRouteOptions<T>) {
-  router.put<unknown, unknown, EnableManagedEntityResponse>(
+  router.put<unknown, unknown, unknown>(
     {
       path: `${ENTITY_INTERNAL_API_PREFIX}/managed/enablement`,
       validate: false,
@@ -93,7 +92,6 @@ export function enableEntityDiscoveryRoute<T extends RequestHandlerContext>({
         await installBuiltInEntityDefinitions({
           logger,
           builtInDefinitions,
-          spaceId: 'default',
           esClient: scopedEsClient,
           soClient: scopedSoClient,
         });
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/create.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/create.ts
index 40004aa85c415..4b0f0c0839862 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/create.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/create.ts
@@ -19,7 +19,6 @@ import { installEntityDefinition } from '../../lib/entities/install_entity_defin
 export function createEntityDefinitionRoute<T extends RequestHandlerContext>({
   router,
   server,
-  spaces,
 }: SetupRouteOptions<T>) {
   router.post<unknown, unknown, EntityDefinition>(
     {
@@ -39,12 +38,10 @@ export function createEntityDefinitionRoute<T extends RequestHandlerContext>({
       const core = await context.core;
       const soClient = core.savedObjects.client;
       const esClient = core.elasticsearch.client.asCurrentUser;
-      const spaceId = spaces?.spacesService.getSpaceId(req) ?? 'default';
       try {
         const definition = await installEntityDefinition({
           soClient,
           esClient,
-          spaceId,
           logger,
           definition: req.body,
         });
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/delete.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/delete.ts
index c18d688572891..91078991f927b 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/delete.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/delete.ts
@@ -19,13 +19,16 @@ export function deleteEntityDefinitionRoute<T extends RequestHandlerContext>({
   router,
   server,
 }: SetupRouteOptions<T>) {
-  router.delete<{ id: string }, unknown, unknown>(
+  router.delete<{ id: string }, { deleteData?: boolean }, unknown>(
     {
       path: `${ENTITY_INTERNAL_API_PREFIX}/definition/{id}`,
       validate: {
         params: schema.object({
           id: schema.string(),
         }),
+        query: schema.object({
+          deleteData: schema.maybe(schema.boolean({ defaultValue: false })),
+        }),
       },
     },
     async (context, req, res) => {
@@ -35,7 +38,13 @@ export function deleteEntityDefinitionRoute<T extends RequestHandlerContext>({
         const esClient = (await context.core).elasticsearch.client.asCurrentUser;
 
         const definition = await readEntityDefinition(soClient, req.params.id, logger);
-        await uninstallEntityDefinition({ definition, soClient, esClient, logger });
+        await uninstallEntityDefinition({
+          definition,
+          soClient,
+          esClient,
+          logger,
+          deleteData: req.query.deleteData,
+        });
 
         return res.ok({ body: { acknowledged: true } });
       } catch (e) {
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/reset.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/reset.ts
index 2a267c6c4e332..68d4b021244ab 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/reset.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/entities/reset.ts
@@ -35,7 +35,6 @@ import { ENTITY_INTERNAL_API_PREFIX } from '../../../common/constants_entities';
 export function resetEntityDefinitionRoute<T extends RequestHandlerContext>({
   router,
   logger,
-  spaces,
 }: SetupRouteOptions<T>) {
   router.post<{ id: string }, unknown, unknown>(
     {
@@ -50,7 +49,6 @@ export function resetEntityDefinitionRoute<T extends RequestHandlerContext>({
       try {
         const soClient = (await context.core).savedObjects.client;
         const esClient = (await context.core).elasticsearch.client.asCurrentUser;
-        const spaceId = spaces?.spacesService.getSpaceId(req) ?? 'default';
 
         const definition = await readEntityDefinition(soClient, req.params.id, logger);
 
@@ -62,8 +60,8 @@ export function resetEntityDefinitionRoute<T extends RequestHandlerContext>({
         await deleteIndices(esClient, definition, logger);
 
         // Recreate everything
-        await createAndInstallHistoryIngestPipeline(esClient, definition, logger, spaceId);
-        await createAndInstallLatestIngestPipeline(esClient, definition, logger, spaceId);
+        await createAndInstallHistoryIngestPipeline(esClient, definition, logger);
+        await createAndInstallLatestIngestPipeline(esClient, definition, logger);
         await createAndInstallHistoryTransform(esClient, definition, logger);
         await createAndInstallLatestTransform(esClient, definition, logger);
         await startTransform(esClient, definition, logger);
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/routes/types.ts b/x-pack/plugins/observability_solution/entity_manager/server/routes/types.ts
index e5c11777a57de..8e3dc7111298d 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/routes/types.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/routes/types.ts
@@ -7,12 +7,10 @@
 
 import { IRouter, RequestHandlerContextBase } from '@kbn/core-http-server';
 import { Logger } from '@kbn/core/server';
-import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { EntityManagerServerSetup } from '../types';
 
 export interface SetupRouteOptions<T extends RequestHandlerContextBase> {
   router: IRouter<T>;
   server: EntityManagerServerSetup;
   logger: Logger;
-  spaces?: SpacesPluginSetup;
 }
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/saved_objects/entity_definition.ts b/x-pack/plugins/observability_solution/entity_manager/server/saved_objects/entity_definition.ts
index 5ddba63b7ad07..b4bf24580d632 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/saved_objects/entity_definition.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/saved_objects/entity_definition.ts
@@ -18,6 +18,7 @@ export const entityDefinition: SavedObjectsType = {
     dynamic: false,
     properties: {
       id: { type: 'keyword' },
+      version: { type: 'keyword' },
       name: { type: 'text' },
       description: { type: 'text' },
       type: { type: 'keyword' },
@@ -37,4 +38,16 @@ export const entityDefinition: SavedObjectsType = {
       return `EntityDefinition: [${savedObject.attributes.name}]`;
     },
   },
+  modelVersions: {
+    '1': {
+      changes: [
+        {
+          type: 'mappings_addition',
+          addedMappings: {
+            version: { type: 'keyword' },
+          },
+        },
+      ],
+    },
+  },
 };
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_history.ts
similarity index 64%
rename from x-pack/plugins/observability_solution/entity_manager/server/templates/components/base.ts
rename to x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_history.ts
index adf527d653d9c..d0bdaa76152ec 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_history.ts
@@ -6,12 +6,16 @@
  */
 
 import { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+import { ENTITY_HISTORY_BASE_COMPONENT_TEMPLATE_V1 } from '../../../common/constants_entities';
 
-export const entitiesBaseComponentTemplateConfig: ClusterPutComponentTemplateRequest = {
-  name: 'entities_v1_base',
+export const entitiesHistoryBaseComponentTemplateConfig: ClusterPutComponentTemplateRequest = {
+  name: ENTITY_HISTORY_BASE_COMPONENT_TEMPLATE_V1,
   _meta: {
+    description:
+      "Component template for the ECS fields used in the Elastic Entity Model's entity discovery framework's history data set",
     documentation: 'https://www.elastic.co/guide/en/ecs/current/ecs-base.html',
     ecs_version: '8.0.0',
+    managed: true,
   },
   template: {
     mappings: {
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_latest.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_latest.ts
new file mode 100644
index 0000000000000..d0167eb716039
--- /dev/null
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/base_latest.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+import { ENTITY_LATEST_BASE_COMPONENT_TEMPLATE_V1 } from '../../../common/constants_entities';
+
+export const entitiesLatestBaseComponentTemplateConfig: ClusterPutComponentTemplateRequest = {
+  name: ENTITY_LATEST_BASE_COMPONENT_TEMPLATE_V1,
+  _meta: {
+    description:
+      "Component template for the ECS fields used in the Elastic Entity Model's entity discovery framework's latest data set",
+    documentation: 'https://www.elastic.co/guide/en/ecs/current/ecs-base.html',
+    ecs_version: '8.0.0',
+    managed: true,
+  },
+  template: {
+    mappings: {
+      properties: {
+        labels: {
+          type: 'object',
+        },
+        tags: {
+          ignore_above: 1024,
+          type: 'keyword',
+        },
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/entity.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/entity.ts
index fd8781dc64e9c..31486b8e1cb24 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/entity.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/entity.ts
@@ -6,11 +6,15 @@
  */
 
 import { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+import { ENTITY_ENTITY_COMPONENT_TEMPLATE_V1 } from '../../../common/constants_entities';
 
 export const entitiesEntityComponentTemplateConfig: ClusterPutComponentTemplateRequest = {
-  name: 'entities_v1_entity',
+  name: ENTITY_ENTITY_COMPONENT_TEMPLATE_V1,
   _meta: {
+    description:
+      "Component template for the entity fields used in the Elastic Entity Model's entity discovery framework",
     ecs_version: '8.0.0',
+    managed: true,
   },
   template: {
     mappings: {
@@ -38,6 +42,14 @@ export const entitiesEntityComponentTemplateConfig: ClusterPutComponentTemplateR
               ignore_above: 1024,
               type: 'keyword',
             },
+            definitionVersion: {
+              ignore_above: 1024,
+              type: 'keyword',
+            },
+            schemaVersion: {
+              ignore_above: 1024,
+              type: 'keyword',
+            },
             lastSeenTimestamp: {
               type: 'date',
             },
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/event.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/event.ts
index 6ad4b628fdf36..42b7b98f333ea 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/templates/components/event.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/components/event.ts
@@ -6,12 +6,16 @@
  */
 
 import { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+import { ENTITY_EVENT_COMPONENT_TEMPLATE_V1 } from '../../../common/constants_entities';
 
 export const entitiesEventComponentTemplateConfig: ClusterPutComponentTemplateRequest = {
-  name: 'entities_v1_event',
+  name: ENTITY_EVENT_COMPONENT_TEMPLATE_V1,
   _meta: {
+    description:
+      "Component template for the event fields used in the Elastic Entity Model's entity discovery framework",
     documentation: 'https://www.elastic.co/guide/en/ecs/current/ecs-event.html',
     ecs_version: '8.0.0',
+    managed: true,
   },
   template: {
     mappings: {
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_history_template.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_history_template.ts
new file mode 100644
index 0000000000000..d5ceeecd44828
--- /dev/null
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_history_template.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { IndicesPutIndexTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+import {
+  ENTITY_ENTITY_COMPONENT_TEMPLATE_V1,
+  ENTITY_EVENT_COMPONENT_TEMPLATE_V1,
+  ENTITY_HISTORY_BASE_COMPONENT_TEMPLATE_V1,
+  ENTITY_HISTORY_INDEX_PREFIX_V1,
+  ENTITY_HISTORY_INDEX_TEMPLATE_V1,
+} from '../../common/constants_entities';
+
+export const entitiesHistoryIndexTemplateConfig: IndicesPutIndexTemplateRequest = {
+  name: ENTITY_HISTORY_INDEX_TEMPLATE_V1,
+  _meta: {
+    description:
+      "Index template for indices managed by the Elastic Entity Model's entity discovery framework for the history dataset",
+    ecs_version: '8.0.0',
+    managed: true,
+  },
+  composed_of: [
+    ENTITY_HISTORY_BASE_COMPONENT_TEMPLATE_V1,
+    ENTITY_ENTITY_COMPONENT_TEMPLATE_V1,
+    ENTITY_EVENT_COMPONENT_TEMPLATE_V1,
+  ],
+  index_patterns: [`${ENTITY_HISTORY_INDEX_PREFIX_V1}.*`],
+  priority: 1,
+  template: {
+    mappings: {
+      _meta: {
+        version: '1.6.0',
+      },
+      date_detection: false,
+      dynamic_templates: [
+        {
+          strings_as_keyword: {
+            mapping: {
+              ignore_above: 1024,
+              type: 'keyword',
+              fields: {
+                text: {
+                  type: 'text',
+                },
+              },
+            },
+            match_mapping_type: 'string',
+          },
+        },
+        {
+          entity_metrics: {
+            mapping: {
+              type: '{dynamic_type}',
+            },
+            match_mapping_type: ['long', 'double'],
+            path_match: 'entity.metrics.*',
+          },
+        },
+      ],
+    },
+    settings: {
+      index: {
+        codec: 'best_compression',
+        mapping: {
+          total_fields: {
+            limit: 2000,
+          },
+        },
+      },
+    },
+  },
+};
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_template.ts b/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_latest_template.ts
similarity index 63%
rename from x-pack/plugins/observability_solution/entity_manager/server/templates/entities_template.ts
rename to x-pack/plugins/observability_solution/entity_manager/server/templates/entities_latest_template.ts
index d728edcf01418..f601c3aa9d57d 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_template.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/templates/entities_latest_template.ts
@@ -6,16 +6,28 @@
  */
 
 import { IndicesPutIndexTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
-import { ENTITY_BASE_PREFIX } from '../../common/constants_entities';
+import {
+  ENTITY_ENTITY_COMPONENT_TEMPLATE_V1,
+  ENTITY_EVENT_COMPONENT_TEMPLATE_V1,
+  ENTITY_LATEST_BASE_COMPONENT_TEMPLATE_V1,
+  ENTITY_LATEST_INDEX_PREFIX_V1,
+  ENTITY_LATEST_INDEX_TEMPLATE_V1,
+} from '../../common/constants_entities';
 
-export const entitiesIndexTemplateConfig: IndicesPutIndexTemplateRequest = {
-  name: 'entities_v1_index_template',
+export const entitiesLatestIndexTemplateConfig: IndicesPutIndexTemplateRequest = {
+  name: ENTITY_LATEST_INDEX_TEMPLATE_V1,
   _meta: {
-    description: 'The entities index template',
+    description:
+      "Index template for indices managed by the Elastic Entity Model's entity discovery framework for the latest dataset",
     ecs_version: '8.0.0',
+    managed: true,
   },
-  composed_of: ['entities_v1_base', 'entities_v1_event', 'entities_v1_entity'],
-  index_patterns: [`${ENTITY_BASE_PREFIX}.*`],
+  composed_of: [
+    ENTITY_LATEST_BASE_COMPONENT_TEMPLATE_V1,
+    ENTITY_ENTITY_COMPONENT_TEMPLATE_V1,
+    ENTITY_EVENT_COMPONENT_TEMPLATE_V1,
+  ],
+  index_patterns: [`${ENTITY_LATEST_INDEX_PREFIX_V1}.*`],
   priority: 1,
   template: {
     mappings: {
diff --git a/x-pack/plugins/observability_solution/entity_manager/server/types.ts b/x-pack/plugins/observability_solution/entity_manager/server/types.ts
index 505f44eccf3ff..2215b50285c82 100644
--- a/x-pack/plugins/observability_solution/entity_manager/server/types.ts
+++ b/x-pack/plugins/observability_solution/entity_manager/server/types.ts
@@ -11,7 +11,6 @@ import {
   EncryptedSavedObjectsPluginSetup,
   EncryptedSavedObjectsPluginStart,
 } from '@kbn/encrypted-saved-objects-plugin/server';
-import { SpacesPluginSetup } from '@kbn/spaces-plugin/server';
 import { EntityManagerConfig } from '../common/config';
 
 export interface EntityManagerServerSetup {
@@ -29,7 +28,6 @@ export interface ElasticsearchAccessorOptions {
 
 export interface EntityManagerPluginSetupDependencies {
   encryptedSavedObjects: EncryptedSavedObjectsPluginSetup;
-  spaces?: SpacesPluginSetup;
 }
 
 export interface EntityManagerPluginStartDependencies {
diff --git a/x-pack/plugins/observability_solution/entity_manager/tsconfig.json b/x-pack/plugins/observability_solution/entity_manager/tsconfig.json
index 176494e26e600..4b9d394a62f12 100644
--- a/x-pack/plugins/observability_solution/entity_manager/tsconfig.json
+++ b/x-pack/plugins/observability_solution/entity_manager/tsconfig.json
@@ -27,7 +27,6 @@
     "@kbn/zod-helpers",
     "@kbn/security-plugin",
     "@kbn/encrypted-saved-objects-plugin",
-    "@kbn/spaces-plugin",
     "@kbn/logging-mocks",
   ]
 }
diff --git a/x-pack/plugins/observability_solution/exploratory_view/kibana.jsonc b/x-pack/plugins/observability_solution/exploratory_view/kibana.jsonc
index 9fadcd2d68ca3..4061de177e427 100644
--- a/x-pack/plugins/observability_solution/exploratory_view/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/exploratory_view/kibana.jsonc
@@ -1,7 +1,7 @@
 {
   "type": "plugin",
   "id": "@kbn/exploratory-view-plugin",
-  "owner": "@elastic/obs-ux-infra_services-team",
+  "owner": "@elastic/obs-ux-management-team",
   "plugin": {
     "id": "exploratoryView",
     "server": false,
diff --git a/x-pack/plugins/observability_solution/infra/public/alerting/metric_threshold/components/expression.tsx b/x-pack/plugins/observability_solution/infra/public/alerting/metric_threshold/components/expression.tsx
index 9eaf5e2bd7b45..798a0db85e2f0 100644
--- a/x-pack/plugins/observability_solution/infra/public/alerting/metric_threshold/components/expression.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/alerting/metric_threshold/components/expression.tsx
@@ -12,7 +12,6 @@ import {
   EuiFieldSearch,
   EuiFormRow,
   EuiIconTip,
-  EuiLink,
   EuiPanel,
   EuiSpacer,
   EuiText,
@@ -35,7 +34,6 @@ import {
   useSourceContext,
   withSourceProvider,
 } from '../../../containers/metrics_source';
-import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
 import { MetricsExplorerGroupBy } from '../../../pages/metrics/metrics_explorer/components/group_by';
 import { MetricsExplorerKueryBar } from '../../../pages/metrics/metrics_explorer/components/kuery_bar';
 import { MetricsExplorerOptions } from '../../../pages/metrics/metrics_explorer/hooks/use_metrics_explorer_options';
@@ -66,7 +64,6 @@ export { defaultExpression };
 
 export const Expressions: React.FC<Props> = (props) => {
   const { setRuleParams, ruleParams, errors, metadata } = props;
-  const { docLinks } = useKibanaContextForPlugin().services;
   const { source } = useSourceContext();
   const { metricsView } = useMetricsDataViewContext();
   const [timeSize, setTimeSize] = useState<number | undefined>(1);
@@ -267,30 +264,6 @@ export const Expressions: React.FC<Props> = (props) => {
     [ruleParams.criteria]
   );
 
-  // Test to see if any of the group fields in groupBy are already filtered down to a single
-  // group by the filterQuery. If this is the case, then a groupBy is unnecessary, as it would only
-  // ever produce one group instance
-  const groupByFilterTestPatterns = useMemo(() => {
-    if (!ruleParams.groupBy) return null;
-    const groups = !Array.isArray(ruleParams.groupBy) ? [ruleParams.groupBy] : ruleParams.groupBy;
-    return groups.map((group: string) => ({
-      groupName: group,
-      pattern: new RegExp(`{"match(_phrase)?":{"${group}":"(.*?)"}}`),
-    }));
-  }, [ruleParams.groupBy]);
-
-  const redundantFilterGroupBy = useMemo(() => {
-    const { filterQuery } = ruleParams;
-    if (typeof filterQuery !== 'string' || !groupByFilterTestPatterns) return [];
-    return groupByFilterTestPatterns
-      .map(({ groupName, pattern }) => {
-        if (pattern.test(filterQuery)) {
-          return groupName;
-        }
-      })
-      .filter((g) => typeof g === 'string') as string[];
-  }, [ruleParams, groupByFilterTestPatterns]);
-
   return (
     <>
       <EuiSpacer size="m" />
@@ -465,35 +438,8 @@ export const Expressions: React.FC<Props> = (props) => {
             ...options,
             groupBy: ruleParams.groupBy || undefined,
           }}
-          errorOptions={redundantFilterGroupBy}
         />
       </EuiFormRow>
-      {redundantFilterGroupBy.length > 0 && (
-        <>
-          <EuiSpacer size="s" />
-          <EuiText size="xs" color="danger">
-            <FormattedMessage
-              id="xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError"
-              defaultMessage="This rule may alert on {matchedGroups} less than expected, because the filter query contains a match for {groupCount, plural, one {this field} other {these fields}}. For more information, refer to {filteringAndGroupingLink}."
-              values={{
-                matchedGroups: <strong>{redundantFilterGroupBy.join(', ')}</strong>,
-                groupCount: redundantFilterGroupBy.length,
-                filteringAndGroupingLink: (
-                  <EuiLink
-                    data-test-subj="infraExpressionsTheDocsLink"
-                    href={`${docLinks.links.observability.metricsThreshold}#filtering-and-grouping`}
-                  >
-                    {i18n.translate(
-                      'xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError.docsLink',
-                      { defaultMessage: 'the docs' }
-                    )}
-                  </EuiLink>
-                ),
-              }}
-            />
-          </EuiText>
-        </>
-      )}
       <EuiSpacer size="s" />
       <EuiCheckbox
         id="metrics-alert-group-disappear-toggle"
diff --git a/x-pack/plugins/observability_solution/infra/public/components/asset_details/links/link_to_apm_service.tsx b/x-pack/plugins/observability_solution/infra/public/components/asset_details/links/link_to_apm_service.tsx
index b4e2ea57c9eaa..92424d85f1861 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/asset_details/links/link_to_apm_service.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/components/asset_details/links/link_to_apm_service.tsx
@@ -39,7 +39,12 @@ export const LinkToApmService = ({ serviceName, agentName, dateRange }: LinkToAp
         })}
       >
         {agentName ? (
-          <AgentIcon agentName={agentName as AgentName} size="m" css={{ marginRight: '4px' }} />
+          <AgentIcon
+            agentName={agentName as AgentName}
+            size="m"
+            css={{ marginRight: '4px' }}
+            role="presentation"
+          />
         ) : null}
         <span data-test-subj={`serviceNameText-${serviceName}`}>{serviceName}</span>
       </EuiBadge>
diff --git a/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx b/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
index b38af534df6e7..482d4c7294c5e 100644
--- a/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/components/ml/anomaly_detection/anomalies_table/anomalies_table.tsx
@@ -221,9 +221,9 @@ export const AnomaliesTable = ({
 }: Props) => {
   const [search, setSearch] = useState('');
   const trackMetric = useUiTracker({ app: 'infra_metrics' });
-  const [timeRange, setTimeRange] = useState<{ start: number; end: number }>({
-    start: datemathToEpochMillis(dateRange.from) || 0,
-    end: datemathToEpochMillis(dateRange.to, 'up') || 0,
+  const [timeRange, setTimeRange] = useState<{ start: string; end: string }>({
+    start: dateRange.from,
+    end: dateRange.to,
   });
   const { sorting, setSorting } = useSorting<MetricsHostsAnomaly>({
     field: 'startTime',
@@ -256,8 +256,8 @@ export const AnomaliesTable = ({
     ({ isInvalid, start: startChange, end: endChange }: OnTimeChangeProps) => {
       if (!isInvalid) {
         setTimeRange({
-          start: datemathToEpochMillis(startChange)!,
-          end: datemathToEpochMillis(endChange, 'up')!,
+          start: startChange,
+          end: endChange,
         });
       }
     },
@@ -265,14 +265,17 @@ export const AnomaliesTable = ({
   );
 
   const getTimeRange = useCallback(() => {
-    if (hideDatePicker) {
-      return {
-        start: datemathToEpochMillis(dateRange.from) || 0,
-        end: datemathToEpochMillis(dateRange.to, 'up') || 0,
-      };
-    } else {
-      return timeRange;
-    }
+    const { start, end } = hideDatePicker
+      ? {
+          start: dateRange.from,
+          end: dateRange.to,
+        }
+      : timeRange;
+
+    return {
+      start: datemathToEpochMillis(start) || 0,
+      end: datemathToEpochMillis(end, 'up') || 0,
+    };
   }, [dateRange.from, dateRange.to, hideDatePicker, timeRange]);
 
   const anomalyParams = useMemo(() => {
@@ -483,8 +486,8 @@ export const AnomaliesTable = ({
       {!hideDatePicker && (
         <EuiFlexItem grow={false}>
           <EuiSuperDatePicker
-            start={dateRange.from}
-            end={dateRange.to}
+            start={timeRange.start}
+            end={timeRange.end}
             showUpdateButton={false}
             onTimeChange={onTimeChange}
             width="full"
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/table/entry_title.tsx b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/table/entry_title.tsx
index 8bd22bde90716..a88a2c30c6eac 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/table/entry_title.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/hosts/components/table/entry_title.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import React from 'react';
+import { i18n } from '@kbn/i18n';
 import { EuiFlexGroup, EuiFlexItem, EuiLink, EuiToolTip } from '@elastic/eui';
 import { CloudProviderIcon } from '@kbn/custom-icons';
 import { useNodeDetailsRedirect } from '../../../../link_to/use_node_details_redirect';
@@ -34,28 +35,38 @@ export const EntryTitle = ({ onClick, title }: EntryTitleProps) => {
   const providerName = cloudProvider ?? 'Unknown';
 
   return (
-    <EuiFlexGroup
-      alignItems="center"
-      className="eui-textTruncate"
-      gutterSize="s"
-      responsive={false}
+    <EuiToolTip
+      delay="long"
+      anchorClassName="eui-displayBlock"
+      content={i18n.translate('xpack.infra.hostsViewPage.table.nameTooltip', {
+        defaultMessage: '{providerName}: {name}',
+        values: {
+          providerName,
+          name,
+        },
+      })}
     >
-      <EuiFlexItem grow={false}>
-        <EuiToolTip delay="long" content={providerName}>
-          <CloudProviderIcon cloudProvider={cloudProvider} size="m" title={name} />
-        </EuiToolTip>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false} className="eui-textTruncate" onClick={onClick}>
-        <EuiToolTip delay="long" content={name}>
-          <EuiLink
-            data-test-subj="hostsViewTableEntryTitleLink"
-            className="eui-displayBlock eui-textTruncate"
-            {...link}
-          >
-            {name}
-          </EuiLink>
-        </EuiToolTip>
-      </EuiFlexItem>
-    </EuiFlexGroup>
+      <EuiLink data-test-subj="hostsViewTableEntryTitleLink" {...link}>
+        <EuiFlexGroup
+          className="eui-textTruncate"
+          alignItems="center"
+          gutterSize="s"
+          responsive={false}
+          onClick={onClick}
+        >
+          <EuiFlexItem grow={false}>
+            <CloudProviderIcon
+              cloudProvider={cloudProvider}
+              size="m"
+              title={providerName}
+              role="presentation"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem className="eui-textTruncate">
+            <span className="eui-textTruncate">{name}</span>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiLink>
+    </EuiToolTip>
   );
 };
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/group_by.tsx b/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/group_by.tsx
index 5cc1ad8ec467c..0dacb7653d159 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/group_by.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/metrics_explorer/components/group_by.tsx
@@ -14,10 +14,9 @@ import { MetricsExplorerOptions } from '../hooks/use_metrics_explorer_options';
 interface Props {
   options: MetricsExplorerOptions;
   onChange: (groupBy: string | null | string[]) => void;
-  errorOptions?: string[];
 }
 
-export const MetricsExplorerGroupBy = ({ options, onChange, errorOptions }: Props) => {
+export const MetricsExplorerGroupBy = ({ options, onChange }: Props) => {
   const { metricsView } = useMetricsDataViewContext();
   const handleChange = useCallback(
     (selectedOptions: Array<{ label: string }>) => {
@@ -28,17 +27,9 @@ export const MetricsExplorerGroupBy = ({ options, onChange, errorOptions }: Prop
   );
 
   const selectedOptions = Array.isArray(options.groupBy)
-    ? options.groupBy.map((field) => ({
-        label: field,
-        color: errorOptions?.includes(field) ? 'danger' : undefined,
-      }))
+    ? options.groupBy.map((field) => ({ label: field }))
     : options.groupBy
-    ? [
-        {
-          label: options.groupBy,
-          color: errorOptions?.includes(options.groupBy) ? 'danger' : undefined,
-        },
-      ]
+    ? [{ label: options.groupBy }]
     : [];
 
   const comboOptions = (metricsView?.fields ?? [])
diff --git a/x-pack/plugins/observability_solution/infra/public/plugin.ts b/x-pack/plugins/observability_solution/infra/public/plugin.ts
index f323d7adb6297..6a4e813064eef 100644
--- a/x-pack/plugins/observability_solution/infra/public/plugin.ts
+++ b/x-pack/plugins/observability_solution/infra/public/plugin.ts
@@ -405,11 +405,12 @@ export class Plugin implements InfraClientPluginClass {
       order: 30,
       getDisplayName: () =>
         i18n.translate('xpack.infra.logStreamEmbeddable.displayName', {
-          defaultMessage: 'Log stream',
+          defaultMessage: 'Log stream (deprecated)',
         }),
       getDisplayNameTooltip: () =>
         i18n.translate('xpack.infra.logStreamEmbeddable.description', {
-          defaultMessage: 'Add a table of live streaming logs.',
+          defaultMessage:
+            'Add a table of live streaming logs. For a more efficient experience, we recommend using the Discover Page to create a saved search instead of using Log stream.',
         }),
       getIconType: () => 'logsApp',
       isCompatible: async ({ embeddable }) => {
diff --git a/x-pack/plugins/observability_solution/investigate/kibana.jsonc b/x-pack/plugins/observability_solution/investigate/kibana.jsonc
index ff0d3a58670d8..b3421fca1541c 100644
--- a/x-pack/plugins/observability_solution/investigate/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/investigate/kibana.jsonc
@@ -1,7 +1,7 @@
 {
   "type": "plugin",
   "id": "@kbn/investigate-plugin",
-  "owner": "@elastic/obs-ai-assistant",
+  "owner": "@elastic/obs-ux-management-team",
   "plugin": {
     "id": "investigate",
     "server": true,
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/es_fields.ts b/x-pack/plugins/observability_solution/logs_data_access/server/es_fields.ts
new file mode 100644
index 0000000000000..6393700df9b1e
--- /dev/null
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/es_fields.ts
@@ -0,0 +1,8 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const LOG_LEVEL = 'log.level';
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_error_rate_timeseries/get_logs_error_rate_timeseries.ts b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_error_rate_timeseries/get_logs_error_rate_timeseries.ts
new file mode 100644
index 0000000000000..fdc71e5b84685
--- /dev/null
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_error_rate_timeseries/get_logs_error_rate_timeseries.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import type { AggregationOptionsByType, AggregationResultOf } from '@kbn/es-types';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { existsQuery, kqlQuery } from '@kbn/observability-plugin/server';
+import { estypes } from '@elastic/elasticsearch';
+import { getBucketSizeFromTimeRangeAndBucketCount, getLogErrorRate } from '../../utils';
+import { LOG_LEVEL } from '../../es_fields';
+
+export interface LogsErrorRateTimeseries {
+  esClient: ElasticsearchClient;
+  serviceEnvironmentQuery?: QueryDslQueryContainer[];
+  serviceNames: string[];
+  identifyingMetadata: string;
+  timeFrom: number;
+  timeTo: number;
+  kuery?: string;
+}
+
+const getLogErrorsAggregation = () => ({
+  terms: {
+    field: LOG_LEVEL,
+    include: ['error', 'ERROR'],
+  },
+});
+
+type LogErrorsAggregation = ReturnType<typeof getLogErrorsAggregation>;
+interface LogsErrorRateTimeseriesHistogram {
+  timeseries: AggregationResultOf<
+    {
+      date_histogram: AggregationOptionsByType['date_histogram'];
+      aggs: { logErrors: LogErrorsAggregation };
+    },
+    {}
+  >;
+  doc_count: number;
+  key: string;
+}
+
+interface LogRateQueryAggregation {
+  services: estypes.AggregationsTermsAggregateBase<LogsErrorRateTimeseriesHistogram>;
+}
+export interface LogsErrorRateTimeseriesReturnType {
+  [serviceName: string]: Array<{ x: number; y: number | null }>;
+}
+export function createGetLogErrorRateTimeseries() {
+  return async ({
+    esClient,
+    identifyingMetadata,
+    serviceNames,
+    timeFrom,
+    timeTo,
+    kuery,
+    serviceEnvironmentQuery = [],
+  }: LogsErrorRateTimeseries): Promise<LogsErrorRateTimeseriesReturnType> => {
+    const intervalString = getBucketSizeFromTimeRangeAndBucketCount(timeFrom, timeTo, 50);
+
+    const esResponse = await esClient.search({
+      index: 'logs-*-*',
+      size: 0,
+      query: {
+        bool: {
+          filter: [
+            ...existsQuery(LOG_LEVEL),
+            ...kqlQuery(kuery),
+            {
+              terms: {
+                [identifyingMetadata]: serviceNames,
+              },
+            },
+            ...serviceEnvironmentQuery,
+            {
+              range: {
+                ['@timestamp']: {
+                  gte: timeFrom,
+                  lte: timeTo,
+                  format: 'epoch_millis',
+                },
+              },
+            },
+          ],
+        },
+      },
+      aggs: {
+        services: {
+          terms: {
+            field: identifyingMetadata,
+          },
+          aggs: {
+            timeseries: {
+              date_histogram: {
+                field: '@timestamp',
+                fixed_interval: `${intervalString}s`,
+                min_doc_count: 0,
+                extended_bounds: {
+                  min: timeFrom,
+                  max: timeTo,
+                },
+              },
+              aggs: {
+                logErrors: getLogErrorsAggregation(),
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const aggregations = esResponse.aggregations as LogRateQueryAggregation | undefined;
+    const buckets = aggregations?.services.buckets as LogsErrorRateTimeseriesHistogram[];
+
+    return buckets
+      ? buckets.reduce<LogsErrorRateTimeseriesReturnType>((acc, bucket) => {
+          const timeseries = bucket.timeseries.buckets.map((timeseriesBucket) => {
+            const totalCount = timeseriesBucket.doc_count;
+            const logErrorCount = timeseriesBucket.logErrors.buckets[0]?.doc_count;
+
+            return {
+              x: timeseriesBucket.key,
+              y: logErrorCount ? getLogErrorRate({ logCount: totalCount, logErrorCount }) : null,
+            };
+          });
+
+          return {
+            ...acc,
+            [bucket.key]: timeseries,
+          };
+        }, {})
+      : {};
+  };
+}
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rate_timeseries/get_logs_rate_timeseries.ts b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rate_timeseries/get_logs_rate_timeseries.ts
new file mode 100644
index 0000000000000..c0e9704931578
--- /dev/null
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rate_timeseries/get_logs_rate_timeseries.ts
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import type { AggregationOptionsByType, AggregationResultOf } from '@kbn/es-types';
+import { ElasticsearchClient } from '@kbn/core/server';
+import { existsQuery, kqlQuery } from '@kbn/observability-plugin/server';
+import { estypes } from '@elastic/elasticsearch';
+import { getBucketSizeFromTimeRangeAndBucketCount } from '../../utils';
+import { LOG_LEVEL } from '../../es_fields';
+
+export interface LogsRateTimeseries {
+  esClient: ElasticsearchClient;
+  serviceEnvironmentQuery?: QueryDslQueryContainer[];
+  serviceNames: string[];
+  identifyingMetadata: string;
+  timeFrom: number;
+  timeTo: number;
+  kuery?: string;
+}
+
+interface LogsRateTimeseriesHistogram {
+  timeseries: AggregationResultOf<
+    {
+      date_histogram: AggregationOptionsByType['date_histogram'];
+    },
+    {}
+  >;
+  doc_count: number;
+  key: string;
+}
+
+interface LogRateQueryAggregation {
+  service: estypes.AggregationsTermsAggregateBase<LogsRateTimeseriesHistogram>;
+}
+export interface LogsRateTimeseriesReturnType {
+  [serviceName: string]: Array<{ x: number; y: number | null }>;
+}
+export function createGetLogsRateTimeseries() {
+  return async ({
+    esClient,
+    identifyingMetadata,
+    serviceNames,
+    timeFrom,
+    timeTo,
+    kuery,
+    serviceEnvironmentQuery = [],
+  }: LogsRateTimeseries): Promise<LogsRateTimeseriesReturnType> => {
+    const intervalString = getBucketSizeFromTimeRangeAndBucketCount(timeFrom, timeTo, 50);
+
+    const esResponse = await esClient.search({
+      index: 'logs-*-*',
+      size: 0,
+      query: {
+        bool: {
+          filter: [
+            ...existsQuery(LOG_LEVEL),
+            ...kqlQuery(kuery),
+            {
+              terms: {
+                [identifyingMetadata]: serviceNames,
+              },
+            },
+            ...serviceEnvironmentQuery,
+            {
+              range: {
+                ['@timestamp']: {
+                  gte: timeFrom,
+                  lte: timeTo,
+                  format: 'epoch_millis',
+                },
+              },
+            },
+          ],
+        },
+      },
+      aggs: {
+        service: {
+          terms: {
+            field: identifyingMetadata,
+          },
+          aggs: {
+            timeseries: {
+              date_histogram: {
+                field: '@timestamp',
+                fixed_interval: `${intervalString}s`,
+                min_doc_count: 0,
+                extended_bounds: {
+                  min: timeFrom,
+                  max: timeTo,
+                },
+              },
+            },
+          },
+        },
+      },
+    });
+
+    const aggregations = esResponse.aggregations as LogRateQueryAggregation | undefined;
+    const buckets = aggregations?.service.buckets as LogsRateTimeseriesHistogram[];
+
+    return buckets
+      ? buckets.reduce<LogsRateTimeseriesReturnType>((acc, bucket) => {
+          const totalCount = bucket.doc_count;
+
+          const timeseries = bucket.timeseries.buckets.map((timeseriesBucket) => {
+            return {
+              x: timeseriesBucket.key,
+              y: timeseriesBucket.doc_count / totalCount,
+            };
+          });
+
+          return {
+            ...acc,
+            [bucket.key]: timeseries,
+          };
+        }, {})
+      : {};
+  };
+}
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/index.ts b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/index.ts
index 0ef186d16b180..1eeeb82ed0b92 100644
--- a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/index.ts
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/index.ts
@@ -7,8 +7,8 @@
 
 import { ElasticsearchClient } from '@kbn/core/server';
 import { estypes } from '@elastic/elasticsearch';
-import { RegisterServicesParams } from '../register_services';
-import { getLogErrorRate, getLogRatePerMinute } from './utils';
+import { getLogErrorRate, getLogRatePerMinute } from '../../utils';
+import { LOG_LEVEL } from '../../es_fields';
 
 export interface LogsRatesServiceParams {
   esClient: ElasticsearchClient;
@@ -35,7 +35,7 @@ export interface LogsRatesServiceReturnType {
   [serviceName: string]: LogsRatesMetrics;
 }
 
-export function createGetLogsRatesService(params: RegisterServicesParams) {
+export function createGetLogsRatesService() {
   return async ({
     esClient,
     identifyingMetadata,
@@ -52,7 +52,7 @@ export function createGetLogsRatesService(params: RegisterServicesParams) {
             {
               exists: {
                 // For now, we don't want to count APM server logs or any other logs that don't have the log.level field.
-                field: 'log.level',
+                field: LOG_LEVEL,
               },
             },
             {
@@ -80,7 +80,7 @@ export function createGetLogsRatesService(params: RegisterServicesParams) {
           aggs: {
             logErrors: {
               terms: {
-                field: 'log.level',
+                field: LOG_LEVEL,
                 include: ['error', 'ERROR'],
               },
             },
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/register_services.ts b/x-pack/plugins/observability_solution/logs_data_access/server/services/register_services.ts
index 26435a5657be9..4756bb17f25b1 100644
--- a/x-pack/plugins/observability_solution/logs_data_access/server/services/register_services.ts
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/services/register_services.ts
@@ -8,6 +8,8 @@
 import { SavedObjectsServiceStart } from '@kbn/core-saved-objects-server';
 import { UiSettingsServiceStart } from '@kbn/core-ui-settings-server';
 import { Logger } from '@kbn/logging';
+import { createGetLogsRateTimeseries } from './get_logs_rate_timeseries/get_logs_rate_timeseries';
+import { createGetLogErrorRateTimeseries } from './get_logs_error_rate_timeseries/get_logs_error_rate_timeseries';
 import { createGetLogsRatesService } from './get_logs_rates_service';
 import { createGetLogSourcesService } from './log_sources_service';
 
@@ -21,7 +23,9 @@ export interface RegisterServicesParams {
 
 export function registerServices(params: RegisterServicesParams) {
   return {
-    getLogsRatesService: createGetLogsRatesService(params),
+    getLogsRatesService: createGetLogsRatesService(),
+    getLogsRateTimeseries: createGetLogsRateTimeseries(),
+    getLogsErrorRateTimeseries: createGetLogErrorRateTimeseries(),
     getLogSourcesService: createGetLogSourcesService(params),
   };
 }
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.ts b/x-pack/plugins/observability_solution/logs_data_access/server/utils/index.ts
similarity index 64%
rename from x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.ts
rename to x-pack/plugins/observability_solution/logs_data_access/server/utils/index.ts
index c56f7114999ad..9d6e42365140f 100644
--- a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.ts
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/utils/index.ts
@@ -5,6 +5,19 @@
  * 2.0.
  */
 
+import moment from 'moment/moment';
+import { calculateAuto } from '@kbn/calculate-auto';
+
+export function getBucketSizeFromTimeRangeAndBucketCount(
+  timeFrom: number,
+  timeTo: number,
+  numBuckets: number
+): number {
+  const duration = moment.duration(timeTo - timeFrom, 'ms');
+
+  return Math.max(calculateAuto.near(numBuckets, duration)?.asSeconds() ?? 0, 60);
+}
+
 export function getLogRatePerMinute({
   logCount,
   timeFrom,
diff --git a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.test.ts b/x-pack/plugins/observability_solution/logs_data_access/server/utils/utils.test.ts
similarity index 95%
rename from x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.test.ts
rename to x-pack/plugins/observability_solution/logs_data_access/server/utils/utils.test.ts
index e1fbd84e7177b..3a1d83b9693a7 100644
--- a/x-pack/plugins/observability_solution/logs_data_access/server/services/get_logs_rates_service/utils.test.ts
+++ b/x-pack/plugins/observability_solution/logs_data_access/server/utils/utils.test.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { getLogRatePerMinute, getLogErrorRate } from './utils';
+import { getLogRatePerMinute, getLogErrorRate } from '.';
 
 describe('getLogRatePerMinute', () => {
   it('should log rate per minute for one minute period', () => {
diff --git a/x-pack/plugins/observability_solution/logs_data_access/tsconfig.json b/x-pack/plugins/observability_solution/logs_data_access/tsconfig.json
index 1bc17c4f8814a..09a57dea36e49 100644
--- a/x-pack/plugins/observability_solution/logs_data_access/tsconfig.json
+++ b/x-pack/plugins/observability_solution/logs_data_access/tsconfig.json
@@ -3,13 +3,15 @@
   "compilerOptions": {
     "outDir": "target/types"
   },
-  "include": ["common/**/*", "server/**/*",  "public/**/*", "jest.config.js"],
+  "include": ["common/**/*", "server/**/*", "public/**/*", "jest.config.js"],
   "exclude": ["target/**/*"],
   "kbn_references": [
     "@kbn/core",
-    "@kbn/logging",
     "@kbn/data-plugin",
     "@kbn/data-views-plugin",
+    "@kbn/observability-plugin",
+    "@kbn/calculate-auto",
+    "@kbn/es-types",
     "@kbn/core-http-server",
     "@kbn/management-settings-ids",
     "@kbn/config-schema",
@@ -18,5 +20,6 @@
     "@kbn/core-saved-objects-server",
     "@kbn/core-ui-settings-server",
     "@kbn/core-ui-settings-browser",
+    "@kbn/logging"
   ]
 }
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx b/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
index 94b46ffbaf49c..a38626fd10eae 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.test.tsx
@@ -5,29 +5,55 @@
  * 2.0.
  */
 
+import { coreMock } from '@kbn/core/public/mocks';
+import {
+  uptimeOverviewLocatorID,
+  UptimeOverviewLocatorInfraParams,
+  UptimeOverviewLocatorParams,
+} from '@kbn/deeplinks-observability';
+import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
+import { MockUrlService } from '@kbn/share-plugin/common/mocks';
+import { type UrlService } from '@kbn/share-plugin/common/url_service';
+import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 import { subj as testSubject } from '@kbn/test-subj-selector';
-import React, { FC, PropsWithChildren } from 'react';
+import React, { FC } from 'react';
 import { act } from 'react-dom/test-utils';
-
-// import { mount } from 'enzyme';
 import { LogEntryActionsMenu } from './log_entry_actions_menu';
-import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
-import { coreMock } from '@kbn/core/public/mocks';
-import { mountWithIntl as mount } from '@kbn/test-jest-helpers';
 
 const coreStartMock = coreMock.createStart();
 coreStartMock.application.getUrlForApp.mockImplementation((app, options) => {
   return `/test-basepath/s/test-space/app/${app}${options?.path}`;
 });
 
-const ProviderWrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
-  return <KibanaContextProvider services={{ ...coreStartMock }}>{children}</KibanaContextProvider>;
+const emptyUrlService = new MockUrlService();
+const urlServiceWithUptimeLocator = new MockUrlService();
+// we can't use the actual locator here because its import would create a
+// forbidden ts project reference cycle
+urlServiceWithUptimeLocator.locators.create<
+  UptimeOverviewLocatorInfraParams | UptimeOverviewLocatorParams
+>({
+  id: uptimeOverviewLocatorID,
+  getLocation: async (params) => {
+    return { app: 'uptime', path: '/overview', state: {} };
+  },
+});
+
+const ProviderWrapper: FC<{ urlService?: UrlService }> = ({
+  children,
+  urlService = emptyUrlService,
+}) => {
+  return (
+    <KibanaContextProvider services={{ ...coreStartMock, share: { url: urlService } }}>
+      {children}
+    </KibanaContextProvider>
+  );
 };
 
 describe('LogEntryActionsMenu component', () => {
   const time = new Date().toISOString();
-  describe('uptime link', () => {
-    it('renders with a host ip filter when present in log entry', () => {
+
+  describe('uptime link with legacy uptime disabled', () => {
+    it('renders as disabled even when a supported field is present', () => {
       const elementWrapper = mount(
         <ProviderWrapper>
           <LogEntryActionsMenu
@@ -53,16 +79,21 @@ describe('LogEntryActionsMenu component', () => {
       elementWrapper.update();
 
       expect(
-        elementWrapper.find(`a${testSubject('~uptimeLogEntryActionsMenuItem')}`).prop('href')
-      ).toBe('/test-basepath/s/test-space/app/uptime#/?search=host.ip:HOST_IP');
+        elementWrapper
+          .find(`${testSubject('~uptimeLogEntryActionsMenuItem')}`)
+          .first()
+          .prop('disabled')
+      ).toEqual(true);
     });
+  });
 
-    it('renders with a container id filter when present in log entry', () => {
+  describe('uptime link with legacy uptime enabled', () => {
+    it('renders as enabled when a host ip is present in the log entry', () => {
       const elementWrapper = mount(
-        <ProviderWrapper>
+        <ProviderWrapper urlService={urlServiceWithUptimeLocator}>
           <LogEntryActionsMenu
             logEntry={{
-              fields: [{ field: 'container.id', value: ['CONTAINER_ID'] }],
+              fields: [{ field: 'host.ip', value: ['HOST_IP'] }],
               id: 'ITEM_ID',
               index: 'INDEX',
               cursor: {
@@ -84,15 +115,15 @@ describe('LogEntryActionsMenu component', () => {
 
       expect(
         elementWrapper.find(`a${testSubject('~uptimeLogEntryActionsMenuItem')}`).prop('href')
-      ).toBe('/test-basepath/s/test-space/app/uptime#/?search=container.id:CONTAINER_ID');
+      ).toEqual(expect.any(String));
     });
 
-    it('renders with a pod uid filter when present in log entry', () => {
+    it('renders as enabled when a container id is present in the log entry', () => {
       const elementWrapper = mount(
-        <ProviderWrapper>
+        <ProviderWrapper urlService={urlServiceWithUptimeLocator}>
           <LogEntryActionsMenu
             logEntry={{
-              fields: [{ field: 'kubernetes.pod.uid', value: ['POD_UID'] }],
+              fields: [{ field: 'container.id', value: ['CONTAINER_ID'] }],
               id: 'ITEM_ID',
               index: 'INDEX',
               cursor: {
@@ -114,19 +145,15 @@ describe('LogEntryActionsMenu component', () => {
 
       expect(
         elementWrapper.find(`a${testSubject('~uptimeLogEntryActionsMenuItem')}`).prop('href')
-      ).toBe('/test-basepath/s/test-space/app/uptime#/?search=kubernetes.pod.uid:POD_UID');
+      ).toEqual(expect.any(String));
     });
 
-    it('renders with a disjunction of filters when multiple present in log entry', () => {
+    it('renders as enabled when a pod uid is present in the log entry', () => {
       const elementWrapper = mount(
-        <ProviderWrapper>
+        <ProviderWrapper urlService={urlServiceWithUptimeLocator}>
           <LogEntryActionsMenu
             logEntry={{
-              fields: [
-                { field: 'container.id', value: ['CONTAINER_ID'] },
-                { field: 'host.ip', value: ['HOST_IP'] },
-                { field: 'kubernetes.pod.uid', value: ['POD_UID'] },
-              ],
+              fields: [{ field: 'kubernetes.pod.uid', value: ['POD_UID'] }],
               id: 'ITEM_ID',
               index: 'INDEX',
               cursor: {
@@ -148,14 +175,12 @@ describe('LogEntryActionsMenu component', () => {
 
       expect(
         elementWrapper.find(`a${testSubject('~uptimeLogEntryActionsMenuItem')}`).prop('href')
-      ).toBe(
-        '/test-basepath/s/test-space/app/uptime#/?search=container.id:CONTAINER_ID%20or%20host.ip:HOST_IP%20or%20kubernetes.pod.uid:POD_UID'
-      );
+      ).toEqual(expect.any(String));
     });
 
-    it('renders as disabled when no supported field is present in log entry', () => {
+    it('renders as disabled when no supported field is present in the log entry', () => {
       const elementWrapper = mount(
-        <ProviderWrapper>
+        <ProviderWrapper urlService={urlServiceWithUptimeLocator}>
           <LogEntryActionsMenu
             logEntry={{
               fields: [],
@@ -180,7 +205,8 @@ describe('LogEntryActionsMenu component', () => {
 
       expect(
         elementWrapper
-          .find(`button${testSubject('~uptimeLogEntryActionsMenuItem')}`)
+          .find(`${testSubject('~uptimeLogEntryActionsMenuItem')}`)
+          .first()
           .prop('disabled')
       ).toEqual(true);
     });
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx b/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
index e99304a61b453..4f16d34a489ac 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
+++ b/x-pack/plugins/observability_solution/logs_shared/public/components/logging/log_entry_flyout/log_entry_actions_menu.tsx
@@ -6,28 +6,36 @@
  */
 
 import { EuiButton, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
+import {
+  uptimeOverviewLocatorID,
+  type UptimeOverviewLocatorInfraParams,
+} from '@kbn/deeplinks-observability';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { LinkDescriptor, useLinkProps } from '@kbn/observability-shared-plugin/public';
+import { getRouterLinkProps } from '@kbn/router-utils';
+import { ILocatorClient } from '@kbn/share-plugin/common/url_service';
 import React, { useMemo } from 'react';
-import { useLinkProps, LinkDescriptor } from '@kbn/observability-shared-plugin/public';
-import { useVisibilityState } from '../../../utils/use_visibility_state';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
-
-const UPTIME_FIELDS = ['container.id', 'host.ip', 'kubernetes.pod.uid'];
+import { useKibanaContextForPlugin } from '../../../hooks/use_kibana';
+import { useVisibilityState } from '../../../utils/use_visibility_state';
 
 export interface LogEntryActionsMenuProps {
   logEntry: LogEntry;
 }
 
 export const LogEntryActionsMenu = ({ logEntry }: LogEntryActionsMenuProps) => {
+  const {
+    services: {
+      share: {
+        url: { locators },
+      },
+    },
+  } = useKibanaContextForPlugin();
   const { hide, isVisible, toggle } = useVisibilityState(false);
 
   const apmLinkDescriptor = useMemo(() => getAPMLink(logEntry), [logEntry]);
-  const uptimeLinkDescriptor = useMemo(() => getUptimeLink(logEntry), [logEntry]);
 
-  const uptimeLinkProps = useLinkProps({
-    app: 'uptime',
-    ...(uptimeLinkDescriptor ? uptimeLinkDescriptor : {}),
-  });
+  const uptimeLinkProps = getUptimeLink({ locators })(logEntry);
 
   const apmLinkProps = useLinkProps({
     app: 'apm',
@@ -38,7 +46,7 @@ export const LogEntryActionsMenu = ({ logEntry }: LogEntryActionsMenuProps) => {
     () => [
       <EuiContextMenuItem
         data-test-subj="logEntryActionsMenuItem uptimeLogEntryActionsMenuItem"
-        disabled={!uptimeLinkDescriptor}
+        disabled={!uptimeLinkProps}
         icon="uptimeApp"
         key="uptimeLink"
         {...uptimeLinkProps}
@@ -61,7 +69,7 @@ export const LogEntryActionsMenu = ({ logEntry }: LogEntryActionsMenuProps) => {
         />
       </EuiContextMenuItem>,
     ],
-    [uptimeLinkDescriptor, apmLinkDescriptor, apmLinkProps, uptimeLinkProps]
+    [apmLinkDescriptor, apmLinkProps, uptimeLinkProps]
   );
 
   const hasMenuItems = useMemo(() => menuItems.length > 0, [menuItems]);
@@ -92,25 +100,40 @@ export const LogEntryActionsMenu = ({ logEntry }: LogEntryActionsMenuProps) => {
   );
 };
 
-const getUptimeLink = (logEntry: LogEntry): LinkDescriptor | undefined => {
-  const searchExpressions = logEntry.fields
-    .filter(({ field, value }) => value != null && UPTIME_FIELDS.includes(field))
-    .reduce<string[]>((acc, fieldItem) => {
-      const { field, value } = fieldItem;
-      return acc.concat(value.map((val) => `${field}:${val}`));
-    }, []);
-
-  if (searchExpressions.length === 0) {
-    return undefined;
-  }
-  return {
-    app: 'uptime',
-    hash: '/',
-    search: {
-      search: `${searchExpressions.join(' or ')}`,
-    },
+const getUptimeLink =
+  ({ locators }: { locators: ILocatorClient }) =>
+  (logEntry: LogEntry): ContextRouterLinkProps | undefined => {
+    const uptimeLocator = locators.get<UptimeOverviewLocatorInfraParams>(uptimeOverviewLocatorID);
+
+    if (!uptimeLocator) {
+      return undefined;
+    }
+
+    const ipValue = logEntry.fields.find(({ field }) => field === 'host.ip')?.value?.[0];
+    const containerValue = logEntry.fields.find(({ field }) => field === 'container.id')
+      ?.value?.[0];
+    const podValue = logEntry.fields.find(({ field }) => field === 'kubernetes.pod.uid')
+      ?.value?.[0];
+    const hostValue = logEntry.fields.find(({ field }) => field === 'host.name')?.value?.[0];
+
+    const uptimeLocatorParams: UptimeOverviewLocatorInfraParams = {
+      ...(typeof ipValue === 'string' && { ip: ipValue }),
+      ...(typeof containerValue === 'string' && { container: containerValue }),
+      ...(typeof podValue === 'string' && { pod: podValue }),
+      ...(typeof hostValue === 'string' && { host: hostValue }),
+    };
+
+    if (Object.keys(uptimeLocatorParams).length === 0) {
+      return undefined;
+    }
+
+    // Coercing the return value to ContextRouterLinkProps because
+    // EuiContextMenuItem defines a too broad type for onClick
+    return getRouterLinkProps({
+      href: uptimeLocator.getRedirectUrl(uptimeLocatorParams),
+      onClick: () => uptimeLocator.navigate(uptimeLocatorParams),
+    }) as ContextRouterLinkProps;
   };
-};
 
 const getAPMLink = (logEntry: LogEntry): LinkDescriptor | undefined => {
   const traceId = logEntry.fields.find(
@@ -153,3 +176,8 @@ function getApmTraceUrl({
 }) {
   return `/link-to/trace/${traceId}?` + new URLSearchParams({ rangeFrom, rangeTo }).toString();
 }
+
+export interface ContextRouterLinkProps {
+  href: string | undefined;
+  onClick: (event: React.MouseEvent) => void;
+}
diff --git a/x-pack/plugins/observability_solution/logs_shared/public/types.ts b/x-pack/plugins/observability_solution/logs_shared/public/types.ts
index 0e89358d2e0fa..9f0d344294880 100644
--- a/x-pack/plugins/observability_solution/logs_shared/public/types.ts
+++ b/x-pack/plugins/observability_solution/logs_shared/public/types.ts
@@ -10,8 +10,8 @@ import type { DataPublicPluginStart } from '@kbn/data-plugin/public';
 import type { DataViewsPublicPluginStart } from '@kbn/data-views-plugin/public';
 import type { DiscoverSharedPublicStart } from '@kbn/discover-shared-plugin/public';
 import type { ObservabilityAIAssistantPublicStart } from '@kbn/observability-ai-assistant-plugin/public';
-import { SharePluginSetup } from '@kbn/share-plugin/public';
-import { UiActionsStart } from '@kbn/ui-actions-plugin/public';
+import type { SharePluginSetup, SharePluginStart } from '@kbn/share-plugin/public';
+import type { UiActionsStart } from '@kbn/ui-actions-plugin/public';
 
 import { LogsSharedLocators } from '../common/locators';
 import type { LogAIAssistantProps } from './components/log_ai_assistant/log_ai_assistant';
@@ -38,6 +38,7 @@ export interface LogsSharedClientStartDeps {
   dataViews: DataViewsPublicPluginStart;
   discoverShared: DiscoverSharedPublicStart;
   observabilityAIAssistant?: ObservabilityAIAssistantPublicStart;
+  share: SharePluginStart;
   uiActions: UiActionsStart;
 }
 
diff --git a/x-pack/plugins/observability_solution/logs_shared/tsconfig.json b/x-pack/plugins/observability_solution/logs_shared/tsconfig.json
index df4b5e8bcc6ff..d826cd78618c5 100644
--- a/x-pack/plugins/observability_solution/logs_shared/tsconfig.json
+++ b/x-pack/plugins/observability_solution/logs_shared/tsconfig.json
@@ -39,6 +39,7 @@
     "@kbn/search-types",
     "@kbn/discover-shared-plugin",
     "@kbn/react-kibana-context-theme",
-    "@kbn/test-jest-helpers"
+    "@kbn/test-jest-helpers",
+    "@kbn/router-utils",
   ]
 }
diff --git a/x-pack/plugins/observability_solution/observability/common/index.ts b/x-pack/plugins/observability_solution/observability/common/index.ts
index c8247e0d55dc0..30765fed43e3d 100644
--- a/x-pack/plugins/observability_solution/observability/common/index.ts
+++ b/x-pack/plugins/observability_solution/observability/common/index.ts
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 export type { AsDuration, AsPercent, TimeUnitChar, TimeFormatter } from './utils/formatters';
 
 export {
@@ -76,7 +75,7 @@ export const observabilityFeatureId = 'observability';
 
 // Name of a locator created by the uptime plugin. Intended for use
 // by other plugins as well, so defined here to prevent cross-references.
-export const uptimeOverviewLocatorID = 'UPTIME_OVERVIEW_LOCATOR';
+export { uptimeOverviewLocatorID } from '@kbn/deeplinks-observability';
 export const syntheticsMonitorDetailLocatorID = 'SYNTHETICS_MONITOR_DETAIL_LOCATOR';
 export const syntheticsEditMonitorLocatorID = 'SYNTHETICS_EDIT_MONITOR_LOCATOR';
 export const syntheticsSettingsLocatorID = 'SYNTHETICS_SETTINGS';
diff --git a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/components/group_by.tsx b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/components/group_by.tsx
index 199f5357fbea4..54047f42971f2 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/components/group_by.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/components/group_by.tsx
@@ -22,10 +22,9 @@ interface Props {
   options: GroupByOptions;
   onChange: (groupBy: GroupBy) => void;
   fields: MetricsExplorerFields;
-  errorOptions?: string[];
 }
 
-export function GroupBy({ options, onChange, fields, errorOptions, ...rest }: Props) {
+export function GroupBy({ options, onChange, fields, ...rest }: Props) {
   const handleChange = useCallback(
     (selectedOptions: Array<{ label: string }>) => {
       const groupBy = selectedOptions.map((option) => option.label);
@@ -35,17 +34,9 @@ export function GroupBy({ options, onChange, fields, errorOptions, ...rest }: Pr
   );
 
   const selectedOptions = Array.isArray(options.groupBy)
-    ? options.groupBy.map((field) => ({
-        label: field,
-        color: errorOptions?.includes(field) ? 'danger' : undefined,
-      }))
+    ? options.groupBy.map((field) => ({ label: field }))
     : options.groupBy
-    ? [
-        {
-          label: options.groupBy,
-          color: errorOptions?.includes(options.groupBy) ? 'danger' : undefined,
-        },
-      ]
+    ? [{ label: options.groupBy }]
     : [];
 
   return (
diff --git a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/custom_threshold_rule_expression.tsx b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/custom_threshold_rule_expression.tsx
index 0db9c2f048e11..061805a709ea6 100644
--- a/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/custom_threshold_rule_expression.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/components/custom_threshold/custom_threshold_rule_expression.tsx
@@ -16,10 +16,8 @@ import {
   EuiFormRow,
   EuiHorizontalRule,
   EuiIconTip,
-  EuiLink,
   EuiLoadingSpinner,
   EuiSpacer,
-  EuiText,
   EuiTitle,
 } from '@elastic/eui';
 import { ISearchSource, Query } from '@kbn/data-plugin/common';
@@ -72,7 +70,6 @@ export default function Expressions(props: Props) {
     data,
     dataViews,
     dataViewEditor,
-    docLinks,
     unifiedSearch: {
       ui: { SearchBar },
     },
@@ -331,30 +328,6 @@ export default function Expressions(props: Props) {
     [ruleParams.groupBy]
   );
 
-  // Test to see if any of the group fields in groupBy are already filtered down to a single
-  // group by the filterQuery. If this is the case, then a groupBy is unnecessary, as it would only
-  // ever produce one group instance
-  const groupByFilterTestPatterns = useMemo(() => {
-    if (!ruleParams.groupBy) return null;
-    const groups = !Array.isArray(ruleParams.groupBy) ? [ruleParams.groupBy] : ruleParams.groupBy;
-    return groups.map((group: string) => ({
-      groupName: group,
-      pattern: new RegExp(`{"match(_phrase)?":{"${group}":"(.*?)"}}`),
-    }));
-  }, [ruleParams.groupBy]);
-
-  const redundantFilterGroupBy = useMemo(() => {
-    const { filterQuery } = ruleParams;
-    if (typeof filterQuery !== 'string' || !groupByFilterTestPatterns) return [];
-    return groupByFilterTestPatterns
-      .map(({ groupName, pattern }) => {
-        if (pattern.test(filterQuery)) {
-          return groupName;
-        }
-      })
-      .filter((g) => typeof g === 'string') as string[];
-  }, [ruleParams, groupByFilterTestPatterns]);
-
   if (paramsError) {
     return (
       <>
@@ -562,35 +535,8 @@ export default function Expressions(props: Props) {
           options={{
             groupBy: ruleParams.groupBy || null,
           }}
-          errorOptions={redundantFilterGroupBy}
         />
       </EuiFormRow>
-      {redundantFilterGroupBy.length > 0 && (
-        <>
-          <EuiSpacer size="s" />
-          <EuiText size="xs" color="danger">
-            <FormattedMessage
-              id="xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError"
-              defaultMessage="This rule may alert on {matchedGroups} less than expected, because the filter query contains a match for {groupCount, plural, one {this field} other {these fields}}. For more information, refer to {filteringAndGroupingLink}."
-              values={{
-                matchedGroups: <strong>{redundantFilterGroupBy.join(', ')}</strong>,
-                groupCount: redundantFilterGroupBy.length,
-                filteringAndGroupingLink: (
-                  <EuiLink
-                    data-test-subj="thresholdRuleExpressionsTheDocsLink"
-                    href={`${docLinks.links.observability.metricsThreshold}#filtering-and-grouping`}
-                  >
-                    {i18n.translate(
-                      'xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink',
-                      { defaultMessage: 'the docs' }
-                    )}
-                  </EuiLink>
-                ),
-              }}
-            />
-          </EuiText>
-        </>
-      )}
       <EuiSpacer size="s" />
       <EuiCheckbox
         id="metrics-alert-group-disappear-toggle"
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/header_menu/header_menu.tsx b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/header_menu/header_menu.tsx
index 52ca08e40c031..67fba37eece45 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/header_menu/header_menu.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/header_menu/header_menu.tsx
@@ -6,6 +6,10 @@
  */
 
 import { EuiFlexGroup, EuiFlexItem, EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
+import {
+  ObservabilityOnboardingLocatorParams,
+  OBSERVABILITY_ONBOARDING_LOCATOR,
+} from '@kbn/deeplinks-observability';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { usePluginContext } from '../../../../hooks/use_plugin_context';
@@ -14,7 +18,12 @@ import { useKibana } from '../../../../utils/kibana_react';
 import HeaderMenuPortal from './header_menu_portal';
 
 export function HeaderMenu(): React.ReactElement | null {
-  const { http, theme } = useKibana().services;
+  const { share, theme } = useKibana().services;
+
+  const onboardingLocator = share?.url.locators.get<ObservabilityOnboardingLocatorParams>(
+    OBSERVABILITY_ONBOARDING_LOCATOR
+  );
+  const href = onboardingLocator?.useUrl({});
 
   const { appMountParameters } = usePluginContext();
 
@@ -26,13 +35,9 @@ export function HeaderMenu(): React.ReactElement | null {
       <EuiFlexGroup responsive={false} gutterSize="s">
         <EuiFlexItem>
           <EuiHeaderLinks>
-            <EuiHeaderLink
-              color="primary"
-              href={http.basePath.prepend('/app/integrations/browse')}
-              iconType="indexOpen"
-            >
+            <EuiHeaderLink color="primary" href={href} iconType="indexOpen">
               {i18n.translate('xpack.observability.home.addData', {
-                defaultMessage: 'Add integrations',
+                defaultMessage: 'Add data',
               })}
             </EuiHeaderLink>
           </EuiHeaderLinks>
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/observability_onboarding_callout.tsx b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/observability_onboarding_callout.tsx
index 15af235a7fa09..3dd91aff925b6 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/observability_onboarding_callout.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/observability_onboarding_callout.tsx
@@ -14,14 +14,19 @@ import {
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
+import { ObservabilityOnboardingLocatorParams } from '@kbn/deeplinks-observability';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { useKibana } from '@kbn/kibana-react-plugin/public';
 import { useUiTracker } from '@kbn/observability-shared-plugin/public';
 import React, { useCallback } from 'react';
+import { ObservabilityPublicPluginsStart } from '../../../plugin';
 import { useObservabilityOnboarding } from '../../../hooks/use_observability_onboarding';
 
 export function ObservabilityOnboardingCallout() {
-  const { application } = useKibana().services;
+  const { application, share } = useKibana<ObservabilityPublicPluginsStart>().services;
+  const onboardingHref = share?.url.locators
+    .get<ObservabilityOnboardingLocatorParams>('OBSERVABILITY_ONBOARDING_LOCATOR')
+    ?.useUrl({ category: 'logs' });
 
   const trackMetric = useUiTracker({ app: 'observability-overview' });
   const { isObservabilityOnboardingDismissed, dismissObservabilityOnboarding } =
@@ -34,7 +39,7 @@ export function ObservabilityOnboardingCallout() {
 
   const getStarted = () => {
     trackMetric({ metric: 'observability_onboarding_get_started' });
-    application?.navigateToApp('observabilityOnboarding');
+    application?.navigateToUrl(onboardingHref!);
   };
 
   return !isObservabilityOnboardingDismissed ? (
diff --git a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/sections/empty/empty_sections.tsx b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/sections/empty/empty_sections.tsx
index 886f9ae4d42ed..d03f1570496c1 100644
--- a/x-pack/plugins/observability_solution/observability/public/pages/overview/components/sections/empty/empty_sections.tsx
+++ b/x-pack/plugins/observability_solution/observability/public/pages/overview/components/sections/empty/empty_sections.tsx
@@ -10,6 +10,7 @@ import React, { useContext } from 'react';
 import { ThemeContext } from 'styled-components';
 import { i18n } from '@kbn/i18n';
 import { HttpSetup } from '@kbn/core/public';
+import { OBSERVABILITY_ONBOARDING_LOCATOR } from '@kbn/deeplinks-observability';
 import { FETCH_STATUS } from '@kbn/observability-shared-plugin/public';
 
 import { useKibana } from '../../../../../utils/kibana_react';
@@ -18,11 +19,14 @@ import { useHasData } from '../../../../../hooks/use_has_data';
 import { EmptySection, Section } from './empty_section';
 
 export function EmptySections() {
-  const { http } = useKibana().services;
+  const { http, share } = useKibana().services;
+  const onboardingMetricsHref = share?.url.locators
+    .get(OBSERVABILITY_ONBOARDING_LOCATOR)
+    ?.useUrl({ category: 'metrics' });
   const theme = useContext(ThemeContext);
   const { hasDataMap } = useHasData();
 
-  const appEmptySections = getEmptySections({ http }).filter(({ id }) => {
+  const appEmptySections = getEmptySections({ http, onboardingMetricsHref }).filter(({ id }) => {
     const app = hasDataMap[id];
     if (app) {
       return app.status === FETCH_STATUS.FAILURE || !app.hasData;
@@ -57,7 +61,13 @@ export function EmptySections() {
   );
 }
 
-const getEmptySections = ({ http }: { http: HttpSetup }): Section[] => {
+const getEmptySections = ({
+  http,
+  onboardingMetricsHref,
+}: {
+  http: HttpSetup;
+  onboardingMetricsHref?: string;
+}): Section[] => {
   return [
     {
       id: 'infra_logs',
@@ -101,7 +111,7 @@ const getEmptySections = ({ http }: { http: HttpSetup }): Section[] => {
       linkTitle: i18n.translate('xpack.observability.emptySection.apps.metrics.link', {
         defaultMessage: 'Install Metricbeat',
       }),
-      href: http.basePath.prepend('/app/home#/tutorial_directory/metrics'),
+      href: onboardingMetricsHref ?? http.basePath.prepend('/app/home#/tutorial_directory/metrics'),
     },
     {
       id: 'uptime',
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts
index 2b834081a7ac9..f1b5b5567adc7 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/common/connectors.ts
@@ -8,11 +8,13 @@
 export enum ObservabilityAIAssistantConnectorType {
   Bedrock = '.bedrock',
   OpenAI = '.gen-ai',
+  Gemini = '.gemini',
 }
 
 export const SUPPORTED_CONNECTOR_TYPES = [
   ObservabilityAIAssistantConnectorType.OpenAI,
   ObservabilityAIAssistantConnectorType.Bedrock,
+  ObservabilityAIAssistantConnectorType.Gemini,
 ];
 
 export function isSupportedConnectorType(
@@ -20,6 +22,7 @@ export function isSupportedConnectorType(
 ): type is ObservabilityAIAssistantConnectorType {
   return (
     type === ObservabilityAIAssistantConnectorType.Bedrock ||
-    type === ObservabilityAIAssistantConnectorType.OpenAI
+    type === ObservabilityAIAssistantConnectorType.OpenAI ||
+    type === ObservabilityAIAssistantConnectorType.Gemini
   );
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/builders.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/builders.ts
index e233bf6da5d11..3a18b53cef669 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/builders.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/builders.ts
@@ -7,7 +7,7 @@
 
 import type { FunctionDefinition } from '../../common/functions/types';
 
-export function buildFunction(): FunctionDefinition {
+export function buildFunctionElasticsearch(): FunctionDefinition {
   return {
     name: 'elasticsearch',
     description: 'Call Elasticsearch APIs on behalf of the user',
@@ -30,8 +30,6 @@ export function buildFunction(): FunctionDefinition {
   };
 }
 
-export const buildFunctionElasticsearch = buildFunction;
-
 export function buildFunctionServiceSummary(): FunctionDefinition {
   return {
     name: 'get_service_summary',
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/create_screen_context_action.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/create_screen_context_action.ts
index fcd6e8dd7bb80..d2cf9f7df9519 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/create_screen_context_action.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/public/utils/create_screen_context_action.ts
@@ -26,5 +26,5 @@ export function createScreenContextAction<
   return {
     ...definition,
     respond,
-  };
+  } as ScreenContextActionDefinition<unknown>;
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/elasticsearch.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/elasticsearch.ts
index 8c255b885fd4c..6008b53dd42c5 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/elasticsearch.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/functions/elasticsearch.ts
@@ -7,13 +7,15 @@
 
 import type { FunctionRegistrationParameters } from '.';
 
+export const ELASTICSEARCH_FUNCTION_NAME = 'elasticsearch';
+
 export function registerElasticsearchFunction({
   functions,
   resources,
 }: FunctionRegistrationParameters) {
   functions.registerFunction(
     {
-      name: 'elasticsearch',
+      name: ELASTICSEARCH_FUNCTION_NAME,
       description:
         'Call Elasticsearch APIs on behalf of the user. Make sure the request body is valid for the API that you are using. Only call this function when the user has explicitly requested it.',
       descriptionForUser: 'Call Elasticsearch APIs on behalf of the user',
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/bedrock/bedrock_claude_adapter.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/bedrock/bedrock_claude_adapter.ts
index 5c1713ffe6743..0cbe2f98514a4 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/bedrock/bedrock_claude_adapter.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/bedrock/bedrock_claude_adapter.ts
@@ -17,12 +17,6 @@ import { getMessagesWithSimulatedFunctionCalling } from '../simulate_function_ca
 import { parseInlineFunctionCalls } from '../simulate_function_calling/parse_inline_function_calls';
 import { TOOL_USE_END } from '../simulate_function_calling/constants';
 
-function replaceFunctionsWithTools(content: string) {
-  return content.replaceAll(/(function)(s|[\s*\.])?(?!\scall)/g, (match, p1, p2) => {
-    return `tool${p2 || ''}`;
-  });
-}
-
 // Most of the work here is to re-format OpenAI-compatible functions for Claude.
 // See https://github.com/anthropics/anthropic-tools/blob/main/tool_use_package/prompt_constructors.py
 
@@ -46,7 +40,7 @@ export const createBedrockClaudeAdapter: LlmApiAdapterFactory = ({
       const formattedMessages = messagesWithSimulatedFunctionCalling.map((message) => {
         return {
           role: message.message.role,
-          content: replaceFunctionsWithTools(message.message.content ?? ''),
+          content: message.message.content ?? '',
         };
       });
 
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.test.ts
new file mode 100644
index 0000000000000..df2986fdfcf8d
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.test.ts
@@ -0,0 +1,357 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { Logger } from '@kbn/logging';
+import dedent from 'dedent';
+import { last } from 'lodash';
+import { last as lastOperator, lastValueFrom, partition, shareReplay } from 'rxjs';
+import { Readable } from 'stream';
+import {
+  ChatCompletionChunkEvent,
+  concatenateChatCompletionChunks,
+  MessageRole,
+  StreamingChatResponseEventType,
+} from '../../../../../common';
+import { TOOL_USE_END, TOOL_USE_START } from '../simulate_function_calling/constants';
+import { LlmApiAdapterFactory } from '../types';
+import { createGeminiAdapter } from './gemini_adapter';
+import { GoogleGenerateContentResponseChunk } from './types';
+
+describe('createGeminiAdapter', () => {
+  describe('getSubAction', () => {
+    function callSubActionFactory(overrides?: Partial<Parameters<LlmApiAdapterFactory>[0]>) {
+      const subActionParams = createGeminiAdapter({
+        logger: {
+          debug: jest.fn(),
+        } as unknown as Logger,
+        functions: [
+          {
+            name: 'my_tool',
+            description: 'My tool',
+            parameters: {
+              properties: {
+                myParam: {
+                  type: 'string',
+                },
+              },
+            },
+          },
+        ],
+        messages: [
+          {
+            '@timestamp': new Date().toString(),
+            message: {
+              role: MessageRole.System,
+              content: '',
+            },
+          },
+          {
+            '@timestamp': new Date().toString(),
+            message: {
+              role: MessageRole.User,
+              content: 'How can you help me?',
+            },
+          },
+        ],
+        ...overrides,
+      }).getSubAction().subActionParams as {
+        temperature: number;
+        messages: Array<{ role: string; content: string }>;
+      };
+
+      return {
+        ...subActionParams,
+        messages: subActionParams.messages.map((msg) => ({ ...msg, content: dedent(msg.content) })),
+      };
+    }
+    describe('with functions', () => {
+      it('sets the temperature to 0', () => {
+        expect(callSubActionFactory().temperature).toEqual(0);
+      });
+
+      it('formats the functions', () => {
+        expect(callSubActionFactory().messages[0].content).toContain(
+          dedent(
+            JSON.stringify([
+              {
+                name: 'my_tool',
+                description: 'My tool',
+                parameters: {
+                  properties: {
+                    myParam: {
+                      type: 'string',
+                    },
+                  },
+                },
+              },
+            ])
+          )
+        );
+      });
+
+      it('replaces mentions of functions with tools', () => {
+        const messages = [
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.System,
+              content:
+                'Call the "esql" tool. You can chain successive function calls, using the functions available.',
+            },
+          },
+        ];
+
+        const content = callSubActionFactory({ messages }).messages[0].content;
+
+        expect(content).not.toContain(`"esql" function`);
+        expect(content).toContain(`"esql" tool`);
+        expect(content).not.toContain(`functions`);
+        expect(content).toContain(`tools`);
+        expect(content).toContain(`tool calls`);
+      });
+
+      it('mentions to explicitly call the specified function if given', () => {
+        expect(last(callSubActionFactory({ functionCall: 'my_tool' }).messages)!.content).toContain(
+          'Remember, use the my_tool tool to answer this question.'
+        );
+      });
+
+      it('formats the function requests as JSON', () => {
+        const messages = [
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.System,
+              content: '',
+            },
+          },
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.Assistant,
+              function_call: {
+                name: 'my_tool',
+                arguments: JSON.stringify({ myParam: 'myValue' }),
+                trigger: MessageRole.User as const,
+              },
+            },
+          },
+        ];
+
+        expect(last(callSubActionFactory({ messages }).messages)!.content).toContain(
+          dedent(`${TOOL_USE_START}
+        \`\`\`json
+        ${JSON.stringify({ name: 'my_tool', input: { myParam: 'myValue' } })}
+        \`\`\`${TOOL_USE_END}`)
+        );
+      });
+
+      it('formats errors', () => {
+        const messages = [
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.System,
+              content: '',
+            },
+          },
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.Assistant,
+              function_call: {
+                name: 'my_tool',
+                arguments: JSON.stringify({ myParam: 'myValue' }),
+                trigger: MessageRole.User as const,
+              },
+            },
+          },
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.User,
+              name: 'my_tool',
+              content: JSON.stringify({ error: 'An internal server error occurred' }),
+            },
+          },
+        ];
+
+        expect(JSON.parse(last(callSubActionFactory({ messages }).messages)!.content)).toEqual({
+          type: 'tool_result',
+          tool: 'my_tool',
+          error: 'An internal server error occurred',
+          is_error: true,
+        });
+      });
+
+      it('formats function responses as JSON', () => {
+        const messages = [
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.System,
+              content: '',
+            },
+          },
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.Assistant,
+              function_call: {
+                name: 'my_tool',
+                arguments: JSON.stringify({ myParam: 'myValue' }),
+                trigger: MessageRole.User as const,
+              },
+            },
+          },
+          {
+            '@timestamp': new Date().toISOString(),
+            message: {
+              role: MessageRole.User,
+              name: 'my_tool',
+              content: JSON.stringify({ myResponse: { myParam: 'myValue' } }),
+            },
+          },
+        ];
+
+        expect(JSON.parse(last(callSubActionFactory({ messages }).messages)!.content)).toEqual({
+          type: 'tool_result',
+          tool: 'my_tool',
+          myResponse: { myParam: 'myValue' },
+        });
+      });
+    });
+  });
+
+  describe('streamIntoObservable', () => {
+    it('correctly parses the response from Vertex/Gemini', async () => {
+      const chunks: GoogleGenerateContentResponseChunk[] = [
+        {
+          candidates: [
+            {
+              content: {
+                parts: [
+                  {
+                    text: 'This is ',
+                  },
+                ],
+              },
+              index: 0,
+            },
+          ],
+        },
+        {
+          candidates: [
+            {
+              content: {
+                parts: [
+                  {
+                    text: 'my response',
+                  },
+                ],
+              },
+              index: 1,
+            },
+          ],
+        },
+        {
+          usageMetadata: {
+            candidatesTokenCount: 10,
+            promptTokenCount: 100,
+            totalTokenCount: 110,
+          },
+          candidates: [
+            {
+              content: {
+                parts: [
+                  {
+                    text: '.',
+                  },
+                ],
+              },
+              index: 2,
+            },
+          ],
+        },
+      ];
+
+      const stream = new Readable({
+        read(...args) {
+          chunks.forEach((chunk) => this.push(`data: ${JSON.stringify(chunk)}\n\n`));
+          this.push(null);
+        },
+      });
+      const response$ = createGeminiAdapter({
+        logger: {
+          debug: jest.fn(),
+        } as unknown as Logger,
+        functions: [
+          {
+            name: 'my_tool',
+            description: 'My tool',
+            parameters: {
+              properties: {
+                myParam: {
+                  type: 'string',
+                },
+              },
+            },
+          },
+        ],
+        messages: [
+          {
+            '@timestamp': new Date().toString(),
+            message: {
+              role: MessageRole.System,
+              content: '',
+            },
+          },
+          {
+            '@timestamp': new Date().toString(),
+            message: {
+              role: MessageRole.User,
+              content: 'How can you help me?',
+            },
+          },
+        ],
+      })
+        .streamIntoObservable(stream)
+        .pipe(shareReplay());
+
+      const [chunkEvents$, tokenCountEvents$] = partition(
+        response$,
+        (value): value is ChatCompletionChunkEvent =>
+          value.type === StreamingChatResponseEventType.ChatCompletionChunk
+      );
+
+      const [concatenatedMessage, tokenCount] = await Promise.all([
+        lastValueFrom(chunkEvents$.pipe(concatenateChatCompletionChunks(), lastOperator())),
+        lastValueFrom(tokenCountEvents$),
+      ]);
+
+      expect(concatenatedMessage).toEqual({
+        message: {
+          content: 'This is my response.',
+          function_call: {
+            arguments: '',
+            name: '',
+            trigger: MessageRole.Assistant,
+          },
+          role: MessageRole.Assistant,
+        },
+      });
+
+      expect(tokenCount).toEqual({
+        tokens: {
+          completion: 10,
+          prompt: 100,
+          total: 110,
+        },
+        type: StreamingChatResponseEventType.TokenCount,
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.ts
new file mode 100644
index 0000000000000..fba0e3f542365
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/gemini_adapter.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { map } from 'rxjs';
+import { processVertexStream } from './process_vertex_stream';
+import type { LlmApiAdapterFactory } from '../types';
+import { getMessagesWithSimulatedFunctionCalling } from '../simulate_function_calling/get_messages_with_simulated_function_calling';
+import { parseInlineFunctionCalls } from '../simulate_function_calling/parse_inline_function_calls';
+import { TOOL_USE_END } from '../simulate_function_calling/constants';
+import { eventsourceStreamIntoObservable } from '../../../util/eventsource_stream_into_observable';
+import { GoogleGenerateContentResponseChunk } from './types';
+
+export const createGeminiAdapter: LlmApiAdapterFactory = ({
+  messages,
+  functions,
+  functionCall,
+  logger,
+}) => {
+  const filteredFunctions = functionCall
+    ? functions?.filter((fn) => fn.name === functionCall)
+    : functions;
+  return {
+    getSubAction: () => {
+      const messagesWithSimulatedFunctionCalling = getMessagesWithSimulatedFunctionCalling({
+        messages,
+        functions: filteredFunctions,
+        functionCall,
+      });
+
+      const formattedMessages = messagesWithSimulatedFunctionCalling.map((message) => {
+        return {
+          role: message.message.role,
+          content: message.message.content ?? '',
+        };
+      });
+
+      return {
+        subAction: 'invokeStream',
+        subActionParams: {
+          messages: formattedMessages,
+          temperature: 0,
+          stopSequences: ['\n\nHuman:', TOOL_USE_END],
+        },
+      };
+    },
+    streamIntoObservable: (readable) =>
+      eventsourceStreamIntoObservable(readable).pipe(
+        map((value) => {
+          const response = JSON.parse(value) as GoogleGenerateContentResponseChunk;
+          return response;
+        }),
+        processVertexStream(),
+        parseInlineFunctionCalls({ logger })
+      ),
+  };
+};
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/process_vertex_stream.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/process_vertex_stream.ts
new file mode 100644
index 0000000000000..903fa54d11acb
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/process_vertex_stream.ts
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Observable } from 'rxjs';
+import { v4 } from 'uuid';
+import {
+  ChatCompletionChunkEvent,
+  StreamingChatResponseEventType,
+  TokenCountEvent,
+} from '../../../../../common/conversation_complete';
+import type { GoogleGenerateContentResponseChunk } from './types';
+
+export function processVertexStream() {
+  return (source: Observable<GoogleGenerateContentResponseChunk>) =>
+    new Observable<ChatCompletionChunkEvent | TokenCountEvent>((subscriber) => {
+      const id = v4();
+
+      function handleNext(value: GoogleGenerateContentResponseChunk) {
+        // completion: what we eventually want to emit
+        if (value.usageMetadata) {
+          subscriber.next({
+            type: StreamingChatResponseEventType.TokenCount,
+            tokens: {
+              prompt: value.usageMetadata.promptTokenCount,
+              completion: value.usageMetadata.candidatesTokenCount,
+              total: value.usageMetadata.totalTokenCount,
+            },
+          });
+        }
+
+        const completion = value.candidates[0].content.parts[0].text;
+
+        if (completion) {
+          subscriber.next({
+            id,
+            type: StreamingChatResponseEventType.ChatCompletionChunk,
+            message: {
+              content: completion,
+            },
+          });
+        }
+      }
+
+      source.subscribe({
+        next: (value) => {
+          try {
+            handleNext(value);
+          } catch (error) {
+            subscriber.error(error);
+          }
+        },
+        error: (err) => {
+          subscriber.error(err);
+        },
+        complete: () => {
+          subscriber.complete();
+        },
+      });
+    });
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/types.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/types.ts
new file mode 100644
index 0000000000000..9c131f1ee67b3
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/gemini/types.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+interface GenerateContentResponseFunctionCall {
+  name: string;
+  args: Record<string, any>;
+}
+
+interface GenerateContentResponseSafetyRating {
+  category: string;
+  probability: string;
+}
+
+interface GenerateContentResponseCandidate {
+  content: {
+    parts: Array<{
+      text?: string;
+      functionCall?: GenerateContentResponseFunctionCall;
+    }>;
+  };
+  finishReason?: string;
+  index: number;
+  safetyRatings?: GenerateContentResponseSafetyRating[];
+}
+
+interface GenerateContentResponsePromptFeedback {
+  promptFeedback: {
+    safetyRatings: GenerateContentResponseSafetyRating[];
+  };
+  usageMetadata: {
+    promptTokenCount: number;
+    candidatesTokenCount: number;
+    totalTokenCount: number;
+  };
+}
+
+interface GenerateContentResponseUsageMetadata {
+  promptTokenCount: number;
+  candidatesTokenCount: number;
+  totalTokenCount: number;
+}
+
+export interface GoogleGenerateContentResponseChunk {
+  candidates: GenerateContentResponseCandidate[];
+  promptFeedback?: GenerateContentResponsePromptFeedback;
+  usageMetadata?: GenerateContentResponseUsageMetadata;
+}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/get_messages_with_simulated_function_calling.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/get_messages_with_simulated_function_calling.ts
index 2e319a076773c..3325432dc453d 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/get_messages_with_simulated_function_calling.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/get_messages_with_simulated_function_calling.ts
@@ -9,6 +9,12 @@ import { FunctionDefinition, Message } from '../../../../../common';
 import { TOOL_USE_END, TOOL_USE_START } from './constants';
 import { getSystemMessageInstructions } from './get_system_message_instructions';
 
+function replaceFunctionsWithTools(content: string) {
+  return content.replaceAll(/(function)(s|[\s*\.])?(?!\scall)/g, (match, p1, p2) => {
+    return `tool${p2 || ''}`;
+  });
+}
+
 export function getMessagesWithSimulatedFunctionCalling({
   messages,
   functions,
@@ -26,64 +32,76 @@ export function getMessagesWithSimulatedFunctionCalling({
 
   systemMessage.message.content = (systemMessage.message.content ?? '') + '\n' + instructions;
 
-  return [systemMessage, ...otherMessages].map((message, index) => {
-    if (message.message.name) {
-      const deserialized = JSON.parse(message.message.content || '{}');
+  return [systemMessage, ...otherMessages]
+    .map((message, index) => {
+      if (message.message.name) {
+        const deserialized = JSON.parse(message.message.content || '{}');
 
-      const results = {
-        type: 'tool_result',
-        tool: message.message.name,
-        ...(message.message.content ? JSON.parse(message.message.content) : {}),
-      };
+        const results = {
+          type: 'tool_result',
+          tool: message.message.name,
+          ...(message.message.content ? JSON.parse(message.message.content) : {}),
+        };
+
+        if ('error' in deserialized) {
+          return {
+            ...message,
+            message: {
+              role: message.message.role,
+              content: JSON.stringify({
+                ...results,
+                is_error: true,
+              }),
+            },
+          };
+        }
 
-      if ('error' in deserialized) {
         return {
           ...message,
           message: {
             role: message.message.role,
-            content: JSON.stringify({
-              ...results,
-              is_error: true,
-            }),
+            content: JSON.stringify(results),
           },
         };
       }
 
+      let content = message.message.content || '';
+
+      if (message.message.function_call?.name) {
+        content +=
+          TOOL_USE_START +
+          '\n```json\n' +
+          JSON.stringify({
+            name: message.message.function_call.name,
+            input: JSON.parse(message.message.function_call.arguments || '{}'),
+          }) +
+          '\n```' +
+          TOOL_USE_END;
+      }
+
+      if (index === messages.length - 1 && functionCall) {
+        content += `
+      
+      Remember, use the ${functionCall} tool to answer this question.`;
+      }
+
       return {
         ...message,
         message: {
           role: message.message.role,
-          content: JSON.stringify(results),
+          content,
         },
       };
-    }
-
-    let content = message.message.content || '';
-
-    if (message.message.function_call?.name) {
-      content +=
-        TOOL_USE_START +
-        '\n```json\n' +
-        JSON.stringify({
-          name: message.message.function_call.name,
-          input: JSON.parse(message.message.function_call.arguments || '{}'),
-        }) +
-        '\n```' +
-        TOOL_USE_END;
-    }
-
-    if (index === messages.length - 1 && functionCall) {
-      content += `
-      
-      Remember, use the ${functionCall} tool to answer this question.`;
-    }
-
-    return {
-      ...message,
-      message: {
-        role: message.message.role,
-        content,
-      },
-    };
-  });
+    })
+    .map((message) => {
+      return {
+        ...message,
+        message: {
+          ...message.message,
+          content: message.message.content
+            ? replaceFunctionsWithTools(message.message.content)
+            : message.message.content,
+        },
+      };
+    });
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/parse_inline_function_calls.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/parse_inline_function_calls.ts
index 49fc87b908112..82a613ef0b4f8 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/parse_inline_function_calls.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/adapters/simulate_function_calling/parse_inline_function_calls.ts
@@ -58,7 +58,7 @@ export function parseInlineFunctionCalls({ logger }: { logger: Logger }) {
           input?: unknown;
         };
 
-        logger.debug('Parsed function call:\n ' + JSON.stringify(parsedFunctionCall));
+        logger.debug(() => 'Parsed function call:\n ' + JSON.stringify(parsedFunctionCall));
 
         if (!parsedFunctionCall.name) {
           throw createInternalServerError(`Missing name for tool use`);
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/get_context_function_request_if_needed.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/get_context_function_request_if_needed.ts
index e5ea0ad0ff829..8e0da55ff8c76 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/get_context_function_request_if_needed.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/get_context_function_request_if_needed.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { findLastIndex } from 'lodash';
+import { findLastIndex, last } from 'lodash';
 import { Message, MessageAddEvent, MessageRole } from '../../../common';
 import { createFunctionRequestMessage } from '../../../common/utils/create_function_request_message';
 import { CONTEXT_FUNCTION_NAME } from '../../functions/context';
@@ -22,11 +22,10 @@ export function getContextFunctionRequestIfNeeded(
     .slice(indexOfLastUserMessage)
     .some((message) => message.message.name === CONTEXT_FUNCTION_NAME);
 
-  if (hasContextSinceLastUserMessage) {
+  const isLastMessageFunctionRequest = !!last(messages)?.message.function_call?.name;
+  if (hasContextSinceLastUserMessage || isLastMessageFunctionRequest) {
     return undefined;
   }
 
-  return createFunctionRequestMessage({
-    name: CONTEXT_FUNCTION_NAME,
-  });
+  return createFunctionRequestMessage({ name: CONTEXT_FUNCTION_NAME });
 }
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.test.ts
index 46d72d303f7e3..cbe033ed0e4b9 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.test.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.test.ts
@@ -14,7 +14,6 @@ import { Subject } from 'rxjs';
 import { EventEmitter, PassThrough, type Readable } from 'stream';
 import { finished } from 'stream/promises';
 import { ObservabilityAIAssistantClient } from '.';
-import { createResourceNamesMap } from '..';
 import { MessageRole, type Message } from '../../../common';
 import { ObservabilityAIAssistantConnectorType } from '../../../common/connectors';
 import {
@@ -186,7 +185,6 @@ describe('Observability AI Assistant client', () => {
       knowledgeBaseService: knowledgeBaseServiceMock,
       logger: loggerMock,
       namespace: 'default',
-      resources: createResourceNamesMap(),
       user: {
         name: 'johndoe',
       },
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
index 139955742ef6e..4c3527873d01c 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/index.ts
@@ -11,7 +11,7 @@ import type { ElasticsearchClient, IUiSettingsClient } from '@kbn/core/server';
 import type { Logger } from '@kbn/logging';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { SpanKind, context } from '@opentelemetry/api';
-import { merge, omit } from 'lodash';
+import { last, merge, omit } from 'lodash';
 import {
   catchError,
   combineLatest,
@@ -30,6 +30,7 @@ import {
 } from 'rxjs';
 import { Readable } from 'stream';
 import { v4 } from 'uuid';
+import { resourceNames } from '..';
 import { ObservabilityAIAssistantConnectorType } from '../../../common/connectors';
 import {
   ChatCompletionChunkEvent,
@@ -60,13 +61,13 @@ import {
   KnowledgeBaseService,
   RecalledEntry,
 } from '../knowledge_base_service';
-import type { ObservabilityAIAssistantResourceNames } from '../types';
 import { getAccessQuery } from '../util/get_access_query';
 import { getSystemMessageFromInstructions } from '../util/get_system_message_from_instructions';
 import { replaceSystemMessage } from '../util/replace_system_message';
 import { withAssistantSpan } from '../util/with_assistant_span';
 import { createBedrockClaudeAdapter } from './adapters/bedrock/bedrock_claude_adapter';
 import { failOnNonExistingFunctionCall } from './adapters/fail_on_non_existing_function_call';
+import { createGeminiAdapter } from './adapters/gemini/gemini_adapter';
 import { createOpenAiAdapter } from './adapters/openai_adapter';
 import { LlmApiAdapter } from './adapters/types';
 import { getContextFunctionRequestIfNeeded } from './get_context_function_request_if_needed';
@@ -93,7 +94,6 @@ export class ObservabilityAIAssistantClient {
         asInternalUser: ElasticsearchClient;
         asCurrentUser: ElasticsearchClient;
       };
-      resources: ObservabilityAIAssistantResourceNames;
       logger: Logger;
       user?: {
         id?: string;
@@ -107,7 +107,7 @@ export class ObservabilityAIAssistantClient {
     conversationId: string
   ): Promise<SearchHit<Conversation> | undefined> => {
     const response = await this.dependencies.esClient.asInternalUser.search<Conversation>({
-      index: this.dependencies.resources.aliases.conversations,
+      index: resourceNames.aliases.conversations,
       query: {
         bool: {
           filter: [
@@ -335,13 +335,12 @@ export class ObservabilityAIAssistantClient {
                 const initialMessagesWithAddedMessages =
                   messagesWithUpdatedSystemMessage.concat(addedMessages);
 
-                const lastMessage =
-                  initialMessagesWithAddedMessages[initialMessagesWithAddedMessages.length - 1];
+                const lastMessage = last(initialMessagesWithAddedMessages);
 
                 // if a function request is at the very end, close the stream to consumer
                 // without persisting or updating the conversation. we need to wait
                 // on the function response to have a valid conversation
-                const isFunctionRequest = lastMessage.message.function_call?.name;
+                const isFunctionRequest = !!lastMessage?.message.function_call?.name;
 
                 if (!persist || isFunctionRequest) {
                   return of();
@@ -439,18 +438,20 @@ export class ObservabilityAIAssistantClient {
             if (this.dependencies.logger.isLevelEnabled('debug')) {
               switch (event.type) {
                 case StreamingChatResponseEventType.MessageAdd:
-                  this.dependencies.logger.debug(`Added message: ${JSON.stringify(event.message)}`);
+                  this.dependencies.logger.debug(
+                    () => `Added message: ${JSON.stringify(event.message)}`
+                  );
                   break;
 
                 case StreamingChatResponseEventType.ConversationCreate:
                   this.dependencies.logger.debug(
-                    `Created conversation: ${JSON.stringify(event.conversation)}`
+                    () => `Created conversation: ${JSON.stringify(event.conversation)}`
                   );
                   break;
 
                 case StreamingChatResponseEventType.ConversationUpdate:
                   this.dependencies.logger.debug(
-                    `Updated conversation: ${JSON.stringify(event.conversation)}`
+                    () => `Updated conversation: ${JSON.stringify(event.conversation)}`
                   );
                   break;
               }
@@ -514,13 +515,24 @@ export class ObservabilityAIAssistantClient {
             });
             break;
 
+          case ObservabilityAIAssistantConnectorType.Gemini:
+            adapter = createGeminiAdapter({
+              messages,
+              functions,
+              functionCall,
+              logger: this.dependencies.logger,
+            });
+            break;
+
           default:
             throw new Error(`Connector type is not supported: ${connector.actionTypeId}`);
         }
 
         const subAction = adapter.getSubAction();
 
-        this.dependencies.logger.trace(JSON.stringify(subAction.subActionParams, null, 2));
+        if (this.dependencies.logger.isLevelEnabled('trace')) {
+          this.dependencies.logger.trace(JSON.stringify(subAction.subActionParams, null, 2));
+        }
 
         return from(
           withAssistantSpan('get_execute_result', () =>
@@ -594,7 +606,7 @@ export class ObservabilityAIAssistantClient {
 
   find = async (options?: { query?: string }): Promise<{ conversations: Conversation[] }> => {
     const response = await this.dependencies.esClient.asInternalUser.search<Conversation>({
-      index: this.dependencies.resources.aliases.conversations,
+      index: resourceNames.aliases.conversations,
       allow_no_indices: true,
       query: {
         bool: {
@@ -686,7 +698,7 @@ export class ObservabilityAIAssistantClient {
     );
 
     await this.dependencies.esClient.asInternalUser.index({
-      index: this.dependencies.resources.aliases.conversations,
+      index: resourceNames.aliases.conversations,
       document: createdConversation,
       refresh: true,
     });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/operators/continue_conversation.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/operators/continue_conversation.ts
index 83d9bf37e7efb..237eea9411b23 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/operators/continue_conversation.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/client/operators/continue_conversation.ts
@@ -7,7 +7,7 @@
 
 import { Logger } from '@kbn/logging';
 import { decode, encode } from 'gpt-tokenizer';
-import { pick, take } from 'lodash';
+import { last, pick, take } from 'lodash';
 import {
   catchError,
   concat,
@@ -212,10 +212,8 @@ export function continueConversation({
     initialMessages
   );
 
-  const lastMessage =
-    messagesWithUpdatedSystemMessage[messagesWithUpdatedSystemMessage.length - 1].message;
-
-  const isUserMessage = lastMessage.role === MessageRole.User;
+  const lastMessage = last(messagesWithUpdatedSystemMessage)?.message;
+  const isUserMessage = lastMessage?.role === MessageRole.User;
 
   return executeNextStep().pipe(handleEvents());
 
@@ -233,7 +231,7 @@ export function continueConversation({
       }).pipe(emitWithConcatenatedMessage(), catchFunctionNotFoundError(functionLimitExceeded));
     }
 
-    const functionCallName = lastMessage.function_call?.name;
+    const functionCallName = lastMessage?.function_call?.name;
 
     if (!functionCallName) {
       // reply from the LLM without a function request,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
index 34f3667d1cb7b..eddcb8112f540 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/index.ts
@@ -22,40 +22,34 @@ import { ObservabilityAIAssistantClient } from './client';
 import { conversationComponentTemplate } from './conversation_component_template';
 import { kbComponentTemplate } from './kb_component_template';
 import { KnowledgeBaseEntryOperationType, KnowledgeBaseService } from './knowledge_base_service';
-import type {
-  RegistrationCallback,
-  ObservabilityAIAssistantResourceNames,
-  RespondFunctionResources,
-} from './types';
+import type { RegistrationCallback, RespondFunctionResources } from './types';
 import { splitKbText } from './util/split_kb_text';
 
 function getResourceName(resource: string) {
   return `.kibana-observability-ai-assistant-${resource}`;
 }
 
-export function createResourceNamesMap() {
-  return {
-    componentTemplate: {
-      conversations: getResourceName('component-template-conversations'),
-      kb: getResourceName('component-template-kb'),
-    },
-    aliases: {
-      conversations: getResourceName('conversations'),
-      kb: getResourceName('kb'),
-    },
-    indexPatterns: {
-      conversations: getResourceName('conversations*'),
-      kb: getResourceName('kb*'),
-    },
-    indexTemplate: {
-      conversations: getResourceName('index-template-conversations'),
-      kb: getResourceName('index-template-kb'),
-    },
-    pipelines: {
-      kb: getResourceName('kb-ingest-pipeline'),
-    },
-  };
-}
+export const resourceNames = {
+  componentTemplate: {
+    conversations: getResourceName('component-template-conversations'),
+    kb: getResourceName('component-template-kb'),
+  },
+  aliases: {
+    conversations: getResourceName('conversations'),
+    kb: getResourceName('kb'),
+  },
+  indexPatterns: {
+    conversations: getResourceName('conversations*'),
+    kb: getResourceName('kb*'),
+  },
+  indexTemplate: {
+    conversations: getResourceName('index-template-conversations'),
+    kb: getResourceName('index-template-kb'),
+  },
+  pipelines: {
+    kb: getResourceName('kb-ingest-pipeline'),
+  },
+};
 
 export const INDEX_QUEUED_DOCUMENTS_TASK_ID = 'observabilityAIAssistant:indexQueuedDocumentsTask';
 
@@ -76,8 +70,6 @@ export class ObservabilityAIAssistantService {
   private readonly getModelId: () => Promise<string>;
   private kbService?: KnowledgeBaseService;
 
-  private readonly resourceNames: ObservabilityAIAssistantResourceNames = createResourceNamesMap();
-
   private readonly registrations: RegistrationCallback[] = [];
 
   constructor({
@@ -143,15 +135,15 @@ export class ObservabilityAIAssistantService {
       const esClient = coreStart.elasticsearch.client;
       await esClient.asInternalUser.cluster.putComponentTemplate({
         create: false,
-        name: this.resourceNames.componentTemplate.conversations,
+        name: resourceNames.componentTemplate.conversations,
         template: conversationComponentTemplate,
       });
 
       await esClient.asInternalUser.indices.putIndexTemplate({
-        name: this.resourceNames.indexTemplate.conversations,
-        composed_of: [this.resourceNames.componentTemplate.conversations],
+        name: resourceNames.indexTemplate.conversations,
+        composed_of: [resourceNames.componentTemplate.conversations],
         create: false,
-        index_patterns: [this.resourceNames.indexPatterns.conversations],
+        index_patterns: [resourceNames.indexPatterns.conversations],
         template: {
           settings: {
             number_of_shards: 1,
@@ -166,7 +158,7 @@ export class ObservabilityAIAssistantService {
         },
       });
 
-      const conversationAliasName = this.resourceNames.aliases.conversations;
+      const conversationAliasName = resourceNames.aliases.conversations;
 
       await createConcreteWriteIndex({
         esClient: esClient.asInternalUser,
@@ -177,19 +169,19 @@ export class ObservabilityAIAssistantService {
           pattern: `${conversationAliasName}*`,
           basePattern: `${conversationAliasName}*`,
           name: `${conversationAliasName}-000001`,
-          template: this.resourceNames.indexTemplate.conversations,
+          template: resourceNames.indexTemplate.conversations,
         },
         dataStreamAdapter: getDataStreamAdapter({ useDataStreamForAlerts: false }),
       });
 
       await esClient.asInternalUser.cluster.putComponentTemplate({
         create: false,
-        name: this.resourceNames.componentTemplate.kb,
+        name: resourceNames.componentTemplate.kb,
         template: kbComponentTemplate,
       });
 
       await esClient.asInternalUser.ingest.putPipeline({
-        id: this.resourceNames.pipelines.kb,
+        id: resourceNames.pipelines.kb,
         processors: [
           {
             inference: {
@@ -210,10 +202,10 @@ export class ObservabilityAIAssistantService {
       });
 
       await esClient.asInternalUser.indices.putIndexTemplate({
-        name: this.resourceNames.indexTemplate.kb,
-        composed_of: [this.resourceNames.componentTemplate.kb],
+        name: resourceNames.indexTemplate.kb,
+        composed_of: [resourceNames.componentTemplate.kb],
         create: false,
-        index_patterns: [this.resourceNames.indexPatterns.kb],
+        index_patterns: [resourceNames.indexPatterns.kb],
         template: {
           settings: {
             number_of_shards: 1,
@@ -223,7 +215,7 @@ export class ObservabilityAIAssistantService {
         },
       });
 
-      const kbAliasName = this.resourceNames.aliases.kb;
+      const kbAliasName = resourceNames.aliases.kb;
 
       await createConcreteWriteIndex({
         esClient: esClient.asInternalUser,
@@ -234,7 +226,7 @@ export class ObservabilityAIAssistantService {
           pattern: `${kbAliasName}*`,
           basePattern: `${kbAliasName}*`,
           name: `${kbAliasName}-000001`,
-          template: this.resourceNames.indexTemplate.kb,
+          template: resourceNames.indexTemplate.kb,
         },
         dataStreamAdapter: getDataStreamAdapter({ useDataStreamForAlerts: false }),
       });
@@ -242,7 +234,6 @@ export class ObservabilityAIAssistantService {
       this.kbService = new KnowledgeBaseService({
         logger: this.logger.get('kb'),
         esClient,
-        resources: this.resourceNames,
         taskManagerStart: pluginsStart.taskManager,
         getModelId: this.getModelId,
       });
@@ -289,7 +280,6 @@ export class ObservabilityAIAssistantService {
         asInternalUser: coreStart.elasticsearch.client.asInternalUser,
         asCurrentUser: coreStart.elasticsearch.client.asScoped(request).asCurrentUser,
       },
-      resources: this.resourceNames,
       logger: this.logger,
       user: user
         ? {
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
index 45330f9da2f2b..86a18d5a8efa4 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/knowledge_base_service/index.ts
@@ -14,16 +14,18 @@ import pRetry from 'p-retry';
 import { map, orderBy } from 'lodash';
 import { encode } from 'gpt-tokenizer';
 import { MlTrainedModelDeploymentNodesStats } from '@elastic/elasticsearch/lib/api/types';
-import { INDEX_QUEUED_DOCUMENTS_TASK_ID, INDEX_QUEUED_DOCUMENTS_TASK_TYPE } from '..';
+import {
+  INDEX_QUEUED_DOCUMENTS_TASK_ID,
+  INDEX_QUEUED_DOCUMENTS_TASK_TYPE,
+  resourceNames,
+} from '..';
 import { KnowledgeBaseEntry, KnowledgeBaseEntryRole, UserInstruction } from '../../../common/types';
-import type { ObservabilityAIAssistantResourceNames } from '../types';
 import { getAccessQuery } from '../util/get_access_query';
 import { getCategoryQuery } from '../util/get_category_query';
 import { recallFromConnectors } from './recall_from_connectors';
 
 interface Dependencies {
   esClient: { asInternalUser: ElasticsearchClient };
-  resources: ObservabilityAIAssistantResourceNames;
   logger: Logger;
   taskManagerStart: TaskManagerStartContract;
   getModelId: () => Promise<string>;
@@ -105,7 +107,7 @@ export class KnowledgeBaseService {
       });
 
       this.dependencies.logger.debug(
-        'Model definition status:\n' + JSON.stringify(getResponse.trained_model_configs[0])
+        () => 'Model definition status:\n' + JSON.stringify(getResponse.trained_model_configs[0])
       );
 
       return Boolean(getResponse.trained_model_configs[0]?.fully_defined);
@@ -158,7 +160,7 @@ export class KnowledgeBaseService {
       }
 
       this.dependencies.logger.debug('Model is not allocated yet');
-      this.dependencies.logger.debug(JSON.stringify(response));
+      this.dependencies.logger.debug(() => JSON.stringify(response));
 
       throw gatewayTimeout();
     }, retryOptions);
@@ -194,7 +196,7 @@ export class KnowledgeBaseService {
   private async processOperation(operation: KnowledgeBaseEntryOperation) {
     if (operation.type === KnowledgeBaseEntryOperationType.Delete) {
       await this.dependencies.esClient.asInternalUser.deleteByQuery({
-        index: this.dependencies.resources.aliases.kb,
+        index: resourceNames.aliases.kb,
         query: {
           bool: {
             filter: [
@@ -333,7 +335,7 @@ export class KnowledgeBaseService {
     const response = await this.dependencies.esClient.asInternalUser.search<
       Pick<KnowledgeBaseEntry, 'text' | 'is_correction' | 'labels'>
     >({
-      index: [this.dependencies.resources.aliases.kb],
+      index: [resourceNames.aliases.kb],
       query: esQuery,
       size: 20,
       _source: {
@@ -366,7 +368,7 @@ export class KnowledgeBaseService {
     entries: RecalledEntry[];
   }> => {
     this.dependencies.logger.debug(
-      `Recalling entries from KB for queries: "${JSON.stringify(queries)}"`
+      () => `Recalling entries from KB for queries: "${JSON.stringify(queries)}"`
     );
     const modelId = await this.dependencies.getModelId();
 
@@ -431,7 +433,7 @@ export class KnowledgeBaseService {
   ): Promise<UserInstruction[]> => {
     try {
       const response = await this.dependencies.esClient.asInternalUser.search<KnowledgeBaseEntry>({
-        index: this.dependencies.resources.aliases.kb,
+        index: resourceNames.aliases.kb,
         query: {
           bool: {
             must: [
@@ -475,7 +477,7 @@ export class KnowledgeBaseService {
   }): Promise<{ entries: KnowledgeBaseEntry[] }> => {
     try {
       const response = await this.dependencies.esClient.asInternalUser.search<KnowledgeBaseEntry>({
-        index: this.dependencies.resources.aliases.kb,
+        index: resourceNames.aliases.kb,
         ...(query
           ? {
               query: {
@@ -537,7 +539,7 @@ export class KnowledgeBaseService {
   }): Promise<void> => {
     try {
       await this.dependencies.esClient.asInternalUser.index({
-        index: this.dependencies.resources.aliases.kb,
+        index: resourceNames.aliases.kb,
         id,
         document: {
           '@timestamp': new Date().toISOString(),
@@ -545,7 +547,7 @@ export class KnowledgeBaseService {
           user,
           namespace,
         },
-        pipeline: this.dependencies.resources.pipelines.kb,
+        pipeline: resourceNames.pipelines.kb,
         refresh: 'wait_for',
       });
     } catch (error) {
@@ -579,7 +581,7 @@ export class KnowledgeBaseService {
   deleteEntry = async ({ id }: { id: string }): Promise<void> => {
     try {
       await this.dependencies.esClient.asInternalUser.delete({
-        index: this.dependencies.resources.aliases.kb,
+        index: resourceNames.aliases.kb,
         id,
         refresh: 'wait_for',
       });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
index 1d8d909447a38..6e6256c3b8b90 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/service/types.ts
@@ -91,25 +91,3 @@ export type RegistrationCallback = ({}: {
   client: ObservabilityAIAssistantClient;
   functions: ChatFunctionClient;
 }) => Promise<void>;
-
-export interface ObservabilityAIAssistantResourceNames {
-  componentTemplate: {
-    conversations: string;
-    kb: string;
-  };
-  indexTemplate: {
-    conversations: string;
-    kb: string;
-  };
-  aliases: {
-    conversations: string;
-    kb: string;
-  };
-  indexPatterns: {
-    conversations: string;
-    kb: string;
-  };
-  pipelines: {
-    kb: string;
-  };
-}
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
index b6a16d6329aec..009b91a7a8c2c 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant/server/utils/recall/score_suggestions.ts
@@ -101,7 +101,7 @@ export async function scoreSuggestions({
       properties: {
         scores: {
           description: `The document IDs and their scores, as CSV. Example:
-          
+
             my_id,7
             my_other_id,3
             my_third_id,4
@@ -155,7 +155,7 @@ export async function scoreSuggestions({
     relevantDocumentIds.includes(suggestion.id)
   );
 
-  logger.debug(`Relevant documents: ${JSON.stringify(relevantDocuments, null, 2)}`);
+  logger.debug(() => `Relevant documents: ${JSON.stringify(relevantDocuments, null, 2)}`);
 
   return {
     relevantDocuments,
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/plugin.tsx b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/plugin.tsx
index 6e188043a6a31..466cde6747990 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/plugin.tsx
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/public/plugin.tsx
@@ -103,27 +103,29 @@ export class ObservabilityAIAssistantAppPlugin
     const appService = (this.appService = createAppService({
       pluginsStart,
     }));
+    const isEnabled = appService.isEnabled();
+    if (isEnabled) {
+      coreStart.chrome.navControls.registerRight({
+        mount: (element) => {
+          ReactDOM.render(
+            <SharedProviders
+              coreStart={coreStart}
+              pluginsStart={pluginsStart}
+              service={appService}
+              theme$={coreStart.theme.theme$}
+            >
+              <LazyNavControl />
+            </SharedProviders>,
+            element,
+            () => {}
+          );
 
-    coreStart.chrome.navControls.registerRight({
-      mount: (element) => {
-        ReactDOM.render(
-          <SharedProviders
-            coreStart={coreStart}
-            pluginsStart={pluginsStart}
-            service={appService}
-            theme$={coreStart.theme.theme$}
-          >
-            <LazyNavControl />
-          </SharedProviders>,
-          element,
-          () => {}
-        );
-
-        return () => {};
-      },
-      // right before the user profile
-      order: 1001,
-    });
+          return () => {};
+        },
+        // right before the user profile
+        order: 1001,
+      });
+    }
 
     const service = pluginsStart.observabilityAIAssistant.service;
 
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.test.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.test.ts
index 13c5855d67cac..8c6b90bca76ab 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.test.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.test.ts
@@ -11,147 +11,177 @@ describe('correctCommonEsqlMistakes', () => {
     return input.replaceAll(/[\t|\s]*\n[\t|\s]*/gms, '\n');
   }
 
-  function expectQuery(input: string, expectedOutput: string) {
+  function expectQuery({ input, expectedOutput }: { input: string; expectedOutput: string }) {
     expect(normalize(correctCommonEsqlMistakes(input).output)).toEqual(normalize(expectedOutput));
   }
 
   it('replaces aliasing via the AS keyword with the = operator', () => {
-    expectQuery(`FROM logs-* | STATS COUNT() AS count`, 'FROM logs-*\n| STATS count = COUNT()');
-
-    expectQuery(`FROM logs-* | STATS COUNT() as count`, 'FROM logs-*\n| STATS count = COUNT()');
-
-    expectQuery(
-      `FROM logs-* | STATS AVG(transaction.duration.histogram) AS avg_request_latency, PERCENTILE(transaction.duration.histogram, 95) AS p95`,
-      `FROM logs-*
-      | STATS avg_request_latency = AVG(transaction.duration.histogram), p95 = PERCENTILE(transaction.duration.histogram, 95)`
-    );
-
-    expectQuery(
-      `FROM traces-apm*
+    expectQuery({
+      input: `FROM logs-* | STATS COUNT() AS count`,
+      expectedOutput: 'FROM logs-*\n| STATS count = COUNT()',
+    });
+
+    expectQuery({
+      input: `FROM logs-* | STATS COUNT() as count`,
+      expectedOutput: 'FROM logs-*\n| STATS count = COUNT()',
+    });
+
+    expectQuery({
+      input: `FROM logs-* | STATS AVG(transaction.duration.histogram) AS avg_request_latency, PERCENTILE(transaction.duration.histogram, 95) AS p95`,
+      expectedOutput: `FROM logs-*
+      | STATS avg_request_latency = AVG(transaction.duration.histogram), p95 = PERCENTILE(transaction.duration.histogram, 95)`,
+    });
+
+    expectQuery({
+      input: `FROM traces-apm*
       | WHERE @timestamp >= NOW() - 24 hours
       | STATS AVG(transaction.duration.us) AS avg_duration, SUM(success) AS total_successes, COUNT(*) AS total_requests BY service.name`,
-      `FROM traces-apm*
+      expectedOutput: `FROM traces-apm*
       | WHERE @timestamp >= NOW() - 24 hours
-      | STATS avg_duration = AVG(transaction.duration.us), total_successes = SUM(success), total_requests = COUNT(*) BY service.name`
-    );
+      | STATS avg_duration = AVG(transaction.duration.us), total_successes = SUM(success), total_requests = COUNT(*) BY service.name`,
+    });
   });
+  it("replaces ` or ' escaping in FROM statements with double quotes", () => {
+    expectQuery({ input: `FROM "logs-*" | LIMIT 10`, expectedOutput: 'FROM "logs-*"\n| LIMIT 10' });
+    expectQuery({ input: `FROM 'logs-*' | LIMIT 10`, expectedOutput: 'FROM "logs-*"\n| LIMIT 10' });
+    expectQuery({ input: 'FROM `logs-*` | LIMIT 10', expectedOutput: 'FROM "logs-*"\n| LIMIT 10' });
+    expectQuery({
+      input: `FROM 'logs-2024-07-01','logs-2024-07-02' | LIMIT 10`,
+      expectedOutput: 'FROM "logs-2024-07-01","logs-2024-07-02"\n| LIMIT 10',
+    });
+    expectQuery({
+      input: 'FROM `logs-2024-07-01`,`logs-2024-07-02` | LIMIT 10',
+      expectedOutput: 'FROM "logs-2024-07-01","logs-2024-07-02"\n| LIMIT 10',
+    });
+    expectQuery({ input: `FROM logs-* | LIMIT 10`, expectedOutput: 'FROM logs-*\n| LIMIT 10' });
+  });
+
+  it('replaces double quotes around columns with backticks', () => {
+    expectQuery({
+      input: `FROM logs-* | WHERE "@timestamp" <= NOW() - 15m`,
+      expectedOutput: `FROM logs-* \n| WHERE @timestamp <= NOW() - 15m`,
+    });
 
-  it(`replaces " or ' escaping in FROM statements with backticks`, () => {
-    expectQuery(`FROM "logs-*" | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
-    expectQuery(`FROM 'logs-*' | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
-    expectQuery(`FROM logs-* | LIMIT 10`, 'FROM logs-*\n| LIMIT 10');
+    expectQuery({
+      input: `FROM logs-* | EVAL date_bucket = DATE_TRUNC("@timestamp", 1 hour)`,
+      expectedOutput: `FROM logs-* \n| EVAL date_bucket = DATE_TRUNC(@timestamp, 1 hour)`,
+    });
   });
 
   it('replaces = as equal operator with ==', () => {
-    expectQuery(
-      `FROM logs-*\n| WHERE service.name = "foo"`,
-      `FROM logs-*\n| WHERE service.name == "foo"`
-    );
-
-    expectQuery(
-      `FROM logs-*\n| WHERE service.name = "foo" AND service.environment = "bar"`,
-      `FROM logs-*\n| WHERE service.name == "foo" AND service.environment == "bar"`
-    );
-
-    expectQuery(
-      `FROM logs-*\n| WHERE (service.name = "foo" AND service.environment = "bar") OR agent.name = "baz"`,
-      `FROM logs-*\n| WHERE (service.name == "foo" AND service.environment == "bar") OR agent.name == "baz"`
-    );
-
-    expectQuery(
-      `FROM logs-*\n| WHERE \`what=ever\` = "foo=bar"`,
-      `FROM logs-*\n| WHERE \`what=ever\` == "foo=bar"`
-    );
+    expectQuery({
+      input: `FROM logs-*\n| WHERE service.name = "foo"`,
+      expectedOutput: `FROM logs-*\n| WHERE service.name == "foo"`,
+    });
+
+    expectQuery({
+      input: `FROM logs-*\n| WHERE service.name = "foo" AND service.environment = "bar"`,
+      expectedOutput: `FROM logs-*\n| WHERE service.name == "foo" AND service.environment == "bar"`,
+    });
+
+    expectQuery({
+      input: `FROM logs-*\n| WHERE (service.name = "foo" AND service.environment = "bar") OR agent.name = "baz"`,
+      expectedOutput: `FROM logs-*\n| WHERE (service.name == "foo" AND service.environment == "bar") OR agent.name == "baz"`,
+    });
+
+    expectQuery({
+      input: `FROM logs-*\n| WHERE \`what=ever\` = "foo=bar"`,
+      expectedOutput: `FROM logs-*\n| WHERE \`what=ever\` == "foo=bar"`,
+    });
   });
 
   it('replaces single-quote escaped strings with double-quote escaped strings', () => {
-    expectQuery(
-      `FROM nyc_taxis
+    expectQuery({
+      input: `FROM nyc_taxis
     | WHERE DATE_EXTRACT('hour', dropoff_datetime) >= 6 AND DATE_EXTRACT('hour', dropoff_datetime) < 10
     | LIMIT 10`,
-      `FROM nyc_taxis
+      expectedOutput: `FROM nyc_taxis
     | WHERE DATE_EXTRACT("hour", dropoff_datetime) >= 6 AND DATE_EXTRACT("hour", dropoff_datetime) < 10
-    | LIMIT 10`
-    );
-    expectQuery(
-      `FROM nyc_taxis
+    | LIMIT 10`,
+    });
+    expectQuery({
+      input: `FROM nyc_taxis
     | WHERE DATE_EXTRACT('hour', "hh:mm a, 'of' d MMMM yyyy") >= 6 AND DATE_EXTRACT('hour', dropoff_datetime) < 10
     | LIMIT 10`,
-      `FROM nyc_taxis
+      expectedOutput: `FROM nyc_taxis
     | WHERE DATE_EXTRACT("hour", "hh:mm a, 'of' d MMMM yyyy") >= 6 AND DATE_EXTRACT("hour", dropoff_datetime) < 10
-    | LIMIT 10`
-    );
+    | LIMIT 10`,
+    });
   });
 
   it(`verifies if the SORT key is in KEEP, and if it's not, it will include it`, () => {
-    expectQuery(
-      'FROM logs-* \n| KEEP date \n| SORT @timestamp DESC',
-      'FROM logs-*\n| KEEP date, @timestamp\n| SORT @timestamp DESC'
-    );
-
-    expectQuery(
-      `FROM logs-* | KEEP date, whatever | EVAL my_truncated_date_field = DATE_TRUNC(1 year, date) | SORT @timestamp, my_truncated_date_field DESC`,
-      'FROM logs-*\n| KEEP date, whatever, @timestamp\n| EVAL my_truncated_date_field = DATE_TRUNC(1 year, date)\n| SORT @timestamp, my_truncated_date_field DESC'
-    );
-
-    expectQuery(
-      `FROM logs-*\n| STATS COUNT(*) BY BUCKET(@timestamp, 1m)\n| SORT \`BUCKET(@timestamp, 1m)\` DESC`,
-      `FROM logs-*\n| STATS COUNT(*) BY BUCKET(@timestamp, 1m)\n| SORT \`BUCKET(@timestamp, 1m)\` DESC`
-    );
-
-    expectQuery(
-      `FROM logs-* | KEEP date, whatever | RENAME whatever AS forever | SORT forever DESC`,
-      `FROM logs-*\n| KEEP date, whatever\n| RENAME whatever AS forever\n| SORT forever DESC`
-    );
-
-    expectQuery(
-      'FROM employees\n| KEEP first_name, last_name\n| RENAME first_name AS fn, last_name AS ln',
-      'FROM employees\n| KEEP first_name, last_name\n| RENAME first_name AS fn, last_name AS ln'
-    );
+    expectQuery({
+      input: 'FROM logs-* \n| KEEP date \n| SORT @timestamp DESC',
+      expectedOutput: 'FROM logs-*\n| KEEP date, @timestamp\n| SORT @timestamp DESC',
+    });
+
+    expectQuery({
+      input: `FROM logs-* | KEEP date, whatever | EVAL my_truncated_date_field = DATE_TRUNC(1 year, date) | SORT @timestamp, my_truncated_date_field DESC`,
+      expectedOutput:
+        'FROM logs-*\n| KEEP date, whatever, @timestamp\n| EVAL my_truncated_date_field = DATE_TRUNC(1 year, date)\n| SORT @timestamp, my_truncated_date_field DESC',
+    });
+
+    expectQuery({
+      input: `FROM logs-*\n| STATS COUNT(*) BY BUCKET(@timestamp, 1m)\n| SORT \`BUCKET(@timestamp, 1m)\` DESC`,
+      expectedOutput: `FROM logs-*\n| STATS COUNT(*) BY BUCKET(@timestamp, 1m)\n| SORT \`BUCKET(@timestamp, 1m)\` DESC`,
+    });
+
+    expectQuery({
+      input: `FROM logs-* | KEEP date, whatever | RENAME whatever AS forever | SORT forever DESC`,
+      expectedOutput: `FROM logs-*\n| KEEP date, whatever\n| RENAME whatever AS forever\n| SORT forever DESC`,
+    });
+
+    expectQuery({
+      input:
+        'FROM employees\n| KEEP first_name, last_name\n| RENAME first_name AS fn, last_name AS ln',
+      expectedOutput:
+        'FROM employees\n| KEEP first_name, last_name\n| RENAME first_name AS fn, last_name AS ln',
+    });
   });
 
   it(`escapes the column name if SORT uses an expression`, () => {
-    expectQuery(
-      'FROM logs-* \n| STATS COUNT(*) by service.name\n| SORT COUNT(*) DESC',
-      'FROM logs-*\n| STATS COUNT(*) BY service.name\n| SORT `COUNT(*)` DESC'
-    );
-
-    expectQuery(
-      'FROM logs-* \n| STATS COUNT(*) by service.name\n| SORT COUNT(*) DESC, @timestamp ASC',
-      'FROM logs-*\n| STATS COUNT(*) BY service.name\n| SORT `COUNT(*)` DESC, @timestamp ASC'
-    );
-
-    expectQuery(
-      `FROM employees\n| KEEP first_name, last_name, height\n| SORT first_name ASC NULLS FIRST`,
-      `FROM employees\n| KEEP first_name, last_name, height\n| SORT first_name ASC NULLS FIRST`
-    );
-
-    expectQuery(
-      `FROM employees
+    expectQuery({
+      input: 'FROM logs-* \n| STATS COUNT(*) by service.name\n| SORT COUNT(*) DESC',
+      expectedOutput: 'FROM logs-*\n| STATS COUNT(*) BY service.name\n| SORT `COUNT(*)` DESC',
+    });
+
+    expectQuery({
+      input: 'FROM logs-* \n| STATS COUNT(*) by service.name\n| SORT COUNT(*) DESC, @timestamp ASC',
+      expectedOutput:
+        'FROM logs-*\n| STATS COUNT(*) BY service.name\n| SORT `COUNT(*)` DESC, @timestamp ASC',
+    });
+
+    expectQuery({
+      input: `FROM employees\n| KEEP first_name, last_name, height\n| SORT first_name ASC NULLS FIRST`,
+      expectedOutput: `FROM employees\n| KEEP first_name, last_name, height\n| SORT first_name ASC NULLS FIRST`,
+    });
+
+    expectQuery({
+      input: `FROM employees
       | STATS my_count = COUNT() BY LEFT(last_name, 1)
       | SORT \`LEFT(last_name, 1)\``,
-      `FROM employees
+      expectedOutput: `FROM employees
       | STATS my_count = COUNT() BY LEFT(last_name, 1)
-      | SORT \`LEFT(last_name, 1)\``
-    );
+      | SORT \`LEFT(last_name, 1)\``,
+    });
   });
 
   it(`handles complicated queries correctly`, () => {
-    expectQuery(
-      `FROM "postgres-logs*"
+    expectQuery({
+      input: `FROM "postgres-logs*"
       | GROK message "%{TIMESTAMP_ISO8601:timestamp} %{TZ} \[%{NUMBER:process_id}\]: \[%{NUMBER:log_line}\] user=%{USER:user},db=%{USER:database},app=\[%{DATA:application}\],client=%{IP:client_ip} LOG:  duration: %{NUMBER:duration:float} ms  statement: %{GREEDYDATA:statement}"
       | EVAL "@timestamp" = TO_DATETIME(timestamp)
       | WHERE statement LIKE 'SELECT%'
       | STATS avg_duration = AVG(duration)`,
-      `FROM postgres-logs*
+      expectedOutput: `FROM "postgres-logs*"
     | GROK message "%{TIMESTAMP_ISO8601:timestamp} %{TZ} \[%{NUMBER:process_id}\]: \[%{NUMBER:log_line}\] user=%{USER:user},db=%{USER:database},app=\[%{DATA:application}\],client=%{IP:client_ip} LOG:  duration: %{NUMBER:duration:float} ms  statement: %{GREEDYDATA:statement}"
     | EVAL @timestamp = TO_DATETIME(timestamp)
     | WHERE statement LIKE "SELECT%"
-    | STATS avg_duration = AVG(duration)`
-    );
+    | STATS avg_duration = AVG(duration)`,
+    });
 
-    expectQuery(
-      `FROM metrics-apm*
+    expectQuery({
+      input: `FROM metrics-apm*
       | WHERE metricset.name == "service_destination" AND @timestamp > NOW() - 24 hours
       | EVAL total_events = span.destination.service.response_time.count
       | EVAL total_latency = span.destination.service.response_time.sum.us
@@ -161,27 +191,27 @@ describe('correctCommonEsqlMistakes', () => {
           avg_latency_per_request = AVG(total_latency / total_events),
           failure_rate = AVG(is_failure)
         BY span.destination.service.resource`,
-      `FROM metrics-apm*
+      expectedOutput: `FROM metrics-apm*
       | WHERE metricset.name == "service_destination" AND @timestamp > NOW() - 24 hours
       | EVAL total_events = span.destination.service.response_time.count
       | EVAL total_latency = span.destination.service.response_time.sum.us
       | EVAL is_failure = CASE(event.outcome == "failure", 1, 0)
-      | STATS avg_throughput = AVG(total_events), avg_latency_per_request = AVG(total_latency / total_events), failure_rate = AVG(is_failure) BY span.destination.service.resource`
-    );
+      | STATS avg_throughput = AVG(total_events), avg_latency_per_request = AVG(total_latency / total_events), failure_rate = AVG(is_failure) BY span.destination.service.resource`,
+    });
 
-    expectQuery(
-      `FROM sample_data
+    expectQuery({
+      input: `FROM sample_data
       | EVAL successful = CASE(
           STARTS_WITH(message, "Connected to"), 1,
           message == "Connection error", 0
         )
       | STATS success_rate = AVG(successful)`,
-      `FROM sample_data
+      expectedOutput: `FROM sample_data
       | EVAL successful = CASE(
           STARTS_WITH(message, "Connected to"), 1,
           message == "Connection error", 0
         )
-      | STATS success_rate = AVG(successful)`
-    );
+      | STATS success_rate = AVG(successful)`,
+    });
   });
 });
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.ts
index b4d365ad11084..0d4d13b61152a 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/correct_common_esql_mistakes.ts
@@ -235,14 +235,17 @@ export function correctCommonEsqlMistakes(query: string): {
   const formattedCommands: string[] = commands.map(({ name, command }, index) => {
     let formattedCommand = command;
 
+    formattedCommand = formattedCommand
+      .replaceAll(/"@timestamp"/g, '@timestamp')
+      .replaceAll(/'@timestamp'/g, '@timestamp');
+
     switch (name) {
-      case 'FROM':
-        formattedCommand = formattedCommand
-          .replaceAll(/FROM "(.*)"/g, 'FROM $1')
-          .replaceAll(/FROM '(.*)'/g, 'FROM $1')
-          .replaceAll(/FROM `(.*)`/g, 'FROM $1');
+      case 'FROM': {
+        formattedCommand = split(formattedCommand, ',')
+          .map((singlePattern) => singlePattern.replaceAll(/`/g, '"').replaceAll(/'/g, '"'))
+          .join(',');
         break;
-
+      }
       case 'WHERE':
         formattedCommand = replaceSingleQuotesWithDoubleQuotes(formattedCommand);
         formattedCommand = ensureEqualityOperators(formattedCommand);
diff --git a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/index.ts b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/index.ts
index 69a6e5967f746..797d85fc10341 100644
--- a/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/index.ts
+++ b/x-pack/plugins/observability_solution/observability_ai_assistant_app/server/functions/query/index.ts
@@ -28,6 +28,7 @@ import { runAndValidateEsqlQuery } from './validate_esql_query';
 import { INLINE_ESQL_QUERY_REGEX } from './constants';
 
 export const QUERY_FUNCTION_NAME = 'query';
+export const EXECUTE_QUERY_NAME = 'execute_query';
 
 const readFile = promisify(Fs.readFile);
 const readdir = promisify(Fs.readdir);
@@ -89,13 +90,13 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
   even if it has been called before.
 
   When the "visualize_query" function has been called, a visualization has been displayed to the user. DO NOT UNDER ANY CIRCUMSTANCES follow up a "visualize_query" function call with your own visualization attempt.
-  If the "execute_query" function has been called, summarize these results for the user. The user does not see a visualization in this case.`
+  If the "${EXECUTE_QUERY_NAME}" function has been called, summarize these results for the user. The user does not see a visualization in this case.`
       : undefined
   );
 
   functions.registerFunction(
     {
-      name: 'execute_query',
+      name: EXECUTE_QUERY_NAME,
       visibility: FunctionVisibility.UserOnly,
       description: 'Display the results of an ES|QL query.',
       parameters: {
@@ -173,7 +174,7 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
               to classify the user's request in the user message before this ("${abbreviatedUserQuestion}...").
               and get more information about specific functions and commands
               you think are candidates for answering the question.
-              
+
               Examples for functions and commands:
               Do you need to group data? Request \`STATS\`.
               Extract data? Request \`DISSECT\` AND \`GROK\`.
@@ -215,7 +216,7 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
               "I want a query that ..." => ${VisualizeESQLUserIntention.generateQueryOnly}
               "... Just show me the query" => ${VisualizeESQLUserIntention.generateQueryOnly}
               "Create a query that ..." => ${VisualizeESQLUserIntention.generateQueryOnly}
-              
+
               "Show me the avg of x" => ${VisualizeESQLUserIntention.executeAndReturnResults}
               "Show me the results of y" => ${VisualizeESQLUserIntention.executeAndReturnResults}
               "Display the sum of z" => ${VisualizeESQLUserIntention.executeAndReturnResults}
@@ -275,9 +276,10 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
 
       if (!response.message.function_call.arguments) {
         resources.logger.debug(
-          `LLM should have called "classify_esql", but instead responded with the following message: ${JSON.stringify(
-            response.message
-          )}`
+          () =>
+            `LLM should have called "classify_esql", but instead responded with the following message: ${JSON.stringify(
+              response.message
+            )}`
         );
         throw new Error(
           'LLM did not call classify_esql function during query generation, execute the "query" function and try again'
@@ -365,7 +367,7 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
             '@timestamp': new Date().toISOString(),
             message: {
               role: MessageRole.User,
-              content: `Answer the user's question that was previously asked ("${abbreviatedUserQuestion}...") using the attached documentation. Take into account any previous errors from the \`execute_query\` or \`visualize_query\` function.
+              content: `Answer the user's question that was previously asked ("${abbreviatedUserQuestion}...") using the attached documentation. Take into account any previous errors from the \`${EXECUTE_QUERY_NAME}\` or \`visualize_query\` function.
 
                 Format any ES|QL query as follows:
                 \`\`\`esql
@@ -373,41 +375,41 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
                 \`\`\`
 
                 Respond in plain text. Do not attempt to use a function.
-  
+
                 You must use commands and functions for which you have requested documentation.
-  
+
                 ${
                   args.intention !== VisualizeESQLUserIntention.generateQueryOnly
                     ? `DO NOT UNDER ANY CIRCUMSTANCES generate more than a single query.
                     If multiple queries are needed, do it as a follow-up step. Make this clear to the user. For example:
-                    
+
                     Human: plot both yesterday's and today's data.
-                    
+
                     Assistant: Here's how you can plot yesterday's data:
                     \`\`\`esql
                     <query>
                     \`\`\`
-  
+
                     Let's see that first. We'll look at today's data next.
-  
+
                     Human: <response from yesterday's data>
-  
+
                     Assistant: Let's look at today's data:
-  
+
                     \`\`\`esql
                     <query>
                     \`\`\`
                     `
                     : ''
                 }
-  
+
                 ${userIntentionMessage}
-  
+
                 DO NOT UNDER ANY CIRCUMSTANCES use commands or functions that are not a capability of ES|QL
                 as mentioned in the system message and documentation. When converting queries from one language
                 to ES|QL, make sure that the functions are available and documented in ES|QL.
                 E.g., for SPL's LEN, use LENGTH. For IF, use CASE.
-                
+
                 `,
             },
           },
@@ -449,7 +451,7 @@ export function registerQueryFunction({ functions, resources }: FunctionRegistra
             functionCall = undefined;
           } else if (args.intention === VisualizeESQLUserIntention.executeAndReturnResults) {
             functionCall = {
-              name: 'execute_query',
+              name: EXECUTE_QUERY_NAME,
               arguments: JSON.stringify({ query: esqlQuery }),
               trigger: MessageRole.Assistant as const,
             };
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/dataset_quality_link.tsx b/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/dataset_quality_link.tsx
index 24782cd2ab2bb..6610db470014b 100644
--- a/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/dataset_quality_link.tsx
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/public/components/dataset_quality_link.tsx
@@ -12,7 +12,7 @@ import { BrowserUrlService } from '@kbn/share-plugin/public';
 import { MatchedStateFromActor } from '@kbn/xstate-utils';
 import { useActor } from '@xstate/react';
 import React from 'react';
-import { DataQualityLocatorParams, DATA_QUALITY_LOCATOR_ID } from '@kbn/data-quality-plugin/common';
+import { DataQualityLocatorParams, DATA_QUALITY_LOCATOR_ID } from '@kbn/deeplinks-observability';
 import { datasetQualityLinkTitle } from '../../common/translations';
 import {
   ObservabilityLogsExplorerService,
diff --git a/x-pack/plugins/observability_solution/observability_logs_explorer/tsconfig.json b/x-pack/plugins/observability_solution/observability_logs_explorer/tsconfig.json
index 446c237e257eb..26db8756fb9a1 100644
--- a/x-pack/plugins/observability_solution/observability_logs_explorer/tsconfig.json
+++ b/x-pack/plugins/observability_solution/observability_logs_explorer/tsconfig.json
@@ -49,7 +49,6 @@
     "@kbn/es-query",
     "@kbn/core-analytics-browser",
     "@kbn/react-hooks",
-    "@kbn/data-quality-plugin",
     "@kbn/ebt",
   ],
   "exclude": [
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/observability_onboarding_flow.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/observability_onboarding_flow.tsx
index 33e472d841bbc..dd22b1735fc9f 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/observability_onboarding_flow.tsx
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/observability_onboarding_flow.tsx
@@ -19,6 +19,7 @@ import { SystemLogsPanel } from './quickstart_flows/system_logs';
 import { CustomLogsPanel } from './quickstart_flows/custom_logs';
 import { OtelLogsPanel } from './quickstart_flows/otel_logs';
 import { AutoDetectPanel } from './quickstart_flows/auto_detect';
+import { KubernetesPanel } from './quickstart_flows/kubernetes';
 import { BackButton } from './shared/back_button';
 
 const queryClient = new QueryClient();
@@ -66,6 +67,10 @@ export function ObservabilityOnboardingFlow() {
               <BackButton />
               <CustomLogsPanel />
             </Route>
+            <Route path="/kubernetes">
+              <BackButton />
+              <KubernetesPanel />
+            </Route>
             <Route path="/otel-logs">
               <BackButton />
               <OtelLogsPanel />
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/use_custom_cards_for_category.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/use_custom_cards_for_category.ts
index 5bc63403365cc..03d7d0278f374 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/use_custom_cards_for_category.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/use_custom_cards_for_category.ts
@@ -34,6 +34,7 @@ export function useCustomCardsForCategory(
   const { href: systemLogsUrl } = reactRouterNavigate(history, `/systemLogs/${location.search}`);
   const { href: customLogsUrl } = reactRouterNavigate(history, `/customLogs/${location.search}`);
   const { href: otelLogsUrl } = reactRouterNavigate(history, `/otel-logs/${location.search}`);
+  const { href: kubernetesUrl } = reactRouterNavigate(history, `/kubernetes/${location.search}`);
 
   const otelCard: VirtualCard = {
     id: 'otel-logs',
@@ -112,7 +113,23 @@ export function useCustomCardsForCategory(
       ];
     case 'infra':
       return [
-        toFeaturedCard('kubernetes'),
+        {
+          id: 'kubernetes-quick-start',
+          type: 'virtual',
+          title: 'Kubernetes',
+          description: 'Collect logs and metrics from Kubernetes using minimal configuration',
+          name: 'kubernetes-quick-start',
+          categories: ['observability'],
+          icons: [
+            {
+              type: 'svg',
+              src: http?.staticAssets.getPluginAssetHref('kubernetes.svg') ?? '',
+            },
+          ],
+          url: kubernetesUrl,
+          version: '',
+          integration: '',
+        },
         toFeaturedCard('docker'),
         isServerless ? toFeaturedCard('prometheus') : otelCard,
         {
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/packages_list/utils.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/application/packages_list/utils.ts
index 52e9a0f09c807..e0e468b0d80db 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/packages_list/utils.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/packages_list/utils.ts
@@ -7,7 +7,7 @@
 
 import { IntegrationCardItem } from '@kbn/fleet-plugin/public';
 
-export const QUICKSTART_FLOWS = ['system-logs-virtual'];
+export const QUICKSTART_FLOWS = ['system-logs-virtual', 'kubernetes-quick-start'];
 
 export const toCustomCard = (card: IntegrationCardItem) => ({
   ...card,
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/build_kubectl_command.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/build_kubectl_command.ts
new file mode 100644
index 0000000000000..59de30111649d
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/build_kubectl_command.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+interface Params {
+  encodedApiKey: string;
+  onboardingId: string;
+  elasticsearchUrl: string;
+  elasticAgentVersion: string;
+}
+
+const KUSTOMIZE_TEMPLATE_URL =
+  'https://github.com/elastic/elastic-agent/deploy/kubernetes/elastic-agent-kustomize/default/elastic-agent-standalone';
+
+export function buildKubectlCommand({
+  encodedApiKey,
+  onboardingId,
+  elasticsearchUrl,
+  elasticAgentVersion,
+}: Params) {
+  const escapedElasticsearchUrl = elasticsearchUrl.replace(/\//g, '\\/');
+
+  return `
+    kubectl kustomize ${KUSTOMIZE_TEMPLATE_URL}\\?ref\\=v${elasticAgentVersion}
+      | sed -e 's/JUFQSV9LRVkl/${encodedApiKey}/g'
+            -e "s/%ES_HOST%/${escapedElasticsearchUrl}/g"
+            -e "s/%ONBOARDING_ID%/${onboardingId}/g"
+            -e "s/\\(docker.elastic.co\\/beats\\/elastic-agent\:\\).*$/\\1${elasticAgentVersion}/g"
+            -e  "/{CA_TRUSTED}/c\\ "
+      |  kubectl apply -f-
+  `
+    .trim()
+    .replace(/\n/g, ' ')
+    .replace(/\s\s+/g, ' ');
+}
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/command_snippet.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/command_snippet.tsx
new file mode 100644
index 0000000000000..be7857676427c
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/command_snippet.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiCodeBlock, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import { buildKubectlCommand } from './build_kubectl_command';
+import { CopyToClipboardButton } from '../shared/copy_to_clipboard_button';
+
+interface Props {
+  encodedApiKey: string;
+  onboardingId: string;
+  elasticsearchUrl: string;
+  elasticAgentVersion: string;
+}
+
+export function CommandSnippet({
+  encodedApiKey,
+  onboardingId,
+  elasticsearchUrl,
+  elasticAgentVersion,
+}: Props) {
+  const command = buildKubectlCommand({
+    encodedApiKey,
+    onboardingId,
+    elasticsearchUrl,
+    elasticAgentVersion,
+  });
+
+  return (
+    <>
+      <EuiText>
+        <p>
+          <FormattedMessage
+            id="xpack.observability_onboarding.kubernetesPanel.installElasticAgentDescription"
+            defaultMessage="Copy and run the install command. Note that the following manifest contains resource limits that may not be appropriate for a production environment, review our guide on {scalingLink} before deploying this manifest."
+            values={{
+              scalingLink: (
+                <EuiLink
+                  data-test-subj="observabilityOnboardingKubernetesPanelScalingElasticAgentOnKubernetesLink"
+                  href="https://www.elastic.co/guide/en/fleet/current/scaling-on-kubernetes.html"
+                  external
+                  target="_blank"
+                >
+                  {i18n.translate(
+                    'xpack.observability_onboarding.kubernetesPanel.scalingElasticAgentOnLinkLabel',
+                    { defaultMessage: 'Scaling Elastic Agent on Kubernetes' }
+                  )}
+                </EuiLink>
+              ),
+            }}
+          />
+        </p>
+      </EuiText>
+
+      <EuiSpacer />
+
+      <EuiCodeBlock language="text" paddingSize="m" fontSize="m">
+        {command}
+      </EuiCodeBlock>
+
+      <EuiSpacer />
+
+      <CopyToClipboardButton textToCopy={command} fill />
+    </>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/data_ingest_status.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/data_ingest_status.tsx
new file mode 100644
index 0000000000000..3e91c20752bd4
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/data_ingest_status.tsx
@@ -0,0 +1,182 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect, useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiLink, EuiSpacer, EuiText } from '@elastic/eui';
+import { css } from '@emotion/react';
+import { i18n } from '@kbn/i18n';
+import { useKibana } from '@kbn/kibana-react-plugin/public';
+import { DASHBOARD_APP_LOCATOR } from '@kbn/deeplinks-analytics';
+import { FormattedMessage } from '@kbn/i18n-react';
+import {
+  StepsProgress,
+  useFlowProgressTelemetry,
+} from '../../../hooks/use_flow_progress_telemetry';
+import { ObservabilityOnboardingContextValue } from '../../../plugin';
+import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { ProgressIndicator } from '../shared/progress_indicator';
+
+interface Props {
+  onboardingId: string;
+}
+
+const FETCH_INTERVAL = 2000;
+const SHOW_TROUBLESHOOTING_DELAY = 120000; // 2 minutes
+const CLUSTER_OVERVIEW_DASHBOARD_ID = 'kubernetes-f4dc26db-1b53-4ea2-a78b-1bfab8ea267c';
+
+export function DataIngestStatus({ onboardingId }: Props) {
+  const {
+    services: { share, http },
+  } = useKibana<ObservabilityOnboardingContextValue>();
+  const [progress, setProgress] = useState<StepsProgress | undefined>(undefined);
+  const [checkDataStartTime] = useState(Date.now());
+
+  const dashboardLocator = share.url.locators.get(DASHBOARD_APP_LOCATOR);
+
+  const { data, status, refetch } = useFetcher(
+    (callApi) => {
+      return callApi('GET /internal/observability_onboarding/kubernetes/{onboardingId}/has-data', {
+        params: { path: { onboardingId } },
+      });
+    },
+    [onboardingId]
+  );
+
+  useEffect(() => {
+    const pendingStatusList = [FETCH_STATUS.LOADING, FETCH_STATUS.NOT_INITIATED];
+
+    if (pendingStatusList.includes(status) || data?.hasData === true) {
+      return;
+    }
+
+    const timeout = setTimeout(() => {
+      refetch();
+    }, FETCH_INTERVAL);
+
+    return () => clearTimeout(timeout);
+  }, [data?.hasData, refetch, status]);
+
+  useEffect(() => {
+    if (data?.hasData === true) {
+      setProgress({ 'logs-ingest': { status: 'complete' } });
+    }
+  }, [data?.hasData]);
+
+  useFlowProgressTelemetry(progress, onboardingId);
+
+  const isTroubleshootingVisible =
+    data?.hasData === false && Date.now() - checkDataStartTime > SHOW_TROUBLESHOOTING_DELAY;
+
+  return (
+    <>
+      <ProgressIndicator
+        title={data?.hasData ? 'We are monitoring your cluster' : 'Waiting for data to be shipped'}
+        iconType="checkInCircleFilled"
+        isLoading={!data?.hasData}
+        css={css`
+          max-width: 40%;
+        `}
+      />
+
+      {isTroubleshootingVisible && (
+        <>
+          <EuiSpacer />
+          <EuiText color="subdued" size="s">
+            <FormattedMessage
+              id="xpack.observability_onboarding.dataIngestStatus.troubleshootingTextLabel"
+              defaultMessage="Find more details and troubleshooting solutions in our documentation. {troubleshootingLink}"
+              values={{
+                troubleshootingLink: (
+                  <EuiLink
+                    data-test-subj="observabilityOnboardingDataIngestStatusTroubleshootingLink"
+                    href="https://www.elastic.co/guide/en/fleet/current/fleet-troubleshooting.html#agent-oom-k8s"
+                    external
+                    target="_blank"
+                  >
+                    {i18n.translate(
+                      'xpack.observability_onboarding.dataIngestStatus.troubleshootingLinkText',
+                      {
+                        defaultMessage: 'Open documentation',
+                      }
+                    )}
+                  </EuiLink>
+                ),
+              }}
+            />
+          </EuiText>
+        </>
+      )}
+
+      {data?.hasData === true && (
+        <>
+          <EuiSpacer />
+
+          <EuiFlexGroup alignItems="center">
+            <EuiFlexItem grow={false}>
+              <EuiImage
+                src={http.staticAssets.getPluginAssetHref('waterfall_screen.svg')}
+                width={162}
+                height={117}
+                alt=""
+                hasShadow
+              />
+            </EuiFlexItem>
+
+            <EuiFlexItem>
+              <EuiText>
+                <p>
+                  {i18n.translate(
+                    'xpack.observability_onboarding.kubernetesPanel.monitoringCluster',
+                    {
+                      defaultMessage:
+                        'Overview your Kubernetes cluster with this pre-made dashboard',
+                    }
+                  )}
+                </p>
+              </EuiText>
+              <EuiSpacer size="xs" />
+              <EuiLink
+                data-test-subj="observabilityOnboardingDataIngestStatusViewDashboardLink"
+                href={dashboardLocator?.getRedirectUrl({
+                  dashboardId: CLUSTER_OVERVIEW_DASHBOARD_ID,
+                })}
+              >
+                {i18n.translate('xpack.observability_onboarding.kubernetesPanel.exploreDashboard', {
+                  defaultMessage: 'Explore Kubernetes cluster',
+                })}
+              </EuiLink>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+
+          <EuiSpacer />
+
+          <EuiText color="subdued" size="s">
+            <FormattedMessage
+              id="xpack.observability_onboarding.dataIngestStatus.findAllPremadeAssetsTextLabel"
+              defaultMessage="Find all pre-made assets ready to use {viewAllAssetsLink}"
+              values={{
+                viewAllAssetsLink: (
+                  <EuiLink
+                    data-test-subj="observabilityOnboardingDataIngestStatusViewAllAssetsLink"
+                    href={`${http.basePath.get()}/app/integrations/detail/kubernetes/assets`}
+                  >
+                    {i18n.translate(
+                      'xpack.observability_onboarding.dataIngestStatus.viewAllAssetsLinkText',
+                      {
+                        defaultMessage: 'View all assets',
+                      }
+                    )}
+                  </EuiLink>
+                ),
+              }}
+            />
+          </EuiText>
+        </>
+      )}
+    </>
+  );
+}
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/index.tsx
new file mode 100644
index 0000000000000..58de3a72ca92f
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/kubernetes/index.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import {
+  EuiPanel,
+  EuiSkeletonRectangle,
+  EuiSkeletonText,
+  EuiSpacer,
+  EuiSteps,
+  EuiStepStatus,
+} from '@elastic/eui';
+import useEvent from 'react-use/lib/useEvent';
+import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { EmptyPrompt } from '../shared/empty_prompt';
+import { CommandSnippet } from './command_snippet';
+import { DataIngestStatus } from './data_ingest_status';
+
+export const KubernetesPanel: React.FC = () => {
+  const [windowLostFocus, setWindowLostFocus] = useState(false);
+  const { data, status, error, refetch } = useFetcher((callApi) => {
+    return callApi('POST /internal/observability_onboarding/kubernetes/flow');
+  }, []);
+
+  useEvent('blur', () => setWindowLostFocus(true), window);
+
+  if (error !== undefined) {
+    return <EmptyPrompt error={error} onRetryClick={refetch} />;
+  }
+
+  const isMonitoringStepActive =
+    status === FETCH_STATUS.SUCCESS && data !== undefined && windowLostFocus;
+
+  const steps = [
+    {
+      title: 'Install Elastic Agent on your host',
+      children: (
+        <>
+          {status !== FETCH_STATUS.SUCCESS && (
+            <>
+              <EuiSkeletonText lines={5} />
+              <EuiSpacer />
+              <EuiSkeletonRectangle width="170px" height="40px" />
+            </>
+          )}
+          {status === FETCH_STATUS.SUCCESS && data !== undefined && (
+            <CommandSnippet
+              encodedApiKey={data.apiKeyEncoded}
+              onboardingId={data.onboardingId}
+              elasticsearchUrl={data.elasticsearchUrl}
+              elasticAgentVersion={data.elasticAgentVersion}
+            />
+          )}
+        </>
+      ),
+    },
+    {
+      title: 'Monitor your Kubernetes cluster',
+      status: (isMonitoringStepActive ? 'current' : 'incomplete') as EuiStepStatus,
+      children: isMonitoringStepActive && <DataIngestStatus onboardingId={data.onboardingId} />,
+    },
+  ];
+
+  return (
+    <EuiPanel hasBorder paddingSize="xl">
+      <EuiSteps steps={steps} />
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx
index cac3cd41e06b6..3cb5d26d362cd 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/quickstart_flows/otel_logs/index.tsx
@@ -64,15 +64,16 @@ export const OtelLogsPanel: React.FC = () => {
     services: {
       share,
       http,
-      // context: { isServerless, stackVersion },
+      context: { isServerless, stackVersion },
     },
   } = useKibana<ObservabilityOnboardingAppServices>();
 
-  const AGENT_CDN_BASE_URL = 'snapshots.elastic.co/8.15.0-2088c97b/downloads/beats/elastic-agent';
-  const agentVersion = '8.15.0-SNAPSHOT';
-  // TODO uncomment before merge
-  // const AGENT_CDN_BASE_URL = 'artifacts.elastic.co/downloads/beats/elastic-agent';
+  const AGENT_CDN_BASE_URL = isServerless
+    ? 'snapshots.elastic.co/8.15.0-9bb1fcab/downloads/beats/elastic-agent'
+    : 'artifacts.elastic.co/downloads/beats/elastic-agent';
+  // TODO change once otel flow is shown on serverless
   // const agentVersion = isServerless ? setup?.elasticAgentVersion : stackVersion;
+  const agentVersion = isServerless ? '8.15.0-SNAPSHOT' : stackVersion;
 
   const allDatasetsLocator =
     share.url.locators.get<AllDatasetsLocatorParams>(ALL_DATASETS_LOCATOR_ID);
@@ -184,14 +185,13 @@ data:
   otel.yaml: |
     exporters:
       debug:
-        verbosity: normal
+        verbosity: basic
       elasticsearch:
         endpoints: 
         - \${env:ES_ENDPOINT}
         api_key: \${env:ES_API_KEY}
-        #logs_index: logs-otel.generic-default
-        # Metrics are not supported yet
-        #metrics_index: metrics-otel.generic-default
+        logs_dynamic_index:
+          enabled: true
         mapping:
           mode: ecs
     processors:
@@ -215,6 +215,11 @@ data:
           - key: service.name
             from_attribute: app.label.component
             action: insert
+      attributes/k8s_logs_dataset:
+        actions:
+          - key: data_stream.dataset
+            value: "kubernetes.container_logs"
+            action: upsert
       attributes/dataset:
         actions:
           - key: event.dataset
@@ -388,15 +393,10 @@ data:
         collection_interval: 20s
         endpoint: \${env:K8S_NODE_NAME}:10250
         node: '\${env:K8S_NODE_NAME}'
-        # Verify if this can be removed for all CSPs
-        #insecure_skip_verify: true
+        # Required to work for all CSPs without an issue
+        insecure_skip_verify: true
         k8s_api_config:
           auth_type: serviceAccount
-        metric_groups:
-          - node
-          - pod
-          - node
-          - volume
         metrics:
           k8s.pod.cpu.node.utilization:
             enabled: true
@@ -451,6 +451,7 @@ data:
           - resource/cloud
           - attributes/dataset
           - resource/process
+          - attributes/k8s_logs_dataset
           receivers:
           - kubeletstats
           - hostmetrics
@@ -552,8 +553,10 @@ spec:
       content: `arch=$(if ([[ $(arch) == "arm" || $(arch) == "aarch64" ]]); then echo "arm64"; else echo $(arch); fi)
 
 curl --output elastic-distro-${agentVersion}-linux-$arch.tar.gz --url https://${AGENT_CDN_BASE_URL}/elastic-agent-${agentVersion}-linux-$arch.tar.gz --proto '=https' --tlsv1.2 -fOL && mkdir elastic-distro-${agentVersion}-linux-$arch && tar -xvf elastic-distro-${agentVersion}-linux-$arch.tar.gz -C "elastic-distro-${agentVersion}-linux-$arch" --strip-components=1 && cd elastic-distro-${agentVersion}-linux-$arch 
+
+sudo setcap 'cap_dac_read_search=ep' ./data/elastic-agent-*/elastic-agent
         
-rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && sed -i 's#\\\${env:ELASTIC_ENDPOINT}#${setup?.elasticsearchUrl}#g' ./otel.yml && sed -i 's/\\\${env:ELASTIC_API_KEY}/${apiKeyData?.apiKeyEncoded}/g' ./otel.yml`,
+rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && mkdir -p ./data/otelcol && sed -i 's#\\\${env:STORAGE_DIR}#'"$PWD"/data/otelcol'#g' ./otel.yml && sed -i 's#\\\${env:ELASTIC_ENDPOINT}#${setup?.elasticsearchUrl}#g' ./otel.yml && sed -i 's/\\\${env:ELASTIC_API_KEY}/${apiKeyData?.apiKeyEncoded}/g' ./otel.yml`,
       start: './otelcol --config otel.yml',
       type: 'copy',
     },
@@ -565,7 +568,7 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && se
 
 curl --output elastic-distro-${agentVersion}-darwin-$arch.tar.gz --url https://${AGENT_CDN_BASE_URL}/elastic-agent-${agentVersion}-darwin-$arch.tar.gz --proto '=https' --tlsv1.2 -fOL && mkdir "elastic-distro-${agentVersion}-darwin-$arch" && tar -xvf elastic-distro-${agentVersion}-darwin-$arch.tar.gz -C "elastic-distro-${agentVersion}-darwin-$arch" --strip-components=1 && cd elastic-distro-${agentVersion}-darwin-$arch 
       
-rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && sed -i '' 's#\\\${env:ELASTIC_ENDPOINT}#${setup?.elasticsearchUrl}#g' ./otel.yml && sed -i '' 's/\\\${env:ELASTIC_API_KEY}/${apiKeyData?.apiKeyEncoded}/g' ./otel.yml`,
+rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && mkdir -p ./data/otelcol  && sed -i '' 's#\\\${env:STORAGE_DIR}#'"$PWD"/data/otelcol'#g' ./otel.yml && sed -i '' 's#\\\${env:ELASTIC_ENDPOINT}#${setup?.elasticsearchUrl}#g' ./otel.yml && sed -i '' 's/\\\${env:ELASTIC_API_KEY}/${apiKeyData?.apiKeyEncoded}/g' ./otel.yml`,
       start: './otelcol --config otel.yml',
       type: 'copy',
     },
@@ -728,8 +731,8 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && se
                   <EuiFlexGroup direction="column">
                     <EuiCallOut
                       title={i18n.translate(
-                        'xpack.observability_onboarding.otelLogsPanel.historicalDataTitle',
-                        { defaultMessage: 'Historical logs will not be collected' }
+                        'xpack.observability_onboarding.otelLogsPanel.limitationTitle',
+                        { defaultMessage: 'Configuration Information' }
                       )}
                       color="warning"
                       iconType="iInCircle"
@@ -738,11 +741,21 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && se
                         {i18n.translate(
                           'xpack.observability_onboarding.otelLogsPanel.historicalDataDescription',
                           {
-                            defaultMessage:
-                              'We only collect new log messages from the setup onward.',
+                            defaultMessage: 'New log messages are collected from the setup onward.',
                           }
                         )}
                       </p>
+                      {selectedTab !== 'kubernetes' && (
+                        <p>
+                          {i18n.translate(
+                            'xpack.observability_onboarding.otelLogsPanel.historicalDataDescription2',
+                            {
+                              defaultMessage:
+                                'The default log path is /var/log/*. You can change this path in the otel.yml file if needed.',
+                            }
+                          )}
+                        </p>
+                      )}
                     </EuiCallOut>
 
                     {selectedContent.prompt}
@@ -765,7 +778,12 @@ rm ./otel.yml && cp ./otel_samples/platformlogs_hostmetrics.yml ./otel.yml && se
                 ),
               },
               {
-                title: 'Visualize your data',
+                title: i18n.translate(
+                  'xpack.observability_onboarding.otelLogsPanel.steps.visualize',
+                  {
+                    defaultMessage: 'Visualize your data',
+                  }
+                ),
                 children: (
                   <>
                     <EuiText>
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/assets/kubernetes.svg b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/kubernetes.svg
new file mode 100644
index 0000000000000..7f3e86f5482b9
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/assets/kubernetes.svg
@@ -0,0 +1 @@
+<svg width="32" height="32" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32"><path d="M15.89.003c.355-.018.71.053 1.03.206l11.127 5.304a2.11 2.11 0 0 1 1.15 1.429l2.75 11.921a2.09 2.09 0 0 1-.412 1.783l-7.697 9.56c-.404.5-1.016.792-1.663.791L9.827 31c-.648 0-1.26-.292-1.664-.793l-7.7-9.558a2.107 2.107 0 0 1-.41-1.783L2.798 6.945a2.11 2.11 0 0 1 1.151-1.43L15.074.21c.255-.122.532-.192.815-.206zM16 4.06c-.368 0-.667.33-.667.738l.002.019c0 .055-.003.122-.002.17.01.236.06.416.091.632.057.464.103.849.074 1.206-.028.135-.127.258-.216.344l-.015.281a8.569 8.569 0 0 0-5.555 2.666c-.074-.05-.202-.142-.24-.17-.12.016-.24.053-.396-.038-.298-.2-.57-.477-.898-.81-.15-.16-.26-.31-.438-.464-.04-.035-.103-.082-.148-.118a.793.793 0 0 0-.464-.175.642.642 0 0 0-.53.234c-.23.288-.156.726.163.98l.01.008c.044.035.098.08.138.11.19.14.363.212.552.323.398.246.729.45.99.695.103.108.12.3.134.383l.214.19a8.592 8.592 0 0 0-1.36 5.998l-.278.08c-.074.096-.177.245-.286.29-.343.107-.728.147-1.194.195-.218.018-.407.008-.639.051-.05.01-.122.029-.177.042l-.006.001-.01.003c-.393.095-.645.455-.564.81.082.355.465.57.86.485l.01-.001.013-.004c.055-.012.124-.026.172-.039.228-.06.393-.15.597-.228.44-.158.806-.29 1.161-.341.149-.012.305.091.383.135l.29-.05a8.654 8.654 0 0 0 3.84 4.787l-.12.29c.043.113.091.265.059.376-.13.334-.35.688-.603 1.081-.122.182-.247.324-.357.532-.026.05-.06.126-.086.179-.17.365-.045.786.284.944.33.16.741-.008.919-.375l.001-.001v-.002c.025-.051.061-.12.083-.169.094-.215.125-.4.192-.609.176-.442.273-.905.515-1.194.067-.08.175-.11.287-.14l.151-.273a8.616 8.616 0 0 0 6.145.016l.142.256c.114.037.239.056.34.206.182.31.306.675.457 1.118.066.208.1.393.194.61.021.048.057.117.082.17.177.367.59.535.92.376.33-.158.455-.58.284-.945-.026-.052-.06-.129-.087-.179-.11-.208-.235-.348-.357-.53-.252-.393-.461-.72-.59-1.055-.055-.173.009-.28.05-.392-.025-.029-.079-.192-.11-.268a8.654 8.654 0 0 0 3.838-4.822c.086.014.236.04.285.05.1-.066.192-.152.373-.138.355.052.72.183 1.16.341.205.078.37.17.598.23.048.013.117.025.172.037l.013.004.01.002c.395.085.778-.131.86-.486.08-.355-.171-.715-.564-.81-.057-.013-.138-.035-.193-.045-.232-.044-.42-.033-.64-.051-.465-.049-.85-.089-1.193-.196-.14-.054-.239-.22-.287-.289l-.27-.078a8.572 8.572 0 0 0-.139-3.104 8.599 8.599 0 0 0-1.247-2.88c.068-.062.199-.177.236-.21.01-.12.001-.245.125-.377.262-.246.592-.45.99-.695.19-.11.364-.182.554-.322.043-.032.101-.082.146-.118.32-.255.393-.693.164-.98-.23-.287-.674-.314-.993-.06-.046.036-.107.083-.148.118-.179.153-.29.305-.44.464-.328.333-.6.611-.898.812-.129.075-.318.049-.404.044l-.253.18a8.732 8.732 0 0 0-5.528-2.666 16.036 16.036 0 0 1-.015-.297c-.087-.083-.192-.154-.218-.333-.029-.357.02-.742.076-1.206.03-.216.082-.396.09-.632.003-.053 0-.13 0-.189 0-.408-.299-.738-.667-.738zm-.834 5.156l-.198 3.488-.014.007a.587.587 0 0 1-.932.449l-.006.002-2.864-2.027a6.862 6.862 0 0 1 4.014-1.919zm1.668 0a6.922 6.922 0 0 1 3.99 1.92l-2.846 2.015-.01-.004a.588.588 0 0 1-.933-.448l-.003-.001-.198-3.482zm-6.72 3.222l2.614 2.335-.003.014a.585.585 0 0 1-.23 1.008l-.003.01-3.352.967a6.838 6.838 0 0 1 .973-4.334zm11.753.001c.388.63.683 1.331.858 2.093a6.91 6.91 0 0 1 .145 2.229l-3.37-.97-.002-.013a.586.586 0 0 1-.23-1.008l-.002-.007 2.6-2.324zm-6.404 2.515h1.071l.666.83-.239 1.038-.962.461-.964-.463-.24-1.037.668-.83zm3.435 2.844a.585.585 0 0 1 .135.01l.005-.008 3.468.586a6.858 6.858 0 0 1-2.776 3.481l-1.346-3.246.004-.005a.586.586 0 0 1 .51-.818zm-5.824.014a.587.587 0 0 1 .53.817l.01.012-1.331 3.214a6.886 6.886 0 0 1-2.767-3.458l3.437-.582.006.007a.595.595 0 0 1 .115-.01zm2.904 1.407a.582.582 0 0 1 .275.059.583.583 0 0 1 .263.25h.013l1.694 3.057c-.22.073-.446.136-.677.189a6.896 6.896 0 0 1-3.758-.194l1.69-3.05h.003a.588.588 0 0 1 .497-.31z" fill="#326CE5" fill-rule="nonzero"/></svg>
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_flow_progress_telemetry.ts b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_flow_progress_telemetry.ts
index 95d93ad6af985..a580055f8e3c7 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_flow_progress_telemetry.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/hooks/use_flow_progress_telemetry.ts
@@ -11,9 +11,9 @@ import { type LogsFlowProgressStepId } from '../../common/logs_flow_progress_ste
 import { OBSERVABILITY_ONBOARDING_TELEMETRY_EVENT } from '../../common/telemetry_events';
 import { useKibana } from './use_kibana';
 
-type EuiStepStatus = EuiStepsProps['steps'][number]['status'];
+export type EuiStepStatus = EuiStepsProps['steps'][number]['status'];
 
-type StepsProgress = Partial<
+export type StepsProgress = Partial<
   Record<LogsFlowProgressStepId, { status: EuiStepStatus; message?: string }>
 >;
 
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_install_api_key.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_install_api_key.ts
similarity index 96%
rename from x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_install_api_key.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_install_api_key.ts
index d97dd6ac6580c..eddc5e10b5c65 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_install_api_key.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_install_api_key.ts
@@ -13,7 +13,7 @@ import type { CreateAPIKeyParams } from '@kbn/security-plugin/server';
  */
 export function createInstallApiKey(name: string): CreateAPIKeyParams {
   return {
-    name: `onboarding_install_${name}`,
+    name,
     expiration: '1h', // This API key is only used for initial setup and should be short lived
     metadata: {
       managed: true,
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_shipper_api_key.ts
similarity index 93%
rename from x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_shipper_api_key.ts
index 70a3bf344fee6..942ebdbbd07cd 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/create_shipper_api_key.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/create_shipper_api_key.ts
@@ -12,7 +12,7 @@ export function createShipperApiKey(esClient: ElasticsearchClient, name: string)
   // Based on https://www.elastic.co/guide/en/fleet/master/grant-access-to-elasticsearch.html#create-api-key-standalone-agent
   return esClient.security.createApiKey({
     body: {
-      name: `standalone_agent_logs_onboarding_${name}`,
+      name,
       metadata: {
         managed: true,
         application: 'logs',
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/has_log_monitoring_privileges.ts
similarity index 100%
rename from x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/has_log_monitoring_privileges.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/has_log_monitoring_privileges.ts
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/monitoring_config.ts
similarity index 100%
rename from x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/api_key/monitoring_config.ts
rename to x-pack/plugins/observability_solution/observability_onboarding/server/lib/api_key/monitoring_config.ts
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts
index c58a5ef257fbb..80f0159f66594 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/flow/route.ts
@@ -20,12 +20,12 @@ import { ObservabilityOnboardingFlow } from '../../saved_objects/observability_o
 import { createObservabilityOnboardingServerRoute } from '../create_observability_onboarding_server_route';
 import { getHasLogs } from './get_has_logs';
 import { getKibanaUrl } from '../../lib/get_fallback_urls';
-import { hasLogMonitoringPrivileges } from '../logs/api_key/has_log_monitoring_privileges';
-import { createShipperApiKey } from '../logs/api_key/create_shipper_api_key';
-import { createInstallApiKey } from '../logs/api_key/create_install_api_key';
 import { getAgentVersion } from '../../lib/get_agent_version';
 import { getFallbackESUrl } from '../../lib/get_fallback_urls';
 import { ElasticAgentStepPayload, InstalledIntegration, StepProgressPayloadRT } from '../types';
+import { createShipperApiKey } from '../../lib/api_key/create_shipper_api_key';
+import { createInstallApiKey } from '../../lib/api_key/create_install_api_key';
+import { hasLogMonitoringPrivileges } from '../../lib/api_key/has_log_monitoring_privileges';
 
 const updateOnboardingFlowRoute = createObservabilityOnboardingServerRoute({
   endpoint: 'PUT /internal/observability_onboarding/flow/{onboardingId}',
@@ -229,8 +229,11 @@ const createFlowRoute = createObservabilityOnboardingServerRoute({
           progress: {},
         },
       }),
-      createShipperApiKey(client.asCurrentUser, name),
-      securityPluginStart.authc.apiKeys.create(request, createInstallApiKey(name)),
+      createShipperApiKey(client.asCurrentUser, `onboarding_ingest_${name}`),
+      securityPluginStart.authc.apiKeys.create(
+        request,
+        createInstallApiKey(`onboarding_install_${name}`)
+      ),
       getAgentVersion(fleetPluginStart, kibanaVersion),
     ]);
 
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts
index 2f9ce174cf040..e444f2266f18f 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/index.ts
@@ -7,6 +7,7 @@
 import type { EndpointOf, ServerRouteRepository } from '@kbn/server-route-repository';
 import { elasticAgentRouteRepository } from './elastic_agent/route';
 import { flowRouteRepository } from './flow/route';
+import { kubernetesOnboardingRouteRepository } from './kubernetes/route';
 import { logsOnboardingRouteRepository } from './logs/route';
 
 function getTypedObservabilityOnboardingServerRouteRepository() {
@@ -14,6 +15,7 @@ function getTypedObservabilityOnboardingServerRouteRepository() {
     ...flowRouteRepository,
     ...logsOnboardingRouteRepository,
     ...elasticAgentRouteRepository,
+    ...kubernetesOnboardingRouteRepository,
   };
 
   return repository;
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/kubernetes/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/kubernetes/route.ts
new file mode 100644
index 0000000000000..efbea4a0bcd4e
--- /dev/null
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/kubernetes/route.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import * as t from 'io-ts';
+import Boom from '@hapi/boom';
+import { termQuery } from '@kbn/observability-plugin/server';
+import type { estypes } from '@elastic/elasticsearch';
+import { getFallbackESUrl } from '../../lib/get_fallback_urls';
+import { createObservabilityOnboardingServerRoute } from '../create_observability_onboarding_server_route';
+import { hasLogMonitoringPrivileges } from '../../lib/api_key/has_log_monitoring_privileges';
+import { createShipperApiKey } from '../../lib/api_key/create_shipper_api_key';
+import { getAgentVersion } from '../../lib/get_agent_version';
+
+export interface CreateKubernetesOnboardingFlowRouteResponse {
+  apiKeyEncoded: string;
+  onboardingId: string;
+  elasticsearchUrl: string;
+  elasticAgentVersion: string;
+}
+
+export interface HasKubernetesDataRouteResponse {
+  hasData: boolean;
+}
+
+const createKubernetesOnboardingFlowRoute = createObservabilityOnboardingServerRoute({
+  endpoint: 'POST /internal/observability_onboarding/kubernetes/flow',
+  options: { tags: [] },
+  async handler({
+    context,
+    request,
+    plugins,
+    services,
+    kibanaVersion,
+  }): Promise<CreateKubernetesOnboardingFlowRouteResponse> {
+    const {
+      elasticsearch: { client },
+    } = await context.core;
+
+    const hasPrivileges = await hasLogMonitoringPrivileges(client.asCurrentUser);
+
+    if (!hasPrivileges) {
+      throw Boom.forbidden(
+        "You don't have enough privileges to start a new onboarding flow. Contact your system administrator to grant you the required privileges."
+      );
+    }
+
+    const fleetPluginStart = await plugins.fleet.start();
+    const packageClient = fleetPluginStart.packageService.asScoped(request);
+
+    await packageClient.ensureInstalledPackage({ pkgName: 'kubernetes' });
+
+    const [{ encoded: apiKeyEncoded }, elasticAgentVersion] = await Promise.all([
+      createShipperApiKey(client.asCurrentUser, 'kubernetes_onboarding'),
+      getAgentVersion(fleetPluginStart, kibanaVersion),
+    ]);
+    const elasticsearchUrlList = plugins.cloud?.setup?.elasticsearchUrl
+      ? [plugins.cloud?.setup?.elasticsearchUrl]
+      : await getFallbackESUrl(services.esLegacyConfigService);
+
+    return {
+      onboardingId: uuidv4(),
+      apiKeyEncoded,
+      elasticsearchUrl: elasticsearchUrlList.length > 0 ? elasticsearchUrlList[0] : '',
+      elasticAgentVersion,
+    };
+  },
+});
+
+const hasKubernetesDataRoute = createObservabilityOnboardingServerRoute({
+  endpoint: 'GET /internal/observability_onboarding/kubernetes/{onboardingId}/has-data',
+  params: t.type({
+    path: t.type({
+      onboardingId: t.string,
+    }),
+  }),
+  options: { tags: [] },
+  async handler(resources): Promise<HasKubernetesDataRouteResponse> {
+    const { onboardingId } = resources.params.path;
+    const { elasticsearch } = await resources.context.core;
+
+    try {
+      const result = await elasticsearch.client.asCurrentUser.search({
+        index: ['logs-*', 'metrics-*'],
+        ignore_unavailable: true,
+        size: 0,
+        terminate_after: 1,
+        query: {
+          bool: {
+            filter: termQuery('fields.onboarding_id', onboardingId),
+          },
+        },
+      });
+      const { value } = result.hits.total as estypes.SearchTotalHits;
+
+      return {
+        hasData: value > 0,
+      };
+    } catch (error) {
+      throw Boom.internal(`Elasticsearch responses with an error. ${error.message}`);
+    }
+  },
+});
+
+export const kubernetesOnboardingRouteRepository = {
+  ...createKubernetesOnboardingFlowRoute,
+  ...hasKubernetesDataRoute,
+};
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
index 524037c1c4222..6d17617e1a94e 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/routes/logs/route.ts
@@ -10,10 +10,10 @@ import { createObservabilityOnboardingServerRoute } from '../create_observabilit
 import { getFallbackESUrl } from '../../lib/get_fallback_urls';
 import { getKibanaUrl } from '../../lib/get_fallback_urls';
 import { getAgentVersion } from '../../lib/get_agent_version';
-import { hasLogMonitoringPrivileges } from './api_key/has_log_monitoring_privileges';
 import { saveObservabilityOnboardingFlow } from '../../lib/state';
-import { createShipperApiKey } from './api_key/create_shipper_api_key';
+import { createShipperApiKey } from '../../lib/api_key/create_shipper_api_key';
 import { ObservabilityOnboardingFlow } from '../../saved_objects/observability_onboarding_status';
+import { hasLogMonitoringPrivileges } from '../../lib/api_key/has_log_monitoring_privileges';
 
 const logMonitoringPrivilegesRoute = createObservabilityOnboardingServerRoute({
   endpoint: 'GET /internal/observability_onboarding/logs/setup/privileges',
@@ -115,7 +115,10 @@ const createFlowRoute = createObservabilityOnboardingServerRoute({
     const {
       elasticsearch: { client },
     } = await context.core;
-    const { encoded: apiKeyEncoded } = await createShipperApiKey(client.asCurrentUser, name);
+    const { encoded: apiKeyEncoded } = await createShipperApiKey(
+      client.asCurrentUser,
+      `standalone_agent_logs_onboarding_${name}`
+    );
 
     const generatedState = type === 'systemLogs' ? { namespace: 'default' } : state;
     const savedObjectsClient = coreStart.savedObjects.getScopedClient(request);
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
index a7ef942d7ea0a..bf996b96e1958 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/saved_objects/observability_onboarding_status.ts
@@ -23,10 +23,10 @@ export interface SystemLogsState {
   namespace: string;
 }
 
-export type ObservabilityOnboardingType = 'logFiles' | 'systemLogs' | 'autoDetect';
-
 type ObservabilityOnboardingFlowState = LogFilesState | SystemLogsState | undefined;
 
+type ObservabilityOnboardingType = 'logFiles' | 'systemLogs' | 'autoDetect' | 'kubernetes';
+
 export interface ObservabilityOnboardingFlow {
   type: ObservabilityOnboardingType;
   state: ObservabilityOnboardingFlowState;
diff --git a/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
index 95da640fa40ae..340f0cb615651 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
+++ b/x-pack/plugins/observability_solution/observability_onboarding/server/test_helpers/create_observability_onboarding_users/authentication.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { cluster, indices } from '../../routes/logs/api_key/monitoring_config';
+import { cluster, indices } from '../../lib/api_key/monitoring_config';
 
 export enum ObservabilityOnboardingUsername {
   noAccessUser = 'no_access_user',
diff --git a/x-pack/plugins/observability_solution/profiling_data_access/server/services/status/index.ts b/x-pack/plugins/observability_solution/profiling_data_access/server/services/status/index.ts
index a2ad969847da7..b7f791a166385 100644
--- a/x-pack/plugins/observability_solution/profiling_data_access/server/services/status/index.ts
+++ b/x-pack/plugins/observability_solution/profiling_data_access/server/services/status/index.ts
@@ -23,7 +23,9 @@ export function createGetStatusService(params: RegisterServicesParams) {
     try {
       const { type, setupState } = await getSetupState({ ...params, esClient, soClient, spaceId });
 
-      params.logger.debug(`Set up state for: ${type}: ${JSON.stringify(setupState, null, 2)}`);
+      params.logger.debug(
+        () => `Set up state for: ${type}: ${JSON.stringify(setupState, null, 2)}`
+      );
 
       return {
         has_setup:
diff --git a/x-pack/plugins/observability_solution/slo/server/services/transform_manager.ts b/x-pack/plugins/observability_solution/slo/server/services/transform_manager.ts
index f90d240e30087..febd24a457222 100644
--- a/x-pack/plugins/observability_solution/slo/server/services/transform_manager.ts
+++ b/x-pack/plugins/observability_solution/slo/server/services/transform_manager.ts
@@ -91,6 +91,7 @@ export class DefaultTransformManager implements TransformManager {
           this.esClient.transform.startTransform({ transform_id: transformId }, { ignore: [409] }),
         { logger: this.logger }
       );
+      await this.scheduleNowTransform(transformId);
     } catch (err) {
       this.logger.error(`Cannot start SLO transform [${transformId}]`);
       throw err;
@@ -128,4 +129,16 @@ export class DefaultTransformManager implements TransformManager {
       throw err;
     }
   }
+
+  async scheduleNowTransform(transformId: TransformId) {
+    this.esClient.transform
+      .scheduleNowTransform({ transform_id: transformId })
+      .then(() => {
+        this.logger.info(`SLO transform [${transformId}] scheduled now successfully`);
+      })
+      .catch((e) => {
+        this.logger.error(`Cannot schedule now SLO transform [${transformId}]`);
+        this.logger.error(e);
+      });
+  }
 }
diff --git a/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/monitor_types.ts b/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/monitor_types.ts
index 808e7ced0bdbb..1c5b69a44dc0e 100644
--- a/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/monitor_types.ts
+++ b/x-pack/plugins/observability_solution/synthetics/common/runtime_types/monitor_management/monitor_types.ts
@@ -129,12 +129,14 @@ export const TCPAdvancedCodec = t.intersection([
 export type TCPAdvancedFields = t.TypeOf<typeof TCPAdvancedCodec>;
 
 // TCPFields
+// All fields for TCP monitor, excluding sensitive fields
 export const EncryptedTCPFieldsCodec = t.intersection([
   TCPSimpleFieldsCodec,
   TCPAdvancedFieldsCodec,
   TLSFieldsCodec,
 ]);
 
+// All fields for TCP monitor, including sensitive fields
 export const TCPFieldsCodec = t.intersection([
   EncryptedTCPFieldsCodec,
   TCPSensitiveAdvancedFieldsCodec,
@@ -218,12 +220,14 @@ export const HTTPAdvancedCodec = t.intersection([
 ]);
 
 // HTTPFields
+// All fields for HTTP monitor, excluding sensitive fields
 export const EncryptedHTTPFieldsCodec = t.intersection([
   HTTPSimpleFieldsCodec,
   HTTPAdvancedFieldsCodec,
   TLSFieldsCodec,
 ]);
 
+// All fields for HTTP monitor, including sensitive fields
 export const HTTPFieldsCodec = t.intersection([
   EncryptedHTTPFieldsCodec,
   HTTPSensitiveAdvancedFieldsCodec,
@@ -291,12 +295,14 @@ export const BrowserAdvancedFieldsCodec = t.intersection([
   BrowserSensitiveAdvancedFieldsCodec,
 ]);
 
+// All fields for Browser monitor, excluding sensitive fields
 export const EncryptedBrowserFieldsCodec = t.intersection([
   EncryptedBrowserSimpleFieldsCodec,
   EncryptedBrowserAdvancedFieldsCodec,
   TLSFieldsCodec,
 ]);
 
+// All fields for Browser monitor, including sensitive fields
 export const BrowserFieldsCodec = t.intersection([
   BrowserSimpleFieldsCodec,
   BrowserAdvancedFieldsCodec,
@@ -311,7 +317,7 @@ export const MonitorFieldsCodec = t.intersection([
   BrowserFieldsCodec,
 ]);
 
-// Monitor, represents one of (Icmp | Tcp | Http | Browser)
+// Monitor, represents one of (Icmp | Tcp | Http | Browser) decrypted
 export const SyntheticsMonitorCodec = t.union([
   HTTPFieldsCodec,
   TCPFieldsCodec,
@@ -319,6 +325,7 @@ export const SyntheticsMonitorCodec = t.union([
   BrowserFieldsCodec,
 ]);
 
+// Monitor, represents one of (Icmp | Tcp | Http | Browser) encrypted
 export const EncryptedSyntheticsMonitorCodec = t.union([
   EncryptedHTTPFieldsCodec,
   EncryptedTCPFieldsCodec,
diff --git a/x-pack/plugins/observability_solution/synthetics/kibana.jsonc b/x-pack/plugins/observability_solution/synthetics/kibana.jsonc
index 90076811dc75b..3e0715e48abb1 100644
--- a/x-pack/plugins/observability_solution/synthetics/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/synthetics/kibana.jsonc
@@ -1,7 +1,7 @@
 {
   "type": "plugin",
   "id": "@kbn/synthetics-plugin",
-  "owner": "@elastic/obs-ux-infra_services-team",
+  "owner": "@elastic/obs-ux-management-team",
   "description": "This plugin visualizes data from Synthetics and Heartbeat, and integrates with other Observability solutions.",
   "plugin": {
     "id": "synthetics",
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/components/view_document.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/components/view_document.tsx
index e9d6e4e650b46..56efdd3adaaf3 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/components/view_document.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/components/view_document.tsx
@@ -20,6 +20,7 @@ export const ViewDocument = ({ ping }: { ping: Ping }) => {
 
   const dataView = useSyntheticsDataView();
   const formatter = useDateFormat();
+  const formattedTimestamp = formatter(ping.timestamp);
 
   const [, hit] = useEsDocSearch({ id: ping.docId, index: SYNTHETICS_INDEX_PATTERN, dataView });
 
@@ -28,7 +29,7 @@ export const ViewDocument = ({ ping }: { ping: Ping }) => {
       <EuiButtonIcon
         data-test-subj="syntheticsViewDocumentButton"
         iconType="inspect"
-        title={INSPECT_DOCUMENT}
+        title={INSPECT_DOCUMENT(formattedTimestamp)}
         onClick={(evt: MouseEvent<HTMLButtonElement>) => {
           evt.stopPropagation();
           setIsFlyoutVisible(true);
@@ -46,7 +47,7 @@ export const ViewDocument = ({ ping }: { ping: Ping }) => {
           <EuiFlyoutHeader>
             <EuiTitle size="m">
               <h4>
-                {INDEXED_AT} {formatter(ping.timestamp)}
+                {INDEXED_AT} {formattedTimestamp}
               </h4>
             </EuiTitle>
           </EuiFlyoutHeader>
@@ -67,9 +68,8 @@ const INDEXED_AT = i18n.translate('xpack.synthetics.monitorDetails.summary.index
   defaultMessage: 'Indexed at',
 });
 
-export const INSPECT_DOCUMENT = i18n.translate(
-  'xpack.synthetics.monitorDetails.action.inspectDocument',
-  {
-    defaultMessage: 'Inspect document',
-  }
-);
+export const INSPECT_DOCUMENT = (timestamp: string) =>
+  i18n.translate('xpack.synthetics.monitorDetails.action.inspectDocument', {
+    defaultMessage: 'Inspect document timestamped {timestamp}',
+    values: { timestamp },
+  });
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/links/step_details_link.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/links/step_details_link.tsx
index 3414f2b2bfd13..bd7476a1568f4 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/links/step_details_link.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/links/step_details_link.tsx
@@ -52,8 +52,7 @@ export const StepDetailsLinkIcon = ({
     <EuiButtonIcon
       data-test-subj="syntheticsStepDetailsLinkIconButton"
       {...commonProps}
-      aria-label={VIEW_DETAILS}
-      title={VIEW_DETAILS}
+      title={VIEW_DETAILS(stepIndex)}
       size="s"
       href={stepDetailsLink}
       target={target}
@@ -62,6 +61,10 @@ export const StepDetailsLinkIcon = ({
   );
 };
 
-const VIEW_DETAILS = i18n.translate('xpack.synthetics.monitor.step.viewStepDetails', {
-  defaultMessage: 'View step details',
-});
+const VIEW_DETAILS = (stepIndex: number = 1) =>
+  i18n.translate('xpack.synthetics.monitor.step.viewStepDetails', {
+    defaultMessage: 'View step {stepIndex} details',
+    values: {
+      stepIndex,
+    },
+  });
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/monitor_test_result/journey_screenshot_preview.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/monitor_test_result/journey_screenshot_preview.tsx
index 62bb880a0f6be..16d961dfbb67f 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/monitor_test_result/journey_screenshot_preview.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/monitor_test_result/journey_screenshot_preview.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import React, { useCallback, useState, MouseEvent } from 'react';
+import React, { useCallback, useState } from 'react';
 import { EuiPopover, useEuiTheme } from '@elastic/eui';
 
 import { i18n } from '@kbn/i18n';
 import { POPOVER_SCREENSHOT_SIZE, ScreenshotImageSize } from '../screenshot/screenshot_size';
 import { JourneyScreenshotDialog } from '../screenshot/journey_screenshot_dialog';
-import { ScreenshotImage } from '../screenshot/screenshot_image';
+import { ScreenshotImage, ScreenshotImageProps } from '../screenshot/screenshot_image';
 
 export interface StepImagePopoverProps {
   timestamp?: string;
@@ -47,24 +47,24 @@ export const JourneyScreenshotPreview: React.FC<StepImagePopoverProps> = ({
   // Only render the dialog if the image is at least once clicked
   const [isImageEverClick, setIsImageEverClicked] = useState(false);
 
-  const onMouseEnter = useCallback(
-    (_evt: MouseEvent<HTMLImageElement>) => {
+  const onImgFocus: ScreenshotImageProps['onFocus'] = useCallback(
+    (_evt) => {
       setIsImagePopoverOpen(true);
     },
     [setIsImagePopoverOpen]
   );
 
-  const onMouseLeave = useCallback(
-    (_evt: MouseEvent<HTMLImageElement>) => {
+  const onImgBlur: ScreenshotImageProps['onBlur'] = useCallback(
+    (_evt) => {
       setIsImagePopoverOpen(false);
     },
     [setIsImagePopoverOpen]
   );
 
-  const onImgClick = useCallback(
-    (evt: MouseEvent<HTMLImageElement>) => {
-      // needed to prevent propagation to the table row click
+  const onImgClick: ScreenshotImageProps['onClick'] = useCallback(
+    (evt) => {
       evt.stopPropagation();
+
       setIsImageEverClicked(true);
       setIsImageDialogOpen(true);
       setIsImagePopoverOpen(false);
@@ -92,8 +92,8 @@ export const JourneyScreenshotPreview: React.FC<StepImagePopoverProps> = ({
       unavailableMessage={unavailableMessage}
       borderColor={isStepFailed ? euiTheme.colors.danger : undefined}
       borderRadius={borderRadius}
-      onMouseEnter={onMouseEnter}
-      onMouseLeave={onMouseLeave}
+      onFocus={onImgFocus}
+      onBlur={onImgBlur}
       onClick={onImgClick}
     />
   );
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
index 8b08153acec18..b608c694189bc 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/journey_screenshot_dialog.tsx
@@ -133,10 +133,6 @@ export const JourneyScreenshotDialog = ({
             animateLoading={false}
             hasBorder={false}
             size={'full'}
-            onClick={(evt) => {
-              // for table row click to work
-              evt.stopPropagation();
-            }}
           />
         </ModalBodyStyled>
 
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/screenshot_image.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/screenshot_image.tsx
index de37819f043a8..31d5a41d51dff 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/screenshot_image.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/common/screenshot/screenshot_image.tsx
@@ -5,14 +5,16 @@
  * 2.0.
  */
 
-import React, { useState, MouseEventHandler } from 'react';
-import { useEuiTheme, EuiThemeComputed } from '@elastic/eui';
+import React, { useState } from 'react';
+import { useEuiTheme, EuiThemeComputed, keys } from '@elastic/eui';
 
 import { EmptyThumbnail } from './empty_thumbnail';
 import { getConfinedScreenshotSize, ScreenshotImageSize } from './screenshot_size';
 
 const DEFAULT_SIZE: [number, number] = [512, 512];
 
+type ScreenshotImageCallback = (e: { stopPropagation(): void }) => void;
+
 export interface ScreenshotImageProps {
   label?: string;
   isLoading: boolean;
@@ -22,9 +24,9 @@ export interface ScreenshotImageProps {
   borderColor?: EuiThemeComputed['border']['color'];
   borderRadius?: string | number;
   hasBorder?: boolean;
-  onMouseEnter?: MouseEventHandler<HTMLImageElement>;
-  onMouseLeave?: MouseEventHandler<HTMLImageElement>;
-  onClick?: MouseEventHandler<HTMLImageElement>;
+  onFocus?: ScreenshotImageCallback;
+  onBlur?: ScreenshotImageCallback;
+  onClick?: ScreenshotImageCallback;
 }
 
 export const ScreenshotImage: React.FC<ScreenshotImageProps & { imgSrc?: string }> = ({
@@ -37,8 +39,8 @@ export const ScreenshotImage: React.FC<ScreenshotImageProps & { imgSrc?: string
   borderRadius,
   hasBorder = true,
   size = [100, 64],
-  onMouseEnter,
-  onMouseLeave,
+  onFocus,
+  onBlur,
   onClick,
 }) => {
   const { euiTheme } = useEuiTheme();
@@ -70,10 +72,17 @@ export const ScreenshotImage: React.FC<ScreenshotImageProps & { imgSrc?: string
         ];
         setNaturalSize(updatedSize);
       }}
-      onMouseEnter={onMouseEnter}
-      onMouseLeave={onMouseLeave}
+      onMouseEnter={onFocus}
+      onMouseLeave={onBlur}
+      onFocus={onFocus}
+      onBlur={onBlur}
       onClick={onClick}
-      onKeyDown={undefined}
+      onKeyDown={(evt) => {
+        if (onClick && evt.key === keys.ENTER) {
+          onClick(evt);
+        }
+      }}
+      tabIndex={onClick ? 0 : undefined}
     />
   ) : (
     <EmptyThumbnail
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
index 4c151880ff588..7ea35752fefac 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_now_mode/browser/browser_test_results.tsx
@@ -15,6 +15,7 @@ import {
   EuiLoadingSpinner,
   EuiTitle,
   EuiCallOut,
+  EuiScreenReaderLive,
   useEuiTheme,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -153,6 +154,13 @@ function getButtonContent({
   journeyStarted,
   completedSteps,
 }: CheckGroupResult) {
+  const completedText = i18n.translate('xpack.synthetics.monitorManagement.stepCompleted', {
+    defaultMessage: '{stepCount, number} {stepCount, plural, one {step} other {steps}}  completed',
+    values: {
+      stepCount: completedSteps ?? 0,
+    },
+  });
+
   return (
     <div>
       <TestResultHeader
@@ -165,16 +173,9 @@ function getButtonContent({
       />
       <EuiText size="s">
         <p>
-          <EuiText color="subdued">
-            {i18n.translate('xpack.synthetics.monitorManagement.stepCompleted', {
-              defaultMessage:
-                '{stepCount, number} {stepCount, plural, one {step} other {steps}}  completed',
-              values: {
-                stepCount: completedSteps ?? 0,
-              },
-            })}
-          </EuiText>
+          <EuiText color="subdued">{completedText}</EuiText>
         </p>
+        <EuiScreenReaderLive>{completedText}</EuiScreenReaderLive>
       </EuiText>
     </div>
   );
diff --git a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_run_details/components/step_number_nav.tsx b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_run_details/components/step_number_nav.tsx
index 6a4b4ef710e79..8fb3a71f9c5f1 100644
--- a/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_run_details/components/step_number_nav.tsx
+++ b/x-pack/plugins/observability_solution/synthetics/public/apps/synthetics/components/test_run_details/components/step_number_nav.tsx
@@ -36,6 +36,7 @@ export const StepNumberNav = ({
               onClick={handlePreviousStep}
               disabled={!hasPreviousStep}
               iconType="arrowLeft"
+              aria-label={PREVIOUS_STEP_BUTTON_ARIA_LABEL}
             >
               {PREVIOUS_STEP_BUTTON_TEXT}
             </EuiButtonEmpty>
@@ -59,6 +60,7 @@ export const StepNumberNav = ({
               disabled={!hasNextStep}
               iconType="arrowRight"
               iconSide="right"
+              aria-label={NEXT_STEP_BUTTON_ARIA_LABEL}
             >
               {NEXT_STEP_BUTTON_TEXT}
             </EuiButtonEmpty>
@@ -69,16 +71,30 @@ export const StepNumberNav = ({
   );
 };
 
-export const PREVIOUS_STEP_BUTTON_TEXT = i18n.translate(
+const PREVIOUS_STEP_BUTTON_TEXT = i18n.translate(
   'xpack.synthetics.synthetics.stepDetail.previousStepButtonText',
   {
     defaultMessage: 'Previous',
   }
 );
 
-export const NEXT_STEP_BUTTON_TEXT = i18n.translate(
+const PREVIOUS_STEP_BUTTON_ARIA_LABEL = i18n.translate(
+  'xpack.synthetics.synthetics.stepDetail.previousStepButtonAriaLabel',
+  {
+    defaultMessage: 'Previous step',
+  }
+);
+
+const NEXT_STEP_BUTTON_TEXT = i18n.translate(
   'xpack.synthetics.synthetics.stepDetail.nextStepButtonText',
   {
     defaultMessage: 'Next',
   }
 );
+
+const NEXT_STEP_BUTTON_ARIA_LABEL = i18n.translate(
+  'xpack.synthetics.synthetics.stepDetail.nextStepButtonAriaLabel',
+  {
+    defaultMessage: 'Next step',
+  }
+);
diff --git a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/common.ts b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/common.ts
index 28a01845212d2..165a11ea67856 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/common.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/common.ts
@@ -25,12 +25,9 @@ import {
   MonitorStatusActionGroup,
   SYNTHETICS_RULE_TYPES_ALERT_CONTEXT,
 } from '../../common/constants/synthetics_alerts';
-import {
-  getUptimeIndexPattern,
-  IndexPatternTitleAndFields,
-} from '../legacy_uptime/lib/requests/get_index_pattern';
+import { getUptimeIndexPattern, IndexPatternTitleAndFields } from '../queries/get_index_pattern';
 import { StatusCheckFilters } from '../../common/runtime_types';
-import { UptimeEsClient } from '../lib';
+import { SyntheticsEsClient } from '../lib';
 import { getMonitorSummary } from './status_rule/message_utils';
 import {
   SyntheticsCommonState,
@@ -311,14 +308,14 @@ export const RECOVERED_LABEL = i18n.translate('xpack.synthetics.monitorStatus.re
 });
 
 export const formatFilterString = async (
-  uptimeEsClient: UptimeEsClient,
+  syntheticsEsClient: SyntheticsEsClient,
   filters?: StatusCheckFilters,
   search?: string
 ) =>
   await generateFilterDSL(
     () =>
       getUptimeIndexPattern({
-        uptimeEsClient,
+        syntheticsEsClient,
       }),
     filters,
     search
diff --git a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.test.ts b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.test.ts
index ff8ecebccf968..02373c34ac6a5 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.test.ts
@@ -38,7 +38,7 @@ describe('StatusRuleExecutor', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: soClient,
     config: {
       service: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.ts b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.ts
index 0861b29c8134d..36ad8783f44ad 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/status_rule/status_rule_executor.ts
@@ -11,7 +11,7 @@ import {
 } from '@kbn/core-saved-objects-api-server';
 import { ElasticsearchClient } from '@kbn/core-elasticsearch-server';
 import { SyntheticsServerSetup } from '../../types';
-import { UptimeEsClient } from '../../lib';
+import { SyntheticsEsClient } from '../../lib';
 import { SYNTHETICS_INDEX_PATTERN } from '../../../common/constants';
 import {
   getAllMonitors,
@@ -42,7 +42,7 @@ export interface AlertOverviewStatus
 export class StatusRuleExecutor {
   previousStartedAt: Date | null;
   params: StatusRuleParams;
-  esClient: UptimeEsClient;
+  esClient: SyntheticsEsClient;
   soClient: SavedObjectsClientContract;
   server: SyntheticsServerSetup;
   syntheticsMonitorClient: SyntheticsMonitorClient;
@@ -59,7 +59,7 @@ export class StatusRuleExecutor {
     this.previousStartedAt = previousStartedAt;
     this.params = p;
     this.soClient = soClient;
-    this.esClient = new UptimeEsClient(this.soClient, scopedClient, {
+    this.esClient = new SyntheticsEsClient(this.soClient, scopedClient, {
       heartbeatIndices: SYNTHETICS_INDEX_PATTERN,
     });
     this.server = server;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.test.ts b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.test.ts
index eec9a8be02fd7..024ca73982826 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.test.ts
@@ -38,7 +38,7 @@ describe('tlsRuleExecutor', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: soClient,
     config: {
       service: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.ts b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.ts
index 5c6d634783bce..10c4ae24a1bf2 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/alert_rules/tls_rule/tls_rule_executor.ts
@@ -31,12 +31,12 @@ import {
 import { SyntheticsMonitorClient } from '../../synthetics_service/synthetics_monitor/synthetics_monitor_client';
 import { monitorAttributes } from '../../../common/types/saved_objects';
 import { AlertConfigKey } from '../../../common/constants/monitor_management';
-import { UptimeEsClient } from '../../lib';
+import { SyntheticsEsClient } from '../../lib';
 
 export class TLSRuleExecutor {
   previousStartedAt: Date | null;
   params: TLSParams;
-  esClient: UptimeEsClient;
+  esClient: SyntheticsEsClient;
   soClient: SavedObjectsClientContract;
   server: SyntheticsServerSetup;
   syntheticsMonitorClient: SyntheticsMonitorClient;
@@ -53,7 +53,7 @@ export class TLSRuleExecutor {
     this.previousStartedAt = previousStartedAt;
     this.params = p;
     this.soClient = soClient;
-    this.esClient = new UptimeEsClient(this.soClient, scopedClient, {
+    this.esClient = new SyntheticsEsClient(this.soClient, scopedClient, {
       heartbeatIndices: SYNTHETICS_INDEX_PATTERN,
     });
     this.server = server;
@@ -124,7 +124,7 @@ export class TLSRuleExecutor {
     }
 
     const { certs, total }: CertResult = await getSyntheticsCerts({
-      uptimeEsClient: this.esClient,
+      syntheticsEsClient: this.esClient,
       pageIndex: 0,
       size: 1000,
       notValidAfter: `now+${expiryThreshold}d`,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/common/pings/query_pings.ts b/x-pack/plugins/observability_solution/synthetics/server/common/pings/query_pings.ts
index 7b60fc8fcf536..e60052d4c01ee 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/common/pings/query_pings.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/common/pings/query_pings.ts
@@ -11,7 +11,7 @@ import {
   QueryDslQueryContainer,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { SUMMARY_FILTER } from '../../../common/constants/client_defaults';
-import { UptimeEsClient } from '../../lib';
+import { SyntheticsEsClient } from '../../lib';
 import {
   GetPingsParams,
   HttpResponseBody,
@@ -37,10 +37,12 @@ type GetParamsWithFields<F> = GetPingsParams & {
 type GetParamsWithoutFields = GetPingsParams;
 
 export async function queryPings<F>(
-  params: (GetParamsWithFields<F> | GetParamsWithoutFields) & { uptimeEsClient: UptimeEsClient }
+  params: (GetParamsWithFields<F> | GetParamsWithoutFields) & {
+    syntheticsEsClient: SyntheticsEsClient;
+  }
 ): Promise<PingsResponse | { total: number; pings: F[] }> {
   const {
-    uptimeEsClient,
+    syntheticsEsClient,
     dateRange: { from, to },
     index,
     monitorId,
@@ -100,7 +102,7 @@ export async function queryPings<F>(
       body: {
         hits: { hits, total },
       },
-    } = await uptimeEsClient.search({ body: searchBody });
+    } = await syntheticsEsClient.search({ body: searchBody });
 
     return {
       total: total.value,
@@ -112,7 +114,7 @@ export async function queryPings<F>(
     body: {
       hits: { hits, total },
     },
-  } = await uptimeEsClient.search({ body: searchBody });
+  } = await syntheticsEsClient.search({ body: searchBody });
 
   const pings: Ping[] = hits.map((doc: any) => {
     const { _id, _source } = doc;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/lib.test.ts b/x-pack/plugins/observability_solution/synthetics/server/lib.test.ts
index 8dbcdaf58514b..2de1a2b530734 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/lib.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/lib.test.ts
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { UptimeEsClient } from './lib';
+import { SyntheticsEsClient } from './lib';
 import { savedObjectsClientMock, uiSettingsServiceMock } from '@kbn/core/server/mocks';
 import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 
-describe('UptimeEsClient', () => {
-  let uptimeEsClient: UptimeEsClient;
+describe('SyntheticsEsClient', () => {
+  let syntheticsEsClient: SyntheticsEsClient;
   const savedObjectsClient = savedObjectsClientMock.create();
   const esClient = elasticsearchClientMock.createClusterClient().asInternalUser;
 
   beforeEach(() => {
-    uptimeEsClient = new UptimeEsClient(savedObjectsClient, esClient);
+    syntheticsEsClient = new SyntheticsEsClient(savedObjectsClient, esClient);
   });
 
   afterEach(() => {
@@ -32,7 +32,7 @@ describe('UptimeEsClient', () => {
         },
       };
 
-      const result = await uptimeEsClient.search({
+      const result = await syntheticsEsClient.search({
         body: {
           query: {
             match_all: {},
@@ -69,7 +69,7 @@ describe('UptimeEsClient', () => {
       const mockError = new Error('Search error');
       esClient.search.mockRejectedValueOnce(mockError);
 
-      await expect(uptimeEsClient.search(mockSearchParams)).rejects.toThrow(mockError);
+      await expect(syntheticsEsClient.search(mockSearchParams)).rejects.toThrow(mockError);
       expect(esClient.search).toHaveBeenCalledWith(
         {
           index: 'synthetics-*',
@@ -86,7 +86,7 @@ describe('UptimeEsClient', () => {
         index: 'example',
       };
 
-      const result = await uptimeEsClient.count(mockCountParams);
+      const result = await syntheticsEsClient.count(mockCountParams);
 
       expect(esClient.count).toHaveBeenCalledWith(mockCountParams, { meta: true });
       expect(result).toEqual({
@@ -110,30 +110,30 @@ describe('UptimeEsClient', () => {
       const mockError = new Error('Count error');
       esClient.count.mockRejectedValueOnce(mockError);
 
-      await expect(uptimeEsClient.count(mockCountParams)).rejects.toThrow(mockError);
+      await expect(syntheticsEsClient.count(mockCountParams)).rejects.toThrow(mockError);
       expect(esClient.count).toHaveBeenCalledWith(mockCountParams, { meta: true });
     });
   });
 
   describe('getInspectEnabled', () => {
     it('should return false if uiSettings is not available', async () => {
-      const result = await uptimeEsClient.getInspectEnabled();
+      const result = await syntheticsEsClient.getInspectEnabled();
 
       expect(result).toBe(false);
     });
 
     it('should return the value from uiSettings if available', async () => {
       const mockUiSettings = uiSettingsServiceMock.createClient();
-      uptimeEsClient.uiSettings = {
+      syntheticsEsClient.uiSettings = {
         client: mockUiSettings,
       } as any;
 
       // @ts-expect-error
       mockUiSettings.get.mockReturnValue(true);
 
-      await uptimeEsClient.getInspectEnabled();
+      await syntheticsEsClient.getInspectEnabled();
 
-      expect(uptimeEsClient.isInspectorEnabled).toBe(true);
+      expect(syntheticsEsClient.isInspectorEnabled).toBe(true);
       expect(mockUiSettings.get).toHaveBeenCalledWith('observability:enableInspectEsQueries');
     });
   });
diff --git a/x-pack/plugins/observability_solution/synthetics/server/lib.ts b/x-pack/plugins/observability_solution/synthetics/server/lib.ts
index 9aed13371bc58..e4877f09f66a9 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/lib.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/lib.ts
@@ -36,7 +36,7 @@ export interface CountResponse {
   indices: string;
 }
 
-export class UptimeEsClient {
+export class SyntheticsEsClient {
   isDev: boolean;
   request?: KibanaRequest;
   baseESClient: ElasticsearchClient;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/queries/get_certs.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_certs.ts
index cecfe8ba851d3..2d5ad2f84a79e 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/queries/get_certs.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_certs.ts
@@ -11,10 +11,10 @@ import {
   getCertsRequestBody,
   processCertsResult,
 } from '../../common/requests/get_certs_request_body';
-import type { UptimeEsClient } from '../lib';
+import type { SyntheticsEsClient } from '../lib';
 
 export const getSyntheticsCerts = async (
-  requestParams: GetCertsParams & { uptimeEsClient: UptimeEsClient }
+  requestParams: GetCertsParams & { syntheticsEsClient: SyntheticsEsClient }
 ): Promise<CertResult> => {
   const result = await getCertsResults(requestParams);
 
@@ -24,15 +24,15 @@ export const getSyntheticsCerts = async (
 export type CertificatesResults = PromiseType<ReturnType<typeof getCertsResults>>;
 
 const getCertsResults = async (
-  requestParams: GetCertsParams & { uptimeEsClient: UptimeEsClient }
+  requestParams: GetCertsParams & { syntheticsEsClient: SyntheticsEsClient }
 ) => {
-  const { uptimeEsClient } = requestParams;
+  const { syntheticsEsClient } = requestParams;
 
   const searchBody = getCertsRequestBody(requestParams);
 
   const request = { body: searchBody };
 
-  const { body: result } = await uptimeEsClient.search<Ping, typeof request>({
+  const { body: result } = await syntheticsEsClient.search<Ping, typeof request>({
     body: searchBody,
   });
 
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_index_pattern.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_index_pattern.ts
similarity index 80%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_index_pattern.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_index_pattern.ts
index ae7c96b2f3c5d..875fc75544b8a 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_index_pattern.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_index_pattern.ts
@@ -6,8 +6,8 @@
  */
 
 import { FieldDescriptor, IndexPatternsFetcher } from '@kbn/data-plugin/server';
-import { SYNTHETICS_INDEX_PATTERN } from '../../../../common/constants';
-import { UptimeEsClient } from '../../../lib';
+import { SYNTHETICS_INDEX_PATTERN } from '../../common/constants';
+import { SyntheticsEsClient } from '../lib';
 
 export interface IndexPatternTitleAndFields {
   title: string;
@@ -15,11 +15,11 @@ export interface IndexPatternTitleAndFields {
 }
 
 export const getUptimeIndexPattern = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
 }: {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<IndexPatternTitleAndFields | undefined> => {
-  const indexPatternsFetcher = new IndexPatternsFetcher(uptimeEsClient.baseESClient);
+  const indexPatternsFetcher = new IndexPatternsFetcher(syntheticsEsClient.baseESClient);
 
   try {
     const { fields } = await indexPatternsFetcher.getFieldsForWildcard({
diff --git a/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_details.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_details.ts
index a5288a20dad74..97b3595761cf8 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_details.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_details.ts
@@ -6,7 +6,7 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { createEsParams, UptimeEsClient } from '../lib';
+import { createEsParams, SyntheticsEsClient } from '../lib';
 import { JourneyStep, Ping, SyntheticsJourneyApiResponse } from '../../common/runtime_types';
 
 export interface GetJourneyDetails {
@@ -16,10 +16,10 @@ export interface GetJourneyDetails {
 type DocumentSource = (Ping & { '@timestamp': string; synthetics: { type: string } }) | JourneyStep;
 
 export const getJourneyDetails = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   checkGroup,
 }: GetJourneyDetails & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<SyntheticsJourneyApiResponse['details']> => {
   const params = createEsParams({
     body: {
@@ -43,7 +43,7 @@ export const getJourneyDetails = async ({
     },
   });
 
-  const { body: thisJourney } = await uptimeEsClient.search<DocumentSource, typeof params>(
+  const { body: thisJourney } = await syntheticsEsClient.search<DocumentSource, typeof params>(
     params,
     'getJourneyDetailsCurrentJourney'
   );
@@ -143,11 +143,11 @@ export const getJourneyDetails = async ({
     });
 
     const [previousJourneyPromise, nextJourneyPromise] = await Promise.all([
-      uptimeEsClient.search<JourneyStep, typeof previousParams>(
+      syntheticsEsClient.search<JourneyStep, typeof previousParams>(
         previousParams,
         'getJourneyDetailsPreviousJourney'
       ),
-      uptimeEsClient.search<JourneyStep, typeof nextParams>(
+      syntheticsEsClient.search<JourneyStep, typeof nextParams>(
         nextParams,
         'getJourneyDetailsNextJourney'
       ),
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.test.ts
similarity index 97%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.test.ts
index bcfd7d3296fa9..4e9190e61cd72 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.test.ts
@@ -48,7 +48,7 @@ describe('getJourneyFailedSteps', () => {
   it('formats failed steps', async () => {
     expect(
       await getJourneyFailedSteps({
-        uptimeEsClient: mockSearchResult(mockData),
+        syntheticsEsClient: mockSearchResult(mockData),
         checkGroups: ['chg1', 'chg2'],
       })
     ).toMatchInlineSnapshot(`
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.ts
similarity index 80%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.ts
index ff42e8a5e07dc..bde1a970e21f9 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_failed_steps.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_failed_steps.ts
@@ -6,19 +6,19 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UptimeEsClient } from '../../../lib';
-import { asMutableArray } from '../../../../common/utils/as_mutable_array';
-import { JourneyStep } from '../../../../common/runtime_types/ping/synthetics';
+import { SyntheticsEsClient } from '../lib';
+import { asMutableArray } from '../../common/utils/as_mutable_array';
+import { JourneyStep } from '../../common/runtime_types/ping/synthetics';
 
 export interface GetJourneyStepsParams {
   checkGroups: string[];
 }
 
 export const getJourneyFailedSteps = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   checkGroups,
 }: GetJourneyStepsParams & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<JourneyStep[]> => {
   const params = {
     query: {
@@ -52,7 +52,7 @@ export const getJourneyFailedSteps = async ({
     size: 500,
   };
 
-  const { body: result } = await uptimeEsClient.search({ body: params });
+  const { body: result } = await syntheticsEsClient.search({ body: params });
 
   return result.hits.hits.map(({ _id, _source }) => {
     const step = Object.assign({ _id }, _source) as JourneyStep;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.test.ts
similarity index 96%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.test.ts
index 5a94fac1ee31c..8c430cc10a42e 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.test.ts
@@ -26,7 +26,7 @@ describe('getJourneyScreenshot', () => {
     };
     expect(
       await getJourneyScreenshot({
-        uptimeEsClient: mockSearchResult([], {
+        syntheticsEsClient: mockSearchResult([], {
           step: {
             image: {
               hits: {
@@ -93,7 +93,7 @@ describe('getJourneyScreenshot', () => {
     };
     expect(
       await getJourneyScreenshot({
-        uptimeEsClient: mockSearchResult([], {
+        syntheticsEsClient: mockSearchResult([], {
           step: { image: { hits: { hits: [screenshotRefResult], total: 1 } } },
         }),
         checkGroup: 'checkGroup',
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.ts
similarity index 86%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.ts
index 318ea118f22ae..e707b34248c02 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot.ts
@@ -6,8 +6,8 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UptimeEsClient } from '../../../lib';
-import { RefResult, FullScreenshot } from '../../../../common/runtime_types/ping/synthetics';
+import { SyntheticsEsClient } from '../lib';
+import { RefResult, FullScreenshot } from '../../common/runtime_types/ping/synthetics';
 
 interface ResultType {
   _source: RefResult | FullScreenshot;
@@ -20,12 +20,12 @@ export type ScreenshotReturnTypesUnion =
 export const getJourneyScreenshot = async ({
   checkGroup,
   stepIndex,
-  uptimeEsClient,
+  syntheticsEsClient,
 }: {
   checkGroup: string;
   stepIndex: number;
 } & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<ScreenshotReturnTypesUnion> => {
   const body = {
     track_total_hits: true,
@@ -64,7 +64,7 @@ export const getJourneyScreenshot = async ({
     },
   };
 
-  const result = await uptimeEsClient.search({ body });
+  const result = await syntheticsEsClient.search({ body });
 
   const screenshotsOrRefs =
     (result.body.aggregations?.step.image.hits.hits as ResultType[]) ?? null;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.test.ts
similarity index 96%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.test.ts
index 76b2ea0d98708..0a1c30a619130 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.test.ts
@@ -12,7 +12,7 @@ describe('getJourneyScreenshotBlocks', () => {
   it('returns formatted blocks', async () => {
     expect(
       await getJourneyScreenshotBlocks({
-        uptimeEsClient: mockSearchResult([
+        syntheticsEsClient: mockSearchResult([
           {
             _id: 'hash1',
             _source: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.ts
similarity index 79%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.ts
index 44b25ee66259b..47767df107c04 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_screenshot_blocks.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_screenshot_blocks.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import { UptimeEsClient } from '../../../lib';
-import { ScreenshotBlockDoc } from '../../../../common/runtime_types';
+import { SyntheticsEsClient } from '../lib';
+import { ScreenshotBlockDoc } from '../../common/runtime_types';
 
 interface ScreenshotBlockResultType {
   _id: string;
@@ -20,11 +20,11 @@ interface ScreenshotBlockResultType {
 
 export const getJourneyScreenshotBlocks = async ({
   blockIds,
-  uptimeEsClient,
+  syntheticsEsClient,
 }: {
   blockIds: string[];
 } & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<ScreenshotBlockDoc[]> => {
   const body = {
     query: {
@@ -41,7 +41,7 @@ export const getJourneyScreenshotBlocks = async ({
     size: 1000,
   };
 
-  const fetchScreenshotBlocksResult = await uptimeEsClient.search({ body });
+  const fetchScreenshotBlocksResult = await syntheticsEsClient.search({ body });
 
   return (fetchScreenshotBlocksResult.body.hits.hits as ScreenshotBlockResultType[]).map(
     ({ _id, _source }) => ({
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.test.ts
similarity index 94%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.test.ts
index 770fc0706ecbe..bd1ee592634c4 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { JourneyStep } from '../../../../common/runtime_types/ping/synthetics';
+import { JourneyStep } from '../../common/runtime_types/ping/synthetics';
 import { getJourneySteps } from './get_journey_steps';
 import { getUptimeESMockClient } from './test_helpers';
 
@@ -76,11 +76,11 @@ describe('getJourneySteps request module', () => {
     });
 
     it('formats ES result', async () => {
-      const { esClient: mockEsClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient: mockEsClient, syntheticsEsClient } = getUptimeESMockClient();
 
       mockEsClient.search.mockResolvedValueOnce(data);
       const result: JourneyStep[] = await getJourneySteps({
-        uptimeEsClient,
+        syntheticsEsClient,
         checkGroup: '2bf952dc-64b5-11eb-8b3b-42010a84000d',
       });
       expect(mockEsClient.search).toHaveBeenCalledTimes(1);
@@ -138,14 +138,14 @@ describe('getJourneySteps request module', () => {
     });
 
     it('notes screenshot exists when a document of type step/screenshot is included', async () => {
-      const { esClient: mockEsClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient: mockEsClient, syntheticsEsClient } = getUptimeESMockClient();
 
       data.body.hits.hits[0]._source.synthetics.type = 'step/screenshot';
       data.body.hits.hits[0]._source.synthetics.step.index = 2;
       mockEsClient.search.mockResolvedValueOnce(data);
 
       const result: JourneyStep[] = await getJourneySteps({
-        uptimeEsClient,
+        syntheticsEsClient,
         checkGroup: '2bf952dc-64b5-11eb-8b3b-42010a84000d',
       });
 
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.ts
similarity index 87%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.ts
index 73dfd720eb304..0cd964193b2ff 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_journey_steps.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_journey_steps.ts
@@ -6,9 +6,9 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UptimeEsClient } from '../../../lib';
-import { asMutableArray } from '../../../../common/utils/as_mutable_array';
-import { JourneyStep } from '../../../../common/runtime_types/ping/synthetics';
+import { SyntheticsEsClient } from '../lib';
+import { asMutableArray } from '../../common/utils/as_mutable_array';
+import { JourneyStep } from '../../common/runtime_types/ping/synthetics';
 
 export interface GetJourneyStepsParams {
   checkGroup: string;
@@ -17,10 +17,10 @@ export interface GetJourneyStepsParams {
 type ResultType = JourneyStep & { '@timestamp': string };
 
 export const getJourneySteps = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   checkGroup,
 }: GetJourneyStepsParams & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<JourneyStep[]> => {
   const params = {
     query: {
@@ -54,7 +54,7 @@ export const getJourneySteps = async ({
     },
     size: 500,
   };
-  const { body: result } = await uptimeEsClient.search({ body: params }, 'getJourneySteps');
+  const { body: result } = await syntheticsEsClient.search({ body: params }, 'getJourneySteps');
 
   const steps = result.hits.hits.map(
     ({ _id, _source }) => Object.assign({ _id }, _source) as ResultType
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_last_successful_check.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_last_successful_check.test.ts
similarity index 100%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_last_successful_check.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_last_successful_check.test.ts
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_last_successful_check.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_last_successful_check.ts
similarity index 89%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_last_successful_check.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_last_successful_check.ts
index d3f94a11cf2fa..271ef438fbf65 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_last_successful_check.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_last_successful_check.ts
@@ -6,8 +6,8 @@
  */
 
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UptimeEsClient } from '../../../lib';
-import { Ping } from '../../../../common/runtime_types/ping';
+import { SyntheticsEsClient } from '../lib';
+import { Ping } from '../../common/runtime_types/ping';
 
 export interface GetStepScreenshotParams {
   monitorId: string;
@@ -81,12 +81,12 @@ export const getLastSuccessfulStepParams = ({
 };
 
 export const getLastSuccessfulCheck = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   monitorId,
   timestamp,
   location,
 }: GetStepScreenshotParams & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<Ping | null> => {
   const lastSuccessCheckParams = getLastSuccessfulStepParams({
     monitorId,
@@ -94,7 +94,7 @@ export const getLastSuccessfulCheck = async ({
     location,
   });
 
-  const { body: result } = await uptimeEsClient.search({ body: lastSuccessCheckParams });
+  const { body: result } = await syntheticsEsClient.search({ body: lastSuccessCheckParams });
 
   if (result.hits.total.value < 1) {
     return null;
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_monitor.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_monitor.ts
similarity index 87%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_monitor.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_monitor.ts
index 7c5c54f51be63..64e425951f5ff 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_monitor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_monitor.ts
@@ -7,13 +7,13 @@
 
 import { SavedObjectsClientContract } from '@kbn/core/server';
 import { EncryptedSavedObjectsClient } from '@kbn/encrypted-saved-objects-plugin/server';
-import { syntheticsMonitorType } from '../../../../common/types/saved_objects';
+import { syntheticsMonitorType } from '../../common/types/saved_objects';
 import {
   SyntheticsMonitorWithSecretsAttributes,
   EncryptedSyntheticsMonitorAttributes,
   SyntheticsMonitor,
-} from '../../../../common/runtime_types';
-import { normalizeSecrets } from '../../../synthetics_service/utils/secrets';
+} from '../../common/runtime_types';
+import { normalizeSecrets } from '../synthetics_service/utils/secrets';
 
 export const getSyntheticsMonitor = async ({
   monitorId,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.test.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.test.ts
similarity index 98%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.test.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.test.ts
index c7bdafc6ceca0..c55fb7a1af4ff 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.test.ts
@@ -169,7 +169,7 @@ describe('getNetworkEvents', () => {
   });
 
   it('Uses the correct query', async () => {
-    const { uptimeEsClient, esClient } = getUptimeESMockClient();
+    const { syntheticsEsClient, esClient } = getUptimeESMockClient();
 
     esClient.search.mockResponseOnce({
       hits: {
@@ -179,7 +179,7 @@ describe('getNetworkEvents', () => {
     } as any);
 
     await getNetworkEvents({
-      uptimeEsClient,
+      syntheticsEsClient,
       checkGroup: 'my-fake-group',
       stepIndex: '1',
     });
@@ -224,7 +224,7 @@ describe('getNetworkEvents', () => {
   });
 
   it('Returns the correct result', async () => {
-    const { esClient, uptimeEsClient } = getUptimeESMockClient();
+    const { esClient, syntheticsEsClient } = getUptimeESMockClient();
 
     esClient.search.mockResponseOnce({
       hits: {
@@ -234,7 +234,7 @@ describe('getNetworkEvents', () => {
     } as any);
 
     const result = await getNetworkEvents({
-      uptimeEsClient,
+      syntheticsEsClient,
       checkGroup: 'my-fake-group',
       stepIndex: '1',
     });
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.ts
similarity index 92%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.ts
index d860e944a8c06..58cafe505fd63 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/get_network_events.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/get_network_events.ts
@@ -6,8 +6,8 @@
  */
 
 import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { UptimeEsClient } from '../../../lib';
-import { NetworkEvent } from '../../../../common/runtime_types';
+import { SyntheticsEsClient } from '../lib';
+import { NetworkEvent } from '../../common/runtime_types';
 
 export interface GetNetworkEventsParams {
   checkGroup: string;
@@ -19,11 +19,11 @@ export const secondsToMillis = (seconds: number) =>
   seconds === -1 ? -1 : seconds * 1000;
 
 export const getNetworkEvents = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   checkGroup,
   stepIndex,
 }: GetNetworkEventsParams & {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }): Promise<{
   events: NetworkEvent[];
   total: number;
@@ -47,7 +47,7 @@ export const getNetworkEvents = async ({
     size: 1000,
   };
 
-  const { body: result } = await uptimeEsClient.search({ body: params });
+  const { body: result } = await syntheticsEsClient.search({ body: params });
   let isWaterfallSupported = false;
   let hasNavigationRequest = false;
 
diff --git a/x-pack/plugins/observability_solution/synthetics/server/queries/journey_screenshots.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/journey_screenshots.ts
index a58b75f65a29d..b4c9a381c8159 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/queries/journey_screenshots.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/journey_screenshots.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 import { IKibanaResponse } from '@kbn/core-http-server';
-import {
-  getJourneyScreenshot,
-  ScreenshotReturnTypesUnion,
-} from '../legacy_uptime/lib/requests/get_journey_screenshot';
+import { getJourneyScreenshot, ScreenshotReturnTypesUnion } from './get_journey_screenshot';
 import { isRefResult, RefResult } from '../../common/runtime_types';
 import { RouteContext, UptimeRouteContext } from '../routes/types';
 
@@ -27,12 +24,12 @@ function getSharedHeaders(stepName: string, totalSteps: number) {
 export const journeyScreenshotHandler = async ({
   response,
   request,
-  uptimeEsClient,
+  syntheticsEsClient,
 }: RouteContext | UptimeRouteContext): Promise<IKibanaResponse<ClientContract>> => {
   const { checkGroup, stepIndex } = request.params;
 
   const result: ScreenshotReturnTypesUnion | null = await getJourneyScreenshot({
-    uptimeEsClient,
+    syntheticsEsClient,
     checkGroup,
     stepIndex,
   });
diff --git a/x-pack/plugins/observability_solution/synthetics/server/queries/query_monitor_status.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/query_monitor_status.ts
index fca44f0893afc..4e2873ce77218 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/queries/query_monitor_status.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/query_monitor_status.ts
@@ -16,7 +16,7 @@ import {
   OverviewStatus,
   OverviewStatusMetaData,
 } from '../../common/runtime_types';
-import { createEsParams, UptimeEsClient } from '../lib';
+import { createEsParams, SyntheticsEsClient } from '../lib';
 
 const DEFAULT_MAX_ES_BUCKET_SIZE = 10000;
 
@@ -34,7 +34,7 @@ const fields = [
 ];
 
 export async function queryMonitorStatus(
-  esClient: UptimeEsClient,
+  esClient: SyntheticsEsClient,
   monitorLocationIds: string[],
   range: { from: string; to: string },
   monitorQueryIds: string[],
diff --git a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/test_helpers.ts b/x-pack/plugins/observability_solution/synthetics/server/queries/test_helpers.ts
similarity index 90%
rename from x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/test_helpers.ts
rename to x-pack/plugins/observability_solution/synthetics/server/queries/test_helpers.ts
index 48ac588be8c63..92f9bb824d3b8 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/legacy_uptime/lib/requests/test_helpers.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/queries/test_helpers.ts
@@ -8,7 +8,7 @@
 import { AggregationsAggregate } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { ElasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { elasticsearchServiceMock, savedObjectsClientMock } from '@kbn/core/server/mocks';
-import { UptimeEsClient } from '../../../lib';
+import { SyntheticsEsClient } from '../lib';
 
 export interface MultiPageCriteria<K, T> {
   after_key?: K;
@@ -58,7 +58,7 @@ export const setupMockEsCompositeQuery = <K, C, I>(
 
 interface UptimeEsMockClient {
   esClient: ElasticsearchClientMock;
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
 }
 
 export const getUptimeESMockClient = (
@@ -70,15 +70,15 @@ export const getUptimeESMockClient = (
 
   return {
     esClient: esClientMock || esClient,
-    uptimeEsClient: new UptimeEsClient(savedObjectsClient, esClientMock || esClient),
+    syntheticsEsClient: new SyntheticsEsClient(savedObjectsClient, esClientMock || esClient),
   };
 };
 
 export function mockSearchResult(
   data: unknown,
   aggregations: Record<string, AggregationsAggregate> = {}
-): UptimeEsClient {
-  const { esClient: mockEsClient, uptimeEsClient } = getUptimeESMockClient();
+): SyntheticsEsClient {
+  const { esClient: mockEsClient, syntheticsEsClient } = getUptimeESMockClient();
 
   mockEsClient.search.mockResponse({
     took: 18,
@@ -100,5 +100,5 @@ export function mockSearchResult(
     aggregations,
   });
 
-  return uptimeEsClient;
+  return syntheticsEsClient;
 }
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/certs/get_certificates.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/certs/get_certificates.ts
index 5136b3cb3a437..b6b6ad5aec85d 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/certs/get_certificates.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/certs/get_certificates.ts
@@ -36,7 +36,7 @@ export const getSyntheticsCertsRoute: SyntheticsRestApiRouteFactory<
   },
   handler: async ({
     request,
-    uptimeEsClient,
+    syntheticsEsClient,
     savedObjectsClient,
     server,
     syntheticsMonitorClient,
@@ -66,7 +66,7 @@ export const getSyntheticsCertsRoute: SyntheticsRestApiRouteFactory<
 
     const data = await getSyntheticsCerts({
       ...queryParams,
-      uptimeEsClient,
+      syntheticsEsClient,
       monitorIds: enabledMonitorQueryIds,
     });
     return { data };
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_integration.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_integration.ts
index c65844614a68e..2865ca2e70cc2 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_integration.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/delete_integration.ts
@@ -16,12 +16,12 @@ export const deletePackagePolicyRoute: SyntheticsRestApiRouteFactory = () => ({
       packagePolicyId: schema.string({ minLength: 1, maxLength: 1024 }),
     }),
   },
-  handler: async ({ request, savedObjectsClient, server, uptimeEsClient }): Promise<any> => {
+  handler: async ({ request, savedObjectsClient, server, syntheticsEsClient }): Promise<any> => {
     const { packagePolicyId } = request.params;
 
     const response = await server.fleet.packagePolicyService.delete(
       savedObjectsClient,
-      uptimeEsClient.baseESClient,
+      syntheticsEsClient.baseESClient,
       [packagePolicyId],
       {
         force: true,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts
index af743673e7c7e..637c0fc5c6193 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/edit_monitor.test.ts
@@ -27,7 +27,7 @@ describe('syncEditedMonitor', () => {
   const logger = loggerMock.create();
 
   const serverMock: SyntheticsServerSetup = {
-    uptimeEsClient: { search: jest.fn() },
+    syntheticsEsClient: { search: jest.fn() },
     stackVersion: null,
     authSavedObjectsClient: {
       bulkUpdate: jest.fn(),
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/get_monitor.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/get_monitor.ts
index 77e4a1c7440cc..e7623da98cfb4 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/get_monitor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/monitor_cruds/get_monitor.ts
@@ -19,7 +19,7 @@ import { SYNTHETICS_API_URLS } from '../../../common/constants';
 import { getMonitorNotFoundResponse } from '../synthetics_service/service_errors';
 import { getMonitorFilters, MonitorsQuery, QuerySchema, SEARCH_FIELDS } from '../common';
 import { mapSavedObjectToMonitor } from './helper';
-import { getSyntheticsMonitor } from '../../legacy_uptime/lib/requests/get_monitor';
+import { getSyntheticsMonitor } from '../../queries/get_monitor';
 
 export const getSyntheticsMonitorRoute: SyntheticsRestApiRouteFactory = () => ({
   method: 'GET',
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/network_events/get_network_events.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/network_events/get_network_events.ts
index fce38c3ac69d9..4860517f2d8b3 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/network_events/get_network_events.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/network_events/get_network_events.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { getNetworkEvents } from '../../legacy_uptime/lib/requests/get_network_events';
+import { getNetworkEvents } from '../../queries/get_network_events';
 import { SyntheticsRestApiRouteFactory } from '../types';
 import { SYNTHETICS_API_URLS } from '../../../common/constants';
 
@@ -19,11 +19,11 @@ export const createNetworkEventsRoute: SyntheticsRestApiRouteFactory = () => ({
       stepIndex: schema.number(),
     }),
   },
-  handler: async ({ uptimeEsClient, request }): Promise<any> => {
+  handler: async ({ syntheticsEsClient, request }): Promise<any> => {
     const { checkGroup, stepIndex } = request.query;
 
     return await getNetworkEvents({
-      uptimeEsClient,
+      syntheticsEsClient,
       checkGroup,
       stepIndex,
     });
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.test.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.test.ts
index 02e5dfa61e2bc..33cf9746fb6e7 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.test.ts
@@ -13,7 +13,7 @@ import times from 'lodash/times';
 import * as monitorsFns from '../../saved_objects/synthetics_monitor/get_all_monitors';
 import { EncryptedSyntheticsMonitorAttributes } from '../../../common/runtime_types';
 import { RouteContext } from '../types';
-import { getUptimeESMockClient } from '../../legacy_uptime/lib/requests/test_helpers';
+import { getUptimeESMockClient } from '../../queries/test_helpers';
 
 import * as commonLibs from '../common';
 import { SyntheticsServerSetup } from '../../types';
@@ -107,7 +107,7 @@ describe('current status route', () => {
 
   describe('queryMonitorStatus', () => {
     it('parses expected agg fields', async () => {
-      const { esClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient, syntheticsEsClient } = getUptimeESMockClient();
       esClient.search.mockResponseOnce(
         getEsResponse([
           {
@@ -212,7 +212,7 @@ describe('current status route', () => {
       );
       expect(
         await queryMonitorStatus(
-          uptimeEsClient,
+          syntheticsEsClient,
           ['Europe - Germany', 'Asia/Pacific - Japan'],
           { from: 'now-1d', to: 'now' },
           ['id1', 'id2'],
@@ -260,7 +260,7 @@ describe('current status route', () => {
     });
 
     it('handles limits with multiple requests', async () => {
-      const { esClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient, syntheticsEsClient } = getUptimeESMockClient();
       esClient.search.mockResponseOnce(
         getEsResponse([
           {
@@ -377,7 +377,7 @@ describe('current status route', () => {
       ];
       expect(
         await queryMonitorStatus(
-          uptimeEsClient,
+          syntheticsEsClient,
           [...concernedLocations, ...times(9997).map((n) => 'Europe - Germany' + n)],
           { from: 'now-24h', to: 'now' },
           ['id1', 'id2'],
@@ -435,7 +435,7 @@ describe('current status route', () => {
     });
 
     it('handles pending configs', async () => {
-      const { esClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient, syntheticsEsClient } = getUptimeESMockClient();
       esClient.search.mockResponseOnce(
         getEsResponse([
           {
@@ -540,7 +540,7 @@ describe('current status route', () => {
       );
       expect(
         await queryMonitorStatus(
-          uptimeEsClient,
+          syntheticsEsClient,
           ['Europe - Germany', 'Asia/Pacific - Japan'],
           { from: 'now-12h', to: 'now' },
           ['id1', 'id2', 'project-monitor-id', 'id4'],
@@ -667,7 +667,7 @@ describe('current status route', () => {
           sort: ['a', 3013],
         } as unknown as SavedObjectsFindResult<EncryptedSyntheticsMonitorAttributes>,
       ]);
-      const { esClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient, syntheticsEsClient } = getUptimeESMockClient();
       esClient.search.mockResponseOnce(
         getEsResponse([
           {
@@ -772,7 +772,7 @@ describe('current status route', () => {
       );
       const result = await getStatus(
         {
-          uptimeEsClient,
+          syntheticsEsClient,
           savedObjectsClient: savedObjectsClientMock.create(),
           server: serverMock,
         } as unknown as RouteContext,
@@ -833,12 +833,12 @@ describe('current status route', () => {
           sort: ['a', 3013],
         } as unknown as SavedObjectsFindResult<EncryptedSyntheticsMonitorAttributes>,
       ]);
-      const { esClient, uptimeEsClient } = getUptimeESMockClient();
+      const { esClient, syntheticsEsClient } = getUptimeESMockClient();
       esClient.search.mockResponseOnce(getEsResponse([]));
       expect(
         await getStatus(
           {
-            uptimeEsClient,
+            syntheticsEsClient,
             savedObjectsClient: savedObjectsClientMock.create(),
           } as unknown as RouteContext,
           {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.ts
index 7d28d9b4f0576..b6373758ac802 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/overview_status/overview_status.ts
@@ -36,7 +36,7 @@ export function periodToMs(schedule: { number: string; unit: Unit }) {
  * @returns The counts of up/down/disabled monitor by location, and a map of each monitor:location status.
  */
 export async function getStatus(context: RouteContext, params: OverviewStatusQuery) {
-  const { uptimeEsClient, syntheticsMonitorClient, savedObjectsClient, server } = context;
+  const { syntheticsEsClient, syntheticsMonitorClient, savedObjectsClient, server } = context;
 
   const { query, scopeStatusByLocation = true } = params;
 
@@ -97,7 +97,7 @@ export async function getStatus(context: RouteContext, params: OverviewStatusQue
   };
 
   const { up, down, pending, upConfigs, downConfigs, pendingConfigs } = await queryMonitorStatus(
-    uptimeEsClient,
+    syntheticsEsClient,
     listOfLocationAfterFilter,
     range,
     enabledMonitorQueryIds,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_ping_statuses.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_ping_statuses.ts
index 2d1fa867430f7..ffb10e5a931ef 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_ping_statuses.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_ping_statuses.ts
@@ -18,7 +18,7 @@ export const syntheticsGetPingStatusesRoute: SyntheticsRestApiRouteFactory = ()
   validate: {
     query: getPingsRouteQuerySchema,
   },
-  handler: async ({ uptimeEsClient, request, response }): Promise<any> => {
+  handler: async ({ syntheticsEsClient, request, response }): Promise<any> => {
     const {
       from,
       to,
@@ -33,7 +33,7 @@ export const syntheticsGetPingStatusesRoute: SyntheticsRestApiRouteFactory = ()
     } = request.query;
 
     const result = await queryPings<PingStatus>({
-      uptimeEsClient,
+      syntheticsEsClient,
       dateRange: { from, to },
       index,
       monitorId,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_pings.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_pings.ts
index bec8f6a8a845d..6f4f3ad617fba 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_pings.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/get_pings.ts
@@ -31,7 +31,7 @@ export const syntheticsGetPingsRoute: SyntheticsRestApiRouteFactory = () => ({
   validate: {
     query: getPingsRouteQuerySchema,
   },
-  handler: async ({ uptimeEsClient, request, response }): Promise<any> => {
+  handler: async ({ syntheticsEsClient, request, response }): Promise<any> => {
     const {
       from,
       to,
@@ -46,7 +46,7 @@ export const syntheticsGetPingsRoute: SyntheticsRestApiRouteFactory = () => ({
     } = request.query as GetPingsRouteRequest;
 
     return await queryPings({
-      uptimeEsClient,
+      syntheticsEsClient,
       dateRange: { from, to },
       index,
       monitorId,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journey_screenshot_blocks.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journey_screenshot_blocks.ts
index 8d6c62d20b7fc..c86ccbd169c71 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journey_screenshot_blocks.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journey_screenshot_blocks.ts
@@ -9,7 +9,7 @@ import { schema } from '@kbn/config-schema';
 import { IKibanaResponse } from '@kbn/core-http-server';
 import { isRight } from 'fp-ts/Either';
 import * as t from 'io-ts';
-import { getJourneyScreenshotBlocks } from '../../legacy_uptime/lib/requests/get_journey_screenshot_blocks';
+import { getJourneyScreenshotBlocks } from '../../queries/get_journey_screenshot_blocks';
 import { ScreenshotBlockDoc } from '../../../common/runtime_types';
 import { SYNTHETICS_API_URLS } from '../../../common/constants';
 import { RouteContext, SyntheticsRestApiRouteFactory } from '../types';
@@ -31,7 +31,7 @@ export const createJourneyScreenshotBlocksRoute: SyntheticsRestApiRouteFactory =
 export const journeyScreenshotBlocksHandler = async ({
   response,
   request,
-  uptimeEsClient,
+  syntheticsEsClient,
 }: RouteContext): Promise<IKibanaResponse<ScreenshotBlockDoc[]>> => {
   const { hashes: blockIds } = request.body;
 
@@ -39,7 +39,7 @@ export const journeyScreenshotBlocksHandler = async ({
 
   const result = await getJourneyScreenshotBlocks({
     blockIds,
-    uptimeEsClient,
+    syntheticsEsClient,
   });
 
   if (result.length === 0) {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journeys.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journeys.ts
index 095c9f0834eac..c4901175c23cd 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journeys.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/journeys.ts
@@ -7,11 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { SyntheticsJourneyApiResponse } from '../../../common/runtime_types';
-import { getJourneyFailedSteps } from '../../legacy_uptime/lib/requests/get_journey_failed_steps';
+import { getJourneyFailedSteps } from '../../queries/get_journey_failed_steps';
+import { getJourneySteps } from '../../queries/get_journey_steps';
+import { getJourneyDetails } from '../../queries/get_journey_details';
 import { SyntheticsRestApiRouteFactory } from '../types';
 import { SYNTHETICS_API_URLS } from '../../../common/constants';
-import { getJourneyDetails } from '../../queries/get_journey_details';
-import { getJourneySteps } from '../../legacy_uptime/lib/requests/get_journey_steps';
 
 export const createJourneyRoute: SyntheticsRestApiRouteFactory = () => ({
   method: 'GET',
@@ -21,16 +21,20 @@ export const createJourneyRoute: SyntheticsRestApiRouteFactory = () => ({
       checkGroup: schema.string(),
     }),
   },
-  handler: async ({ uptimeEsClient, request, response }): Promise<SyntheticsJourneyApiResponse> => {
+  handler: async ({
+    syntheticsEsClient,
+    request,
+    response,
+  }): Promise<SyntheticsJourneyApiResponse> => {
     const { checkGroup } = request.params;
 
     const [steps, details] = await Promise.all([
       getJourneySteps({
-        uptimeEsClient,
+        syntheticsEsClient,
         checkGroup,
       }),
       getJourneyDetails({
-        uptimeEsClient,
+        syntheticsEsClient,
         checkGroup,
       }),
     ]);
@@ -51,11 +55,11 @@ export const createJourneyFailedStepsRoute: SyntheticsRestApiRouteFactory = () =
       checkGroups: schema.arrayOf(schema.string()),
     }),
   },
-  handler: async ({ uptimeEsClient, request, response }): Promise<any> => {
+  handler: async ({ syntheticsEsClient, request, response }): Promise<any> => {
     const { checkGroups } = request.query;
     try {
       const result = await getJourneyFailedSteps({
-        uptimeEsClient,
+        syntheticsEsClient,
         checkGroups,
       });
       return {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/last_successful_check.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/last_successful_check.ts
index c933288c50d86..444bec7692457 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/pings/last_successful_check.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/pings/last_successful_check.ts
@@ -6,9 +6,9 @@
  */
 
 import { schema } from '@kbn/config-schema';
-import { getJourneyScreenshot } from '../../legacy_uptime/lib/requests/get_journey_screenshot';
+import { getJourneyScreenshot } from '../../queries/get_journey_screenshot';
+import { getLastSuccessfulCheck } from '../../queries/get_last_successful_check';
 import { isFullScreenshot, isRefResult, Ping } from '../../../common/runtime_types';
-import { getLastSuccessfulCheck } from '../../legacy_uptime/lib/requests/get_last_successful_check';
 import { SYNTHETICS_API_URLS } from '../../../common/constants';
 import { RouteContext, SyntheticsRestApiRouteFactory } from '../types';
 
@@ -31,12 +31,12 @@ export const createLastSuccessfulCheckRoute: SyntheticsRestApiRouteFactory = ()
 export const getLastSuccessfulCheckScreenshot = async ({
   response,
   request,
-  uptimeEsClient,
+  syntheticsEsClient,
 }: RouteContext) => {
   const { timestamp, monitorId, stepIndex, location } = request.query;
 
   const check: Ping | null = await getLastSuccessfulCheck({
-    uptimeEsClient,
+    syntheticsEsClient,
     monitorId,
     timestamp,
     location,
@@ -51,7 +51,7 @@ export const getLastSuccessfulCheckScreenshot = async ({
   }
 
   const screenshot = await getJourneyScreenshot({
-    uptimeEsClient,
+    syntheticsEsClient,
     checkGroup: check.monitor.check_group,
     stepIndex,
   });
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/settings/settings.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/settings.ts
index 959e4277d9335..e8d6e97dd0a48 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/settings/settings.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/settings/settings.ts
@@ -14,8 +14,8 @@ export const getIndexSizesRoute: SyntheticsRestApiRouteFactory<{
   method: 'GET',
   path: SYNTHETICS_API_URLS.INDEX_SIZE,
   validate: {},
-  handler: async ({ uptimeEsClient, server }) => {
-    const data = await uptimeEsClient.baseESClient.cat.indices({
+  handler: async ({ syntheticsEsClient, server }) => {
+    const data = await syntheticsEsClient.baseESClient.cat.indices({
       index: 'synthetics-*',
       format: 'json',
       bytes: 'b',
diff --git a/x-pack/plugins/observability_solution/synthetics/server/routes/types.ts b/x-pack/plugins/observability_solution/synthetics/server/routes/types.ts
index 13742425fb23f..fa481d16b92bf 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/routes/types.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/routes/types.ts
@@ -21,7 +21,7 @@ import {
   HttpResponsePayload,
   ResponseError,
 } from '@kbn/core-http-server';
-import { UptimeEsClient } from '../lib';
+import { SyntheticsEsClient } from '../lib';
 import { SyntheticsServerSetup, UptimeRequestHandlerContext } from '../types';
 import { SyntheticsMonitorClient } from '../synthetics_service/synthetics_monitor/synthetics_monitor_client';
 export type SyntheticsRequest = KibanaRequest<
@@ -84,7 +84,7 @@ export type SyntheticsRouteWrapper = (
 ) => UMKibanaRoute;
 
 export interface UptimeRouteContext {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
   context: UptimeRequestHandlerContext;
   request: SyntheticsRequest;
   response: KibanaResponseFactory;
@@ -98,7 +98,7 @@ export interface RouteContext<
   Query = Record<string, any>,
   Body = any
 > {
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
   context: UptimeRequestHandlerContext;
   request: KibanaRequest<Params, Query, Body>;
   response: KibanaResponseFactory;
@@ -115,7 +115,7 @@ export type SyntheticsRouteHandler<
   Query = Record<string, any>,
   Body = any
 > = ({
-  uptimeEsClient,
+  syntheticsEsClient,
   context,
   request,
   response,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor/get_all_monitors.test.ts b/x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor/get_all_monitors.test.ts
index 33af8075616da..f17494bac5487 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor/get_all_monitors.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/saved_objects/synthetics_monitor/get_all_monitors.test.ts
@@ -23,7 +23,7 @@ describe('processMonitors', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: soClient,
     config: {
       service: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_route_wrapper.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_route_wrapper.ts
index a796d881562c3..a0785b4486912 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_route_wrapper.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_route_wrapper.ts
@@ -7,7 +7,7 @@
 import { KibanaResponse } from '@kbn/core-http-router-server-internal';
 import { DEFAULT_SPACE_ID } from '@kbn/spaces-plugin/common';
 import { isEmpty } from 'lodash';
-import { isTestUser, UptimeEsClient } from './lib';
+import { isTestUser, SyntheticsEsClient } from './lib';
 import { checkIndicesReadPrivileges } from './synthetics_service/authentication/check_has_privilege';
 import { SYNTHETICS_INDEX_PATTERN } from '../common/constants';
 import { syntheticsServiceApiKey } from './saved_objects/service_api_key';
@@ -34,20 +34,20 @@ export const syntheticsRouteWrapper: SyntheticsRouteWrapper = (
     // specifically needed for the synthetics service api key generation
     server.authSavedObjectsClient = savedObjectsClient;
 
-    const uptimeEsClient = new UptimeEsClient(savedObjectsClient, esClient.asCurrentUser, {
+    const syntheticsEsClient = new SyntheticsEsClient(savedObjectsClient, esClient.asCurrentUser, {
       request,
       uiSettings,
       isDev: Boolean(server.isDev) && !isTestUser(server),
       heartbeatIndices: SYNTHETICS_INDEX_PATTERN,
     });
 
-    server.uptimeEsClient = uptimeEsClient;
+    server.syntheticsEsClient = syntheticsEsClient;
 
     const spaceId = server.spaces?.spacesService.getSpaceId(request) ?? DEFAULT_SPACE_ID;
 
     try {
       const res = await uptimeRoute.handler({
-        uptimeEsClient,
+        syntheticsEsClient,
         savedObjectsClient,
         context,
         request,
@@ -60,7 +60,7 @@ export const syntheticsRouteWrapper: SyntheticsRouteWrapper = (
         return res;
       }
 
-      const inspectData = await uptimeEsClient.getInspectData(uptimeRoute.path);
+      const inspectData = await syntheticsEsClient.getInspectData(uptimeRoute.path);
 
       if (Array.isArray(res)) {
         if (isEmpty(inspectData)) {
@@ -80,12 +80,12 @@ export const syntheticsRouteWrapper: SyntheticsRouteWrapper = (
       return response.ok({
         body: {
           ...res,
-          ...(await uptimeEsClient.getInspectData(uptimeRoute.path)),
+          ...(await syntheticsEsClient.getInspectData(uptimeRoute.path)),
         },
       });
     } catch (e) {
       if (e.statusCode === 403) {
-        const privileges = await checkIndicesReadPrivileges(uptimeEsClient);
+        const privileges = await checkIndicesReadPrivileges(syntheticsEsClient);
         if (!privileges.has_all_requested) {
           return response.forbidden({
             body: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/authentication/check_has_privilege.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/authentication/check_has_privilege.ts
index 06be332e41df5..09fa498d12cda 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/authentication/check_has_privilege.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/authentication/check_has_privilege.ts
@@ -6,7 +6,7 @@
  */
 
 import { SecurityIndexPrivilege } from '@elastic/elasticsearch/lib/api/types';
-import { UptimeEsClient } from '../../lib';
+import { SyntheticsEsClient } from '../../lib';
 import { SyntheticsServerSetup } from '../../types';
 import { getFakeKibanaRequest } from '../utils/fake_kibana_request';
 import { getServiceApiKeyPrivileges, syntheticsIndex } from '../get_api_key';
@@ -26,8 +26,8 @@ export const checkHasPrivileges = (
     });
 };
 
-export const checkIndicesReadPrivileges = (uptimeEsClient: UptimeEsClient) => {
-  return uptimeEsClient.baseESClient.security.hasPrivileges({
+export const checkIndicesReadPrivileges = (syntheticsEsClient: SyntheticsEsClient) => {
+  return syntheticsEsClient.baseESClient.security.hasPrivileges({
     body: {
       index: [
         {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.test.ts
index e8ce91ec6268d..817b197655449 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.test.ts
@@ -19,7 +19,7 @@ import { loggerMock } from '@kbn/logging-mocks';
 
 import * as authUtils from './authentication/check_has_privilege';
 import { SyntheticsServerSetup } from '../types';
-import { getUptimeESMockClient } from '../legacy_uptime/lib/requests/test_helpers';
+import { getUptimeESMockClient } from '../queries/test_helpers';
 
 describe('getAPIKeyTest', function () {
   const core = coreMock.createStart();
@@ -34,7 +34,7 @@ describe('getAPIKeyTest', function () {
     security,
     encryptedSavedObjects,
     savedObjectsClient: core.savedObjects.getScopedClient(request),
-    uptimeEsClient: getUptimeESMockClient().uptimeEsClient,
+    syntheticsEsClient: getUptimeESMockClient().syntheticsEsClient,
   } as unknown as SyntheticsServerSetup;
 
   security.authc.apiKeys.areAPIKeysEnabled = jest.fn().mockReturnValue(true);
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts
index 66ecf0aff2deb..46b96f32b2a4a 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/get_api_key.ts
@@ -207,12 +207,12 @@ export const getSyntheticsEnablement = async ({ server }: { server: SyntheticsSe
 };
 
 const hasEnablePermissions = async ({
-  uptimeEsClient,
+  syntheticsEsClient,
   isElasticsearchServerless,
 }: SyntheticsServerSetup) => {
   const { cluster: clusterPrivs, indices: index } =
     getServiceApiKeyPrivileges(isElasticsearchServerless);
-  const hasPrivileges = await uptimeEsClient.baseESClient.security.hasPrivileges({
+  const hasPrivileges = await syntheticsEsClient.baseESClient.security.hasPrivileges({
     body: {
       cluster: ['manage_security', 'manage_api_key', 'manage_own_api_key', ...clusterPrivs],
       index,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
index 837006f5f6c3b..ccf78abe4cc72 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/private_location/synthetics_private_location.test.ts
@@ -55,7 +55,7 @@ describe('SyntheticsPrivateLocation', () => {
   } as unknown as HeartbeatConfig;
 
   const serverMock: SyntheticsServerSetup = {
-    uptimeEsClient: { search: jest.fn() },
+    syntheticsEsClient: { search: jest.fn() },
     logger: loggerMock.create(),
     config: {
       service: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts
index 6c381283c1824..650c9b964aaec 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.test.ts
@@ -8,9 +8,35 @@
 import {
   flattenAndFormatObject,
   getNormalizeCommonFields,
+  getUrlsField,
+  isValidURL,
   NormalizedProjectProps,
 } from './common_fields';
 
+describe('isValidUrl', () => {
+  it('returns false for invalid URL', () => {
+    expect(isValidURL('invalid')).toBeFalsy();
+  });
+
+  it('returns true for valid URL', () => {
+    expect(isValidURL('https://elastic.co')).toBeTruthy();
+  });
+});
+
+describe('getUrlsField', () => {
+  it('supports a string value containing a comma', () => {
+    expect(getUrlsField('https://elastic.co?foo=bar,baz')).toEqual([
+      'https://elastic.co?foo=bar,baz',
+    ]);
+  });
+
+  it('supports lists containing exactly one entry, even with commas', () => {
+    expect(getUrlsField(['https://elastic.co?foo=bar,baz'])).toEqual([
+      'https://elastic.co?foo=bar,baz',
+    ]);
+  });
+});
+
 describe('normalizeYamlConfig', () => {
   it('does not continue flattening when encountering an array', () => {
     const array = ['value1', 'value2'];
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts
index fad8e096a483c..4019151dc44f6 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/common_fields.ts
@@ -306,6 +306,24 @@ export const getInvalidUrlsOrHostsError = (
   ),
 });
 
+export const getUnparseableUrlError = (monitor: ProjectMonitor, version: string) => ({
+  id: monitor.id,
+  reason: INVALID_CONFIGURATION_TITLE,
+  details: i18n.translate(
+    'xpack.synthetics.projectMonitorApi.validation.unparseableUrl.description',
+    {
+      defaultMessage:
+        '`{monitorType}` project monitors must specify a valid URL for field `{key}` in version `{version}`. Your monitor definition with ID `{monitorId}` was not saved.',
+      values: {
+        monitorType: monitor.type,
+        key: 'monitor.urls',
+        version,
+        monitorId: monitor.id,
+      },
+    }
+  ),
+});
+
 const getInvalidLocationError = (
   invalidPublic: string[],
   invalidPrivate: string[],
@@ -356,6 +374,17 @@ export const getValueInSeconds = (value: string) => {
   return typeof valueInSeconds === 'number' ? `${valueInSeconds}` : null;
 };
 
+/**
+ * Accounts for url values in a string or list
+ *
+ * @param {Array | string} [value]
+ * @returns {array} Returns an array
+ */
+export const getUrlsField = (value?: string[] | string): string[] => {
+  if (!value) return [];
+  return Array.isArray(value) ? value : [value];
+};
+
 /**
  * Accounts for array values that are optionally defined as a comma seperated list
  *
@@ -369,6 +398,20 @@ export const getOptionalListField = (value?: string[] | string): string[] => {
   return value ? value.split(',') : [];
 };
 
+/**
+ * Does a best-effort check to ensure that the `monitor.url` field will evaluate to a valid URL.
+ * @param url the value of a single entry in the `monitor.url` list intended to pass to the service
+ * @returns `true` if `new URL` does not throw an error, `false` otherwise
+ */
+export const isValidURL = (url: string): boolean => {
+  try {
+    new URL(url);
+    return true;
+  } catch {
+    return false;
+  }
+};
+
 /**
  * Accounts for heartbeat fields that are optionally an array or single string
  *
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts
index 0e92fd6155a5e..d77c03de45d48 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.test.ts
@@ -48,7 +48,7 @@ describe('http normalizers', () => {
         enabled: false,
         id: 'my-monitor-2',
         name: 'My Monitor 2',
-        urls: ['http://localhost:9200', 'http://anotherurl:9200'],
+        urls: ['http://localhost:9200?withComma=1,2,3', 'http://anotherurl:9200'],
         schedule: 60,
         timeout: '80s',
         'check.request': {
@@ -202,7 +202,7 @@ describe('http normalizers', () => {
             tags: [],
             timeout: '80',
             type: 'http',
-            urls: 'http://localhost:9200',
+            urls: 'http://localhost:9200?withComma=1,2,3',
             'url.port': null,
             username: '',
             id: '',
@@ -374,7 +374,7 @@ describe('http normalizers', () => {
             tags: [],
             timeout: '80',
             type: 'http',
-            urls: 'http://localhost:9200',
+            urls: 'http://localhost:9200?withComma=1,2,3',
             'url.port': null,
             username: '',
             id: '',
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts
index 113b75924b1c1..caef8a1ba3381 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/normalizers/http_monitor.ts
@@ -20,10 +20,12 @@ import {
   getNormalizeCommonFields,
   normalizeYamlConfig,
   getOptionalListField,
-  getOptionalArrayField,
   getUnsupportedKeysError,
   getInvalidUrlsOrHostsError,
   getHasTLSFields,
+  isValidURL,
+  getUnparseableUrlError,
+  getUrlsField,
 } from './common_fields';
 
 export const getNormalizeHTTPFields = ({
@@ -50,9 +52,11 @@ export const getNormalizeHTTPFields = ({
   errors.push(...commonErrors);
 
   /* Check if monitor has multiple urls */
-  const urls = getOptionalListField(monitor.urls);
+  const urls = getUrlsField(monitor.urls);
   if (urls.length !== 1) {
     errors.push(getInvalidUrlsOrHostsError(monitor, 'urls', version));
+  } else if (isValidURL(urls[0]) === false) {
+    errors.push(getUnparseableUrlError(monitor, version));
   }
   if (unsupportedKeys.length) {
     errors.push(getUnsupportedKeysError(monitor, unsupportedKeys, version));
@@ -63,7 +67,7 @@ export const getNormalizeHTTPFields = ({
     ...commonFields,
     [ConfigKey.MONITOR_TYPE]: MonitorTypeEnum.HTTP,
     [ConfigKey.FORM_MONITOR_TYPE]: FormMonitorType.HTTP,
-    [ConfigKey.URLS]: getOptionalArrayField(monitor.urls) || defaultFields[ConfigKey.URLS],
+    [ConfigKey.URLS]: urls.length > 0 ? urls[0] : defaultFields[ConfigKey.URLS],
     [ConfigKey.MAX_REDIRECTS]: formatMaxRedirects(monitor[ConfigKey.MAX_REDIRECTS]),
     [ConfigKey.REQUEST_BODY_CHECK]: getRequestBodyField(
       (yamlConfig as Record<keyof HTTPFields, unknown>)[ConfigKey.REQUEST_BODY_CHECK] as string,
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
index ab77abac5afb6..b0d0ccf2d1e3b 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/project_monitor/project_monitor_formatter.test.ts
@@ -104,7 +104,7 @@ describe('ProjectMonitorFormatter', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: soClient,
     config: {
       service: {
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_monitor/synthetics_monitor_client.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_monitor/synthetics_monitor_client.test.ts
index 03d0a5ff372f5..daba0872f3de0 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_monitor/synthetics_monitor_client.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_monitor/synthetics_monitor_client.test.ts
@@ -52,7 +52,7 @@ describe('SyntheticsMonitorClient', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: {
       bulkUpdate: jest.fn(),
       get: jest.fn(),
diff --git a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.test.ts b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.test.ts
index c69cafa41e848..f4da045101626 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.test.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/synthetics_service/synthetics_service.test.ts
@@ -72,7 +72,7 @@ describe('SyntheticsService', () => {
 
   const serverMock: SyntheticsServerSetup = {
     logger,
-    uptimeEsClient: mockEsClient,
+    syntheticsEsClient: mockEsClient,
     authSavedObjectsClient: {
       bulkUpdate: jest.fn(),
     },
diff --git a/x-pack/plugins/observability_solution/synthetics/server/telemetry/sender.ts b/x-pack/plugins/observability_solution/synthetics/server/telemetry/sender.ts
index e495181781fe0..be60d3ca2a127 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/telemetry/sender.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/telemetry/sender.ts
@@ -140,7 +140,7 @@ export class TelemetryEventsSender {
 
       queue.clearEvents();
 
-      this.logger.debug(JSON.stringify(events));
+      this.logger.debug(() => JSON.stringify(events));
 
       await this.send(events, telemetryUrl);
     } catch (err) {
@@ -186,10 +186,12 @@ export class TelemetryEventsSender {
         },
         timeout: 5000,
       });
-      this.logger.debug(`Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`);
+      this.logger.debug(
+        () => `Events sent!. Response: ${resp.status} ${JSON.stringify(resp.data)}`
+      );
     } catch (err) {
       this.logger.debug(
-        `Error sending events: ${err.response.status} ${JSON.stringify(err.response.data)}`
+        () => `Error sending events: ${err.response.status} ${JSON.stringify(err.response.data)}`
       );
     }
   }
diff --git a/x-pack/plugins/observability_solution/synthetics/server/types.ts b/x-pack/plugins/observability_solution/synthetics/server/types.ts
index 9bfab3c676d7f..b5a8735e4e715 100644
--- a/x-pack/plugins/observability_solution/synthetics/server/types.ts
+++ b/x-pack/plugins/observability_solution/synthetics/server/types.ts
@@ -38,7 +38,7 @@ import {
 } from '@kbn/task-manager-plugin/server';
 import { TelemetryEventsSender } from './telemetry/sender';
 import { UptimeConfig } from '../common/config';
-import { UptimeEsClient } from './lib';
+import { SyntheticsEsClient } from './lib';
 
 export interface SyntheticsServerSetup {
   router: UptimeRouter;
@@ -54,7 +54,7 @@ export interface SyntheticsServerSetup {
   stackVersion: string;
   logger: Logger;
   telemetry: TelemetryEventsSender;
-  uptimeEsClient: UptimeEsClient;
+  syntheticsEsClient: SyntheticsEsClient;
   basePath: IBasePath;
   isDev?: boolean;
   coreStart: CoreStart;
diff --git a/x-pack/plugins/observability_solution/uptime/kibana.jsonc b/x-pack/plugins/observability_solution/uptime/kibana.jsonc
index 3e27bac31cba6..b45d8b78bc9cc 100644
--- a/x-pack/plugins/observability_solution/uptime/kibana.jsonc
+++ b/x-pack/plugins/observability_solution/uptime/kibana.jsonc
@@ -1,7 +1,7 @@
 {
   "type": "plugin",
   "id": "@kbn/uptime-plugin",
-  "owner": "@elastic/obs-ux-infra_services-team",
+  "owner": "@elastic/obs-ux-management-team",
   "description": "This plugin visualizes data from Heartbeat, and integrates with other Observability solutions.",
   "plugin": {
     "id": "uptime",
diff --git a/x-pack/plugins/observability_solution/uptime/public/locators/overview.ts b/x-pack/plugins/observability_solution/uptime/public/locators/overview.ts
index 15a1c52406eb1..5e276cbc55d73 100644
--- a/x-pack/plugins/observability_solution/uptime/public/locators/overview.ts
+++ b/x-pack/plugins/observability_solution/uptime/public/locators/overview.ts
@@ -5,25 +5,17 @@
  * 2.0.
  */
 
-import { uptimeOverviewLocatorID } from '@kbn/observability-plugin/public';
+import {
+  uptimeOverviewLocatorID,
+  type UptimeOverviewLocatorInfraParams,
+  type UptimeOverviewLocatorParams,
+} from '@kbn/deeplinks-observability';
 import type { LocatorDefinition } from '@kbn/share-plugin/common';
-import type { SerializableRecord } from '@kbn/utility-types';
 import { OVERVIEW_ROUTE } from '../../common/constants';
 
-const formatSearchKey = (key: string, value: string) => `${key}: "${value}"`;
-
-export interface UptimeOverviewLocatorInfraParams extends SerializableRecord {
-  ip?: string;
-  host?: string;
-  container?: string;
-  pod?: string;
-}
+export type { UptimeOverviewLocatorInfraParams, UptimeOverviewLocatorParams };
 
-export interface UptimeOverviewLocatorParams extends SerializableRecord {
-  dateRangeStart?: string;
-  dateRangeEnd?: string;
-  search?: string;
-}
+const formatSearchKey = (key: string, value: string) => `${key}: "${value}"`;
 
 function isUptimeOverviewLocatorParams(
   args: UptimeOverviewLocatorInfraParams | UptimeOverviewLocatorParams
diff --git a/x-pack/plugins/observability_solution/uptime/tsconfig.json b/x-pack/plugins/observability_solution/uptime/tsconfig.json
index 8fc38a304c26b..041ff7a84a4fb 100644
--- a/x-pack/plugins/observability_solution/uptime/tsconfig.json
+++ b/x-pack/plugins/observability_solution/uptime/tsconfig.json
@@ -76,7 +76,8 @@
     "@kbn/repo-info",
     "@kbn/react-kibana-context-render",
     "@kbn/react-kibana-context-theme",
-    "@kbn/react-kibana-mount"
+    "@kbn/react-kibana-mount",
+    "@kbn/deeplinks-observability"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/osquery/common/api/live_query/create_live_query.gen.ts b/x-pack/plugins/osquery/common/api/live_query/create_live_query.gen.ts
index a0635327aaf30..e435a79acdab4 100644
--- a/x-pack/plugins/osquery/common/api/live_query/create_live_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/live_query/create_live_query.gen.ts
@@ -40,6 +40,3 @@ export const CreateLiveQueryRequestBody = z.object({
   event_ids: z.array(z.string()).optional(),
   metadata: z.object({}).nullable().optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/live_query/create_live_query.schema.yaml b/x-pack/plugins/osquery/common/api/live_query/create_live_query.schema.yaml
index 4cae65cab8b82..1e40158c638d7 100644
--- a/x-pack/plugins/osquery/common/api/live_query/create_live_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/live_query/create_live_query.schema.yaml
@@ -47,7 +47,3 @@ components:
         metadata:
           type: object
           nullable: true
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/live_query/find_live_query.gen.ts b/x-pack/plugins/osquery/common/api/live_query/find_live_query.gen.ts
index 4860fae7cb7ca..313bb98064a50 100644
--- a/x-pack/plugins/osquery/common/api/live_query/find_live_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/live_query/find_live_query.gen.ts
@@ -32,6 +32,3 @@ export const FindLiveQueryRequestQuery = z.object({
   sort: SortOrUndefined.optional(),
   sortOrder: SortOrderOrUndefined.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/live_query/find_live_query.schema.yaml b/x-pack/plugins/osquery/common/api/live_query/find_live_query.schema.yaml
index 730051c5a329d..50589ecc9fc28 100644
--- a/x-pack/plugins/osquery/common/api/live_query/find_live_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/live_query/find_live_query.schema.yaml
@@ -4,13 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    FindLiveQueryRequestQueryParameter:
-      name: query
-      in: query
-      required: true
-      schema:
-        $ref: '#/components/schemas/FindLiveQueryRequestQuery'
   schemas:
     FindLiveQueryRequestQuery:
       type: object
@@ -25,7 +18,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrUndefined'
         sortOrder:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrderOrUndefined'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/live_query/get_live_query_details.schema.yaml b/x-pack/plugins/osquery/common/api/live_query/get_live_query_details.schema.yaml
deleted file mode 100644
index 8bc32f55162f4..0000000000000
--- a/x-pack/plugins/osquery/common/api/live_query/get_live_query_details.schema.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-openapi: 3.0.0
-info:
-  title: Get Live Query Details Schema
-  version: '2023-10-31'
-paths: { }
-components:
-  parameters:
-    GetLiveQueryDetailsRequestParameter:
-      name: id
-      in: path
-      required: true
-      schema:
-        $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Id'
-    GetLiveQueryDetailsRequestQueryParameter:
-      name: query
-      in: query
-      schema:
-        type: object
-        additionalProperties: true
-  schemas:
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.gen.ts b/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.gen.ts
index 171755c49941e..b1ef683502bc3 100644
--- a/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.gen.ts
+++ b/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.gen.ts
@@ -39,6 +39,3 @@ export const GetLiveQueryResultsRequestParams = z.object({
   id: Id.optional(),
   actionId: Id.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.schema.yaml b/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.schema.yaml
index 6036820ef022b..9d946d6fe821d 100644
--- a/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/live_query/get_live_query_results.schema.yaml
@@ -4,19 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    GetLiveQueryRequestResultsQueryParameter:
-      name: query
-      in: query
-      required: true
-      schema:
-        $ref: '#/components/schemas/GetLiveQueryResultsRequestQuery'
-    GetLiveQueryRequestResultsParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/GetLiveQueryResultsRequestParams'
   schemas:
     GetLiveQueryResultsRequestQuery:
       type: object
@@ -38,8 +25,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Id'
         actionId:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Id'
-
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/live_query/live_queries.gen.ts b/x-pack/plugins/osquery/common/api/live_query/live_queries.gen.ts
new file mode 100644
index 0000000000000..03c760cf90f76
--- /dev/null
+++ b/x-pack/plugins/osquery/common/api/live_query/live_queries.gen.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Live Queries Schema
+ *   version: 2023-10-31
+ */
+
+import { z } from 'zod';
+
+import { FindLiveQueryRequestQuery } from './find_live_query.gen';
+import { DefaultSuccessResponse, Id } from '../model/schema/common_attributes.gen';
+import { CreateLiveQueryRequestBody } from './create_live_query.gen';
+import {
+  GetLiveQueryResultsRequestQuery,
+  GetLiveQueryResultsRequestParams,
+} from './get_live_query_results.gen';
+
+export type OsqueryCreateLiveQueryRequestBody = z.infer<typeof OsqueryCreateLiveQueryRequestBody>;
+export const OsqueryCreateLiveQueryRequestBody = CreateLiveQueryRequestBody;
+export type OsqueryCreateLiveQueryRequestBodyInput = z.input<
+  typeof OsqueryCreateLiveQueryRequestBody
+>;
+
+export type OsqueryCreateLiveQueryResponse = z.infer<typeof OsqueryCreateLiveQueryResponse>;
+export const OsqueryCreateLiveQueryResponse = DefaultSuccessResponse;
+export type OsqueryFindLiveQueriesRequestQuery = z.infer<typeof OsqueryFindLiveQueriesRequestQuery>;
+export const OsqueryFindLiveQueriesRequestQuery = z.object({
+  query: FindLiveQueryRequestQuery,
+});
+export type OsqueryFindLiveQueriesRequestQueryInput = z.input<
+  typeof OsqueryFindLiveQueriesRequestQuery
+>;
+
+export type OsqueryFindLiveQueriesResponse = z.infer<typeof OsqueryFindLiveQueriesResponse>;
+export const OsqueryFindLiveQueriesResponse = DefaultSuccessResponse;
+export type OsqueryGetLiveQueryDetailsRequestQuery = z.infer<
+  typeof OsqueryGetLiveQueryDetailsRequestQuery
+>;
+export const OsqueryGetLiveQueryDetailsRequestQuery = z.object({
+  query: z.object({}),
+});
+export type OsqueryGetLiveQueryDetailsRequestQueryInput = z.input<
+  typeof OsqueryGetLiveQueryDetailsRequestQuery
+>;
+
+export type OsqueryGetLiveQueryDetailsRequestParams = z.infer<
+  typeof OsqueryGetLiveQueryDetailsRequestParams
+>;
+export const OsqueryGetLiveQueryDetailsRequestParams = z.object({
+  id: Id,
+});
+export type OsqueryGetLiveQueryDetailsRequestParamsInput = z.input<
+  typeof OsqueryGetLiveQueryDetailsRequestParams
+>;
+
+export type OsqueryGetLiveQueryDetailsResponse = z.infer<typeof OsqueryGetLiveQueryDetailsResponse>;
+export const OsqueryGetLiveQueryDetailsResponse = DefaultSuccessResponse;
+export type OsqueryGetLiveQueryResultsRequestQuery = z.infer<
+  typeof OsqueryGetLiveQueryResultsRequestQuery
+>;
+export const OsqueryGetLiveQueryResultsRequestQuery = z.object({
+  query: GetLiveQueryResultsRequestQuery,
+});
+export type OsqueryGetLiveQueryResultsRequestQueryInput = z.input<
+  typeof OsqueryGetLiveQueryResultsRequestQuery
+>;
+
+export type OsqueryGetLiveQueryResultsRequestParams = z.infer<
+  typeof OsqueryGetLiveQueryResultsRequestParams
+>;
+export const OsqueryGetLiveQueryResultsRequestParams = z.object({
+  query: GetLiveQueryResultsRequestParams,
+});
+export type OsqueryGetLiveQueryResultsRequestParamsInput = z.input<
+  typeof OsqueryGetLiveQueryResultsRequestParams
+>;
+
+export type OsqueryGetLiveQueryResultsResponse = z.infer<typeof OsqueryGetLiveQueryResultsResponse>;
+export const OsqueryGetLiveQueryResultsResponse = DefaultSuccessResponse;
diff --git a/x-pack/plugins/osquery/common/api/live_query/live_queries.schema.yaml b/x-pack/plugins/osquery/common/api/live_query/live_queries.schema.yaml
index feff5dd665f33..ae7c9e4d50f2d 100644
--- a/x-pack/plugins/osquery/common/api/live_query/live_queries.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/live_query/live_queries.schema.yaml
@@ -6,17 +6,32 @@ paths:
   /api/osquery/live_queries:
     get:
       summary: Find live queries
+      operationId: OsqueryFindLiveQueries
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-          - $ref: './find_live_query.schema.yaml#/components/parameters/FindLiveQueryRequestQueryParameter'
+        - name: query
+          in: query
+          required: true
+          schema:
+            $ref: './find_live_query.schema.yaml#/components/schemas/FindLiveQueryRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './find_live_query.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
+
     post:
       summary: Create a live query
+      operationId: OsqueryCreateLiveQuery
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -29,30 +44,59 @@ paths:
           content:
             application/json:
               schema:
-                $ref: './create_live_query.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
+
   /api/osquery/live_queries/{id}:
     get:
       summary: Get live query details
+      operationId: OsqueryGetLiveQueryDetails
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-        - $ref: './get_live_query_details.schema.yaml#/components/parameters/GetLiveQueryDetailsRequestQueryParameter'
-        - $ref: './get_live_query_details.schema.yaml#/components/parameters/GetLiveQueryDetailsRequestParameter'
+        - name: id
+          in: path
+          required: true
+          schema:
+            $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Id'
+        - name: query
+          in: query
+          schema:
+            type: object
+            additionalProperties: true
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './get_live_query_details.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
+
   /api/osquery/live_queries/{id}/results/{actionId}:
-      get:
-        summary: Get live query results
-        parameters:
-          - $ref: './get_live_query_results.schema.yaml#/components/parameters/GetLiveQueryRequestResultsQueryParameter'
-          - $ref: './get_live_query_results.schema.yaml#/components/parameters/GetLiveQueryRequestResultsParameter'
-        responses:
-          '200':
-            description: OK
-            content:
-              application/json:
-                schema:
-                  $ref: './get_live_query_results.schema.yaml#/components/schemas/SuccessResponse'
+    get:
+      summary: Get live query results
+      operationId: OsqueryGetLiveQueryResults
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
+      parameters:
+        - name: query
+          in: query
+          required: true
+          schema:
+            $ref: './get_live_query_results.schema.yaml#/components/schemas/GetLiveQueryResultsRequestQuery'
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './get_live_query_results.schema.yaml#/components/schemas/GetLiveQueryResultsRequestParams'
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
+
diff --git a/x-pack/plugins/osquery/common/api/model/schema/common_attributes.gen.ts b/x-pack/plugins/osquery/common/api/model/schema/common_attributes.gen.ts
index f57cd361a0dd2..71cfeda094ff9 100644
--- a/x-pack/plugins/osquery/common/api/model/schema/common_attributes.gen.ts
+++ b/x-pack/plugins/osquery/common/api/model/schema/common_attributes.gen.ts
@@ -178,3 +178,6 @@ export const SortOrderOrUndefined = z.union([z.string().nullable(), z.unknown()]
 
 export type Shards = z.infer<typeof Shards>;
 export const Shards = z.object({}).catchall(z.number());
+
+export type DefaultSuccessResponse = z.infer<typeof DefaultSuccessResponse>;
+export const DefaultSuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/model/schema/common_attributes.schema.yaml b/x-pack/plugins/osquery/common/api/model/schema/common_attributes.schema.yaml
index ba236b8601e7d..9f24757ee300c 100644
--- a/x-pack/plugins/osquery/common/api/model/schema/common_attributes.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/model/schema/common_attributes.schema.yaml
@@ -241,11 +241,15 @@ components:
     SortOrderOrUndefined:
       oneOf:
 
-      - type: string
-        nullable: true
-      - enum: [ asc, desc ]
+        - type: string
+          nullable: true
+        - enum: [ asc, desc ]
 
     Shards:
       type: object
       additionalProperties:
         type: number
+
+    DefaultSuccessResponse:
+      type: object
+      properties: { }
diff --git a/x-pack/plugins/osquery/common/api/packs/create_pack.gen.ts b/x-pack/plugins/osquery/common/api/packs/create_pack.gen.ts
index 54cd665b25750..1269df0f65053 100644
--- a/x-pack/plugins/osquery/common/api/packs/create_pack.gen.ts
+++ b/x-pack/plugins/osquery/common/api/packs/create_pack.gen.ts
@@ -34,6 +34,3 @@ export const CreatePacksRequestBody = z.object({
   shards: Shards.optional(),
   queries: ObjectQueries.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/packs/create_pack.schema.yaml b/x-pack/plugins/osquery/common/api/packs/create_pack.schema.yaml
index da04d037b1d56..cac8b877bac1a 100644
--- a/x-pack/plugins/osquery/common/api/packs/create_pack.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/create_pack.schema.yaml
@@ -20,7 +20,4 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Shards'
         queries:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/ObjectQueries'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
+
diff --git a/x-pack/plugins/osquery/common/api/packs/delete_packs.gen.ts b/x-pack/plugins/osquery/common/api/packs/delete_packs.gen.ts
index 4efab4f488a1d..525950384cc2f 100644
--- a/x-pack/plugins/osquery/common/api/packs/delete_packs.gen.ts
+++ b/x-pack/plugins/osquery/common/api/packs/delete_packs.gen.ts
@@ -22,6 +22,3 @@ export type DeletePacksRequestQuery = z.infer<typeof DeletePacksRequestQuery>;
 export const DeletePacksRequestQuery = z.object({
   id: PackId.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/packs/delete_packs.schema.yaml b/x-pack/plugins/osquery/common/api/packs/delete_packs.schema.yaml
index 3286aa0b1bb7a..b26c5e415450a 100644
--- a/x-pack/plugins/osquery/common/api/packs/delete_packs.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/delete_packs.schema.yaml
@@ -4,20 +4,9 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    DeletePacksRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/DeletePacksRequestQuery'
   schemas:
     DeletePacksRequestQuery:
       type: object
       properties:
         id:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/PackId'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/packs/find_packs.gen.ts b/x-pack/plugins/osquery/common/api/packs/find_packs.gen.ts
index 9ff3e8c6ae0df..dcad0cb0c9757 100644
--- a/x-pack/plugins/osquery/common/api/packs/find_packs.gen.ts
+++ b/x-pack/plugins/osquery/common/api/packs/find_packs.gen.ts
@@ -30,6 +30,3 @@ export const FindPacksRequestQuery = z.object({
   sort: SortOrUndefined.optional(),
   sortOrder: SortOrderOrUndefined.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/packs/find_packs.schema.yaml b/x-pack/plugins/osquery/common/api/packs/find_packs.schema.yaml
index 4cd1c222bc6d2..c93d9249b7299 100644
--- a/x-pack/plugins/osquery/common/api/packs/find_packs.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/find_packs.schema.yaml
@@ -4,13 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    FindPacksRequestQueryParameter:
-      name: query
-      in: query
-      required: true
-      schema:
-        $ref: '#/components/schemas/FindPacksRequestQuery'
   schemas:
     FindPacksRequestQuery:
       type: object
@@ -23,7 +16,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrUndefined'
         sortOrder:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrderOrUndefined'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/packs/packs.gen.ts b/x-pack/plugins/osquery/common/api/packs/packs.gen.ts
new file mode 100644
index 0000000000000..26d5e8536b884
--- /dev/null
+++ b/x-pack/plugins/osquery/common/api/packs/packs.gen.ts
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Packs Schema
+ *   version: 2023-10-31
+ */
+
+import { z } from 'zod';
+
+import { FindPacksRequestQuery } from './find_packs.gen';
+import { DefaultSuccessResponse } from '../model/schema/common_attributes.gen';
+import { CreatePacksRequestBody } from './create_pack.gen';
+import { ReadPacksRequestQuery } from './read_packs.gen';
+import { DeletePacksRequestQuery } from './delete_packs.gen';
+import { UpdatePacksRequestBody, UpdatePacksRequestParams } from './update_packs.gen';
+
+export type OsqueryCreatePacksRequestBody = z.infer<typeof OsqueryCreatePacksRequestBody>;
+export const OsqueryCreatePacksRequestBody = CreatePacksRequestBody;
+export type OsqueryCreatePacksRequestBodyInput = z.input<typeof OsqueryCreatePacksRequestBody>;
+
+export type OsqueryCreatePacksResponse = z.infer<typeof OsqueryCreatePacksResponse>;
+export const OsqueryCreatePacksResponse = DefaultSuccessResponse;
+
+export type OsqueryDeletePacksRequestParams = z.infer<typeof OsqueryDeletePacksRequestParams>;
+export const OsqueryDeletePacksRequestParams = z.object({
+  query: DeletePacksRequestQuery,
+});
+export type OsqueryDeletePacksRequestParamsInput = z.input<typeof OsqueryDeletePacksRequestParams>;
+
+export type OsqueryDeletePacksResponse = z.infer<typeof OsqueryDeletePacksResponse>;
+export const OsqueryDeletePacksResponse = DefaultSuccessResponse;
+export type OsqueryFindPacksRequestQuery = z.infer<typeof OsqueryFindPacksRequestQuery>;
+export const OsqueryFindPacksRequestQuery = z.object({
+  query: FindPacksRequestQuery,
+});
+export type OsqueryFindPacksRequestQueryInput = z.input<typeof OsqueryFindPacksRequestQuery>;
+
+export type OsqueryFindPacksResponse = z.infer<typeof OsqueryFindPacksResponse>;
+export const OsqueryFindPacksResponse = DefaultSuccessResponse;
+
+export type OsqueryGetPacksDetailsRequestParams = z.infer<
+  typeof OsqueryGetPacksDetailsRequestParams
+>;
+export const OsqueryGetPacksDetailsRequestParams = z.object({
+  query: ReadPacksRequestQuery,
+});
+export type OsqueryGetPacksDetailsRequestParamsInput = z.input<
+  typeof OsqueryGetPacksDetailsRequestParams
+>;
+
+export type OsqueryGetPacksDetailsResponse = z.infer<typeof OsqueryGetPacksDetailsResponse>;
+export const OsqueryGetPacksDetailsResponse = DefaultSuccessResponse;
+
+export type OsqueryUpdatePacksRequestParams = z.infer<typeof OsqueryUpdatePacksRequestParams>;
+export const OsqueryUpdatePacksRequestParams = z.object({
+  query: UpdatePacksRequestParams,
+});
+export type OsqueryUpdatePacksRequestParamsInput = z.input<typeof OsqueryUpdatePacksRequestParams>;
+
+export type OsqueryUpdatePacksRequestBody = z.infer<typeof OsqueryUpdatePacksRequestBody>;
+export const OsqueryUpdatePacksRequestBody = UpdatePacksRequestBody;
+export type OsqueryUpdatePacksRequestBodyInput = z.input<typeof OsqueryUpdatePacksRequestBody>;
+
+export type OsqueryUpdatePacksResponse = z.infer<typeof OsqueryUpdatePacksResponse>;
+export const OsqueryUpdatePacksResponse = DefaultSuccessResponse;
diff --git a/x-pack/plugins/osquery/common/api/packs/packs.schema.yaml b/x-pack/plugins/osquery/common/api/packs/packs.schema.yaml
index 006e0ebd75286..bb2078e334649 100644
--- a/x-pack/plugins/osquery/common/api/packs/packs.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/packs.schema.yaml
@@ -6,17 +6,31 @@ paths:
   /api/osquery/packs:
     get:
       summary: Find packs
+      operationId: OsqueryFindPacks
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-          - $ref: './find_packs.schema.yaml#/components/parameters/FindPacksRequestQueryParameter'
+        - name: query
+          in: query
+          required: true
+          schema:
+            $ref: './find_packs.schema.yaml#/components/schemas/FindPacksRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './find_packs.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     post:
       summary: Create a packs
+      operationId: OsqueryCreatePacks
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -29,32 +43,55 @@ paths:
           content:
             application/json:
               schema:
-                $ref: './create_pack.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
   /api/osquery/packs/{id}:
     get:
       summary: Get packs details
+      operationId: OsqueryGetPacksDetails
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-        - $ref: './read_packs.schema.yaml#/components/parameters/ReadPacksRequestQueryParameter'
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './read_packs.schema.yaml#/components/schemas/ReadPacksRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './read_packs.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     delete:
       summary: Delete packs
+      operationId: OsqueryDeletePacks
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-        - $ref: './delete_packs.schema.yaml#/components/parameters/DeletePacksRequestQueryParameter'
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './delete_packs.schema.yaml#/components/schemas/DeletePacksRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './find_packs.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     put:
       summary: Update packs
+      operationId: OsqueryUpdatePacks
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -62,11 +99,15 @@ paths:
             schema:
               $ref: './update_packs.schema.yaml#/components/schemas/UpdatePacksRequestBody'
       parameters:
-        - $ref: './update_packs.schema.yaml#/components/parameters/UpdatePacksRequestQueryParameter'
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './update_packs.schema.yaml#/components/schemas/UpdatePacksRequestParams'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './update_packs.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
diff --git a/x-pack/plugins/osquery/common/api/packs/read_packs.gen.ts b/x-pack/plugins/osquery/common/api/packs/read_packs.gen.ts
index bd125eb3acf05..2a315b1604db0 100644
--- a/x-pack/plugins/osquery/common/api/packs/read_packs.gen.ts
+++ b/x-pack/plugins/osquery/common/api/packs/read_packs.gen.ts
@@ -22,6 +22,3 @@ export type ReadPacksRequestQuery = z.infer<typeof ReadPacksRequestQuery>;
 export const ReadPacksRequestQuery = z.object({
   id: PackId.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/packs/read_packs.schema.yaml b/x-pack/plugins/osquery/common/api/packs/read_packs.schema.yaml
index 8cfe415848c92..de068fca1259e 100644
--- a/x-pack/plugins/osquery/common/api/packs/read_packs.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/read_packs.schema.yaml
@@ -4,20 +4,9 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    ReadPacksRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/ReadPacksRequestQuery'
   schemas:
     ReadPacksRequestQuery:
       type: object
       properties:
         id:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/PackId'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/packs/update_packs.gen.ts b/x-pack/plugins/osquery/common/api/packs/update_packs.gen.ts
index 92321233cd0d0..de75ec2e3ebc2 100644
--- a/x-pack/plugins/osquery/common/api/packs/update_packs.gen.ts
+++ b/x-pack/plugins/osquery/common/api/packs/update_packs.gen.ts
@@ -39,6 +39,3 @@ export const UpdatePacksRequestBody = z.object({
   shards: Shards.optional(),
   queries: ObjectQueries.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/packs/update_packs.schema.yaml b/x-pack/plugins/osquery/common/api/packs/update_packs.schema.yaml
index 0b0510b4773ab..5a10ec7a73da4 100644
--- a/x-pack/plugins/osquery/common/api/packs/update_packs.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/packs/update_packs.schema.yaml
@@ -4,13 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    UpdatePacksRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/UpdatePacksRequestParams'
   schemas:
     UpdatePacksRequestParams:
       type: object
@@ -32,7 +25,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/Shards'
         queries:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/ObjectQueries'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.gen.ts b/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.gen.ts
index da550104fb6f1..daaee3e18c65c 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.gen.ts
@@ -22,6 +22,3 @@ export type DeleteSavedQueryRequestQuery = z.infer<typeof DeleteSavedQueryReques
 export const DeleteSavedQueryRequestQuery = z.object({
   id: SavedQueryId.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.schema.yaml b/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.schema.yaml
index 7a180c542aa23..7c301cee02242 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/saved_query/delete_saved_query.schema.yaml
@@ -4,20 +4,9 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    DeleteSavedQueryRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/DeleteSavedQueryRequestQuery'
   schemas:
     DeleteSavedQueryRequestQuery:
       type: object
       properties:
         id:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SavedQueryId'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.gen.ts b/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.gen.ts
index 0c875aa8fa187..2773d1f5e210d 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.gen.ts
@@ -30,6 +30,3 @@ export const FindSavedQueryRequestQuery = z.object({
   sort: SortOrUndefined.optional(),
   sortOrder: SortOrderOrUndefined.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.schema.yaml b/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.schema.yaml
index dbebf003a4696..ba11befc7af28 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/saved_query/find_saved_query.schema.yaml
@@ -4,13 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    FindSavedQueryRequestQueryParameter:
-      name: query
-      in: query
-      required: true
-      schema:
-        $ref: '#/components/schemas/FindSavedQueryRequestQuery'
   schemas:
     FindSavedQueryRequestQuery:
       type: object
@@ -23,7 +16,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrUndefined'
         sortOrder:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SortOrderOrUndefined'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.gen.ts b/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.gen.ts
index 33708f3fc4f3c..d397135a87286 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.gen.ts
@@ -22,6 +22,3 @@ export type ReadSavedQueryRequestQuery = z.infer<typeof ReadSavedQueryRequestQue
 export const ReadSavedQueryRequestQuery = z.object({
   id: SavedQueryId.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.schema.yaml b/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.schema.yaml
index a5fed00a37e0c..7f2db7145e673 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/saved_query/read_saved_query.schema.yaml
@@ -4,20 +4,9 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    ReadSavedQueryRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/ReadSavedQueryRequestQuery'
   schemas:
     ReadSavedQueryRequestQuery:
       type: object
       properties:
         id:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SavedQueryId'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/common/api/saved_query/saved_query.gen.ts b/x-pack/plugins/osquery/common/api/saved_query/saved_query.gen.ts
new file mode 100644
index 0000000000000..033dab65762dd
--- /dev/null
+++ b/x-pack/plugins/osquery/common/api/saved_query/saved_query.gen.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Saved Queries Schema
+ *   version: 2023-10-31
+ */
+
+import { z } from 'zod';
+
+import { FindSavedQueryRequestQuery } from './find_saved_query.gen';
+import { DefaultSuccessResponse } from '../model/schema/common_attributes.gen';
+import { CreateSavedQueryRequestBody } from './create_saved_query.gen';
+import { ReadSavedQueryRequestQuery } from './read_saved_query.gen';
+import { DeleteSavedQueryRequestQuery } from './delete_saved_query.gen';
+import {
+  UpdateSavedQueryRequestBody,
+  UpdateSavedQueryRequestParams,
+} from './update_saved_query.gen';
+
+export type OsqueryCreateSavedQueryRequestBody = z.infer<typeof OsqueryCreateSavedQueryRequestBody>;
+export const OsqueryCreateSavedQueryRequestBody = CreateSavedQueryRequestBody;
+export type OsqueryCreateSavedQueryRequestBodyInput = z.input<
+  typeof OsqueryCreateSavedQueryRequestBody
+>;
+
+export type OsqueryCreateSavedQueryResponse = z.infer<typeof OsqueryCreateSavedQueryResponse>;
+export const OsqueryCreateSavedQueryResponse = DefaultSuccessResponse;
+
+export type OsqueryDeleteSavedQueryRequestParams = z.infer<
+  typeof OsqueryDeleteSavedQueryRequestParams
+>;
+export const OsqueryDeleteSavedQueryRequestParams = z.object({
+  query: DeleteSavedQueryRequestQuery,
+});
+export type OsqueryDeleteSavedQueryRequestParamsInput = z.input<
+  typeof OsqueryDeleteSavedQueryRequestParams
+>;
+
+export type OsqueryDeleteSavedQueryResponse = z.infer<typeof OsqueryDeleteSavedQueryResponse>;
+export const OsqueryDeleteSavedQueryResponse = DefaultSuccessResponse;
+export type OsqueryFindSavedQueriesRequestQuery = z.infer<
+  typeof OsqueryFindSavedQueriesRequestQuery
+>;
+export const OsqueryFindSavedQueriesRequestQuery = z.object({
+  query: FindSavedQueryRequestQuery,
+});
+export type OsqueryFindSavedQueriesRequestQueryInput = z.input<
+  typeof OsqueryFindSavedQueriesRequestQuery
+>;
+
+export type OsqueryFindSavedQueriesResponse = z.infer<typeof OsqueryFindSavedQueriesResponse>;
+export const OsqueryFindSavedQueriesResponse = DefaultSuccessResponse;
+
+export type OsqueryGetSavedQueryDetailsRequestParams = z.infer<
+  typeof OsqueryGetSavedQueryDetailsRequestParams
+>;
+export const OsqueryGetSavedQueryDetailsRequestParams = z.object({
+  query: ReadSavedQueryRequestQuery,
+});
+export type OsqueryGetSavedQueryDetailsRequestParamsInput = z.input<
+  typeof OsqueryGetSavedQueryDetailsRequestParams
+>;
+
+export type OsqueryGetSavedQueryDetailsResponse = z.infer<
+  typeof OsqueryGetSavedQueryDetailsResponse
+>;
+export const OsqueryGetSavedQueryDetailsResponse = DefaultSuccessResponse;
+
+export type OsqueryUpdateSavedQueryRequestParams = z.infer<
+  typeof OsqueryUpdateSavedQueryRequestParams
+>;
+export const OsqueryUpdateSavedQueryRequestParams = z.object({
+  query: UpdateSavedQueryRequestParams,
+});
+export type OsqueryUpdateSavedQueryRequestParamsInput = z.input<
+  typeof OsqueryUpdateSavedQueryRequestParams
+>;
+
+export type OsqueryUpdateSavedQueryRequestBody = z.infer<typeof OsqueryUpdateSavedQueryRequestBody>;
+export const OsqueryUpdateSavedQueryRequestBody = UpdateSavedQueryRequestBody;
+export type OsqueryUpdateSavedQueryRequestBodyInput = z.input<
+  typeof OsqueryUpdateSavedQueryRequestBody
+>;
+
+export type OsqueryUpdateSavedQueryResponse = z.infer<typeof OsqueryUpdateSavedQueryResponse>;
+export const OsqueryUpdateSavedQueryResponse = DefaultSuccessResponse;
diff --git a/x-pack/plugins/osquery/common/api/saved_query/saved_query.schema.yaml b/x-pack/plugins/osquery/common/api/saved_query/saved_query.schema.yaml
index d8cef82ac7103..62ae77a83a94b 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/saved_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/saved_query/saved_query.schema.yaml
@@ -6,17 +6,31 @@ paths:
   /api/osquery/saved_queries:
     get:
       summary: Find saved queries
+      operationId: OsqueryFindSavedQueries
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-          - $ref: './find_saved_query.schema.yaml#/components/parameters/FindSavedQueryRequestQueryParameter'
+        - name: query
+          in: query
+          required: true
+          schema:
+            $ref: './find_saved_query.schema.yaml#/components/schemas/FindSavedQueryRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './find_saved_query.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     post:
       summary: Create a saved query
+      operationId: OsqueryCreateSavedQuery
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -29,44 +43,71 @@ paths:
           content:
             application/json:
               schema:
-                $ref: './create_saved_query.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
   /api/osquery/saved_queries/{id}:
     get:
       summary: Get saved query details
+      operationId: OsqueryGetSavedQueryDetails
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
-        - $ref: './read_saved_query.schema.yaml#/components/parameters/ReadSavedQueryRequestQueryParameter'
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './read_saved_query.schema.yaml#/components/schemas/ReadSavedQueryRequestQuery'
       responses:
         '200':
           description: OK
           content:
             application/json:
               schema:
-                $ref: './read_saved_query.schema.yaml#/components/schemas/SuccessResponse'
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     delete:
-          summary: Delete saved query
-          parameters:
-            - $ref: './delete_saved_query.schema.yaml#/components/parameters/DeleteSavedQueryRequestQueryParameter'
-          responses:
-            '200':
-              description: OK
-              content:
-                application/json:
-                  schema:
-                    $ref: './find_saved_query.schema.yaml#/components/schemas/SuccessResponse'
+      summary: Delete saved query
+      operationId: OsqueryDeleteSavedQuery
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
+      parameters:
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './delete_saved_query.schema.yaml#/components/schemas/DeleteSavedQueryRequestQuery'
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
     put:
-          summary: Update saved query
-          requestBody:
-            required: true
-            content:
-              application/json:
-                schema:
-                  $ref: './update_saved_query.schema.yaml#/components/schemas/UpdateSavedQueryRequestBody'
-          parameters:
-            - $ref: './update_saved_query.schema.yaml#/components/parameters/UpdateSavedQueryRequestQueryParameter'
-          responses:
-            '200':
-              description: OK
-              content:
-                application/json:
-                  schema:
-                    $ref: './update_saved_query.schema.yaml#/components/schemas/SuccessResponse'
+      summary: Update saved query
+      operationId: OsqueryUpdateSavedQuery
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: './update_saved_query.schema.yaml#/components/schemas/UpdateSavedQueryRequestBody'
+      parameters:
+        - name: query
+          in: path
+          required: true
+          schema:
+            $ref: './update_saved_query.schema.yaml#/components/schemas/UpdateSavedQueryRequestParams'
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/DefaultSuccessResponse'
diff --git a/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.gen.ts b/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.gen.ts
index 70417f2880de2..b2e5a48c4aaca 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.gen.ts
+++ b/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.gen.ts
@@ -44,6 +44,3 @@ export const UpdateSavedQueryRequestBody = z.object({
   snapshot: SnapshotOrUndefined.optional(),
   removed: RemovedOrUndefined.optional(),
 });
-
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.schema.yaml b/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.schema.yaml
index b91359b5bbeef..9f33e8bfda83d 100644
--- a/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.schema.yaml
+++ b/x-pack/plugins/osquery/common/api/saved_query/update_saved_query.schema.yaml
@@ -4,13 +4,6 @@ info:
   version: '2023-10-31'
 paths: { }
 components:
-  parameters:
-    UpdateSavedQueryRequestQueryParameter:
-      name: query
-      in: path
-      required: true
-      schema:
-        $ref: '#/components/schemas/UpdateSavedQueryRequestParams'
   schemas:
     UpdateSavedQueryRequestParams:
       type: object
@@ -38,7 +31,3 @@ components:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/SnapshotOrUndefined'
         removed:
           $ref: '../model/schema/common_attributes.schema.yaml#/components/schemas/RemovedOrUndefined'
-    SuccessResponse:
-      type: object
-      properties: {}
-      # Define properties for the success response if needed
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
index 6b847fb396967..f06666ed1fd88 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/add_integration.cy.ts
@@ -39,7 +39,8 @@ import {
 } from '../../tasks/integrations';
 import { ServerlessRoleName } from '../../support/roles';
 
-describe('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () => {
+// Failing: See https://github.com/elastic/kibana/issues/170593
+describe.skip('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () => {
   let savedQueryId: string;
 
   before(() => {
@@ -103,7 +104,8 @@ describe('ALL - Add Integration', { tags: ['@ess', '@serverless'] }, () => {
       cy.contains(`version: ${oldVersion}`).should('not.exist');
     });
   });
-  describe('Add integration to policy', () => {
+  // FLAKY: https://github.com/elastic/kibana/issues/170593
+  describe.skip('Add integration to policy', () => {
     const [integrationName, policyName] = generateRandomStringName(2);
     let policyId: string;
     beforeEach(() => {
diff --git a/x-pack/plugins/osquery/cypress/e2e/all/packs_integration.cy.ts b/x-pack/plugins/osquery/cypress/e2e/all/packs_integration.cy.ts
index ccbd119aab3a7..f940807345034 100644
--- a/x-pack/plugins/osquery/cypress/e2e/all/packs_integration.cy.ts
+++ b/x-pack/plugins/osquery/cypress/e2e/all/packs_integration.cy.ts
@@ -40,7 +40,9 @@ import { cleanupPack, cleanupAgentPolicy } from '../../tasks/api_fixtures';
 import { request } from '../../tasks/common';
 import { ServerlessRoleName } from '../../support/roles';
 
-describe('ALL - Packs', { tags: ['@ess', '@serverless'] }, () => {
+// Failing: See https://github.com/elastic/kibana/issues/171279
+// Failing: See https://github.com/elastic/kibana/issues/180424
+describe.skip('ALL - Packs', { tags: ['@ess', '@serverless'] }, () => {
   const integration = 'Osquery Manager';
 
   describe(
diff --git a/x-pack/plugins/rule_registry/common/types.ts b/x-pack/plugins/rule_registry/common/types.ts
index da14078b72a3b..5f80af04048e2 100644
--- a/x-pack/plugins/rule_registry/common/types.ts
+++ b/x-pack/plugins/rule_registry/common/types.ts
@@ -11,6 +11,7 @@ import * as t from 'io-ts';
 
 import type { IFieldSubType } from '@kbn/es-query';
 import type { RuntimeField } from '@kbn/data-views-plugin/common';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
 // note: these schemas are not exhaustive. See the `Sort` type of `@elastic/elasticsearch` if you need to enhance it.
 const fieldSchema = t.string;
@@ -198,6 +199,23 @@ const bucketAggsTempsSchemas: t.Type<BucketAggsSchemas> = t.exact(
         ]),
       })
     ),
+    bucket_sort: t.exact(
+      t.partial({
+        sort: sortSchema,
+        from: t.number,
+        size: t.number,
+        gap_policy: t.union([
+          t.literal('skip'),
+          t.literal('insert_zeros'),
+          t.literal('keep_values'),
+        ]),
+      })
+    ),
+    value_count: t.exact(
+      t.partial({
+        field: t.string,
+      })
+    ),
   })
 );
 
@@ -311,6 +329,80 @@ export const bucketAggsSchemas = t.intersection([
   ),
 ]);
 
+export const alertsAggregationsSchema = t.record(
+  t.string,
+  t.intersection([metricsAggsSchemas, bucketAggsSchemas])
+);
+
+const allowedFilterKeysSchema = t.union([
+  t.literal('bool'),
+  t.literal('boosting'),
+  t.literal('common'),
+  t.literal('combined_fields'),
+  t.literal('constant_score'),
+  t.literal('dis_max'),
+  t.literal('distance_feature'),
+  t.literal('exists'),
+  t.literal('function_score'),
+  t.literal('fuzzy'),
+  t.literal('geo_bounding_box'),
+  t.literal('geo_distance'),
+  t.literal('geo_polygon'),
+  t.literal('geo_shape'),
+  t.literal('has_child'),
+  t.literal('has_parent'),
+  t.literal('ids'),
+  t.literal('intervals'),
+  t.literal('knn'),
+  t.literal('match'),
+  t.literal('match_all'),
+  t.literal('match_bool_prefix'),
+  t.literal('match_none'),
+  t.literal('match_phrase'),
+  t.literal('match_phrase_prefix'),
+  t.literal('more_like_this'),
+  t.literal('multi_match'),
+  t.literal('nested'),
+  t.literal('parent_id'),
+  t.literal('percolate'),
+  t.literal('pinned'),
+  t.literal('prefix'),
+  t.literal('query_string'),
+  t.literal('range'),
+  t.literal('rank_feature'),
+  t.literal('regexp'),
+  t.literal('rule_query'),
+  t.literal('shape'),
+  t.literal('simple_query_string'),
+  t.literal('span_containing'),
+  t.literal('span_field_masking'),
+  t.literal('span_first'),
+  t.literal('span_multi'),
+  t.literal('span_near'),
+  t.literal('span_not'),
+  t.literal('span_or'),
+  t.literal('span_term'),
+  t.literal('span_within'),
+  t.literal('term'),
+  t.literal('terms'),
+  t.literal('terms_set'),
+  t.literal('text_expansion'),
+  t.literal('weighted_tokens'),
+  t.literal('wildcard'),
+  t.literal('wrapper'),
+  t.literal('type'),
+]);
+
+type AssertAssignable<T, U extends T> = T;
+
+// Used to check that the validation schema is aligned with the type from ES
+declare type _ = AssertAssignable<
+  keyof Omit<QueryDslQueryContainer, 'script' | 'script_score'>,
+  t.TypeOf<typeof allowedFilterKeysSchema>
+>;
+
+export const alertsGroupFilterSchema = t.record(allowedFilterKeysSchema, t.any);
+
 export type PutIndexTemplateRequest = estypes.IndicesPutIndexTemplateRequest & {
   body?: { composed_of?: string[] };
 };
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
index 75a2c7222a9de..66ef6a73013f4 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.mock.ts
@@ -19,6 +19,7 @@ const createAlertsClientMock = () => {
     bulkUpdate: jest.fn(),
     bulkUpdateCases: jest.fn(),
     find: jest.fn(),
+    getGroupAggregations: jest.fn(),
     getFeatureIdsByRegistrationContexts: jest.fn(),
     getBrowserFields: jest.fn(),
     getAlertSummary: jest.fn(),
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
index e45bbecf93cec..4dac5ff413909 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/alerts_client.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 import Boom from '@hapi/boom';
+import { v4 as uuidv4 } from 'uuid';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { Filter, buildEsQuery, EsQueryConfig } from '@kbn/es-query';
@@ -27,7 +28,9 @@ import {
 
 import {
   InlineScript,
+  MappingRuntimeFields,
   QueryDslQueryContainer,
+  SortCombinations,
 } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { RuleTypeParams, PluginStartContract as AlertingStart } from '@kbn/alerting-plugin/server';
 import {
@@ -41,6 +44,7 @@ import { AuditLogger } from '@kbn/security-plugin/server';
 import { FieldDescriptor, IndexPatternsFetcher } from '@kbn/data-plugin/server';
 import { isEmpty } from 'lodash';
 import { RuleTypeRegistry } from '@kbn/alerting-plugin/server/types';
+import { TypeOf } from 'io-ts';
 import { BrowserFields } from '../../common';
 import { alertAuditEvent, operationAlertAuditActionMap } from './audit_events';
 import {
@@ -53,6 +57,12 @@ import { ParsedTechnicalFields } from '../../common/parse_technical_fields';
 import { IRuleDataService } from '../rule_data_plugin_service';
 import { getAuthzFilter, getSpacesFilter } from '../lib';
 import { fieldDescriptorToBrowserFieldMapper } from './browser_fields';
+import { alertsAggregationsSchema } from '../../common/types';
+import {
+  MAX_ALERTS_GROUPING_QUERY_SIZE,
+  MAX_ALERTS_PAGES,
+  MAX_PAGINATED_ALERTS,
+} from './constants';
 
 // TODO: Fix typings https://github.com/elastic/kibana/issues/101776
 type NonNullableProps<Obj extends {}, Props extends keyof Obj> = Omit<Obj, Props> & {
@@ -88,15 +98,15 @@ export interface ConstructorOptions {
 export interface UpdateOptions<Params extends RuleTypeParams> {
   id: string;
   status: string;
-  _version: string | undefined;
+  _version?: string;
   index: string;
 }
 
 export interface BulkUpdateOptions<Params extends RuleTypeParams> {
-  ids: string[] | undefined | null;
+  ids?: string[] | null;
   status: STATUS_VALUES;
   index: string;
-  query: object | string | undefined | null;
+  query?: object | string | null;
 }
 
 interface MgetAndAuditAlert {
@@ -128,18 +138,19 @@ interface GetAlertSummaryParams {
   fixedInterval?: string;
 }
 
-interface SingleSearchAfterAndAudit {
-  id?: string | null | undefined;
-  query?: string | object | undefined;
-  aggs?: Record<string, any> | undefined;
+interface SearchAlertsParams {
+  id?: string | null;
+  query?: string | object;
+  aggs?: Record<string, any>;
   index?: string;
-  _source?: string[] | undefined;
+  _source?: string[] | false;
   track_total_hits?: boolean | number;
-  size?: number | undefined;
+  size?: number;
   operation: WriteOperations.Update | ReadOperations.Find | ReadOperations.Get;
-  sort?: estypes.SortOptions[] | undefined;
-  lastSortIds?: Array<string | number> | undefined;
+  sort?: estypes.SortOptions[];
+  lastSortIds?: Array<string | number>;
   featureIds?: string[];
+  runtimeMappings?: MappingRuntimeFields;
 }
 
 /**
@@ -205,21 +216,15 @@ export class AlertsClient {
 
   /**
    * Accepts an array of ES documents and executes ensureAuthorized for the given operation
-   * @param items
-   * @param operation
-   * @returns
    */
   private async ensureAllAuthorized(
     items: Array<{
       _id: string;
       // this is typed kind of crazy to fit the output of es api response to this
-      _source?:
-        | {
-            [ALERT_RULE_TYPE_ID]?: string | null | undefined;
-            [ALERT_RULE_CONSUMER]?: string | null | undefined;
-          }
-        | null
-        | undefined;
+      _source?: {
+        [ALERT_RULE_TYPE_ID]?: string | null;
+        [ALERT_RULE_CONSUMER]?: string | null;
+      } | null;
     }>,
     operation: ReadOperations.Find | ReadOperations.Get | WriteOperations.Update
   ) {
@@ -236,8 +241,8 @@ export class AlertsClient {
       { hitIds: [], ownersAndRuleTypeIds: [] } as {
         hitIds: string[];
         ownersAndRuleTypeIds: Array<{
-          [ALERT_RULE_TYPE_ID]: string | null | undefined;
-          [ALERT_RULE_CONSUMER]: string | null | undefined;
+          [ALERT_RULE_TYPE_ID]?: string | null;
+          [ALERT_RULE_CONSUMER]?: string | null;
         }>;
       }
     );
@@ -272,12 +277,9 @@ export class AlertsClient {
   }
 
   /**
-   * This will be used as a part of the "find" api
-   * In the future we will add an "aggs" param
-   * @param param0
-   * @returns
+   * Searches alerts by id or query and audits the results
    */
-  private async singleSearchAfterAndAudit({
+  private async searchAlerts({
     id,
     query,
     aggs,
@@ -289,7 +291,8 @@ export class AlertsClient {
     sort,
     lastSortIds = [],
     featureIds,
-  }: SingleSearchAfterAndAudit) {
+    runtimeMappings,
+  }: SearchAlertsParams) {
     try {
       const alertSpaceId = this.spaceId;
       if (alertSpaceId == null) {
@@ -322,6 +325,7 @@ export class AlertsClient {
             },
           },
         ],
+        runtime_mappings: runtimeMappings,
       };
 
       if (lastSortIds.length > 0) {
@@ -338,26 +342,28 @@ export class AlertsClient {
         seq_no_primary_term: true,
       });
 
-      if (!result?.hits.hits.every((hit) => isValidAlert(hit))) {
+      if (!result?.hits?.hits?.length) {
+        return result;
+      }
+
+      if (result.hits.hits.some((hit) => !isValidAlert(hit))) {
         const errorMessage = `Invalid alert found with id of "${id}" or with query "${query}" and operation ${operation}`;
         this.logger.error(errorMessage);
         throw Boom.badData(errorMessage);
       }
 
-      if (result?.hits.hits.length > 0) {
-        // @ts-expect-error type mismatch: SearchHit._id is optional
-        await this.ensureAllAuthorized(result.hits.hits, operation);
-
-        result?.hits.hits.map((item) =>
-          this.auditLogger?.log(
-            alertAuditEvent({
-              action: operationAlertAuditActionMap[operation],
-              id: item._id,
-              ...this.getOutcome(operation),
-            })
-          )
-        );
-      }
+      // @ts-expect-error type mismatch: SearchHit._id is optional
+      await this.ensureAllAuthorized(result.hits.hits, operation);
+
+      result.hits.hits.forEach((item) =>
+        this.auditLogger?.log(
+          alertAuditEvent({
+            action: operationAlertAuditActionMap[operation],
+            id: item._id,
+            ...this.getOutcome(operation),
+          })
+        )
+      );
 
       return result;
     } catch (error) {
@@ -369,8 +375,6 @@ export class AlertsClient {
 
   /**
    * When an update by ids is requested, do a multi-get, ensure authz and audit alerts, then execute bulk update
-   * @param param0
-   * @returns
    */
   private async mgetAlertsAuditOperate({
     alerts,
@@ -425,8 +429,6 @@ export class AlertsClient {
 
   /**
    * When an update by ids is requested, do a multi-get, ensure authz and audit alerts, then execute bulk update
-   * @param param0
-   * @returns
    */
   private async mgetAlertsAuditOperateStatus({
     alerts,
@@ -492,9 +494,7 @@ export class AlertsClient {
   }
 
   /**
-   * executes a search after to find alerts with query (+ authz filter)
-   * @param param0
-   * @returns
+   * Executes a search after to find alerts with query (+ authz filter)
    */
   private async queryAndAuditAllAlerts({
     index,
@@ -525,7 +525,7 @@ export class AlertsClient {
 
     while (hasSortIds) {
       try {
-        const result = await this.singleSearchAfterAndAudit({
+        const result = await this.searchAlerts({
           id: null,
           query,
           index,
@@ -608,7 +608,7 @@ export class AlertsClient {
   public async get({ id, index }: GetAlertParams) {
     try {
       // first search for the alert by id, then use the alert info to check if user has access to it
-      const alert = await this.singleSearchAfterAndAudit({
+      const alert = await this.searchAlerts({
         id,
         index,
         operation: ReadOperations.Get,
@@ -646,7 +646,7 @@ export class AlertsClient {
       }
 
       // first search for the alert by id, then use the alert info to check if user has access to it
-      const responseAlertSum = await this.singleSearchAfterAndAudit({
+      const responseAlertSum = await this.searchAlerts({
         index: (indexToUse ?? []).join(),
         operation: ReadOperations.Get,
         aggs: {
@@ -711,7 +711,7 @@ export class AlertsClient {
       let activeAlertCount = 0;
       let recoveredAlertCount = 0;
       (
-        ((responseAlertSum.aggregations?.count as estypes.AggregationsMultiBucketAggregateBase)
+        ((responseAlertSum?.aggregations?.count as estypes.AggregationsMultiBucketAggregateBase)
           ?.buckets as estypes.AggregationsStringTermsBucketKeys[]) ?? []
       ).forEach((b) => {
         if (b.key === ALERT_STATUS_ACTIVE) {
@@ -726,13 +726,15 @@ export class AlertsClient {
         recoveredAlertCount,
         activeAlerts:
           (
-            responseAlertSum.aggregations
+            responseAlertSum?.aggregations
               ?.active_alerts_bucket as estypes.AggregationsAutoDateHistogramAggregate
           )?.buckets ?? [],
         recoveredAlerts:
           (
-            (responseAlertSum.aggregations?.recovered_alerts as estypes.AggregationsFilterAggregate)
-              ?.container as estypes.AggregationsAutoDateHistogramAggregate
+            (
+              responseAlertSum?.aggregations
+                ?.recovered_alerts as estypes.AggregationsFilterAggregate
+            )?.container as estypes.AggregationsAutoDateHistogramAggregate
           )?.buckets ?? [],
       };
     } catch (error) {
@@ -748,7 +750,7 @@ export class AlertsClient {
     index,
   }: UpdateOptions<Params>) {
     try {
-      const alert = await this.singleSearchAfterAndAudit({
+      const alert = await this.searchAlerts({
         id,
         index,
         operation: WriteOperations.Update,
@@ -983,6 +985,7 @@ export class AlertsClient {
     sort,
     track_total_hits: trackTotalHits,
     _source,
+    runtimeMappings,
   }: {
     aggs?: object;
     featureIds?: string[];
@@ -992,7 +995,8 @@ export class AlertsClient {
     size?: number;
     sort?: estypes.SortOptions[];
     track_total_hits?: boolean | number;
-    _source?: string[];
+    _source?: string[] | false;
+    runtimeMappings?: MappingRuntimeFields;
   }) {
     try {
       let indexToUse = index;
@@ -1003,8 +1007,7 @@ export class AlertsClient {
         }
       }
 
-      // first search for the alert by id, then use the alert info to check if user has access to it
-      const alertsSearchResponse = await this.singleSearchAfterAndAudit({
+      const alertsSearchResponse = await this.searchAlerts({
         query,
         aggs,
         _source,
@@ -1014,6 +1017,7 @@ export class AlertsClient {
         operation: ReadOperations.Find,
         sort,
         lastSortIds: searchAfter,
+        runtimeMappings,
       });
 
       if (alertsSearchResponse == null) {
@@ -1029,6 +1033,114 @@ export class AlertsClient {
     }
   }
 
+  /**
+   * Performs a `find` query to extract aggregations on alert groups
+   */
+  public getGroupAggregations({
+    featureIds,
+    groupByField,
+    aggregations,
+    filters,
+    pageIndex,
+    pageSize,
+    sort = [{ unitsCount: { order: 'desc' } }],
+  }: {
+    /**
+     * The feature ids the alerts belong to, used for authorization
+     */
+    featureIds: string[];
+    /**
+     * The field to group by
+     * @example "kibana.alert.rule.name"
+     */
+    groupByField: string;
+    /**
+     * The aggregations to perform on the groupByField buckets
+     */
+    aggregations?: TypeOf<typeof alertsAggregationsSchema>;
+    /**
+     * The filters to apply to the query
+     */
+    filters?: estypes.QueryDslQueryContainer[];
+    /**
+     * Any sort options to apply to the groupByField aggregations
+     */
+    sort?: SortCombinations[];
+    /**
+     * The page index to start from
+     */
+    pageIndex: number;
+    /**
+     * The page size
+     */
+    pageSize: number;
+  }) {
+    const uniqueValue = uuidv4();
+    if (pageIndex > MAX_ALERTS_PAGES) {
+      throw Boom.badRequest(
+        `The provided pageIndex value is too high. The maximum allowed pageIndex value is ${MAX_ALERTS_PAGES}.`
+      );
+    }
+    if (Math.max(pageIndex, pageIndex * pageSize) > MAX_PAGINATED_ALERTS) {
+      throw Boom.badRequest(
+        `The number of documents is too high. Paginating through more than ${MAX_PAGINATED_ALERTS} documents is not possible.`
+      );
+    }
+    return this.find({
+      featureIds,
+      aggs: {
+        groupByFields: {
+          terms: {
+            field: 'groupByField',
+            size: MAX_ALERTS_GROUPING_QUERY_SIZE,
+          },
+          aggs: {
+            unitsCount: { value_count: { field: 'groupByField' } },
+            bucket_truncate: {
+              bucket_sort: {
+                sort,
+                from: pageIndex * pageSize,
+                size: pageSize,
+              },
+            },
+            ...(aggregations ?? {}),
+          },
+        },
+        unitsCount: { value_count: { field: 'groupByField' } },
+        groupsCount: { cardinality: { field: 'groupByField' } },
+      },
+      query: {
+        bool: {
+          filter: filters,
+        },
+      },
+      runtimeMappings: {
+        groupByField: {
+          type: 'keyword',
+          script: {
+            source:
+              // When size()==0, emits a uniqueValue as the value to represent this group  else join by uniqueValue.
+              "if (doc[params['selectedGroup']].size()==0) { emit(params['uniqueValue']) }" +
+              // Else, join the values with uniqueValue. We cannot simply emit the value like doc[params['selectedGroup']].value,
+              // the runtime field will only return the first value in an array.
+              // The docs advise that if the field has multiple values, "Scripts can call the emit method multiple times to emit multiple values."
+              // However, this gives us a group for each value instead of combining the values like we're aiming for.
+              // Instead of .value, we can retrieve all values with .join().
+              // Instead of joining with a "," we should join with a unique value to avoid splitting a value that happens to contain a ",".
+              // We will format into a proper array in parseGroupingQuery .
+              " else { emit(doc[params['selectedGroup']].join(params['uniqueValue']))}",
+            params: {
+              selectedGroup: groupByField,
+              uniqueValue,
+            },
+          },
+        },
+      },
+      size: 0,
+      _source: false,
+    });
+  }
+
   public async getAuthorizedAlertsIndices(featureIds: string[]): Promise<string[] | undefined> {
     try {
       const authorizedRuleTypes = await this.authorization.getAuthorizedRuleTypes(
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/constants.ts b/x-pack/plugins/rule_registry/server/alert_data_client/constants.ts
new file mode 100644
index 0000000000000..27251a4129363
--- /dev/null
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/constants.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * The maximum number of alert groups to render
+ */
+export const DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE = 10;
+
+/**
+ * Grouping pagination breaks if the field cardinality exceeds this number
+ *
+ * @external https://github.com/elastic/kibana/issues/151913
+ */
+export const MAX_ALERTS_GROUPING_QUERY_SIZE = 10000;
+
+/**
+ * The maximum number of addressable pages
+ */
+export const MAX_ALERTS_PAGES = 100;
+
+/**
+ * The maximum number of alerts to paginate
+ */
+export const MAX_PAGINATED_ALERTS = 10000;
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
index 8ccae88dd83c3..1aee2885cc318 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/find_alerts.test.ts
@@ -181,6 +181,7 @@ describe('find()', () => {
                 "should": Array [],
               },
             },
+            "runtime_mappings": undefined,
             "size": undefined,
             "sort": Array [
               Object {
@@ -314,6 +315,7 @@ describe('find()', () => {
                 "should": Array [],
               },
             },
+            "runtime_mappings": undefined,
             "size": undefined,
             "sort": Array [
               Object {
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
index 1526e209e40c0..b48e68c3bf255 100644
--- a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get.test.ts
@@ -162,6 +162,7 @@ describe('get()', () => {
                 "should": Array [],
               },
             },
+            "runtime_mappings": undefined,
             "size": undefined,
             "sort": Array [
               Object {
diff --git a/x-pack/plugins/rule_registry/server/alert_data_client/tests/get_alerts_group_aggregations.test.ts b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get_alerts_group_aggregations.test.ts
new file mode 100644
index 0000000000000..8aedf715ff668
--- /dev/null
+++ b/x-pack/plugins/rule_registry/server/alert_data_client/tests/get_alerts_group_aggregations.test.ts
@@ -0,0 +1,168 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AlertConsumers } from '@kbn/rule-data-utils';
+import { AlertsClient, ConstructorOptions } from '../alerts_client';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
+import { elasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
+import { alertingAuthorizationMock } from '@kbn/alerting-plugin/server/authorization/alerting_authorization.mock';
+import { auditLoggerMock } from '@kbn/security-plugin/server/audit/mocks';
+import { AlertingAuthorizationEntity } from '@kbn/alerting-plugin/server';
+import { ruleDataServiceMock } from '../../rule_data_plugin_service/rule_data_plugin_service.mock';
+import { DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE, MAX_ALERTS_GROUPING_QUERY_SIZE } from '../constants';
+
+jest.mock('uuid', () => ({ v4: () => 'unique-value' }));
+
+const alertingAuthMock = alertingAuthorizationMock.create();
+const esClientMock = elasticsearchClientMock.createElasticsearchClient();
+const auditLogger = auditLoggerMock.create();
+
+const alertsClientParams: jest.Mocked<ConstructorOptions> = {
+  logger: loggingSystemMock.create().get(),
+  authorization: alertingAuthMock,
+  esClient: esClientMock,
+  auditLogger,
+  ruleDataService: ruleDataServiceMock.create(),
+  getRuleType: jest.fn(),
+  getRuleList: jest.fn(),
+  getAlertIndicesAlias: jest.fn(),
+};
+
+const DEFAULT_SPACE = 'test_default_space_id';
+
+beforeEach(() => {
+  jest.resetAllMocks();
+  alertingAuthMock.getSpaceId.mockImplementation(() => DEFAULT_SPACE);
+  // @ts-expect-error
+  alertingAuthMock.getAuthorizationFilter.mockImplementation(async () =>
+    Promise.resolve({ filter: [] })
+  );
+  // @ts-expect-error
+  alertingAuthMock.getAugmentedRuleTypesWithAuthorization.mockImplementation(async () => {
+    const authorizedRuleTypes = new Set();
+    authorizedRuleTypes.add({ producer: 'apm' });
+    return Promise.resolve({ authorizedRuleTypes });
+  });
+
+  alertingAuthMock.ensureAuthorized.mockImplementation(
+    // @ts-expect-error
+    async ({
+      ruleTypeId,
+      consumer,
+      operation,
+      entity,
+    }: {
+      ruleTypeId: string;
+      consumer: string;
+      operation: string;
+      entity: typeof AlertingAuthorizationEntity.Alert;
+    }) => {
+      if (ruleTypeId === 'apm.error_rate' && consumer === 'apm') {
+        return Promise.resolve();
+      }
+      return Promise.reject(new Error(`Unauthorized for ${ruleTypeId} and ${consumer}`));
+    }
+  );
+});
+
+describe('getGroupAggregations()', () => {
+  test('calls find() with the correct params', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+    alertsClient.find = jest.fn();
+
+    const featureIds = [AlertConsumers.STACK_ALERTS];
+    const groupByField = 'kibana.alert.rule.name';
+    const aggregations = {
+      usersCount: {
+        cardinality: {
+          field: 'user.name',
+        },
+      },
+    };
+    const filters = [{ range: { '@timestamp': { gte: 'now-1d/d', lte: 'now/d' } } }];
+
+    await alertsClient.getGroupAggregations({
+      featureIds,
+      groupByField,
+      aggregations,
+      filters,
+      pageIndex: 0,
+      pageSize: DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE,
+    });
+
+    expect(alertsClient.find).toHaveBeenCalledWith({
+      featureIds,
+      aggs: {
+        groupByFields: {
+          terms: {
+            field: 'groupByField',
+            size: MAX_ALERTS_GROUPING_QUERY_SIZE,
+          },
+          aggs: {
+            unitsCount: { value_count: { field: 'groupByField' } },
+            bucket_truncate: {
+              bucket_sort: {
+                sort: [{ unitsCount: { order: 'desc' } }],
+                from: 0,
+                size: DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE,
+              },
+            },
+            ...(aggregations ?? {}),
+          },
+        },
+        unitsCount: { value_count: { field: 'groupByField' } },
+        groupsCount: { cardinality: { field: 'groupByField' } },
+      },
+      query: {
+        bool: {
+          filter: filters,
+        },
+      },
+      runtimeMappings: {
+        groupByField: {
+          type: 'keyword',
+          script: {
+            source:
+              "if (doc[params['selectedGroup']].size()==0) { emit(params['uniqueValue']) }" +
+              " else { emit(doc[params['selectedGroup']].join(params['uniqueValue']))}",
+            params: {
+              selectedGroup: groupByField,
+              uniqueValue: 'unique-value',
+            },
+          },
+        },
+      },
+      size: 0,
+      _source: false,
+    });
+  });
+
+  test('rejects with invalid pagination options', async () => {
+    const alertsClient = new AlertsClient(alertsClientParams);
+
+    expect(() =>
+      alertsClient.getGroupAggregations({
+        featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+        groupByField: 'kibana.alert.rule.name',
+        pageIndex: 101,
+        pageSize: 50,
+      })
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"The provided pageIndex value is too high. The maximum allowed pageIndex value is 100."`
+    );
+    expect(() =>
+      alertsClient.getGroupAggregations({
+        featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+        groupByField: 'kibana.alert.rule.name',
+        pageIndex: 10,
+        pageSize: 5000,
+      })
+    ).toThrowErrorMatchingInlineSnapshot(
+      `"The number of documents is too high. Paginating through more than 10000 documents is not possible."`
+    );
+  });
+});
diff --git a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts
index e041a43aa709f..d3857c4c49f17 100644
--- a/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts
+++ b/x-pack/plugins/rule_registry/server/routes/__mocks__/request_responses.ts
@@ -53,3 +53,53 @@ export const getMetricThresholdAADFields = () =>
     path: `${BASE_RAC_ALERTS_API_PATH}/aad_fields`,
     query: { ruleTypeId: 'metrics.alert.threshold' },
   });
+
+export const getAlertsGroupAggregationsRequest = () =>
+  requestMock.create({
+    method: 'post',
+    path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+    body: {
+      featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+      groupByField: 'kibana.alert.rule.name',
+      aggregations: {
+        unitsCount: {
+          cardinality: {
+            field: 'kibana.alert.uuid',
+          },
+        },
+        description: {
+          terms: {
+            field: 'kibana.alert.rule.description',
+            size: 1,
+          },
+        },
+        usersCountAggregation: {
+          cardinality: {
+            field: 'user.name',
+          },
+        },
+        hostsCountAggregation: {
+          cardinality: {
+            field: 'host.name',
+          },
+        },
+        ruleTags: {
+          terms: {
+            field: 'kibana.alert.rule.tags',
+          },
+        },
+      },
+      filters: [
+        {
+          range: {
+            '@timestamp': {
+              gte: 'now-1y/d',
+              lte: 'now',
+            },
+          },
+        },
+      ],
+      pageIndex: 0,
+      pageSize: 25,
+    },
+  });
diff --git a/x-pack/plugins/rule_registry/server/routes/find.ts b/x-pack/plugins/rule_registry/server/routes/find.ts
index 807ed7e22f29e..5075525a9dbd8 100644
--- a/x-pack/plugins/rule_registry/server/routes/find.ts
+++ b/x-pack/plugins/rule_registry/server/routes/find.ts
@@ -11,10 +11,10 @@ import { transformError } from '@kbn/securitysolution-es-utils';
 import { PositiveInteger } from '@kbn/securitysolution-io-ts-types';
 import { SortOptions } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 
+import { bucketAggsSchemas, metricsAggsSchemas } from '../../common/types';
 import { RacRequestHandlerContext } from '../types';
 import { BASE_RAC_ALERTS_API_PATH } from '../../common/constants';
 import { buildRouteValidation } from './utils/route_validation';
-import { bucketAggsSchemas, metricsAggsSchemas } from '../../common/types';
 
 export const findAlertsByQueryRoute = (router: IRouter<RacRequestHandlerContext>) => {
   router.post(
@@ -32,7 +32,7 @@ export const findAlertsByQueryRoute = (router: IRouter<RacRequestHandlerContext>
               size: t.union([PositiveInteger, t.undefined]),
               sort: t.union([t.array(t.object), t.undefined]),
               track_total_hits: t.union([t.boolean, t.undefined]),
-              _source: t.union([t.array(t.string), t.undefined]),
+              _source: t.union([t.array(t.string), t.boolean, t.undefined]),
             })
           )
         ),
@@ -67,7 +67,7 @@ export const findAlertsByQueryRoute = (router: IRouter<RacRequestHandlerContext>
           size,
           sort: sort as SortOptions[],
           track_total_hits,
-          _source,
+          _source: _source as false | string[],
         });
         if (alerts == null) {
           return response.notFound({
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.test.ts b/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.test.ts
new file mode 100644
index 0000000000000..1ce32adc37e62
--- /dev/null
+++ b/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.test.ts
@@ -0,0 +1,283 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { BASE_RAC_ALERTS_API_PATH } from '../../common/constants';
+import { requestContextMock } from './__mocks__/request_context';
+import { getAlertsGroupAggregationsRequest } from './__mocks__/request_responses';
+import { requestMock, serverMock } from './__mocks__/server';
+import { AlertsClient } from '..';
+import { getAlertsGroupAggregations } from './get_alerts_group_aggregations';
+
+const getMockAggregations = () =>
+  ({
+    took: 17,
+    timed_out: false,
+    _shards: {
+      total: 9,
+      successful: 9,
+      skipped: 5,
+      failed: 0,
+    },
+    hits: {
+      total: {
+        value: 185,
+        relation: 'eq',
+      },
+      max_score: null,
+      hits: [],
+    },
+    aggregations: {
+      groupsCount: {
+        value: 5,
+      },
+      groupByFields: {
+        doc_count_error_upper_bound: 0,
+        sum_other_doc_count: 0,
+        buckets: [
+          {
+            key: 'CPU Usage',
+            doc_count: 179,
+            unitsCount: {
+              value: 179,
+            },
+            description: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+            usersCountAggregation: {
+              value: 0,
+            },
+            hostsCountAggregation: {
+              value: 0,
+            },
+            ruleTags: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+          },
+          {
+            key: 'Synthetics',
+            doc_count: 2,
+            unitsCount: {
+              value: 2,
+            },
+            description: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+            usersCountAggregation: {
+              value: 0,
+            },
+            hostsCountAggregation: {
+              value: 0,
+            },
+            ruleTags: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [
+                {
+                  key: 'SYNTHETICS_DEFAULT_ALERT',
+                  doc_count: 2,
+                },
+              ],
+            },
+          },
+          {
+            key: 'ES|QL',
+            doc_count: 2,
+            unitsCount: {
+              value: 2,
+            },
+            description: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+            usersCountAggregation: {
+              value: 0,
+            },
+            hostsCountAggregation: {
+              value: 0,
+            },
+            ruleTags: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+          },
+          {
+            key: 'ES Query',
+            doc_count: 1,
+            unitsCount: {
+              value: 1,
+            },
+            description: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+            usersCountAggregation: {
+              value: 0,
+            },
+            hostsCountAggregation: {
+              value: 0,
+            },
+            ruleTags: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+          },
+          {
+            key: 'Log',
+            doc_count: 1,
+            unitsCount: {
+              value: 1,
+            },
+            description: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+            usersCountAggregation: {
+              value: 0,
+            },
+            hostsCountAggregation: {
+              value: 0,
+            },
+            ruleTags: {
+              doc_count_error_upper_bound: 0,
+              sum_other_doc_count: 0,
+              buckets: [],
+            },
+          },
+        ],
+      },
+      unitsCount: {
+        value: 185,
+      },
+    },
+  } as unknown as ReturnType<AlertsClient['getGroupAggregations']>);
+
+describe('getAlertsGroupAggregations', () => {
+  let server: ReturnType<typeof serverMock.create>;
+  let { clients, context } = requestContextMock.createTools();
+
+  beforeEach(async () => {
+    server = serverMock.create();
+    ({ clients, context } = requestContextMock.createTools());
+
+    clients.rac.getGroupAggregations.mockResolvedValue(getMockAggregations());
+
+    getAlertsGroupAggregations(server.router);
+  });
+
+  test('returns 200 when the parameters are correct', async () => {
+    const response = await server.inject(getAlertsGroupAggregationsRequest(), context);
+
+    expect(response.status).toEqual(200);
+    expect(response.body).toEqual(getMockAggregations());
+  });
+
+  describe('request validation', () => {
+    test('rejects with missing params', async () => {
+      await expect(
+        server.inject(
+          requestMock.create({
+            method: 'post',
+            path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+            body: {
+              groupByField: 'kibana.alert.rule.name',
+            },
+          }),
+          context
+        )
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Request was rejected with message: 'Invalid value \\"undefined\\" supplied to \\"featureIds\\"'"`
+      );
+    });
+
+    test('rejects with invalid params', async () => {
+      await expect(
+        server.inject(
+          requestMock.create({
+            method: 'post',
+            path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+            body: {
+              featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+              groupByField: 'kibana.alert.rule.name',
+              aggregations: {
+                scriptedAggregation: {
+                  script: '100',
+                },
+              },
+            },
+          }),
+          context
+        )
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Request was rejected with message: 'invalid keys \\"script\\"'"`
+      );
+      await expect(
+        server.inject(
+          requestMock.create({
+            method: 'post',
+            path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+            body: {
+              featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+              groupByField: 'kibana.alert.rule.name',
+              filters: [
+                {
+                  script: {
+                    script: '100',
+                  },
+                },
+              ],
+            },
+          }),
+          context
+        )
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Request was rejected with message: 'invalid keys \\"script\\"'"`
+      );
+    });
+
+    test('rejects unknown query params', async () => {
+      await expect(
+        server.inject(
+          requestMock.create({
+            method: 'post',
+            path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+            body: {
+              featureIds: ['apm', 'infrastructure', 'logs', 'observability', 'slo', 'uptime'],
+              groupByField: 'kibana.alert.rule.name',
+              aggregations: {},
+              runtimeMappings: {},
+            },
+          }),
+          context
+        )
+      ).rejects.toThrowErrorMatchingInlineSnapshot(
+        `"Request was rejected with message: 'invalid keys \\"runtimeMappings,{}\\"'"`
+      );
+    });
+  });
+
+  test('returns error status if rac client find fails', async () => {
+    clients.rac.getGroupAggregations.mockRejectedValue(new Error('Unable to get alerts'));
+    const response = await server.inject(getAlertsGroupAggregationsRequest(), context);
+
+    expect(response.status).toEqual(500);
+    expect(response.body).toEqual({
+      attributes: { success: false },
+      message: 'Unable to get alerts',
+    });
+  });
+});
diff --git a/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.ts b/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.ts
new file mode 100644
index 0000000000000..bd589fcda71a1
--- /dev/null
+++ b/x-pack/plugins/rule_registry/server/routes/get_alerts_group_aggregations.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { IRouter } from '@kbn/core/server';
+import * as t from 'io-ts';
+import { transformError } from '@kbn/securitysolution-es-utils';
+
+import { SortCombinations } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { RacRequestHandlerContext } from '../types';
+import { BASE_RAC_ALERTS_API_PATH } from '../../common/constants';
+import { buildRouteValidation } from './utils/route_validation';
+import { alertsAggregationsSchema, alertsGroupFilterSchema } from '../../common/types';
+import { DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE } from '../alert_data_client/constants';
+
+export const getAlertsGroupAggregations = (router: IRouter<RacRequestHandlerContext>) => {
+  router.post(
+    {
+      path: `${BASE_RAC_ALERTS_API_PATH}/_group_aggregations`,
+      validate: {
+        body: buildRouteValidation(
+          t.exact(
+            t.type({
+              featureIds: t.array(t.string),
+              groupByField: t.string,
+              aggregations: t.union([alertsAggregationsSchema, t.undefined]),
+              filters: t.union([t.array(alertsGroupFilterSchema), t.undefined]),
+              sort: t.union([t.array(t.object), t.undefined]),
+              pageIndex: t.union([t.number, t.undefined]),
+              pageSize: t.union([t.number, t.undefined]),
+            })
+          )
+        ),
+      },
+      options: {
+        tags: ['access:rac'],
+      },
+    },
+    async (context, request, response) => {
+      const {
+        featureIds,
+        groupByField,
+        aggregations,
+        filters,
+        sort,
+        pageIndex = 0,
+        pageSize = DEFAULT_ALERTS_GROUP_BY_FIELD_SIZE,
+      } = request.body;
+      try {
+        const racContext = await context.rac;
+        const alertsClient = await racContext.getAlertsClient();
+        const alerts = await alertsClient.getGroupAggregations({
+          featureIds,
+          groupByField,
+          aggregations,
+          filters,
+          sort: sort as SortCombinations[],
+          pageIndex,
+          pageSize,
+        });
+        return response.ok({
+          body: alerts,
+        });
+      } catch (exc) {
+        const err = transformError(exc);
+        const contentType = {
+          'content-type': 'application/json',
+        };
+        const defaultedHeaders = {
+          ...contentType,
+        };
+
+        return response.customError({
+          headers: defaultedHeaders,
+          statusCode: err.statusCode,
+          body: {
+            message: err.message,
+            attributes: {
+              success: false,
+            },
+          },
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/plugins/rule_registry/server/routes/index.ts b/x-pack/plugins/rule_registry/server/routes/index.ts
index 27a8d359d5338..ae9f113ee0ac1 100644
--- a/x-pack/plugins/rule_registry/server/routes/index.ts
+++ b/x-pack/plugins/rule_registry/server/routes/index.ts
@@ -6,6 +6,7 @@
  */
 
 import { IRouter } from '@kbn/core/server';
+import { getAlertsGroupAggregations } from './get_alerts_group_aggregations';
 import { RacRequestHandlerContext } from '../types';
 import { getAlertByIdRoute } from './get_alert_by_id';
 import { updateAlertByIdRoute } from './update_alert_by_id';
@@ -23,6 +24,7 @@ export function defineRoutes(router: IRouter<RacRequestHandlerContext>) {
   getAlertsIndexRoute(router);
   bulkUpdateAlertsRoute(router);
   findAlertsByQueryRoute(router);
+  getAlertsGroupAggregations(router);
   getFeatureIdsByRegistrationContexts(router);
   getBrowserFieldsByFeatureId(router);
   getAlertSummaryRoute(router);
diff --git a/x-pack/plugins/screenshotting/server/browsers/chromium/integration_tests/downloads.test.ts b/x-pack/plugins/screenshotting/server/browsers/chromium/integration_tests/downloads.test.ts
index a2c331e039389..d6f215df9bef4 100644
--- a/x-pack/plugins/screenshotting/server/browsers/chromium/integration_tests/downloads.test.ts
+++ b/x-pack/plugins/screenshotting/server/browsers/chromium/integration_tests/downloads.test.ts
@@ -17,13 +17,13 @@ import { install } from '../../install';
 /* eslint-disable no-console */
 
 const mockLogger = loggingSystemMock.create().get();
-mockLogger.warn = jest.fn((message: string | Error) => {
+mockLogger.warn = jest.fn((message: string | (() => string) | Error) => {
   console.warn(message);
 });
-mockLogger.debug = jest.fn((message: string | Error) => {
+mockLogger.debug = jest.fn((message: string | (() => string) | Error) => {
   console.log(message);
 });
-mockLogger.error = jest.fn((message: string | Error) => {
+mockLogger.error = jest.fn((message: string | (() => string) | Error) => {
   console.error(message);
 });
 
diff --git a/x-pack/plugins/search_homepage/public/components/console_link_button.tsx b/x-pack/plugins/search_homepage/public/components/console_link_button.tsx
new file mode 100644
index 0000000000000..79511788b2f95
--- /dev/null
+++ b/x-pack/plugins/search_homepage/public/components/console_link_button.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { useCallback } from 'react';
+import { EuiButtonEmpty } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import type { ConsolePluginStart } from '@kbn/console-plugin/public';
+
+import { useKibana } from '../hooks/use_kibana';
+
+const canOpenConsole = (plugin?: ConsolePluginStart): boolean => {
+  if (!plugin) return false;
+  if (!plugin.isEmbeddedConsoleAvailable || !plugin.openEmbeddedConsole) return false;
+  return plugin.isEmbeddedConsoleAvailable();
+};
+
+export const ConsoleLinkButton = () => {
+  const {
+    services: { console: consolePlugin },
+  } = useKibana();
+  const openConsole = useCallback(() => {
+    if (!canOpenConsole(consolePlugin)) return;
+
+    consolePlugin!.openEmbeddedConsole!();
+  }, [consolePlugin]);
+  if (consolePlugin === undefined || consolePlugin.openEmbeddedConsole === undefined) return null;
+
+  return (
+    <EuiButtonEmpty
+      iconType="console"
+      color="primary"
+      onClick={openConsole}
+      data-test-subj="searchHomepageEmbeddedConsoleButton"
+      data-telemetry-id="searchHomepageEmbeddedConsoleButton"
+    >
+      <FormattedMessage
+        id="xpack.searchHomepage.consoleLink.buttonText"
+        defaultMessage="Quickly get started in Console"
+      />
+    </EuiButtonEmpty>
+  );
+};
diff --git a/x-pack/plugins/search_homepage/public/components/endpoints_header_action.tsx b/x-pack/plugins/search_homepage/public/components/endpoints_header_action.tsx
new file mode 100644
index 0000000000000..0cc3ae6dea48f
--- /dev/null
+++ b/x-pack/plugins/search_homepage/public/components/endpoints_header_action.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlyout, EuiHeaderLinks } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import {
+  KibanaWiredConnectionDetailsProvider,
+  ConnectionDetailsFlyoutContent,
+} from '@kbn/cloud/connection_details';
+
+export const EndpointsHeaderAction = () => {
+  const [open, setOpen] = React.useState(false);
+
+  return (
+    <>
+      <EuiHeaderLinks>
+        <EuiFlexGroup alignItems="center" gutterSize="s">
+          <EuiButtonEmpty
+            iconType="endpoint"
+            size="s"
+            onClick={() => setOpen(true)}
+            data-test-subj="searchHomepageEndpointsHeaderActionEndpointsApiKeysButton"
+            data-telemetry-id="searchHomepageEndpointsHeaderActionEndpointsApiKeysButton"
+          >
+            <FormattedMessage
+              id="xpack.searchHomepage.header.endpointsButtonLabel"
+              defaultMessage="Endpoints & API keys"
+            />
+          </EuiButtonEmpty>
+        </EuiFlexGroup>
+      </EuiHeaderLinks>
+      {open && (
+        <EuiFlyout onClose={() => setOpen(false)} size="s">
+          <KibanaWiredConnectionDetailsProvider>
+            <ConnectionDetailsFlyoutContent />
+          </KibanaWiredConnectionDetailsProvider>
+        </EuiFlyout>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/search_homepage/public/components/search_homepage.tsx b/x-pack/plugins/search_homepage/public/components/search_homepage.tsx
index 7af02cbcf3275..76f34caad0a5d 100644
--- a/x-pack/plugins/search_homepage/public/components/search_homepage.tsx
+++ b/x-pack/plugins/search_homepage/public/components/search_homepage.tsx
@@ -24,7 +24,7 @@ export const SearchHomepagePage = () => {
 
   return (
     <EuiPageTemplate offset={0} restrictWidth={false} data-test-subj="search-homepage" grow={false}>
-      <SearchHomepageHeader />
+      <SearchHomepageHeader showEndpointsAPIKeys />
       <SearchHomepageBody />
       {embeddableConsole}
     </EuiPageTemplate>
diff --git a/x-pack/plugins/search_homepage/public/components/search_homepage_body.tsx b/x-pack/plugins/search_homepage/public/components/search_homepage_body.tsx
index 808393594e7d8..f27da23468711 100644
--- a/x-pack/plugins/search_homepage/public/components/search_homepage_body.tsx
+++ b/x-pack/plugins/search_homepage/public/components/search_homepage_body.tsx
@@ -6,19 +6,16 @@
  */
 import React from 'react';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+
+import { ConsoleLinkButton } from './console_link_button';
 
 export const SearchHomepageBody = () => (
-  <KibanaPageTemplate.Section
-    alignment="top"
-    restrictWidth={false}
-    grow
-    css={{
-      position: 'relative',
-    }}
-    contentProps={{ css: { display: 'flex', flexGrow: 1, position: 'absolute', inset: 0 } }}
-    paddingSize="none"
-    className="eui-fullHeight"
-  >
-    <div />
+  <KibanaPageTemplate.Section alignment="top" restrictWidth={false} grow>
+    <EuiFlexGroup justifyContent="spaceBetween">
+      <EuiFlexItem grow={false}>
+        <ConsoleLinkButton />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   </KibanaPageTemplate.Section>
 );
diff --git a/x-pack/plugins/search_homepage/public/components/search_homepage_header.tsx b/x-pack/plugins/search_homepage/public/components/search_homepage_header.tsx
index 941655d67cdab..3ea294bb1138c 100644
--- a/x-pack/plugins/search_homepage/public/components/search_homepage_header.tsx
+++ b/x-pack/plugins/search_homepage/public/components/search_homepage_header.tsx
@@ -8,7 +8,13 @@ import React from 'react';
 import { EuiPageTemplate, EuiTitle } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-export const SearchHomepageHeader = () => (
+import { EndpointsHeaderAction } from './endpoints_header_action';
+
+export interface SearchHomepageHeaderProps {
+  showEndpointsAPIKeys: boolean;
+}
+
+export const SearchHomepageHeader = ({ showEndpointsAPIKeys }: SearchHomepageHeaderProps) => (
   <EuiPageTemplate.Header
     pageTitle={
       <EuiTitle data-test-subj="search-homepage-header-title">
@@ -21,6 +27,6 @@ export const SearchHomepageHeader = () => (
       </EuiTitle>
     }
     data-test-subj="search-homepage-header"
-    rightSideItems={[]}
+    rightSideItems={[...(showEndpointsAPIKeys ? [<EndpointsHeaderAction />] : [])]}
   />
 );
diff --git a/x-pack/plugins/search_homepage/public/components/stack_app.tsx b/x-pack/plugins/search_homepage/public/components/stack_app.tsx
index ca18ac7112c09..f570d81e97c3a 100644
--- a/x-pack/plugins/search_homepage/public/components/stack_app.tsx
+++ b/x-pack/plugins/search_homepage/public/components/stack_app.tsx
@@ -12,7 +12,7 @@ import { SearchHomepageHeader } from './search_homepage_header';
 export const App: React.FC = () => {
   return (
     <>
-      <SearchHomepageHeader />
+      <SearchHomepageHeader showEndpointsAPIKeys={false} />
       <SearchHomepageBody />
     </>
   );
diff --git a/x-pack/plugins/search_homepage/tsconfig.json b/x-pack/plugins/search_homepage/tsconfig.json
index 9f084b32f7d3b..91de974fd2914 100644
--- a/x-pack/plugins/search_homepage/tsconfig.json
+++ b/x-pack/plugins/search_homepage/tsconfig.json
@@ -23,6 +23,7 @@
     "@kbn/share-plugin",
     "@kbn/usage-collection-plugin",
     "@kbn/config-schema",
+    "@kbn/cloud",
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/search_inference_endpoints/common/translations.ts b/x-pack/plugins/search_inference_endpoints/common/translations.ts
index e58829812829b..8171b8bba0254 100644
--- a/x-pack/plugins/search_inference_endpoints/common/translations.ts
+++ b/x-pack/plugins/search_inference_endpoints/common/translations.ts
@@ -14,6 +14,10 @@ export const INFERENCE_ENDPOINT_LABEL = i18n.translate(
   }
 );
 
+export const CANCEL = i18n.translate('xpack.searchInferenceEndpoints.cancel', {
+  defaultMessage: 'Cancel',
+});
+
 export const MANAGE_INFERENCE_ENDPOINTS_LABEL = i18n.translate(
   'xpack.searchInferenceEndpoints.allInferenceEndpoints.description',
   {
@@ -94,3 +98,63 @@ export const FORBIDDEN_TO_ACCESS_TRAINED_MODELS = i18n.translate(
     defaultMessage: 'Forbidden to access trained models',
   }
 );
+
+export const COPY_ID_ACTION_LABEL = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.copyID',
+  {
+    defaultMessage: 'Copy endpoint ID',
+  }
+);
+
+export const COPY_ID_ACTION_SUCCESS = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.copyIDSuccess',
+  {
+    defaultMessage: 'Inference endpoint ID copied!',
+  }
+);
+
+export const ENDPOINT_ADDED_SUCCESS = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.endpointAddedSuccess',
+  {
+    defaultMessage: 'Endpoint added',
+  }
+);
+
+export const ENDPOINT_CREATION_FAILED = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.endpointAddedFailure',
+  {
+    defaultMessage: 'Endpoint creation failed',
+  }
+);
+
+export const ENDPOINT_ADDED_SUCCESS_DESCRIPTION = (endpointId: string) =>
+  i18n.translate('xpack.searchInferenceEndpoints.actions.endpointAddedSuccessDescription', {
+    defaultMessage: 'The inference endpoint "{endpointId}" was added.',
+    values: { endpointId },
+  });
+
+export const DELETE_ACTION_LABEL = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.deleteSingleEndpoint',
+  {
+    defaultMessage: 'Delete endpoint',
+  }
+);
+
+export const ENDPOINT = i18n.translate('xpack.searchInferenceEndpoints.endpoint', {
+  defaultMessage: 'Endpoint',
+});
+
+export const SERVICE_PROVIDER = i18n.translate('xpack.searchInferenceEndpoints.serviceProvider', {
+  defaultMessage: 'Service',
+});
+
+export const TASK_TYPE = i18n.translate('xpack.searchInferenceEndpoints.taskType', {
+  defaultMessage: 'Type',
+});
+
+export const TRAINED_MODELS_STAT_GATHER_FAILED = i18n.translate(
+  'xpack.searchInferenceEndpoints.actions.trainedModelsStatGatherFailed',
+  {
+    defaultMessage: 'Failed to retrieve trained model statistics',
+  }
+);
diff --git a/x-pack/plugins/search_inference_endpoints/common/types.ts b/x-pack/plugins/search_inference_endpoints/common/types.ts
index ef29d987309f8..e6529de4e3a64 100644
--- a/x-pack/plugins/search_inference_endpoints/common/types.ts
+++ b/x-pack/plugins/search_inference_endpoints/common/types.ts
@@ -7,6 +7,7 @@
 
 export enum APIRoutes {
   GET_INFERENCE_ENDPOINTS = '/internal/inference_endpoints/endpoints',
+  DELETE_INFERENCE_ENDPOINT = '/internal/inference_endpoint/endpoints/{type}/{id}',
 }
 
 export interface SearchInferenceEndpointsConfigType {
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_ai_studio.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_ai_studio.svg
new file mode 100644
index 0000000000000..405e182a10394
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_ai_studio.svg
@@ -0,0 +1,44 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.7797 2.01892C21.612 2.01892 22.3496 2.64311 22.6144 3.55102C22.8793 4.45893 24.4302 10.0766 24.4302 10.0766V21.2364H18.8125L18.9261 2H20.7797V2.01892Z" fill="url(#paint0_linear_3625_43445)"/>
+<path d="M29.0265 10.737C29.0265 10.3397 28.705 10.0371 28.3267 10.0371H25.0166C22.69 10.0371 20.7986 11.9286 20.7986 14.2551V21.2536H24.8084C27.1351 21.2536 29.0265 19.3621 29.0265 17.0356V10.737Z" fill="url(#paint1_linear_3625_43445)"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M20.7798 2.01758C20.1367 2.01758 19.626 2.52828 19.626 3.17139L19.5126 24.4128C19.5126 27.5148 16.9969 30.0305 13.8949 30.0305H3.69968C3.2079 30.0305 2.88634 29.5576 3.03766 29.1037L11.2089 5.78164C12.0033 3.53077 14.1217 2.01758 16.505 2.01758H20.7987H20.7798Z" fill="url(#paint2_linear_3625_43445)"/>
+<defs>
+<linearGradient id="paint0_linear_3625_43445" x1="23.1251" y1="21.6525" x2="18.3964" y2="2.71876" gradientUnits="userSpaceOnUse">
+<stop stop-color="#712575"/>
+<stop offset="0.09" stop-color="#9A2884"/>
+<stop offset="0.18" stop-color="#BF2C92"/>
+<stop offset="0.27" stop-color="#DA2E9C"/>
+<stop offset="0.34" stop-color="#EB30A2"/>
+<stop offset="0.4" stop-color="#F131A5"/>
+<stop offset="0.5" stop-color="#EC30A3"/>
+<stop offset="0.61" stop-color="#DF2F9E"/>
+<stop offset="0.72" stop-color="#C92D96"/>
+<stop offset="0.83" stop-color="#AA2A8A"/>
+<stop offset="0.95" stop-color="#83267C"/>
+<stop offset="1" stop-color="#712575"/>
+</linearGradient>
+<linearGradient id="paint1_linear_3625_43445" x1="24.922" y1="2.41679" x2="24.922" y2="29.1246" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.08" stop-color="#B17BD5"/>
+<stop offset="0.19" stop-color="#8778DB"/>
+<stop offset="0.3" stop-color="#6276E1"/>
+<stop offset="0.41" stop-color="#4574E5"/>
+<stop offset="0.54" stop-color="#2E72E8"/>
+<stop offset="0.67" stop-color="#1D71EB"/>
+<stop offset="0.81" stop-color="#1471EC"/>
+<stop offset="1" stop-color="#1171ED"/>
+</linearGradient>
+<linearGradient id="paint2_linear_3625_43445" x1="23.3144" y1="3.02245" x2="5.61009" y2="31.4137" gradientUnits="userSpaceOnUse">
+<stop stop-color="#DA7ED0"/>
+<stop offset="0.05" stop-color="#B77BD4"/>
+<stop offset="0.11" stop-color="#9079DA"/>
+<stop offset="0.18" stop-color="#6E77DF"/>
+<stop offset="0.25" stop-color="#5175E3"/>
+<stop offset="0.33" stop-color="#3973E7"/>
+<stop offset="0.42" stop-color="#2772E9"/>
+<stop offset="0.54" stop-color="#1A71EB"/>
+<stop offset="0.68" stop-color="#1371EC"/>
+<stop offset="1" stop-color="#1171ED"/>
+</linearGradient>
+</defs>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_open_ai.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_open_ai.svg
new file mode 100644
index 0000000000000..122c0c65af13c
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/azure_open_ai.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M2 6.2V25.8C2 28.1193 3.88067 30 6.2 30H25.8C28.1193 30 30 28.1193 30 25.8V6.2C30 3.88067 28.1193 2 25.8 2H6.2C3.88067 2 2 3.88067 2 6.2ZM18.8 2V7.6C18.8 13.7849 23.8151 18.8 30 18.8H24.4C18.2151 18.8 13.2016 23.812 13.2 29.9969V24.4C13.2 18.2151 8.18489 13.2 2 13.2H7.6C13.7849 13.2 18.8 8.18489 18.8 2Z" fill="url(#paint0_radial_3625_43439)"/>
+<defs>
+<radialGradient id="paint0_radial_3625_43439" cx="0" cy="0" r="1" gradientUnits="userSpaceOnUse" gradientTransform="translate(14.7834 15.2861) rotate(45) scale(17.5637 23.9043)">
+<stop stop-color="#83B9F9"/>
+<stop offset="1" stop-color="#0078D4"/>
+</radialGradient>
+</defs>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/cohere.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/cohere.svg
new file mode 100644
index 0000000000000..69953809fec35
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/cohere.svg
@@ -0,0 +1,9 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame 1502">
+<g id="Group">
+<path id="Vector" fill-rule="evenodd" clip-rule="evenodd" d="M4.69017 8.30813C5.05012 8.30813 5.76614 8.2878 6.75587 7.86999C7.9092 7.383 10.2038 6.49902 11.8591 5.59107C13.0168 4.95601 13.5242 4.11609 13.5242 2.98501C13.5243 1.41518 12.2833 0.142578 10.7525 0.142578H4.3387C2.13989 0.142578 0.357422 1.97049 0.357422 4.22534C0.357422 6.48016 2.02634 8.30813 4.69017 8.30813Z" fill="#343741"/>
+<path id="Vector_2" fill-rule="evenodd" clip-rule="evenodd" d="M5.77539 11.1217C5.77539 10.0164 6.42425 9.01987 7.41974 8.59618L9.43959 7.73656C11.4826 6.86702 13.7314 8.40671 13.7314 10.6752C13.7314 12.4326 12.3419 13.8572 10.6281 13.8568L8.44111 13.8561C6.96877 13.8558 5.77539 12.6317 5.77539 11.1217Z" fill="#343741"/>
+<path id="Vector_3" d="M2.65251 8.8457C1.38499 8.8457 0.357422 9.89945 0.357422 11.1993V11.5041C0.357422 12.8039 1.38495 13.8577 2.65247 13.8577C3.91999 13.8577 4.94757 12.8039 4.94757 11.5041V11.1993C4.94757 9.89945 3.92003 8.8457 2.65251 8.8457Z" fill="#343741"/>
+</g>
+</g>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/elastic.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/elastic.svg
new file mode 100644
index 0000000000000..e763c2e2f2ab6
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/elastic.svg
@@ -0,0 +1,16 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Elastic Logo" clip-path="url(#clip0_3517_16106)">
+<path id="Outline" fill-rule="evenodd" clip-rule="evenodd" d="M13.3683 5.76929C13.6877 6.22686 13.8583 6.77172 13.8569 7.32972C13.8541 7.88997 13.6804 8.43603 13.3589 8.89486C13.038 9.35285 12.5845 9.7015 12.0595 9.89386C12.2124 10.3141 12.2253 10.7725 12.0961 11.2006C11.9669 11.6287 11.7027 12.0035 11.3429 12.269C10.9833 12.5333 10.5474 12.6731 10.1011 12.6674C9.65492 12.6617 9.22272 12.5107 8.87003 12.2373C8.39436 12.9043 7.71899 13.4029 6.94145 13.661C6.16465 13.9188 5.32592 13.9222 4.54703 13.6709C3.76743 13.4189 3.08814 12.9255 2.60731 12.2621C2.12537 11.5976 1.86627 10.7975 1.86717 9.97657C1.86706 9.72855 1.89001 9.48106 1.93574 9.23729C1.40909 9.04854 0.954014 8.70098 0.633311 8.24258C0.311933 7.78314 0.140528 7.23554 0.142597 6.67486C0.145501 6.11457 0.319395 5.56851 0.641026 5.10972C0.962305 4.6517 1.41627 4.30319 1.94174 4.11115C1.78662 3.69074 1.77202 3.23136 1.90014 2.80195C2.02826 2.37254 2.29219 1.99626 2.65231 1.72958C3.01211 1.46404 3.44878 1.32328 3.89592 1.32869C4.34306 1.33411 4.77619 1.4854 5.12945 1.75958C5.64444 1.04047 6.39005 0.519302 7.24231 0.282718C8.09391 0.0467746 9.00068 0.110161 9.81117 0.46229C10.6227 0.815129 11.2891 1.43484 11.6999 2.21858C12.1115 3.00344 12.2435 3.9051 12.074 4.775C12.5977 4.96493 13.0498 5.31224 13.3683 5.76929ZM5.53403 6.05129L8.53488 7.42743L11.5632 4.76472C11.607 4.54501 11.6289 4.32148 11.6283 4.09743C11.6286 3.37229 11.3974 2.666 10.9683 2.08143C10.5403 1.49792 9.93643 1.06698 9.24546 0.851861C8.55514 0.637319 7.81416 0.650239 7.13174 0.888718C6.44837 1.12763 5.85956 1.5793 5.45174 2.17743L4.9486 4.79943L5.53445 6.05086L5.53403 6.05129ZM2.42817 9.24029C2.33332 9.70704 2.33721 10.1885 2.43958 10.6536C2.54196 11.1188 2.74055 11.5574 3.0226 11.9411C3.453 12.5265 4.05991 12.9582 4.75402 13.1729C5.44731 13.387 6.19109 13.3724 6.87545 13.1313C7.56085 12.8897 8.15062 12.4345 8.55803 11.8327L9.05774 9.21758L8.39131 7.93829L5.37845 6.56215L2.42774 9.23986L2.42817 9.24029ZM4.46602 4.51572L2.40888 4.02843L2.40974 4.02758C2.29072 3.69713 2.28112 3.33716 2.38237 3.00084C2.48362 2.66452 2.69035 2.36968 2.97202 2.15986C3.25372 1.9511 3.59548 1.83922 3.94609 1.841C4.29671 1.84278 4.63732 1.95811 4.91688 2.16972L4.46602 4.51572ZM2.2306 4.52C1.78544 4.66747 1.3969 4.94924 1.11845 5.32658C0.839302 5.70454 0.683648 6.15948 0.672756 6.62923C0.661864 7.09898 0.796264 7.56065 1.0576 7.95115C1.3186 8.34115 1.6936 8.64115 2.13117 8.80829L5.01674 6.19358L4.48745 5.05786L2.2306 4.52ZM10.0675 12.1691C9.71278 12.1685 9.36834 12.0502 9.08817 11.8327L9.5326 9.49529L11.5897 9.97743C11.6796 10.2236 11.7089 10.4877 11.6753 10.7476C11.6417 11.0075 11.546 11.2554 11.3965 11.4706C11.2477 11.6855 11.0491 11.8613 10.8177 11.983C10.5863 12.1046 10.3289 12.1685 10.0675 12.1691ZM9.50603 8.95529L11.7689 9.48586C12.2209 9.33292 12.6138 9.04253 12.8926 8.65529C13.172 8.26743 13.3238 7.80218 13.3267 7.32415C13.3266 6.86346 13.1868 6.41366 12.9256 6.03415C12.6649 5.65512 12.2949 5.36451 11.8649 5.201L8.90602 7.80243L9.50603 8.95529Z" fill="white"/>
+<path id="Vector" d="M5.53465 6.05061L8.53551 7.42676L11.5638 4.76404C11.6077 4.54434 11.6295 4.3208 11.6289 4.09676C11.6292 3.37162 11.398 2.66532 10.9689 2.08076C10.5409 1.49724 9.93705 1.0663 9.24608 0.851186C8.55576 0.636644 7.81478 0.649564 7.13236 0.888043C6.44899 1.12696 5.86018 1.57862 5.45236 2.17676L4.94922 4.79876L5.53508 6.05019L5.53465 6.05061Z" fill="#FEC514"/>
+<path id="Vector_2" d="M2.42774 9.24064C2.33289 9.70739 2.33678 10.1888 2.43915 10.654C2.54153 11.1191 2.74012 11.5577 3.02217 11.9415C3.45257 12.5268 4.05948 12.9586 4.75359 13.1732C5.44688 13.3873 6.19066 13.3728 6.87502 13.1316C7.56042 12.89 8.15019 12.4349 8.55759 11.8331L9.05731 9.21793L8.39088 7.93864L5.37802 6.5625L2.42731 9.24021L2.42774 9.24064Z" fill="#00BFB3"/>
+<path id="Vector_3" d="M2.40851 4.02925L4.46565 4.51654L4.91651 2.17054C4.63695 1.95893 4.29634 1.84359 3.94572 1.84182C3.59511 1.84004 3.25335 1.95191 2.97165 2.16068C2.68998 2.3705 2.48325 2.66534 2.382 3.00166C2.28075 3.33798 2.29034 3.69795 2.40937 4.02839" fill="#F04E98"/>
+<path id="Vector_4" d="M2.23033 4.51953C1.78517 4.66699 1.39664 4.94877 1.11819 5.3261C0.839035 5.70407 0.683381 6.15901 0.672488 6.62876C0.661596 7.09851 0.795996 7.56017 1.05733 7.95067C1.31833 8.34067 1.69333 8.64067 2.1309 8.80782L5.01647 6.1931L4.48719 5.05739L2.23033 4.51953Z" fill="#1BA9F5"/>
+<path id="Vector_5" d="M9.08789 11.8335C9.36806 12.051 9.7125 12.1693 10.0672 12.17C10.3286 12.1693 10.586 12.1054 10.8174 11.9838C11.0488 11.8621 11.2474 11.6863 11.3962 11.4714C11.5457 11.2562 11.6414 11.0083 11.675 10.7484C11.7087 10.4885 11.6793 10.2244 11.5895 9.97824L9.53232 9.49609L9.08789 11.8335Z" fill="#93C90E"/>
+<path id="Vector_6" d="M9.50625 8.95546L11.7691 9.48603C12.2211 9.33309 12.614 9.04269 12.8928 8.65546C13.1723 8.2676 13.324 7.80235 13.327 7.32431C13.3269 6.86363 13.187 6.41382 12.9258 6.03431C12.6651 5.65529 12.2951 5.36468 11.8651 5.20117L8.90625 7.8026L9.50625 8.95546Z" fill="#0077CC"/>
+</g>
+<defs>
+<clipPath id="clip0_3517_16106">
+<rect width="13.7143" height="13.7143" fill="white" transform="translate(0.142578 0.142578)"/>
+</clipPath>
+</defs>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/google_ai_studio.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/google_ai_studio.svg
new file mode 100644
index 0000000000000..b6e34ae15c9e4
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/google_ai_studio.svg
@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M20.3054 10.1595H21.2814L24.063 7.35127L24.1996 6.15898C22.6062 4.73904 20.6804 3.75265 18.6044 3.293C16.5283 2.83335 14.3704 2.91561 12.3346 3.53202C10.2988 4.14842 8.45224 5.27861 6.96936 6.81583C5.48648 8.35306 4.41624 10.2466 3.85974 12.3175C4.16962 12.1892 4.5129 12.1684 4.83574 12.2584L10.399 11.3321C10.399 11.3321 10.682 10.8591 10.8284 10.8887C12.0204 9.56701 13.6678 8.7553 15.4332 8.61975C17.1986 8.48419 18.9486 9.03505 20.3249 10.1595H20.3054Z" fill="#EA4335"/>
+<path d="M28.0256 12.3166C27.3863 9.93956 26.0735 7.80262 24.2485 6.16797L20.3445 10.1094C21.1581 10.7806 21.8102 11.6296 22.2514 12.5922C22.6927 13.5549 22.9117 14.6062 22.8919 15.6668V16.3664C23.3481 16.3664 23.8 16.4572 24.2215 16.6334C24.6431 16.8097 25.0261 17.0681 25.3487 17.3939C25.6714 17.7196 25.9273 18.1063 26.1019 18.5319C26.2766 18.9575 26.3664 19.4136 26.3664 19.8743C26.3664 20.335 26.2766 20.7911 26.1019 21.2167C25.9273 21.6423 25.6714 22.029 25.3487 22.3547C25.0261 22.6805 24.6431 22.9389 24.2215 23.1152C23.8 23.2914 23.3481 23.3822 22.8919 23.3822H15.9427L15.2498 24.0916V28.2991L15.9427 28.9987H22.8919C24.8324 29.014 26.7262 28.3982 28.2933 27.2426C29.8603 26.0869 31.0173 24.4528 31.593 22.5818C32.1688 20.7108 32.1328 18.7025 31.4903 16.8538C30.8479 15.0051 29.6331 13.4142 28.0256 12.3166Z" fill="#4285F4"/>
+<path d="M8.98381 28.9612H15.9329V23.3446H8.98381C8.48871 23.3445 7.99942 23.237 7.54908 23.0293L6.57308 23.3348L3.77195 26.143L3.52795 27.1284C5.09876 28.3259 7.01548 28.9698 8.98381 28.9612Z" fill="#34A853"/>
+<path d="M8.9838 10.7403C7.10091 10.7516 5.26856 11.3564 3.74266 12.4702C2.21676 13.5839 1.07351 15.151 0.472601 16.9526C-0.128309 18.7542 -0.156875 20.7002 0.390891 22.519C0.938658 24.3377 2.0354 25.9383 3.52794 27.0972L7.55883 23.0277C7.04659 22.7941 6.59814 22.4384 6.25197 21.9913C5.90579 21.5443 5.67222 21.019 5.5713 20.4608C5.47038 19.9025 5.50511 19.3279 5.67253 18.7861C5.83995 18.2444 6.13505 17.7518 6.53251 17.3505C6.92997 16.9492 7.41793 16.6513 7.95451 16.4823C8.4911 16.3133 9.06029 16.2782 9.61325 16.3801C10.1662 16.482 10.6864 16.7178 11.1293 17.0673C11.5721 17.4168 11.9244 17.8695 12.1558 18.3867L16.1867 14.3171C15.3406 13.2005 14.2502 12.2966 13.0007 11.6761C11.7511 11.0556 10.3763 10.7353 8.9838 10.7403Z" fill="#FBBC05"/>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/hugging_face.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/hugging_face.svg
new file mode 100644
index 0000000000000..87ac70c5a18f4
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/hugging_face.svg
@@ -0,0 +1,10 @@
+<svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Group 9">
+<path id="Vector" d="M13.8099 9.93159C13.7741 9.79662 13.7162 9.66857 13.6385 9.55257C13.6551 9.49151 13.6678 9.42945 13.6763 9.36672C13.7315 8.96879 13.5935 8.60449 13.3335 8.32262C13.1927 8.16867 13.0418 8.06699 12.8819 8.00459C12.9868 7.55559 13.0399 7.09606 13.0402 6.635C13.0402 6.42438 13.0282 6.21809 13.0083 6.01487C12.9979 5.91338 12.9853 5.81217 12.9705 5.71122C12.9248 5.41337 12.8568 5.11932 12.7673 4.83159C12.7087 4.64253 12.6408 4.45643 12.564 4.27398C12.4489 4.00378 12.3144 3.7422 12.1617 3.4913C12.0616 3.32436 11.9525 3.16294 11.835 3.00774C11.7774 2.92936 11.7174 2.85284 11.6549 2.77827C11.4699 2.55347 11.2689 2.34236 11.0534 2.14661C10.9818 2.0808 10.9083 2.01725 10.8327 1.95604C10.7583 1.894 10.6823 1.83396 10.6047 1.77598C10.4485 1.65976 10.2872 1.55073 10.1211 1.44923C9.20347 0.89189 8.12733 0.572266 6.97715 0.572266C3.62829 0.572266 0.914148 3.28654 0.914148 6.6352C0.914015 7.10212 0.968085 7.56744 1.07529 8.02184C0.931461 8.0843 0.793623 8.18165 0.665774 8.32249C0.405879 8.60422 0.267842 8.96719 0.323043 9.36513C0.331434 9.42832 0.344019 9.49091 0.360799 9.55244C0.283164 9.6685 0.225272 9.79662 0.189467 9.93159C0.109561 10.2353 0.135863 10.5092 0.237411 10.7492C0.127007 11.0628 0.154575 11.3968 0.298339 11.6872C0.402883 11.8993 0.552507 12.0634 0.736957 12.21C0.956232 12.3843 1.23071 12.5324 1.56179 12.6745C1.95679 12.843 2.43896 13.0013 2.65823 13.0593C3.22463 13.2059 3.76773 13.2989 4.31815 13.3034C5.10236 13.3107 5.7777 13.1263 6.26119 12.6544C6.49872 12.6835 6.73783 12.6981 6.97715 12.6979C7.22999 12.6974 7.48256 12.6815 7.73346 12.6503C8.21583 13.1252 8.89377 13.3113 9.68084 13.3038C10.2312 13.2994 10.7743 13.2065 11.3392 13.0596C11.56 13.0016 12.0419 12.8433 12.4371 12.6748C12.7682 12.5325 13.0427 12.3844 13.2634 12.2104C13.4465 12.0637 13.596 11.8997 13.7006 11.6876C13.8458 11.3971 13.8719 11.0631 13.763 10.7495C13.8636 10.5095 13.8898 10.235 13.8099 9.93159ZM13.2479 10.7289C13.3592 10.94 13.3663 11.1786 13.2682 11.4008C13.1193 11.7375 12.7494 12.0028 12.0311 12.2876C11.5845 12.4647 11.1755 12.578 11.1719 12.579C10.5811 12.7322 10.0468 12.8101 9.58429 12.8101C8.81839 12.8101 8.24846 12.5987 7.88702 12.1813C7.2758 12.2855 6.65174 12.289 6.03939 12.1919C5.67748 12.6023 5.11081 12.8101 4.35137 12.8101C3.88878 12.8101 3.35455 12.7322 2.76371 12.579C2.76011 12.578 2.35126 12.4647 1.90445 12.2876C1.18623 12.0028 0.816264 11.7377 0.667439 11.4008C0.569287 11.1786 0.576412 10.94 0.687681 10.7289C0.697936 10.7092 0.70899 10.6901 0.720776 10.6716C0.654094 10.5714 0.609367 10.4583 0.58953 10.3396C0.5697 10.2209 0.575213 10.0994 0.605711 9.983C0.649926 9.815 0.741218 9.67529 0.865206 9.57495C0.805476 9.47679 0.766289 9.36759 0.750008 9.25386C0.714317 9.00655 0.79642 8.75964 0.98107 8.55827C1.1249 8.40159 1.32819 8.31536 1.55326 8.31536H1.55926C1.38956 7.7714 1.30352 7.2048 1.30409 6.635C1.30409 3.52726 3.82353 1.00762 6.93174 1.00762C10.0399 1.00762 12.5593 3.52699 12.5593 6.635C12.5598 7.20633 12.4732 7.7744 12.3024 8.31962C12.3295 8.31696 12.3562 8.31563 12.3823 8.31556C12.6074 8.31556 12.8108 8.40179 12.9545 8.55847C13.1391 8.75964 13.2213 9.00675 13.1855 9.25406C13.1693 9.36779 13.1301 9.47699 13.0704 9.57515C13.1944 9.67549 13.2857 9.8152 13.3299 9.9832C13.3604 10.0996 13.3659 10.2211 13.3461 10.3398C13.3263 10.4585 13.2815 10.5716 13.2148 10.6718C13.2266 10.6901 13.2378 10.7092 13.2479 10.7289Z" fill="white"/>
+<path id="Vector_2" d="M13.2152 10.6718C13.282 10.5717 13.3267 10.4586 13.3465 10.3399C13.3663 10.2212 13.3608 10.0996 13.3303 9.98325C13.2861 9.81525 13.1947 9.67555 13.0708 9.5752C13.1305 9.47705 13.1697 9.36784 13.1859 9.25411C13.2217 9.0068 13.1396 8.75989 12.9549 8.55853C12.8112 8.40184 12.6078 8.31561 12.3827 8.31561C12.3566 8.31561 12.3299 8.31701 12.3028 8.31967C12.4734 7.77445 12.5599 7.20645 12.5593 6.63519C12.5593 3.52738 10.0398 1.00781 6.93196 1.00781C3.82402 1.00781 1.3043 3.52712 1.3043 6.63519C1.30375 7.20499 1.38978 7.77158 1.55948 8.31555H1.55348C1.32841 8.31555 1.12512 8.40171 0.981358 8.55839C0.796709 8.75956 0.714532 9.00673 0.75029 9.25397C0.766584 9.36771 0.805771 9.47698 0.865488 9.57513C0.7415 9.67541 0.650148 9.81512 0.605933 9.98312C0.575449 10.0996 0.569955 10.2211 0.589812 10.3398C0.609669 10.4585 0.654416 10.5717 0.721124 10.6718C0.709271 10.6904 0.698351 10.7095 0.68803 10.7291C0.576827 10.9403 0.569642 11.1788 0.66786 11.4011C0.816752 11.7378 1.18658 12.0031 1.90487 12.2879C2.35147 12.465 2.76053 12.5783 2.76413 12.5793C3.3549 12.7325 3.88921 12.8103 4.35173 12.8103C5.11123 12.8103 5.6779 12.6026 6.03981 12.1921C6.65216 12.2893 7.27622 12.2857 7.88744 12.1816C8.24888 12.599 8.81881 12.8103 9.58471 12.8103C10.0472 12.8103 10.5815 12.7325 11.1722 12.5793C11.1759 12.5783 11.5848 12.465 12.0316 12.2879C12.7499 12.0031 13.1198 11.7378 13.2686 11.4011C13.3667 11.1788 13.3596 10.9403 13.2483 10.7291C13.2382 10.7093 13.227 10.6902 13.2152 10.6718ZM5.78085 11.5495C5.74968 11.604 5.71632 11.6572 5.68083 11.709C5.58727 11.8459 5.46422 11.9506 5.32139 12.0284C5.04837 12.1773 4.70278 12.2293 4.35173 12.2293C3.79711 12.2293 3.22858 12.0995 2.90996 12.0169C2.89424 12.0128 0.956654 11.4655 1.20197 10.9997C1.24325 10.9213 1.31116 10.89 1.39673 10.89C1.74212 10.89 2.37105 11.4043 2.64133 11.4043C2.70173 11.4043 2.74434 11.3786 2.76172 11.3159C2.87692 10.9028 1.01092 10.7291 1.16807 10.1309C1.19577 10.025 1.27102 9.98199 1.37676 9.98199C1.83342 9.98192 2.85835 10.785 3.0727 10.785C3.08915 10.785 3.10093 10.7802 3.10732 10.7701C3.10825 10.7685 3.10919 10.7671 3.11005 10.7655C3.21067 10.5993 3.15293 10.4785 2.46367 10.0564L2.39749 10.0161C1.63898 9.55702 1.1066 9.28074 1.40938 8.95113C1.44421 8.91311 1.49362 8.89626 1.55361 8.89626C1.62473 8.89626 1.71083 8.92003 1.80565 8.95999C2.20624 9.12892 2.76146 9.58965 2.99339 9.79054C3.02988 9.82224 3.06613 9.85427 3.10212 9.8865C3.10212 9.8865 3.39579 10.1919 3.57331 10.1919C3.6142 10.1919 3.64888 10.1758 3.67239 10.1359C3.79831 9.92365 2.5029 8.94201 2.42985 8.53695C2.38031 8.26254 2.46461 8.12351 2.62042 8.12351C2.69454 8.12351 2.78496 8.15507 2.88478 8.21839C3.19442 8.4149 3.79225 9.44222 4.01112 9.84188C4.0845 9.97579 4.20975 10.0324 4.32262 10.0324C4.54656 10.0324 4.72162 9.80979 4.34313 9.52692C3.77427 9.10129 3.97391 8.40557 4.24539 8.36276C4.25697 8.36089 4.26869 8.35996 4.28034 8.35996C4.52725 8.35996 4.63612 8.78539 4.63612 8.78539C4.63612 8.78539 4.95534 9.58698 5.50371 10.1349C6.00125 10.6323 6.07077 11.0404 5.78085 11.5495ZM7.55403 11.6434L7.5256 11.6468L7.47712 11.6524C7.45161 11.655 7.42605 11.6575 7.40041 11.6599L7.37544 11.6621L7.3526 11.6641L7.32024 11.6667L7.28448 11.6693L7.24879 11.6716L7.24086 11.6721C7.23154 11.6727 7.22222 11.6733 7.21276 11.6737L7.20084 11.6744C7.18979 11.675 7.17874 11.6755 7.16755 11.676L7.12886 11.6777L7.09377 11.6789L7.07033 11.6795H7.05841C7.05109 11.6795 7.04383 11.6799 7.0365 11.68H7.02492C7.01759 11.68 7.01033 11.68 7.00301 11.6803L6.97318 11.6807H6.93156C6.89887 11.6807 6.86624 11.6804 6.83374 11.6797L6.80737 11.6791C6.79985 11.6791 6.79232 11.6788 6.78493 11.6785L6.75697 11.6777L6.72227 11.6764L6.69098 11.675L6.68292 11.6747L6.65315 11.6731C6.64483 11.6727 6.63664 11.6723 6.62838 11.6717L6.60914 11.6705C6.58497 11.669 6.5608 11.6673 6.53662 11.6655L6.51132 11.6634C6.50067 11.6626 6.49001 11.6616 6.47942 11.6607C6.46697 11.6596 6.45452 11.6584 6.44207 11.6572C6.42123 11.6553 6.40038 11.6532 6.37954 11.6509H6.37854C6.68285 10.972 6.52897 10.338 5.91402 9.72356C5.5107 9.32076 5.24241 8.726 5.18675 8.59542C5.07407 8.20887 4.7759 7.77918 4.28068 7.77918C4.23879 7.77918 4.19698 7.78251 4.15563 7.78903C3.93868 7.82319 3.74904 7.94804 3.61373 8.13596C3.4675 7.9541 3.3254 7.80954 3.19689 7.7279C3.00311 7.60505 2.80973 7.54272 2.62136 7.54272C2.38623 7.54272 2.17608 7.63927 2.02959 7.8144L2.02586 7.81886C2.02306 7.80734 2.0204 7.79582 2.01767 7.78424L2.01733 7.78271C1.98945 7.66351 1.96605 7.54332 1.94715 7.42233C1.94715 7.42153 1.94715 7.42073 1.94675 7.41993C1.94528 7.41081 1.94395 7.40162 1.94255 7.3925C1.93846 7.36546 1.93462 7.33836 1.93103 7.31126C1.92944 7.29894 1.92771 7.28662 1.92617 7.2743L1.92165 7.23735C1.92018 7.22503 1.91898 7.21384 1.91765 7.20212L1.91726 7.19919C1.91194 7.15125 1.90728 7.1033 1.90327 7.05523L1.9018 7.03678L1.89947 7.00535C1.89881 6.99676 1.89814 6.98811 1.89767 6.97945C1.89767 6.97739 1.89734 6.97539 1.89727 6.97346C1.89558 6.94935 1.89414 6.92518 1.89295 6.90101C1.89228 6.88842 1.89161 6.87591 1.89108 6.86325L1.88975 6.83023L1.88942 6.82024L1.88835 6.78981L1.88769 6.7639C1.88769 6.75358 1.88715 6.74326 1.88702 6.73294C1.88682 6.72262 1.88655 6.7113 1.88649 6.70038C1.88635 6.68946 1.88649 6.67867 1.88615 6.66782C1.88589 6.6569 1.88615 6.64604 1.88615 6.63519C1.88615 3.84827 4.14556 1.58886 6.93276 1.58886C9.71988 1.58886 11.9792 3.84821 11.9792 6.63519V6.70038C11.9792 6.71123 11.9789 6.72215 11.9787 6.73294C11.9787 6.74193 11.9783 6.75079 11.978 6.75991C11.978 6.7679 11.9777 6.77596 11.9774 6.78368C11.9774 6.79387 11.9768 6.80406 11.9765 6.81424V6.81504L11.9751 6.8504C11.9746 6.86072 11.9742 6.87111 11.9737 6.88143L11.9734 6.88876L11.9716 6.92178C11.9676 6.99257 11.9622 7.06322 11.9555 7.1338V7.13467C11.9544 7.14625 11.9533 7.15784 11.952 7.16943L11.949 7.19679L11.9431 7.25033L11.9397 7.27743L11.9355 7.30933C11.9339 7.32092 11.9324 7.33257 11.9307 7.34409C11.9289 7.35707 11.927 7.36999 11.9251 7.38291L11.9205 7.41347L11.915 7.4481C11.9132 7.45962 11.9112 7.47107 11.909 7.48252C11.9068 7.49404 11.9051 7.5055 11.9031 7.51695C11.8991 7.53986 11.8949 7.56276 11.8905 7.5856C11.8838 7.61976 11.8769 7.65386 11.8699 7.68795L11.8626 7.72171C11.8602 7.73296 11.8576 7.74428 11.855 7.75554C11.713 7.6175 11.5249 7.54232 11.3175 7.54232C11.1292 7.54232 10.9357 7.60458 10.7419 7.72744C10.6134 7.80907 10.4714 7.9537 10.3251 8.13549C10.1896 7.94758 9.99995 7.82273 9.78314 7.78857C9.74179 7.78204 9.69997 7.77871 9.65809 7.77871C9.16274 7.77871 8.86475 8.20841 8.75202 8.59495C8.69608 8.72553 8.42773 9.3203 8.02408 9.72369C7.40953 10.3362 7.25451 10.9674 7.55403 11.6434ZM12.764 10.2844L12.762 10.2904C12.7569 10.3037 12.751 10.3168 12.7445 10.3294C12.7395 10.3388 12.7341 10.3478 12.7282 10.3566C12.7171 10.3732 12.7049 10.389 12.6917 10.404C12.6886 10.4074 12.6857 10.4109 12.6822 10.4143C12.6774 10.4194 12.6725 10.4245 12.6675 10.4294C12.5779 10.5182 12.4413 10.5961 12.2868 10.6676C12.2693 10.6755 12.2515 10.6834 12.2336 10.6914L12.2157 10.6993C12.2038 10.7046 12.1919 10.7098 12.1794 10.7149C12.1675 10.7201 12.1551 10.7253 12.1427 10.7304L12.1055 10.7457C12.0186 10.7814 11.9296 10.8155 11.8428 10.8492L11.8056 10.8636L11.7689 10.878C11.7445 10.8875 11.7204 10.897 11.6967 10.9066L11.6613 10.9208L11.6266 10.935L11.6095 10.9422C11.5981 10.9469 11.587 10.9516 11.5759 10.9564C11.3204 11.066 11.1365 11.1776 11.1752 11.316C11.1762 11.3199 11.1774 11.3236 11.1788 11.3273C11.1822 11.3375 11.187 11.3472 11.1929 11.3563C11.1963 11.3617 11.2003 11.3668 11.2048 11.3715C11.2502 11.4187 11.3329 11.4112 11.4371 11.3737C11.4517 11.3684 11.4663 11.3628 11.4807 11.3569L11.4898 11.3532C11.5136 11.3431 11.5389 11.3317 11.5646 11.3195C11.5711 11.3164 11.5776 11.3135 11.5842 11.3101C11.7116 11.2478 11.856 11.1639 11.9993 11.0875C12.0567 11.0565 12.1148 11.0272 12.1737 10.9993C12.3094 10.9354 12.437 10.8901 12.5395 10.8901C12.5876 10.8901 12.6301 10.9 12.6656 10.9226L12.6715 10.9265C12.6937 10.9422 12.7124 10.9623 12.7263 10.9856C12.729 10.9901 12.7317 10.9948 12.7343 10.9997C12.7849 11.0959 12.7425 11.1955 12.6432 11.2932C12.548 11.387 12.3997 11.479 12.2313 11.5641C12.2187 11.5704 12.2062 11.5767 12.1935 11.5829C11.6921 11.8291 11.0355 12.0146 11.0263 12.0169C10.8514 12.0623 10.6011 12.1218 10.3192 12.1664L10.2775 12.1729L10.2706 12.1739C10.2391 12.1787 10.2074 12.1831 10.1757 12.1873C10.1436 12.1916 10.1111 12.1955 10.0784 12.1992L10.0724 12.1998C9.95387 12.2135 9.83488 12.2226 9.71562 12.2269H9.71389C9.67074 12.2284 9.62766 12.2292 9.58451 12.2292H9.53477C9.46898 12.2283 9.40332 12.2253 9.33773 12.2203C9.3362 12.2203 9.33453 12.2203 9.333 12.2199C9.3095 12.2181 9.28606 12.2159 9.26262 12.2133C9.23831 12.2107 9.21408 12.2078 9.1899 12.2045C9.17399 12.2024 9.15814 12.2 9.14229 12.1974C9.12618 12.1948 9.11007 12.1921 9.09402 12.1893L9.07211 12.1852L9.07045 12.1849C9.04734 12.1805 9.02437 12.1756 9.00146 12.1703C8.98814 12.1673 8.97489 12.1644 8.96177 12.1608L8.95385 12.1588C8.94732 12.1572 8.941 12.1554 8.93454 12.1537L8.93101 12.1528L8.9105 12.1468C8.90304 12.1447 8.89558 12.1424 8.88813 12.1402L8.88553 12.1395L8.86615 12.1336C8.85883 12.1313 8.8515 12.1289 8.84424 12.1265L8.8264 12.1206L8.81328 12.116C8.80063 12.1115 8.78804 12.107 8.77559 12.1022L8.76374 12.0975L8.75395 12.0936C8.73504 12.086 8.71626 12.0781 8.69768 12.0698L8.68536 12.0638L8.6833 12.0629C8.67891 12.0608 8.67458 12.0587 8.67018 12.0569C8.66159 12.0528 8.65307 12.0486 8.64461 12.0442L8.64202 12.043L8.62976 12.0365C8.60799 12.0251 8.58668 12.013 8.56577 12.0001L8.55432 11.9931C8.54859 11.9896 8.54287 11.9859 8.53727 11.9822L8.52236 11.9723L8.50631 11.9613L8.49672 11.9544C8.4866 11.9472 8.47668 11.9398 8.46695 11.9321L8.45144 11.9202C8.44525 11.9152 8.43912 11.9101 8.43306 11.905C8.42793 11.9008 8.42294 11.8964 8.41795 11.892L8.41755 11.8917C8.41215 11.8869 8.40689 11.8822 8.40163 11.8774C8.39644 11.8726 8.39124 11.8678 8.38618 11.863L8.38558 11.8624C8.38026 11.8573 8.37506 11.8522 8.36994 11.8469C8.36481 11.8417 8.35955 11.8365 8.35455 11.8312C8.34956 11.826 8.34443 11.8206 8.3395 11.815C8.33458 11.8096 8.33005 11.8046 8.32539 11.7992L8.32386 11.7974C8.31933 11.7922 8.31487 11.7869 8.31047 11.7815C8.30095 11.7702 8.29169 11.7585 8.28277 11.7466C8.27378 11.7346 8.26499 11.7223 8.2564 11.7099L8.24821 11.6976C8.23729 11.6817 8.22664 11.6655 8.21632 11.6492C8.20859 11.6374 8.20107 11.6255 8.19374 11.6135C8.18901 11.6059 8.18449 11.5984 8.17996 11.5909L8.17809 11.5878C8.17377 11.5805 8.1695 11.5733 8.16538 11.5661C8.16298 11.5621 8.16071 11.5582 8.15858 11.5541C8.15639 11.55 8.15386 11.5458 8.15153 11.5416L8.14773 11.535L8.1454 11.5308C8.14094 11.5228 8.13654 11.5147 8.13228 11.5066C8.13028 11.503 8.12835 11.4994 8.12629 11.4959L8.12036 11.4844L8.11437 11.473C8.09939 11.4431 8.0852 11.4127 8.07189 11.3819L8.06716 11.3707C8.0641 11.3632 8.06123 11.3557 8.05817 11.3483C8.0567 11.3447 8.05524 11.3412 8.05397 11.3376C8.04685 11.3191 8.04019 11.3005 8.03406 11.2817C8.03187 11.275 8.02974 11.2684 8.02774 11.2617C8.02294 11.2466 8.01861 11.2314 8.01475 11.216C8.01003 11.1981 8.00583 11.18 8.0023 11.1619C8.00157 11.1582 8.00084 11.1545 8.00024 11.151C7.99677 11.1332 7.99398 11.1153 7.99178 11.0973C7.99125 11.0938 7.99085 11.0903 7.99045 11.0868L7.98932 11.076C7.98785 11.0618 7.98672 11.0477 7.98605 11.0335C7.98605 11.0299 7.98572 11.0263 7.98559 11.0228C7.98525 11.0158 7.98512 11.0087 7.98505 11.0017C7.98133 10.7171 8.12529 10.4436 8.43313 10.1359C8.98148 9.58805 9.30071 8.78639 9.30071 8.78639C9.30071 8.78639 9.3093 8.75276 9.32714 8.70435C9.32961 8.69763 9.3322 8.6907 9.33513 8.68345C9.34552 8.65634 9.35724 8.62971 9.37023 8.60374L9.37282 8.59875C9.38388 8.57664 9.396 8.55506 9.40905 8.53409C9.41211 8.52923 9.41504 8.52443 9.41844 8.51957C9.42822 8.50512 9.43855 8.49101 9.4494 8.47736C9.45533 8.46996 9.46178 8.46264 9.46824 8.45551C9.47084 8.45272 9.47337 8.44992 9.4761 8.44726C9.50786 8.41443 9.54416 8.38766 9.58524 8.37341L9.59043 8.37168C9.5939 8.37055 9.59736 8.36948 9.60089 8.36848C9.60495 8.36742 9.60901 8.36649 9.61321 8.36562L9.61514 8.36522C9.62379 8.36349 9.63258 8.36236 9.64144 8.36176H9.64217C9.64677 8.36176 9.65143 8.36129 9.65616 8.36129C9.66208 8.36129 9.66761 8.36129 9.6734 8.36189C9.67939 8.36242 9.68532 8.36309 9.69131 8.36402C9.74072 8.37188 9.78773 8.40131 9.82822 8.44672C9.8436 8.46404 9.85745 8.48268 9.86957 8.50239C9.87756 8.51518 9.88509 8.5287 9.89221 8.54294C9.89508 8.54887 9.89781 8.55433 9.90047 8.56019C9.90739 8.57524 9.91365 8.59056 9.91911 8.6062C9.9321 8.64283 9.94189 8.68052 9.94835 8.71887C9.95394 8.7525 9.95727 8.78646 9.95833 8.82049C9.95887 8.83866 9.95887 8.85711 9.95833 8.87569C9.95474 8.96212 9.93703 9.04742 9.90593 9.12819C9.90313 9.13558 9.9 9.14304 9.89701 9.1505C9.89088 9.16555 9.88415 9.18033 9.8769 9.19478C9.8715 9.20577 9.86584 9.21682 9.85972 9.22781C9.85572 9.23513 9.85153 9.24246 9.84733 9.24978C9.83661 9.26803 9.82502 9.28614 9.81257 9.30418L9.80505 9.31497C9.77562 9.35599 9.74285 9.39448 9.70703 9.43004C9.67174 9.46539 9.63391 9.49809 9.5939 9.52792C9.55381 9.55762 9.51619 9.59051 9.48143 9.62627C9.38135 9.73128 9.35804 9.82397 9.38055 9.89422C9.38414 9.90528 9.38887 9.916 9.3946 9.92612C9.40132 9.93771 9.40931 9.94836 9.41837 9.95808L9.4219 9.96174L9.42549 9.96534C9.42909 9.9688 9.43289 9.9722 9.43695 9.97553L9.44094 9.97872C9.4506 9.98618 9.46085 9.99284 9.47157 9.9987C9.4747 10.0004 9.4775 10.002 9.48103 10.0036C9.49261 10.0093 9.50453 10.0141 9.51679 10.0181C9.52018 10.0192 9.52358 10.0202 9.52704 10.0213L9.53137 10.0224L9.53736 10.024L9.54249 10.0253L9.54808 10.0265L9.55361 10.0276L9.55887 10.0285C9.56273 10.0291 9.56673 10.0298 9.57072 10.0303L9.57452 10.0309L9.58144 10.0315L9.5857 10.032L9.5927 10.0325H9.59683L9.60415 10.0329H9.62719L9.63378 10.0325L9.64137 10.032L9.65063 10.0311L9.65929 10.0301C9.66128 10.0301 9.66328 10.0296 9.66528 10.0292C9.69191 10.0253 9.71802 10.0183 9.74299 10.0082L9.75358 10.0037C9.7595 10.0011 9.76549 9.99837 9.77096 9.99544C9.78267 9.98958 9.79406 9.98292 9.80498 9.97566C9.82023 9.96567 9.83461 9.95448 9.84806 9.94217C9.85126 9.9393 9.85439 9.93624 9.85745 9.93331C9.85898 9.93185 9.86045 9.93045 9.86191 9.92885C9.86484 9.92585 9.86784 9.92292 9.87077 9.91966C9.89208 9.89622 9.91052 9.87038 9.9257 9.84262C10.056 9.60563 10.1926 9.37217 10.3353 9.14251L10.3549 9.11114L10.3746 9.07978C10.3845 9.06387 10.3945 9.04822 10.4044 9.03264L10.4144 9.01705C10.4476 8.96512 10.4813 8.91351 10.5155 8.8623L10.5359 8.83194C10.5766 8.77154 10.6172 8.71281 10.6575 8.65701L10.6776 8.62938C10.7214 8.56898 10.767 8.50985 10.8143 8.45218L10.8331 8.42968C10.8362 8.42595 10.8391 8.42222 10.8425 8.41862C10.8487 8.4113 10.8549 8.40417 10.8609 8.39725C10.864 8.39372 10.8669 8.39026 10.8701 8.3868L10.888 8.36669L10.8969 8.3569C10.9059 8.34724 10.9147 8.33799 10.9233 8.32913C10.9293 8.32314 10.9349 8.31721 10.9406 8.31162C10.9743 8.27712 11.0116 8.24616 11.0517 8.21933L11.061 8.21333C11.07 8.20734 11.0792 8.20175 11.0887 8.19669C11.2461 8.10732 11.3764 8.10073 11.4514 8.17578C11.4969 8.22119 11.522 8.2965 11.5206 8.40131C11.5206 8.40591 11.5206 8.41057 11.5203 8.41536V8.42049C11.5203 8.42528 11.5199 8.43008 11.5195 8.43494C11.5195 8.44093 11.5188 8.44686 11.5182 8.45285C11.5176 8.45878 11.5173 8.46331 11.5167 8.46863C11.5167 8.4701 11.5164 8.47163 11.5162 8.47323C11.5158 8.47782 11.5152 8.48255 11.5145 8.48728C11.5145 8.48868 11.5145 8.49014 11.514 8.49161C11.5132 8.49793 11.5123 8.50419 11.5112 8.51045C11.5105 8.51644 11.5095 8.52204 11.5084 8.5279L11.5067 8.53782C11.505 8.54727 11.5028 8.5566 11.5001 8.56578C11.4949 8.58303 11.4886 8.59988 11.4812 8.61626C11.4709 8.63877 11.4595 8.66067 11.447 8.68198C11.4401 8.69383 11.4329 8.70549 11.4255 8.71701C11.418 8.72893 11.41 8.74098 11.4017 8.75316C11.3807 8.78326 11.3588 8.81276 11.3361 8.84159L11.3257 8.85471C11.2887 8.90086 11.2505 8.94607 11.2111 8.99022L11.1986 9.0042C11.1818 9.02291 11.1648 9.04176 11.1473 9.06067L11.1342 9.07492C11.1255 9.08444 11.1164 9.09396 11.1076 9.10355C11.0989 9.11308 11.0897 9.12273 11.0805 9.13239L11.0532 9.16122L11.0254 9.19025L10.9974 9.21928C10.9787 9.23873 10.9598 9.25817 10.9408 9.27761C10.6708 9.55456 10.3864 9.83056 10.2901 10.0026C10.2836 10.0138 10.2778 10.0254 10.2726 10.0372C10.2589 10.0685 10.2532 10.0953 10.2571 10.1169C10.2584 10.124 10.2608 10.1308 10.2645 10.1371C10.2699 10.1465 10.2765 10.1551 10.2842 10.1628C10.2877 10.1663 10.2914 10.1695 10.2953 10.1724C10.3152 10.1865 10.3391 10.1938 10.3635 10.1931H10.371L10.3788 10.1925L10.3866 10.1917L10.3931 10.1907C10.394 10.1906 10.3949 10.1905 10.3958 10.1902L10.4017 10.1891L10.4032 10.1887L10.4098 10.1873L10.4121 10.1867C10.4145 10.1861 10.4167 10.1855 10.4191 10.1849C10.4214 10.1842 10.4246 10.1833 10.4274 10.1824C10.4391 10.1789 10.4506 10.1747 10.4618 10.1699C10.4677 10.1675 10.4735 10.1649 10.4793 10.1621C10.4823 10.1608 10.4852 10.1594 10.488 10.1579L10.497 10.1535C10.5183 10.1425 10.5391 10.1304 10.5593 10.1175L10.5682 10.1115C10.5711 10.1096 10.5741 10.1077 10.577 10.1056L10.5859 10.0996L10.5906 10.0964L10.6034 10.0874C10.6153 10.0792 10.6264 10.0707 10.6377 10.0622L10.6387 10.0614L10.6566 10.0475C10.681 10.0282 10.7042 10.0088 10.7252 9.99044L10.7392 9.97819L10.7405 9.97699L10.7478 9.97053C10.765 9.95508 10.7803 9.9407 10.793 9.92885L10.7983 9.92372C10.8029 9.91939 10.8071 9.91533 10.8109 9.91187L10.8183 9.90448L10.821 9.90188L10.8217 9.90115L10.8295 9.89336L10.8344 9.88823L10.835 9.88776L10.8374 9.88563L10.8403 9.88297L10.8412 9.8821L10.8437 9.87984L10.8573 9.86792L10.8649 9.86113C10.8689 9.8576 10.8729 9.854 10.8768 9.85034L10.8858 9.84228C10.8875 9.84095 10.8891 9.83949 10.8908 9.83802L10.9003 9.8297L10.9143 9.81738L10.9217 9.81092C10.9507 9.78575 10.9859 9.75532 11.0264 9.72103L11.043 9.70698L11.0704 9.684L11.0984 9.66063C11.135 9.6302 11.1744 9.5979 11.2161 9.56441L11.2435 9.54244C11.2668 9.52386 11.2907 9.50495 11.3149 9.4859C11.3247 9.47824 11.3346 9.47059 11.3448 9.463C11.3695 9.44375 11.3944 9.42464 11.4195 9.4058C11.4767 9.36265 11.5356 9.31943 11.5953 9.27735L11.6208 9.2595C11.6388 9.24718 11.6566 9.2348 11.6744 9.22275L11.6906 9.21183C11.7225 9.19018 11.7549 9.16908 11.7875 9.1485L11.8037 9.13831L11.8197 9.12832C11.8359 9.11833 11.8518 9.10855 11.8678 9.09902L11.8837 9.0895L11.9155 9.07099L11.9467 9.05308L11.9531 9.04962L11.9778 9.03603C11.9881 9.03044 11.9983 9.02504 12.0086 9.01978L12.0238 9.01193L12.0387 9.00447C12.0439 9.00201 12.049 8.99941 12.0541 8.99694C12.0875 8.98043 12.1216 8.96525 12.1562 8.9514C12.1656 8.9474 12.1749 8.94381 12.1842 8.94068L12.2115 8.93109C12.2197 8.92836 12.2277 8.92576 12.2353 8.92343L12.238 8.92263C12.2421 8.9213 12.2462 8.9201 12.2503 8.91904L12.2515 8.9187C12.26 8.91624 12.2685 8.91411 12.2768 8.91211H12.2774C12.301 8.90645 12.325 8.90239 12.3491 8.89992C12.3602 8.89879 12.3714 8.89819 12.3826 8.89826H12.3881C12.3956 8.89826 12.4028 8.89873 12.4099 8.89946C12.4132 8.89946 12.4164 8.90012 12.4196 8.90052H12.421C12.4242 8.90092 12.4274 8.90139 12.4306 8.90212C12.4337 8.90272 12.4369 8.90325 12.4399 8.90399H12.4409C12.4441 8.90465 12.4469 8.90545 12.4501 8.90638C12.4671 8.91111 12.4832 8.91844 12.4979 8.92803C12.5052 8.93275 12.512 8.93808 12.5183 8.94401L12.5201 8.94574C12.5213 8.9468 12.5224 8.94794 12.5235 8.94907L12.5267 8.9526C12.5535 8.98063 12.5756 9.01279 12.5922 9.04782L12.5948 9.05381C12.6004 9.06713 12.6049 9.08091 12.6081 9.09496C12.6175 9.13798 12.6139 9.18286 12.5976 9.22381C12.5914 9.24032 12.5838 9.25624 12.575 9.27142C12.5543 9.30631 12.5297 9.33874 12.5018 9.36811L12.4959 9.37443C12.487 9.38376 12.4778 9.39308 12.4682 9.4024C12.4639 9.4066 12.4595 9.41072 12.455 9.41492L12.4413 9.4275L12.4342 9.43383C12.417 9.44915 12.3994 9.464 12.3815 9.47838C12.3706 9.48717 12.3597 9.49576 12.3487 9.50422C12.3096 9.53405 12.2699 9.56281 12.2294 9.59058C12.205 9.60736 12.1803 9.62381 12.1555 9.64005C12.0943 9.68021 12.0324 9.71936 11.97 9.75745C11.8389 9.83802 11.6937 9.92419 11.5389 10.0179L11.4988 10.0422C11.4549 10.069 11.4135 10.0945 11.3745 10.1189L11.3548 10.1312L11.3177 10.155C11.293 10.1708 11.2685 10.1867 11.2439 10.2027L11.2241 10.2157C11.2145 10.222 11.2049 10.2284 11.1953 10.2348L11.1859 10.2407L11.1571 10.2601L11.1419 10.2706L11.124 10.283L11.1074 10.2945C11.0797 10.3141 11.0538 10.3328 11.0301 10.3506L11.0212 10.3574C11.0072 10.368 10.9933 10.3788 10.9797 10.3898C10.9591 10.4064 10.9403 10.4222 10.9235 10.4375L10.9152 10.445C10.9105 10.4493 10.9058 10.4536 10.9014 10.4579C10.8983 10.4609 10.8954 10.4639 10.8922 10.4667L10.888 10.471C10.8785 10.4806 10.8691 10.4904 10.8601 10.5004L10.8557 10.5055C10.846 10.5168 10.8374 10.5277 10.83 10.5383L10.8266 10.543C10.8208 10.5515 10.8154 10.5603 10.8105 10.5694C10.8093 10.5716 10.8081 10.5739 10.807 10.5762L10.8037 10.5829L10.8015 10.5879L10.8001 10.5912L10.799 10.5942L10.7975 10.5983C10.7934 10.6095 10.7905 10.6212 10.7888 10.6331L10.7883 10.6372L10.7879 10.6411V10.6621C10.7879 10.6638 10.7879 10.6655 10.7884 10.6674L10.7887 10.6706C10.7887 10.6723 10.7891 10.674 10.7894 10.6758C10.7896 10.6776 10.7901 10.6807 10.7906 10.6832V10.6835C10.7911 10.6858 10.7916 10.6881 10.7922 10.6904C10.7928 10.6927 10.7934 10.6954 10.7941 10.6978C10.7953 10.7025 10.7969 10.7072 10.7986 10.7119C10.7997 10.7147 10.8007 10.7174 10.8018 10.7201C10.8018 10.7207 10.8022 10.7212 10.8025 10.7218L10.8049 10.7272L10.8082 10.7346C10.8118 10.7422 10.8157 10.7497 10.82 10.7569L10.8244 10.7645L10.8289 10.7721C10.8297 10.7734 10.8306 10.7746 10.8316 10.7757L10.8331 10.7773L10.8348 10.7788L10.8365 10.7801C10.839 10.7819 10.8418 10.7833 10.8446 10.7843C10.8462 10.7848 10.8478 10.7852 10.8494 10.7856C10.8878 10.7943 10.9667 10.7625 11.0717 10.7071C11.0776 10.7039 11.0841 10.7006 11.0905 10.6971L11.1224 10.6797L11.138 10.671C11.1491 10.6651 11.1605 10.6584 11.172 10.6518L11.1931 10.6399C11.3319 10.56 11.4975 10.4575 11.6688 10.3573C11.6848 10.348 11.701 10.3386 11.7171 10.3293L11.7494 10.3086C11.787 10.2871 11.8247 10.2659 11.8626 10.2449C11.9104 10.2186 11.9584 10.1931 12.007 10.1683L12.0387 10.1523C12.0597 10.1419 12.0806 10.1317 12.1011 10.1219C12.141 10.103 12.1813 10.085 12.222 10.068L12.2443 10.059L12.247 10.0579C12.3652 10.0111 12.4723 9.98219 12.559 9.98219C12.5777 9.98199 12.5965 9.98358 12.6149 9.98678H12.6155C12.6215 9.98785 12.6269 9.98904 12.6324 9.99038H12.6334C12.6476 9.99397 12.6614 9.9991 12.6744 10.0057C12.6927 10.0151 12.7092 10.0277 12.7231 10.0429C12.7295 10.05 12.7351 10.0576 12.7401 10.0658C12.7495 10.0801 12.7568 10.0956 12.762 10.1118C12.7642 10.1182 12.766 10.1244 12.768 10.1309C12.782 10.1814 12.7806 10.2348 12.764 10.2844Z" fill="#FF9D00"/>
+<path id="Vector_3" fill-rule="evenodd" clip-rule="evenodd" d="M11.9778 6.66685V6.63416C11.9778 3.84717 9.71928 1.58789 6.93209 1.58789C4.14498 1.58789 1.88556 3.8473 1.88556 6.63416V6.64508C1.88543 6.65234 1.88536 6.65959 1.88556 6.66685C1.88589 6.6777 1.886 6.68856 1.8859 6.69941L1.88623 6.72338L1.88643 6.73197C1.88643 6.73597 1.88657 6.7399 1.8867 6.74389C1.8869 6.75022 1.88703 6.75661 1.88703 6.76294L1.88776 6.78884L1.88883 6.81927L1.88916 6.82926L1.89049 6.86076V6.86229C1.89102 6.87461 1.8917 6.88686 1.89229 6.89911L1.89235 6.90004C1.89302 6.91256 1.89369 6.92515 1.89449 6.93773C1.89516 6.94932 1.89582 6.96091 1.89668 6.97249L1.89682 6.97456C1.8974 6.98448 1.89807 6.99447 1.89881 7.00439L1.89901 7.00705L1.90121 7.03582L1.90142 7.03768C1.90182 7.04327 1.90221 7.04887 1.90274 7.05426C1.90672 7.10227 1.91137 7.15028 1.91667 7.19816L1.91699 7.20116L1.92105 7.23638L1.92559 7.27334L1.92891 7.29844L1.93044 7.31023C1.93399 7.3374 1.93783 7.3645 1.94196 7.39153L1.94224 7.39333L1.94616 7.4189C1.96517 7.54069 1.98871 7.66175 2.01674 7.78181L2.01708 7.78327L2.01921 7.79226L2.02526 7.8179L2.02899 7.81344C2.17549 7.63831 2.38564 7.54176 2.62076 7.54176C2.80921 7.54176 3.00252 7.60408 3.19629 7.72694C3.32481 7.80858 3.46691 7.95314 3.61314 8.13499C3.74845 7.94708 3.93809 7.82216 4.15503 7.78807C4.1964 7.78154 4.23821 7.77828 4.28009 7.77821C4.77524 7.77821 5.07348 8.20791 5.18615 8.59445C5.24182 8.72503 5.5101 9.3198 5.91469 9.72212C6.5297 10.3365 6.68359 10.9705 6.37921 11.6494H6.38028C6.40099 11.6517 6.42183 11.6539 6.4428 11.6558C6.45526 11.657 6.46764 11.6582 6.48016 11.6592L6.48455 11.6596L6.51205 11.662L6.53736 11.664C6.56146 11.6658 6.58564 11.6676 6.60987 11.6691L6.62912 11.6702L6.64437 11.6712L6.65382 11.6717L6.68359 11.6732L6.69171 11.6736L6.72294 11.675L6.7577 11.6763L6.7856 11.6771L6.79026 11.6772C6.79619 11.6775 6.80211 11.6777 6.80804 11.6777L6.81443 11.6779C6.85372 11.6788 6.89294 11.6793 6.93223 11.6792H6.97391L7.00368 11.6789C7.011 11.6786 7.01826 11.6786 7.02565 11.6786H7.03724L7.04729 11.6783C7.05122 11.6782 7.05515 11.678 7.05914 11.678H7.07106L7.09444 11.6774L7.1296 11.6762L7.16828 11.6745C7.17947 11.6741 7.19052 11.6735 7.20158 11.673L7.2135 11.6722L7.23121 11.6713L7.2416 11.6707L7.24945 11.6702L7.28521 11.6678L7.3209 11.6652L7.35333 11.6626L7.37611 11.6607L7.40114 11.6584C7.44296 11.6547 7.48464 11.6503 7.52633 11.6453L7.55476 11.6419C7.25518 10.9659 7.41027 10.3347 8.02268 9.72272C8.4264 9.31933 8.69469 8.72456 8.75062 8.59392C8.86336 8.20744 9.16141 7.77774 9.65669 7.77774C9.69858 7.77774 9.74046 7.78107 9.78181 7.7876C9.99856 7.82169 10.1882 7.94661 10.3237 8.13453C10.47 7.95274 10.612 7.80804 10.7406 7.72641C10.9343 7.60362 11.1278 7.54129 11.3161 7.54129C11.5236 7.54129 11.7116 7.61653 11.8536 7.75457C11.8562 7.74332 11.8588 7.73206 11.8612 7.72074L11.8685 7.68705C11.8711 7.67473 11.8737 7.66241 11.8761 7.65009C11.8805 7.62832 11.8849 7.60655 11.8891 7.58457C11.8935 7.5618 11.8977 7.53889 11.9017 7.51599L11.9038 7.5036C11.905 7.49628 11.9062 7.48895 11.9076 7.48156C11.9099 7.47011 11.9118 7.45865 11.9136 7.44707L11.9144 7.44267L11.9191 7.41251L11.9238 7.38194V7.38168C11.9272 7.3591 11.9304 7.33653 11.9333 7.31396L11.9341 7.30836L11.9383 7.27653L11.9417 7.24937L11.9477 7.19583L11.95 7.17432L11.9506 7.16846C11.9519 7.15688 11.9531 7.14529 11.9541 7.1337V7.13277C11.955 7.12358 11.9559 7.11433 11.9567 7.10507C11.9614 7.0526 11.9654 6.99986 11.9686 6.94692C11.9692 6.93826 11.9697 6.92954 11.9702 6.92082V6.92042L11.972 6.88772L11.9724 6.8804C11.9734 6.85829 11.9744 6.83618 11.9751 6.81408V6.81328L11.9754 6.80462C11.9758 6.79736 11.976 6.79004 11.976 6.78272L11.9762 6.77978C11.9764 6.77293 11.9767 6.76587 11.9767 6.75888L11.9769 6.75288C11.9771 6.74589 11.9773 6.73897 11.9773 6.73197L11.9774 6.72605C11.9776 6.71719 11.9778 6.70827 11.9778 6.69941V6.66685ZM5.68043 11.708C6.0801 11.1219 6.05173 10.6821 5.50344 10.134C4.95503 9.58595 4.63586 8.78449 4.63586 8.78449C4.63586 8.78449 4.51674 8.31897 4.24506 8.36172C3.97338 8.40447 3.77408 9.10012 4.34295 9.52596C4.91174 9.95179 4.22975 10.2405 4.0108 9.84092C3.79186 9.44126 3.19409 8.414 2.88419 8.21749C2.57429 8.02099 2.35634 8.13113 2.42939 8.53612C2.46568 8.73715 2.80316 9.08028 3.11845 9.40084C3.43834 9.72605 3.73539 10.0281 3.67186 10.135C3.54581 10.3472 3.10187 9.8856 3.10187 9.8856C3.10187 9.8856 1.71177 8.62055 1.40919 8.95023C1.13018 9.25408 1.56041 9.51237 2.22337 9.9105C2.27971 9.94433 2.33777 9.97922 2.39723 10.0152C3.15574 10.4744 3.21473 10.5955 3.10706 10.7692C3.06731 10.8334 2.8134 10.681 2.50111 10.4936C1.96873 10.1739 1.26676 9.75242 1.16761 10.1296C1.08185 10.4561 1.5983 10.6562 2.06668 10.8376C2.45689 10.9888 2.81381 11.127 2.76127 11.3147C2.70687 11.5092 2.41195 11.3469 2.0896 11.1696C1.72769 10.9704 1.33115 10.7522 1.20137 10.9984C0.956129 11.4639 2.89338 12.0118 2.90937 12.0159C3.5353 12.1782 5.12489 12.5222 5.68043 11.708ZM8.25507 11.708C7.85541 11.1219 7.88378 10.6821 8.43213 10.134C8.98049 9.58595 9.29964 8.78449 9.29964 8.78449C9.29964 8.78449 9.41877 8.31897 9.69045 8.36172C9.96213 8.40447 10.1614 9.10012 9.59263 9.52596C9.02377 9.95179 9.70577 10.2405 9.92471 9.84092C10.1437 9.44126 10.7411 8.414 11.051 8.21749C11.3609 8.02099 11.579 8.13113 11.5058 8.53612C11.4696 8.73715 11.1321 9.08028 10.8168 9.4009C10.4969 9.72612 10.1999 10.0281 10.2633 10.135C10.3894 10.3472 10.8336 9.88533 10.8336 9.88533C10.8336 9.88533 12.2237 8.62035 12.5264 8.95003C12.8053 9.25381 12.3751 9.51217 11.7121 9.9103C11.6541 9.94513 11.5961 9.98002 11.5383 10.015C10.7798 10.4742 10.7208 10.5953 10.8284 10.769C10.8682 10.8332 11.1221 10.6807 11.4343 10.4933C11.9668 10.1737 12.6687 9.75216 12.7679 10.1294C12.8537 10.4559 12.3372 10.656 11.8688 10.8374C11.4786 10.9886 11.1217 11.1268 11.1742 11.3145C11.2285 11.509 11.5234 11.3467 11.8456 11.1693C12.2076 10.9701 12.6042 10.7518 12.7339 10.9982C12.9792 11.4639 11.0416 12.0114 11.0259 12.0154C10.4 12.1782 8.81042 12.5222 8.25507 11.708Z" fill="#FFD21E"/>
+<path id="Vector_4" fill-rule="evenodd" clip-rule="evenodd" d="M8.57118 5.26131C8.64989 5.28914 8.70842 5.37384 8.76409 5.45448C8.83933 5.56342 8.90938 5.66483 9.01686 5.6077C9.14364 5.54025 9.24758 5.43677 9.3155 5.31025C9.38349 5.18373 9.41246 5.03995 9.39874 4.897C9.38848 4.79011 9.35466 4.68684 9.29966 4.59461C9.24465 4.50238 9.16987 4.42349 9.08078 4.36364C8.99162 4.30379 8.89027 4.26447 8.78413 4.24849C8.67792 4.23252 8.56951 4.2403 8.4667 4.27127C8.36389 4.30223 8.26927 4.35559 8.18956 4.42752C8.10985 4.49945 8.04706 4.58815 8.00578 4.68725C7.96449 4.78635 7.94565 4.89337 7.95064 5.00061C7.9557 5.10789 7.9844 5.21263 8.03481 5.30745C8.08462 5.40114 8.19515 5.35693 8.31182 5.31025C8.40324 5.27369 8.49853 5.2356 8.57118 5.26131ZM5.1502 5.26131C5.07149 5.28914 5.01296 5.37391 4.9573 5.45448C4.88205 5.56349 4.81193 5.66483 4.70453 5.6077C4.54508 5.52327 4.4228 5.38243 4.36152 5.21276C4.30023 5.04306 4.30434 4.85662 4.37304 4.68979C4.44173 4.52295 4.57009 4.38767 4.73309 4.31033C4.8961 4.23298 5.08207 4.21911 5.25475 4.2714C5.39225 4.31281 5.51437 4.39404 5.60573 4.50483C5.69709 4.61563 5.75349 4.75101 5.76794 4.89387C5.78232 5.03674 5.75402 5.18067 5.68664 5.30745C5.63676 5.40114 5.52623 5.35693 5.40956 5.31032C5.31807 5.27369 5.22292 5.2356 5.1502 5.26131ZM8.04193 8.37438C8.58416 7.94721 8.78333 7.24977 8.78333 6.82014C8.78333 6.48054 8.55486 6.58741 8.1891 6.76853L8.16845 6.77872C7.83271 6.94499 7.38577 7.1664 6.89515 7.1664C6.40446 7.1664 5.95752 6.94499 5.62185 6.77866C5.24422 6.59161 5.00737 6.47428 5.00737 6.82021C5.00737 7.26342 5.21925 7.99116 5.80084 8.41393C5.87761 8.25818 5.98569 8.11995 6.11833 8.00781C6.25091 7.89568 6.40526 7.81211 6.5716 7.7623C6.62966 7.74499 6.68946 7.84494 6.75065 7.94728C6.80972 8.04597 6.87011 8.14691 6.93151 8.14691C6.99696 8.14691 7.06122 8.04743 7.12401 7.95034C7.1896 7.8488 7.25359 7.74991 7.31545 7.76969C7.62676 7.86964 7.88718 8.08638 8.04193 8.37438Z" fill="#32343D"/>
+<path id="Vector_5" d="M8.04175 8.37381C7.75934 8.59635 7.38399 8.74558 6.89516 8.74558C6.4359 8.74558 6.07672 8.61386 5.80078 8.41337C5.87756 8.25762 5.98563 8.11931 6.11827 8.00724C6.25085 7.89511 6.4052 7.81154 6.57154 7.76173C6.68554 7.72771 6.8064 8.14635 6.93145 8.14635C7.06529 8.14635 7.19428 7.73044 7.3154 7.76912C7.62663 7.86914 7.88699 8.08589 8.04175 8.37381Z" fill="#FF323D"/>
+<path id="Vector_6" fill-rule="evenodd" clip-rule="evenodd" d="M3.85335 5.86646C3.78884 5.90961 3.71467 5.93618 3.63742 5.94377C3.56017 5.95143 3.48224 5.93984 3.41054 5.91008C3.35323 5.88644 3.30115 5.85168 3.25731 5.8078C3.21346 5.76398 3.17871 5.71191 3.15504 5.65458C3.12534 5.58286 3.11379 5.50495 3.12143 5.42771C3.12906 5.35047 3.15564 5.27629 3.19879 5.21177C3.25065 5.13412 3.32436 5.07362 3.41062 5.03788C3.49688 5.00215 3.5918 4.9928 3.68336 5.01104C3.77493 5.02926 3.85903 5.07424 3.92503 5.14025C3.99103 5.20631 4.03595 5.29047 4.05412 5.38203C4.07232 5.47359 4.06296 5.56848 4.02724 5.65471C3.99151 5.74094 3.93096 5.81459 3.85335 5.86646ZM10.6063 5.86646C10.5418 5.90961 10.4676 5.93618 10.3903 5.94377C10.313 5.95143 10.2351 5.93984 10.1634 5.91008C10.1061 5.88637 10.054 5.85168 10.0102 5.8078C9.96637 5.76398 9.93161 5.71191 9.9079 5.65458C9.87827 5.58286 9.86675 5.50495 9.87434 5.42771C9.882 5.35047 9.90857 5.27629 9.95165 5.21177C9.9904 5.1537 10.0416 5.10503 10.1015 5.06912C10.1613 5.03324 10.2284 5.01108 10.2978 5.00426C10.3674 4.99743 10.4375 5.00609 10.5031 5.02963C10.5689 5.05318 10.6285 5.091 10.6779 5.14038C10.7439 5.20637 10.7889 5.29047 10.807 5.38203C10.8253 5.47359 10.8159 5.56848 10.7801 5.65471C10.7444 5.74094 10.6839 5.81459 10.6063 5.86646Z" fill="#FFAD03"/>
+</g>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/mistral.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/mistral.svg
new file mode 100644
index 0000000000000..f62258a327594
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/mistral.svg
@@ -0,0 +1,34 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.2415 18.6003H7.03916L7.0416 13.4005H12.2441L12.2415 18.6003Z" fill="black"/>
+<path d="M17.4412 23.8001H12.2389L12.2415 18.6003L17.4438 18.6004L17.4412 23.8001Z" fill="black"/>
+<path d="M17.4438 18.6004L12.2415 18.6003L12.2441 13.4005H17.4464L17.4438 18.6004Z" fill="black"/>
+<path d="M22.6461 18.6003L17.4438 18.6004L17.4464 13.4005H22.6487L22.6461 18.6003Z" fill="black"/>
+<path d="M12.2441 13.4005H7.0416L7.04408 8.20071H12.2466L12.2441 13.4005Z" fill="black"/>
+<path d="M22.6487 13.4005H17.4464L17.4488 8.20071H22.6513L22.6487 13.4005Z" fill="black"/>
+<path d="M7.03916 18.6003H1.83674L1.83918 13.4005H7.0416L7.03916 18.6003Z" fill="black"/>
+<path d="M7.0416 13.4005H1.83918L1.84176 8.20071H7.04408L7.0416 13.4005Z" fill="black"/>
+<path d="M7.04408 8.20071H1.84176L1.84435 3.00088H7.04684L7.04408 8.20071Z" fill="black"/>
+<path d="M27.8536 8.20061L22.6513 8.20071L22.6537 3.00088H27.8562L27.8536 8.20061Z" fill="black"/>
+<path d="M7.0366 23.8001H1.83425L1.83674 18.6003H7.03916L7.0366 23.8001Z" fill="black"/>
+<path d="M7.03401 28.9999H1.83167L1.83425 23.8001H7.0366L7.03401 28.9999Z" fill="black"/>
+<path d="M27.8485 18.6003H22.6461L22.6487 13.4005H27.851L27.8485 18.6003Z" fill="black"/>
+<path d="M27.851 13.4005H22.6487L22.6513 8.20071L27.8536 8.20061L27.851 13.4005Z" fill="black"/>
+<path d="M27.846 23.8001H22.6436L22.6461 18.6003H27.8485L27.846 23.8001Z" fill="black"/>
+<path d="M27.8434 28.9999H22.641L22.6436 23.8001H27.846L27.8434 28.9999Z" fill="black"/>
+<path d="M14.405 18.5994H9.20275L9.20519 13.3997H14.4077L14.405 18.5994Z" fill="#FF7000"/>
+<path d="M19.6049 23.7992H14.4026L14.405 18.5994L19.6075 18.5995L19.6049 23.7992Z" fill="#FF4900"/>
+<path d="M19.6075 18.5995L14.405 18.5994L14.4077 13.3997L19.61 13.4007L19.6075 18.5995Z" fill="#FF7000"/>
+<path d="M24.8099 18.6004L19.6075 18.5995L19.61 13.4007H24.8125L24.8099 18.6004Z" fill="#FF7000"/>
+<path d="M14.4077 13.3997H9.20519L9.20783 8.1992H14.4103L14.4077 13.3997Z" fill="#FFA300"/>
+<path d="M24.8124 13.3989H19.61L19.6125 8.1992H24.815L24.8124 13.3989Z" fill="#FFA300"/>
+<path d="M9.20275 18.5994H4.00043L4.00286 13.3997H9.20519L9.20275 18.5994Z" fill="#FF7000"/>
+<path d="M9.20519 13.3997H4.00286L4.00535 8.19983L9.20783 8.1992L9.20519 13.3997Z" fill="#FFA300"/>
+<path d="M9.20783 8.1992L4.00535 8.19983L4.00794 3H9.21043L9.20783 8.1992Z" fill="#FFCE00"/>
+<path d="M30.0172 8.19973L24.815 8.1992L24.8173 3H30.0198L30.0172 8.19973Z" fill="#FFCE00"/>
+<path d="M9.20005 23.7992H3.99784L4.00043 18.5994H9.20275L9.20005 23.7992Z" fill="#FF4900"/>
+<path d="M9.19756 28.9991H3.99535L3.99784 23.7992H9.20005L9.19756 28.9991Z" fill="#FF0107"/>
+<path d="M30.0122 18.5994L24.8099 18.6004L24.8124 13.3989L30.0147 13.3997L30.0122 18.5994Z" fill="#FF7000"/>
+<path d="M30.0147 13.3997L24.8124 13.3989L24.815 8.1992L30.0172 8.19973L30.0147 13.3997Z" fill="#FFA300"/>
+<path d="M30.0096 23.7992H24.8072L24.8099 18.6004L30.0122 18.5994L30.0096 23.7992Z" fill="#FF4900"/>
+<path d="M30.0071 28.9991H24.8047L24.8072 23.7992H30.0096L30.0071 28.9991Z" fill="#FF0107"/>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/open_ai.svg b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/open_ai.svg
new file mode 100644
index 0000000000000..9ddc8f8fd63b8
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/assets/images/providers/open_ai.svg
@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M28.1537 13.4601C28.4721 12.5178 28.5826 11.5176 28.4776 10.5285C28.3727 9.53937 28.0547 8.58469 27.5457 7.73014C26.7865 6.43008 25.6346 5.40425 24.2557 4.80014C22.8693 4.19126 21.327 4.03247 19.8457 4.34614C19.175 3.60107 18.3535 3.00725 17.4357 2.60414C16.5153 2.19969 15.52 1.99388 14.5147 2.00014C13.0027 1.99593 11.5276 2.46676 10.2977 3.34614C9.07577 4.21901 8.16395 5.4587 7.69468 6.88514C6.70973 7.08379 5.77797 7.48866 4.96068 8.07314C4.14712 8.65428 3.46726 9.40268 2.96668 10.2681C2.20588 11.5589 1.88068 13.0602 2.03916 14.5501C2.19764 16.04 2.83138 17.4393 3.84668 18.5411C3.52841 19.4833 3.41787 20.4832 3.52265 21.4721C3.62743 22.4611 3.94505 23.4156 4.45368 24.2701C5.21284 25.5702 6.36472 26.596 7.74368 27.2001C9.13 27.809 10.6724 27.9678 12.1537 27.6541C12.824 28.3992 13.6452 28.993 14.5627 29.3961C15.4827 29.8001 16.4787 30.0061 17.4857 30.0001C18.9986 30.0053 20.4748 29.5348 21.7057 28.6551C22.9291 27.7816 23.8417 26.5404 24.3107 25.1121C25.2956 24.9139 26.2274 24.5094 27.0447 23.9251C27.858 23.3436 28.5376 22.5949 29.0377 21.7291C29.7974 20.4383 30.1216 18.9373 29.9624 17.448C29.8032 15.9587 29.1691 14.5602 28.1537 13.4591V13.4601ZM17.5437 28.1701C16.1317 28.1701 15.0387 27.7421 14.0837 26.9551C14.1267 26.9321 14.2027 26.8911 14.2517 26.8611L19.9017 23.6411C20.0423 23.5619 20.1594 23.4468 20.241 23.3074C20.3225 23.1681 20.3655 23.0096 20.3657 22.8481V14.9881L22.7547 16.3481C22.767 16.3545 22.7776 16.3638 22.7856 16.3751C22.7936 16.3864 22.7987 16.3994 22.8007 16.4131V22.9211C22.8007 25.8731 20.3097 28.1701 17.5437 28.1701ZM6.06268 23.3541C5.43989 22.2948 5.21478 21.0484 5.42768 19.8381C5.46968 19.8631 5.54268 19.9081 5.59568 19.9381L11.2457 23.1581C11.3867 23.2396 11.5468 23.2825 11.7097 23.2825C11.8726 23.2825 12.0326 23.2396 12.1737 23.1581L19.0717 19.2281V21.9481C19.0725 21.962 19.0698 21.9759 19.0639 21.9885C19.0579 22.0011 19.0489 22.012 19.0377 22.0201L13.3267 25.2751C12.1017 25.97 10.6532 26.1574 9.29168 25.7971C7.9348 25.441 6.77475 24.5628 6.06268 23.3541ZM4.57368 11.1841C5.19855 10.1168 6.17811 9.30248 7.34168 8.88314V15.5151C7.34012 15.6769 7.38245 15.8361 7.46415 15.9757C7.54586 16.1154 7.66388 16.2302 7.80568 16.3081L14.7027 20.2381L12.3147 21.5981C12.303 21.6058 12.2896 21.6105 12.2757 21.6119C12.2617 21.6133 12.2477 21.6113 12.2347 21.6061L6.52068 18.3491C5.91893 18.0071 5.39058 17.5497 4.96588 17.0032C4.54118 16.4567 4.22847 15.8317 4.04568 15.1641C3.86493 14.499 3.81844 13.8045 3.90892 13.1211C3.9994 12.4378 4.22604 11.7793 4.57368 11.1841ZM24.1967 15.6901L17.2987 11.7601L19.6867 10.4001C19.6984 10.3925 19.7118 10.3877 19.7257 10.3863C19.7396 10.385 19.7537 10.3869 19.7667 10.3921L25.4797 13.6471C26.3517 14.1436 27.0642 14.8783 27.5337 15.7651C28.0004 16.6478 28.2026 17.6464 28.116 18.641C28.0295 19.6357 27.6578 20.5844 27.0457 21.3731C26.4299 22.1683 25.6011 22.7723 24.6557 23.1151V16.4821C24.6574 16.3211 24.6157 16.1625 24.535 16.0231C24.4542 15.8837 24.3373 15.7687 24.1967 15.6901ZM26.5737 12.1571C26.5181 12.1235 26.4621 12.0905 26.4057 12.0581L20.7557 8.83814C20.6145 8.75688 20.4545 8.71412 20.2917 8.71412C20.1288 8.71412 19.9688 8.75688 19.8277 8.83814L12.9297 12.7681V10.0461C12.9289 10.0322 12.9315 10.0184 12.9375 10.0058C12.9434 9.99321 12.9524 9.98233 12.9637 9.97414L18.6757 6.72314C19.5524 6.22471 20.5517 5.98299 21.5593 6.02561C22.5669 6.06823 23.5422 6.39346 24.3737 6.96414C25.1997 7.53109 25.8467 8.32209 26.2387 9.24414C26.6287 10.1641 26.7447 11.1741 26.5737 12.1571ZM11.6317 17.0091L9.24168 15.6491C9.22917 15.643 9.21841 15.6339 9.21037 15.6225C9.20233 15.6112 9.19728 15.598 9.19568 15.5841V9.07514C9.19668 8.07814 9.48568 7.10214 10.0277 6.26114C10.5729 5.41768 11.3466 4.7466 12.2587 4.32614C13.1746 3.90382 14.1908 3.74739 15.1914 3.8747C16.192 4.002 17.1366 4.40791 17.9177 5.04614C17.8611 5.07604 17.8051 5.10704 17.7497 5.13914L12.0997 8.35914C11.959 8.43838 11.8418 8.55353 11.7601 8.69284C11.6784 8.83216 11.6351 8.99064 11.6347 9.15214L11.6317 17.0091ZM12.9287 14.2491L16.0007 12.5001L19.0727 14.2501V17.7501L16.0007 19.4991L12.9287 17.7491V14.2491Z" fill="black"/>
+</svg>
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts
index 1b7e72149fd43..b3fd13dc5383a 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/constants.ts
@@ -8,8 +8,9 @@
 import {
   SortFieldInferenceEndpoint,
   QueryParams,
-  AlInferenceEndpointsTableState,
+  AllInferenceEndpointsTableState,
   SortOrder,
+  FilterOptions,
 } from './types';
 
 export const DEFAULT_TABLE_ACTIVE_PAGE = 1;
@@ -22,6 +23,12 @@ export const DEFAULT_QUERY_PARAMS: QueryParams = {
   sortOrder: SortOrder.asc,
 };
 
-export const DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE: AlInferenceEndpointsTableState = {
+export const DEFAULT_FILTER_OPTIONS: FilterOptions = {
+  provider: [],
+  type: [],
+};
+
+export const DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE: AllInferenceEndpointsTableState = {
+  filterOptions: DEFAULT_FILTER_OPTIONS,
   queryParams: DEFAULT_QUERY_PARAMS,
 };
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.test.tsx
new file mode 100644
index 0000000000000..87b984c26d3ea
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render, fireEvent, waitFor } from '@testing-library/react';
+import { MultiSelectFilter, MultiSelectFilterOption } from './multi_select_filter';
+import '@testing-library/jest-dom/extend-expect';
+
+describe('MultiSelectFilter', () => {
+  const options: MultiSelectFilterOption[] = [
+    { key: '1', label: 'Option 1', checked: 'off' },
+    { key: '2', label: 'Option 2', checked: 'on' },
+    { key: '3', label: 'Option 3', checked: 'off' },
+  ];
+
+  it('should render the filter button with the provided label', () => {
+    const { getByText } = render(
+      <MultiSelectFilter onChange={() => {}} options={options} buttonLabel="Filter Options" />
+    );
+    expect(getByText('Filter Options')).toBeInTheDocument();
+  });
+
+  it('should toggle the popover when the filter button is clicked', async () => {
+    const { getByText, queryByText } = render(
+      <MultiSelectFilter onChange={() => {}} options={options} buttonLabel="Filter Options" />
+    );
+    fireEvent.click(getByText('Filter Options'));
+    expect(queryByText('Option 1')).toBeInTheDocument();
+    fireEvent.click(getByText('Filter Options'));
+    await waitFor(() => {
+      expect(queryByText('Option 1')).not.toBeInTheDocument();
+    });
+  });
+
+  it('should render the provided options', async () => {
+    const { getByText } = render(
+      <MultiSelectFilter onChange={() => {}} options={options} buttonLabel="Filter Options" />
+    );
+
+    fireEvent.click(getByText('Filter Options'));
+
+    await waitFor(() => {
+      expect(getByText('Option 1')).toBeInTheDocument();
+      expect(getByText('Option 2')).toBeInTheDocument();
+      expect(getByText('Option 3')).toBeInTheDocument();
+    });
+  });
+
+  it('should call the onChange function with the updated options when an option is clicked', async () => {
+    const onChange = jest.fn();
+    const { getByText } = render(
+      <MultiSelectFilter onChange={onChange} options={options} buttonLabel="Filter Options" />
+    );
+
+    fireEvent.click(getByText('Filter Options'));
+    fireEvent.click(getByText('Option 1'));
+
+    await waitFor(() => {
+      expect(onChange).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.tsx
new file mode 100644
index 0000000000000..84883c4e85432
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/multi_select_filter.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiFilterButton,
+  EuiFilterGroup,
+  EuiPopover,
+  EuiPopoverTitle,
+  EuiSelectable,
+  EuiSpacer,
+  EuiText,
+  EuiTextColor,
+  useEuiTheme,
+} from '@elastic/eui';
+import { css } from '@emotion/react';
+import React, { useState } from 'react';
+import * as i18n from './translations';
+
+export interface MultiSelectFilterOption {
+  key: string;
+  label: string;
+  checked?: 'on' | 'off';
+}
+
+interface UseFilterParams {
+  buttonLabel?: string;
+  onChange: (newOptions: MultiSelectFilterOption[]) => void;
+  options: MultiSelectFilterOption[];
+  renderOption?: (option: MultiSelectFilterOption) => React.ReactNode;
+  selectedOptionKeys?: string[];
+}
+
+export const MultiSelectFilter: React.FC<UseFilterParams> = ({
+  buttonLabel,
+  onChange,
+  options: rawOptions,
+  selectedOptionKeys = [],
+  renderOption,
+}) => {
+  const { euiTheme } = useEuiTheme();
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  const toggleIsPopoverOpen = () => setIsPopoverOpen((prevValue) => !prevValue);
+  const options: MultiSelectFilterOption[] = rawOptions.map(({ key, label }) => ({
+    label,
+    key,
+    checked: selectedOptionKeys.includes(key) ? 'on' : undefined,
+  }));
+
+  return (
+    <EuiFilterGroup>
+      <EuiPopover
+        ownFocus
+        button={
+          <EuiFilterButton
+            iconType={'arrowDown'}
+            onClick={toggleIsPopoverOpen}
+            isSelected={isPopoverOpen}
+            numFilters={options.length}
+            hasActiveFilters={selectedOptionKeys.length > 0}
+            numActiveFilters={selectedOptionKeys.length}
+            aria-label={buttonLabel}
+          >
+            <EuiText size="s" className="eui-textTruncate">
+              {buttonLabel}
+            </EuiText>
+          </EuiFilterButton>
+        }
+        isOpen={isPopoverOpen}
+        closePopover={() => setIsPopoverOpen(false)}
+        panelPaddingSize="none"
+        repositionOnScroll
+      >
+        <EuiSelectable
+          options={options}
+          searchable
+          searchProps={{
+            placeholder: buttonLabel,
+          }}
+          emptyMessage="No options"
+          onChange={onChange}
+          singleSelection={false}
+          renderOption={renderOption}
+        >
+          {(list, search) => (
+            <div>
+              <EuiPopoverTitle paddingSize="s">{search}</EuiPopoverTitle>
+              <div
+                css={css`
+                  line-height: ${euiTheme.size.xl};
+                  padding-left: ${euiTheme.size.m};
+                  border-bottom: ${euiTheme.border.thin};
+                `}
+              >
+                <EuiTextColor color="subdued">{i18n.OPTIONS(options.length)}</EuiTextColor>
+              </div>
+              <EuiSpacer size="xs" />
+              {list}
+            </div>
+          )}
+        </EuiSelectable>
+      </EuiPopover>
+    </EuiFilterGroup>
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/service_provider_filter.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/service_provider_filter.tsx
new file mode 100644
index 0000000000000..3d7f9568428ef
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/service_provider_filter.tsx
@@ -0,0 +1,43 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { SERVICE_PROVIDERS } from '../render_table_columns/render_service_provider/service_provider';
+import type { FilterOptions, ServiceProviderKeys } from '../types';
+import { MultiSelectFilter, MultiSelectFilterOption } from './multi_select_filter';
+import * as i18n from './translations';
+
+interface Props {
+  optionKeys: ServiceProviderKeys[];
+  onChange: (newFilterOptions: Partial<FilterOptions>) => void;
+}
+
+const options = Object.entries(SERVICE_PROVIDERS).map(([key, { name }]) => ({
+  key,
+  label: name,
+}));
+
+export const ServiceProviderFilter: React.FC<Props> = ({ optionKeys, onChange }) => {
+  const filterId: string = 'provider';
+  const onSystemFilterChange = (newOptions: MultiSelectFilterOption[]) => {
+    onChange({
+      [filterId]: newOptions
+        .filter((option) => option.checked === 'on')
+        .map((option) => option.key),
+    });
+  };
+
+  return (
+    <MultiSelectFilter
+      buttonLabel={i18n.SERVICE_PROVIDER}
+      onChange={onSystemFilterChange}
+      options={options}
+      renderOption={(option) => option.label}
+      selectedOptionKeys={optionKeys}
+    />
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/task_type_filter.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/task_type_filter.tsx
new file mode 100644
index 0000000000000..389757b833db6
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/task_type_filter.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { FilterOptions, TaskTypes } from '../types';
+import { MultiSelectFilter, MultiSelectFilterOption } from './multi_select_filter';
+import * as i18n from './translations';
+
+interface Props {
+  optionKeys: TaskTypes[];
+  onChange: (newFilterOptions: Partial<FilterOptions>) => void;
+}
+
+const options = Object.values(TaskTypes).map((option) => ({
+  key: option,
+  label: option,
+}));
+
+export const TaskTypeFilter: React.FC<Props> = ({ optionKeys, onChange }) => {
+  const filterId: string = 'type';
+  const onSystemFilterChange = (newOptions: MultiSelectFilterOption[]) => {
+    onChange({
+      [filterId]: newOptions
+        .filter((option) => option.checked === 'on')
+        .map((option) => option.key),
+    });
+  };
+
+  return (
+    <MultiSelectFilter
+      buttonLabel={i18n.TASK_TYPE}
+      onChange={onSystemFilterChange}
+      options={options}
+      renderOption={(option) => option.label}
+      selectedOptionKeys={optionKeys}
+    />
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/translations.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/translations.ts
new file mode 100644
index 0000000000000..f373e8f5d5a46
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/filter/translations.ts
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export { SERVICE_PROVIDER, TASK_TYPE } from '../../../../common/translations';
+
+export const EMPTY_FILTER_MESSAGE = i18n.translate(
+  'xpack.searchInferenceEndpoints.filter.emptyMessage',
+  {
+    defaultMessage: 'No options',
+  }
+);
+export const OPTIONS = (totalCount: number) =>
+  i18n.translate('xpack.searchInferenceEndpoints.filter.options', {
+    defaultMessage: '{totalCount, plural, one {# option} other {# options}}',
+    values: { totalCount },
+  });
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.test.tsx
new file mode 100644
index 0000000000000..1445e0c41c574
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.test.tsx
@@ -0,0 +1,73 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderReactTestingLibraryWithI18n as render } from '@kbn/test-jest-helpers';
+import React from 'react';
+import { useKibana } from '../../../../../../hooks/use_kibana';
+import { useCopyIDAction } from './use_copy_id_action';
+
+const mockInferenceEndpoint = {
+  deployment: 'not_applicable',
+  endpoint: {
+    model_id: 'hugging-face-embeddings',
+    task_type: 'text_embedding',
+    service: 'hugging_face',
+    service_settings: {
+      dimensions: 768,
+      rate_limit: {
+        requests_per_minute: 3000,
+      },
+    },
+    task_settings: {},
+  },
+  provider: 'hugging_face',
+  type: 'text_embedding',
+} as any;
+
+Object.defineProperty(navigator, 'clipboard', {
+  value: {
+    writeText: jest.fn().mockResolvedValue(undefined),
+  },
+  configurable: true,
+});
+
+const mockOnActionSuccess = jest.fn();
+
+jest.mock('../../../../../../hooks/use_kibana', () => ({
+  useKibana: jest.fn(),
+}));
+
+const addSuccess = jest.fn();
+
+(useKibana as jest.Mock).mockImplementation(() => ({
+  services: {
+    notifications: {
+      toasts: {
+        addSuccess,
+      },
+    },
+  },
+}));
+
+describe('useCopyIDAction hook', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders the label with correct text', () => {
+    const TestComponent = () => {
+      const { getAction } = useCopyIDAction({ onActionSuccess: mockOnActionSuccess });
+      const action = getAction(mockInferenceEndpoint);
+      return <div>{action}</div>;
+    };
+
+    const { getByTestId } = render(<TestComponent />);
+    const labelElement = getByTestId('inference-endpoints-action-copy-id-label');
+
+    expect(labelElement).toHaveTextContent('Copy endpoint ID');
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.tsx
new file mode 100644
index 0000000000000..b43b308af068a
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/copy_id/use_copy_id_action.tsx
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiContextMenuItem, EuiCopy, EuiIcon } from '@elastic/eui';
+import React from 'react';
+import * as i18n from '../../../../../../../common/translations';
+import { useKibana } from '../../../../../../hooks/use_kibana';
+import { InferenceEndpointUI } from '../../../../types';
+import { UseCopyIDActionProps } from '../types';
+
+export const useCopyIDAction = ({ onActionSuccess }: UseCopyIDActionProps) => {
+  const {
+    services: { notifications },
+  } = useKibana();
+  const toasts = notifications?.toasts;
+
+  const getAction = (inferenceEndpoint: InferenceEndpointUI) => {
+    return (
+      <EuiCopy textToCopy={inferenceEndpoint.endpoint.model_id} anchorClassName="eui-fullWidth">
+        {(copy) => (
+          <EuiContextMenuItem
+            key="copy"
+            data-test-subj="inference-endpoints-action-copy-id-label"
+            icon={<EuiIcon type="copyClipboard" size="m" />}
+            onClick={() => {
+              copy();
+              onActionSuccess();
+              toasts?.addSuccess({ title: i18n.COPY_ID_ACTION_SUCCESS });
+            }}
+            size="s"
+          >
+            {i18n.COPY_ID_ACTION_LABEL}
+          </EuiContextMenuItem>
+        )}
+      </EuiCopy>
+    );
+  };
+
+  return { getAction };
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.test.tsx
new file mode 100644
index 0000000000000..e6f4594e2d0cd
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.test.tsx
@@ -0,0 +1,41 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, fireEvent, screen } from '@testing-library/react';
+import React from 'react';
+import { ConfirmDeleteEndpointModal } from '.';
+import * as i18n from './translations';
+
+describe('ConfirmDeleteEndpointModal', () => {
+  const mockOnCancel = jest.fn();
+  const mockOnConfirm = jest.fn();
+
+  beforeEach(() => {
+    render(<ConfirmDeleteEndpointModal onCancel={mockOnCancel} onConfirm={mockOnConfirm} />);
+  });
+
+  it('renders the modal with correct texts', () => {
+    expect(screen.getByText(i18n.DELETE_TITLE)).toBeInTheDocument();
+    expect(screen.getByText(i18n.CONFIRM_DELETE_WARNING)).toBeInTheDocument();
+    expect(screen.getByText(i18n.CANCEL)).toBeInTheDocument();
+    expect(screen.getByText(i18n.DELETE_ACTION_LABEL)).toBeInTheDocument();
+  });
+
+  it('calls onCancel when the cancel button is clicked', () => {
+    fireEvent.click(screen.getByText(i18n.CANCEL));
+    expect(mockOnCancel).toHaveBeenCalled();
+  });
+
+  it('calls onConfirm when the delete button is clicked', () => {
+    fireEvent.click(screen.getByText(i18n.DELETE_ACTION_LABEL));
+    expect(mockOnConfirm).toHaveBeenCalled();
+  });
+
+  it('has the delete button focused by default', () => {
+    expect(document.activeElement).toHaveTextContent(i18n.DELETE_ACTION_LABEL);
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.tsx
new file mode 100644
index 0000000000000..e650192a66dc7
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/index.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiConfirmModal } from '@elastic/eui';
+import * as i18n from './translations';
+
+interface ConfirmDeleteEndpointModalProps {
+  onCancel: () => void;
+  onConfirm: () => void;
+}
+
+export const ConfirmDeleteEndpointModal: React.FC<ConfirmDeleteEndpointModalProps> = ({
+  onCancel,
+  onConfirm,
+}) => {
+  return (
+    <EuiConfirmModal
+      buttonColor="danger"
+      cancelButtonText={i18n.CANCEL}
+      confirmButtonText={i18n.DELETE_ACTION_LABEL}
+      defaultFocusedButton="confirm"
+      onCancel={onCancel}
+      onConfirm={onConfirm}
+      title={i18n.DELETE_TITLE}
+    >
+      {i18n.CONFIRM_DELETE_WARNING}
+    </EuiConfirmModal>
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/translations.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/translations.ts
new file mode 100644
index 0000000000000..6b2dff7d8b8f1
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/confirm_delete_endpoint/translations.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+export * from '../../../../../../../../common/translations';
+
+export const DELETE_TITLE = i18n.translate(
+  'xpack.searchInferenceEndpoints.confirmDeleteEndpoint.title',
+  {
+    defaultMessage: 'Delete inference endpoint',
+  }
+);
+
+export const CONFIRM_DELETE_WARNING = i18n.translate(
+  'xpack.searchInferenceEndpoints.confirmDeleteEndpoint.confirmQuestion',
+  {
+    defaultMessage:
+      'Deleting an active endpoint will cause operations targeting associated semantic_text fields and inference pipelines to fail.',
+  }
+);
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/use_delete_action.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/use_delete_action.tsx
new file mode 100644
index 0000000000000..1a2e5cdb5b51f
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/delete/use_delete_action.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiContextMenuItem, EuiIcon } from '@elastic/eui';
+import React, { useCallback, useState } from 'react';
+import * as i18n from '../../../../../../../common/translations';
+import { useDeleteEndpoint } from '../../../../../../hooks/use_delete_endpoint';
+import { InferenceEndpointUI } from '../../../../types';
+import type { UseActionProps } from '../types';
+
+export const useDeleteAction = ({ onActionSuccess }: UseActionProps) => {
+  const [isModalVisible, setIsModalVisible] = useState<boolean>(false);
+  const [endpointToBeDeleted, setEndpointToBeDeleted] = useState<InferenceEndpointUI | null>(null);
+  const onCloseModal = useCallback(() => setIsModalVisible(false), []);
+  const openModal = useCallback(
+    (selectedEndpoint: InferenceEndpointUI) => {
+      onActionSuccess();
+      setIsModalVisible(true);
+      setEndpointToBeDeleted(selectedEndpoint);
+    },
+    [onActionSuccess]
+  );
+
+  const { mutate: deleteEndpoint } = useDeleteEndpoint();
+
+  const onConfirmDeletion = useCallback(() => {
+    onCloseModal();
+    if (!endpointToBeDeleted) {
+      return;
+    }
+
+    deleteEndpoint({
+      type: endpointToBeDeleted.type,
+      id: endpointToBeDeleted.endpoint.model_id,
+    });
+  }, [deleteEndpoint, onCloseModal, endpointToBeDeleted]);
+
+  const getAction = (selectedEndpoint: InferenceEndpointUI) => {
+    return (
+      <EuiContextMenuItem
+        key="delete"
+        icon={<EuiIcon type="trash" size="m" color={'danger'} />}
+        onClick={() => openModal(selectedEndpoint)}
+      >
+        {i18n.DELETE_ACTION_LABEL}
+      </EuiContextMenuItem>
+    );
+  };
+
+  return { getAction, isModalVisible, onConfirmDeletion, onCloseModal };
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/types.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/types.ts
new file mode 100644
index 0000000000000..a80ccae703b7a
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/actions/types.ts
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export interface UseActionProps {
+  onActionSuccess: () => void;
+}
+
+export type UseCopyIDActionProps = Pick<UseActionProps, 'onActionSuccess'>;
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/use_actions.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/use_actions.tsx
new file mode 100644
index 0000000000000..f76d147c68646
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_actions/use_actions.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { EuiTableComputedColumnType } from '@elastic/eui';
+import { EuiButtonIcon, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
+import React, { useCallback, useState } from 'react';
+import { InferenceEndpointUI } from '../../types';
+import { useCopyIDAction } from './actions/copy_id/use_copy_id_action';
+import { ConfirmDeleteEndpointModal } from './actions/delete/confirm_delete_endpoint';
+import { useDeleteAction } from './actions/delete/use_delete_action';
+
+export const ActionColumn: React.FC<{ interfaceEndpoint: InferenceEndpointUI }> = ({
+  interfaceEndpoint,
+}) => {
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+  const tooglePopover = useCallback(() => setIsPopoverOpen(!isPopoverOpen), [isPopoverOpen]);
+  const closePopover = useCallback(() => setIsPopoverOpen(false), []);
+
+  const copyIDAction = useCopyIDAction({
+    onActionSuccess: closePopover,
+  });
+
+  const deleteAction = useDeleteAction({
+    onActionSuccess: closePopover,
+  });
+
+  const items = [
+    copyIDAction.getAction(interfaceEndpoint),
+    deleteAction.getAction(interfaceEndpoint),
+  ];
+
+  return (
+    <>
+      <EuiPopover
+        button={
+          <EuiButtonIcon
+            onClick={tooglePopover}
+            iconType="boxesHorizontal"
+            aria-label={'Actions'}
+            color="text"
+            disabled={false}
+          />
+        }
+        isOpen={isPopoverOpen}
+        closePopover={closePopover}
+        panelPaddingSize="none"
+        anchorPosition="downLeft"
+      >
+        <EuiContextMenuPanel size="s" items={items} />
+      </EuiPopover>
+      {deleteAction.isModalVisible ? (
+        <ConfirmDeleteEndpointModal
+          onCancel={deleteAction.onCloseModal}
+          onConfirm={deleteAction.onConfirmDeletion}
+        />
+      ) : null}
+    </>
+  );
+};
+
+interface UseBulkActionsReturnValue {
+  actions: EuiTableComputedColumnType<InferenceEndpointUI>;
+}
+
+export const useActions = (): UseBulkActionsReturnValue => {
+  return {
+    actions: {
+      align: 'right',
+      render: (interfaceEndpoint: InferenceEndpointUI) => {
+        return <ActionColumn interfaceEndpoint={interfaceEndpoint} />;
+      },
+      width: '165px',
+    },
+  };
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.test.tsx
new file mode 100644
index 0000000000000..59414cd6c90ef
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.test.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { DeploymentStatus } from './deployment_status';
+import { DeploymentStatusEnum } from '../../types';
+
+describe('DeploymentStatus component', () => {
+  it.each([[DeploymentStatusEnum.deployed, DeploymentStatusEnum.notDeployed]])(
+    'renders with %s status, expects %s color, and correct data-test-subj attribute',
+    (status) => {
+      render(<DeploymentStatus status={status} />);
+      const healthComponent = screen.getByTestId(`table-column-deployment-${status}`);
+      expect(healthComponent).toBeInTheDocument();
+    }
+  );
+
+  it('does not render when status is notApplicable', () => {
+    const { container } = render(<DeploymentStatus status={DeploymentStatusEnum.notApplicable} />);
+    expect(container).toBeEmptyDOMElement();
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.tsx
new file mode 100644
index 0000000000000..61e6e620d2485
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/deployment_status.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiIcon, EuiToolTip } from '@elastic/eui';
+import { DeploymentStatusEnum } from '../../types';
+import * as i18n from './translations';
+
+interface DeploymentStatusProps {
+  status: DeploymentStatusEnum;
+}
+
+export const DeploymentStatus: React.FC<DeploymentStatusProps> = ({ status }) => {
+  if (status === DeploymentStatusEnum.notApplicable) {
+    return null;
+  }
+
+  let statusColor: string;
+  let type: string;
+  let tooltip: string;
+
+  switch (status) {
+    case DeploymentStatusEnum.deployed:
+      statusColor = 'success';
+      type = 'dot';
+      tooltip = i18n.MODEL_DEPLOYED;
+      break;
+    case DeploymentStatusEnum.notDeployed:
+      statusColor = 'warning';
+      type = 'warning';
+      tooltip = i18n.MODEL_NOT_DEPLOYED;
+      break;
+    case DeploymentStatusEnum.notDeployable:
+      statusColor = 'danger';
+      type = 'dot';
+      tooltip = i18n.MODEL_FAILED_TO_BE_DEPLOYED;
+  }
+
+  return (
+    <EuiToolTip content={tooltip}>
+      <EuiIcon
+        type={type}
+        data-test-subj={`table-column-deployment-${status}`}
+        color={statusColor}
+      />
+    </EuiToolTip>
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/translations.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/translations.ts
new file mode 100644
index 0000000000000..9a5448f5bf0d2
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_deployment_status/translations.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const MODEL_DEPLOYED = i18n.translate(
+  'xpack.searchInferenceEndpoints.deploymentStatus.tooltip.modelDeployed',
+  {
+    defaultMessage: 'Model is deployed',
+  }
+);
+
+export const MODEL_NOT_DEPLOYED = i18n.translate(
+  'xpack.searchInferenceEndpoints.deploymentStatus.tooltip.modelNotDeployed',
+  {
+    defaultMessage: 'Model is not deployed',
+  }
+);
+
+export const MODEL_FAILED_TO_BE_DEPLOYED = i18n.translate(
+  'xpack.searchInferenceEndpoints.deploymentStatus.tooltip.modelFailedToBeDeployed',
+  {
+    defaultMessage: 'Model can not be deployed',
+  }
+);
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.test.tsx
new file mode 100644
index 0000000000000..c92c01240425c
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.test.tsx
@@ -0,0 +1,257 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { EndpointInfo } from './endpoint_info';
+
+describe('RenderEndpoint component tests', () => {
+  describe('with cohere service', () => {
+    const mockEndpoint = {
+      model_id: 'cohere-2',
+      service: 'cohere',
+      service_settings: {
+        similarity: 'cosine',
+        dimensions: 384,
+        model_id: 'embed-english-light-v3.0',
+        rate_limit: {
+          requests_per_minute: 10000,
+        },
+        embedding_type: 'byte',
+      },
+      task_settings: {},
+    } as any;
+
+    it('renders the component with endpoint details for Cohere service', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('cohere-2')).toBeInTheDocument();
+      expect(screen.getByText('byte')).toBeInTheDocument();
+      expect(screen.getByText('embed-english-light-v3.0')).toBeInTheDocument();
+    });
+
+    it('does not render model_id badge if serviceSettings.model_id is not provided for Cohere service', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: { ...mockEndpoint.service_settings, model_id: undefined },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.queryByText('embed-english-light-v3.0')).not.toBeInTheDocument();
+    });
+
+    it('renders only model_id if other settings are not provided for Cohere service', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: { model_id: 'embed-english-light-v3.0' },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('embed-english-light-v3.0')).toBeInTheDocument();
+      expect(screen.queryByText(',')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('with elasticsearch service', () => {
+    const mockEndpoint = {
+      model_id: 'model-123',
+      service: 'elasticsearch',
+      service_settings: {
+        num_allocations: 5,
+        num_threads: 10,
+        model_id: 'settings-model-123',
+      },
+    } as any;
+
+    it('renders the component with endpoint model_id and model settings', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('model-123')).toBeInTheDocument();
+      expect(screen.getByText('settings-model-123')).toBeInTheDocument();
+      expect(screen.getByText('Threads: 10 | Allocations: 5')).toBeInTheDocument();
+    });
+
+    it('renders the component with only model_id if num_threads and num_allocations are not provided', () => {
+      const modifiedSettings = {
+        ...mockEndpoint.service_settings,
+        num_threads: undefined,
+        num_allocations: undefined,
+      };
+      const modifiedEndpoint = { ...mockEndpoint, service_settings: modifiedSettings };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('model-123')).toBeInTheDocument();
+      expect(screen.getByText('settings-model-123')).toBeInTheDocument();
+      expect(screen.queryByText('Threads: 10 | Allocations: 5')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('with azureaistudio service', () => {
+    const mockEndpoint = {
+      model_id: 'azure-ai-1',
+      service: 'azureaistudio',
+      service_settings: {
+        target: 'westus',
+        provider: 'microsoft_phi',
+        endpoint_type: 'realtime',
+      },
+    } as any;
+
+    it('renders the component with endpoint details', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('azure-ai-1')).toBeInTheDocument();
+      expect(screen.getByText('microsoft_phi, realtime, westus')).toBeInTheDocument();
+    });
+
+    it('renders correctly when some service settings are missing', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: { target: 'westus', provider: 'microsoft_phi' },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('microsoft_phi, westus')).toBeInTheDocument();
+    });
+
+    it('does not render a comma when only one service setting is provided', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: { target: 'westus' },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('westus')).toBeInTheDocument();
+      expect(screen.queryByText(',')).not.toBeInTheDocument();
+    });
+
+    it('renders nothing related to service settings when all are missing', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: {},
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('azure-ai-1')).toBeInTheDocument();
+      expect(screen.queryByText('westus')).not.toBeInTheDocument();
+      expect(screen.queryByText('microsoft_phi')).not.toBeInTheDocument();
+      expect(screen.queryByText('realtime')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('with azureopenai service', () => {
+    const mockEndpoint = {
+      model_id: 'azure-openai-1',
+      service: 'azureopenai',
+      service_settings: {
+        resource_name: 'resource-xyz',
+        deployment_id: 'deployment-123',
+        api_version: 'v1',
+      },
+    } as any;
+
+    it('renders the component with all required endpoint details', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('azure-openai-1')).toBeInTheDocument();
+      expect(screen.getByText('resource-xyz, deployment-123, v1')).toBeInTheDocument();
+    });
+  });
+
+  describe('with mistral service', () => {
+    const mockEndpoint = {
+      model_id: 'mistral-ai-1',
+      service: 'mistral',
+      service_settings: {
+        model: 'model-xyz',
+        max_input_tokens: 512,
+        rate_limit: {
+          requests_per_minute: 1000,
+        },
+      },
+    } as any;
+
+    it('renders the component with endpoint details', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('mistral-ai-1')).toBeInTheDocument();
+      expect(screen.getByText('model-xyz')).toBeInTheDocument();
+      expect(screen.getByText('max_input_tokens: 512, rate_limit: 1000')).toBeInTheDocument();
+    });
+
+    it('renders correctly when some service settings are missing', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: {
+          model: 'model-xyz',
+          max_input_tokens: 512,
+        },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('max_input_tokens: 512')).toBeInTheDocument();
+    });
+
+    it('does not render a comma when only one service setting is provided', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: { model: 'model-xyz' },
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('model-xyz')).toBeInTheDocument();
+      expect(screen.queryByText(',')).not.toBeInTheDocument();
+    });
+
+    it('renders nothing related to service settings when all are missing', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: {},
+      };
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('mistral-ai-1')).toBeInTheDocument();
+      expect(screen.queryByText('model-xyz')).not.toBeInTheDocument();
+      expect(screen.queryByText('max_input_tokens: 512')).not.toBeInTheDocument();
+      expect(screen.queryByText('rate_limit: 1000')).not.toBeInTheDocument();
+    });
+  });
+
+  describe('with googleaistudio service', () => {
+    const mockEndpoint = {
+      model_id: 'google-ai-1',
+      service: 'googleaistudio',
+      service_settings: {
+        model_id: 'model-abc',
+        rate_limit: {
+          requests_per_minute: 500,
+        },
+      },
+    } as any;
+
+    it('renders the component with endpoint details', () => {
+      render(<EndpointInfo endpoint={mockEndpoint} />);
+
+      expect(screen.getByText('model-abc')).toBeInTheDocument();
+      expect(screen.getByText('rate_limit: 500')).toBeInTheDocument();
+    });
+
+    it('renders correctly when rate limit is missing', () => {
+      const modifiedEndpoint = {
+        ...mockEndpoint,
+        service_settings: {
+          model_id: 'model-abc',
+        },
+      };
+
+      render(<EndpointInfo endpoint={modifiedEndpoint} />);
+
+      expect(screen.getByText('model-abc')).toBeInTheDocument();
+      expect(screen.queryByText('Rate limit:')).not.toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx
new file mode 100644
index 0000000000000..ae482b609346f
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/endpoint_info.tsx
@@ -0,0 +1,164 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import { EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
+import { ServiceProviderKeys } from '../../types';
+import { ModelBadge } from './model_badge';
+import * as i18n from './translations';
+
+export interface EndpointInfoProps {
+  endpoint: InferenceAPIConfigResponse;
+}
+
+export const EndpointInfo: React.FC<EndpointInfoProps> = ({ endpoint }) => {
+  return (
+    <EuiFlexGroup gutterSize="s" direction="column">
+      <EuiFlexItem grow={false}>
+        <strong>{endpoint.model_id}</strong>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EndpointModelInfo endpoint={endpoint} />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+export const EndpointModelInfo: React.FC<EndpointInfoProps> = ({ endpoint }) => {
+  const serviceSettings = endpoint.service_settings;
+  const modelId =
+    'model_id' in serviceSettings
+      ? serviceSettings.model_id
+      : 'model' in serviceSettings
+      ? serviceSettings.model
+      : undefined;
+
+  return (
+    <EuiFlexGroup gutterSize="s" alignItems="center">
+      {modelId && (
+        <EuiFlexItem grow={false}>
+          <ModelBadge model={modelId} />
+        </EuiFlexItem>
+      )}
+      <EuiFlexItem grow={false}>
+        <EuiText color="subdued" size="xs">
+          {endpointModelAtrributes(endpoint)}
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
+
+function endpointModelAtrributes(endpoint: InferenceAPIConfigResponse) {
+  switch (endpoint.service) {
+    case ServiceProviderKeys.elser:
+    case ServiceProviderKeys.elasticsearch:
+      return elasticsearchAttributes(endpoint);
+    case ServiceProviderKeys.cohere:
+      return cohereAttributes(endpoint);
+    case ServiceProviderKeys.hugging_face:
+      return huggingFaceAttributes(endpoint);
+    case ServiceProviderKeys.openai:
+      return openAIAttributes(endpoint);
+    case ServiceProviderKeys.azureaistudio:
+      return azureOpenAIStudioAttributes(endpoint);
+    case ServiceProviderKeys.azureopenai:
+      return azureOpenAIAttributes(endpoint);
+    case ServiceProviderKeys.mistral:
+      return mistralAttributes(endpoint);
+    case ServiceProviderKeys.googleaistudio:
+      return googleAIStudioAttributes(endpoint);
+    default:
+      return null;
+  }
+}
+
+function elasticsearchAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+
+  const numAllocations =
+    'num_allocations' in serviceSettings ? serviceSettings.num_allocations : undefined;
+  const numThreads = 'num_threads' in serviceSettings ? serviceSettings.num_threads : undefined;
+
+  return `${numThreads ? i18n.THREADS(numThreads) : ''}${
+    numThreads && numAllocations ? ' | ' : ''
+  }${numAllocations ? i18n.ALLOCATIONS(numAllocations) : ''}`;
+}
+
+function cohereAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+  const embeddingType =
+    'embedding_type' in serviceSettings ? serviceSettings.embedding_type : undefined;
+
+  const taskSettings = endpoint.task_settings;
+  const inputType = 'input_type' in taskSettings ? taskSettings.input_type : undefined;
+  const truncate = 'truncate' in taskSettings ? taskSettings.truncate : undefined;
+
+  return [embeddingType, inputType, truncate && `truncate: ${truncate}`].filter(Boolean).join(', ');
+}
+
+function huggingFaceAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+  const url = 'url' in serviceSettings ? serviceSettings.url : null;
+
+  return url;
+}
+
+function openAIAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+  const url = 'url' in serviceSettings ? serviceSettings.url : null;
+
+  return url;
+}
+
+function azureOpenAIStudioAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+  const provider = 'provider' in serviceSettings ? serviceSettings.provider : undefined;
+  const endpointType =
+    'endpoint_type' in serviceSettings ? serviceSettings.endpoint_type : undefined;
+  const target = 'target' in serviceSettings ? serviceSettings.target : undefined;
+
+  return [provider, endpointType, target].filter(Boolean).join(', ');
+}
+
+function azureOpenAIAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+
+  const resourceName =
+    'resource_name' in serviceSettings ? serviceSettings.resource_name : undefined;
+  const deploymentId =
+    'deployment_id' in serviceSettings ? serviceSettings.deployment_id : undefined;
+  const apiVersion = 'api_version' in serviceSettings ? serviceSettings.api_version : undefined;
+
+  return [resourceName, deploymentId, apiVersion].filter(Boolean).join(', ');
+}
+
+function mistralAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+
+  const maxInputTokens =
+    'max_input_tokens' in serviceSettings ? serviceSettings.max_input_tokens : undefined;
+  const rateLimit =
+    'rate_limit' in serviceSettings ? serviceSettings.rate_limit.requests_per_minute : undefined;
+
+  return [
+    maxInputTokens && `max_input_tokens: ${maxInputTokens}`,
+    rateLimit && `rate_limit: ${rateLimit}`,
+  ]
+    .filter(Boolean)
+    .join(', ');
+}
+
+function googleAIStudioAttributes(endpoint: InferenceAPIConfigResponse) {
+  const serviceSettings = endpoint.service_settings;
+
+  const rateLimit =
+    'rate_limit' in serviceSettings ? serviceSettings.rate_limit.requests_per_minute : undefined;
+
+  return rateLimit && `rate_limit: ${rateLimit}`;
+}
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/model_badge.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/model_badge.tsx
new file mode 100644
index 0000000000000..e4b241abd8199
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/model_badge.tsx
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiBadge, useEuiTheme } from '@elastic/eui';
+
+interface ModelBadgeProps {
+  model?: string;
+}
+
+export const ModelBadge: React.FC<ModelBadgeProps> = ({ model }) => {
+  const { euiTheme } = useEuiTheme();
+
+  if (!model) return null;
+
+  return <EuiBadge color={euiTheme.colors.body}>{model}</EuiBadge>;
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/translations.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/translations.ts
new file mode 100644
index 0000000000000..52705999e8b44
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_endpoint/translations.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const THREADS = (numThreads: number) =>
+  i18n.translate('xpack.searchInferenceEndpoints.elasticsearch.threads', {
+    defaultMessage: 'Threads: {numThreads}',
+    values: { numThreads },
+  });
+
+export const ALLOCATIONS = (numAllocations: number) =>
+  i18n.translate('xpack.searchInferenceEndpoints.elasticsearch.allocations', {
+    defaultMessage: 'Allocations: {numAllocations}',
+    values: { numAllocations },
+  });
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.test.tsx
new file mode 100644
index 0000000000000..a592569abb0aa
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.test.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { ServiceProvider } from './service_provider';
+import { ServiceProviderKeys } from '../../types';
+
+jest.mock('../../../../assets/images/providers/elastic.svg', () => 'elasticIcon.svg');
+jest.mock('../../../../assets/images/providers/hugging_face.svg', () => 'huggingFaceIcon.svg');
+jest.mock('../../../../assets/images/providers/cohere.svg', () => 'cohereIcon.svg');
+jest.mock('../../../../assets/images/providers/open_ai.svg', () => 'openAIIcon.svg');
+
+describe('ServiceProvider component', () => {
+  it('renders Hugging Face icon and name when providerKey is hugging_face', () => {
+    render(<ServiceProvider providerKey={ServiceProviderKeys.hugging_face} />);
+    expect(screen.getByText('Hugging Face')).toBeInTheDocument();
+    const icon = screen.getByTestId('table-column-service-provider-hugging_face');
+    expect(icon).toBeInTheDocument();
+  });
+
+  it('renders Open AI icon and name when providerKey is openai', () => {
+    render(<ServiceProvider providerKey={ServiceProviderKeys.openai} />);
+    expect(screen.getByText('OpenAI')).toBeInTheDocument();
+    const icon = screen.getByTestId('table-column-service-provider-openai');
+    expect(icon).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.tsx
new file mode 100644
index 0000000000000..c4f09213158ce
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_service_provider/service_provider.tsx
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiIcon } from '@elastic/eui';
+import React from 'react';
+import elasticIcon from '../../../../assets/images/providers/elastic.svg';
+import huggingFaceIcon from '../../../../assets/images/providers/hugging_face.svg';
+import cohereIcon from '../../../../assets/images/providers/cohere.svg';
+import openAIIcon from '../../../../assets/images/providers/open_ai.svg';
+import azureAIStudioIcon from '../../../../assets/images/providers/azure_ai_studio.svg';
+import azureOpenAIIcon from '../../../../assets/images/providers/azure_open_ai.svg';
+import googleAIStudioIcon from '../../../../assets/images/providers/google_ai_studio.svg';
+import mistralIcon from '../../../../assets/images/providers/mistral.svg';
+import { ServiceProviderKeys } from '../../types';
+
+interface ServiceProviderProps {
+  providerKey: ServiceProviderKeys;
+}
+
+interface ServiceProviderRecord {
+  icon: string;
+  name: string;
+}
+
+export const SERVICE_PROVIDERS: Record<ServiceProviderKeys, ServiceProviderRecord> = {
+  [ServiceProviderKeys.azureaistudio]: {
+    icon: azureAIStudioIcon,
+    name: 'Azure AI Studio',
+  },
+  [ServiceProviderKeys.azureopenai]: {
+    icon: azureOpenAIIcon,
+    name: 'Azure OpenAI',
+  },
+  [ServiceProviderKeys.cohere]: {
+    icon: cohereIcon,
+    name: 'Cohere',
+  },
+  [ServiceProviderKeys.elasticsearch]: {
+    icon: elasticIcon,
+    name: 'Elasticsearch',
+  },
+  [ServiceProviderKeys.elser]: {
+    icon: elasticIcon,
+    name: 'ELSER',
+  },
+  [ServiceProviderKeys.googleaistudio]: {
+    icon: googleAIStudioIcon,
+    name: 'Google AI Studio',
+  },
+  [ServiceProviderKeys.hugging_face]: {
+    icon: huggingFaceIcon,
+    name: 'Hugging Face',
+  },
+  [ServiceProviderKeys.mistral]: {
+    icon: mistralIcon,
+    name: 'Mistral',
+  },
+  [ServiceProviderKeys.openai]: {
+    icon: openAIIcon,
+    name: 'OpenAI',
+  },
+};
+
+export const ServiceProvider: React.FC<ServiceProviderProps> = ({ providerKey }) => {
+  const provider = SERVICE_PROVIDERS[providerKey];
+
+  return provider ? (
+    <>
+      <EuiIcon
+        data-test-subj={`table-column-service-provider-${providerKey}`}
+        type={provider.icon}
+        style={{ marginRight: '8px' }}
+      />
+      <span>{provider.name}</span>
+    </>
+  ) : (
+    <span>{providerKey}</span>
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.test.tsx
new file mode 100644
index 0000000000000..c81ce80a619e5
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.test.tsx
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen } from '@testing-library/react';
+import React from 'react';
+import { TaskType } from './task_type';
+import { TaskTypes } from '../../types';
+
+describe('TaskType component', () => {
+  it.each([
+    [TaskTypes.completion, 'completion'],
+    [TaskTypes.sparse_embedding, 'sparse_embedding'],
+    [TaskTypes.text_embedding, 'text_embedding'],
+  ])('renders the task type badge for %s', (taskType, expected) => {
+    render(<TaskType type={taskType} />);
+    const badge = screen.getByTestId(`table-column-task-type-${taskType}`);
+    expect(badge).toBeInTheDocument();
+    expect(badge).toHaveTextContent(expected);
+  });
+
+  it('returns null when type is null', () => {
+    const { container } = render(<TaskType />);
+    expect(container).toBeEmptyDOMElement();
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.tsx
new file mode 100644
index 0000000000000..c294255961748
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/render_task_type/task_type.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiBadge } from '@elastic/eui';
+import React from 'react';
+import { TaskTypes } from '../../types';
+
+interface TaskTypeProps {
+  type?: TaskTypes;
+}
+
+export const TaskType: React.FC<TaskTypeProps> = ({ type }) => {
+  if (type != null) {
+    return (
+      <EuiBadge data-test-subj={`table-column-task-type-${type}`} color="hollow">
+        {type}
+      </EuiBadge>
+    );
+  }
+
+  return null;
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/table_columns.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/table_columns.tsx
new file mode 100644
index 0000000000000..caca4449e02fa
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/render_table_columns/table_columns.tsx
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import React from 'react';
+import type { HorizontalAlignment } from '@elastic/eui';
+import * as i18n from '../../../../common/translations';
+import { useActions } from './render_actions/use_actions';
+import { EndpointInfo } from './render_endpoint/endpoint_info';
+import { ServiceProvider } from './render_service_provider/service_provider';
+import { TaskType } from './render_task_type/task_type';
+import { DeploymentStatus } from './render_deployment_status/deployment_status';
+import { DeploymentStatusEnum, ServiceProviderKeys, TaskTypes } from '../types';
+
+export const useTableColumns = () => {
+  const { actions } = useActions();
+  const deploymentAlignment: HorizontalAlignment = 'center';
+
+  const TABLE_COLUMNS = [
+    {
+      field: 'deployment',
+      name: '',
+      render: (deployment: DeploymentStatusEnum) => {
+        if (deployment != null) {
+          return <DeploymentStatus status={deployment} />;
+        }
+
+        return null;
+      },
+      width: '64px',
+      align: deploymentAlignment,
+    },
+    {
+      field: 'endpoint',
+      name: i18n.ENDPOINT,
+      render: (endpoint: InferenceAPIConfigResponse) => {
+        if (endpoint != null) {
+          return <EndpointInfo endpoint={endpoint} />;
+        }
+
+        return null;
+      },
+      sortable: true,
+    },
+    {
+      field: 'provider',
+      name: i18n.SERVICE_PROVIDER,
+      render: (provider: ServiceProviderKeys) => {
+        if (provider != null) {
+          return <ServiceProvider providerKey={provider} />;
+        }
+
+        return null;
+      },
+      sortable: false,
+      width: '265px',
+    },
+    {
+      field: 'type',
+      name: i18n.TASK_TYPE,
+      render: (type: TaskTypes) => {
+        if (type != null) {
+          return <TaskType type={type} />;
+        }
+
+        return null;
+      },
+      sortable: false,
+      width: '265px',
+    },
+    actions,
+  ];
+
+  return TABLE_COLUMNS;
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.test.tsx
new file mode 100644
index 0000000000000..b7d1dbcacfd71
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.test.tsx
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render, screen, fireEvent } from '@testing-library/react';
+import { TableSearch } from './table_search';
+import React from 'react';
+
+describe('TableSearchComponent', () => {
+  const mockSetSearchKey = jest.fn();
+
+  it('renders correctly', () => {
+    render(<TableSearch searchKey="" setSearchKey={mockSetSearchKey} />);
+    expect(screen.getByRole('searchbox')).toBeInTheDocument();
+  });
+
+  it('input value matches searchKey prop', () => {
+    render(<TableSearch searchKey="test" setSearchKey={mockSetSearchKey} />);
+    expect(screen.getByRole('searchbox')).toHaveValue('test');
+  });
+
+  it('calls setSearchKey on input change', () => {
+    render(<TableSearch searchKey="" setSearchKey={mockSetSearchKey} />);
+    fireEvent.change(screen.getByRole('searchbox'), { target: { value: 'new search' } });
+    expect(mockSetSearchKey).toHaveBeenCalledWith('new search');
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.tsx
new file mode 100644
index 0000000000000..086dcb9656d83
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/search/table_search.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFieldSearch } from '@elastic/eui';
+import React, { useCallback } from 'react';
+
+interface TableSearchComponentProps {
+  searchKey: string;
+  setSearchKey: React.Dispatch<React.SetStateAction<string>>;
+}
+
+export const TableSearch: React.FC<TableSearchComponentProps> = ({ searchKey, setSearchKey }) => {
+  const onSearch = useCallback(
+    (newSearch) => {
+      const trimSearch = newSearch.trim();
+      setSearchKey(trimSearch);
+    },
+    [setSearchKey]
+  );
+
+  return (
+    <EuiFieldSearch
+      aria-label="Search endpoints"
+      placeholder="Search"
+      onChange={(e) => setSearchKey(e.target.value)}
+      onSearch={onSearch}
+      value={searchKey}
+    />
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/table_columns.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/table_columns.ts
deleted file mode 100644
index 39e957f908684..0000000000000
--- a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/table_columns.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const TABLE_COLUMNS = [
-  {
-    field: 'endpoint',
-    name: i18n.translate('xpack.searchInferenceEndpoints.inferenceEndpoints.table.endpoint', {
-      defaultMessage: 'Endpoint',
-    }),
-    sortable: true,
-    width: '50%',
-  },
-  {
-    field: 'provider',
-    name: i18n.translate('xpack.searchInferenceEndpoints.inferenceEndpoints.table.provider', {
-      defaultMessage: 'Provider',
-    }),
-    sortable: false,
-    width: '110px',
-  },
-  {
-    field: 'type',
-    name: i18n.translate('xpack.searchInferenceEndpoints.inferenceEndpoints.table.type', {
-      defaultMessage: 'Type',
-    }),
-    sortable: false,
-    width: '90px',
-  },
-];
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx
index 091ff8270dd63..91a2ea959fdec 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.test.tsx
@@ -36,6 +36,12 @@ const inferenceEndpoints = [
   },
 ] as InferenceAPIConfigResponse[];
 
+jest.mock('../../hooks/use_delete_endpoint', () => ({
+  useDeleteEndpoint: () => ({
+    mutate: jest.fn().mockImplementation(() => Promise.resolve()), // Mock implementation of the mutate function
+  }),
+}));
+
 describe('When the tabular page is loaded', () => {
   beforeEach(() => {
     render(<TabularPage inferenceEndpoints={inferenceEndpoints} />);
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.tsx b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.tsx
index 2fb84dc4b99de..ec19ad49ad477 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/tabular_page.tsx
@@ -5,28 +5,87 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import { extractErrorProperties } from '@kbn/ml-error-utils';
+import * as i18n from '../../../common/translations';
 
 import { useTableData } from '../../hooks/use_table_data';
+import { FilterOptions } from './types';
+
+import { DeploymentStatusEnum } from './types';
 
 import { useAllInferenceEndpointsState } from '../../hooks/use_all_inference_endpoints_state';
 import { EndpointsTable } from './endpoints_table';
-import { TABLE_COLUMNS } from './table_columns';
+import { ServiceProviderFilter } from './filter/service_provider_filter';
+import { TaskTypeFilter } from './filter/task_type_filter';
+import { TableSearch } from './search/table_search';
+import { useTableColumns } from './render_table_columns/table_columns';
+import { useKibana } from '../../hooks/use_kibana';
 
 interface TabularPageProps {
   inferenceEndpoints: InferenceAPIConfigResponse[];
 }
 
 export const TabularPage: React.FC<TabularPageProps> = ({ inferenceEndpoints }) => {
-  const { queryParams, setQueryParams } = useAllInferenceEndpointsState();
+  const [searchKey, setSearchKey] = React.useState('');
+  const [deploymentStatus, setDeploymentStatus] = React.useState<
+    Record<string, DeploymentStatusEnum>
+  >({});
+  const { queryParams, setQueryParams, filterOptions, setFilterOptions } =
+    useAllInferenceEndpointsState();
+
+  const {
+    services: { ml, notifications },
+  } = useKibana();
+
+  const onFilterChangedCallback = useCallback(
+    (newFilterOptions: Partial<FilterOptions>) => {
+      setFilterOptions(newFilterOptions);
+    },
+    [setFilterOptions]
+  );
+
+  useEffect(() => {
+    const fetchDeploymentStatus = async () => {
+      const trainedModelStats = await ml?.mlApi?.trainedModels.getTrainedModelStats();
+      if (trainedModelStats) {
+        const newDeploymentStatus = trainedModelStats?.trained_model_stats.reduce(
+          (acc, modelStat) => {
+            if (modelStat.model_id) {
+              acc[modelStat.model_id] =
+                modelStat?.deployment_stats?.state === 'started'
+                  ? DeploymentStatusEnum.deployed
+                  : DeploymentStatusEnum.notDeployed;
+            }
+            return acc;
+          },
+          {} as Record<string, DeploymentStatusEnum>
+        );
+        setDeploymentStatus(newDeploymentStatus);
+      }
+    };
+
+    fetchDeploymentStatus().catch((error) => {
+      const errorObj = extractErrorProperties(error);
+      notifications?.toasts?.addError(errorObj.message ? new Error(error.message) : error, {
+        title: i18n.TRAINED_MODELS_STAT_GATHER_FAILED,
+      });
+    });
+  }, [ml, notifications]);
 
   const { paginatedSortedTableData, pagination, sorting } = useTableData(
     inferenceEndpoints,
-    queryParams
+    queryParams,
+    filterOptions,
+    searchKey,
+    deploymentStatus
   );
 
+  const tableColumns = useTableColumns();
+
   const handleTableChange = useCallback(
     ({ page, sort }) => {
       const newQueryParams = {
@@ -46,12 +105,32 @@ export const TabularPage: React.FC<TabularPageProps> = ({ inferenceEndpoints })
   );
 
   return (
-    <EndpointsTable
-      columns={TABLE_COLUMNS}
-      data={paginatedSortedTableData}
-      onChange={handleTableChange}
-      pagination={pagination}
-      sorting={sorting}
-    />
+    <EuiFlexGroup direction="column">
+      <EuiFlexItem>
+        <EuiFlexGroup gutterSize="s">
+          <EuiFlexItem style={{ width: '400px' }} grow={false}>
+            <TableSearch searchKey={searchKey} setSearchKey={setSearchKey} />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <ServiceProviderFilter
+              optionKeys={filterOptions.provider}
+              onChange={onFilterChangedCallback}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <TaskTypeFilter optionKeys={filterOptions.type} onChange={onFilterChangedCallback} />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EndpointsTable
+          columns={tableColumns}
+          data={paginatedSortedTableData}
+          onChange={handleTableChange}
+          pagination={pagination}
+          sorting={sorting}
+        />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/types.ts b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/types.ts
index 4afba1dda110a..4a83ac401c89a 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/types.ts
+++ b/x-pack/plugins/search_inference_endpoints/public/components/all_inference_endpoints/types.ts
@@ -5,8 +5,28 @@
  * 2.0.
  */
 
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
 export const INFERENCE_ENDPOINTS_TABLE_PER_PAGE_VALUES = [10, 25, 50, 100];
 
+export enum ServiceProviderKeys {
+  azureopenai = 'azureopenai',
+  azureaistudio = 'azureaistudio',
+  cohere = 'cohere',
+  elasticsearch = 'elasticsearch',
+  elser = 'elser',
+  googleaistudio = 'googleaistudio',
+  hugging_face = 'hugging_face',
+  mistral = 'mistral',
+  openai = 'openai',
+}
+
+export enum TaskTypes {
+  completion = 'completion',
+  rerank = 'rerank',
+  sparse_embedding = 'sparse_embedding',
+  text_embedding = 'text_embedding',
+}
+
 export enum SortFieldInferenceEndpoint {
   endpoint = 'endpoint',
 }
@@ -25,7 +45,13 @@ export interface QueryParams extends SortingParams {
   perPage: number;
 }
 
-export interface AlInferenceEndpointsTableState {
+export interface FilterOptions {
+  provider: ServiceProviderKeys[];
+  type: TaskTypes[];
+}
+
+export interface AllInferenceEndpointsTableState {
+  filterOptions: FilterOptions;
   queryParams: QueryParams;
 }
 
@@ -34,8 +60,16 @@ export interface EuiBasicTableSortTypes {
   field: string;
 }
 
+export enum DeploymentStatusEnum {
+  deployed = 'deployed',
+  notDeployed = 'not_deployed',
+  notDeployable = 'not_deployable',
+  notApplicable = 'not_applicable',
+}
+
 export interface InferenceEndpointUI {
-  endpoint: string;
+  deployment: DeploymentStatusEnum;
+  endpoint: InferenceAPIConfigResponse;
   provider: string;
   type: string;
 }
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/add_empty_prompt.tsx b/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/add_empty_prompt.tsx
index 69d74724016d6..ee858f7a8b640 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/add_empty_prompt.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/add_empty_prompt.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import {
   EuiButton,
-  EuiEmptyPrompt,
+  EuiPageTemplate,
   EuiFlexGroup,
   EuiFlexItem,
   EuiImage,
@@ -20,8 +20,7 @@ import * as i18n from '../../../common/translations';
 
 import inferenceEndpoint from '../../assets/images/inference_endpoint.svg';
 
-import { ElserPrompt } from './elser_prompt';
-import { MultilingualE5Prompt } from './multilingual_e5_prompt';
+import { EndpointPrompt } from './endpoint_prompt';
 
 import './add_empty_prompt.scss';
 
@@ -31,9 +30,12 @@ interface AddEmptyPromptProps {
 
 export const AddEmptyPrompt: React.FC<AddEmptyPromptProps> = ({ setIsInferenceFlyoutVisible }) => {
   return (
-    <EuiEmptyPrompt
-      className="addEmptyPrompt"
+    <EuiPageTemplate.EmptyPrompt
       layout="horizontal"
+      restrictWidth
+      color="plain"
+      hasShadow
+      icon={<EuiImage size="fullWidth" src={inferenceEndpoint} alt="" />}
       title={<h2>{i18n.INFERENCE_ENDPOINT_LABEL}</h2>}
       body={
         <EuiFlexGroup direction="column">
@@ -60,20 +62,41 @@ export const AddEmptyPrompt: React.FC<AddEmptyPromptProps> = ({ setIsInferenceFl
           <EuiFlexItem>
             <strong>{i18n.START_WITH_PREPARED_ENDPOINTS_LABEL}</strong>
           </EuiFlexItem>
-          <EuiSpacer />
+          <EuiSpacer size="s" />
           <EuiFlexGroup>
             <EuiFlexItem>
-              <ElserPrompt setIsInferenceFlyoutVisible={setIsInferenceFlyoutVisible} />
+              <EndpointPrompt
+                setIsInferenceFlyoutVisible={setIsInferenceFlyoutVisible}
+                title={i18n.ELSER_TITLE}
+                description={i18n.ELSER_DESCRIPTION}
+                footer={
+                  <EuiButton
+                    iconType="plusInCircle"
+                    onClick={() => setIsInferenceFlyoutVisible(true)}
+                  >
+                    {i18n.ADD_ENDPOINT_LABEL}
+                  </EuiButton>
+                }
+              />
             </EuiFlexItem>
             <EuiFlexItem>
-              <MultilingualE5Prompt setIsInferenceFlyoutVisible={setIsInferenceFlyoutVisible} />
+              <EndpointPrompt
+                setIsInferenceFlyoutVisible={setIsInferenceFlyoutVisible}
+                title={i18n.E5_TITLE}
+                description={i18n.E5_DESCRIPTION}
+                footer={
+                  <EuiButton
+                    iconType="plusInCircle"
+                    onClick={() => setIsInferenceFlyoutVisible(true)}
+                  >
+                    {i18n.ADD_ENDPOINT_LABEL}
+                  </EuiButton>
+                }
+              />
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexGroup>
       }
-      color="plain"
-      hasBorder
-      icon={<EuiImage size="fullWidth" src={inferenceEndpoint} alt="" />}
     />
   );
 };
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/elser_prompt.tsx b/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/elser_prompt.tsx
deleted file mode 100644
index db38b649fd66e..0000000000000
--- a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/elser_prompt.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { EuiButton, EuiCard } from '@elastic/eui';
-
-import * as i18n from '../../../common/translations';
-
-interface ElserPromptProps {
-  setIsInferenceFlyoutVisible: (value: boolean) => void;
-}
-export const ElserPrompt: React.FC<ElserPromptProps> = ({ setIsInferenceFlyoutVisible }) => (
-  <EuiCard
-    display="plain"
-    hasBorder
-    textAlign="left"
-    data-test-subj="elserPromptForEmptyState"
-    title={i18n.ELSER_TITLE}
-    description={i18n.ELSER_DESCRIPTION}
-    footer={
-      <EuiButton iconType="plusInCircle" onClick={() => setIsInferenceFlyoutVisible(true)}>
-        {i18n.ADD_ENDPOINT_LABEL}
-      </EuiButton>
-    }
-  />
-);
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/multilingual_e5_prompt.tsx b/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/endpoint_prompt.tsx
similarity index 51%
rename from x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/multilingual_e5_prompt.tsx
rename to x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/endpoint_prompt.tsx
index 69133909efcb2..b10812ef2e6a3 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/multilingual_e5_prompt.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/empty_prompt/endpoint_prompt.tsx
@@ -6,29 +6,28 @@
  */
 
 import React from 'react';
+import { EuiCard } from '@elastic/eui';
 
-import { EuiButton, EuiCard } from '@elastic/eui';
-
-import * as i18n from '../../../common/translations';
-
-interface MultilingualE5PromptProps {
+interface EndpointPromptProps {
   setIsInferenceFlyoutVisible: (value: boolean) => void;
+  title: string;
+  description: string;
+  footer: React.ReactElement;
 }
 
-export const MultilingualE5Prompt: React.FC<MultilingualE5PromptProps> = ({
+export const EndpointPrompt: React.FC<EndpointPromptProps> = ({
   setIsInferenceFlyoutVisible,
+  title,
+  description,
+  footer,
 }) => (
   <EuiCard
     display="plain"
-    hasBorder
     textAlign="left"
     data-test-subj="multilingualE5PromptForEmptyState"
-    title={i18n.E5_TITLE}
-    description={i18n.E5_DESCRIPTION}
-    footer={
-      <EuiButton iconType="plusInCircle" onClick={() => setIsInferenceFlyoutVisible(true)}>
-        {i18n.ADD_ENDPOINT_LABEL}
-      </EuiButton>
-    }
+    title={title}
+    titleSize="xs"
+    description={description}
+    footer={footer}
   />
 );
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/inference_endpoints_header.tsx b/x-pack/plugins/search_inference_endpoints/public/components/inference_endpoints_header.tsx
index 8b551af28bd4c..6956e470a9b77 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/inference_endpoints_header.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/inference_endpoints_header.tsx
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
+import { EuiButton, EuiPageTemplate } from '@elastic/eui';
 import React from 'react';
-import { EuiPageTemplate, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
 import * as i18n from '../../common/translations';
 
 interface InferenceEndpointsHeaderProps {
@@ -21,21 +21,18 @@ export const InferenceEndpointsHeader: React.FC<InferenceEndpointsHeaderProps> =
     data-test-subj="allInferenceEndpointsPage"
     pageTitle={i18n.INFERENCE_ENDPOINT_LABEL}
     description={i18n.MANAGE_INFERENCE_ENDPOINTS_LABEL}
+    bottomBorder={true}
     rightSideItems={[
-      <EuiFlexGroup gutterSize="xs">
-        <EuiFlexItem>
-          <EuiButton
-            key="newInferenceEndpoint"
-            color="primary"
-            iconType="plusInCircle"
-            data-test-subj="addEndpointButtonForAllInferenceEndpoints"
-            fill
-            onClick={() => setIsInferenceFlyoutVisible(true)}
-          >
-            {i18n.ADD_ENDPOINT_LABEL}
-          </EuiButton>
-        </EuiFlexItem>
-      </EuiFlexGroup>,
+      <EuiButton
+        key="newInferenceEndpoint"
+        color="primary"
+        iconType="plusInCircle"
+        data-test-subj="addEndpointButtonForAllInferenceEndpoints"
+        fill
+        onClick={() => setIsInferenceFlyoutVisible(true)}
+      >
+        {i18n.ADD_ENDPOINT_LABEL}
+      </EuiButton>,
     ]}
   />
 );
diff --git a/x-pack/plugins/search_inference_endpoints/public/components/inference_flyout_wrapper_component.tsx b/x-pack/plugins/search_inference_endpoints/public/components/inference_flyout_wrapper_component.tsx
index bf1343fe3db8b..43dc7d7d1751c 100644
--- a/x-pack/plugins/search_inference_endpoints/public/components/inference_flyout_wrapper_component.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/components/inference_flyout_wrapper_component.tsx
@@ -47,9 +47,11 @@ export const InferenceFlyoutWrapperComponent: React.FC<InferenceFlyoutWrapperCom
   const queryClient = useQueryClient();
 
   const {
-    services: { ml },
+    services: { ml, notifications },
   } = useKibana();
 
+  const toasts = notifications?.toasts;
+
   const createInferenceEndpointMutation = useMutation(
     async ({
       inferenceId,
@@ -64,6 +66,10 @@ export const InferenceFlyoutWrapperComponent: React.FC<InferenceFlyoutWrapperCom
         throw new Error(i18n.UNABLE_TO_CREATE_INFERENCE_ENDPOINT);
       }
       await ml?.mlApi?.inferenceModels?.createInferenceEndpoint(inferenceId, taskType, modelConfig);
+      toasts?.addSuccess({
+        title: i18n.ENDPOINT_ADDED_SUCCESS,
+        text: i18n.ENDPOINT_ADDED_SUCCESS_DESCRIPTION(inferenceId),
+      });
     },
     {
       onSuccess: () => {
@@ -87,17 +93,26 @@ export const InferenceFlyoutWrapperComponent: React.FC<InferenceFlyoutWrapperCom
   const onSaveInferenceCallback = useCallback(
     async (inferenceId: string, taskType: InferenceTaskType, modelConfig: ModelConfig) => {
       setIsCreateInferenceApiLoading(true);
-      try {
-        await createInferenceEndpointMutation.mutateAsync({ inferenceId, taskType, modelConfig });
-        setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
-      } catch (error) {
-        const errorObj = extractErrorProperties(error);
-        setInferenceAddError(errorObj.message);
-      } finally {
-        setIsCreateInferenceApiLoading(false);
-      }
+
+      createInferenceEndpointMutation
+        .mutateAsync({ inferenceId, taskType, modelConfig })
+        .catch((error) => {
+          const errorObj = extractErrorProperties(error);
+          notifications?.toasts?.addError(errorObj.message ? new Error(error.message) : error, {
+            title: i18n.ENDPOINT_CREATION_FAILED,
+          });
+        })
+        .finally(() => {
+          setIsCreateInferenceApiLoading(false);
+        });
+      setIsInferenceFlyoutVisible(!isInferenceFlyoutVisible);
     },
-    [createInferenceEndpointMutation, isInferenceFlyoutVisible, setIsInferenceFlyoutVisible]
+    [
+      createInferenceEndpointMutation,
+      isInferenceFlyoutVisible,
+      setIsInferenceFlyoutVisible,
+      notifications,
+    ]
   );
 
   const onFlyoutClose = useCallback(() => {
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/translations.ts b/x-pack/plugins/search_inference_endpoints/public/hooks/translations.ts
new file mode 100644
index 0000000000000..ee1dc26a54817
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/translations.ts
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+export * from '../../common/translations';
+
+export const ENDPOINT_DELETION_FAILED = i18n.translate(
+  'xpack.searchInferenceEndpoints.deleteEndpoint.endpointDeletionFailed',
+  {
+    defaultMessage: 'Endpoint deletion failed',
+  }
+);
+
+export const DELETE_SUCCESS = i18n.translate(
+  'xpack.searchInferenceEndpoints.deleteEndpoint.deleteSuccess',
+  {
+    defaultMessage: 'The inference endpoint has been deleted sucessfully.',
+  }
+);
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/use_all_inference_endpoints_state.tsx b/x-pack/plugins/search_inference_endpoints/public/hooks/use_all_inference_endpoints_state.tsx
index 4979cdf7994fc..c2a0486578a9e 100644
--- a/x-pack/plugins/search_inference_endpoints/public/hooks/use_all_inference_endpoints_state.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/use_all_inference_endpoints_state.tsx
@@ -9,7 +9,8 @@ import { useCallback, useState } from 'react';
 
 import type {
   QueryParams,
-  AlInferenceEndpointsTableState,
+  AllInferenceEndpointsTableState,
+  FilterOptions,
 } from '../components/all_inference_endpoints/types';
 
 import { DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE } from '../components/all_inference_endpoints/constants';
@@ -17,13 +18,15 @@ import { DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE } from '../components/all_infer
 interface UseAllInferenceEndpointsStateReturn {
   queryParams: QueryParams;
   setQueryParams: (queryParam: Partial<QueryParams>) => void;
+  filterOptions: FilterOptions;
+  setFilterOptions: (filterOptions: Partial<FilterOptions>) => void;
 }
 
 export function useAllInferenceEndpointsState(): UseAllInferenceEndpointsStateReturn {
-  const [tableState, setTableState] = useState<AlInferenceEndpointsTableState>(
+  const [tableState, setTableState] = useState<AllInferenceEndpointsTableState>(
     DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE
   );
-  const setState = useCallback((state: AlInferenceEndpointsTableState) => {
+  const setState = useCallback((state: AllInferenceEndpointsTableState) => {
     setTableState(state);
   }, []);
 
@@ -34,8 +37,19 @@ export function useAllInferenceEndpointsState(): UseAllInferenceEndpointsStateRe
     },
     setQueryParams: (newQueryParams: Partial<QueryParams>) => {
       setState({
+        filterOptions: tableState.filterOptions,
         queryParams: { ...tableState.queryParams, ...newQueryParams },
       });
     },
+    filterOptions: {
+      ...DEFAULT_INFERENCE_ENDPOINTS_TABLE_STATE.filterOptions,
+      ...tableState.filterOptions,
+    },
+    setFilterOptions: (newFilterOptions: Partial<FilterOptions>) => {
+      setState({
+        filterOptions: { ...tableState.filterOptions, ...newFilterOptions },
+        queryParams: tableState.queryParams,
+      });
+    },
   };
 }
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.test.tsx b/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.test.tsx
new file mode 100644
index 0000000000000..72e8dfe8418e2
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.test.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { renderHook } from '@testing-library/react-hooks';
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import { useKibana } from './use_kibana';
+import { useDeleteEndpoint } from './use_delete_endpoint';
+import * as i18n from './translations';
+import React from 'react';
+
+jest.mock('./use_kibana');
+
+const mockUseKibana = useKibana as jest.Mock;
+const mockDelete = jest.fn();
+const mockAddSuccess = jest.fn();
+const mockAddError = jest.fn();
+
+describe('useDeleteEndpoint', () => {
+  beforeEach(() => {
+    mockUseKibana.mockReturnValue({
+      services: {
+        http: {
+          delete: mockDelete,
+        },
+        notifications: {
+          toasts: {
+            addSuccess: mockAddSuccess,
+            addError: mockAddError,
+          },
+        },
+      },
+    });
+    mockDelete.mockResolvedValue({});
+  });
+
+  const wrapper = ({ children }: { children: React.ReactNode }) => {
+    const queryClient = new QueryClient();
+    return <QueryClientProvider client={queryClient}>{children}</QueryClientProvider>;
+  };
+
+  it('should call delete endpoint and show success toast on success', async () => {
+    const { result, waitFor } = renderHook(() => useDeleteEndpoint(), { wrapper });
+
+    result.current.mutate({ type: 'text_embedding', id: 'in-1' });
+
+    await waitFor(() =>
+      expect(mockDelete).toHaveBeenCalledWith(
+        '/internal/inference_endpoint/endpoints/text_embedding/in-1'
+      )
+    );
+    expect(mockAddSuccess).toHaveBeenCalledWith({
+      title: i18n.DELETE_SUCCESS,
+    });
+  });
+
+  it('should show error toast on failure', async () => {
+    const error = new Error('Deletion failed');
+    mockDelete.mockRejectedValue(error);
+    const { result, waitFor } = renderHook(() => useDeleteEndpoint(), { wrapper });
+
+    result.current.mutate({ type: 'model', id: '123' });
+
+    await waitFor(() => expect(mockAddError).toHaveBeenCalled());
+    expect(mockAddError).toHaveBeenCalledWith(error, {
+      title: i18n.ENDPOINT_DELETION_FAILED,
+    });
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.tsx b/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.tsx
new file mode 100644
index 0000000000000..e5464703dcfe2
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/use_delete_endpoint.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useKibana } from './use_kibana';
+import * as i18n from './translations';
+
+import { INFERENCE_ENDPOINTS_QUERY_KEY } from '../../common/constants';
+
+interface MutationArgs {
+  type: string;
+  id: string;
+}
+
+export const useDeleteEndpoint = () => {
+  const queryClient = useQueryClient();
+  const { services } = useKibana();
+  const toasts = services.notifications?.toasts;
+
+  return useMutation(
+    async ({ type, id }: MutationArgs) => {
+      await services.http.delete<{}>(`/internal/inference_endpoint/endpoints/${type}/${id}`);
+    },
+    {
+      onSuccess: () => {
+        queryClient.invalidateQueries([INFERENCE_ENDPOINTS_QUERY_KEY]);
+        toasts?.addSuccess({
+          title: i18n.DELETE_SUCCESS,
+        });
+      },
+      onError: (error: Error) => {
+        toasts?.addError(new Error(error?.message), {
+          title: i18n.ENDPOINT_DELETION_FAILED,
+        });
+      },
+    }
+  );
+};
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.test.tsx b/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.test.tsx
index e0026cbffff98..a8d0326a4c36f 100644
--- a/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.test.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.test.tsx
@@ -36,8 +36,8 @@ const inferenceEndpoints = [
   },
   {
     model_id: 'my-elser-model-05',
-    task_type: 'sparse_embedding',
-    service: 'elser',
+    task_type: 'text_embedding',
+    service: 'elasticsearch',
     service_settings: {
       num_allocations: 1,
       num_threads: 1,
@@ -54,9 +54,23 @@ const queryParams = {
   sortOrder: 'desc',
 } as QueryParams;
 
+const filterOptions = {
+  provider: ['elser', 'elasticsearch'],
+  type: ['sparse_embedding', 'text_embedding'],
+} as any;
+
+const deploymentStatus = {
+  '.elser_model_2': 'deployed',
+  lang_ident_model_1: 'not_deployed',
+} as any;
+
+const searchKey = 'my';
+
 describe('useTableData', () => {
   it('should return correct pagination', () => {
-    const { result } = renderHook(() => useTableData(inferenceEndpoints, queryParams));
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions, searchKey, deploymentStatus)
+    );
 
     expect(result.current.pagination).toEqual({
       pageIndex: 0,
@@ -67,7 +81,9 @@ describe('useTableData', () => {
   });
 
   it('should return correct sorting', () => {
-    const { result } = renderHook(() => useTableData(inferenceEndpoints, queryParams));
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions, searchKey, deploymentStatus)
+    );
 
     expect(result.current.sorting).toEqual({
       sort: {
@@ -78,15 +94,54 @@ describe('useTableData', () => {
   });
 
   it('should return correctly sorted data', () => {
-    const { result } = renderHook(() => useTableData(inferenceEndpoints, queryParams));
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions, searchKey, deploymentStatus)
+    );
 
     const expectedSortedData = [...inferenceEndpoints].sort((a, b) =>
       b.model_id.localeCompare(a.model_id)
     );
 
-    const sortedEndpoints = result.current.sortedTableData.map((item) => item.endpoint);
+    const sortedEndpoints = result.current.sortedTableData.map((item) => item.endpoint.model_id);
     const expectedModelIds = expectedSortedData.map((item) => item.model_id);
 
     expect(sortedEndpoints).toEqual(expectedModelIds);
   });
+
+  it('should filter data based on provider and type from filterOptions', () => {
+    const filterOptions2 = {
+      provider: ['elser'],
+      type: ['text_embedding'],
+    } as any;
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions2, searchKey, deploymentStatus)
+    );
+
+    const filteredData = result.current.sortedTableData;
+    expect(
+      filteredData.every(
+        (endpoint) =>
+          filterOptions.provider.includes(endpoint.provider) &&
+          filterOptions.type.includes(endpoint.type)
+      )
+    ).toBeTruthy();
+  });
+
+  it('should filter data based on searchKey', () => {
+    const searchKey2 = 'model-05';
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions, searchKey2, deploymentStatus)
+    );
+    const filteredData = result.current.sortedTableData;
+    expect(filteredData.every((item) => item.endpoint.model_id.includes(searchKey))).toBeTruthy();
+  });
+
+  it('should update deployment status based on deploymentStatus object', () => {
+    const { result } = renderHook(() =>
+      useTableData(inferenceEndpoints, queryParams, filterOptions, searchKey, deploymentStatus)
+    );
+
+    const updatedData = result.current.sortedTableData;
+    expect(updatedData[0].deployment).toEqual('deployed');
+  });
 });
diff --git a/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.tsx b/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.tsx
index 304c469e06093..54d865aad5190 100644
--- a/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.tsx
+++ b/x-pack/plugins/search_inference_endpoints/public/hooks/use_table_data.tsx
@@ -11,11 +11,15 @@ import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
 import { useMemo } from 'react';
 import { DEFAULT_TABLE_LIMIT } from '../components/all_inference_endpoints/constants';
 import {
-  InferenceEndpointUI,
+  FilterOptions,
   INFERENCE_ENDPOINTS_TABLE_PER_PAGE_VALUES,
+  InferenceEndpointUI,
   QueryParams,
   SortOrder,
+  ServiceProviderKeys,
+  TaskTypes,
 } from '../components/all_inference_endpoints/types';
+import { DeploymentStatusEnum } from '../components/all_inference_endpoints/types';
 
 interface UseTableDataReturn {
   tableData: InferenceEndpointUI[];
@@ -27,15 +31,50 @@ interface UseTableDataReturn {
 
 export const useTableData = (
   inferenceEndpoints: InferenceAPIConfigResponse[],
-  queryParams: QueryParams
+  queryParams: QueryParams,
+  filterOptions: FilterOptions,
+  searchKey: string,
+  deploymentStatus: Record<string, DeploymentStatusEnum>
 ): UseTableDataReturn => {
   const tableData: InferenceEndpointUI[] = useMemo(() => {
-    return inferenceEndpoints.map((endpoint) => ({
-      endpoint: endpoint.model_id,
-      provider: endpoint.service,
-      type: endpoint.task_type,
-    }));
-  }, [inferenceEndpoints]);
+    let filteredEndpoints = inferenceEndpoints;
+
+    if (filterOptions.provider.length > 0) {
+      filteredEndpoints = filteredEndpoints.filter((endpoint) =>
+        filterOptions.provider.includes(ServiceProviderKeys[endpoint.service])
+      );
+    }
+
+    if (filterOptions.type.length > 0) {
+      filteredEndpoints = filteredEndpoints.filter((endpoint) =>
+        filterOptions.type.includes(TaskTypes[endpoint.task_type])
+      );
+    }
+
+    return filteredEndpoints
+      .filter((endpoint) => endpoint.model_id.includes(searchKey))
+      .map((endpoint) => {
+        const isElasticService =
+          endpoint.service === ServiceProviderKeys.elasticsearch ||
+          endpoint.service === ServiceProviderKeys.elser;
+
+        let deploymentStatusValue = DeploymentStatusEnum.notApplicable;
+        if (isElasticService) {
+          const modelId = endpoint.service_settings?.model_id;
+          deploymentStatusValue =
+            modelId && deploymentStatus[modelId] !== undefined
+              ? deploymentStatus[modelId]
+              : DeploymentStatusEnum.notDeployable;
+        }
+
+        return {
+          deployment: deploymentStatusValue,
+          endpoint,
+          provider: endpoint.service,
+          type: endpoint.task_type,
+        };
+      });
+  }, [inferenceEndpoints, searchKey, filterOptions, deploymentStatus]);
 
   const sortedTableData: InferenceEndpointUI[] = useMemo(() => {
     return [...tableData].sort((a, b) => {
@@ -43,9 +82,9 @@ export const useTableData = (
       const bValue = b[queryParams.sortField];
 
       if (queryParams.sortOrder === SortOrder.asc) {
-        return aValue.localeCompare(bValue);
+        return aValue.model_id.localeCompare(bValue.model_id);
       } else {
-        return bValue.localeCompare(aValue);
+        return bValue.model_id.localeCompare(aValue.model_id);
       }
     });
   }, [tableData, queryParams]);
diff --git a/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.test.ts b/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.test.ts
new file mode 100644
index 0000000000000..f6c9a5625230d
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.test.ts
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { deleteInferenceEndpoint } from './delete_inference_endpoint';
+
+describe('deleteInferenceEndpoint', () => {
+  let mockClient: any;
+
+  beforeEach(() => {
+    mockClient = {
+      transport: {
+        request: jest.fn(),
+      },
+    };
+  });
+
+  it('should call the Elasticsearch client with the correct DELETE request', async () => {
+    const type = 'model';
+    const id = 'model-id-123';
+
+    await deleteInferenceEndpoint(mockClient, type, id);
+
+    expect(mockClient.transport.request).toHaveBeenCalledWith({
+      method: 'DELETE',
+      path: `/_inference/${type}/${id}`,
+    });
+  });
+});
diff --git a/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.ts b/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.ts
new file mode 100644
index 0000000000000..c294820e4943e
--- /dev/null
+++ b/x-pack/plugins/search_inference_endpoints/server/lib/delete_inference_endpoint.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ElasticsearchClient } from '@kbn/core/server';
+
+export const deleteInferenceEndpoint = async (
+  client: ElasticsearchClient,
+  type: string,
+  id: string
+): Promise<void> => {
+  return await client.transport.request({
+    method: 'DELETE',
+    path: `/_inference/${type}/${id}`,
+  });
+};
diff --git a/x-pack/plugins/search_inference_endpoints/server/routes.ts b/x-pack/plugins/search_inference_endpoints/server/routes.ts
index d5f010b902c52..7456888aabb19 100644
--- a/x-pack/plugins/search_inference_endpoints/server/routes.ts
+++ b/x-pack/plugins/search_inference_endpoints/server/routes.ts
@@ -6,10 +6,12 @@
  */
 
 import { IRouter } from '@kbn/core/server';
+import { schema } from '@kbn/config-schema';
 import type { Logger } from '@kbn/logging';
 import { fetchInferenceEndpoints } from './lib/fetch_inference_endpoints';
 import { APIRoutes } from './types';
 import { errorHandler } from './utils/error_handler';
+import { deleteInferenceEndpoint } from './lib/delete_inference_endpoint';
 
 export function defineRoutes({ logger, router }: { logger: Logger; router: IRouter }) {
   router.get(
@@ -32,4 +34,27 @@ export function defineRoutes({ logger, router }: { logger: Logger; router: IRout
       });
     })
   );
+
+  router.delete(
+    {
+      path: APIRoutes.DELETE_INFERENCE_ENDPOINT,
+      validate: {
+        params: schema.object({
+          type: schema.string(),
+          id: schema.string(),
+        }),
+      },
+    },
+    errorHandler(logger)(async (context, request, response) => {
+      const {
+        client: { asCurrentUser },
+      } = (await context.core).elasticsearch;
+
+      const { type, id } = request.params;
+
+      await deleteInferenceEndpoint(asCurrentUser, type, id);
+
+      return response.ok();
+    })
+  );
 }
diff --git a/x-pack/plugins/search_notebooks/kibana.jsonc b/x-pack/plugins/search_notebooks/kibana.jsonc
index d702cfb020275..e9432a5559ce9 100644
--- a/x-pack/plugins/search_notebooks/kibana.jsonc
+++ b/x-pack/plugins/search_notebooks/kibana.jsonc
@@ -15,7 +15,9 @@
     "requiredPlugins": [
       "console"
     ],
-    "optionalPlugins": [],
+    "optionalPlugins": [
+      "usageCollection"
+    ],
     "requiredBundles": [
       "kibanaReact"
     ]
diff --git a/x-pack/plugins/search_notebooks/public/components/notebooks_view.tsx b/x-pack/plugins/search_notebooks/public/components/notebooks_view.tsx
index a20c3b9ddaf2d..b6c837f70ba37 100644
--- a/x-pack/plugins/search_notebooks/public/components/notebooks_view.tsx
+++ b/x-pack/plugins/search_notebooks/public/components/notebooks_view.tsx
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+
 import React from 'react';
 import { CoreStart } from '@kbn/core/public';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
@@ -11,24 +12,32 @@ import { KibanaThemeProvider } from '@kbn/react-kibana-context-theme';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 
 import { SearchNotebooks } from './search_notebooks';
-import { NotebookListValue } from '../types';
+import { AppMetricsTracker, NotebookListValue } from '../types';
 
 export interface SearchNotebooksViewProps {
   core: CoreStart;
   queryClient: QueryClient;
+  usageTracker: AppMetricsTracker;
   getNotebookList: () => NotebookListValue;
 }
 
 export const SearchNotebooksView = ({
   core,
   queryClient,
+  usageTracker,
   getNotebookList,
-}: SearchNotebooksViewProps) => (
-  <KibanaThemeProvider theme={core.theme}>
-    <KibanaContextProvider services={{ ...core, notebooks: { getNotebookList } }}>
-      <QueryClientProvider client={queryClient}>
-        <SearchNotebooks />
-      </QueryClientProvider>
-    </KibanaContextProvider>
-  </KibanaThemeProvider>
-);
+}: SearchNotebooksViewProps) => {
+  React.useEffect(() => {
+    usageTracker.count('opened_notebooks_view');
+  }, [usageTracker]);
+
+  return (
+    <KibanaThemeProvider theme={core.theme}>
+      <KibanaContextProvider services={{ ...core, notebooks: { getNotebookList }, usageTracker }}>
+        <QueryClientProvider client={queryClient}>
+          <SearchNotebooks />
+        </QueryClientProvider>
+      </KibanaContextProvider>
+    </KibanaThemeProvider>
+  );
+};
diff --git a/x-pack/plugins/search_notebooks/public/components/search_notebook.tsx b/x-pack/plugins/search_notebooks/public/components/search_notebook.tsx
index 9c78344c15bab..e075c52c53e80 100644
--- a/x-pack/plugins/search_notebooks/public/components/search_notebook.tsx
+++ b/x-pack/plugins/search_notebooks/public/components/search_notebook.tsx
@@ -4,48 +4,31 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React from 'react';
-import { EuiPanel, EuiEmptyPrompt, EuiCodeBlock } from '@elastic/eui';
+import React, { useEffect } from 'react';
+import { EuiPanel } from '@elastic/eui';
 import { NotebookRenderer } from '@kbn/ipynb';
-import { FormattedMessage } from '@kbn/i18n-react';
 
 import { useNotebook } from '../hooks/use_notebook';
+import { useUsageTracker } from '../hooks/use_usage_tracker';
 import { LoadingPanel } from './loading_panel';
+import { SearchNotebookError } from './search_notebook_error';
 
 export interface SearchNotebookProps {
   notebookId: string;
 }
 export const SearchNotebook = ({ notebookId }: SearchNotebookProps) => {
+  const usageTracker = useUsageTracker();
   const { data, isLoading, error } = useNotebook(notebookId);
+  useEffect(() => {
+    usageTracker.count(['view-notebook', `nb-${notebookId}`]);
+  }, [usageTracker, notebookId]);
+
   if (isLoading) {
     return <LoadingPanel />;
   }
   if (!data || error) {
     return (
-      <EuiEmptyPrompt
-        iconType="warning"
-        iconColor="danger"
-        title={
-          <h2>
-            <FormattedMessage
-              id="xpack.searchNotebooks.notebook.fetchError.title"
-              defaultMessage="Error loading notebook"
-            />
-          </h2>
-        }
-        titleSize="l"
-        body={
-          <>
-            <p>
-              <FormattedMessage
-                id="xpack.searchNotebooks.notebook.fetchError.body"
-                defaultMessage="We can't fetch the notebook from Kibana due to the following error:"
-              />
-            </p>
-            <EuiCodeBlock css={{ textAlign: 'left' }}>{JSON.stringify(error)}</EuiCodeBlock>
-          </>
-        }
-      />
+      <SearchNotebookError notebookId={notebookId} usageTracker={usageTracker} error={error} />
     );
   }
   return (
diff --git a/x-pack/plugins/search_notebooks/public/components/search_notebook_error.tsx b/x-pack/plugins/search_notebooks/public/components/search_notebook_error.tsx
new file mode 100644
index 0000000000000..87c0bf74fe941
--- /dev/null
+++ b/x-pack/plugins/search_notebooks/public/components/search_notebook_error.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiEmptyPrompt, EuiCodeBlock } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import type { AppMetricsTracker } from '../types';
+import { getErrorMessage } from '../utils/get_error_message';
+
+export interface SearchNotebookErrorProps {
+  error: unknown;
+  notebookId: string;
+  usageTracker: AppMetricsTracker;
+}
+
+export const SearchNotebookError = ({
+  error,
+  notebookId,
+  usageTracker,
+}: SearchNotebookErrorProps) => {
+  React.useEffect(() => {
+    usageTracker.count(['notebookViewError', `error-${notebookId}`]);
+  }, [usageTracker, notebookId]);
+
+  return (
+    <EuiEmptyPrompt
+      iconType="warning"
+      iconColor="danger"
+      title={
+        <h2>
+          <FormattedMessage
+            id="xpack.searchNotebooks.notebook.fetchError.title"
+            defaultMessage="Error loading notebook"
+          />
+        </h2>
+      }
+      titleSize="l"
+      body={
+        <>
+          <p>
+            <FormattedMessage
+              id="xpack.searchNotebooks.notebook.fetchError.body"
+              defaultMessage="We can't fetch the notebook from Kibana due to the following error:"
+            />
+          </p>
+          {error !== undefined && typeof error === 'object' ? (
+            <EuiCodeBlock css={{ textAlign: 'left' }}>{JSON.stringify(error)}</EuiCodeBlock>
+          ) : (
+            <p>
+              {getErrorMessage(
+                error,
+                i18n.translate('xpack.searchNotebooks.notebook.fetchError.unknownError', {
+                  defaultMessage: 'Unknown error fetching notebook',
+                })
+              )}
+            </p>
+          )}
+        </>
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/search_notebooks/public/console_view.tsx b/x-pack/plugins/search_notebooks/public/console_view.tsx
index 99575c8e93948..0f64ed989f5e2 100644
--- a/x-pack/plugins/search_notebooks/public/console_view.tsx
+++ b/x-pack/plugins/search_notebooks/public/console_view.tsx
@@ -14,7 +14,7 @@ import type {
 import { dynamic } from '@kbn/shared-ux-utility';
 import { QueryClient } from '@tanstack/react-query';
 
-import { NotebookListValue } from './types';
+import { NotebookListValue, AppMetricsTracker } from './types';
 
 const SearchNotebooksButton = dynamic(async () => ({
   default: (await import('./components/notebooks_button')).SearchNotebooksButton,
@@ -26,6 +26,7 @@ const SearchNotebooksView = dynamic(async () => ({
 export const notebooksConsoleView = (
   core: CoreStart,
   queryClient: QueryClient,
+  usageTracker: AppMetricsTracker,
   clearNotebookList: () => void,
   getNotebookListValue: () => NotebookListValue
 ): EmbeddedConsoleView => {
@@ -37,6 +38,7 @@ export const notebooksConsoleView = (
       <SearchNotebooksView
         core={core}
         queryClient={queryClient}
+        usageTracker={usageTracker}
         getNotebookList={getNotebookListValue}
       />
     ),
diff --git a/x-pack/plugins/search_notebooks/public/hooks/use_kibana.ts b/x-pack/plugins/search_notebooks/public/hooks/use_kibana.ts
index b490e61f41490..fc2a5511b9336 100644
--- a/x-pack/plugins/search_notebooks/public/hooks/use_kibana.ts
+++ b/x-pack/plugins/search_notebooks/public/hooks/use_kibana.ts
@@ -9,13 +9,14 @@ import type { ConsolePluginStart } from '@kbn/console-plugin/public';
 import type { CoreStart } from '@kbn/core/public';
 import { useKibana as useKibanaBase } from '@kbn/kibana-react-plugin/public';
 
-import { NotebookListValue } from '../types';
+import { NotebookListValue, AppMetricsTracker } from '../types';
 
 export interface SearchNotebooksContext {
   console: ConsolePluginStart;
   notebooks: {
     getNotebookList: () => NotebookListValue;
   };
+  usageTracker: AppMetricsTracker;
 }
 
 type ServerlessSearchKibanaContext = CoreStart & SearchNotebooksContext;
diff --git a/x-pack/plugins/search_notebooks/public/hooks/use_usage_tracker.ts b/x-pack/plugins/search_notebooks/public/hooks/use_usage_tracker.ts
new file mode 100644
index 0000000000000..52e583d6af358
--- /dev/null
+++ b/x-pack/plugins/search_notebooks/public/hooks/use_usage_tracker.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useKibanaServices } from './use_kibana';
+import { AppMetricsTracker } from '../types';
+
+export const useUsageTracker = (): AppMetricsTracker => {
+  const { usageTracker } = useKibanaServices();
+
+  return usageTracker;
+};
diff --git a/x-pack/plugins/search_notebooks/public/plugin.ts b/x-pack/plugins/search_notebooks/public/plugin.ts
index 3b71193ed3add..e4e1c2b4f0d00 100644
--- a/x-pack/plugins/search_notebooks/public/plugin.ts
+++ b/x-pack/plugins/search_notebooks/public/plugin.ts
@@ -14,14 +14,17 @@ import {
   SearchNotebooksPluginStart,
   SearchNotebooksPluginStartDependencies,
   NotebookListValue,
+  AppMetricsTracker,
 } from './types';
 import { getErrorCode, getErrorMessage, isKibanaServerError } from './utils/get_error_message';
+import { createUsageTracker } from './utils/usage_tracker';
 
 export class SearchNotebooksPlugin
   implements Plugin<SearchNotebooksPluginSetup, SearchNotebooksPluginStart>
 {
   private notebooksList: NotebookListValue = null;
   private queryClient: QueryClient | undefined;
+  private usageTracker: AppMetricsTracker | undefined;
 
   public setup(core: CoreSetup): SearchNotebooksPluginSetup {
     this.queryClient = new QueryClient({
@@ -56,11 +59,13 @@ export class SearchNotebooksPlugin
     core: CoreStart,
     deps: SearchNotebooksPluginStartDependencies
   ): SearchNotebooksPluginStart {
+    this.usageTracker = createUsageTracker(deps.usageCollection);
     if (deps.console?.registerEmbeddedConsoleAlternateView) {
       deps.console.registerEmbeddedConsoleAlternateView(
         notebooksConsoleView(
           core,
           this.queryClient!,
+          this.usageTracker,
           this.clearNotebookList.bind(this),
           this.getNotebookList.bind(this)
         )
diff --git a/x-pack/plugins/search_notebooks/public/types.ts b/x-pack/plugins/search_notebooks/public/types.ts
index 150d08a5d463f..63955ceb85029 100644
--- a/x-pack/plugins/search_notebooks/public/types.ts
+++ b/x-pack/plugins/search_notebooks/public/types.ts
@@ -6,6 +6,7 @@
  */
 
 import type { ConsolePluginStart } from '@kbn/console-plugin/public';
+import type { UsageCollectionStart } from '@kbn/usage-collection-plugin/public';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface SearchNotebooksPluginSetup {}
@@ -16,6 +17,13 @@ export interface SearchNotebooksPluginStart {
 
 export interface SearchNotebooksPluginStartDependencies {
   console: ConsolePluginStart;
+  usageCollection?: UsageCollectionStart;
 }
 
 export type NotebookListValue = string | null;
+
+export interface AppMetricsTracker {
+  click: (eventName: string | string[]) => void;
+  count: (eventName: string | string[]) => void;
+  load: (eventName: string | string[]) => void;
+}
diff --git a/x-pack/plugins/search_notebooks/public/utils/get_error_message.ts b/x-pack/plugins/search_notebooks/public/utils/get_error_message.ts
index 0a73af9e544ce..4625b2cf5240c 100644
--- a/x-pack/plugins/search_notebooks/public/utils/get_error_message.ts
+++ b/x-pack/plugins/search_notebooks/public/utils/get_error_message.ts
@@ -7,7 +7,7 @@
 
 import { KibanaServerError } from '@kbn/kibana-utils-plugin/common';
 
-export function getErrorMessage(error: unknown): string {
+export function getErrorMessage(error: unknown, defaultMessage?: string): string {
   if (typeof error === 'string') {
     return error;
   }
@@ -19,7 +19,7 @@ export function getErrorMessage(error: unknown): string {
     return (error as { name: string }).name;
   }
 
-  return '';
+  return defaultMessage ?? '';
 }
 
 export function getErrorCode(error: unknown): number | undefined {
diff --git a/x-pack/plugins/search_notebooks/public/utils/usage_tracker.ts b/x-pack/plugins/search_notebooks/public/utils/usage_tracker.ts
new file mode 100644
index 0000000000000..9a85626c73608
--- /dev/null
+++ b/x-pack/plugins/search_notebooks/public/utils/usage_tracker.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { METRIC_TYPE, UiCounterMetricType } from '@kbn/analytics';
+import type {
+  UsageCollectionSetup,
+  UsageCollectionStart,
+} from '@kbn/usage-collection-plugin/public';
+import { AppMetricsTracker } from '../types';
+
+const APP_TRACKER_NAME = 'searchNotebooks';
+
+export function createUsageTracker(
+  usageCollection?: UsageCollectionSetup | UsageCollectionStart
+): AppMetricsTracker {
+  const track = (type: UiCounterMetricType, name: string | string[]) =>
+    usageCollection?.reportUiCounter(APP_TRACKER_NAME, type, name);
+  return {
+    click: (eventName: string | string[]) => {
+      track(METRIC_TYPE.CLICK, eventName);
+    },
+    count: (eventName: string | string[]) => {
+      track(METRIC_TYPE.COUNT, eventName);
+    },
+    load: (eventName: string | string[]) => {
+      track(METRIC_TYPE.LOADED, eventName);
+    },
+  };
+}
diff --git a/x-pack/plugins/search_notebooks/tsconfig.json b/x-pack/plugins/search_notebooks/tsconfig.json
index b50ec60a5bed5..5f9d5efaa0308 100644
--- a/x-pack/plugins/search_notebooks/tsconfig.json
+++ b/x-pack/plugins/search_notebooks/tsconfig.json
@@ -15,6 +15,7 @@
     "target/**/*"
   ],
   "kbn_references": [
+    "@kbn/analytics",
     "@kbn/config-schema",
     "@kbn/core",
     "@kbn/i18n",
@@ -26,5 +27,6 @@
     "@kbn/shared-ux-utility",
     "@kbn/kibana-utils-plugin",
     "@kbn/ipynb",
+    "@kbn/usage-collection-plugin",
   ]
 }
diff --git a/x-pack/plugins/search_playground/__mocks__/search_playground_mock.ts b/x-pack/plugins/search_playground/__mocks__/search_playground_mock.ts
index d1bde7eaf53a5..1a73128730324 100644
--- a/x-pack/plugins/search_playground/__mocks__/search_playground_mock.ts
+++ b/x-pack/plugins/search_playground/__mocks__/search_playground_mock.ts
@@ -12,7 +12,6 @@ export type Start = jest.Mocked<SearchPlaygroundPluginStart>;
 const createStartMock = (): Start => {
   const startContract: Start = {
     PlaygroundProvider: jest.fn(),
-    PlaygroundToolbar: jest.fn(),
     Playground: jest.fn(),
     PlaygroundHeaderDocs: jest.fn(),
   };
diff --git a/x-pack/plugins/search_playground/common/models.ts b/x-pack/plugins/search_playground/common/models.ts
index 590f241c2e580..ca27c29e20533 100644
--- a/x-pack/plugins/search_playground/common/models.ts
+++ b/x-pack/plugins/search_playground/common/models.ts
@@ -27,15 +27,27 @@ export const MODELS: ModelProvider[] = [
     provider: LLMs.openai,
   },
   {
-    name: 'Claude 3 Haiku',
+    name: 'Anthropic Claude 3 Haiku',
     model: 'anthropic.claude-3-haiku-20240307-v1:0',
     promptTokenLimit: 200000,
     provider: LLMs.bedrock,
   },
   {
-    name: 'Claude 3 Sonnet',
-    model: 'anthropic.claude-3-haiku-20240307-v1:0',
+    name: 'Anthropic Claude 3.5 Sonnet',
+    model: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
     promptTokenLimit: 200000,
     provider: LLMs.bedrock,
   },
+  {
+    name: 'Google Gemini 1.5 Pro',
+    model: 'gemini-1.5-pro-001',
+    promptTokenLimit: 2097152,
+    provider: LLMs.gemini,
+  },
+  {
+    name: 'Google Gemini 1.5 Flash',
+    model: 'gemini-1.5-flash-001',
+    promptTokenLimit: 2097152,
+    provider: LLMs.gemini,
+  },
 ];
diff --git a/x-pack/plugins/search_playground/common/prompt.ts b/x-pack/plugins/search_playground/common/prompt.ts
index 0f528be26bf3a..9d9ffa6a00186 100644
--- a/x-pack/plugins/search_playground/common/prompt.ts
+++ b/x-pack/plugins/search_playground/common/prompt.ts
@@ -45,10 +45,23 @@ const AnthropicPrompt = (systemInstructions: string) => {
   `;
 };
 
+const GeminiPrompt = (systemInstructions: string) => {
+  return `
+  Instructions:
+  ${systemInstructions}
+
+  Context:
+  {context}
+
+  Question: {question}
+  Answer:
+  `;
+};
+
 interface PromptTemplateOptions {
   citations?: boolean;
   context?: boolean;
-  type?: 'openai' | 'mistral' | 'anthropic';
+  type?: 'openai' | 'mistral' | 'anthropic' | 'gemini';
 }
 
 export const Prompt = (instructions: string, options: PromptTemplateOptions): string => {
@@ -73,5 +86,20 @@ export const Prompt = (instructions: string, options: PromptTemplateOptions): st
     openai: OpenAIPrompt,
     mistral: MistralPrompt,
     anthropic: AnthropicPrompt,
+    gemini: GeminiPrompt,
+  }[options.type || 'openai'](systemInstructions);
+};
+
+interface QuestionRewritePromptOptions {
+  type: 'openai' | 'mistral' | 'anthropic' | 'gemini';
+}
+
+export const QuestionRewritePrompt = (options: QuestionRewritePromptOptions): string => {
+  const systemInstructions = `Given the following conversation and a follow up question, rephrase the follow up question to be a standalone question. Rewrite the question in the question language. Keep the answer to a single sentence. Do not use quotes.`;
+  return {
+    openai: OpenAIPrompt,
+    mistral: MistralPrompt,
+    anthropic: AnthropicPrompt,
+    gemini: GeminiPrompt,
   }[options.type || 'openai'](systemInstructions);
 };
diff --git a/x-pack/plugins/search_playground/common/types.ts b/x-pack/plugins/search_playground/common/types.ts
index 00bfde68ec2ea..9331599786ced 100644
--- a/x-pack/plugins/search_playground/common/types.ts
+++ b/x-pack/plugins/search_playground/common/types.ts
@@ -40,6 +40,7 @@ export enum LLMs {
   openai = 'openai',
   openai_azure = 'openai_azure',
   bedrock = 'bedrock',
+  gemini = 'gemini',
 }
 
 export interface ChatRequestData {
diff --git a/x-pack/plugins/search_playground/public/analytics/constants.ts b/x-pack/plugins/search_playground/public/analytics/constants.ts
index 30347e67bac82..055b5b74b201b 100644
--- a/x-pack/plugins/search_playground/public/analytics/constants.ts
+++ b/x-pack/plugins/search_playground/public/analytics/constants.ts
@@ -13,24 +13,21 @@ export enum AnalyticsEvents {
   chatRegenerateMessages = 'chat_regenerate_messages',
   citationDetailsExpanded = 'citation_details_expanded',
   citationDetailsCollapsed = 'citation_details_collapsed',
-  editContextFlyoutOpened = 'edit_context_flyout_opened',
   editContextFieldToggled = 'edit_context_field_toggled',
   editContextDocSizeChanged = 'edit_context_doc_size_changed',
-  editContextSaved = 'edit_context_saved',
   genAiConnectorAdded = 'gen_ai_connector_added',
   genAiConnectorCreated = 'gen_ai_connector_created',
   genAiConnectorExists = 'gen_ai_connector_exists',
   genAiConnectorSetup = 'gen_ai_connector_setup',
   includeCitations = 'include_citations',
   instructionsFieldChanged = 'instructions_field_changed',
+  queryFieldsUpdated = 'view_query_fields_updated',
+  queryModeLoaded = 'query_mode_loaded',
   modelSelected = 'model_selected',
   retrievalDocsFlyoutOpened = 'retrieval_docs_flyout_opened',
   sourceFieldsLoaded = 'source_fields_loaded',
   sourceIndexUpdated = 'source_index_updated',
-  startNewChatPageLoaded = 'start_new_chat_page_loaded',
-  viewQueryFlyoutOpened = 'view_query_flyout_opened',
-  viewQueryFieldsUpdated = 'view_query_fields_updated',
-  viewQuerySaved = 'view_query_saved',
+  setupChatPageLoaded = 'start_new_chat_page_loaded',
   viewCodeFlyoutOpened = 'view_code_flyout_opened',
   viewCodeLanguageChange = 'view_code_language_change',
 }
diff --git a/x-pack/plugins/search_playground/public/chat_playground_overview.tsx b/x-pack/plugins/search_playground/public/chat_playground_overview.tsx
index fc350356e873a..b5d753e6044f2 100644
--- a/x-pack/plugins/search_playground/public/chat_playground_overview.tsx
+++ b/x-pack/plugins/search_playground/public/chat_playground_overview.tsx
@@ -5,15 +5,13 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
-import { EuiBetaBadge, EuiFlexGroup, EuiFlexItem, EuiPageTemplate, EuiTitle } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiPageTemplate } from '@elastic/eui';
+import { QueryClientProvider } from '@tanstack/react-query';
+import { queryClient } from './utils/query_client';
 import { PlaygroundProvider } from './providers/playground_provider';
 
 import { App } from './components/app';
-import { PlaygroundToolbar } from './embeddable';
-import { PlaygroundHeaderDocs } from './components/playground_header_docs';
 import { useKibana } from './hooks/use_kibana';
 
 export const ChatPlaygroundOverview: React.FC = () => {
@@ -27,46 +25,19 @@ export const ChatPlaygroundOverview: React.FC = () => {
   );
 
   return (
-    <PlaygroundProvider>
-      <EuiPageTemplate
-        offset={0}
-        restrictWidth={false}
-        data-test-subj="svlPlaygroundPage"
-        grow={false}
-      >
-        <EuiPageTemplate.Header
-          css={{ '.euiPageHeaderContent > .euiFlexGroup': { flexWrap: 'wrap' } }}
-          pageTitle={
-            <EuiFlexGroup>
-              <EuiFlexItem grow={false}>
-                <EuiTitle
-                  css={{ whiteSpace: 'nowrap' }}
-                  data-test-subj="chat-playground-home-page-title"
-                >
-                  <h2>
-                    <FormattedMessage
-                      id="xpack.searchPlayground.pageTitle"
-                      defaultMessage="Playground"
-                    />
-                  </h2>
-                </EuiTitle>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiBetaBadge
-                  label={i18n.translate('xpack.searchPlayground.pageTitle.techPreview', {
-                    defaultMessage: 'TECH PREVIEW',
-                  })}
-                  color="hollow"
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          }
-          data-test-subj="chat-playground-home-page"
-          rightSideItems={[<PlaygroundHeaderDocs />, <PlaygroundToolbar />]}
-        />
-        <App />
-        {embeddableConsole}
-      </EuiPageTemplate>
-    </PlaygroundProvider>
+    <QueryClientProvider client={queryClient}>
+      <PlaygroundProvider>
+        <EuiPageTemplate
+          offset={0}
+          restrictWidth={false}
+          data-test-subj="svlPlaygroundPage"
+          grow={false}
+          panelled={false}
+        >
+          <App showDocs />
+          {embeddableConsole}
+        </EuiPageTemplate>
+      </PlaygroundProvider>
+    </QueryClientProvider>
   );
 };
diff --git a/x-pack/plugins/search_playground/public/components/app.tsx b/x-pack/plugins/search_playground/public/components/app.tsx
index 854be8d3ac760..b779897dc4afa 100644
--- a/x-pack/plugins/search_playground/public/components/app.tsx
+++ b/x-pack/plugins/search_playground/public/components/app.tsx
@@ -5,28 +5,61 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 
-import { StartNewChat } from './start_new_chat';
+import { useFormContext } from 'react-hook-form';
+import { QueryMode } from './query_mode/query_mode';
+import { SetupPage } from './setup_page/setup_page';
+import { Header } from './header';
+import { useLoadConnectors } from '../hooks/use_load_connectors';
+import { ChatForm, ChatFormFields } from '../types';
 import { Chat } from './chat';
 
-export const App: React.FC = () => {
-  const [showStartPage, setShowStartPage] = useState(true);
+export interface AppProps {
+  showDocs?: boolean;
+}
+
+export enum ViewMode {
+  chat = 'chat',
+  query = 'query',
+}
+
+export const App: React.FC<AppProps> = ({ showDocs = false }) => {
+  const [showSetupPage, setShowSetupPage] = useState(true);
+  const [selectedMode, setSelectedMode] = useState<ViewMode>(ViewMode.chat);
+  const { watch } = useFormContext<ChatForm>();
+  const { data: connectors } = useLoadConnectors();
+  const hasSelectedIndices = watch(ChatFormFields.indices).length;
+  const handleModeChange = (id: string) => setSelectedMode(id as ViewMode);
+
+  useEffect(() => {
+    if (showSetupPage && connectors?.length && hasSelectedIndices) {
+      setShowSetupPage(false);
+    }
+  }, [connectors, hasSelectedIndices, showSetupPage]);
 
   return (
-    <KibanaPageTemplate.Section
-      alignment="top"
-      restrictWidth={false}
-      grow
-      css={{
-        position: 'relative',
-      }}
-      contentProps={{ css: { display: 'flex', flexGrow: 1, position: 'absolute', inset: 0 } }}
-      paddingSize="none"
-      className="eui-fullHeight"
-    >
-      {showStartPage ? <StartNewChat onStartClick={() => setShowStartPage(false)} /> : <Chat />}
-    </KibanaPageTemplate.Section>
+    <>
+      <Header
+        showDocs={showDocs}
+        onModeChange={handleModeChange}
+        selectedMode={selectedMode}
+        isActionsDisabled={showSetupPage}
+      />
+      <KibanaPageTemplate.Section
+        alignment="top"
+        restrictWidth={false}
+        grow
+        css={{
+          position: 'relative',
+        }}
+        contentProps={{ css: { display: 'flex', flexGrow: 1, position: 'absolute', inset: 0 } }}
+        paddingSize="none"
+        className="eui-fullHeight"
+      >
+        {showSetupPage ? <SetupPage /> : selectedMode === ViewMode.chat ? <Chat /> : <QueryMode />}
+      </KibanaPageTemplate.Section>
+    </>
   );
 };
diff --git a/x-pack/plugins/search_playground/public/components/chat.tsx b/x-pack/plugins/search_playground/public/components/chat.tsx
index de0a296e162b0..cc4c0b1ccdff2 100644
--- a/x-pack/plugins/search_playground/public/components/chat.tsx
+++ b/x-pack/plugins/search_playground/public/components/chat.tsx
@@ -13,6 +13,7 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
   EuiForm,
+  EuiHideFor,
   EuiHorizontalRule,
   EuiSpacer,
   useEuiTheme,
@@ -50,14 +51,12 @@ export const Chat = () => {
   const { euiTheme } = useEuiTheme();
   const {
     control,
-    watch,
     formState: { isValid, isSubmitting },
     resetField,
     handleSubmit,
     getValues,
   } = useFormContext<ChatForm>();
   const { messages, append, stop: stopRequest, setMessages, reload, error } = useChat();
-  const selectedIndicesCount = watch(ChatFormFields.indices, []).length;
   const messagesRef = useAutoBottomScroll();
   const [isRegenerating, setIsRegenerating] = useState<boolean>(false);
   const usageTracker = useUsageTracker();
@@ -123,7 +122,6 @@ export const Chat = () => {
         <EuiFlexItem
           grow={2}
           css={{
-            borderRight: euiTheme.border.thin,
             paddingTop: euiTheme.size.l,
             paddingBottom: euiTheme.size.l,
             // don't allow the chat to shrink below 66.6% of the screen
@@ -149,14 +147,15 @@ export const Chat = () => {
             >
               <EuiHorizontalRule margin="none" />
 
-              <EuiSpacer size="m" />
+              <EuiSpacer size="s" />
 
-              <EuiFlexGroup>
+              <EuiFlexGroup responsive={false}>
                 <EuiFlexItem grow={false}>
                   <EuiButtonEmpty
                     iconType="sparkles"
                     disabled={isToolBarActionsDisabled}
                     onClick={regenerateMessages}
+                    size="xs"
                     data-test-subj="regenerateActionButton"
                   >
                     <FormattedMessage
@@ -170,6 +169,7 @@ export const Chat = () => {
                     iconType="refresh"
                     disabled={isToolBarActionsDisabled}
                     onClick={handleClearChat}
+                    size="xs"
                     data-test-subj="clearChatActionButton"
                   >
                     <FormattedMessage
@@ -180,7 +180,7 @@ export const Chat = () => {
                 </EuiFlexItem>
               </EuiFlexGroup>
 
-              <EuiSpacer size="m" />
+              <EuiSpacer size="s" />
 
               <Controller
                 name={ChatFormFields.question}
@@ -234,9 +234,11 @@ export const Chat = () => {
           </EuiFlexGroup>
         </EuiFlexItem>
 
-        <EuiFlexItem grow={1} css={{ flexBasis: 0, minWidth: '33.3%' }}>
-          <ChatSidebar selectedIndicesCount={selectedIndicesCount} />
-        </EuiFlexItem>
+        <EuiHideFor sizes={['xs', 's']}>
+          <EuiFlexItem grow={1} css={{ flexBasis: 0, minWidth: '33.3%' }}>
+            <ChatSidebar />
+          </EuiFlexItem>
+        </EuiHideFor>
       </EuiFlexGroup>
     </EuiForm>
   );
diff --git a/x-pack/plugins/search_playground/public/components/chat_sidebar.tsx b/x-pack/plugins/search_playground/public/components/chat_sidebar.tsx
index 2172ee8831ead..5686a2d14b642 100644
--- a/x-pack/plugins/search_playground/public/components/chat_sidebar.tsx
+++ b/x-pack/plugins/search_playground/public/components/chat_sidebar.tsx
@@ -6,84 +6,91 @@
  */
 
 import {
-  EuiAccordion,
+  EuiButtonEmpty,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiSpacer,
-  EuiText,
+  EuiLink,
   EuiTitle,
   useEuiTheme,
-  useGeneratedHtmlId,
 } from '@elastic/eui';
-import React, { useState } from 'react';
+import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SourcesPanelSidebar } from './sources_panel/sources_panel_sidebar';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { useWatch } from 'react-hook-form';
+import { docLinks } from '../../common/doc_links';
+import { EditContextPanel } from './edit_context/edit_context_panel';
+import { ChatForm, ChatFormFields } from '../types';
+import { useManagementLink } from '../hooks/use_management_link';
 import { SummarizationPanel } from './summarization_panel/summarization_panel';
 
-interface ChatSidebarProps {
-  selectedIndicesCount: number;
-}
-
-export const ChatSidebar: React.FC<ChatSidebarProps> = ({ selectedIndicesCount }) => {
+export const ChatSidebar: React.FC = () => {
   const { euiTheme } = useEuiTheme();
-  const accordions = [
+  const selectedModel = useWatch<ChatForm, ChatFormFields.summarizationModel>({
+    name: ChatFormFields.summarizationModel,
+  });
+  const managementLink = useManagementLink(selectedModel?.connectorId);
+  const panels = [
     {
-      id: useGeneratedHtmlId({ prefix: 'summarizationAccordion' }),
       title: i18n.translate('xpack.searchPlayground.sidebar.summarizationTitle', {
         defaultMessage: 'Model settings',
       }),
       children: <SummarizationPanel />,
-      dataTestId: 'summarizationAccordion',
+      extraAction: (
+        <EuiButtonEmpty
+          target="_blank"
+          href={managementLink}
+          data-test-subj="manageConnectorsLink"
+          iconType="wrench"
+          size="s"
+          aria-label={i18n.translate(
+            'xpack.searchPlayground.sidebar.summarizationModel.manageConnectorLink',
+            {
+              defaultMessage: 'Manage connector',
+            }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.sidebar.summarizationModel.manageConnectorTooltip"
+            defaultMessage="Manage"
+          />
+        </EuiButtonEmpty>
+      ),
     },
     {
-      id: useGeneratedHtmlId({ prefix: 'sourcesAccordion' }),
-      title: i18n.translate('xpack.searchPlayground.sidebar.sourceTitle', {
-        defaultMessage: 'Indices',
+      title: i18n.translate('xpack.searchPlayground.sidebar.contextTitle', {
+        defaultMessage: 'Context',
       }),
-      extraAction: !!selectedIndicesCount && (
-        <EuiText size="xs">
-          <p>
-            {i18n.translate('xpack.searchPlayground.sidebar.sourceIndicesCount', {
-              defaultMessage: '{count, number} {count, plural, one {Index} other {Indices}}',
-              values: { count: Number(selectedIndicesCount) },
-            })}
-          </p>
-        </EuiText>
+      extraAction: (
+        <EuiLink
+          href={docLinks.context}
+          target="_blank"
+          data-test-subj="hidden-fields-documentation-link"
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.sidebar.contextLearnMore"
+            defaultMessage="Learn more"
+          />
+        </EuiLink>
       ),
-      children: <SourcesPanelSidebar />,
-      dataTestId: 'sourcesAccordion',
+      children: <EditContextPanel />,
     },
   ];
-  const [openAccordionId, setOpenAccordionId] = useState(accordions[0].id);
 
   return (
     <EuiFlexGroup direction="column" className="eui-yScroll" gutterSize="none">
-      {accordions.map(({ id, title, extraAction, children, dataTestId }, index) => (
-        <EuiFlexItem
-          key={id}
-          css={{
-            borderBottom: index === accordions.length - 1 ? 'none' : euiTheme.border.thin,
-            padding: `0 ${euiTheme.size.l}`,
-            flexGrow: openAccordionId === id ? 1 : 0,
-            transition: `${euiTheme.animation.normal} ease-in-out`,
-          }}
-        >
-          <EuiAccordion
-            id={id}
-            buttonContent={
-              <EuiTitle size="xs">
-                <h5>{title}</h5>
-              </EuiTitle>
-            }
-            extraAction={extraAction}
-            buttonProps={{ paddingSize: 'l' }}
-            forceState={openAccordionId === id ? 'open' : 'closed'}
-            onToggle={() => setOpenAccordionId(openAccordionId === id ? '' : id)}
-            data-test-subj={dataTestId}
-          >
-            {children}
-            <EuiSpacer size="l" />
-          </EuiAccordion>
+      {panels?.map(({ title, children, extraAction }) => (
+        <EuiFlexItem key={title} grow={false}>
+          <EuiFlexGroup direction="column" css={{ padding: euiTheme.size.l }} gutterSize="s">
+            <EuiFlexItem grow={false}>
+              <EuiFlexGroup justifyContent="spaceBetween" gutterSize="none" alignItems="center">
+                <EuiTitle size="xs">
+                  <h4>{title}</h4>
+                </EuiTitle>
+                {extraAction && <EuiFlexItem grow={false}>{extraAction}</EuiFlexItem>}
+              </EuiFlexGroup>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>{children}</EuiFlexItem>
+          </EuiFlexGroup>
         </EuiFlexItem>
       ))}
     </EuiFlexGroup>
diff --git a/x-pack/plugins/search_playground/public/components/data_action_button.tsx b/x-pack/plugins/search_playground/public/components/data_action_button.tsx
new file mode 100644
index 0000000000000..abc2a0c265cf9
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/data_action_button.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiButton } from '@elastic/eui';
+import { useWatch } from 'react-hook-form';
+import { ChatForm, ChatFormFields } from '../types';
+import { SelectIndicesFlyout } from './select_indices_flyout';
+
+export const DataActionButton: React.FC = () => {
+  const selectedIndices = useWatch<ChatForm, ChatFormFields.indices>({
+    name: ChatFormFields.indices,
+  });
+  const [showFlyout, setShowFlyout] = useState(false);
+  const handleFlyoutClose = () => setShowFlyout(false);
+  const handleShowFlyout = () => setShowFlyout(true);
+
+  return (
+    <>
+      {showFlyout && <SelectIndicesFlyout onClose={handleFlyoutClose} />}
+      <EuiButton
+        size="s"
+        iconType="database"
+        onClick={handleShowFlyout}
+        disabled={!selectedIndices?.length}
+        data-test-subj="dataSourceActionButton"
+      >
+        <FormattedMessage id="xpack.searchPlayground.dataActionButton" defaultMessage="Data" />
+      </EuiButton>
+    </>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx
deleted file mode 100644
index 6e9a638248660..0000000000000
--- a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_action.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-import { EuiButtonEmpty } from '@elastic/eui';
-import { useFormContext } from 'react-hook-form';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { ChatForm } from '../../types';
-import { EditContextFlyout } from './edit_context_flyout';
-
-export const EditContextAction: React.FC = () => {
-  const { watch } = useFormContext<ChatForm>();
-  const [showFlyout, setShowFlyout] = useState(false);
-  const selectedIndices: string[] = watch('indices');
-
-  const closeFlyout = () => setShowFlyout(false);
-
-  return (
-    <>
-      {showFlyout && <EditContextFlyout onClose={closeFlyout} />}
-      <EuiButtonEmpty
-        onClick={() => setShowFlyout(true)}
-        disabled={selectedIndices?.length === 0}
-        data-test-subj="editContextActionButton"
-      >
-        <FormattedMessage
-          id="xpack.searchPlayground.editContext.actionButtonLabel"
-          defaultMessage="Edit context"
-        />
-      </EuiButtonEmpty>
-    </>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx
deleted file mode 100644
index cb6968dcce6e4..0000000000000
--- a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.tsx
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import React, { useEffect, useState } from 'react';
-import {
-  EuiFlyout,
-  EuiFlyoutHeader,
-  EuiFlyoutBody,
-  EuiTitle,
-  EuiFlexItem,
-  EuiFlexGroup,
-  EuiButtonEmpty,
-  EuiButton,
-  EuiFlyoutFooter,
-  EuiLink,
-  EuiSpacer,
-  EuiText,
-  EuiSelect,
-  EuiSuperSelect,
-  EuiFormRow,
-} from '@elastic/eui';
-import { useController, useFormContext } from 'react-hook-form';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { docLinks } from '../../../common/doc_links';
-import { useUsageTracker } from '../../hooks/use_usage_tracker';
-import { ChatForm, ChatFormFields } from '../../types';
-import { useIndicesFields } from '../../hooks/use_indices_fields';
-import { getDefaultSourceFields } from '../../utils/create_query';
-import { AnalyticsEvents } from '../../analytics/constants';
-
-interface EditContextFlyoutProps {
-  onClose: () => void;
-}
-
-export const EditContextFlyout: React.FC<EditContextFlyoutProps> = ({ onClose }) => {
-  const usageTracker = useUsageTracker();
-  const { getValues } = useFormContext<ChatForm>();
-  const selectedIndices: string[] = getValues(ChatFormFields.indices);
-  const { fields } = useIndicesFields(selectedIndices);
-  const defaultFields = getDefaultSourceFields(fields);
-
-  const {
-    field: { onChange: onChangeSize, value: docSizeInitialValue },
-  } = useController({
-    name: ChatFormFields.docSize,
-  });
-
-  const [docSize, setDocSize] = useState(docSizeInitialValue);
-
-  const {
-    field: { onChange: onChangeSourceFields, value: sourceFields },
-  } = useController({
-    name: ChatFormFields.sourceFields,
-    defaultValue: defaultFields,
-  });
-
-  const [tempSourceFields, setTempSourceFields] = useState(sourceFields);
-
-  const updateSourceField = (index: string, field: string) => {
-    setTempSourceFields({
-      ...tempSourceFields,
-      [index]: [field],
-    });
-    usageTracker?.click(AnalyticsEvents.editContextFieldToggled);
-  };
-
-  const saveSourceFields = () => {
-    usageTracker?.click(AnalyticsEvents.editContextSaved);
-    onChangeSourceFields(tempSourceFields);
-    onChangeSize(docSize);
-    onClose();
-  };
-
-  const handleDocSizeChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
-    usageTracker?.click(AnalyticsEvents.editContextDocSizeChanged);
-    setDocSize(Number(e.target.value));
-  };
-
-  useEffect(() => {
-    usageTracker?.load(AnalyticsEvents.editContextFlyoutOpened);
-  }, [usageTracker]);
-
-  return (
-    <EuiFlyout ownFocus onClose={onClose} size="s" data-test-subj="editContextFlyout">
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2>
-            <FormattedMessage
-              id="xpack.searchPlayground.editContext.flyout.title"
-              defaultMessage="Edit context"
-            />
-          </h2>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <EuiText color="subdued">
-          <p>
-            <FormattedMessage
-              id="xpack.searchPlayground.editContext.flyout.description"
-              defaultMessage="Context is the information you provide to the LLM, by selecting fields from your Elasticsearch documents. Optimize context for better results."
-            />
-            <EuiLink
-              href={docLinks.context}
-              target="_blank"
-              data-test-subj="context-optimization-documentation-link"
-            >
-              <FormattedMessage
-                id="xpack.searchPlayground.editContext.flyout.learnMoreLink"
-                defaultMessage=" Learn more."
-              />
-            </EuiLink>
-          </p>
-        </EuiText>
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>
-        <EuiFlexGroup>
-          <EuiFlexItem grow={3}>
-            <EuiFlexGroup direction="column" gutterSize="l">
-              <EuiFlexItem grow={false}>
-                <EuiFormRow
-                  label={i18n.translate(
-                    'xpack.searchPlayground.editContext.flyout.docsRetrievedCount',
-                    {
-                      defaultMessage: 'Number of documents sent to LLM',
-                    }
-                  )}
-                >
-                  <EuiSelect
-                    options={[
-                      {
-                        value: 1,
-                        text: '1',
-                      },
-                      {
-                        value: 3,
-                        text: '3',
-                      },
-                      {
-                        value: 5,
-                        text: '5',
-                      },
-                      {
-                        value: 10,
-                        text: '10',
-                      },
-                    ]}
-                    value={docSize}
-                    onChange={handleDocSizeChange}
-                  />
-                </EuiFormRow>
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiFlexGroup direction="column" gutterSize="m">
-                  <EuiFlexItem>
-                    <EuiText>
-                      <h5>
-                        <FormattedMessage
-                          id="xpack.searchPlayground.editContext.flyout.table.title"
-                          defaultMessage="Select fields"
-                        />
-                      </h5>
-                    </EuiText>
-                  </EuiFlexItem>
-                  {Object.entries(fields).map(([index, group]) => (
-                    <EuiFlexItem grow={false} key={index}>
-                      <EuiFormRow label={index}>
-                        <EuiSuperSelect
-                          data-test-subj={`contextFieldsSelectable_${index}`}
-                          options={group.source_fields.map((field) => ({
-                            value: field,
-                            inputDisplay: field,
-                            'data-test-subj': 'contextField',
-                          }))}
-                          valueOfSelected={tempSourceFields[index]?.[0]}
-                          onChange={(value) => updateSourceField(index, value)}
-                        />
-                      </EuiFormRow>
-                    </EuiFlexItem>
-                  ))}
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlyoutBody>
-      <EuiFlyoutFooter>
-        <EuiFlexGroup justifyContent="spaceBetween">
-          <EuiFlexItem grow={false}>
-            <EuiButtonEmpty iconType="cross" onClick={onClose} flush="left">
-              <FormattedMessage
-                id="xpack.searchPlayground.editContext.flyout.closeButton"
-                defaultMessage="Close"
-              />
-            </EuiButtonEmpty>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiButton onClick={saveSourceFields} fill>
-              <FormattedMessage
-                id="xpack.searchPlayground.editContext.flyout.saveButton"
-                defaultMessage="Save changes"
-              />
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlyoutFooter>
-    </EuiFlyout>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.test.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.test.tsx
similarity index 67%
rename from x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.test.tsx
rename to x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.test.tsx
index de82892b167be..ac86efd665b27 100644
--- a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_flyout.test.tsx
+++ b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.test.tsx
@@ -7,12 +7,13 @@
 
 import React from 'react';
 import { render, fireEvent, screen } from '@testing-library/react';
-import { EditContextFlyout } from './edit_context_flyout';
+import { EditContextPanel } from './edit_context_panel';
 import { FormProvider, useForm } from 'react-hook-form';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
+import { ChatFormFields } from '../../types';
 
-jest.mock('../../hooks/use_indices_fields', () => ({
-  useIndicesFields: () => ({
+jest.mock('../../hooks/use_source_indices_field', () => ({
+  useSourceIndicesFields: () => ({
     fields: {
       index1: {
         elser_query_fields: [],
@@ -43,9 +44,9 @@ jest.mock('../../hooks/use_usage_tracker', () => ({
 const MockFormProvider = ({ children }: { children: React.ReactElement }) => {
   const methods = useForm({
     values: {
-      indices: ['index1'],
-      docSize: 1,
-      sourceFields: {
+      [ChatFormFields.indices]: ['index1'],
+      [ChatFormFields.docSize]: 1,
+      [ChatFormFields.sourceFields]: {
         index1: ['context_field1'],
         index2: ['context_field2'],
       },
@@ -55,27 +56,20 @@ const MockFormProvider = ({ children }: { children: React.ReactElement }) => {
 };
 
 describe('EditContextFlyout component tests', () => {
-  const onCloseMock = jest.fn();
-
   beforeEach(() => {
     render(
       <IntlProvider locale="en">
         <MockFormProvider>
-          <EditContextFlyout onClose={onCloseMock} />
+          <EditContextPanel />
         </MockFormProvider>
       </IntlProvider>
     );
   });
 
-  it('calls onClose when the close button is clicked', () => {
-    fireEvent.click(screen.getByRole('button', { name: 'Close' }));
-    expect(onCloseMock).toHaveBeenCalledTimes(1);
-  });
-
   it('should see the context fields', async () => {
-    expect(screen.getByTestId('contextFieldsSelectable_index1')).toBeInTheDocument();
-    fireEvent.click(screen.getByTestId('contextFieldsSelectable_index1'));
-    expect(screen.getByRole('option', { name: 'context_field1' })).toBeInTheDocument();
-    expect(screen.getByRole('option', { name: 'context_field2' })).toBeInTheDocument();
+    expect(screen.getByTestId('contextFieldsSelectable-0')).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId('contextFieldsSelectable-0'));
+    const fields = await screen.findAllByTestId('contextField');
+    expect(fields.length).toBe(2);
   });
 });
diff --git a/x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.tsx b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.tsx
new file mode 100644
index 0000000000000..1283730efa9cc
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/edit_context/edit_context_panel.tsx
@@ -0,0 +1,137 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFormRow,
+  EuiPanel,
+  EuiSelect,
+  EuiSuperSelect,
+  EuiText,
+  EuiCallOut,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+import { useController } from 'react-hook-form';
+import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
+import { useUsageTracker } from '../../hooks/use_usage_tracker';
+import { ChatForm, ChatFormFields } from '../../types';
+import { AnalyticsEvents } from '../../analytics/constants';
+
+export const EditContextPanel: React.FC = () => {
+  const usageTracker = useUsageTracker();
+  const { fields } = useSourceIndicesFields();
+
+  const {
+    field: { onChange: onChangeSize, value: docSize },
+  } = useController({
+    name: ChatFormFields.docSize,
+  });
+
+  const {
+    field: { onChange: onChangeSourceFields, value: sourceFields },
+  } = useController<ChatForm, ChatFormFields.sourceFields>({
+    name: ChatFormFields.sourceFields,
+  });
+
+  const updateSourceField = (index: string, field: string) => {
+    onChangeSourceFields({
+      ...sourceFields,
+      [index]: [field],
+    });
+    usageTracker?.click(AnalyticsEvents.editContextFieldToggled);
+  };
+
+  const handleDocSizeChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    usageTracker?.click(AnalyticsEvents.editContextDocSizeChanged);
+    onChangeSize(Number(e.target.value));
+  };
+
+  return (
+    <EuiPanel data-test-subj="editContextPanel">
+      <EuiFlexGroup direction="column" gutterSize="l">
+        <EuiFlexItem grow={false}>
+          <EuiFormRow
+            label={i18n.translate('xpack.searchPlayground.editContext.docsRetrievedCount', {
+              defaultMessage: 'Number of documents sent to LLM',
+            })}
+            fullWidth
+          >
+            <EuiSelect
+              options={[
+                {
+                  value: 1,
+                  text: '1',
+                },
+                {
+                  value: 3,
+                  text: '3',
+                },
+                {
+                  value: 5,
+                  text: '5',
+                },
+                {
+                  value: 10,
+                  text: '10',
+                },
+              ]}
+              value={docSize}
+              onChange={handleDocSizeChange}
+              fullWidth
+            />
+          </EuiFormRow>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFlexGroup direction="column" gutterSize="m">
+            <EuiFlexItem>
+              <EuiText>
+                <h5>
+                  <FormattedMessage
+                    id="xpack.searchPlayground.editContext.table.title"
+                    defaultMessage="Context fields"
+                  />
+                </h5>
+              </EuiText>
+            </EuiFlexItem>
+            {Object.entries(fields).map(([index, group], indexNum) => (
+              <EuiFlexItem grow={false} key={index}>
+                <EuiFormRow label={index} fullWidth>
+                  {!!group.source_fields?.length ? (
+                    <EuiSuperSelect
+                      data-test-subj={`contextFieldsSelectable-${indexNum}`}
+                      options={group.source_fields.map((field) => ({
+                        value: field,
+                        inputDisplay: field,
+                        'data-test-subj': 'contextField',
+                      }))}
+                      valueOfSelected={sourceFields[index]?.[0]}
+                      onChange={(value) => updateSourceField(index, value)}
+                      fullWidth
+                    />
+                  ) : (
+                    <EuiCallOut
+                      title={i18n.translate(
+                        'xpack.searchPlayground.editContext.noSourceFieldWarning',
+                        { defaultMessage: 'No source fields found' }
+                      )}
+                      color="warning"
+                      iconType="warning"
+                      size="s"
+                    />
+                  )}
+                </EuiFormRow>
+              </EuiFlexItem>
+            ))}
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/header.tsx b/x-pack/plugins/search_playground/public/components/header.tsx
new file mode 100644
index 0000000000000..bc468a0e4be87
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/header.tsx
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiBetaBadge,
+  EuiButtonGroup,
+  EuiFlexGroup,
+  EuiPageHeaderSection,
+  EuiPageTemplate,
+  EuiTitle,
+  useEuiTheme,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+import { PlaygroundHeaderDocs } from './playground_header_docs';
+import { Toolbar } from './toolbar';
+import { ViewMode } from './app';
+
+interface HeaderProps {
+  showDocs?: boolean;
+  selectedMode: string;
+  onModeChange: (mode: string) => void;
+  isActionsDisabled?: boolean;
+}
+
+export const Header: React.FC<HeaderProps> = ({
+  selectedMode,
+  onModeChange,
+  showDocs = false,
+  isActionsDisabled = false,
+}) => {
+  const { euiTheme } = useEuiTheme();
+  const options = [
+    {
+      id: ViewMode.chat,
+      label: i18n.translate('xpack.searchPlayground.header.view.chat', {
+        defaultMessage: 'Chat',
+      }),
+      'data-test-subj': 'chatMode',
+    },
+    {
+      id: ViewMode.query,
+      label: i18n.translate('xpack.searchPlayground.header.view.query', {
+        defaultMessage: 'Query',
+      }),
+      'data-test-subj': 'queryMode',
+    },
+  ];
+
+  return (
+    <EuiPageTemplate.Header
+      css={{
+        '.euiPageHeaderContent > .euiFlexGroup': { flexWrap: 'wrap' },
+        backgroundColor: euiTheme.colors.ghost,
+      }}
+      paddingSize="s"
+      data-test-subj="chat-playground-home-page"
+    >
+      <EuiPageHeaderSection>
+        <EuiFlexGroup gutterSize="s" alignItems="center">
+          <EuiTitle
+            css={{ whiteSpace: 'nowrap' }}
+            data-test-subj="chat-playground-home-page-title"
+            size="xs"
+          >
+            <h2>
+              <FormattedMessage id="xpack.searchPlayground.pageTitle" defaultMessage="Playground" />
+            </h2>
+          </EuiTitle>
+          <EuiBetaBadge
+            label={i18n.translate('xpack.searchPlayground.pageTitle.techPreview', {
+              defaultMessage: 'TECH PREVIEW',
+            })}
+            color="hollow"
+            alignment="middle"
+          />
+        </EuiFlexGroup>
+      </EuiPageHeaderSection>
+      <EuiPageHeaderSection>
+        <EuiButtonGroup
+          legend="viewMode"
+          options={options}
+          idSelected={selectedMode}
+          onChange={onModeChange}
+          buttonSize="compressed"
+          isDisabled={isActionsDisabled}
+          data-test-subj="viewModeSelector"
+        />
+      </EuiPageHeaderSection>
+      <EuiPageHeaderSection>
+        <EuiFlexGroup alignItems="center">
+          {showDocs && <PlaygroundHeaderDocs />}
+          <Toolbar />
+        </EuiFlexGroup>
+      </EuiPageHeaderSection>
+    </EuiPageTemplate.Header>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/message_list/assistant_message.tsx b/x-pack/plugins/search_playground/public/components/message_list/assistant_message.tsx
index 3aa90f188a9cf..7e94059bdc272 100644
--- a/x-pack/plugins/search_playground/public/components/message_list/assistant_message.tsx
+++ b/x-pack/plugins/search_playground/public/components/message_list/assistant_message.tsx
@@ -17,6 +17,7 @@ import {
   EuiSpacer,
   EuiText,
   EuiTitle,
+  useEuiTheme,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
@@ -42,6 +43,7 @@ const AIMessageCSS = css`
 `;
 
 export const AssistantMessage: React.FC<AssistantMessageProps> = ({ message }) => {
+  const { euiTheme } = useEuiTheme();
   const [isDocsFlyoutOpen, setIsDocsFlyoutOpen] = useState(false);
   const { content, createdAt, citations, retrievalDocs, inputTokens } = message;
   const username = i18n.translate('xpack.searchPlayground.chat.message.assistant.username', {
@@ -55,6 +57,14 @@ export const AssistantMessage: React.FC<AssistantMessageProps> = ({ message }) =
           username={username}
           timelineAvatar="dot"
           data-test-subj="retrieval-docs-comment"
+          eventColor="subdued"
+          css={{
+            '.euiAvatar': { backgroundColor: euiTheme.colors.ghost },
+            '.euiCommentEvent': {
+              border: euiTheme.border.thin,
+              borderRadius: euiTheme.border.radius.medium,
+            },
+          }}
           event={
             <>
               <EuiText size="s">
@@ -96,6 +106,14 @@ export const AssistantMessage: React.FC<AssistantMessageProps> = ({ message }) =
           username={username}
           timelineAvatar="dot"
           data-test-subj="retrieval-docs-comment-no-docs"
+          eventColor="subdued"
+          css={{
+            '.euiAvatar': { backgroundColor: euiTheme.colors.ghost },
+            '.euiCommentEvent': {
+              border: euiTheme.border.thin,
+              borderRadius: euiTheme.border.radius.medium,
+            },
+          }}
           event={
             <>
               <EuiText size="s">
@@ -144,6 +162,13 @@ export const AssistantMessage: React.FC<AssistantMessageProps> = ({ message }) =
             },
           })
         }
+        css={{
+          '.euiAvatar': { backgroundColor: euiTheme.colors.ghost },
+          '.euiCommentEvent__body': {
+            backgroundColor: euiTheme.colors.ghost,
+          },
+        }}
+        eventColor="subdued"
         timelineAvatar="compute"
         timelineAvatarAriaLabel={i18n.translate(
           'xpack.searchPlayground.chat.message.assistant.avatarAriaLabel',
diff --git a/x-pack/plugins/search_playground/public/components/message_list/system_message.tsx b/x-pack/plugins/search_playground/public/components/message_list/system_message.tsx
index 16295299a914c..e973bea3c8a14 100644
--- a/x-pack/plugins/search_playground/public/components/message_list/system_message.tsx
+++ b/x-pack/plugins/search_playground/public/components/message_list/system_message.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 
-import { EuiComment } from '@elastic/eui';
+import { EuiComment, useEuiTheme } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
 interface SystemMessageProps {
@@ -15,6 +15,8 @@ interface SystemMessageProps {
 }
 
 export const SystemMessage: React.FC<SystemMessageProps> = ({ content }) => {
+  const { euiTheme } = useEuiTheme();
+
   return (
     <EuiComment
       username={i18n.translate('xpack.searchPlayground.chat.message.system.username', {
@@ -29,6 +31,13 @@ export const SystemMessage: React.FC<SystemMessageProps> = ({ content }) => {
       event={content}
       timelineAvatar="dot"
       eventColor="subdued"
+      css={{
+        '.euiAvatar': { backgroundColor: euiTheme.colors.ghost },
+        '.euiCommentEvent': {
+          border: euiTheme.border.thin,
+          borderRadius: euiTheme.border.radius.medium,
+        },
+      }}
     />
   );
 };
diff --git a/x-pack/plugins/search_playground/public/components/message_list/user_message.tsx b/x-pack/plugins/search_playground/public/components/message_list/user_message.tsx
index 12c1d86283404..8c15ca1b6b69e 100644
--- a/x-pack/plugins/search_playground/public/components/message_list/user_message.tsx
+++ b/x-pack/plugins/search_playground/public/components/message_list/user_message.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 
 import moment from 'moment';
 
-import { EuiComment, EuiText } from '@elastic/eui';
+import { EuiComment, EuiText, useEuiTheme } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { UserAvatar } from '@kbn/user-profile-components';
 
@@ -26,10 +26,17 @@ const UserMessageCSS = css`
 `;
 
 export const UserMessage: React.FC<UserMessageProps> = ({ content, createdAt }) => {
+  const { euiTheme } = useEuiTheme();
   const currentUserProfile = useUserProfile();
 
   return (
     <EuiComment
+      eventColor="subdued"
+      css={{
+        '.euiCommentEvent__body': {
+          backgroundColor: euiTheme.colors.ghost,
+        },
+      }}
       username={i18n.translate('xpack.searchPlayground.chat.message.user.name', {
         defaultMessage: 'You',
       })}
diff --git a/x-pack/plugins/search_playground/public/components/playground_header_docs.tsx b/x-pack/plugins/search_playground/public/components/playground_header_docs.tsx
index fe1f715a29f99..423ed093e8fcf 100644
--- a/x-pack/plugins/search_playground/public/components/playground_header_docs.tsx
+++ b/x-pack/plugins/search_playground/public/components/playground_header_docs.tsx
@@ -20,6 +20,7 @@ export const PlaygroundHeaderDocs: React.FC = () => (
     href={docLinks.chatPlayground}
     target="_blank"
     iconType="documents"
+    size="s"
   >
     {i18n.translate('xpack.searchPlayground.pageTitle.header.docLink', {
       defaultMessage: 'Playground Docs',
diff --git a/x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.test.tsx b/x-pack/plugins/search_playground/public/components/query_mode/query_mode.test.tsx
similarity index 72%
rename from x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.test.tsx
rename to x-pack/plugins/search_playground/public/components/query_mode/query_mode.test.tsx
index 39136e2557296..ca92bb229e38f 100644
--- a/x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.test.tsx
+++ b/x-pack/plugins/search_playground/public/components/query_mode/query_mode.test.tsx
@@ -6,14 +6,14 @@
  */
 
 import React from 'react';
-import { render, fireEvent, screen } from '@testing-library/react';
-import { ViewQueryFlyout } from './view_query_flyout';
+import { render, screen } from '@testing-library/react';
+import { QueryMode } from './query_mode';
 import { FormProvider, useForm } from 'react-hook-form';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { ChatFormFields } from '../../types';
 
-jest.mock('../../hooks/use_indices_fields', () => ({
-  useIndicesFields: () => ({
+jest.mock('../../hooks/use_source_indices_field', () => ({
+  useSourceIndicesFields: () => ({
     fields: {
       index1: {
         elser_query_fields: [],
@@ -30,6 +30,7 @@ jest.mock('../../hooks/use_indices_fields', () => ({
         semantic_fields: [],
       },
     },
+    isFieldsLoading: false,
   }),
 }));
 
@@ -45,6 +46,7 @@ const MockFormProvider = ({ children }: { children: React.ReactElement }) => {
   const methods = useForm({
     values: {
       [ChatFormFields.indices]: ['index1', 'index2'],
+      [ChatFormFields.queryFields]: { index1: ['field1'], index2: ['field1'] },
       [ChatFormFields.sourceFields]: {
         index1: ['field1'],
         index2: ['field1'],
@@ -54,24 +56,17 @@ const MockFormProvider = ({ children }: { children: React.ReactElement }) => {
   return <FormProvider {...methods}>{children}</FormProvider>;
 };
 
-describe('ViewQueryFlyout component tests', () => {
-  const onCloseMock = jest.fn();
-
+describe('QueryMode component tests', () => {
   beforeEach(() => {
     render(
       <IntlProvider locale="en">
         <MockFormProvider>
-          <ViewQueryFlyout onClose={onCloseMock} />
+          <QueryMode />
         </MockFormProvider>
       </IntlProvider>
     );
   });
 
-  it('calls onClose when the close button is clicked', () => {
-    fireEvent.click(screen.getByTestId('euiFlyoutCloseButton'));
-    expect(onCloseMock).toHaveBeenCalledTimes(1);
-  });
-
   it('should see the view elasticsearch query', async () => {
     expect(screen.getByTestId('ViewElasticsearchQueryResult')).toBeInTheDocument();
     expect(screen.getByTestId('ViewElasticsearchQueryResult')).toHaveTextContent(
@@ -80,14 +75,14 @@ describe('ViewQueryFlyout component tests', () => {
   });
 
   it('displays query fields and indicates hidden fields', () => {
-    expect(screen.getByTestId('queryFieldsSelectable_index1')).toBeInTheDocument();
-    expect(screen.getByTestId('queryFieldsSelectable_index2')).toBeInTheDocument();
+    expect(screen.getByTestId('fieldsAccordion-0')).toBeInTheDocument();
+    expect(screen.getByTestId('fieldsAccordion-1')).toBeInTheDocument();
 
     // Check if hidden fields indicator is shown
-    expect(screen.getByTestId('skipped_fields_index1')).toBeInTheDocument();
-    expect(screen.getByTestId('skipped_fields_index1')).toHaveTextContent('1 fields are hidden.');
+    expect(screen.getByTestId('skippedFields-0')).toBeInTheDocument();
+    expect(screen.getByTestId('skippedFields-0')).toHaveTextContent('1 fields are hidden.');
 
     // Check if hidden fields indicator is shown
-    expect(screen.queryByTestId('skipped_fields_index2')).not.toBeInTheDocument();
+    expect(screen.queryByTestId('skippedFields-1')).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/search_playground/public/components/query_mode/query_mode.tsx b/x-pack/plugins/search_playground/public/components/query_mode/query_mode.tsx
new file mode 100644
index 0000000000000..5027f0ac432a2
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/query_mode/query_mode.tsx
@@ -0,0 +1,210 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiAccordion,
+  EuiBasicTable,
+  EuiCodeBlock,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiIcon,
+  EuiLink,
+  EuiPanel,
+  EuiSpacer,
+  EuiSwitch,
+  EuiText,
+  useEuiTheme,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useEffect, useMemo } from 'react';
+import { useController, useWatch } from 'react-hook-form';
+import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
+import { useUsageTracker } from '../../hooks/use_usage_tracker';
+import { ChatForm, ChatFormFields } from '../../types';
+import { AnalyticsEvents } from '../../analytics/constants';
+import { docLinks } from '../../../common/doc_links';
+import { createQuery } from '../../utils/create_query';
+
+const isQueryFieldSelected = (
+  queryFields: ChatForm[ChatFormFields.queryFields],
+  index: string,
+  field: string
+): boolean => {
+  return Boolean(queryFields[index]?.includes(field));
+};
+
+export const QueryMode: React.FC = () => {
+  const { euiTheme } = useEuiTheme();
+  const usageTracker = useUsageTracker();
+  const { fields, isFieldsLoading } = useSourceIndicesFields();
+  const sourceFields = useWatch<ChatForm, ChatFormFields.sourceFields>({
+    name: ChatFormFields.sourceFields,
+  });
+  const {
+    field: { onChange: queryFieldsOnChange, value: queryFields },
+  } = useController<ChatForm, ChatFormFields.queryFields>({
+    name: ChatFormFields.queryFields,
+  });
+
+  const {
+    field: { onChange: elasticsearchQueryChange },
+  } = useController({
+    name: ChatFormFields.elasticsearchQuery,
+  });
+
+  const updateFields = (index: string, fieldName: string, checked: boolean) => {
+    const currentIndexFields = checked
+      ? [...queryFields[index], fieldName]
+      : queryFields[index].filter((field) => fieldName !== field);
+    const updatedQueryFields = { ...queryFields, [index]: currentIndexFields };
+
+    queryFieldsOnChange(updatedQueryFields);
+    elasticsearchQueryChange(createQuery(updatedQueryFields, sourceFields, fields));
+    usageTracker?.count(AnalyticsEvents.queryFieldsUpdated, currentIndexFields.length);
+  };
+
+  useEffect(() => {
+    usageTracker?.load(AnalyticsEvents.queryModeLoaded);
+  }, [usageTracker]);
+
+  const query = useMemo(
+    () =>
+      !isFieldsLoading && JSON.stringify(createQuery(queryFields, sourceFields, fields), null, 2),
+    [isFieldsLoading, queryFields, sourceFields, fields]
+  );
+
+  return (
+    <EuiFlexGroup>
+      <EuiFlexItem
+        grow={6}
+        className="eui-yScroll"
+        css={{ padding: euiTheme.size.l, paddingRight: 0 }}
+      >
+        <EuiCodeBlock
+          language="json"
+          fontSize="m"
+          paddingSize="none"
+          lineNumbers
+          transparentBackground
+          data-test-subj="ViewElasticsearchQueryResult"
+        >
+          {query}
+        </EuiCodeBlock>
+      </EuiFlexItem>
+      <EuiFlexItem
+        grow={3}
+        className="eui-yScroll"
+        css={{ padding: euiTheme.size.l, paddingLeft: 0 }}
+      >
+        <EuiFlexGroup direction="column" gutterSize="s">
+          <EuiText>
+            <h5>
+              <FormattedMessage
+                id="xpack.searchPlayground.viewQuery.flyout.table.title"
+                defaultMessage="Fields to search (per index)"
+              />
+            </h5>
+          </EuiText>
+          {Object.entries(fields).map(([index, group], indexNum) => (
+            <EuiFlexItem grow={false} key={index}>
+              <EuiPanel grow={false} hasShadow={false} hasBorder>
+                <EuiAccordion
+                  id={index}
+                  buttonContent={
+                    <EuiText>
+                      <h5>{index}</h5>
+                    </EuiText>
+                  }
+                  initialIsOpen
+                  data-test-subj={`fieldsAccordion-${indexNum}`}
+                >
+                  <EuiSpacer size="s" />
+
+                  <EuiBasicTable
+                    tableCaption="Query Model table"
+                    items={[
+                      ...group.semantic_fields,
+                      ...group.elser_query_fields,
+                      ...group.dense_vector_query_fields,
+                      ...group.bm25_query_fields,
+                    ].map((field) => ({
+                      name: typeof field === 'string' ? field : field.field,
+                      checked: isQueryFieldSelected(
+                        queryFields,
+                        index,
+                        typeof field === 'string' ? field : field.field
+                      ),
+                    }))}
+                    rowHeader="name"
+                    columns={[
+                      {
+                        field: 'name',
+                        name: 'Field',
+                        'data-test-subj': 'fieldName',
+                      },
+                      {
+                        field: 'checked',
+                        name: 'Enabled',
+                        align: 'right',
+                        render: (checked, field) => {
+                          return (
+                            <EuiSwitch
+                              showLabel={false}
+                              label={field.name}
+                              checked={checked}
+                              onChange={(e) => updateFields(index, field.name, e.target.checked)}
+                              compressed
+                            />
+                          );
+                        },
+                      },
+                    ]}
+                  />
+
+                  {group.skipped_fields > 0 && (
+                    <>
+                      <EuiSpacer size="m" />
+                      <EuiFlexGroup>
+                        <EuiFlexItem>
+                          <EuiText
+                            size="s"
+                            color="subdued"
+                            data-test-subj={`skippedFields-${indexNum}`}
+                          >
+                            <EuiIcon type="eyeClosed" />
+                            {` `}
+                            <FormattedMessage
+                              id="xpack.searchPlayground.viewQuery.flyout.hiddenFields"
+                              defaultMessage="{skippedFields} fields are hidden."
+                              values={{ skippedFields: group.skipped_fields }}
+                            />
+                          </EuiText>
+                        </EuiFlexItem>
+                        <EuiFlexItem grow={false}>
+                          <EuiLink
+                            href={docLinks.hiddenFields}
+                            target="_blank"
+                            data-test-subj="hidden-fields-documentation-link"
+                          >
+                            <FormattedMessage
+                              id="xpack.searchPlayground.viewQuery.flyout.learnMoreLink"
+                              defaultMessage="Learn more."
+                            />
+                          </EuiLink>
+                        </EuiFlexItem>
+                      </EuiFlexGroup>
+                    </>
+                  )}
+                </EuiAccordion>
+              </EuiPanel>
+            </EuiFlexItem>
+          ))}
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/select_indices_flyout.test.tsx b/x-pack/plugins/search_playground/public/components/select_indices_flyout.test.tsx
new file mode 100644
index 0000000000000..94dc1ad037401
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/select_indices_flyout.test.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, PropsWithChildren } from 'react';
+import { render, fireEvent, waitFor } from '@testing-library/react';
+import { SelectIndicesFlyout } from './select_indices_flyout';
+import { useSourceIndicesFields } from '../hooks/use_source_indices_field';
+import { useQueryIndices } from '../hooks/use_query_indices';
+import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
+
+jest.mock('../hooks/use_source_indices_field');
+jest.mock('../hooks/use_query_indices');
+jest.mock('../hooks/use_indices_fields', () => ({
+  useIndicesFields: () => ({ fields: {} }),
+}));
+
+const Wrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
+  return (
+    <>
+      <IntlProvider locale="en">{children}</IntlProvider>
+    </>
+  );
+};
+
+const mockedUseSourceIndicesFields = useSourceIndicesFields as jest.MockedFunction<
+  typeof useSourceIndicesFields
+>;
+const mockedUseQueryIndices = useQueryIndices as jest.MockedFunction<typeof useQueryIndices>;
+
+describe('SelectIndicesFlyout', () => {
+  const onCloseMock = jest.fn();
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+
+    mockedUseSourceIndicesFields.mockReturnValue({
+      indices: ['index1', 'index2'],
+      setIndices: jest.fn(),
+      fields: {},
+      loading: false,
+      addIndex: () => {},
+      removeIndex: () => {},
+      isFieldsLoading: false,
+    });
+
+    mockedUseQueryIndices.mockReturnValue({
+      indices: ['index1', 'index2', 'index3'],
+      isLoading: false,
+    });
+  });
+
+  it('renders correctly', () => {
+    const { getByTestId } = render(<SelectIndicesFlyout onClose={onCloseMock} />, {
+      wrapper: Wrapper,
+    });
+
+    expect(getByTestId('indicesTable')).toBeInTheDocument();
+    expect(getByTestId('saveButton')).toBeInTheDocument();
+    expect(getByTestId('closeButton')).toBeInTheDocument();
+  });
+
+  it('selecting indices and saving', async () => {
+    const { getByTestId } = render(<SelectIndicesFlyout onClose={onCloseMock} />, {
+      wrapper: Wrapper,
+    });
+
+    fireEvent.click(getByTestId('sourceIndex-2'));
+    fireEvent.click(getByTestId('saveButton'));
+
+    await waitFor(() => {
+      expect(mockedUseSourceIndicesFields().setIndices).toHaveBeenCalledWith([
+        'index1',
+        'index2',
+        'index3',
+      ]);
+      expect(onCloseMock).toHaveBeenCalled();
+    });
+  });
+
+  it('closing flyout without saving', () => {
+    const { getByTestId } = render(<SelectIndicesFlyout onClose={onCloseMock} />, {
+      wrapper: Wrapper,
+    });
+
+    fireEvent.click(getByTestId('closeButton'));
+
+    expect(onCloseMock).toHaveBeenCalled();
+  });
+
+  it('save button is disabled when no indices are selected', () => {
+    mockedUseSourceIndicesFields.mockReturnValueOnce({
+      indices: [],
+      setIndices: jest.fn(),
+      fields: {},
+      loading: false,
+      addIndex: () => {},
+      removeIndex: () => {},
+      isFieldsLoading: false,
+    });
+
+    const { getByTestId } = render(<SelectIndicesFlyout onClose={onCloseMock} />, {
+      wrapper: Wrapper,
+    });
+
+    const saveButton = getByTestId('saveButton');
+    expect(saveButton).toBeDisabled();
+  });
+});
diff --git a/x-pack/plugins/search_playground/public/components/select_indices_flyout.tsx b/x-pack/plugins/search_playground/public/components/select_indices_flyout.tsx
new file mode 100644
index 0000000000000..d98a6fc9de8b7
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/select_indices_flyout.tsx
@@ -0,0 +1,172 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiCallOut,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiFlyoutHeader,
+  EuiSelectable,
+  EuiSpacer,
+  EuiTabbedContent,
+  EuiTitle,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { i18n } from '@kbn/i18n';
+import { EuiSelectableOption } from '@elastic/eui/src/components/selectable/selectable_option';
+import { getIndicesWithNoSourceFields } from '../utils/create_query';
+import { useIndicesFields } from '../hooks/use_indices_fields';
+import { useSourceIndicesFields } from '../hooks/use_source_indices_field';
+import { useQueryIndices } from '../hooks/use_query_indices';
+
+interface SelectIndicesFlyout {
+  onClose: () => void;
+}
+
+export const SelectIndicesFlyout: React.FC<SelectIndicesFlyout> = ({ onClose }) => {
+  const [query, setQuery] = useState<string>('');
+  const { indices, isLoading: isIndicesLoading } = useQueryIndices(query);
+  const { indices: selectedIndices, setIndices: setSelectedIndices } = useSourceIndicesFields();
+  const [selectedTempIndices, setSelectedTempIndices] = useState<string[]>(selectedIndices);
+  const handleSelectOptions = (options: EuiSelectableOption[]) => {
+    setSelectedTempIndices(
+      options.filter((option) => option.checked === 'on').map((option) => option.label)
+    );
+  };
+  const handleSearchChange = (searchValue: string) => {
+    setQuery(searchValue);
+  };
+
+  const handleSaveQuery = () => {
+    setSelectedIndices(selectedTempIndices);
+    onClose();
+  };
+  const tabs = [
+    {
+      id: 'indices',
+      name: i18n.translate('xpack.searchPlayground.setupPage.addDataSource.flyout.tabName', {
+        defaultMessage: 'Indices',
+      }),
+      content: (
+        <>
+          <EuiSpacer />
+          <EuiSelectable
+            searchable
+            searchProps={{
+              onChange: handleSearchChange,
+            }}
+            options={[
+              {
+                label: i18n.translate(
+                  'xpack.searchPlayground.setupPage.addDataSource.flyout.groupOption',
+                  {
+                    defaultMessage: 'Available indices',
+                  }
+                ),
+                isGroupLabel: true,
+              },
+              ...indices.map(
+                (index, num) =>
+                  ({
+                    label: index,
+                    checked: selectedTempIndices.includes(index) ? 'on' : '',
+                    'data-test-subj': `sourceIndex-${num}`,
+                  } as EuiSelectableOption)
+              ),
+            ]}
+            onChange={handleSelectOptions}
+            listProps={{
+              showIcons: true,
+              bordered: false,
+            }}
+            isLoading={isIndicesLoading}
+            renderOption={undefined}
+          >
+            {(list, search) => (
+              <>
+                {search}
+                {list}
+              </>
+            )}
+          </EuiSelectable>
+        </>
+      ),
+    },
+  ];
+  const { fields, isLoading: isFieldsLoading } = useIndicesFields(selectedTempIndices);
+  const noSourceFieldsWarning = getIndicesWithNoSourceFields(fields);
+
+  return (
+    <EuiFlyout size="s" ownFocus onClose={onClose} data-test-subj="selectIndicesFlyout">
+      <EuiFlyoutHeader>
+        <EuiTitle size="m">
+          <h2>
+            <FormattedMessage
+              id="xpack.searchPlayground.addDataSource.flyout.title"
+              defaultMessage="Add data to query"
+            />
+          </h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <EuiTabbedContent
+          tabs={tabs}
+          initialSelectedTab={tabs[0]}
+          autoFocus="selected"
+          data-test-subj="indicesTable"
+        />
+        {!isFieldsLoading && !!noSourceFieldsWarning && (
+          <EuiCallOut color="warning" iconType="warning" data-test-subj="NoIndicesFieldsMessage">
+            <p>
+              <FormattedMessage
+                id="xpack.searchPlayground.addDataSource.flyout.warningCallout"
+                defaultMessage="No fields found for {errorMessage}. Try adding data to these indices."
+                values={{ errorMessage: noSourceFieldsWarning }}
+              />
+            </p>
+          </EuiCallOut>
+        )}
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              iconType="cross"
+              onClick={onClose}
+              flush="left"
+              data-test-subj="closeButton"
+            >
+              <FormattedMessage
+                id="xpack.searchPlayground.addDataSource.flyout.closeButton"
+                defaultMessage="Close"
+              />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              onClick={handleSaveQuery}
+              data-test-subj="saveButton"
+              fill
+              disabled={!selectedTempIndices.length}
+            >
+              <FormattedMessage
+                id="xpack.searchPlayground.setupPage.addDataSource.flyout.saveButton"
+                defaultMessage="Save and continue"
+              />
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.tsx b/x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.tsx
deleted file mode 100644
index 2430cd4e6c7a0..0000000000000
--- a/x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.tsx
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useEffect, useState } from 'react';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { EuiButton, EuiCallOut, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { GenerativeAIForSearchPlaygroundConnectorFeatureId } from '@kbn/actions-plugin/common';
-import { AnalyticsEvents } from '../analytics/constants';
-import { useUsageTracker } from '../hooks/use_usage_tracker';
-import { useKibana } from '../hooks/use_kibana';
-import { useLoadConnectors } from '../hooks/use_load_connectors';
-import { StartChatPanel } from './start_chat_panel';
-
-export const SetUpConnectorPanelForStartChat: React.FC = () => {
-  const [connectorFlyoutOpen, setConnectorFlyoutOpen] = useState(false);
-  const [showCallout, setShowAddedCallout] = useState(false);
-  const {
-    services: {
-      triggersActionsUi: { getAddConnectorFlyout: ConnectorFlyout },
-    },
-  } = useKibana();
-  const {
-    data: connectors,
-    refetch: refetchConnectors,
-    isLoading: isConnectorListLoading,
-  } = useLoadConnectors();
-  const usageTracker = useUsageTracker();
-  const handleConnectorCreated = () => {
-    refetchConnectors();
-    setShowAddedCallout(true);
-    setConnectorFlyoutOpen(false);
-  };
-  const handleSetupGenAiConnector = () => {
-    usageTracker?.click(AnalyticsEvents.genAiConnectorCreated);
-    setConnectorFlyoutOpen(true);
-  };
-
-  useEffect(() => {
-    if (connectors?.length) {
-      if (showCallout) {
-        usageTracker?.load(AnalyticsEvents.genAiConnectorAdded);
-      } else {
-        usageTracker?.load(AnalyticsEvents.genAiConnectorExists);
-      }
-    } else {
-      usageTracker?.load(AnalyticsEvents.genAiConnectorSetup);
-    }
-  }, [connectors?.length, showCallout, usageTracker]);
-
-  if (isConnectorListLoading) {
-    return null;
-  }
-
-  return connectors?.length ? (
-    showCallout ? (
-      <EuiCallOut
-        title={i18n.translate('xpack.searchPlayground.emptyPrompts.setUpConnector.settled', {
-          defaultMessage: '{connectorName} connector added',
-          values: {
-            connectorName: connectors![0].title,
-          },
-        })}
-        iconType="check"
-        color="success"
-        data-test-subj="addedConnectorCallout"
-      />
-    ) : null
-  ) : (
-    <>
-      <StartChatPanel
-        title={i18n.translate('xpack.searchPlayground.emptyPrompts.setUpConnector.title', {
-          defaultMessage: 'Connect to LLM',
-        })}
-        description={
-          <FormattedMessage
-            id="xpack.searchPlayground.emptyPrompts.setUpConnector.description"
-            defaultMessage="You need to connect to a large-language model to use this feature. Start by adding connection details for your LLM provider."
-          />
-        }
-        dataTestSubj="connectToLLMChatPanel"
-      >
-        <EuiFlexGroup>
-          <EuiFlexItem grow={false}>
-            <EuiButton
-              color="primary"
-              data-test-subj="setupGenAIConnectorButton"
-              onClick={handleSetupGenAiConnector}
-            >
-              <FormattedMessage
-                id="xpack.searchPlayground.emptyPrompts.setUpConnector.btn"
-                defaultMessage="Connect"
-              />
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </StartChatPanel>
-      {connectorFlyoutOpen && (
-        <ConnectorFlyout
-          featureId={GenerativeAIForSearchPlaygroundConnectorFeatureId}
-          onConnectorCreated={handleConnectorCreated}
-          onClose={() => setConnectorFlyoutOpen(false)}
-        />
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/setup_page/add_data_sources.tsx b/x-pack/plugins/search_playground/public/components/setup_page/add_data_sources.tsx
new file mode 100644
index 0000000000000..77d8114866592
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/setup_page/add_data_sources.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { useFormContext } from 'react-hook-form';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiButton, EuiButtonEmpty } from '@elastic/eui';
+import { ChatForm, ChatFormFields } from '../../types';
+import { SelectIndicesFlyout } from '../select_indices_flyout';
+
+export const AddDataSources: React.FC = () => {
+  const [showFlyout, setShowFlyout] = useState(false);
+  const { getValues } = useFormContext<ChatForm>();
+  const hasSelectedIndices: boolean = !!getValues(ChatFormFields.indices)?.length;
+  const handleFlyoutClose = () => {
+    setShowFlyout(false);
+  };
+
+  return (
+    <>
+      {showFlyout && <SelectIndicesFlyout onClose={handleFlyoutClose} />}
+      {hasSelectedIndices ? (
+        <EuiButtonEmpty
+          iconType="check"
+          color="success"
+          onClick={() => setShowFlyout(true)}
+          data-test-subj="dataSourcesSuccessButton"
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.setupPage.addedDataSourcesLabel"
+            defaultMessage="Data sources added"
+          />
+        </EuiButtonEmpty>
+      ) : (
+        <EuiButton
+          fill
+          iconType="plusInCircle"
+          onClick={() => setShowFlyout(true)}
+          data-test-subj="addDataSourcesButton"
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.setupPage.addDataSourcesLabel"
+            defaultMessage="Add data sources"
+          />
+        </EuiButton>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.test.tsx b/x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.test.tsx
similarity index 66%
rename from x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.test.tsx
rename to x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.test.tsx
index 7ed41e946a91f..65be856d77eb3 100644
--- a/x-pack/plugins/search_playground/public/components/set_up_connector_panel_for_start_chat.test.tsx
+++ b/x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.test.tsx
@@ -7,17 +7,17 @@
 
 import React from 'react';
 import { fireEvent, render as testingLibraryRender, waitFor } from '@testing-library/react';
-import { SetUpConnectorPanelForStartChat } from './set_up_connector_panel_for_start_chat';
-import { useKibana } from '../hooks/use_kibana';
-import { useLoadConnectors } from '../hooks/use_load_connectors';
+import { ConnectLLMButton } from './connect_llm_button';
+import { useKibana } from '../../hooks/use_kibana';
+import { useLoadConnectors } from '../../hooks/use_load_connectors';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 
 const render = (children: React.ReactNode) =>
   testingLibraryRender(<IntlProvider locale="en">{children}</IntlProvider>);
 
-jest.mock('../hooks/use_kibana');
-jest.mock('../hooks/use_load_connectors');
-jest.mock('../hooks/use_usage_tracker', () => ({
+jest.mock('../../hooks/use_kibana');
+jest.mock('../../hooks/use_load_connectors');
+jest.mock('../../hooks/use_usage_tracker', () => ({
   useUsageTracker: () => ({
     count: jest.fn(),
     load: jest.fn(),
@@ -30,7 +30,7 @@ const mockConnectors = {
   '2': { title: 'Connector 2' },
 };
 
-describe('SetUpConnectorPanelForStartChat', () => {
+describe('ConnectLLMButton', () => {
   beforeEach(() => {
     (useKibana as jest.Mock).mockReturnValue({
       services: {
@@ -59,8 +59,8 @@ describe('SetUpConnectorPanelForStartChat', () => {
       isLoading: false,
       isSuccess: true,
     });
-    const { getByTestId } = render(<SetUpConnectorPanelForStartChat />);
-    expect(getByTestId('setupGenAIConnectorButton')).toBeInTheDocument();
+    const { getByTestId } = render(<ConnectLLMButton />);
+    expect(getByTestId('connectLLMButton')).toBeInTheDocument();
   });
 
   it('show the flyout when the button is clicked', async () => {
@@ -69,11 +69,22 @@ describe('SetUpConnectorPanelForStartChat', () => {
       isLoading: false,
       isSuccess: true,
     });
-    const { getByTestId, queryByTestId } = render(<SetUpConnectorPanelForStartChat />);
+    const { getByTestId, queryByTestId } = render(<ConnectLLMButton />);
 
     expect(queryByTestId('addConnectorFlyout')).not.toBeInTheDocument();
 
-    fireEvent.click(getByTestId('setupGenAIConnectorButton'));
+    fireEvent.click(getByTestId('connectLLMButton'));
     await waitFor(() => expect(getByTestId('addConnectorFlyout')).toBeInTheDocument());
   });
+
+  it('show success button when connector exists', async () => {
+    (useLoadConnectors as jest.Mock).mockReturnValue({
+      data: [{}],
+      isLoading: false,
+      isSuccess: true,
+    });
+    const { queryByTestId } = render(<ConnectLLMButton />);
+
+    expect(queryByTestId('successConnectLLMButton')).toBeInTheDocument();
+  });
 });
diff --git a/x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.tsx b/x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.tsx
new file mode 100644
index 0000000000000..579715e79ea55
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/setup_page/connect_llm_button.tsx
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiButton, EuiButtonEmpty } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useEffect, useState } from 'react';
+import { GenerativeAIForSearchPlaygroundConnectorFeatureId } from '@kbn/actions-plugin/common';
+import { useKibana } from '../../hooks/use_kibana';
+import { useLoadConnectors } from '../../hooks/use_load_connectors';
+import { useUsageTracker } from '../../hooks/use_usage_tracker';
+import { AnalyticsEvents } from '../../analytics/constants';
+
+export const ConnectLLMButton: React.FC = () => {
+  const [connectorFlyoutOpen, setConnectorFlyoutOpen] = useState(false);
+  const [showCallout, setShowAddedCallout] = useState(false);
+  const {
+    services: {
+      triggersActionsUi: { getAddConnectorFlyout: ConnectorFlyout },
+    },
+  } = useKibana();
+  const { data: connectors, refetch: refetchConnectors } = useLoadConnectors();
+  const usageTracker = useUsageTracker();
+  const handleConnectorCreated = () => {
+    refetchConnectors();
+    setShowAddedCallout(true);
+    setConnectorFlyoutOpen(false);
+  };
+  const handleSetupGenAiConnector = () => {
+    usageTracker?.click(AnalyticsEvents.genAiConnectorCreated);
+    setConnectorFlyoutOpen(true);
+  };
+
+  useEffect(() => {
+    if (connectors?.length) {
+      if (showCallout) {
+        usageTracker?.load(AnalyticsEvents.genAiConnectorAdded);
+      } else {
+        usageTracker?.load(AnalyticsEvents.genAiConnectorExists);
+      }
+    } else {
+      usageTracker?.load(AnalyticsEvents.genAiConnectorSetup);
+    }
+  }, [connectors?.length, showCallout, usageTracker]);
+
+  return (
+    <>
+      {connectors?.length ? (
+        <EuiButtonEmpty
+          iconType="check"
+          color="success"
+          onClick={handleSetupGenAiConnector}
+          data-test-subj="successConnectLLMButton"
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.setupPage.llmConnectedButtonLabel"
+            defaultMessage="LLM connected"
+          />
+        </EuiButtonEmpty>
+      ) : (
+        <EuiButton
+          fill
+          iconType="link"
+          data-test-subj="connectLLMButton"
+          onClick={handleSetupGenAiConnector}
+        >
+          <FormattedMessage
+            id="xpack.searchPlayground.setupPage.connectLLMButtonLabel"
+            defaultMessage="Connect to an LLM"
+          />
+        </EuiButton>
+      )}
+      {connectorFlyoutOpen && (
+        <ConnectorFlyout
+          featureId={GenerativeAIForSearchPlaygroundConnectorFeatureId}
+          onConnectorCreated={handleConnectorCreated}
+          onClose={() => setConnectorFlyoutOpen(false)}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.test.tsx b/x-pack/plugins/search_playground/public/components/setup_page/create_index_button.test.tsx
similarity index 87%
rename from x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.test.tsx
rename to x-pack/plugins/search_playground/public/components/setup_page/create_index_button.test.tsx
index d75d5385cc3f8..485bb5eb5df55 100644
--- a/x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.test.tsx
+++ b/x-pack/plugins/search_playground/public/components/setup_page/create_index_button.test.tsx
@@ -7,9 +7,9 @@
 
 import React, { FC, PropsWithChildren } from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
-import { CreateIndexCallout } from './create_index_callout';
 import { useKibana } from '../../hooks/use_kibana';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
+import { CreateIndexButton } from './create_index_button';
 
 // Mocking the useKibana hook
 jest.mock('../../hooks/use_kibana', () => ({
@@ -37,9 +37,9 @@ const Wrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
   );
 };
 
-describe('CreateIndexCallout', () => {
+describe('CreateIndexButton', () => {
   it('renders correctly when there is no locator', async () => {
-    const { queryByTestId } = render(<CreateIndexCallout />, { wrapper: Wrapper });
+    const { queryByTestId } = render(<CreateIndexButton />, { wrapper: Wrapper });
 
     expect(queryByTestId('createIndexButton')).not.toBeInTheDocument();
   });
@@ -64,7 +64,7 @@ describe('CreateIndexCallout', () => {
       },
     }));
 
-    const { getByTestId } = render(<CreateIndexCallout />, { wrapper: Wrapper });
+    const { getByTestId } = render(<CreateIndexButton />, { wrapper: Wrapper });
 
     const createIndexButton = getByTestId('createIndexButton');
     expect(createIndexButton).toBeInTheDocument();
diff --git a/x-pack/plugins/search_playground/public/components/setup_page/create_index_button.tsx b/x-pack/plugins/search_playground/public/components/setup_page/create_index_button.tsx
new file mode 100644
index 0000000000000..d4a165f56266c
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/setup_page/create_index_button.tsx
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiButton, EuiCallOut } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React, { useCallback, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { useKibana } from '../../hooks/use_kibana';
+
+export const CreateIndexButton: React.FC = () => {
+  const {
+    services: { application, share },
+  } = useKibana();
+  const createIndexLocator = useMemo(
+    () => share.url.locators.get('CREATE_INDEX_LOCATOR_ID'),
+    [share.url.locators]
+  );
+  const handleNavigateToIndex = useCallback(async () => {
+    const createIndexUrl = await createIndexLocator?.getUrl({});
+
+    if (createIndexUrl) {
+      application?.navigateToUrl(createIndexUrl);
+    }
+  }, [application, createIndexLocator]);
+
+  return createIndexLocator ? (
+    <EuiButton
+      color="primary"
+      iconType="plusInCircle"
+      fill
+      onClick={handleNavigateToIndex}
+      data-test-subj="createIndexButton"
+    >
+      <FormattedMessage
+        id="xpack.searchPlayground.createIndexButton"
+        defaultMessage="Create an index"
+      />
+    </EuiButton>
+  ) : (
+    <EuiCallOut
+      title={i18n.translate('xpack.searchPlayground.createIndexCallout', {
+        defaultMessage: 'You need to create an index first',
+      })}
+      size="s"
+      color="warning"
+      data-test-subj="createIndexCallout"
+    />
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/setup_page/setup_page.tsx b/x-pack/plugins/search_playground/public/components/setup_page/setup_page.tsx
new file mode 100644
index 0000000000000..6dc4d80cc8b15
--- /dev/null
+++ b/x-pack/plugins/search_playground/public/components/setup_page/setup_page.tsx
@@ -0,0 +1,109 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  EuiEmptyPrompt,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiLoadingSpinner,
+  EuiTitle,
+} from '@elastic/eui';
+import React, { useEffect, useMemo } from 'react';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { useSearchParams } from 'react-router-dom-v5-compat';
+import { CreateIndexButton } from './create_index_button';
+import { useQueryIndices } from '../../hooks/use_query_indices';
+import { docLinks } from '../../../common/doc_links';
+import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
+import { useUsageTracker } from '../../hooks/use_usage_tracker';
+import { AnalyticsEvents } from '../../analytics/constants';
+import { ConnectLLMButton } from './connect_llm_button';
+import { AddDataSources } from './add_data_sources';
+
+export const SetupPage: React.FC = () => {
+  const usageTracker = useUsageTracker();
+  const [searchParams] = useSearchParams();
+  const { indices, isLoading: isIndicesLoading } = useQueryIndices();
+  const index = useMemo(() => searchParams.get('default-index'), [searchParams]);
+  const { addIndex } = useSourceIndicesFields();
+
+  useEffect(() => {
+    if (index) {
+      addIndex(index);
+    }
+  }, [index, addIndex]);
+
+  useEffect(() => {
+    usageTracker?.load(AnalyticsEvents.setupChatPageLoaded);
+  }, [usageTracker]);
+
+  return (
+    <EuiEmptyPrompt
+      iconType="discuss"
+      data-test-subj="setupPage"
+      title={
+        <h2>
+          <FormattedMessage
+            id="xpack.searchPlayground.setupPage.title"
+            defaultMessage="Setup a chat experience"
+          />
+        </h2>
+      }
+      body={
+        <>
+          <p>
+            <FormattedMessage
+              id="xpack.searchPlayground.setupPage.description"
+              defaultMessage="Experiment with combining your Elasticsearch data with powerful large language models (LLMs) using Playground for retrieval augmented generation (RAG)."
+            />
+          </p>
+          <p>
+            <FormattedMessage
+              id="xpack.searchPlayground.setupPage.descriptionLLM"
+              defaultMessage="Connect to your LLM provider and select your data sources to get started."
+            />
+          </p>
+        </>
+      }
+      actions={
+        <EuiFlexGroup justifyContent="center">
+          {isIndicesLoading ? (
+            <EuiLoadingSpinner />
+          ) : (
+            <>
+              <EuiFlexItem grow={false}>
+                <ConnectLLMButton />
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                {indices.length ? <AddDataSources /> : <CreateIndexButton />}
+              </EuiFlexItem>
+            </>
+          )}
+        </EuiFlexGroup>
+      }
+      footer={
+        <>
+          <EuiTitle size="xxs">
+            <span>
+              <FormattedMessage
+                id="xpack.searchPlayground.setupPage.learnMore"
+                defaultMessage="Want to learn more?"
+              />
+            </span>
+          </EuiTitle>{' '}
+          <EuiLink href={docLinks.chatPlayground} target="_blank" external>
+            <FormattedMessage
+              id="xpack.searchPlayground.setupPage.documentationLink"
+              defaultMessage="Read documentation"
+            />
+          </EuiLink>
+        </>
+      }
+    />
+  );
+};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/add_indices_field.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/add_indices_field.tsx
deleted file mode 100644
index 786a9db0c8238..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/add_indices_field.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiComboBox, EuiFormRow } from '@elastic/eui';
-import React, { useState } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiComboBoxOptionOption } from '@elastic/eui/src/components/combo_box/types';
-import { IndexName } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
-import { useQueryIndices } from '../../hooks/use_query_indices';
-
-interface AddIndicesFieldProps {
-  selectedIndices: IndexName[];
-  onIndexSelect: (index: IndexName) => void;
-  loading: boolean;
-}
-
-export const AddIndicesField: React.FC<AddIndicesFieldProps> = ({
-  selectedIndices,
-  onIndexSelect,
-  loading,
-}) => {
-  const [query, setQuery] = useState<string>('');
-  const { indices, isLoading } = useQueryIndices(query);
-  const handleChange = (value: Array<EuiComboBoxOptionOption<IndexName>>) => {
-    if (value?.[0]?.label) {
-      onIndexSelect(value[0].label);
-    }
-  };
-  const handleSearchChange = (searchValue: string) => {
-    setQuery(searchValue);
-  };
-
-  return (
-    <EuiFormRow
-      fullWidth
-      label={i18n.translate('xpack.searchPlayground.sources.addIndex.label', {
-        defaultMessage: 'Add index',
-      })}
-      labelType="legend"
-    >
-      <EuiComboBox
-        singleSelection={{ asPlainText: true }}
-        placeholder={i18n.translate('xpack.searchPlayground.sources.addIndex.placeholder', {
-          defaultMessage: 'Search for index',
-        })}
-        async
-        isLoading={isLoading}
-        onChange={handleChange}
-        onSearchChange={handleSearchChange}
-        fullWidth
-        isDisabled={loading}
-        options={indices.map((index) => ({
-          label: index,
-          disabled: selectedIndices.includes(index),
-        }))}
-        isClearable={false}
-        data-test-subj="selectIndicesComboBox"
-      />
-    </EuiFormRow>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.tsx
deleted file mode 100644
index 4294272946f76..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/create_index_callout.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiButton, EuiCallOut, EuiSpacer, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n-react';
-import React, { useCallback, useMemo } from 'react';
-import { useKibana } from '../../hooks/use_kibana';
-
-export const CreateIndexCallout: React.FC = () => {
-  const {
-    services: { application, share },
-  } = useKibana();
-  const createIndexLocator = useMemo(
-    () => share.url.locators.get('CREATE_INDEX_LOCATOR_ID'),
-    [share.url.locators]
-  );
-  const handleNavigateToIndex = useCallback(async () => {
-    const createIndexUrl = await createIndexLocator?.getUrl({});
-
-    if (createIndexUrl) {
-      application?.navigateToUrl(createIndexUrl);
-    }
-  }, [application, createIndexLocator]);
-
-  return (
-    <EuiCallOut
-      title={i18n.translate('xpack.searchPlayground.sources.createIndexCallout.headerText', {
-        defaultMessage: 'Create an index',
-      })}
-      color="primary"
-      iconType="iInCircle"
-      data-test-subj="createIndexCallout"
-    >
-      <EuiText size="s">
-        <p>
-          <FormattedMessage
-            id="xpack.searchPlayground.sources.createIndexCallout.description"
-            defaultMessage="You need at least one index with data to search. "
-          />
-        </p>
-      </EuiText>
-      <EuiSpacer size="l" />
-      {createIndexLocator && (
-        <EuiButton
-          color="primary"
-          iconType="plusInCircle"
-          fill
-          size="s"
-          onClick={handleNavigateToIndex}
-          data-test-subj="createIndexButton"
-        >
-          <FormattedMessage
-            id="xpack.searchPlayground.sources.createIndexCallout."
-            defaultMessage="Create an index"
-          />
-        </EuiButton>
-      )}
-    </EuiCallOut>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_sidebar.test.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_sidebar.test.tsx
deleted file mode 100644
index 194b451ccd1fb..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_sidebar.test.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, PropsWithChildren } from 'react';
-import { render, screen } from '@testing-library/react';
-import { SourcesPanelSidebar } from './sources_panel_sidebar';
-import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
-import { useQueryIndices } from '../../hooks/use_query_indices';
-import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-
-jest.mock('../../hooks/use_source_indices_field', () => ({
-  useSourceIndicesFields: jest.fn(),
-}));
-jest.mock('../../hooks/use_query_indices', () => ({
-  useQueryIndices: jest.fn(),
-}));
-
-const Wrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
-  return (
-    <>
-      <IntlProvider locale="en">{children}</IntlProvider>
-    </>
-  );
-};
-
-describe('SourcesPanelSidebar component', () => {
-  afterEach(jest.clearAllMocks);
-
-  it('shows the "AddIndicesField" component when there are indices and not loading', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: ['index1'], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: [],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelSidebar />, { wrapper: Wrapper });
-    expect(screen.queryByTestId('indicesLoading')).not.toBeInTheDocument();
-  });
-
-  it('displays IndicesTable when there are selected indices', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: ['index1'], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: ['index1', 'index2'],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelSidebar />, { wrapper: Wrapper });
-    expect(screen.getAllByTestId('removeIndexButton')).toHaveLength(2);
-    expect(screen.getAllByTestId('removeIndexButton')[0]).not.toBeDisabled();
-    expect(screen.getAllByTestId('removeIndexButton')[1]).not.toBeDisabled();
-  });
-
-  it('does not allow to remove all indices', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: ['index1'], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: ['index1'],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelSidebar />, { wrapper: Wrapper });
-    expect(screen.getByTestId('removeIndexButton')).toBeDisabled();
-  });
-});
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.test.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.test.tsx
deleted file mode 100644
index 72c0aadfdb708..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.test.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, PropsWithChildren } from 'react';
-import { render, screen } from '@testing-library/react';
-import { SourcesPanelForStartChat } from './sources_panel_for_start_chat';
-import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
-import { useQueryIndices } from '../../hooks/use_query_indices';
-import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-
-jest.mock('../../hooks/use_source_indices_field', () => ({
-  useSourceIndicesFields: jest.fn(),
-}));
-jest.mock('../../hooks/use_query_indices', () => ({
-  useQueryIndices: jest.fn(),
-}));
-
-jest.mock('../../hooks/use_kibana', () => ({
-  useKibana: jest.fn(() => ({
-    services: {
-      application: { navigateToUrl: jest.fn() },
-      share: { url: { locators: { get: jest.fn() } } },
-    },
-  })),
-}));
-
-const Wrapper: FC<PropsWithChildren<unknown>> = ({ children }) => {
-  return (
-    <>
-      <IntlProvider locale="en">{children}</IntlProvider>
-    </>
-  );
-};
-
-describe('SourcesPanelForStartChat component', () => {
-  afterEach(jest.clearAllMocks);
-
-  it('shows a loading spinner when query is loading', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: [], isLoading: true });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: [],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelForStartChat />, { wrapper: Wrapper });
-    expect(screen.getByTestId('indicesLoading')).toBeInTheDocument();
-  });
-
-  it('shows the "AddIndicesField" component when there are indices and not loading', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: ['index1'], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: [],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelForStartChat />, { wrapper: Wrapper });
-    expect(screen.queryByTestId('indicesLoading')).not.toBeInTheDocument();
-  });
-
-  it('displays IndicesTable when there are selected indices', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: ['index1'], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: ['index1'],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelForStartChat />, { wrapper: Wrapper });
-    expect(screen.getAllByText('index1')).toHaveLength(1);
-    expect(screen.getByTestId('removeIndexButton')).toBeInTheDocument();
-  });
-
-  it('displays "CreateIndexCallout" when no indices are found and not loading', () => {
-    (useQueryIndices as jest.Mock).mockReturnValue({ indices: [], isLoading: false });
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: [],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-    });
-
-    render(<SourcesPanelForStartChat />, { wrapper: Wrapper });
-    expect(screen.getByTestId('createIndexCallout')).toBeInTheDocument();
-  });
-
-  it('renders warning callout', () => {
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({
-      indices: ['index1'],
-      removeIndex: jest.fn(),
-      addIndex: jest.fn(),
-      loading: false,
-      noFieldsIndicesWarning: 'index1',
-    });
-
-    render(<SourcesPanelForStartChat />, { wrapper: Wrapper });
-    expect(screen.getByTestId('NoIndicesFieldsMessage')).toBeInTheDocument();
-    expect(screen.getByTestId('NoIndicesFieldsMessage')).toHaveTextContent('index1');
-  });
-});
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx
deleted file mode 100644
index 992ae7e574658..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_for_start_chat.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiCallOut, EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { AddIndicesField } from './add_indices_field';
-import { IndicesTable } from './indices_table';
-import { StartChatPanel } from '../start_chat_panel';
-import { CreateIndexCallout } from './create_index_callout';
-import { useQueryIndices } from '../../hooks/use_query_indices';
-import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
-
-export const SourcesPanelForStartChat: React.FC = () => {
-  const {
-    indices: selectedIndices,
-    removeIndex,
-    addIndex,
-    loading: fieldIndicesLoading,
-    noFieldsIndicesWarning,
-  } = useSourceIndicesFields();
-  const { indices, isLoading } = useQueryIndices();
-
-  return (
-    <StartChatPanel
-      title={i18n.translate('xpack.searchPlayground.emptyPrompts.sources.title', {
-        defaultMessage: 'Select indices',
-      })}
-      description={i18n.translate('xpack.searchPlayground.emptyPrompts.sources.description', {
-        defaultMessage:
-          "Select the Elasticsearch indices you'd like to query, providing additional context for the LLM.",
-      })}
-      isValid={!!selectedIndices?.length}
-      dataTestSubj="selectIndicesChatPanel"
-    >
-      {!!selectedIndices?.length && (
-        <EuiFlexItem>
-          <IndicesTable indices={selectedIndices} onRemoveClick={removeIndex} />
-        </EuiFlexItem>
-      )}
-
-      {noFieldsIndicesWarning && (
-        <EuiCallOut color="warning" iconType="warning" data-test-subj="NoIndicesFieldsMessage">
-          <p>
-            {i18n.translate('xpack.searchPlayground.emptyPrompts.sources.warningCallout', {
-              defaultMessage:
-                'No fields found for {errorMessage}. Try adding data to these indices.',
-              values: {
-                errorMessage: noFieldsIndicesWarning,
-              },
-            })}
-          </p>
-        </EuiCallOut>
-      )}
-
-      {isLoading && (
-        <EuiFlexGroup justifyContent="center" alignItems="center">
-          <EuiLoadingSpinner size="l" data-test-subj="indicesLoading" />
-        </EuiFlexGroup>
-      )}
-
-      {!isLoading && !!indices?.length && (
-        <EuiFlexItem>
-          <AddIndicesField
-            selectedIndices={selectedIndices}
-            onIndexSelect={addIndex}
-            loading={fieldIndicesLoading}
-          />
-        </EuiFlexItem>
-      )}
-
-      {!isLoading && !indices?.length && <CreateIndexCallout />}
-    </StartChatPanel>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_sidebar.tsx b/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_sidebar.tsx
deleted file mode 100644
index 813c98641ff29..0000000000000
--- a/x-pack/plugins/search_playground/public/components/sources_panel/sources_panel_sidebar.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiCallOut, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { useSourceIndicesFields } from '../../hooks/use_source_indices_field';
-import { AddIndicesField } from './add_indices_field';
-import { IndicesList } from './indices_list';
-
-export const SourcesPanelSidebar: React.FC = () => {
-  const { indices: selectedIndices, removeIndex, addIndex, loading } = useSourceIndicesFields();
-
-  return (
-    <EuiFlexGroup direction="column">
-      <EuiFlexItem>
-        <EuiCallOut
-          title={i18n.translate('xpack.searchPlayground.sources.callout', {
-            defaultMessage: 'Changes update the query used to search your data',
-          })}
-          iconType="warning"
-          size="s"
-        />
-      </EuiFlexItem>
-
-      <EuiFlexItem>
-        <IndicesList indices={selectedIndices} onRemoveClick={removeIndex} hasBorder />
-      </EuiFlexItem>
-
-      <EuiFlexItem>
-        <AddIndicesField
-          selectedIndices={selectedIndices}
-          onIndexSelect={addIndex}
-          loading={loading}
-        />
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/start_chat_panel.tsx b/x-pack/plugins/search_playground/public/components/start_chat_panel.tsx
deleted file mode 100644
index 996f088090d29..0000000000000
--- a/x-pack/plugins/search_playground/public/components/start_chat_panel.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiPanel,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
-import React, { FC, PropsWithChildren } from 'react';
-import { FormattedMessage } from '@kbn/i18n-react';
-
-interface StartChatPanelProps {
-  children: React.ReactNode;
-  title: string;
-  description: string | React.ReactNode;
-  isValid?: boolean;
-  dataTestSubj: string;
-}
-
-export const StartChatPanel: FC<PropsWithChildren<StartChatPanelProps>> = ({
-  title,
-  description,
-  children,
-  isValid,
-  dataTestSubj,
-}) => (
-  <EuiPanel hasBorder paddingSize="l" data-test-subj={dataTestSubj}>
-    <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-      <EuiTitle size="xs">
-        <h5>{title}</h5>
-      </EuiTitle>
-
-      {isValid && (
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup alignItems="center" gutterSize="s">
-            <EuiIcon type="check" color="success" />
-
-            <EuiText size="xs" color="success">
-              <p>
-                <FormattedMessage
-                  id="xpack.searchPlayground.startChatPanel.verified"
-                  defaultMessage="Completed"
-                />
-              </p>
-            </EuiText>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      )}
-    </EuiFlexGroup>
-
-    <EuiSpacer size="s" />
-
-    <EuiFlexGroup direction="column" gutterSize="l">
-      <EuiText size="s">
-        <p>{description}</p>
-      </EuiText>
-
-      {children}
-    </EuiFlexGroup>
-  </EuiPanel>
-);
diff --git a/x-pack/plugins/search_playground/public/components/start_new_chat.test.tsx b/x-pack/plugins/search_playground/public/components/start_new_chat.test.tsx
deleted file mode 100644
index ed380e00eb1da..0000000000000
--- a/x-pack/plugins/search_playground/public/components/start_new_chat.test.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
-
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { MemoryRouter, useSearchParams } from 'react-router-dom-v5-compat';
-import { StartNewChat } from './start_new_chat';
-import { useLoadConnectors } from '../hooks/use_load_connectors';
-import { useUsageTracker } from '../hooks/use_usage_tracker';
-import { AnalyticsEvents } from '../analytics/constants';
-import { useSourceIndicesFields } from '../hooks/use_source_indices_field';
-import { useKibana } from '../hooks/use_kibana';
-import { PlaygroundProvider } from '../providers/playground_provider';
-
-jest.mock('../hooks/use_load_connectors');
-jest.mock('../hooks/use_usage_tracker');
-jest.mock('../hooks/use_source_indices_field', () => ({
-  useSourceIndicesFields: jest.fn(() => ({ addIndex: jest.fn() })),
-}));
-jest.mock('react-router-dom-v5-compat', () => ({
-  ...jest.requireActual('react-router-dom-v5-compat'),
-  useSearchParams: jest.fn(),
-}));
-jest.mock('../hooks/use_kibana');
-
-const mockUseLoadConnectors = useLoadConnectors as jest.Mock;
-const mockUseUsageTracker = useUsageTracker as jest.Mock;
-const mockUseSearchParams = useSearchParams as jest.Mock;
-
-const renderWithForm = (ui: React.ReactElement) => {
-  const Wrapper: React.FC = ({ children }) => {
-    return (
-      <IntlProvider locale="en">
-        <PlaygroundProvider>{children}</PlaygroundProvider>
-      </IntlProvider>
-    );
-  };
-  return render(ui, { wrapper: Wrapper });
-};
-
-const mockConnectors = {
-  '1': { title: 'Connector 1' },
-  '2': { title: 'Connector 2' },
-};
-
-describe('StartNewChat', () => {
-  beforeEach(() => {
-    mockUseLoadConnectors.mockReturnValue({ data: [] });
-    mockUseUsageTracker.mockReturnValue({ load: jest.fn() });
-    mockUseSearchParams.mockReturnValue([new URLSearchParams()]);
-
-    (useKibana as jest.Mock).mockReturnValue({
-      services: {
-        triggersActionsUi: {
-          getAddConnectorFlyout: () => (
-            <div data-test-subj="addConnectorFlyout">Add Connector Flyout</div>
-          ),
-        },
-      },
-    });
-    (useLoadConnectors as jest.Mock).mockReturnValue({
-      data: mockConnectors,
-      refetch: jest.fn(),
-      isLoading: false,
-      isSuccess: true,
-    });
-  });
-
-  it('renders correctly', () => {
-    renderWithForm(
-      <MemoryRouter>
-        <StartNewChat onStartClick={jest.fn()} />
-      </MemoryRouter>
-    );
-
-    expect(screen.getByTestId('startNewChatTitle')).toBeInTheDocument();
-  });
-
-  it('disables the start button when form conditions are not met', () => {
-    renderWithForm(
-      <MemoryRouter>
-        <StartNewChat onStartClick={jest.fn()} />
-      </MemoryRouter>
-    );
-
-    const startButton = screen.getByTestId('startChatButton');
-    expect(startButton).toBeDisabled();
-  });
-
-  it('tracks the page load event', () => {
-    const usageTracker = { load: jest.fn() };
-    mockUseUsageTracker.mockReturnValue(usageTracker);
-
-    renderWithForm(
-      <MemoryRouter>
-        <StartNewChat onStartClick={jest.fn()} />
-      </MemoryRouter>
-    );
-
-    expect(usageTracker.load).toHaveBeenCalledWith(AnalyticsEvents.startNewChatPageLoaded);
-  });
-
-  it('calls addIndex when default-index is present in searchParams', () => {
-    const addIndex = jest.fn();
-    (useSourceIndicesFields as jest.Mock).mockReturnValue({ addIndex });
-    const searchParams = new URLSearchParams({ 'default-index': 'test-index' });
-    mockUseSearchParams.mockReturnValue([searchParams]);
-
-    renderWithForm(
-      <MemoryRouter>
-        <StartNewChat onStartClick={jest.fn()} />
-      </MemoryRouter>
-    );
-
-    expect(addIndex).toHaveBeenCalledWith('test-index');
-  });
-});
diff --git a/x-pack/plugins/search_playground/public/components/start_new_chat.tsx b/x-pack/plugins/search_playground/public/components/start_new_chat.tsx
deleted file mode 100644
index 0df4485ec858c..0000000000000
--- a/x-pack/plugins/search_playground/public/components/start_new_chat.tsx
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButton,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiIcon,
-  EuiText,
-  EuiTitle,
-  useEuiTheme,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import React, { useEffect, useMemo } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { useSearchParams } from 'react-router-dom-v5-compat';
-import { useUsageTracker } from '../hooks/use_usage_tracker';
-import { useLoadConnectors } from '../hooks/use_load_connectors';
-import { SourcesPanelForStartChat } from './sources_panel/sources_panel_for_start_chat';
-import { SetUpConnectorPanelForStartChat } from './set_up_connector_panel_for_start_chat';
-import { ChatFormFields } from '../types';
-import { AnalyticsEvents } from '../analytics/constants';
-import { useSourceIndicesFields } from '../hooks/use_source_indices_field';
-
-const maxWidthPage = 640;
-
-interface StartNewChatProps {
-  onStartClick: () => void;
-}
-
-export const StartNewChat: React.FC<StartNewChatProps> = ({ onStartClick }) => {
-  const { euiTheme } = useEuiTheme();
-  const { data: connectors } = useLoadConnectors();
-  const { watch } = useFormContext();
-  const usageTracker = useUsageTracker();
-
-  const [searchParams] = useSearchParams();
-  const index = useMemo(() => searchParams.get('default-index'), [searchParams]);
-  const { addIndex } = useSourceIndicesFields();
-
-  useEffect(() => {
-    if (index) {
-      addIndex(index);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [index]);
-
-  useEffect(() => {
-    usageTracker?.load(AnalyticsEvents.startNewChatPageLoaded);
-  }, [usageTracker]);
-
-  return (
-    <EuiFlexGroup justifyContent="center" className="eui-yScroll" data-test-subj="startChatPage">
-      <EuiFlexGroup
-        css={{
-          height: 'fit-content',
-          padding: `${euiTheme.size.xxl} ${euiTheme.size.l}`,
-          maxWidth: maxWidthPage,
-          boxSizing: 'content-box',
-        }}
-        direction="column"
-        gutterSize="xl"
-      >
-        <EuiFlexItem grow={false}>
-          <EuiFlexGroup alignItems="center" justifyContent="center" gutterSize="m">
-            <EuiTitle>
-              <h2 data-test-subj="startNewChatTitle">
-                <FormattedMessage
-                  id="xpack.searchPlayground.startNewChat.title"
-                  defaultMessage="Start a new chat"
-                />
-              </h2>
-            </EuiTitle>
-
-            <EuiIcon type="discuss" size="xl" />
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          <EuiText>
-            <p>
-              <FormattedMessage
-                id="xpack.searchPlayground.startNewChat.description"
-                defaultMessage="Combine your Elasticsearch data with the power of large language models for retrieval augmented generation (RAG). Use the UI to view and edit the Elasticsearch queries used to search your data, then download the code to integrate into your own application."
-              />
-            </p>
-          </EuiText>
-        </EuiFlexItem>
-
-        <EuiFlexItem grow={false}>
-          <SetUpConnectorPanelForStartChat />
-        </EuiFlexItem>
-
-        <EuiFlexItem grow={false}>
-          <SourcesPanelForStartChat />
-        </EuiFlexItem>
-
-        <EuiFlexGroup justifyContent="flexEnd">
-          <EuiButton
-            fill
-            iconType="arrowRight"
-            iconSide="right"
-            data-test-subj="startChatButton"
-            disabled={
-              !watch(ChatFormFields.indices, [])?.length ||
-              !Object.keys(connectors || {}).length ||
-              !watch(ChatFormFields.elasticsearchQuery, '')
-            }
-            onClick={onStartClick}
-          >
-            <FormattedMessage
-              id="xpack.searchPlayground.startNewChat.startBtn"
-              defaultMessage="Start"
-            />
-          </EuiButton>
-        </EuiFlexGroup>
-      </EuiFlexGroup>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/summarization_panel/include_citations_field.tsx b/x-pack/plugins/search_playground/public/components/summarization_panel/include_citations_field.tsx
index 75212a2ba9cc3..6ab49bea16c3d 100644
--- a/x-pack/plugins/search_playground/public/components/summarization_panel/include_citations_field.tsx
+++ b/x-pack/plugins/search_playground/public/components/summarization_panel/include_citations_field.tsx
@@ -27,7 +27,7 @@ export const IncludeCitationsField: React.FC<IncludeCitationsFieldProps> = ({
   };
 
   return (
-    <EuiFormRow>
+    <EuiFormRow fullWidth>
       <EuiSwitch
         label={i18n.translate('xpack.searchPlayground.sidebar.citationsField.label', {
           defaultMessage: 'Include citations',
diff --git a/x-pack/plugins/search_playground/public/components/summarization_panel/instructions_field.tsx b/x-pack/plugins/search_playground/public/components/summarization_panel/instructions_field.tsx
index baea917937264..5db2dcc6c6d86 100644
--- a/x-pack/plugins/search_playground/public/components/summarization_panel/instructions_field.tsx
+++ b/x-pack/plugins/search_playground/public/components/summarization_panel/instructions_field.tsx
@@ -53,6 +53,7 @@ export const InstructionsField: React.FC<InstructionsFieldProps> = ({ value, onC
           </>
         </EuiToolTip>
       }
+      fullWidth
     >
       <EuiTextArea
         placeholder={i18n.translate(
diff --git a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.test.tsx b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.test.tsx
index 7d844c51cebb0..85bc7421bcf01 100644
--- a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.test.tsx
+++ b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.test.tsx
@@ -60,9 +60,5 @@ describe('SummarizationModel', () => {
     );
 
     expect(getByTestId('summarizationModelSelect')).toBeInTheDocument();
-    expect(getByTestId('manageConnectorsLink')).toHaveAttribute(
-      'href',
-      'http://example.com/manage-connectors'
-    );
   });
 });
diff --git a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.tsx b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.tsx
index f60436025e0d1..e13823d87fd8d 100644
--- a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.tsx
+++ b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_model.tsx
@@ -8,7 +8,6 @@
 import React, { useEffect, useMemo } from 'react';
 
 import {
-  EuiButtonIcon,
   EuiFlexGroup,
   EuiFlexItem,
   EuiFormRow,
@@ -16,18 +15,15 @@ import {
   EuiSuperSelect,
   type EuiSuperSelectOption,
   EuiText,
-  EuiToolTip,
 } from '@elastic/eui';
 
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { AnalyticsEvents } from '../../analytics/constants';
 import { useUsageTracker } from '../../hooks/use_usage_tracker';
 import type { LLMModel } from '../../types';
-import { useManagementLink } from '../../hooks/use_management_link';
 
 interface SummarizationModelProps {
-  selectedModel: LLMModel;
+  selectedModel?: LLMModel;
   onSelect: (model: LLMModel) => void;
   models: LLMModel[];
 }
@@ -40,7 +36,6 @@ export const SummarizationModel: React.FC<SummarizationModelProps> = ({
   onSelect,
 }) => {
   const usageTracker = useUsageTracker();
-  const managementLink = useManagementLink(selectedModel.connectorId);
   const onChange = (modelValue: string) => {
     const newSelectedModel = models.find((model) => getOptionValue(model) === modelValue);
 
@@ -98,7 +93,7 @@ export const SummarizationModel: React.FC<SummarizationModelProps> = ({
 
   useEffect(() => {
     usageTracker?.click(
-      `${AnalyticsEvents.modelSelected}_${selectedModel.value || selectedModel.connectorType}`
+      `${AnalyticsEvents.modelSelected}_${selectedModel!.value || selectedModel!.connectorType}`
     );
   }, [usageTracker, selectedModel]);
 
@@ -113,36 +108,14 @@ export const SummarizationModel: React.FC<SummarizationModelProps> = ({
           />{' '}
         </>
       }
-      labelAppend={
-        <EuiToolTip
-          delay="long"
-          content={i18n.translate(
-            'xpack.searchPlayground.sidebar.summarizationModel.manageConnectorTooltip',
-            {
-              defaultMessage: 'Manage',
-            }
-          )}
-        >
-          <EuiButtonIcon
-            target="_blank"
-            href={managementLink}
-            data-test-subj="manageConnectorsLink"
-            iconType="wrench"
-            aria-label={i18n.translate(
-              'xpack.searchPlayground.sidebar.summarizationModel.manageConnectorLink',
-              {
-                defaultMessage: 'Manage connector',
-              }
-            )}
-          />
-        </EuiToolTip>
-      }
+      fullWidth
     >
       <EuiSuperSelect
         data-test-subj="summarizationModelSelect"
         options={modelsOption}
-        valueOfSelected={getOptionValue(selectedModel)}
+        valueOfSelected={selectedModel && getOptionValue(selectedModel)}
         onChange={onChange}
+        fullWidth
       />
     </EuiFormRow>
   );
diff --git a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_panel.tsx b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_panel.tsx
index 77b152121f5b0..4a199f7d98b18 100644
--- a/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_panel.tsx
+++ b/x-pack/plugins/search_playground/public/components/summarization_panel/summarization_panel.tsx
@@ -8,6 +8,7 @@
 import React from 'react';
 import { Controller, useFormContext } from 'react-hook-form';
 
+import { EuiPanel } from '@elastic/eui';
 import { useLLMsModels } from '../../hooks/use_llms_models';
 import { IncludeCitationsField } from './include_citations_field';
 import { InstructionsField } from './instructions_field';
@@ -17,13 +18,11 @@ import { SummarizationModel } from './summarization_model';
 export const SummarizationPanel: React.FC = () => {
   const { control } = useFormContext<ChatForm>();
   const models = useLLMsModels();
-  const defaultModel = models.find((model) => !model.disabled);
 
   return (
-    <>
+    <EuiPanel data-test-subj="summarizationPanel">
       <Controller
         name={ChatFormFields.summarizationModel}
-        defaultValue={defaultModel}
         rules={{ required: true }}
         control={control}
         render={({ field }) => (
@@ -51,6 +50,6 @@ export const SummarizationPanel: React.FC = () => {
           <IncludeCitationsField checked={field.value} onChange={field.onChange} />
         )}
       />
-    </>
+    </EuiPanel>
   );
 };
diff --git a/x-pack/plugins/search_playground/public/components/toolbar.tsx b/x-pack/plugins/search_playground/public/components/toolbar.tsx
index e322c9c6bb3ff..31ea3345cdcbe 100644
--- a/x-pack/plugins/search_playground/public/components/toolbar.tsx
+++ b/x-pack/plugins/search_playground/public/components/toolbar.tsx
@@ -7,15 +7,13 @@
 
 import { EuiFlexGroup } from '@elastic/eui';
 import React from 'react';
+import { DataActionButton } from './data_action_button';
 import { ViewCodeAction } from './view_code/view_code_action';
-import { ViewQueryAction } from './view_query/view_query_action';
-import { EditContextAction } from './edit_context/edit_context_action';
 
 export const Toolbar: React.FC = () => {
   return (
-    <EuiFlexGroup gutterSize="s" data-test-subj="playground-header-actions">
-      <EditContextAction />
-      <ViewQueryAction />
+    <EuiFlexGroup gutterSize="s" alignItems="center" data-test-subj="playground-header-actions">
+      <DataActionButton />
       <ViewCodeAction />
     </EuiFlexGroup>
   );
diff --git a/x-pack/plugins/search_playground/public/components/view_code/view_code_action.tsx b/x-pack/plugins/search_playground/public/components/view_code/view_code_action.tsx
index 01ddc3d789dc5..13b6a2119757a 100644
--- a/x-pack/plugins/search_playground/public/components/view_code/view_code_action.tsx
+++ b/x-pack/plugins/search_playground/public/components/view_code/view_code_action.tsx
@@ -27,6 +27,7 @@ export const ViewCodeAction: React.FC = () => {
         onClick={() => setShowFlyout(true)}
         disabled={!selectedIndices || selectedIndices?.length === 0}
         data-test-subj="viewCodeActionButton"
+        size="s"
       >
         <FormattedMessage
           id="xpack.searchPlayground.viewCode.actionButtonLabel"
diff --git a/x-pack/plugins/search_playground/public/components/view_query/view_query_action.tsx b/x-pack/plugins/search_playground/public/components/view_query/view_query_action.tsx
deleted file mode 100644
index 53d01dc81d614..0000000000000
--- a/x-pack/plugins/search_playground/public/components/view_query/view_query_action.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-import { EuiButtonEmpty } from '@elastic/eui';
-import { useFormContext } from 'react-hook-form';
-import { FormattedMessage } from '@kbn/i18n-react';
-import { ViewQueryFlyout } from './view_query_flyout';
-import { ChatForm, ChatFormFields } from '../../types';
-
-export const ViewQueryAction: React.FC = () => {
-  const [showFlyout, setShowFlyout] = useState(false);
-  const { watch } = useFormContext<ChatForm>();
-  const selectedIndices: string[] = watch(ChatFormFields.indices);
-
-  return (
-    <>
-      {showFlyout && <ViewQueryFlyout onClose={() => setShowFlyout(false)} />}
-      <EuiButtonEmpty
-        onClick={() => setShowFlyout(true)}
-        disabled={selectedIndices?.length === 0}
-        data-test-subj="viewQueryActionButton"
-      >
-        <FormattedMessage
-          id="xpack.searchPlayground.viewQuery.actionButtonLabel"
-          defaultMessage="View query"
-        />
-      </EuiButtonEmpty>
-    </>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.tsx b/x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.tsx
deleted file mode 100644
index 2fd64f073eac7..0000000000000
--- a/x-pack/plugins/search_playground/public/components/view_query/view_query_flyout.tsx
+++ /dev/null
@@ -1,302 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiAccordion,
-  EuiSelectable,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiCodeBlock,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutFooter,
-  EuiFlyoutHeader,
-  EuiPanel,
-  EuiSpacer,
-  EuiSelectableOption,
-  EuiText,
-  EuiTitle,
-  EuiCheckbox,
-  EuiLink,
-  EuiIcon,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n-react';
-import React, { useEffect, useState } from 'react';
-import { useFormContext } from 'react-hook-form';
-import { useController } from 'react-hook-form';
-import { AnalyticsEvents } from '../../analytics/constants';
-import { docLinks } from '../../../common/doc_links';
-import { useIndicesFields } from '../../hooks/use_indices_fields';
-import { useUsageTracker } from '../../hooks/use_usage_tracker';
-import { ChatForm, ChatFormFields, IndicesQuerySourceFields } from '../../types';
-import { createQuery, getDefaultQueryFields, IndexFields } from '../../utils/create_query';
-
-const groupTypeQueryFields = (
-  fields: IndicesQuerySourceFields,
-  queryFields: IndexFields
-): string[] =>
-  Object.entries(queryFields).map(([index, selectedFields]) => {
-    const indexFields = fields[index];
-    let typeQueryFields = '';
-
-    if (selectedFields.some((field) => indexFields.bm25_query_fields.includes(field))) {
-      typeQueryFields = 'BM25';
-    }
-
-    if (
-      selectedFields.some((field) =>
-        indexFields.dense_vector_query_fields.find((vectorField) => vectorField.field === field)
-      )
-    ) {
-      typeQueryFields += (typeQueryFields ? '_' : '') + 'DENSE';
-    }
-
-    if (
-      selectedFields.some((field) =>
-        indexFields.elser_query_fields.find((elserField) => elserField.field === field)
-      )
-    ) {
-      typeQueryFields += (typeQueryFields ? '_' : '') + 'SPARSE';
-    }
-
-    if (
-      selectedFields.some((field) => indexFields.semantic_fields.find((f) => f.field === field))
-    ) {
-      typeQueryFields += (typeQueryFields ? '_' : '') + 'SEMANTIC';
-    }
-
-    return typeQueryFields;
-  });
-
-interface ViewQueryFlyoutProps {
-  onClose: () => void;
-}
-
-export const ViewQueryFlyout: React.FC<ViewQueryFlyoutProps> = ({ onClose }) => {
-  const usageTracker = useUsageTracker();
-  const { getValues } = useFormContext<ChatForm>();
-  const selectedIndices: string[] = getValues(ChatFormFields.indices);
-  const sourceFields = getValues(ChatFormFields.sourceFields);
-  const { fields } = useIndicesFields(selectedIndices);
-  const defaultFields = getDefaultQueryFields(fields);
-
-  const {
-    field: { onChange: queryFieldsOnChange, value: queryFields },
-  } = useController({
-    name: ChatFormFields.queryFields,
-    defaultValue: defaultFields,
-  });
-
-  const [tempQueryFields, setTempQueryFields] = useState<IndexFields>(queryFields);
-
-  const {
-    field: { onChange: elasticsearchQueryChange },
-  } = useController({
-    name: ChatFormFields.elasticsearchQuery,
-  });
-
-  const isQueryFieldSelected = (index: string, field: string) => {
-    return tempQueryFields[index].includes(field);
-  };
-
-  const updateFields = (index: string, options: EuiSelectableOption[]) => {
-    const newFields = options
-      .filter((option) => option.checked === 'on')
-      .map((option) => option.label);
-    setTempQueryFields({
-      ...tempQueryFields,
-      [index]: newFields,
-    });
-    usageTracker?.count(AnalyticsEvents.viewQueryFieldsUpdated, newFields.length);
-  };
-
-  const saveQuery = () => {
-    queryFieldsOnChange(tempQueryFields);
-    elasticsearchQueryChange(createQuery(tempQueryFields, sourceFields, fields));
-    onClose();
-
-    const groupedQueryFields = groupTypeQueryFields(fields, tempQueryFields);
-
-    groupedQueryFields.forEach((typeQueryFields) =>
-      usageTracker?.click(`${AnalyticsEvents.viewQuerySaved}_${typeQueryFields}`)
-    );
-  };
-
-  useEffect(() => {
-    usageTracker?.load(AnalyticsEvents.viewQueryFlyoutOpened);
-  }, [usageTracker]);
-
-  return (
-    <EuiFlyout ownFocus onClose={onClose} size="l" data-test-subj="viewQueryFlyout">
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2>
-            <FormattedMessage
-              id="xpack.searchPlayground.viewQuery.flyout.title"
-              defaultMessage="Customize your Elasticsearch query"
-            />
-          </h2>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <EuiText color="subdued">
-          <p>
-            <FormattedMessage
-              id="xpack.searchPlayground.viewQuery.flyout.description"
-              defaultMessage="This query will be used to search your indices. Customize by choosing which
-            fields in your Elasticsearch documents to search."
-            />
-            {` `}
-            <EuiLink
-              href={docLinks.retrievalOptimize}
-              target="_blank"
-              data-test-subj="query-optimize-documentation-link"
-            >
-              <FormattedMessage
-                id="xpack.searchPlayground.viewQuery.flyout.learnMoreQueryOptimizeLink"
-                defaultMessage="Learn more."
-              />
-            </EuiLink>
-          </p>
-        </EuiText>
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>
-        <EuiFlexGroup>
-          <EuiFlexItem grow={6}>
-            <EuiCodeBlock
-              language="json"
-              fontSize="m"
-              paddingSize="m"
-              lineNumbers
-              data-test-subj="ViewElasticsearchQueryResult"
-            >
-              {JSON.stringify(createQuery(tempQueryFields, sourceFields, fields), null, 2)}
-            </EuiCodeBlock>
-          </EuiFlexItem>
-          <EuiFlexItem grow={3}>
-            <EuiFlexGroup direction="column" gutterSize="s">
-              <EuiText>
-                <h5>
-                  <FormattedMessage
-                    id="xpack.searchPlayground.viewQuery.flyout.table.title"
-                    defaultMessage="Fields to search (per index)"
-                  />
-                </h5>
-              </EuiText>
-              {Object.entries(fields).map(([index, group]) => (
-                <EuiFlexItem grow={false} key={index}>
-                  <EuiPanel grow={false} hasShadow={false} hasBorder>
-                    <EuiAccordion
-                      id={index}
-                      initialIsOpen
-                      buttonContent={
-                        <EuiText>
-                          <h5>{index}</h5>
-                        </EuiText>
-                      }
-                    >
-                      <EuiSpacer size="s" />
-                      <EuiSelectable
-                        aria-label="Select query fields"
-                        data-test-subj={`queryFieldsSelectable_${index}`}
-                        options={[
-                          ...group.semantic_fields,
-                          ...group.elser_query_fields,
-                          ...group.dense_vector_query_fields,
-                          ...group.bm25_query_fields,
-                        ].map((field, idx) => {
-                          const checked = isQueryFieldSelected(
-                            index,
-                            typeof field === 'string' ? field : field.field
-                          );
-                          return {
-                            label: typeof field === 'string' ? field : field.field,
-                            prepend: (
-                              <EuiCheckbox
-                                id={`checkbox_${idx}`}
-                                checked={checked}
-                                onChange={() => {}}
-                              />
-                            ),
-                            checked: checked ? 'on' : undefined,
-                            'data-test-subj': 'queryField',
-                          };
-                        })}
-                        listProps={{
-                          bordered: false,
-                          showIcons: false,
-                        }}
-                        onChange={(newOptions) => updateFields(index, newOptions)}
-                      >
-                        {(list) => list}
-                      </EuiSelectable>
-                      {group.skipped_fields > 0 && (
-                        <>
-                          <EuiSpacer size="m" />
-                          <EuiFlexGroup>
-                            <EuiFlexItem>
-                              <EuiText
-                                size="s"
-                                color="subdued"
-                                data-test-subj={`skipped_fields_${index}`}
-                              >
-                                <EuiIcon type="eyeClosed" />
-                                {` `}
-                                <FormattedMessage
-                                  id="xpack.searchPlayground.viewQuery.flyout.hiddenFields"
-                                  defaultMessage="{skippedFields} fields are hidden."
-                                  values={{ skippedFields: group.skipped_fields }}
-                                />
-                              </EuiText>
-                            </EuiFlexItem>
-                            <EuiFlexItem grow={false}>
-                              <EuiLink
-                                href={docLinks.hiddenFields}
-                                target="_blank"
-                                data-test-subj="hidden-fields-documentation-link"
-                              >
-                                <FormattedMessage
-                                  id="xpack.searchPlayground.viewQuery.flyout.learnMoreLink"
-                                  defaultMessage="Learn more."
-                                />
-                              </EuiLink>
-                            </EuiFlexItem>
-                          </EuiFlexGroup>
-                        </>
-                      )}
-                    </EuiAccordion>
-                  </EuiPanel>
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGroup>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlyoutBody>
-      <EuiFlyoutFooter>
-        <EuiFlexGroup justifyContent="spaceBetween">
-          <EuiFlexItem grow={false}>
-            <EuiButtonEmpty iconType="cross" onClick={onClose} flush="left">
-              <FormattedMessage
-                id="xpack.searchPlayground.viewQuery.flyout.closeButton"
-                defaultMessage="Close"
-              />
-            </EuiButtonEmpty>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiButton onClick={saveQuery} fill>
-              <FormattedMessage
-                id="xpack.searchPlayground.viewQuery.flyout.saveButton"
-                defaultMessage="Save changes"
-              />
-            </EuiButton>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlyoutFooter>
-    </EuiFlyout>
-  );
-};
diff --git a/x-pack/plugins/search_playground/public/embeddable.tsx b/x-pack/plugins/search_playground/public/embeddable.tsx
index f21c0c0f667eb..10eaec93fab8a 100644
--- a/x-pack/plugins/search_playground/public/embeddable.tsx
+++ b/x-pack/plugins/search_playground/public/embeddable.tsx
@@ -9,16 +9,15 @@ import React from 'react';
 import { dynamic } from '@kbn/shared-ux-utility';
 import { KibanaContextProvider } from '@kbn/kibana-react-plugin/public';
 import { CoreStart } from '@kbn/core-lifecycle-browser';
+import { QueryClientProvider } from '@tanstack/react-query';
 import { AppPluginStartDependencies } from './types';
+import { queryClient } from './utils/query_client';
+import { AppProps } from './components/app';
 
-export const Playground = dynamic(async () => ({
+export const Playground = dynamic<React.FC<AppProps>>(async () => ({
   default: (await import('./components/app')).App,
 }));
 
-export const PlaygroundToolbar = dynamic(async () => ({
-  default: (await import('./components/toolbar')).Toolbar,
-}));
-
 export const PlaygroundProvider = dynamic(async () => ({
   default: (await import('./providers/playground_provider')).PlaygroundProvider,
 }));
@@ -32,6 +31,8 @@ export const getPlaygroundProvider =
   (props: React.ComponentProps<typeof PlaygroundProvider>) =>
     (
       <KibanaContextProvider services={{ ...core, ...services }}>
-        <PlaygroundProvider {...props} />
+        <QueryClientProvider client={queryClient}>
+          <PlaygroundProvider {...props} />
+        </QueryClientProvider>
       </KibanaContextProvider>
     );
diff --git a/x-pack/plugins/search_playground/public/hooks/use_indices_fields.ts b/x-pack/plugins/search_playground/public/hooks/use_indices_fields.ts
index f78ea3accf206..e2ca982f2dc3f 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_indices_fields.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_indices_fields.ts
@@ -9,13 +9,15 @@ import { useQuery } from '@tanstack/react-query';
 import { useKibana } from './use_kibana';
 import { APIRoutes, IndicesQuerySourceFields } from '../types';
 
+const initialData = {};
+
 export const useIndicesFields = (indices: string[] = []) => {
   const { services } = useKibana();
 
-  const { data, isLoading } = useQuery({
+  const { data, isLoading, isFetching } = useQuery<IndicesQuerySourceFields>({
     enabled: indices.length > 0,
     queryKey: ['fields', indices.toString()],
-    initialData: {},
+    initialData,
     queryFn: async () => {
       const response = await services.http.post<IndicesQuerySourceFields>(
         APIRoutes.POST_QUERY_SOURCE_FIELDS,
@@ -30,5 +32,5 @@ export const useIndicesFields = (indices: string[] = []) => {
     },
   });
 
-  return { fields: data!, isLoading };
+  return { fields: data, isLoading: isLoading || isFetching };
 };
diff --git a/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts b/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
index cb21721c3240a..d661084306583 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_llms_models.test.ts
@@ -88,8 +88,8 @@ describe('useLLMsModels Hook', () => {
         connectorType: LLMs.bedrock,
         disabled: false,
         icon: expect.any(Function),
-        id: 'connectorId2Claude 3 Haiku',
-        name: 'Claude 3 Haiku',
+        id: 'connectorId2Anthropic Claude 3 Haiku',
+        name: 'Anthropic Claude 3 Haiku',
         showConnectorName: false,
         value: 'anthropic.claude-3-haiku-20240307-v1:0',
         promptTokenLimit: 200000,
@@ -100,10 +100,10 @@ describe('useLLMsModels Hook', () => {
         connectorType: LLMs.bedrock,
         disabled: false,
         icon: expect.any(Function),
-        id: 'connectorId2Claude 3 Sonnet',
-        name: 'Claude 3 Sonnet',
+        id: 'connectorId2Anthropic Claude 3.5 Sonnet',
+        name: 'Anthropic Claude 3.5 Sonnet',
         showConnectorName: false,
-        value: 'anthropic.claude-3-haiku-20240307-v1:0',
+        value: 'anthropic.claude-3-5-sonnet-20240620-v1:0',
         promptTokenLimit: 200000,
       },
     ]);
diff --git a/x-pack/plugins/search_playground/public/hooks/use_llms_models.ts b/x-pack/plugins/search_playground/public/hooks/use_llms_models.ts
index e0b26dcee3c7b..7a9b01e085a6d 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_llms_models.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_llms_models.ts
@@ -6,7 +6,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { BedrockLogo, OpenAILogo } from '@kbn/stack-connectors-plugin/public/common';
+import { BedrockLogo, OpenAILogo, GeminiLogo } from '@kbn/stack-connectors-plugin/public/common';
 import { ComponentType, useMemo } from 'react';
 import { LLMs } from '../../common/types';
 import { LLMModel } from '../types';
@@ -52,6 +52,15 @@ const mapLlmToModels: Record<
         promptTokenLimit: model.promptTokenLimit,
       })),
   },
+  [LLMs.gemini]: {
+    icon: GeminiLogo,
+    getModels: () =>
+      MODELS.filter(({ provider }) => provider === LLMs.gemini).map((model) => ({
+        label: model.name,
+        value: model.model,
+        promptTokenLimit: model.promptTokenLimit,
+      })),
+  },
 };
 
 export const useLLMsModels = (): LLMModel[] => {
diff --git a/x-pack/plugins/search_playground/public/hooks/use_load_connectors.ts b/x-pack/plugins/search_playground/public/hooks/use_load_connectors.ts
index 6e66ece073cc2..94bb2da37b1ed 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_load_connectors.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_load_connectors.ts
@@ -16,6 +16,7 @@ import {
   OPENAI_CONNECTOR_ID,
   OpenAiProviderType,
   BEDROCK_CONNECTOR_ID,
+  GEMINI_CONNECTOR_ID,
 } from '@kbn/stack-connectors-plugin/public/common';
 import { UserConfiguredActionConnector } from '@kbn/triggers-actions-ui-plugin/public/types';
 import { useKibana } from './use_kibana';
@@ -73,6 +74,17 @@ const connectorTypeToLLM: Array<{
       type: LLMs.bedrock,
     }),
   },
+  {
+    actionId: GEMINI_CONNECTOR_ID,
+    match: (connector) => connector.actionTypeId === GEMINI_CONNECTOR_ID,
+    transform: (connector) => ({
+      ...connector,
+      title: i18n.translate('xpack.searchPlayground.geminiConnectorTitle', {
+        defaultMessage: 'Gemini',
+      }),
+      type: LLMs.gemini,
+    }),
+  },
 ];
 
 type PlaygroundConnector = ActionConnector & { title: string; type: LLMs };
diff --git a/x-pack/plugins/search_playground/public/hooks/use_query_indices.ts b/x-pack/plugins/search_playground/public/hooks/use_query_indices.ts
index 6740928ac903c..d011b471a68d6 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_query_indices.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_query_indices.ts
@@ -29,7 +29,8 @@ export const useQueryIndices = (
 
       return response.indices;
     },
+    initialData: [],
   });
 
-  return { indices: data || [], isLoading };
+  return { indices: data, isLoading };
 };
diff --git a/x-pack/plugins/search_playground/public/hooks/use_source_indices_field.ts b/x-pack/plugins/search_playground/public/hooks/use_source_indices_field.ts
index bc9a37060fb6f..2fe9fbc237ff3 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_source_indices_field.ts
+++ b/x-pack/plugins/search_playground/public/hooks/use_source_indices_field.ts
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import { useQuery } from '@tanstack/react-query';
-import { useController, useFormContext } from 'react-hook-form';
+import { useController } from 'react-hook-form';
 import { IndexName } from '@elastic/elasticsearch/lib/api/types';
-import { useEffect, useState } from 'react';
-import { useKibana } from './use_kibana';
-import { APIRoutes, IndicesQuerySourceFields } from '../types';
+import { useCallback, useEffect, useState } from 'react';
+import { merge } from 'lodash';
+import { useIndicesFields } from './use_indices_fields';
 import { ChatForm, ChatFormFields } from '../types';
 import {
   createQuery,
@@ -36,10 +35,7 @@ export const getIndicesWithNoSourceFields = (
 
 export const useSourceIndicesFields = () => {
   const usageTracker = useUsageTracker();
-  const { services } = useKibana();
   const [loading, setLoading] = useState<boolean>(false);
-  const [noFieldsIndicesWarning, setNoFieldsIndicesWarning] = useState<string | null>(null);
-  const { resetField } = useFormContext<ChatForm>();
 
   const {
     field: { value: selectedIndices, onChange: onIndicesChange },
@@ -55,73 +51,74 @@ export const useSourceIndicesFields = () => {
   });
 
   const {
-    field: { onChange: onSourceFieldsChange },
-  } = useController({
-    name: ChatFormFields.sourceFields,
+    field: { onChange: onQueryFieldsOnChange, value: queryFields },
+  } = useController<ChatForm, ChatFormFields.queryFields>({
+    name: ChatFormFields.queryFields,
   });
 
-  const { data: fields } = useQuery({
-    enabled: selectedIndices.length > 0,
-    queryKey: ['fields', selectedIndices.toString()],
-    queryFn: async () => {
-      const response = await services.http.post<IndicesQuerySourceFields>(
-        APIRoutes.POST_QUERY_SOURCE_FIELDS,
-        {
-          body: JSON.stringify({ indices: selectedIndices }),
-        }
-      );
-      return response;
-    },
+  const {
+    field: { onChange: onSourceFieldsChange, value: sourceFields },
+  } = useController({
+    name: ChatFormFields.sourceFields,
   });
+  const { fields, isLoading: isFieldsLoading } = useIndicesFields(selectedIndices);
 
   useEffect(() => {
     if (fields) {
-      resetField(ChatFormFields.queryFields);
-
       const defaultFields = getDefaultQueryFields(fields);
       const defaultSourceFields = getDefaultSourceFields(fields);
+      const mergedQueryFields = merge(defaultFields, queryFields);
+      const mergedSourceFields = merge(defaultSourceFields, sourceFields);
 
-      const indicesWithNoSourceFields = getIndicesWithNoSourceFields(defaultSourceFields);
+      onElasticsearchQueryChange(createQuery(mergedQueryFields, mergedSourceFields, fields));
+      onQueryFieldsOnChange(mergedQueryFields);
 
-      if (indicesWithNoSourceFields) {
-        setNoFieldsIndicesWarning(indicesWithNoSourceFields);
-      } else {
-        setNoFieldsIndicesWarning(null);
-      }
-
-      onElasticsearchQueryChange(createQuery(defaultFields, defaultSourceFields, fields));
-      onSourceFieldsChange(defaultSourceFields);
+      onSourceFieldsChange(mergedSourceFields);
       usageTracker?.count(
         AnalyticsEvents.sourceFieldsLoaded,
         Object.values(fields)?.flat()?.length
       );
-    } else {
-      setNoFieldsIndicesWarning(null);
     }
     setLoading(false);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fields]);
 
-  const addIndex = (newIndex: IndexName) => {
-    const newIndices = [...selectedIndices, newIndex];
-    setLoading(true);
-    onIndicesChange(newIndices);
-    usageTracker?.count(AnalyticsEvents.sourceIndexUpdated, newIndices.length);
-  };
-
-  const removeIndex = (index: IndexName) => {
-    const newIndices = selectedIndices.filter((indexName: string) => indexName !== index);
-    setLoading(true);
-    onIndicesChange(newIndices);
-    usageTracker?.count(AnalyticsEvents.sourceIndexUpdated, newIndices.length);
-  };
+  const addIndex = useCallback(
+    (newIndex: IndexName) => {
+      const newIndices = [...selectedIndices, newIndex];
+      setLoading(true);
+      onIndicesChange(newIndices);
+      usageTracker?.count(AnalyticsEvents.sourceIndexUpdated, newIndices.length);
+    },
+    [onIndicesChange, selectedIndices, usageTracker]
+  );
+
+  const removeIndex = useCallback(
+    (index: IndexName) => {
+      const newIndices = selectedIndices.filter((indexName: string) => indexName !== index);
+      setLoading(true);
+      onIndicesChange(newIndices);
+      usageTracker?.count(AnalyticsEvents.sourceIndexUpdated, newIndices.length);
+    },
+    [onIndicesChange, selectedIndices, usageTracker]
+  );
+
+  const setIndices = useCallback(
+    (indices: IndexName[]) => {
+      setLoading(true);
+      onIndicesChange(indices);
+      usageTracker?.count(AnalyticsEvents.sourceIndexUpdated, indices.length);
+    },
+    [onIndicesChange, usageTracker]
+  );
 
   return {
     indices: selectedIndices,
     fields,
     loading,
+    isFieldsLoading,
     addIndex,
     removeIndex,
-    noFieldsIndicesWarning,
+    setIndices,
   };
 };
diff --git a/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx b/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
index 7dd1a43d6fc01..431eab3cd943c 100644
--- a/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
+++ b/x-pack/plugins/search_playground/public/hooks/use_source_indices_fields.test.tsx
@@ -165,7 +165,6 @@ describe.skip('useSourceIndicesFields Hook', () => {
     expect(postMock).toHaveBeenCalled();
 
     await act(async () => {
-      expect(result.current.noFieldsIndicesWarning).toEqual('missing_fields_index');
       expect(result.current.loading).toBe(false);
       expect(getValues()).toMatchInlineSnapshot(`
         Object {
@@ -219,7 +218,6 @@ describe.skip('useSourceIndicesFields Hook', () => {
     expect(postMock).toHaveBeenCalled();
 
     await act(async () => {
-      expect(result.current.noFieldsIndicesWarning).toBeNull();
       expect(result.current.loading).toBe(false);
       expect(getValues()).toMatchInlineSnapshot(`
         Object {
diff --git a/x-pack/plugins/search_playground/public/plugin.ts b/x-pack/plugins/search_playground/public/plugin.ts
index bb8403366a6ed..8b2976cab10c9 100644
--- a/x-pack/plugins/search_playground/public/plugin.ts
+++ b/x-pack/plugins/search_playground/public/plugin.ts
@@ -15,7 +15,7 @@ import {
 import { PLUGIN_ID, PLUGIN_NAME } from '../common';
 import { docLinks } from '../common/doc_links';
 import { PlaygroundHeaderDocs } from './components/playground_header_docs';
-import { PlaygroundToolbar, Playground, getPlaygroundProvider } from './embeddable';
+import { Playground, getPlaygroundProvider } from './embeddable';
 import {
   AppPluginStartDependencies,
   SearchPlaygroundConfigType,
@@ -60,7 +60,6 @@ export class SearchPlaygroundPlugin
     docLinks.setDocLinks(core.docLinks.links);
     return {
       PlaygroundProvider: getPlaygroundProvider(core, deps),
-      PlaygroundToolbar,
       Playground,
       PlaygroundHeaderDocs,
     };
diff --git a/x-pack/plugins/search_playground/public/providers/playground_provider.tsx b/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
index 562658b4b8bd5..6700bb4c66a57 100644
--- a/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
+++ b/x-pack/plugins/search_playground/public/providers/playground_provider.tsx
@@ -5,32 +5,30 @@
  * 2.0.
  */
 
-import React, { FC, PropsWithChildren } from 'react';
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
+import React, { FC, useEffect } from 'react';
 import { FormProvider, useForm } from 'react-hook-form';
-import { ChatForm } from '../types';
+import { useLLMsModels } from '../hooks/use_llms_models';
+import { ChatForm, ChatFormFields } from '../types';
 
-const queryClient = new QueryClient({});
-
-export interface PlaygroundProviderProps {
-  children: React.ReactNode;
-}
-
-export const PlaygroundProvider: FC<PropsWithChildren<PlaygroundProviderProps>> = ({
-  children,
-}) => {
+export const PlaygroundProvider: FC = ({ children }) => {
+  const models = useLLMsModels();
   const form = useForm<ChatForm>({
     defaultValues: {
       prompt: 'You are an assistant for question-answering tasks.',
       doc_size: 3,
       source_fields: {},
       indices: [],
+      summarization_model: {},
     },
   });
 
-  return (
-    <QueryClientProvider client={queryClient}>
-      <FormProvider {...form}>{children}</FormProvider>
-    </QueryClientProvider>
-  );
+  useEffect(() => {
+    const defaultModel = models.find((model) => !model.disabled);
+
+    if (defaultModel) {
+      form.setValue(ChatFormFields.summarizationModel, defaultModel);
+    }
+  }, [form, models]);
+
+  return <FormProvider {...form}>{children}</FormProvider>;
 };
diff --git a/x-pack/plugins/search_playground/public/types.ts b/x-pack/plugins/search_playground/public/types.ts
index eea41aae96d59..2076ac2190b99 100644
--- a/x-pack/plugins/search_playground/public/types.ts
+++ b/x-pack/plugins/search_playground/public/types.ts
@@ -25,7 +25,6 @@ import type { ConsolePluginStart } from '@kbn/console-plugin/public';
 import { ChatRequestData } from '../common/types';
 import type { App } from './components/app';
 import type { PlaygroundProvider as PlaygroundProviderComponent } from './providers/playground_provider';
-import type { Toolbar } from './components/toolbar';
 import { PlaygroundHeaderDocs } from './components/playground_header_docs';
 
 export * from '../common/types';
@@ -34,7 +33,6 @@ export * from '../common/types';
 export interface SearchPlaygroundPluginSetup {}
 export interface SearchPlaygroundPluginStart {
   PlaygroundProvider: React.FC<React.ComponentProps<typeof PlaygroundProviderComponent>>;
-  PlaygroundToolbar: React.FC<React.ComponentProps<typeof Toolbar>>;
   Playground: React.FC<React.ComponentProps<typeof App>>;
   PlaygroundHeaderDocs: React.FC<React.ComponentProps<typeof PlaygroundHeaderDocs>>;
 }
diff --git a/x-pack/plugins/search_playground/public/utils/create_query.ts b/x-pack/plugins/search_playground/public/utils/create_query.ts
index fadf15f291abd..1f3fee0e35104 100644
--- a/x-pack/plugins/search_playground/public/utils/create_query.ts
+++ b/x-pack/plugins/search_playground/public/utils/create_query.ts
@@ -55,6 +55,9 @@ export function createQuery(
   const indices = Object.keys(fieldDescriptors);
   const boolMatches = Object.keys(fields).reduce<Matches>(
     (acc, index) => {
+      if (!fieldDescriptors[index]) {
+        return acc;
+      }
       const indexFields: string[] = fields[index];
       const indexFieldDescriptors: QuerySourceFields = fieldDescriptors[index];
 
@@ -320,6 +323,21 @@ export function getDefaultSourceFields(fieldDescriptors: IndicesQuerySourceField
   return indexFields;
 }
 
+export const getIndicesWithNoSourceFields = (
+  fields: IndicesQuerySourceFields
+): string | undefined => {
+  const defaultSourceFields = getDefaultSourceFields(fields);
+  const indices = Object.keys(defaultSourceFields).reduce<string[]>((result, index: string) => {
+    if (defaultSourceFields[index].length === 0) {
+      result.push(index);
+    }
+
+    return result;
+  }, []);
+
+  return indices.length === 0 ? undefined : indices.join();
+};
+
 export function getDefaultQueryFields(fieldDescriptors: IndicesQuerySourceFields): IndexFields {
   const indexFields = Object.keys(fieldDescriptors).reduce<IndexFields>(
     (acc: IndexFields, index: string) => {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/flyout/types.ts b/x-pack/plugins/search_playground/public/utils/query_client.ts
similarity index 68%
rename from x-pack/plugins/security_solution/public/common/hooks/flyout/types.ts
rename to x-pack/plugins/search_playground/public/utils/query_client.ts
index 09fd6a25cc53e..c5d9874fe71ef 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/flyout/types.ts
+++ b/x-pack/plugins/search_playground/public/utils/query_client.ts
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
-import type { ExpandedDetailType } from '../../../../common/types';
+import { QueryClient } from '@tanstack/react-query';
 
-export type FlyoutUrlState = ExpandedDetailType;
+export const queryClient = new QueryClient({});
diff --git a/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts b/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
index fa6ee8e6e1abd..5885802428d5e 100644
--- a/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
+++ b/x-pack/plugins/search_playground/server/lib/conversational_chain.test.ts
@@ -97,6 +97,7 @@ describe('conversational chain', () => {
         inputTokensLimit: modelLimit,
       },
       prompt: 'you are a QA bot {question} {chat_history} {context}',
+      questionRewritePrompt: 'rewrite question {question} using {chat_history}"',
     });
 
     const stream = await conversationalChain.stream(aiClient, chat);
@@ -442,7 +443,7 @@ describe('conversational chain', () => {
           type: 'retrieved_docs',
         },
       ],
-      // Even with body_content of 1000, the token count should be below the model limit of 100
+      // Even with body_content of 1000, the token count should be below or equal to model limit of 100
       expectedTokens: [
         { type: 'context_token_count', count: 70 },
         { type: 'prompt_token_count', count: 97 },
diff --git a/x-pack/plugins/search_playground/server/lib/conversational_chain.ts b/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
index 96756848797df..0a8f26efca163 100644
--- a/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
+++ b/x-pack/plugins/search_playground/server/lib/conversational_chain.ts
@@ -37,6 +37,7 @@ interface RAGOptions {
 interface ConversationalChainOptions {
   model: BaseLanguageModel;
   prompt: string;
+  questionRewritePrompt: string;
   rag?: RAGOptions;
 }
 
@@ -46,16 +47,6 @@ interface ContextInputs {
   question: string;
 }
 
-const CONDENSE_QUESTION_TEMPLATE = `Given the following conversation and a follow up question, rephrase the follow up question to be a standalone question, in its original language. Be verbose in your answer.
-
-Chat History:
-{chat_history}
-
-Follow Up Input: {question}
-Standalone question:`;
-
-const condenseQuestionPrompt = PromptTemplate.fromTemplate(CONDENSE_QUESTION_TEMPLATE);
-
 const formatVercelMessages = (chatHistory: VercelChatMessage[]) => {
   const formattedDialogueTurns = chatHistory.map((message) => {
     if (message.role === 'user') {
@@ -160,11 +151,21 @@ class ConversationalChainFn {
       retrievalChain = retriever.pipe(buildContext);
     }
 
-    let standaloneQuestionChain: Runnable = RunnableLambda.from((input) => input.question);
+    let standaloneQuestionChain: Runnable = RunnableLambda.from((input) => {
+      return input.question;
+    });
 
     if (previousMessages.length > 0) {
+      const questionRewritePromptTemplate = PromptTemplate.fromTemplate(
+        this.options.questionRewritePrompt
+      );
       standaloneQuestionChain = RunnableSequence.from([
-        condenseQuestionPrompt,
+        {
+          context: () => '',
+          chat_history: (input) => input.chat_history,
+          question: (input) => input.question,
+        },
+        questionRewritePromptTemplate,
         this.options.model,
         new StringOutputParser(),
       ]).withConfig({
diff --git a/x-pack/plugins/search_playground/server/lib/get_chat_params.test.ts b/x-pack/plugins/search_playground/server/lib/get_chat_params.test.ts
index b05ac4a75c0ad..cbc696a50085e 100644
--- a/x-pack/plugins/search_playground/server/lib/get_chat_params.test.ts
+++ b/x-pack/plugins/search_playground/server/lib/get_chat_params.test.ts
@@ -6,12 +6,13 @@
  */
 
 import { getChatParams } from './get_chat_params';
-import { ActionsClientChatOpenAI, ActionsClientLlm } from '@kbn/langchain/server';
+import { ActionsClientChatOpenAI, ActionsClientSimpleChatModel } from '@kbn/langchain/server';
 import {
   OPENAI_CONNECTOR_ID,
   BEDROCK_CONNECTOR_ID,
+  GEMINI_CONNECTOR_ID,
 } from '@kbn/stack-connectors-plugin/public/common';
-import { Prompt } from '../../common/prompt';
+import { Prompt, QuestionRewritePrompt } from '../../common/prompt';
 import { KibanaRequest, Logger } from '@kbn/core/server';
 import { PluginStartContract as ActionsPluginStartContract } from '@kbn/actions-plugin/server';
 
@@ -20,12 +21,13 @@ jest.mock('@kbn/langchain/server', () => {
   return {
     ...original,
     ActionsClientChatOpenAI: jest.fn(),
-    ActionsClientLlm: jest.fn(),
+    ActionsClientSimpleChatModel: jest.fn(),
   };
 });
 
 jest.mock('../../common/prompt', () => ({
   Prompt: jest.fn((instructions) => instructions),
+  QuestionRewritePrompt: jest.fn((instructions) => instructions),
 }));
 
 jest.mock('uuid', () => ({
@@ -64,10 +66,45 @@ describe('getChatParams', () => {
       context: true,
       type: 'openai',
     });
+    expect(QuestionRewritePrompt).toHaveBeenCalledWith({
+      type: 'openai',
+    });
     expect(ActionsClientChatOpenAI).toHaveBeenCalledWith(expect.anything());
     expect(result.chatPrompt).toContain('Hello, world!');
   });
 
+  it('returns the correct chat model and prompt for Gemeni', async () => {
+    mockActionsClient.get.mockResolvedValue({ id: '1', actionTypeId: GEMINI_CONNECTOR_ID });
+
+    const result = await getChatParams(
+      {
+        connectorId: '1',
+        model: 'gemini-1.5-pro',
+        prompt: 'Hello, world!',
+        citations: true,
+      },
+      { actions, request, logger }
+    );
+    expect(Prompt).toHaveBeenCalledWith('Hello, world!', {
+      citations: true,
+      context: true,
+      type: 'gemini',
+    });
+    expect(QuestionRewritePrompt).toHaveBeenCalledWith({
+      type: 'gemini',
+    });
+    expect(ActionsClientSimpleChatModel).toHaveBeenCalledWith({
+      temperature: 0,
+      llmType: 'gemini',
+      logger: expect.anything(),
+      model: 'gemini-1.5-pro',
+      connectorId: '1',
+      actionsClient: expect.anything(),
+      streaming: true,
+    });
+    expect(result.chatPrompt).toContain('Hello, world!');
+  });
+
   it('returns the correct chat model and prompt for BEDROCK_CONNECTOR_ID', async () => {
     mockActionsClient.get.mockResolvedValue({ id: '2', actionTypeId: BEDROCK_CONNECTOR_ID });
 
@@ -86,14 +123,17 @@ describe('getChatParams', () => {
       context: true,
       type: 'anthropic',
     });
-    expect(ActionsClientLlm).toHaveBeenCalledWith({
+    expect(QuestionRewritePrompt).toHaveBeenCalledWith({
+      type: 'anthropic',
+    });
+    expect(ActionsClientSimpleChatModel).toHaveBeenCalledWith({
       temperature: 0,
       llmType: 'bedrock',
-      traceId: 'test-uuid',
       logger: expect.anything(),
       model: 'custom-model',
       connectorId: '2',
       actionsClient: expect.anything(),
+      streaming: true,
     });
     expect(result.chatPrompt).toContain('How does it work?');
   });
diff --git a/x-pack/plugins/search_playground/server/lib/get_chat_params.ts b/x-pack/plugins/search_playground/server/lib/get_chat_params.ts
index 9740988c3e1e2..d2c4bb1afaa9d 100644
--- a/x-pack/plugins/search_playground/server/lib/get_chat_params.ts
+++ b/x-pack/plugins/search_playground/server/lib/get_chat_params.ts
@@ -14,10 +14,11 @@ import { BaseLanguageModel } from '@langchain/core/language_models/base';
 import type { Connector } from '@kbn/actions-plugin/server/application/connector/types';
 import {
   ActionsClientChatOpenAI,
-  ActionsClientLlm,
+  ActionsClientSimpleChatModel,
   getDefaultArguments,
 } from '@kbn/langchain/server';
-import { Prompt } from '../../common/prompt';
+import { GEMINI_CONNECTOR_ID } from '@kbn/stack-connectors-plugin/common/gemini/constants';
+import { Prompt, QuestionRewritePrompt } from '../../common/prompt';
 
 export const getChatParams = async (
   {
@@ -35,13 +36,20 @@ export const getChatParams = async (
     logger: Logger;
     request: KibanaRequest;
   }
-): Promise<{ chatModel: BaseLanguageModel; chatPrompt: string; connector: Connector }> => {
+): Promise<{
+  chatModel: BaseLanguageModel;
+  chatPrompt: string;
+  questionRewritePrompt: string;
+  connector: Connector;
+}> => {
   const abortController = new AbortController();
   const abortSignal = abortController.signal;
   const actionsClient = await actions.getActionsClientWithRequest(request);
   const connector = await actionsClient.get({ id: connectorId });
   let chatModel;
   let chatPrompt;
+  let questionRewritePrompt;
+  let llmType;
 
   switch (connector.actionTypeId) {
     case OPENAI_CONNECTOR_ID:
@@ -62,31 +70,57 @@ export const getChatParams = async (
         context: true,
         type: 'openai',
       });
+      questionRewritePrompt = QuestionRewritePrompt({
+        type: 'openai',
+      });
       break;
     case BEDROCK_CONNECTOR_ID:
-      const llmType = 'bedrock';
-      chatModel = new ActionsClientLlm({
+      llmType = 'bedrock';
+      chatModel = new ActionsClientSimpleChatModel({
         actionsClient,
         logger,
         connectorId,
         model,
-        traceId: uuidv4(),
         llmType,
         temperature: getDefaultArguments(llmType).temperature,
+        streaming: true,
       });
       chatPrompt = Prompt(prompt, {
         citations,
         context: true,
         type: 'anthropic',
       });
+      questionRewritePrompt = QuestionRewritePrompt({
+        type: 'anthropic',
+      });
+      break;
+    case GEMINI_CONNECTOR_ID:
+      llmType = 'gemini';
+      chatModel = new ActionsClientSimpleChatModel({
+        actionsClient,
+        logger,
+        connectorId,
+        model,
+        llmType,
+        temperature: getDefaultArguments(llmType).temperature,
+        streaming: true,
+      });
+      chatPrompt = Prompt(prompt, {
+        citations,
+        context: true,
+        type: 'gemini',
+      });
+      questionRewritePrompt = QuestionRewritePrompt({
+        type: 'gemini',
+      });
       break;
     default:
       break;
   }
 
-  if (!chatModel || !chatPrompt) {
+  if (!chatModel || !chatPrompt || !questionRewritePrompt) {
     throw new Error('Invalid connector id');
   }
 
-  return { chatModel, chatPrompt, connector };
+  return { chatModel, chatPrompt, questionRewritePrompt, connector };
 };
diff --git a/x-pack/plugins/search_playground/server/routes.ts b/x-pack/plugins/search_playground/server/routes.ts
index 8421122f72e6f..de26776816f33 100644
--- a/x-pack/plugins/search_playground/server/routes.ts
+++ b/x-pack/plugins/search_playground/server/routes.ts
@@ -27,7 +27,7 @@ import { MODELS } from '../common/models';
 export function createRetriever(esQuery: string) {
   return (question: string) => {
     try {
-      const replacedQuery = esQuery.replace(/{query}/g, question.replace(/"/g, '\\"'));
+      const replacedQuery = esQuery.replace(/\"{query}\"/g, JSON.stringify(question));
       const query = JSON.parse(replacedQuery);
       return query;
     } catch (e) {
@@ -96,7 +96,7 @@ export function defineRoutes({
         es_client: client.asCurrentUser,
       } as AssistClientOptionsWithClient);
       const { messages, data } = await request.body;
-      const { chatModel, chatPrompt, connector } = await getChatParams(
+      const { chatModel, chatPrompt, questionRewritePrompt, connector } = await getChatParams(
         {
           connectorId: data.connector_id,
           model: data.summarization_model,
@@ -133,6 +133,7 @@ export function defineRoutes({
           inputTokensLimit: modelPromptLimit,
         },
         prompt: chatPrompt,
+        questionRewritePrompt,
       });
 
       let stream: ReadableStream<Uint8Array>;
diff --git a/x-pack/plugins/security/server/analytics/analytics_service.ts b/x-pack/plugins/security/server/analytics/analytics_service.ts
index b5bbbf0079cf9..9dc501b354fe2 100644
--- a/x-pack/plugins/security/server/analytics/analytics_service.ts
+++ b/x-pack/plugins/security/server/analytics/analytics_service.ts
@@ -235,7 +235,14 @@ const permissionsPolicyViolation: EventTypeOpts<PermissionsPolicyViolationEvent>
       type: 'text',
       _meta: {
         description: '"featureId" field of Reporting API permissions policy violation report.',
-        optional: false,
+        optional: true,
+      },
+    },
+    policyId: {
+      type: 'text',
+      _meta: {
+        description: '"policyId" field of Reporting API permissions policy violation report.',
+        optional: true,
       },
     },
     sourceFile: {
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
index 7c63ace9fc706..198bc004ecb60 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.test.ts
@@ -30,6 +30,7 @@ describe('API Keys', () => {
   >;
   let mockLicense: jest.Mocked<SecurityLicense>;
   let logger: Logger;
+  const roleDescriptors: { [key: string]: any } = { foo: true };
 
   beforeEach(() => {
     mockValidateKibanaPrivileges.mockReset().mockReturnValue({ validationErrors: [] });
@@ -239,9 +240,10 @@ describe('API Keys', () => {
       });
       const result = await apiKeys.create(httpServerMock.createKibanaRequest(), {
         name: 'key-name',
-        role_descriptors: { foo: true },
+        role_descriptors: roleDescriptors,
         expiration: '1d',
       });
+
       expect(result).toEqual({
         api_key: 'abc123',
         expiration: '1d',
@@ -253,7 +255,7 @@ describe('API Keys', () => {
       expect(mockScopedClusterClient.asCurrentUser.security.createApiKey).toHaveBeenCalledWith({
         body: {
           name: 'key-name',
-          role_descriptors: { foo: true },
+          role_descriptors: roleDescriptors,
           expiration: '1d',
         },
       });
@@ -343,7 +345,7 @@ describe('API Keys', () => {
 
       const result = await apiKeys.update(httpServerMock.createKibanaRequest(), {
         id: 'test_id',
-        role_descriptors: { foo: true },
+        role_descriptors: roleDescriptors,
         metadata: {},
       });
 
@@ -370,7 +372,7 @@ describe('API Keys', () => {
 
       const result = await apiKeys.update(httpServerMock.createKibanaRequest(), {
         id: 'test_id',
-        role_descriptors: { foo: true },
+        role_descriptors: roleDescriptors,
         metadata: {},
       });
 
@@ -473,7 +475,7 @@ describe('API Keys', () => {
         }),
         {
           name: 'test_api_key',
-          role_descriptors: { foo: true },
+          role_descriptors: roleDescriptors,
           expiration: '1d',
         }
       );
@@ -512,7 +514,7 @@ describe('API Keys', () => {
         }),
         {
           name: 'test_api_key',
-          role_descriptors: { foo: true },
+          role_descriptors: roleDescriptors,
           expiration: '1d',
         }
       );
@@ -527,7 +529,7 @@ describe('API Keys', () => {
         body: {
           api_key: {
             name: 'test_api_key',
-            role_descriptors: { foo: true },
+            role_descriptors: roleDescriptors,
             expiration: '1d',
           },
           grant_type: 'access_token',
@@ -553,7 +555,7 @@ describe('API Keys', () => {
         }),
         {
           name: 'test_api_key',
-          role_descriptors: { foo: true },
+          role_descriptors: roleDescriptors,
           expiration: '1d',
         }
       );
@@ -592,7 +594,7 @@ describe('API Keys', () => {
           }),
           {
             name: 'test_api_key',
-            role_descriptors: { foo: true },
+            role_descriptors: roleDescriptors,
             expiration: '1d',
           }
         )
diff --git a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
index 1fbd99b4dd812..054ab59fbd0bb 100644
--- a/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
+++ b/x-pack/plugins/security/server/authentication/api_keys/api_keys.ts
@@ -20,6 +20,7 @@ import type {
   InvalidateAPIKeysParams,
   ValidateAPIKeyParams,
 } from '@kbn/security-plugin-types-server';
+import { isCreateRestAPIKeyParams } from '@kbn/security-plugin-types-server';
 
 import { getFakeKibanaRequest } from './fake_kibana_request';
 import type { SecurityLicense } from '../../../common';
@@ -96,7 +97,6 @@ export class APIKeys implements APIKeysType {
     this.logger.debug(
       `Testing if API Keys are enabled by attempting to invalidate a non-existant key: ${id}`
     );
-
     try {
       await this.clusterClient.asInternalUser.security.invalidateApiKey({
         body: {
@@ -125,7 +125,6 @@ export class APIKeys implements APIKeysType {
     this.logger.debug(
       `Testing if cross-cluster API Keys are enabled by attempting to update a non-existant key: ${id}`
     );
-
     try {
       await this.clusterClient.asInternalUser.transport.request({
         method: 'PUT',
@@ -155,13 +154,13 @@ export class APIKeys implements APIKeysType {
     if (!this.license.isEnabled()) {
       return null;
     }
-
     const { type, expiration, name, metadata } = createParams;
     const scopedClusterClient = this.clusterClient.asScoped(request);
 
     this.logger.debug('Trying to create an API key');
 
     let result: CreateAPIKeyResult;
+
     try {
       if (type === 'cross_cluster') {
         result = await scopedClusterClient.asCurrentUser.transport.request<CreateAPIKeyResult>({
@@ -175,13 +174,13 @@ export class APIKeys implements APIKeysType {
             name,
             expiration,
             metadata,
-            role_descriptors:
-              'role_descriptors' in createParams
-                ? createParams.role_descriptors
-                : this.parseRoleDescriptorsWithKibanaPrivileges(
-                    createParams.kibana_role_descriptors,
-                    false
-                  ),
+            role_descriptors: isCreateRestAPIKeyParams(createParams)
+              ? createParams.role_descriptors
+              : this.parseRoleDescriptorsWithKibanaPrivileges(
+                  createParams.kibana_role_descriptors,
+                  this.kibanaFeatures,
+                  false
+                ),
           },
         });
       }
@@ -234,6 +233,7 @@ export class APIKeys implements APIKeysType {
               ? updateParams.role_descriptors
               : this.parseRoleDescriptorsWithKibanaPrivileges(
                   updateParams.kibana_role_descriptors,
+                  this.kibanaFeatures,
                   true
                 ),
         });
@@ -279,12 +279,12 @@ export class APIKeys implements APIKeysType {
     );
 
     const { expiration, metadata, name } = createParams;
-
     const roleDescriptors =
       'role_descriptors' in createParams
         ? createParams.role_descriptors
         : this.parseRoleDescriptorsWithKibanaPrivileges(
             createParams.kibana_role_descriptors,
+            this.kibanaFeatures,
             false
           );
 
@@ -293,7 +293,6 @@ export class APIKeys implements APIKeysType {
       authorizationHeader,
       clientAuthorizationHeader
     );
-
     // User needs `manage_api_key` or `grant_api_key` privilege to use this API
     let result: GrantAPIKeyResult;
     try {
@@ -318,7 +317,6 @@ export class APIKeys implements APIKeysType {
     }
 
     this.logger.debug(`Trying to invalidate ${params.ids.length} an API key as current user`);
-
     let result: InvalidateAPIKeyResult;
     try {
       // User needs `manage_api_key` privilege to use this API
@@ -354,6 +352,7 @@ export class APIKeys implements APIKeysType {
     this.logger.debug(`Trying to invalidate ${params.ids.length} API keys`);
 
     let result: InvalidateAPIKeyResult;
+
     try {
       // Internal user needs `cluster:admin/xpack/security/api_key/invalidate` privilege to use this API
       result = await this.clusterClient.asInternalUser.security.invalidateApiKey({
@@ -384,7 +383,6 @@ export class APIKeys implements APIKeysType {
     const fakeRequest = getFakeKibanaRequest(apiKeyPrams);
 
     this.logger.debug(`Trying to validate an API key`);
-
     try {
       await this.clusterClient.asScoped(fakeRequest).asCurrentUser.security.authenticate();
       this.logger.debug(`API key was validated successfully`);
@@ -445,6 +443,7 @@ export class APIKeys implements APIKeysType {
 
   private parseRoleDescriptorsWithKibanaPrivileges(
     kibanaRoleDescriptors: CreateRestAPIKeyWithKibanaPrivilegesParams['kibana_role_descriptors'],
+    features: KibanaFeature[],
     isEdit: boolean
   ) {
     const roleDescriptors = Object.create(null);
@@ -452,10 +451,7 @@ export class APIKeys implements APIKeysType {
     const allValidationErrors: string[] = [];
     if (kibanaRoleDescriptors) {
       Object.entries(kibanaRoleDescriptors).forEach(([roleKey, roleDescriptor]) => {
-        const { validationErrors } = validateKibanaPrivileges(
-          this.kibanaFeatures,
-          roleDescriptor.kibana
-        );
+        const { validationErrors } = validateKibanaPrivileges(features, roleDescriptor.kibana);
         allValidationErrors.push(...validationErrors);
 
         const applications = transformPrivilegesToElasticsearchPrivileges(
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.mock.ts b/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
index de87e7161bda8..676b039eefaa4 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import { apiKeysMock } from '@kbn/core-security-server-mocks';
 import type { DeeplyMockedKeys } from '@kbn/utility-types-jest';
 
-import { apiKeysMock } from './api_keys/api_keys.mock';
 import type { InternalAuthenticationServiceStart } from './authentication_service';
 
 export const authenticationServiceMock = {
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
index abc400c0b6305..cf99084d4d0bc 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -348,7 +348,6 @@ export class AuthenticationService {
       applicationName,
       kibanaFeatures,
     });
-
     /**
      * Retrieves server protocol name/host name/port and merges it with `xpack.security.public` config
      * to construct a server base URL (deprecated, used by the SAML provider only).
diff --git a/x-pack/plugins/security/server/authentication/providers/basic.ts b/x-pack/plugins/security/server/authentication/providers/basic.ts
index fad94f6b34a57..3664bd14a23db 100644
--- a/x-pack/plugins/security/server/authentication/providers/basic.ts
+++ b/x-pack/plugins/security/server/authentication/providers/basic.ts
@@ -87,7 +87,7 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
         state: authHeaders,
       });
     } catch (err) {
-      this.logger.debug(`Failed to perform a login: ${getDetailedErrorMessage(err)}`);
+      this.logger.debug(() => `Failed to perform a login: ${getDetailedErrorMessage(err)}`);
       return AuthenticationResult.failed(err);
     }
   }
@@ -172,7 +172,7 @@ export class BasicAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.succeeded(user, { authHeaders });
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
+        () => `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/http.ts b/x-pack/plugins/security/server/authentication/providers/http.ts
index 630ae7ea59de7..e23ec826ed2e1 100644
--- a/x-pack/plugins/security/server/authentication/providers/http.ts
+++ b/x-pack/plugins/security/server/authentication/providers/http.ts
@@ -116,9 +116,12 @@ export class HTTPAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.succeeded(user);
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request to ${request.url.pathname} via authorization header with "${
-          authorizationHeader.scheme
-        }" scheme: ${getDetailedErrorMessage(err)}`
+        () =>
+          `Failed to authenticate request to ${
+            request.url.pathname
+          } via authorization header with "${
+            authorizationHeader.scheme
+          }" scheme: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/kerberos.ts b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
index 6ffd7a82e79c6..d28acef624c07 100644
--- a/x-pack/plugins/security/server/authentication/providers/kerberos.ts
+++ b/x-pack/plugins/security/server/authentication/providers/kerberos.ts
@@ -122,7 +122,7 @@ export class KerberosAuthenticationProvider extends BaseAuthenticationProvider {
         await this.options.tokens.invalidate(state);
       } catch (err) {
         this.logger.debug(
-          `Failed invalidating access and/or refresh tokens: ${getDetailedErrorMessage(err)}`
+          () => `Failed invalidating access and/or refresh tokens: ${getDetailedErrorMessage(err)}`
         );
         return DeauthenticationResult.failed(err);
       }
diff --git a/x-pack/plugins/security/server/authentication/providers/oidc.ts b/x-pack/plugins/security/server/authentication/providers/oidc.ts
index 273641f40b471..ef4df3acb8663 100644
--- a/x-pack/plugins/security/server/authentication/providers/oidc.ts
+++ b/x-pack/plugins/security/server/authentication/providers/oidc.ts
@@ -268,7 +268,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       })) as any;
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request via OpenID Connect: ${getDetailedErrorMessage(err)}`
+        () => `Failed to authenticate request via OpenID Connect: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -319,7 +319,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       );
     } catch (err) {
       this.logger.debug(
-        `Failed to initiate OpenID Connect authentication: ${getDetailedErrorMessage(err)}`
+        () => `Failed to initiate OpenID Connect authentication: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -349,7 +349,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.succeeded(user, { authHeaders });
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
+        () => `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -448,7 +448,7 @@ export class OIDCAuthenticationProvider extends BaseAuthenticationProvider {
           return DeauthenticationResult.redirectTo(redirect);
         }
       } catch (err) {
-        this.logger.debug(`Failed to deauthenticate user: ${getDetailedErrorMessage(err)}`);
+        this.logger.debug(() => `Failed to deauthenticate user: ${getDetailedErrorMessage(err)}`);
         return DeauthenticationResult.failed(err);
       }
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/pki.ts b/x-pack/plugins/security/server/authentication/providers/pki.ts
index 8ec86795c16f5..662f7632fff40 100644
--- a/x-pack/plugins/security/server/authentication/providers/pki.ts
+++ b/x-pack/plugins/security/server/authentication/providers/pki.ts
@@ -171,7 +171,9 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
       try {
         await this.options.tokens.invalidate({ accessToken: state.accessToken });
       } catch (err) {
-        this.logger.debug(`Failed invalidating access token: ${getDetailedErrorMessage(err)}`);
+        this.logger.debug(
+          () => `Failed invalidating access token: ${getDetailedErrorMessage(err)}`
+        );
         return DeauthenticationResult.failed(err);
       }
     }
@@ -241,7 +243,7 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.succeeded(user, { authHeaders });
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
+        () => `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -291,9 +293,10 @@ export class PKIAuthenticationProvider extends BaseAuthenticationProvider {
       })) as any;
     } catch (err) {
       this.logger.debug(
-        `Failed to exchange peer certificate chain to an access token: ${getDetailedErrorMessage(
-          err
-        )}`
+        () =>
+          `Failed to exchange peer certificate chain to an access token: ${getDetailedErrorMessage(
+            err
+          )}`
       );
       return AuthenticationResult.failed(err);
     }
diff --git a/x-pack/plugins/security/server/authentication/providers/saml.ts b/x-pack/plugins/security/server/authentication/providers/saml.ts
index bda606843f462..56dbd78b2ef34 100644
--- a/x-pack/plugins/security/server/authentication/providers/saml.ts
+++ b/x-pack/plugins/security/server/authentication/providers/saml.ts
@@ -187,9 +187,10 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       this.logger.debug('Login has been successfully performed.');
     } else {
       this.logger.debug(
-        `Failed to perform a login: ${
-          authenticationResult.error && getDetailedErrorMessage(authenticationResult.error)
-        }`
+        () =>
+          `Failed to perform a login: ${
+            authenticationResult.error && getDetailedErrorMessage(authenticationResult.error)
+          }`
       );
     }
 
@@ -286,7 +287,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
           return DeauthenticationResult.redirectTo(redirect);
         }
       } catch (err) {
-        this.logger.debug(`Failed to deauthenticate user: ${getDetailedErrorMessage(err)}`);
+        this.logger.debug(() => `Failed to deauthenticate user: ${getDetailedErrorMessage(err)}`);
         return DeauthenticationResult.failed(err);
       }
     }
@@ -467,7 +468,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       });
     } catch (err) {
       this.logger.debug(
-        `Failed to perform IdP initiated local logout: ${getDetailedErrorMessage(err)}`
+        () => `Failed to perform IdP initiated local logout: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -500,7 +501,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
       return AuthenticationResult.succeeded(user, { authHeaders });
     } catch (err) {
       this.logger.debug(
-        `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
+        () => `Failed to authenticate request via state: ${getDetailedErrorMessage(err)}`
       );
       return AuthenticationResult.failed(err);
     }
@@ -593,7 +594,7 @@ export class SAMLAuthenticationProvider extends BaseAuthenticationProvider {
         state: { requestId, redirectURL, realm },
       });
     } catch (err) {
-      this.logger.debug(`Failed to initiate SAML handshake: ${getDetailedErrorMessage(err)}`);
+      this.logger.debug(() => `Failed to initiate SAML handshake: ${getDetailedErrorMessage(err)}`);
       return AuthenticationResult.failed(err);
     }
   }
diff --git a/x-pack/plugins/security/server/authentication/providers/token.ts b/x-pack/plugins/security/server/authentication/providers/token.ts
index baf5b48c82e57..bc2ec0dd15a87 100644
--- a/x-pack/plugins/security/server/authentication/providers/token.ts
+++ b/x-pack/plugins/security/server/authentication/providers/token.ts
@@ -94,7 +94,7 @@ export class TokenAuthenticationProvider extends BaseAuthenticationProvider {
         }
       );
     } catch (err) {
-      this.logger.debug(`Failed to perform a login: ${getDetailedErrorMessage(err)}`);
+      this.logger.debug(() => `Failed to perform a login: ${getDetailedErrorMessage(err)}`);
       return AuthenticationResult.failed(err);
     }
   }
diff --git a/x-pack/plugins/security/server/authentication/tokens.ts b/x-pack/plugins/security/server/authentication/tokens.ts
index 90e0d74e61bcd..2cb644dd5caec 100644
--- a/x-pack/plugins/security/server/authentication/tokens.ts
+++ b/x-pack/plugins/security/server/authentication/tokens.ts
@@ -77,7 +77,7 @@ export class Tokens {
         authenticationInfo: authenticationInfo as AuthenticationInfo,
       };
     } catch (err) {
-      this.logger.debug(`Failed to refresh access token: ${getDetailedErrorMessage(err)}`);
+      this.logger.debug(() => `Failed to refresh access token: ${getDetailedErrorMessage(err)}`);
 
       // There are at least two common cases when refresh token request can fail:
       // 1. Refresh token is valid only for 24 hours and if it hasn't been used it expires.
@@ -123,7 +123,9 @@ export class Tokens {
           })
         ).invalidated_tokens;
       } catch (err) {
-        this.logger.debug(`Failed to invalidate refresh token: ${getDetailedErrorMessage(err)}`);
+        this.logger.debug(
+          () => `Failed to invalidate refresh token: ${getDetailedErrorMessage(err)}`
+        );
 
         // When using already deleted refresh token, Elasticsearch responds with 404 and a body that
         // shows that no tokens were invalidated.
@@ -155,7 +157,9 @@ export class Tokens {
           })
         ).invalidated_tokens;
       } catch (err) {
-        this.logger.debug(`Failed to invalidate access token: ${getDetailedErrorMessage(err)}`);
+        this.logger.debug(
+          () => `Failed to invalidate access token: ${getDetailedErrorMessage(err)}`
+        );
 
         // When using already deleted access token, Elasticsearch responds with 404 and a body that
         // shows that no tokens were invalidated.
diff --git a/x-pack/plugins/security/server/build_delegate_apis.test.ts b/x-pack/plugins/security/server/build_delegate_apis.test.ts
index 59963ad2aef8e..297ee6ebf92c4 100644
--- a/x-pack/plugins/security/server/build_delegate_apis.test.ts
+++ b/x-pack/plugins/security/server/build_delegate_apis.test.ts
@@ -65,6 +65,21 @@ describe('buildSecurityApi', () => {
       expect(auditService.asScoped(request).log).toHaveBeenCalledWith({ message: 'an event' });
     });
   });
+
+  describe('authc.apiKeys', () => {
+    it('properly delegates to the service', async () => {
+      await authc.apiKeys.areAPIKeysEnabled();
+      expect(authc.apiKeys.areAPIKeysEnabled).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns the result from the service', async () => {
+      authc.apiKeys.areAPIKeysEnabled.mockReturnValue(Promise.resolve(false));
+
+      const areAPIKeysEnabled = await authc.apiKeys.areAPIKeysEnabled();
+
+      expect(areAPIKeysEnabled).toBe(false);
+    });
+  });
 });
 
 describe('buildUserProfileApi', () => {
diff --git a/x-pack/plugins/security/server/build_delegate_apis.ts b/x-pack/plugins/security/server/build_delegate_apis.ts
index fb782f3db256f..f6d57cfc8a4a8 100644
--- a/x-pack/plugins/security/server/build_delegate_apis.ts
+++ b/x-pack/plugins/security/server/build_delegate_apis.ts
@@ -24,6 +24,17 @@ export const buildSecurityApi = ({
       getCurrentUser: (request) => {
         return getAuthc().getCurrentUser(request);
       },
+      apiKeys: {
+        areAPIKeysEnabled: () => getAuthc().apiKeys.areAPIKeysEnabled(),
+        areCrossClusterAPIKeysEnabled: () => getAuthc().apiKeys.areAPIKeysEnabled(),
+        grantAsInternalUser: (request, createParams) =>
+          getAuthc().apiKeys.grantAsInternalUser(request, createParams),
+        create: (request, createParams) => getAuthc().apiKeys.create(request, createParams),
+        update: (request, updateParams) => getAuthc().apiKeys.update(request, updateParams),
+        validate: (apiKeyParams) => getAuthc().apiKeys.validate(apiKeyParams),
+        invalidate: (request, params) => getAuthc().apiKeys.invalidate(request, params),
+        invalidateAsInternalUser: (params) => getAuthc().apiKeys.invalidateAsInternalUser(params),
+      },
     },
     audit: {
       asScoped(request) {
diff --git a/x-pack/plugins/security/server/mocks.ts b/x-pack/plugins/security/server/mocks.ts
index a5473176fc7e7..e47faeba525a0 100644
--- a/x-pack/plugins/security/server/mocks.ts
+++ b/x-pack/plugins/security/server/mocks.ts
@@ -7,7 +7,7 @@
 
 import type { TransportResult } from '@elastic/elasticsearch';
 
-import { securityServiceMock } from '@kbn/core-security-server-mocks';
+import { apiKeysMock, securityServiceMock } from '@kbn/core-security-server-mocks';
 
 import { auditServiceMock } from './audit/mocks';
 import { authenticationServiceMock } from './authentication/authentication_service.mock';
@@ -19,7 +19,10 @@ function createSetupMock() {
   const mockAuthz = authorizationMock.create();
   return {
     audit: auditServiceMock.create(),
-    authc: { getCurrentUser: jest.fn() },
+    authc: {
+      getCurrentUser: jest.fn(),
+      apiKeys: apiKeysMock.create(),
+    },
     authz: {
       actions: mockAuthz.actions,
       checkPrivilegesWithRequest: mockAuthz.checkPrivilegesWithRequest,
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 9d5ffde67b1d7..a500454f98fa9 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -77,7 +77,9 @@ export interface SecurityPluginSetup extends SecurityPluginSetupWithoutDeprecate
   /**
    * @deprecated Use `authc` methods from the `SecurityServiceStart` contract instead.
    */
-  authc: { getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null };
+  authc: {
+    getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null;
+  };
   /**
    * @deprecated Use `authz` methods from the `SecurityServiceStart` contract instead.
    */
@@ -110,6 +112,7 @@ export class SecurityPlugin
   private readonly logger: Logger;
   private authorizationSetup?: AuthorizationServiceSetupInternal;
   private auditSetup?: AuditServiceSetup;
+
   private configSubscription?: Subscription;
 
   private config?: ConfigType;
@@ -189,6 +192,7 @@ export class SecurityPlugin
       this.initializerContext.logger.get('authentication')
     );
     this.auditService = new AuditService(this.initializerContext.logger.get('audit'));
+
     this.elasticsearchService = new ElasticsearchService(
       this.initializerContext.logger.get('elasticsearch')
     );
@@ -340,7 +344,9 @@ export class SecurityPlugin
 
     return Object.freeze<SecurityPluginSetup>({
       audit: this.auditSetup,
-      authc: { getCurrentUser: (request) => this.getAuthentication().getCurrentUser(request) },
+      authc: {
+        getCurrentUser: (request) => this.getAuthentication().getCurrentUser(request),
+      },
       authz: {
         actions: this.authorizationSetup.actions,
         checkPrivilegesWithRequest: this.authorizationSetup.checkPrivilegesWithRequest,
@@ -421,8 +427,8 @@ export class SecurityPlugin
 
     return Object.freeze<SecurityPluginStart>({
       authc: {
-        apiKeys: this.authenticationStart.apiKeys,
         getCurrentUser: this.authenticationStart.getCurrentUser,
+        apiKeys: this.authenticationStart.apiKeys,
       },
       authz: {
         actions: this.authorizationSetup!.actions,
diff --git a/x-pack/plugins/security/server/routes/analytics/record_violations.test.ts b/x-pack/plugins/security/server/routes/analytics/record_violations.test.ts
index 97fe293205187..cf83ec1ad981f 100644
--- a/x-pack/plugins/security/server/routes/analytics/record_violations.test.ts
+++ b/x-pack/plugins/security/server/routes/analytics/record_violations.test.ts
@@ -95,7 +95,7 @@ describe('POST /internal/security/analytics/_record_violations', () => {
       user_agent: 'jest',
       body: {
         disposition: 'report',
-        featureId: 'camera',
+        policyId: 'camera',
       },
     };
 
diff --git a/x-pack/plugins/security/server/routes/analytics/record_violations.ts b/x-pack/plugins/security/server/routes/analytics/record_violations.ts
index 8e59fc52831d2..9ee4e1c66be3e 100644
--- a/x-pack/plugins/security/server/routes/analytics/record_violations.ts
+++ b/x-pack/plugins/security/server/routes/analytics/record_violations.ts
@@ -90,8 +90,13 @@ export const permissionsPolicyViolationReportSchema = schema.object(
       {
         /**
          * The string identifying the policy-controlled feature whose policy has been violated. This string can be used for grouping and counting related reports.
+         * Spec mentions featureId, however the report that is sent from Chrome has policyId. This is to handle both cases.
          */
-        featureId: schema.string(),
+        policyId: schema.maybe(schema.string()),
+        /**
+         * The string identifying the policy-controlled feature whose policy has been violated. This string can be used for grouping and counting related reports.
+         */
+        featureId: schema.maybe(schema.string()),
         /**
          * If known, the file where the violation occured, or null otherwise.
          */
@@ -140,6 +145,7 @@ export function defineRecordViolations({ router, analyticsService }: RouteDefini
             schema.oneOf([cspViolationReportSchema, permissionsPolicyViolationReportSchema])
           ),
           cspViolationReportSchema,
+          permissionsPolicyViolationReportSchema,
         ]),
       },
       options: {
diff --git a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
index e7c2e06abbb8e..638a8f8a1bc7d 100644
--- a/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
+++ b/x-pack/plugins/security/server/routes/deprecations/kibana_user_role.ts
@@ -53,9 +53,10 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
         logger.debug(`No users with "${KIBANA_USER_ROLE_NAME}" role found.`);
       } else {
         logger.debug(
-          `The following users with "${KIBANA_USER_ROLE_NAME}" role found and will be migrated to "${KIBANA_ADMIN_ROLE_NAME}" role: ${usersWithKibanaUserRole
-            .map((user) => user.username)
-            .join(', ')}.`
+          () =>
+            `The following users with "${KIBANA_USER_ROLE_NAME}" role found and will be migrated to "${KIBANA_ADMIN_ROLE_NAME}" role: ${usersWithKibanaUserRole
+              .map((user) => user.username)
+              .join(', ')}.`
         );
       }
 
@@ -107,9 +108,10 @@ export function defineKibanaUserRoleDeprecationRoutes({ router, logger }: RouteD
         logger.debug(`No role mappings with "${KIBANA_USER_ROLE_NAME}" role found.`);
       } else {
         logger.debug(
-          `The following role mappings with "${KIBANA_USER_ROLE_NAME}" role found and will be migrated to "${KIBANA_ADMIN_ROLE_NAME}" role: ${roleMappingsWithKibanaUserRole
-            .map(([mappingName]) => mappingName)
-            .join(', ')}.`
+          () =>
+            `The following role mappings with "${KIBANA_USER_ROLE_NAME}" role found and will be migrated to "${KIBANA_ADMIN_ROLE_NAME}" role: ${roleMappingsWithKibanaUserRole
+              .map(([mappingName]) => mappingName)
+              .join(', ')}.`
         );
       }
 
diff --git a/x-pack/plugins/security/server/session_management/session.ts b/x-pack/plugins/security/server/session_management/session.ts
index afc917bde78be..b4af54e5afea9 100644
--- a/x-pack/plugins/security/server/session_management/session.ts
+++ b/x-pack/plugins/security/server/session_management/session.ts
@@ -468,9 +468,10 @@ export class Session {
       invalidateIndexValueFilter = filter;
     } else {
       sessionLogger.debug(
-        `Invalidating sessions that match query: ${JSON.stringify(
-          filter.query.username ? { ...filter.query, username: '[REDACTED]' } : filter.query
-        )}.`
+        () =>
+          `Invalidating sessions that match query: ${JSON.stringify(
+            filter.query.username ? { ...filter.query, username: '[REDACTED]' } : filter.query
+          )}.`
       );
       invalidateIndexValueFilter = filter.query.username
         ? {
diff --git a/x-pack/plugins/security/tsconfig.json b/x-pack/plugins/security/tsconfig.json
index 64d162839cf1e..10c1ada6ede15 100644
--- a/x-pack/plugins/security/tsconfig.json
+++ b/x-pack/plugins/security/tsconfig.json
@@ -83,7 +83,7 @@
     "@kbn/core-user-profile-browser",
     "@kbn/security-api-key-management",
     "@kbn/security-form-components",
-    "@kbn/core-security-server-mocks",
+    "@kbn/core-security-server-mocks"
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.gen.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.gen.ts
index df0084d6ff0e3..dadb6bfa4165d 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.gen.ts
@@ -304,8 +304,29 @@ export type TimestampOverrideFallbackDisabled = z.infer<typeof TimestampOverride
 export const TimestampOverrideFallbackDisabled = z.boolean();
 
 /**
- * Describes an Elasticsearch field that is needed for the rule to function
- */
+  * Describes an Elasticsearch field that is needed for the rule to function.
+
+Almost all types of Security rules check source event documents for a match to some kind of
+query or filter. If a document has certain field with certain values, then it's a match and
+the rule will generate an alert.
+
+Required field is an event field that must be present in the source indices of a given rule.
+
+@example
+const standardEcsField: RequiredField = {
+  name: 'event.action',
+  type: 'keyword',
+  ecs: true,
+};
+
+@example
+const nonEcsField: RequiredField = {
+  name: 'winlog.event_data.AttributeLDAPDisplayName',
+  type: 'keyword',
+  ecs: false,
+};
+
+  */
 export type RequiredField = z.infer<typeof RequiredField>;
 export const RequiredField = z.object({
   /**
@@ -368,6 +389,39 @@ export const SavedObjectResolveAliasPurpose = z.enum([
 export type SavedObjectResolveAliasPurposeEnum = typeof SavedObjectResolveAliasPurpose.enum;
 export const SavedObjectResolveAliasPurposeEnum = SavedObjectResolveAliasPurpose.enum;
 
+/**
+  * Related integration is a potential dependency of a rule. It's assumed that if the user installs
+one of the related integrations of a rule, the rule might start to work properly because it will
+have source events (generated by this integration) potentially matching the rule's query.
+
+NOTE: Proper work is not guaranteed, because a related integration, if installed, can be
+configured differently or generate data that is not necessarily relevant for this rule.
+
+Related integration is a combination of a Fleet package and (optionally) one of the
+package's "integrations" that this package contains. It is represented by 3 properties:
+
+- `package`: name of the package (required, unique id)
+- `version`: version of the package (required, semver-compatible)
+- `integration`: name of the integration of this package (optional, id within the package)
+
+There are Fleet packages like `windows` that contain only one integration; in this case,
+`integration` should be unspecified. There are also packages like `aws` and `azure` that contain
+several integrations; in this case, `integration` should be specified.
+
+@example
+const x: RelatedIntegration = {
+  package: 'windows',
+  version: '1.5.x',
+};
+
+@example
+const x: RelatedIntegration = {
+  package: 'azure',
+  version: '~1.1.6',
+  integration: 'activitylogs',
+};
+
+  */
 export type RelatedIntegration = z.infer<typeof RelatedIntegration>;
 export const RelatedIntegration = z.object({
   package: NonEmptyString,
@@ -378,6 +432,22 @@ export const RelatedIntegration = z.object({
 export type RelatedIntegrationArray = z.infer<typeof RelatedIntegrationArray>;
 export const RelatedIntegrationArray = z.array(RelatedIntegration);
 
+/**
+  * Schema for fields relating to investigation fields. These are user defined fields we use to highlight
+in various features in the UI such as alert details flyout and exceptions auto-population from alert.
+Added in PR #163235
+Right now we only have a single field but anticipate adding more related fields to store various
+configuration states such as `override` - where a user might say if they want only these fields to
+display, or if they want these fields + the fields we select. When expanding this field, it may look
+something like:
+```typescript
+const investigationFields = z.object({
+  field_names: NonEmptyArray(NonEmptyString),
+  override: z.boolean().optional(),
+});
+```
+
+  */
 export type InvestigationFields = z.infer<typeof InvestigationFields>;
 export const InvestigationFields = z.object({
   field_names: z.array(NonEmptyString).min(1),
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.schema.yaml b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.schema.yaml
index cd5e238723f6a..b2d72a561e46c 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.schema.yaml
@@ -315,7 +315,28 @@ components:
 
     RequiredField:
       type: object
-      description: Describes an Elasticsearch field that is needed for the rule to function
+      description: |
+        Describes an Elasticsearch field that is needed for the rule to function.
+
+        Almost all types of Security rules check source event documents for a match to some kind of
+        query or filter. If a document has certain field with certain values, then it's a match and
+        the rule will generate an alert.
+
+        Required field is an event field that must be present in the source indices of a given rule.
+
+        @example
+        const standardEcsField: RequiredField = {
+          name: 'event.action',
+          type: 'keyword',
+          ecs: true,
+        };
+
+        @example
+        const nonEcsField: RequiredField = {
+          name: 'winlog.event_data.AttributeLDAPDisplayName',
+          type: 'keyword',
+          ecs: false,
+        };
       properties:
         name:
           $ref: '../../../model/primitives.schema.yaml#/components/schemas/NonEmptyString'
@@ -376,6 +397,37 @@ components:
 
     RelatedIntegration:
       type: object
+      description: |
+        Related integration is a potential dependency of a rule. It's assumed that if the user installs
+        one of the related integrations of a rule, the rule might start to work properly because it will
+        have source events (generated by this integration) potentially matching the rule's query.
+
+        NOTE: Proper work is not guaranteed, because a related integration, if installed, can be
+        configured differently or generate data that is not necessarily relevant for this rule.
+
+        Related integration is a combination of a Fleet package and (optionally) one of the
+        package's "integrations" that this package contains. It is represented by 3 properties:
+
+        - `package`: name of the package (required, unique id)
+        - `version`: version of the package (required, semver-compatible)
+        - `integration`: name of the integration of this package (optional, id within the package)
+
+        There are Fleet packages like `windows` that contain only one integration; in this case,
+        `integration` should be unspecified. There are also packages like `aws` and `azure` that contain
+        several integrations; in this case, `integration` should be specified.
+
+        @example
+        const x: RelatedIntegration = {
+          package: 'windows',
+          version: '1.5.x',
+        };
+
+        @example
+        const x: RelatedIntegration = {
+          package: 'azure',
+          version: '~1.1.6',
+          integration: 'activitylogs',
+        };
       properties:
         package:
           $ref: '../../../model/primitives.schema.yaml#/components/schemas/NonEmptyString'
@@ -392,10 +444,22 @@ components:
       items:
         $ref: '#/components/schemas/RelatedIntegration'
 
-    # Schema for fields relating to investigation fields, these are user defined fields we use to highlight in various features in the UI such as alert details flyout and exceptions auto-population from alert. Added in PR #163235
-    # Right now we only have a single field but anticipate adding more related fields to store various configuration states such as `override` - where a user might say if they want only these fields to display, or if they want these fields + the fields we select.
     InvestigationFields:
       type: object
+      description: |
+        Schema for fields relating to investigation fields. These are user defined fields we use to highlight
+        in various features in the UI such as alert details flyout and exceptions auto-population from alert.
+        Added in PR #163235
+        Right now we only have a single field but anticipate adding more related fields to store various
+        configuration states such as `override` - where a user might say if they want only these fields to
+        display, or if they want these fields + the fields we select. When expanding this field, it may look
+        something like:
+        ```typescript
+        const investigationFields = z.object({
+          field_names: NonEmptyArray(NonEmptyString),
+          override: z.boolean().optional(),
+        });
+        ```
       properties:
         field_names:
           type: array
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_response_schema.mock.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_response_schema.mock.ts
index 1a39d65c1c22f..c605436576995 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_response_schema.mock.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/rule_response_schema.mock.ts
@@ -6,16 +6,18 @@
  */
 
 import { DEFAULT_INDICATOR_SOURCE_PATH } from '../../../../constants';
+import { getListArrayMock } from '../../../../detection_engine/schemas/types/lists.mock';
 import type {
   EqlRule,
   EsqlRule,
   MachineLearningRule,
+  NewTermsRule,
   QueryRule,
   SavedQueryRule,
   SharedResponseProps,
   ThreatMatchRule,
+  ThresholdRule,
 } from './rule_schemas.gen';
-import { getListArrayMock } from '../../../../detection_engine/schemas/types/lists.mock';
 
 export const ANCHOR_DATE = '2020-02-20T03:57:54.037Z';
 
@@ -238,3 +240,27 @@ export const getRulesEqlSchemaMock = (anchorDate: string = ANCHOR_DATE): EqlRule
     tiebreaker_field: undefined,
   };
 };
+
+export const getRulesNewTermsSchemaMock = (anchorDate: string = ANCHOR_DATE): NewTermsRule => {
+  return {
+    ...getResponseBaseParams(anchorDate),
+    type: 'new_terms',
+    query: '*',
+    language: 'kuery',
+    new_terms_fields: ['user.name'],
+    history_window_start: 'now-7d',
+  };
+};
+
+export const getRulesThresholdSchemaMock = (anchorDate: string = ANCHOR_DATE): ThresholdRule => {
+  return {
+    ...getResponseBaseParams(anchorDate),
+    type: 'threshold',
+    language: 'kuery',
+    query: 'user.name: root or user.name: admin',
+    threshold: {
+      field: 'some.field',
+      value: 4,
+    },
+  };
+};
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.test.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.test.ts
new file mode 100644
index 0000000000000..b455894333aee
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.test.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { expectParseError, expectParseSuccess, stringifyZodError } from '@kbn/zod-helpers';
+import { TimeDuration } from './time_duration'; // Update with the actual path to your TimeDuration file
+
+describe('TimeDuration schema', () => {
+  test('it should validate a correctly formed TimeDuration with time unit of seconds', () => {
+    const payload = '1s';
+    const schema = TimeDuration({ allowedUnits: ['s'] });
+
+    const result = schema.safeParse(payload);
+    expectParseSuccess(result);
+    expect(result.data).toEqual(payload);
+  });
+
+  test('it should validate a correctly formed TimeDuration with time unit of minutes', () => {
+    const payload = '100m';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm'] });
+
+    const result = schema.safeParse(payload);
+    expectParseSuccess(result);
+    expect(result.data).toEqual(payload);
+  });
+
+  test('it should validate a correctly formed TimeDuration with time unit of hours', () => {
+    const payload = '10000000h';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h'] });
+
+    const result = schema.safeParse(payload);
+    expectParseSuccess(result);
+    expect(result.data).toEqual(payload);
+  });
+
+  test('it should validate a correctly formed TimeDuration with time unit of days', () => {
+    const payload = '7d';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] });
+
+    const result = schema.safeParse(payload);
+    expectParseSuccess(result);
+    expect(result.data).toEqual(payload);
+  });
+
+  test('it should NOT validate a correctly formed TimeDuration with time unit of seconds if it is not an allowed unit', () => {
+    const payload = '30s';
+    const schema = TimeDuration({ allowedUnits: ['m', 'h', 'd'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate a negative TimeDuration', () => {
+    const payload = '-10s';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate a fractional number', () => {
+    const payload = '1.5s';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate a TimeDuration with an invalid time unit', () => {
+    const payload = '10000000days';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h', 'd'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate a TimeDuration with a time interval with incorrect format', () => {
+    const payload = '100ff0000w';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate an empty string', () => {
+    const payload = '';
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+
+  test('it should NOT validate a number', () => {
+    const payload = 100;
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Expected string, received number"`
+    );
+  });
+
+  test('it should NOT validate a TimeDuration with a valid time unit but unsafe integer', () => {
+    const payload = `${Math.pow(2, 53)}h`;
+    const schema = TimeDuration({ allowedUnits: ['s', 'm', 'h'] });
+
+    const result = schema.safeParse(payload);
+    expectParseError(result);
+    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
+      `"Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. \\"30s\\", \\"1m\\", \\"2h\\", \\"7d\\""`
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.ts
new file mode 100644
index 0000000000000..da5cea87f31cf
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/time_duration.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { z } from 'zod';
+
+type TimeUnits = 's' | 'm' | 'h' | 'd' | 'w' | 'y';
+
+interface TimeDurationType {
+  allowedUnits: TimeUnits[];
+}
+
+const isTimeSafe = (time: number) => time >= 1 && Number.isSafeInteger(time);
+
+/**
+ * Types the TimeDuration as:
+ *   - A string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time
+ *   - in the format {safe_integer}{timeUnit}, e.g. "30s", "1m", "2h", "7d"
+ *
+ * Example usage:
+ * ```
+ * const schedule: RuleSchedule = {
+ *   interval: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }).parse('3h'),
+ * };
+ * ```
+ */
+export const TimeDuration = ({ allowedUnits }: TimeDurationType) => {
+  return z.string().refine(
+    (input) => {
+      if (input.trim() === '') return false;
+
+      try {
+        const inputLength = input.length;
+        const time = Number(input.trim().substring(0, inputLength - 1));
+        const unit = input.trim().at(-1) as TimeUnits;
+
+        return isTimeSafe(time) && allowedUnits.includes(unit);
+      } catch (error) {
+        return false;
+      }
+    },
+    {
+      message:
+        'Invalid time duration format. Must be a string that is not empty, and composed of a positive integer greater than 0 followed by a unit of time in the format {safe_integer}{timeUnit}, e.g. "30s", "1m", "2h", "7d"',
+    }
+  );
+};
+
+export type TimeDurationSchema = ReturnType<typeof TimeDuration>;
+export type TimeDuration = z.infer<TimeDurationSchema>;
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts
index 310f96b7bf946..ba07c49a7b130 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/common_attributes.ts
@@ -6,9 +6,24 @@
  */
 
 import * as t from 'io-ts';
-import { listArray } from '@kbn/securitysolution-io-ts-list-types';
-import { NonEmptyString, version, UUID, NonEmptyArray } from '@kbn/securitysolution-io-ts-types';
-import { max_signals, threat } from '@kbn/securitysolution-io-ts-alerting-types';
+import { NonEmptyString, UUID } from '@kbn/securitysolution-io-ts-types';
+
+/*
+IMPORTANT NOTE ON THIS FILE:
+
+This file contains the remaining rule schema types created manually via io-ts. They have been
+migrated to Zod schemas created via code generation out of OpenAPI schemas
+(found in x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema/common_attributes.gen.ts)
+
+The remaining types here couldn't easily be deleted/replaced because they are dependencies in
+complex derived schemas in two files:
+
+- x-pack/plugins/security_solution/common/api/detection_engine/rule_exceptions/find_exception_references/find_exception_references_route.ts
+- x-pack/plugins/security_solution/common/api/timeline/model/api.ts
+
+Once those two files are migrated to Zod, the /common/api/detection_engine/model/rule_schema_legacy
+folder can be removed.
+*/
 
 export type RuleObjectId = t.TypeOf<typeof RuleObjectId>;
 export const RuleObjectId = UUID;
@@ -24,156 +39,6 @@ export const RuleSignatureId = t.string; // should be non-empty string?
 export type RuleName = t.TypeOf<typeof RuleName>;
 export const RuleName = NonEmptyString;
 
-export type RuleDescription = t.TypeOf<typeof RuleDescription>;
-export const RuleDescription = NonEmptyString;
-
-export type RuleVersion = t.TypeOf<typeof RuleVersion>;
-export const RuleVersion = version;
-
-export type IsRuleImmutable = t.TypeOf<typeof IsRuleImmutable>;
-export const IsRuleImmutable = t.boolean;
-
-export type IsRuleEnabled = t.TypeOf<typeof IsRuleEnabled>;
-export const IsRuleEnabled = t.boolean;
-
-export type RuleTagArray = t.TypeOf<typeof RuleTagArray>;
-export const RuleTagArray = t.array(t.string); // should be non-empty strings?
-
-/**
- * Note that this is a non-exact io-ts type as we allow extra meta information
- * to be added to the meta object
- */
-export type RuleMetadata = t.TypeOf<typeof RuleMetadata>;
-export const RuleMetadata = t.UnknownRecord; // should be a more specific type?
-
-export type RuleLicense = t.TypeOf<typeof RuleLicense>;
-export const RuleLicense = t.string;
-
-export type RuleAuthorArray = t.TypeOf<typeof RuleAuthorArray>;
-export const RuleAuthorArray = t.array(t.string); // should be non-empty strings?
-
-export type RuleFalsePositiveArray = t.TypeOf<typeof RuleFalsePositiveArray>;
-export const RuleFalsePositiveArray = t.array(t.string); // should be non-empty strings?
-
-export type RuleReferenceArray = t.TypeOf<typeof RuleReferenceArray>;
-export const RuleReferenceArray = t.array(t.string); // should be non-empty strings?
-
-export type InvestigationGuide = t.TypeOf<typeof InvestigationGuide>;
-export const InvestigationGuide = t.string;
-
-/**
- * Any instructions for the user for setting up their environment in order to start receiving
- * source events for a given rule.
- *
- * It's a multiline text. Markdown is supported.
- */
-export type SetupGuide = t.TypeOf<typeof SetupGuide>;
-export const SetupGuide = t.string;
-
-export type BuildingBlockType = t.TypeOf<typeof BuildingBlockType>;
-export const BuildingBlockType = t.string;
-
-export type AlertsIndex = t.TypeOf<typeof AlertsIndex>;
-export const AlertsIndex = t.string;
-
-export type AlertsIndexNamespace = t.TypeOf<typeof AlertsIndexNamespace>;
-export const AlertsIndexNamespace = t.string;
-
-export type ExceptionListArray = t.TypeOf<typeof ExceptionListArray>;
-export const ExceptionListArray = listArray;
-
-export type MaxSignals = t.TypeOf<typeof MaxSignals>;
-export const MaxSignals = max_signals;
-
-export type ThreatArray = t.TypeOf<typeof ThreatArray>;
-export const ThreatArray = t.array(threat);
-
-export type IndexPatternArray = t.TypeOf<typeof IndexPatternArray>;
-export const IndexPatternArray = t.array(t.string);
-
-export type DataViewId = t.TypeOf<typeof DataViewId>;
-export const DataViewId = t.string;
-
-export type RuleQuery = t.TypeOf<typeof RuleQuery>;
-export const RuleQuery = t.string;
-
-/**
- * TODO: Right now the filters is an "unknown", when it could more than likely
- * become the actual ESFilter as a type.
- */
-export type RuleFilterArray = t.TypeOf<typeof RuleFilterArray>; // Filters are not easily type-able yet
-export const RuleFilterArray = t.array(t.unknown); // Filters are not easily type-able yet
-
-export type RuleNameOverride = t.TypeOf<typeof RuleNameOverride>;
-export const RuleNameOverride = t.string; // should be non-empty string?
-
-export type TimestampOverride = t.TypeOf<typeof TimestampOverride>;
-export const TimestampOverride = t.string; // should be non-empty string?
-
-export type TimestampOverrideFallbackDisabled = t.TypeOf<typeof TimestampOverrideFallbackDisabled>;
-export const TimestampOverrideFallbackDisabled = t.boolean;
-
-/**
- * Almost all types of Security rules check source event documents for a match to some kind of
- * query or filter. If a document has certain field with certain values, then it's a match and
- * the rule will generate an alert.
- *
- * Required field is an event field that must be present in the source indices of a given rule.
- *
- * @example
- * const standardEcsField: RequiredField = {
- *   name: 'event.action',
- *   type: 'keyword',
- *   ecs: true,
- * };
- *
- * @example
- * const nonEcsField: RequiredField = {
- *   name: 'winlog.event_data.AttributeLDAPDisplayName',
- *   type: 'keyword',
- *   ecs: false,
- * };
- */
-export type RequiredField = t.TypeOf<typeof RequiredField>;
-export const RequiredField = t.exact(
-  t.type({
-    name: NonEmptyString,
-    type: NonEmptyString,
-    ecs: t.boolean,
-  })
-);
-
-/**
- * Array of event fields that must be present in the source indices of a given rule.
- *
- * @example
- * const x: RequiredFieldArray = [
- *   {
- *     name: 'event.action',
- *     type: 'keyword',
- *     ecs: true,
- *   },
- *   {
- *     name: 'event.code',
- *     type: 'keyword',
- *     ecs: true,
- *   },
- *   {
- *     name: 'winlog.event_data.AttributeLDAPDisplayName',
- *     type: 'keyword',
- *     ecs: false,
- *   },
- * ];
- */
-export type RequiredFieldArray = t.TypeOf<typeof RequiredFieldArray>;
-export const RequiredFieldArray = t.array(RequiredField);
-
-export type TimelineTemplateId = t.TypeOf<typeof TimelineTemplateId>;
-export const TimelineTemplateId = t.string; // should be non-empty string?
-
-export type TimelineTemplateTitle = t.TypeOf<typeof TimelineTemplateTitle>;
-export const TimelineTemplateTitle = t.string; // should be non-empty string?
-
 /**
  * Outcome is a property of the saved object resolve api
  * will tell us info about the rule after 8.0 migrations
@@ -193,96 +58,3 @@ export const SavedObjectResolveAliasPurpose = t.union([
   t.literal('savedObjectConversion'),
   t.literal('savedObjectImport'),
 ]);
-
-/**
- * Related integration is a potential dependency of a rule. It's assumed that if the user installs
- * one of the related integrations of a rule, the rule might start to work properly because it will
- * have source events (generated by this integration) potentially matching the rule's query.
- *
- *   NOTE: Proper work is not guaranteed, because a related integration, if installed, can be
- *   configured differently or generate data that is not necessarily relevant for this rule.
- *
- * Related integration is a combination of a Fleet package and (optionally) one of the
- * package's "integrations" that this package contains. It is represented by 3 properties:
- *
- *   - `package`: name of the package (required, unique id)
- *   - `version`: version of the package (required, semver-compatible)
- *   - `integration`: name of the integration of this package (optional, id within the package)
- *
- * There are Fleet packages like `windows` that contain only one integration; in this case,
- * `integration` should be unspecified. There are also packages like `aws` and `azure` that contain
- * several integrations; in this case, `integration` should be specified.
- *
- * @example
- * const x: RelatedIntegration = {
- *   package: 'windows',
- *   version: '1.5.x',
- * };
- *
- * @example
- * const x: RelatedIntegration = {
- *   package: 'azure',
- *   version: '~1.1.6',
- *   integration: 'activitylogs',
- * };
- */
-export type RelatedIntegration = t.TypeOf<typeof RelatedIntegration>;
-export const RelatedIntegration = t.exact(
-  t.intersection([
-    t.type({
-      package: NonEmptyString,
-      version: NonEmptyString,
-    }),
-    t.partial({
-      integration: NonEmptyString,
-    }),
-  ])
-);
-
-/**
- * Array of related integrations.
- *
- * @example
- * const x: RelatedIntegrationArray = [
- *   {
- *     package: 'windows',
- *     version: '1.5.x',
- *   },
- *   {
- *     package: 'azure',
- *     version: '~1.1.6',
- *     integration: 'activitylogs',
- *   },
- * ];
- */
-export type RelatedIntegrationArray = t.TypeOf<typeof RelatedIntegrationArray>;
-export const RelatedIntegrationArray = t.array(RelatedIntegration);
-
-/**
- * Schema for fields relating to investigation fields, these are user defined fields we use to highlight
- * in various features in the UI such as alert details flyout and exceptions auto-population from alert.
- * Added in PR #163235
- * Right now we only have a single field but anticipate adding more related fields to store various
- * configuration states such as `override` - where a user might say if they want only these fields to
- * display, or if they want these fields + the fields we select. When expanding this field, it may look
- * something like:
- * export const investigationFields = t.intersection([
- * t.exact(
- *   t.type({
- *     field_names: NonEmptyArray(NonEmptyString),
- *   })
- * ),
- * t.exact(
- *   t.partial({
- *     overide: t.boolean,
- *   })
- * ),
- * ]);
- *
- */
-export type InvestigationFields = t.TypeOf<typeof InvestigationFields>;
-export const InvestigationFields = t.exact(
-  t.type({
-    field_names: NonEmptyArray(NonEmptyString),
-  })
-);
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/eql_attributes.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/eql_attributes.ts
deleted file mode 100644
index 0bc029fa0d4a5..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/eql_attributes.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-
-// Attributes specific to EQL rules
-
-export type EventCategoryOverride = t.TypeOf<typeof EventCategoryOverride>;
-export const EventCategoryOverride = t.string; // should be non-empty string?
-
-export type TimestampField = t.TypeOf<typeof TimestampField>;
-export const TimestampField = t.string; // should be non-empty string?
-
-export type TiebreakerField = t.TypeOf<typeof TiebreakerField>;
-export const TiebreakerField = t.string; // should be non-empty string?
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts
index 6fbe808a0eb48..a112f6ca1b29f 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/index.ts
@@ -6,10 +6,3 @@
  */
 
 export * from './common_attributes';
-
-export * from './eql_attributes';
-export * from './new_terms_attributes';
-export * from './query_attributes';
-export * from './threshold_attributes';
-
-export * from './rule_schemas';
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/new_terms_attributes.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/new_terms_attributes.ts
deleted file mode 100644
index 6d9f39011b675..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/new_terms_attributes.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-import { LimitedSizeArray, NonEmptyString } from '@kbn/securitysolution-io-ts-types';
-import { MAX_NUMBER_OF_NEW_TERMS_FIELDS } from '../../../../constants';
-
-// Attributes specific to New Terms rules
-
-/**
- * New terms rule type supports a limited number of fields. Max number of fields is 3 and defined in common constants as MAX_NUMBER_OF_NEW_TERMS_FIELDS
- */
-export type NewTermsFields = t.TypeOf<typeof NewTermsFields>;
-export const NewTermsFields = LimitedSizeArray({
-  codec: t.string,
-  minSize: 1,
-  maxSize: MAX_NUMBER_OF_NEW_TERMS_FIELDS,
-});
-
-export type HistoryWindowStart = t.TypeOf<typeof HistoryWindowStart>;
-export const HistoryWindowStart = NonEmptyString;
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/query_attributes.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/query_attributes.ts
deleted file mode 100644
index 8ee40e7a507d4..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/query_attributes.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-import {
-  LimitedSizeArray,
-  PositiveIntegerGreaterThanZero,
-  enumeration,
-} from '@kbn/securitysolution-io-ts-types';
-import { AlertSuppressionMissingFieldsStrategyEnum } from '../rule_schema/common_attributes.gen';
-
-export type AlertSuppressionMissingFields = t.TypeOf<typeof AlertSuppressionMissingFields>;
-export const AlertSuppressionMissingFields = enumeration(
-  'AlertSuppressionMissingFields',
-  AlertSuppressionMissingFieldsStrategyEnum
-);
-
-export const AlertSuppressionGroupBy = LimitedSizeArray({
-  codec: t.string,
-  minSize: 1,
-  maxSize: 3,
-});
-
-export const AlertSuppressionDuration = t.type({
-  value: PositiveIntegerGreaterThanZero,
-  unit: t.keyof({
-    s: null,
-    m: null,
-    h: null,
-  }),
-});
-
-/**
- * Schema for fields relating to alert suppression, which enables limiting the number of alerts per entity.
- * e.g. group_by: ['host.name'] would create only one alert per value of host.name. The created alert
- * contains metadata about how many other candidate alerts with the same host.name value were suppressed.
- */
-export type AlertSuppression = t.TypeOf<typeof AlertSuppression>;
-export const AlertSuppression = t.intersection([
-  t.exact(
-    t.type({
-      group_by: AlertSuppressionGroupBy,
-    })
-  ),
-  t.exact(
-    t.partial({
-      duration: AlertSuppressionDuration,
-      missing_fields_strategy: AlertSuppressionMissingFields,
-    })
-  ),
-]);
-
-export type AlertSuppressionCamel = t.TypeOf<typeof AlertSuppressionCamel>;
-export const AlertSuppressionCamel = t.intersection([
-  t.exact(
-    t.type({
-      groupBy: AlertSuppressionGroupBy,
-    })
-  ),
-  t.exact(
-    t.partial({
-      duration: AlertSuppressionDuration,
-      missingFieldsStrategy: AlertSuppressionMissingFields,
-    })
-  ),
-]);
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/response_actions.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/response_actions.ts
deleted file mode 100644
index e4164c6d2bb04..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/response_actions.ts
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import { arrayQueries, ecsMapping } from '@kbn/osquery-io-ts-types';
-import * as t from 'io-ts';
-
-// to enable using RESPONSE_ACTION_API_COMMANDS_NAMES as a type
-function keyObject<T extends readonly string[]>(arr: T): { [K in T[number]]: null } {
-  return Object.fromEntries(arr.map((v) => [v, null])) as never;
-}
-
-export type EndpointParams = t.TypeOf<typeof EndpointParams>;
-export const EndpointParams = t.type({
-  // TODO: TC- change these when we go GA with automated process actions
-  command: t.keyof(keyObject(['isolate', 'kill-process', 'suspend-process'])),
-  // command: t.keyof(keyObject(ENABLED_AUTOMATED_RESPONSE_ACTION_COMMANDS)),
-  comment: t.union([t.string, t.undefined]),
-});
-
-export const OsqueryParams = t.type({
-  query: t.union([t.string, t.undefined]),
-  ecs_mapping: t.union([ecsMapping, t.undefined]),
-  queries: t.union([arrayQueries, t.undefined]),
-  pack_id: t.union([t.string, t.undefined]),
-  saved_query_id: t.union([t.string, t.undefined]),
-});
-
-export const OsqueryParamsCamelCase = t.type({
-  query: t.union([t.string, t.undefined]),
-  ecsMapping: t.union([ecsMapping, t.undefined]),
-  queries: t.union([arrayQueries, t.undefined]),
-  packId: t.union([t.string, t.undefined]),
-  savedQueryId: t.union([t.string, t.undefined]),
-});
-
-// When we create new response action types, create a union of types
-export type RuleResponseOsqueryAction = t.TypeOf<typeof RuleResponseOsqueryAction>;
-export const RuleResponseOsqueryAction = t.strict({
-  actionTypeId: t.literal('.osquery'),
-  params: OsqueryParamsCamelCase,
-});
-
-export type RuleResponseEndpointAction = t.TypeOf<typeof RuleResponseEndpointAction>;
-export const RuleResponseEndpointAction = t.strict({
-  actionTypeId: t.literal('.endpoint'),
-  params: EndpointParams,
-});
-
-export type RuleResponseAction = t.TypeOf<typeof ResponseActionRuleParam>;
-const ResponseActionRuleParam = t.union([RuleResponseOsqueryAction, RuleResponseEndpointAction]);
-
-export const ResponseActionRuleParamsOrUndefined = t.union([
-  t.array(ResponseActionRuleParam),
-  t.undefined,
-]);
-
-// When we create new response action types, create a union of types
-const OsqueryResponseAction = t.strict({
-  action_type_id: t.literal('.osquery'),
-  params: OsqueryParams,
-});
-
-const EndpointResponseAction = t.strict({
-  action_type_id: t.literal('.endpoint'),
-  params: EndpointParams,
-});
-
-export type ResponseAction = t.TypeOf<typeof ResponseAction>;
-export const ResponseAction = t.union([OsqueryResponseAction, EndpointResponseAction]);
-
-export const ResponseActionArray = t.array(ResponseAction);
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/rule_schemas.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/rule_schemas.ts
deleted file mode 100644
index 4ec9ca19ee399..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/rule_schemas.ts
+++ /dev/null
@@ -1,388 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-
-import {
-  concurrent_searches,
-  items_per_search,
-  machine_learning_job_id,
-  RiskScore,
-  RiskScoreMapping,
-  RuleActionArray,
-  RuleActionThrottle,
-  RuleInterval,
-  RuleIntervalFrom,
-  RuleIntervalTo,
-  Severity,
-  SeverityMapping,
-  threat_filters,
-  threat_index,
-  threat_indicator_path,
-  threat_mapping,
-  threat_query,
-} from '@kbn/securitysolution-io-ts-alerting-types';
-import { PositiveInteger } from '@kbn/securitysolution-io-ts-types';
-import { ResponseActionArray } from './response_actions';
-
-import { anomaly_threshold, saved_id } from '../schemas';
-
-import {
-  AlertsIndex,
-  AlertsIndexNamespace,
-  BuildingBlockType,
-  DataViewId,
-  ExceptionListArray,
-  IndexPatternArray,
-  InvestigationFields,
-  InvestigationGuide,
-  IsRuleEnabled,
-  MaxSignals,
-  RuleAuthorArray,
-  RuleDescription,
-  RuleFalsePositiveArray,
-  RuleFilterArray,
-  RuleLicense,
-  RuleMetadata,
-  RuleName,
-  RuleNameOverride,
-  RuleQuery,
-  RuleReferenceArray,
-  RuleSignatureId,
-  RuleTagArray,
-  RuleVersion,
-  SavedObjectResolveAliasPurpose,
-  SavedObjectResolveAliasTargetId,
-  SavedObjectResolveOutcome,
-  ThreatArray,
-  TimelineTemplateId,
-  TimelineTemplateTitle,
-  TimestampOverride,
-  TimestampOverrideFallbackDisabled,
-} from './common_attributes';
-import { EventCategoryOverride, TiebreakerField, TimestampField } from './eql_attributes';
-import { HistoryWindowStart, NewTermsFields } from './new_terms_attributes';
-import { AlertSuppression } from './query_attributes';
-import { Threshold } from './threshold_attributes';
-
-export const buildRuleSchemas = <
-  Required extends t.Props,
-  Optional extends t.Props,
-  Defaultable extends t.Props
->({
-  required,
-  optional,
-  defaultable,
-}: {
-  required: Required;
-  optional: Optional;
-  defaultable: Defaultable;
-}) => ({
-  create: t.intersection([
-    t.exact(t.type(required)),
-    t.exact(t.partial(optional)),
-    t.exact(t.partial(defaultable)),
-  ]),
-  patch: t.intersection([t.partial(required), t.partial(optional), t.partial(defaultable)]),
-  response: t.intersection([
-    t.exact(t.type(required)),
-    // This bit of logic is to force all fields to be accounted for in conversions from the internal
-    // rule schema to the response schema. Rather than use `t.partial`, which makes each field optional,
-    // we make each field required but possibly undefined. The result is that if a field is forgotten in
-    // the conversion from internal schema to response schema TS will report an error. If we just used t.partial
-    // instead, then optional fields can be accidentally omitted from the conversion - and any actual values
-    // in those fields internally will be stripped in the response.
-    t.exact(t.type(orUndefined(optional))),
-    t.exact(t.type(defaultable)),
-  ]),
-});
-
-export type OrUndefined<P extends t.Props> = {
-  [K in keyof P]: P[K] | t.UndefinedC;
-};
-
-export const orUndefined = <P extends t.Props>(props: P): OrUndefined<P> => {
-  return Object.keys(props).reduce<t.Props>((acc, key) => {
-    acc[key] = t.union([props[key], t.undefined]);
-    return acc;
-  }, {}) as OrUndefined<P>;
-};
-
-// -------------------------------------------------------------------------------------------------
-// Base schema
-
-export const baseSchema = buildRuleSchemas({
-  required: {
-    name: RuleName,
-    description: RuleDescription,
-    risk_score: RiskScore,
-    severity: Severity,
-  },
-  optional: {
-    // Field overrides
-    rule_name_override: RuleNameOverride,
-    timestamp_override: TimestampOverride,
-    timestamp_override_fallback_disabled: TimestampOverrideFallbackDisabled,
-    // Timeline template
-    timeline_id: TimelineTemplateId,
-    timeline_title: TimelineTemplateTitle,
-    // Attributes related to SavedObjectsClient.resolve API
-    outcome: SavedObjectResolveOutcome,
-    alias_target_id: SavedObjectResolveAliasTargetId,
-    alias_purpose: SavedObjectResolveAliasPurpose,
-    // Misc attributes
-    license: RuleLicense,
-    note: InvestigationGuide,
-    building_block_type: BuildingBlockType,
-    output_index: AlertsIndex,
-    namespace: AlertsIndexNamespace,
-    meta: RuleMetadata,
-    investigation_fields: InvestigationFields,
-    // Throttle
-    throttle: RuleActionThrottle,
-  },
-  defaultable: {
-    // Main attributes
-    version: RuleVersion,
-    tags: RuleTagArray,
-    enabled: IsRuleEnabled,
-    // Field overrides
-    risk_score_mapping: RiskScoreMapping,
-    severity_mapping: SeverityMapping,
-    // Rule schedule
-    interval: RuleInterval,
-    from: RuleIntervalFrom,
-    to: RuleIntervalTo,
-    // Rule actions
-    actions: RuleActionArray,
-    // Rule exceptions
-    exceptions_list: ExceptionListArray,
-    // Misc attributes
-    author: RuleAuthorArray,
-    false_positives: RuleFalsePositiveArray,
-    references: RuleReferenceArray,
-    // maxSignals not used in ML rules but probably should be used
-    max_signals: MaxSignals,
-    threat: ThreatArray,
-  },
-});
-
-export type DurationMetric = t.TypeOf<typeof DurationMetric>;
-export const DurationMetric = PositiveInteger;
-
-export type RuleExecutionMetrics = t.TypeOf<typeof RuleExecutionMetrics>;
-
-/**
-  @property total_search_duration_ms - "total time spent performing ES searches as measured by Kibana; 
-  includes network latency and time spent serializing/deserializing request/response",
-  @property total_indexing_duration_ms - "total time spent indexing documents during current rule execution cycle",
-  @property total_enrichment_duration_ms - total time spent enriching documents during current rule execution cycle
-  @property execution_gap_duration_s - "duration in seconds of execution gap"
-*/
-export const RuleExecutionMetrics = t.partial({
-  total_search_duration_ms: DurationMetric,
-  total_indexing_duration_ms: DurationMetric,
-  total_enrichment_duration_ms: DurationMetric,
-  execution_gap_duration_s: DurationMetric,
-});
-
-export type BaseCreateProps = t.TypeOf<typeof BaseCreateProps>;
-export const BaseCreateProps = baseSchema.create;
-
-// -------------------------------------------------------------------------------------------------
-// Shared schemas
-
-// "Shared" types are the same across all rule types, and built from "baseSchema" above
-// with some variations for each route. These intersect with type specific schemas below
-// to create the full schema for each route.
-
-export type SharedCreateProps = t.TypeOf<typeof SharedCreateProps>;
-export const SharedCreateProps = t.intersection([
-  baseSchema.create,
-  t.exact(t.partial({ rule_id: RuleSignatureId })),
-]);
-
-// -------------------------------------------------------------------------------------------------
-// EQL rule schema
-
-export type KqlQueryLanguage = t.TypeOf<typeof KqlQueryLanguage>;
-export const KqlQueryLanguage = t.keyof({ kuery: null, lucene: null });
-
-export type EqlQueryLanguage = t.TypeOf<typeof EqlQueryLanguage>;
-export const EqlQueryLanguage = t.literal('eql');
-
-const eqlSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('eql'),
-    language: EqlQueryLanguage,
-    query: RuleQuery,
-  },
-  optional: {
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    filters: RuleFilterArray,
-    timestamp_field: TimestampField,
-    event_category_override: EventCategoryOverride,
-    tiebreaker_field: TiebreakerField,
-  },
-  defaultable: {},
-});
-
-// -------------------------------------------------------------------------------------------------
-// ES|QL rule schema
-
-export type EsqlQueryLanguage = t.TypeOf<typeof EsqlQueryLanguage>;
-export const EsqlQueryLanguage = t.literal('esql');
-
-const esqlSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('esql'),
-    language: EsqlQueryLanguage,
-    query: RuleQuery,
-  },
-  optional: {},
-  defaultable: {},
-});
-
-// -------------------------------------------------------------------------------------------------
-// Indicator Match rule schema
-
-const threatMatchSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('threat_match'),
-    query: RuleQuery,
-    threat_query,
-    threat_mapping,
-    threat_index,
-  },
-  optional: {
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    filters: RuleFilterArray,
-    saved_id,
-    threat_filters,
-    threat_indicator_path,
-    threat_language: KqlQueryLanguage,
-    concurrent_searches,
-    items_per_search,
-  },
-  defaultable: {
-    language: KqlQueryLanguage,
-  },
-});
-
-// -------------------------------------------------------------------------------------------------
-// Custom Query rule schema
-
-const querySchema = buildRuleSchemas({
-  required: {
-    type: t.literal('query'),
-  },
-  optional: {
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    filters: RuleFilterArray,
-    saved_id,
-    response_actions: ResponseActionArray,
-    alert_suppression: AlertSuppression,
-  },
-  defaultable: {
-    query: RuleQuery,
-    language: KqlQueryLanguage,
-  },
-});
-
-// -------------------------------------------------------------------------------------------------
-// Saved Query rule schema
-
-const savedQuerySchema = buildRuleSchemas({
-  required: {
-    type: t.literal('saved_query'),
-    saved_id,
-  },
-  optional: {
-    // Having language, query, and filters possibly defined adds more code confusion and probably user confusion
-    // if the saved object gets deleted for some reason
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    query: RuleQuery,
-    filters: RuleFilterArray,
-    response_actions: ResponseActionArray,
-    alert_suppression: AlertSuppression,
-  },
-  defaultable: {
-    language: KqlQueryLanguage,
-  },
-});
-
-// -------------------------------------------------------------------------------------------------
-// Threshold rule schema
-
-const thresholdSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('threshold'),
-    query: RuleQuery,
-    threshold: Threshold,
-  },
-  optional: {
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    filters: RuleFilterArray,
-    saved_id,
-  },
-  defaultable: {
-    language: KqlQueryLanguage,
-  },
-});
-
-// -------------------------------------------------------------------------------------------------
-// Machine Learning rule schema
-
-const machineLearningSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('machine_learning'),
-    anomaly_threshold,
-    machine_learning_job_id,
-  },
-  optional: {},
-  defaultable: {},
-});
-
-// -------------------------------------------------------------------------------------------------
-// New Terms rule schema
-
-const newTermsSchema = buildRuleSchemas({
-  required: {
-    type: t.literal('new_terms'),
-    query: RuleQuery,
-    new_terms_fields: NewTermsFields,
-    history_window_start: HistoryWindowStart,
-  },
-  optional: {
-    index: IndexPatternArray,
-    data_view_id: DataViewId,
-    filters: RuleFilterArray,
-  },
-  defaultable: {
-    language: KqlQueryLanguage,
-  },
-});
-
-// -------------------------------------------------------------------------------------------------
-// Combined type specific schemas
-
-export type TypeSpecificCreateProps = t.TypeOf<typeof TypeSpecificCreateProps>;
-export const TypeSpecificCreateProps = t.union([
-  eqlSchema.create,
-  esqlSchema.create,
-  threatMatchSchema.create,
-  querySchema.create,
-  savedQuerySchema.create,
-  thresholdSchema.create,
-  machineLearningSchema.create,
-  newTermsSchema.create,
-]);
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/threshold_attributes.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/threshold_attributes.ts
deleted file mode 100644
index eb5639c97ab3e..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/rule_schema_legacy/threshold_attributes.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-import { PositiveInteger, PositiveIntegerGreaterThanZero } from '@kbn/securitysolution-io-ts-types';
-
-// Attributes specific to Threshold rules
-
-const thresholdField = t.exact(
-  t.type({
-    field: t.union([t.string, t.array(t.string)]), // Covers pre- and post-7.12
-    value: PositiveIntegerGreaterThanZero,
-  })
-);
-
-const thresholdFieldNormalized = t.exact(
-  t.type({
-    field: t.array(t.string),
-    value: PositiveIntegerGreaterThanZero,
-  })
-);
-
-const thresholdCardinalityField = t.exact(
-  t.type({
-    field: t.string,
-    value: PositiveInteger,
-  })
-);
-
-export type Threshold = t.TypeOf<typeof Threshold>;
-export const Threshold = t.intersection([
-  thresholdField,
-  t.exact(
-    t.partial({
-      cardinality: t.array(thresholdCardinalityField),
-    })
-  ),
-]);
-
-export type ThresholdNormalized = t.TypeOf<typeof ThresholdNormalized>;
-export const ThresholdNormalized = t.intersection([
-  thresholdFieldNormalized,
-  t.exact(
-    t.partial({
-      cardinality: t.array(thresholdCardinalityField),
-    })
-  ),
-]);
-
-export type ThresholdWithCardinality = t.TypeOf<typeof ThresholdWithCardinality>;
-export const ThresholdWithCardinality = t.intersection([
-  thresholdFieldNormalized,
-  t.exact(
-    t.type({
-      cardinality: t.array(thresholdCardinalityField),
-    })
-  ),
-]);
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/model/schemas.ts b/x-pack/plugins/security_solution/common/api/detection_engine/model/schemas.ts
index 68a6dbb461673..12973846c1f23 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/model/schemas.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/model/schemas.ts
@@ -7,89 +7,76 @@
 
 /* eslint-disable @typescript-eslint/naming-convention */
 
-import * as t from 'io-ts';
-import { PositiveInteger } from '@kbn/securitysolution-io-ts-types';
-
-export const file_name = t.string;
-export type FileName = t.TypeOf<typeof file_name>;
-
-export const exclude_export_details = t.boolean;
-export type ExcludeExportDetails = t.TypeOf<typeof exclude_export_details>;
-
-export const saved_id = t.string;
-
-export const savedIdOrUndefined = t.union([saved_id, t.undefined]);
-export type SavedIdOrUndefined = t.TypeOf<typeof savedIdOrUndefined>;
-
-export const anomaly_threshold = PositiveInteger;
-
-export const status = t.keyof({
-  open: null,
-  closed: null,
-  acknowledged: null,
-  'in-progress': null,
-});
-export type Status = t.TypeOf<typeof status>;
-
-export const conflicts = t.keyof({ abort: null, proceed: null });
-
-export const signal_ids = t.array(t.string);
-export type SignalIds = t.TypeOf<typeof signal_ids>;
-
-// TODO: Can this be more strict or is this is the set of all Elastic Queries?
-export const signal_status_query = t.object;
-
-export const alert_tag_ids = t.array(t.string);
-export type AlertTagIds = t.TypeOf<typeof alert_tag_ids>;
-
-export const indexRecord = t.record(
-  t.string,
-  t.type({
-    all: t.boolean,
-    maintenance: t.boolean,
-    read: t.boolean,
-    create_index: t.boolean,
-    index: t.boolean,
-    monitor: t.boolean,
-    delete: t.boolean,
-    manage: t.boolean,
-    delete_index: t.boolean,
-    create_doc: t.boolean,
-    view_index_metadata: t.boolean,
-    create: t.boolean,
-    write: t.boolean,
+import { z } from 'zod';
+
+export type FileName = z.infer<typeof file_name>;
+export const file_name = z.string();
+
+export type ExcludeExportDetails = z.infer<typeof exclude_export_details>;
+export const exclude_export_details = z.boolean();
+
+export const saved_id = z.string();
+
+export type SavedIdOrUndefined = z.infer<typeof savedIdOrUndefined>;
+export const savedIdOrUndefined = saved_id.optional();
+
+export const status = z.enum(['open', 'closed', 'acknowledged', 'in-progress']);
+export type Status = z.infer<typeof status>;
+
+export const signal_ids = z.array(z.string());
+export type SignalIds = z.infer<typeof signal_ids>;
+
+export const alert_tag_ids = z.array(z.string());
+export type AlertTagIds = z.infer<typeof alert_tag_ids>;
+
+export const indexRecord = z.record(
+  z.string(),
+  z.object({
+    all: z.boolean(),
+    maintenance: z.boolean(),
+    read: z.boolean(),
+    create_index: z.boolean(),
+    index: z.boolean(),
+    monitor: z.boolean(),
+    delete: z.boolean(),
+    manage: z.boolean(),
+    delete_index: z.boolean(),
+    create_doc: z.boolean(),
+    view_index_metadata: z.boolean(),
+    create: z.boolean(),
+    write: z.boolean(),
   })
 );
 
-export const privilege = t.type({
-  username: t.string,
-  has_all_requested: t.boolean,
-  cluster: t.type({
-    monitor_ml: t.boolean,
-    manage_index_templates: t.boolean,
-    monitor_transform: t.boolean,
-    manage_security: t.boolean,
-    manage_own_api_key: t.boolean,
-    all: t.boolean,
-    monitor: t.boolean,
-    manage: t.boolean,
-    manage_transform: t.boolean,
-    manage_ml: t.boolean,
-    manage_pipeline: t.boolean,
+export const privilege = z.object({
+  username: z.string(),
+  has_all_requested: z.boolean(),
+  cluster: z.object({
+    monitor_ml: z.boolean(),
+    manage_index_templates: z.boolean(),
+    monitor_transform: z.boolean(),
+    manage_security: z.boolean(),
+    manage_own_api_key: z.boolean(),
+    all: z.boolean(),
+    monitor: z.boolean(),
+    manage: z.boolean(),
+    manage_transform: z.boolean(),
+    manage_ml: z.boolean(),
+    manage_pipeline: z.boolean(),
   }),
   index: indexRecord,
-  is_authenticated: t.boolean,
-  has_encryption_key: t.boolean,
+  is_authenticated: z.boolean(),
+  has_encryption_key: z.boolean(),
 });
 
-export type Privilege = t.TypeOf<typeof privilege>;
+export type Privilege = z.infer<typeof privilege>;
 
-export const alert_tags = t.type({
-  tags_to_add: t.array(t.string),
-  tags_to_remove: t.array(t.string),
+export const alert_tags = z.object({
+  tags_to_add: z.array(z.string()),
+  tags_to_remove: z.array(z.string()),
 });
 
-export type AlertTags = t.TypeOf<typeof alert_tags>;
+export type AlertTags = z.infer<typeof alert_tags>;
 
-export const user_search_term = t.string;
-export type UserSearchTerm = t.TypeOf<typeof user_search_term>;
+export const user_search_term = z.string();
+export type UserSearchTerm = z.infer<typeof user_search_term>;
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/index.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/index.ts
index a2b514676767b..635dfdf45c1c4 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/index.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/index.ts
@@ -14,7 +14,6 @@ export * from './review_rule_installation/review_rule_installation_route';
 export * from './review_rule_upgrade/review_rule_upgrade_route';
 export * from './urls';
 export * from './model/aggregated_prebuilt_rules_error';
-export * from './model/diff/diffable_rule/build_schema';
 export * from './model/diff/diffable_rule/diffable_field_types';
 export * from './model/diff/diffable_rule/diffable_rule';
 export * from './model/diff/rule_diff/fields_diff';
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/build_schema.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/build_schema.ts
deleted file mode 100644
index b1d7752fb9f89..0000000000000
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/build_schema.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as t from 'io-ts';
-// TODO https://github.com/elastic/security-team/issues/7491
-// eslint-disable-next-line no-restricted-imports
-import { orUndefined } from '../../../../model/rule_schema_legacy';
-
-interface RuleFields<TRequired extends t.Props, TOptional extends t.Props> {
-  required: TRequired;
-  optional: TOptional;
-}
-
-export const buildSchema = <TRequired extends t.Props, TOptional extends t.Props>(
-  fields: RuleFields<TRequired, TOptional>
-) => {
-  return t.intersection([
-    t.exact(t.type(fields.required)),
-    t.exact(t.type(orUndefined(fields.optional))),
-  ]);
-};
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_field_types.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_field_types.ts
index 299b4a7d7b394..aa64c1d12185a 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_field_types.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_field_types.ts
@@ -4,25 +4,23 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import { z } from 'zod';
 
-import * as t from 'io-ts';
-import { TimeDuration } from '@kbn/securitysolution-io-ts-types';
-// TODO https://github.com/elastic/security-team/issues/7491
-// eslint-disable-next-line no-restricted-imports
 import {
   BuildingBlockType,
   DataViewId,
   IndexPatternArray,
   KqlQueryLanguage,
   RuleFilterArray,
-  RuleNameOverride as RuleNameOverrideFieldName,
+  RuleNameOverride,
   RuleQuery,
+  SavedQueryId,
   TimelineTemplateId,
   TimelineTemplateTitle,
-  TimestampOverride as TimestampOverrideFieldName,
+  TimestampOverride,
   TimestampOverrideFallbackDisabled,
-} from '../../../../model/rule_schema_legacy';
-import { saved_id } from '../../../../model/schemas';
+} from '../../../../model/rule_schema';
+import { TimeDuration } from '../../../../model/rule_schema/time_duration';
 
 // -------------------------------------------------------------------------------------------------
 // Rule data source
@@ -32,24 +30,23 @@ export enum DataSourceType {
   'data_view' = 'data_view',
 }
 
-export type DataSourceIndexPatterns = t.TypeOf<typeof DataSourceIndexPatterns>;
-export const DataSourceIndexPatterns = t.exact(
-  t.type({
-    type: t.literal(DataSourceType.index_patterns),
-    index_patterns: IndexPatternArray,
-  })
-);
-
-export type DataSourceDataView = t.TypeOf<typeof DataSourceDataView>;
-export const DataSourceDataView = t.exact(
-  t.type({
-    type: t.literal(DataSourceType.data_view),
-    data_view_id: DataViewId,
-  })
-);
-
-export type RuleDataSource = t.TypeOf<typeof RuleDataSource>;
-export const RuleDataSource = t.union([DataSourceIndexPatterns, DataSourceDataView]);
+export type DataSourceIndexPatterns = z.infer<typeof DataSourceIndexPatterns>;
+export const DataSourceIndexPatterns = z.object({
+  type: z.literal(DataSourceType.index_patterns),
+  index_patterns: IndexPatternArray,
+});
+
+export type DataSourceDataView = z.infer<typeof DataSourceDataView>;
+export const DataSourceDataView = z.object({
+  type: z.literal(DataSourceType.data_view),
+  data_view_id: DataViewId,
+});
+
+export type RuleDataSource = z.infer<typeof RuleDataSource>;
+export const RuleDataSource = z.discriminatedUnion('type', [
+  DataSourceIndexPatterns,
+  DataSourceDataView,
+]);
 
 // -------------------------------------------------------------------------------------------------
 // Rule data query
@@ -59,93 +56,75 @@ export enum KqlQueryType {
   'saved_query' = 'saved_query',
 }
 
-export type InlineKqlQuery = t.TypeOf<typeof InlineKqlQuery>;
-export const InlineKqlQuery = t.exact(
-  t.type({
-    type: t.literal(KqlQueryType.inline_query),
-    query: RuleQuery,
-    language: KqlQueryLanguage,
-    filters: RuleFilterArray,
-  })
-);
-
-export type SavedKqlQuery = t.TypeOf<typeof SavedKqlQuery>;
-export const SavedKqlQuery = t.exact(
-  t.type({
-    type: t.literal(KqlQueryType.saved_query),
-    saved_query_id: saved_id,
-  })
-);
-
-export type RuleKqlQuery = t.TypeOf<typeof RuleKqlQuery>;
-export const RuleKqlQuery = t.union([InlineKqlQuery, SavedKqlQuery]);
-
-export type RuleEqlQuery = t.TypeOf<typeof RuleEqlQuery>;
-export const RuleEqlQuery = t.exact(
-  t.type({
-    query: RuleQuery,
-    language: t.literal('eql'),
-    filters: RuleFilterArray,
-  })
-);
-
-export type RuleEsqlQuery = t.TypeOf<typeof RuleEsqlQuery>;
-export const RuleEsqlQuery = t.exact(
-  t.type({
-    query: RuleQuery,
-    language: t.literal('esql'),
-  })
-);
+export type InlineKqlQuery = z.infer<typeof InlineKqlQuery>;
+export const InlineKqlQuery = z.object({
+  type: z.literal(KqlQueryType.inline_query),
+  query: RuleQuery,
+  language: KqlQueryLanguage,
+  filters: RuleFilterArray,
+});
+
+export type SavedKqlQuery = z.infer<typeof SavedKqlQuery>;
+export const SavedKqlQuery = z.object({
+  type: z.literal(KqlQueryType.saved_query),
+  saved_query_id: SavedQueryId,
+});
+
+export type RuleKqlQuery = z.infer<typeof RuleKqlQuery>;
+export const RuleKqlQuery = z.discriminatedUnion('type', [InlineKqlQuery, SavedKqlQuery]);
+
+export type RuleEqlQuery = z.infer<typeof RuleEqlQuery>;
+export const RuleEqlQuery = z.object({
+  query: RuleQuery,
+  language: z.literal('eql'),
+  filters: RuleFilterArray,
+});
+
+export type RuleEsqlQuery = z.infer<typeof RuleEsqlQuery>;
+export const RuleEsqlQuery = z.object({
+  query: RuleQuery,
+  language: z.literal('esql'),
+});
 
 // -------------------------------------------------------------------------------------------------
 // Rule schedule
 
-export type RuleSchedule = t.TypeOf<typeof RuleSchedule>;
-export const RuleSchedule = t.exact(
-  t.type({
-    interval: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }),
-    lookback: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }),
-  })
-);
+export type RuleSchedule = z.infer<typeof RuleSchedule>;
+export const RuleSchedule = z.object({
+  interval: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }),
+  lookback: TimeDuration({ allowedUnits: ['s', 'm', 'h'] }),
+});
 
 // -------------------------------------------------------------------------------------------------
 // Rule name override
 
-export type RuleNameOverrideObject = t.TypeOf<typeof RuleNameOverrideObject>;
-export const RuleNameOverrideObject = t.exact(
-  t.type({
-    field_name: RuleNameOverrideFieldName,
-  })
-);
+export type RuleNameOverrideObject = z.infer<typeof RuleNameOverrideObject>;
+export const RuleNameOverrideObject = z.object({
+  field_name: RuleNameOverride,
+});
 
 // -------------------------------------------------------------------------------------------------
 // Timestamp override
 
-export type TimestampOverrideObject = t.TypeOf<typeof TimestampOverrideObject>;
-export const TimestampOverrideObject = t.exact(
-  t.type({
-    field_name: TimestampOverrideFieldName,
-    fallback_disabled: TimestampOverrideFallbackDisabled,
-  })
-);
+export type TimestampOverrideObject = z.infer<typeof TimestampOverrideObject>;
+export const TimestampOverrideObject = z.object({
+  field_name: TimestampOverride,
+  fallback_disabled: TimestampOverrideFallbackDisabled,
+});
 
 // -------------------------------------------------------------------------------------------------
 // Reference to a timeline template
 
-export type TimelineTemplateReference = t.TypeOf<typeof TimelineTemplateReference>;
-export const TimelineTemplateReference = t.exact(
-  t.type({
-    timeline_id: TimelineTemplateId,
-    timeline_title: TimelineTemplateTitle,
-  })
-);
+export type TimelineTemplateReference = z.infer<typeof TimelineTemplateReference>;
+export const TimelineTemplateReference = z.object({
+  timeline_id: TimelineTemplateId,
+  timeline_title: TimelineTemplateTitle,
+});
 
 // -------------------------------------------------------------------------------------------------
 // Building block
 
-export type BuildingBlockObject = t.TypeOf<typeof BuildingBlockObject>;
-export const BuildingBlockObject = t.exact(
-  t.type({
-    type: BuildingBlockType,
-  })
-);
+export type BuildingBlockObject = z.infer<typeof BuildingBlockObject>;
+export const BuildingBlockObject = z.object({
+  type: BuildingBlockType,
+});
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_rule.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_rule.ts
index 9bb6fc10031d2..3d58f1e0b7da5 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_rule.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/diffable_rule/diffable_rule.ts
@@ -5,212 +5,164 @@
  * 2.0.
  */
 
-import * as t from 'io-ts';
+import { z } from 'zod';
 
 import {
-  concurrent_searches,
-  items_per_search,
-  machine_learning_job_id,
-  RiskScore,
-  RiskScoreMapping,
-  RuleActionArray,
-  RuleActionThrottle,
-  Severity,
-  SeverityMapping,
-  threat_index,
-  threat_indicator_path,
-  threat_mapping,
-} from '@kbn/securitysolution-io-ts-alerting-types';
-
-// TODO https://github.com/elastic/security-team/issues/7491
-// eslint-disable-next-line no-restricted-imports
-import {
-  AlertSuppression,
+  AnomalyThreshold,
+  ConcurrentSearches,
   EventCategoryOverride,
-  ExceptionListArray,
   HistoryWindowStart,
   InvestigationGuide,
+  ItemsPerSearch,
+  MachineLearningJobId,
   MaxSignals,
   NewTermsFields,
   RelatedIntegrationArray,
   RequiredFieldArray,
+  RiskScore,
+  RiskScoreMapping,
   RuleAuthorArray,
   RuleDescription,
+  RuleExceptionList,
   RuleFalsePositiveArray,
   RuleLicense,
-  RuleMetadata,
   RuleName,
   RuleReferenceArray,
   RuleSignatureId,
   RuleTagArray,
   RuleVersion,
   SetupGuide,
+  Severity,
+  SeverityMapping,
   ThreatArray,
+  ThreatIndex,
+  ThreatIndicatorPath,
+  ThreatMapping,
   Threshold,
   TiebreakerField,
   TimestampField,
-} from '../../../../model/rule_schema_legacy';
+} from '../../../../model/rule_schema';
 
 import {
   BuildingBlockObject,
+  InlineKqlQuery,
+  RuleDataSource,
   RuleEqlQuery,
   RuleEsqlQuery,
-  InlineKqlQuery,
   RuleKqlQuery,
-  RuleDataSource,
   RuleNameOverrideObject,
   RuleSchedule,
   TimelineTemplateReference,
   TimestampOverrideObject,
 } from './diffable_field_types';
 
-import { buildSchema } from './build_schema';
-import { anomaly_threshold } from '../../../../model/schemas';
-
-export type DiffableCommonFields = t.TypeOf<typeof DiffableCommonFields>;
-export const DiffableCommonFields = buildSchema({
-  required: {
-    // Technical fields
-    // NOTE: We might consider removing them from the schema and returning from the API
-    // not via the fields diff, but via dedicated properties in the response body.
-    rule_id: RuleSignatureId,
-    version: RuleVersion,
-    meta: RuleMetadata,
-
-    // Main domain fields
-    name: RuleName,
-    tags: RuleTagArray,
-    description: RuleDescription,
-    severity: Severity,
-    severity_mapping: SeverityMapping,
-    risk_score: RiskScore,
-    risk_score_mapping: RiskScoreMapping,
-
-    // About -> Advanced settings
-    references: RuleReferenceArray,
-    false_positives: RuleFalsePositiveArray,
-    threat: ThreatArray,
-    note: InvestigationGuide,
-    setup: SetupGuide,
-    related_integrations: RelatedIntegrationArray,
-    required_fields: RequiredFieldArray,
-    author: RuleAuthorArray,
-    license: RuleLicense,
-
-    // Other domain fields
-    rule_schedule: RuleSchedule, // NOTE: new field
-    actions: RuleActionArray,
-    throttle: RuleActionThrottle,
-    exceptions_list: ExceptionListArray,
-    max_signals: MaxSignals,
-  },
-  optional: {
-    rule_name_override: RuleNameOverrideObject, // NOTE: new field
-    timestamp_override: TimestampOverrideObject, // NOTE: new field
-    timeline_template: TimelineTemplateReference, // NOTE: new field
-    building_block: BuildingBlockObject, // NOTE: new field
-  },
+export type DiffableCommonFields = z.infer<typeof DiffableCommonFields>;
+export const DiffableCommonFields = z.object({
+  // Technical fields
+  // NOTE: We might consider removing them from the schema and returning from the API
+  // not via the fields diff, but via dedicated properties in the response body.
+  rule_id: RuleSignatureId,
+  version: RuleVersion,
+
+  // Main domain fields
+  name: RuleName,
+  tags: RuleTagArray,
+  description: RuleDescription,
+  severity: Severity,
+  severity_mapping: SeverityMapping,
+  risk_score: RiskScore,
+  risk_score_mapping: RiskScoreMapping,
+
+  // About -> Advanced settings
+  references: RuleReferenceArray,
+  false_positives: RuleFalsePositiveArray,
+  threat: ThreatArray,
+  note: InvestigationGuide,
+  setup: SetupGuide,
+  related_integrations: RelatedIntegrationArray,
+  required_fields: RequiredFieldArray,
+  author: RuleAuthorArray,
+  license: RuleLicense,
+
+  // Other domain fields
+  rule_schedule: RuleSchedule, // NOTE: new field
+  exceptions_list: z.array(RuleExceptionList),
+  max_signals: MaxSignals,
+
+  // Optional fields
+  rule_name_override: RuleNameOverrideObject.optional(), // NOTE: new field
+  timestamp_override: TimestampOverrideObject.optional(), // NOTE: new field
+  timeline_template: TimelineTemplateReference.optional(), // NOTE: new field
+  building_block: BuildingBlockObject.optional(), // NOTE: new field
 });
 
-export type DiffableCustomQueryFields = t.TypeOf<typeof DiffableCustomQueryFields>;
-export const DiffableCustomQueryFields = buildSchema({
-  required: {
-    type: t.literal('query'),
-    kql_query: RuleKqlQuery, // NOTE: new field
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-    alert_suppression: AlertSuppression,
-  },
+export type DiffableCustomQueryFields = z.infer<typeof DiffableCustomQueryFields>;
+export const DiffableCustomQueryFields = z.object({
+  type: z.literal('query'),
+  kql_query: RuleKqlQuery, // NOTE: new field
+  data_source: RuleDataSource.optional(), // NOTE: new field
 });
 
-export type DiffableSavedQueryFields = t.TypeOf<typeof DiffableSavedQueryFields>;
-export const DiffableSavedQueryFields = buildSchema({
-  required: {
-    type: t.literal('saved_query'),
-    kql_query: RuleKqlQuery, // NOTE: new field
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-    alert_suppression: AlertSuppression,
-  },
+export type DiffableSavedQueryFields = z.infer<typeof DiffableSavedQueryFields>;
+export const DiffableSavedQueryFields = z.object({
+  type: z.literal('saved_query'),
+  kql_query: RuleKqlQuery, // NOTE: new field
+  data_source: RuleDataSource.optional(), // NOTE: new field
 });
 
-export type DiffableEqlFields = t.TypeOf<typeof DiffableEqlFields>;
-export const DiffableEqlFields = buildSchema({
-  required: {
-    type: t.literal('eql'),
-    eql_query: RuleEqlQuery, // NOTE: new field
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-    event_category_override: EventCategoryOverride,
-    timestamp_field: TimestampField,
-    tiebreaker_field: TiebreakerField,
-  },
+export type DiffableEqlFields = z.infer<typeof DiffableEqlFields>;
+export const DiffableEqlFields = z.object({
+  type: z.literal('eql'),
+  eql_query: RuleEqlQuery, // NOTE: new field
+  data_source: RuleDataSource.optional(), // NOTE: new field
+  event_category_override: EventCategoryOverride.optional(),
+  timestamp_field: TimestampField.optional(),
+  tiebreaker_field: TiebreakerField.optional(),
 });
 
-export type DiffableEsqlFields = t.TypeOf<typeof DiffableEsqlFields>;
-export const DiffableEsqlFields = buildSchema({
-  required: {
-    type: t.literal('esql'),
-    esql_query: RuleEsqlQuery, // NOTE: new field
-  },
-  // this is a new type of rule, no prebuilt rules created yet.
-  // new properties might be added here during further rule type development
-  optional: {},
+// this is a new type of rule, no prebuilt rules created yet.
+// new properties might be added here during further rule type development
+export type DiffableEsqlFields = z.infer<typeof DiffableEsqlFields>;
+export const DiffableEsqlFields = z.object({
+  type: z.literal('esql'),
+  esql_query: RuleEsqlQuery, // NOTE: new field
 });
 
-export type DiffableThreatMatchFields = t.TypeOf<typeof DiffableThreatMatchFields>;
-export const DiffableThreatMatchFields = buildSchema({
-  required: {
-    type: t.literal('threat_match'),
-    kql_query: RuleKqlQuery, // NOTE: new field
-    threat_query: InlineKqlQuery, // NOTE: new field
-    threat_index,
-    threat_mapping,
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-    threat_indicator_path,
-    concurrent_searches, // Should combine concurrent_searches and items_per_search?
-    items_per_search,
-  },
+export type DiffableThreatMatchFields = z.infer<typeof DiffableThreatMatchFields>;
+export const DiffableThreatMatchFields = z.object({
+  type: z.literal('threat_match'),
+  kql_query: RuleKqlQuery, // NOTE: new field
+  threat_query: InlineKqlQuery, // NOTE: new field
+  threat_index: ThreatIndex,
+  threat_mapping: ThreatMapping,
+  data_source: RuleDataSource.optional(), // NOTE: new field
+  threat_indicator_path: ThreatIndicatorPath.optional(),
+  concurrent_searches: ConcurrentSearches.optional(),
+  items_per_search: ItemsPerSearch.optional(),
 });
 
-export type DiffableThresholdFields = t.TypeOf<typeof DiffableThresholdFields>;
-export const DiffableThresholdFields = buildSchema({
-  required: {
-    type: t.literal('threshold'),
-    kql_query: RuleKqlQuery, // NOTE: new field
-    threshold: Threshold,
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-  },
+export type DiffableThresholdFields = z.infer<typeof DiffableThresholdFields>;
+export const DiffableThresholdFields = z.object({
+  type: z.literal('threshold'),
+  kql_query: RuleKqlQuery, // NOTE: new field
+  threshold: Threshold,
+  data_source: RuleDataSource.optional(), // NOTE: new field
 });
 
-export type DiffableMachineLearningFields = t.TypeOf<typeof DiffableMachineLearningFields>;
-export const DiffableMachineLearningFields = buildSchema({
-  required: {
-    type: t.literal('machine_learning'),
-    machine_learning_job_id,
-    anomaly_threshold,
-  },
-  optional: {},
+export type DiffableMachineLearningFields = z.infer<typeof DiffableMachineLearningFields>;
+export const DiffableMachineLearningFields = z.object({
+  type: z.literal('machine_learning'),
+  machine_learning_job_id: MachineLearningJobId,
+  anomaly_threshold: AnomalyThreshold,
 });
 
-export type DiffableNewTermsFields = t.TypeOf<typeof DiffableNewTermsFields>;
-export const DiffableNewTermsFields = buildSchema({
-  required: {
-    type: t.literal('new_terms'),
-    kql_query: InlineKqlQuery, // NOTE: new field
-    new_terms_fields: NewTermsFields,
-    history_window_start: HistoryWindowStart,
-  },
-  optional: {
-    data_source: RuleDataSource, // NOTE: new field
-  },
+export type DiffableNewTermsFields = z.infer<typeof DiffableNewTermsFields>;
+export const DiffableNewTermsFields = z.object({
+  type: z.literal('new_terms'),
+  kql_query: InlineKqlQuery, // NOTE: new field
+  new_terms_fields: NewTermsFields,
+  history_window_start: HistoryWindowStart,
+  data_source: RuleDataSource.optional(), // NOTE: new field
 });
 
 /**
@@ -240,10 +192,10 @@ export const DiffableNewTermsFields = buildSchema({
  * top-level fields.
  */
 
-export type DiffableRule = t.TypeOf<typeof DiffableRule>;
-export const DiffableRule = t.intersection([
+export type DiffableRule = z.infer<typeof DiffableRule>;
+const DiffableRule = z.intersection(
   DiffableCommonFields,
-  t.union([
+  z.discriminatedUnion('type', [
     DiffableCustomQueryFields,
     DiffableSavedQueryFields,
     DiffableEqlFields,
@@ -252,8 +204,8 @@ export const DiffableRule = t.intersection([
     DiffableThresholdFields,
     DiffableMachineLearningFields,
     DiffableNewTermsFields,
-  ]),
-]);
+  ])
+);
 
 /**
  * This is a merge of all fields from all rule types into a single TS type.
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff.ts
index a1b8a0ae8d104..9637faebe9c9c 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/diff/rule_diff/fields_diff.ts
@@ -7,10 +7,10 @@
 
 import type { ThreeWayDiff, ThreeWayDiffAlgorithm } from '../three_way_diff/three_way_diff';
 
-export type FieldsDiff<TObject> = {
+export type FieldsDiff<TObject> = Required<{
   [Field in keyof TObject]: ThreeWayDiff<TObject[Field]>;
-};
+}>;
 
-export type FieldsDiffAlgorithmsFor<TObject> = {
+export type FieldsDiffAlgorithmsFor<TObject> = Required<{
   [Field in keyof TObject]: ThreeWayDiffAlgorithm<TObject[Field]>;
-};
+}>;
diff --git a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/index.ts b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/index.ts
index 7e550633d8efc..8abee3cbe83a6 100644
--- a/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/index.ts
+++ b/x-pack/plugins/security_solution/common/api/detection_engine/prebuilt_rules/model/index.ts
@@ -6,7 +6,6 @@
  */
 
 export * from './aggregated_prebuilt_rules_error';
-export * from './diff/diffable_rule/build_schema';
 export * from './diff/diffable_rule/diffable_field_types';
 export * from './diff/diffable_rule/diffable_rule';
 export * from './diff/rule_diff/fields_diff';
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/actions.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/actions.schema.yaml
index 206a293715355..a64eb5c5cff3a 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/actions.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/actions.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Action State schema
       operationId: EndpointGetActionsState
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       responses:
         '200':
           description: OK
@@ -21,6 +24,9 @@ paths:
       summary: Get Running Processes Action
       operationId: EndpointGetRunningProcessesAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -40,6 +46,9 @@ paths:
       summary: Isolate host Action
       operationId: EndpointIsolateHostAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -59,6 +68,9 @@ paths:
       summary: Unisolate host Action
       operationId: EndpointUnisolateHostAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -78,6 +90,9 @@ paths:
       summary: Kill process Action
       operationId: EndpointKillProcessAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
@@ -98,6 +113,9 @@ paths:
       summary: Suspend process Action
       operationId: EndpointSuspendProcessAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/actions_status.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/actions_status.schema.yaml
index 88f911a49a714..92438f6d1a9fc 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/actions_status.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/actions_status.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Actions status schema
       operationId: EndpointGetActionsStatus
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/audit_log.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/audit_log.schema.yaml
index 7deb6dab317a8..5d0ed51ca339a 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/audit_log.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/audit_log.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get action audit log schema
       operationId: EndpointGetActionAuditLog
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/common/base.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/common/base.ts
index a5e5c060e7303..8bb76a19fa015 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/common/base.ts
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/common/base.ts
@@ -71,13 +71,3 @@ export const NoParametersRequestSchema = {
   body: schema.object({ ...BaseActionRequestSchema }),
 };
 export type BaseActionRequestBody = TypeOf<typeof NoParametersRequestSchema.body>;
-
-export const KillOrSuspendProcessRequestSchema = {
-  body: schema.object({
-    ...BaseActionRequestSchema,
-    parameters: schema.oneOf([
-      schema.object({ pid: schema.number({ min: 1 }) }),
-      schema.object({ entity_id: schema.string({ minLength: 1 }) }),
-    ]),
-  }),
-};
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/common/response_actions.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/common/response_actions.ts
index 66dc4d5828ce0..ca6d9d5e91982 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/common/response_actions.ts
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/common/response_actions.ts
@@ -7,15 +7,20 @@
 
 import type { TypeOf } from '@kbn/config-schema';
 import { schema } from '@kbn/config-schema';
-import { UploadActionRequestSchema } from '../..';
+import {
+  KillProcessRouteRequestSchema,
+  SuspendProcessRouteRequestSchema,
+  UploadActionRequestSchema,
+} from '../..';
 import { ExecuteActionRequestSchema } from '../execute_route';
 import { EndpointActionGetFileSchema } from '../get_file_route';
 import { ScanActionRequestSchema } from '../scan_route';
-import { KillOrSuspendProcessRequestSchema, NoParametersRequestSchema } from './base';
+import { NoParametersRequestSchema } from './base';
 
 export const ResponseActionBodySchema = schema.oneOf([
   NoParametersRequestSchema.body,
-  KillOrSuspendProcessRequestSchema.body,
+  KillProcessRouteRequestSchema.body,
+  SuspendProcessRouteRequestSchema.body,
   EndpointActionGetFileSchema.body,
   ExecuteActionRequestSchema.body,
   ScanActionRequestSchema.body,
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/details.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/details.schema.yaml
index 4f37c0a23c149..18a3ffa2c1fd2 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/details.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/details.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Action details schema
       operationId: EndpointGetActionsDetails
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: path
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/execute.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/execute.schema.yaml
index 1af01e1b7876b..ea9e7d7d98bf9 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/execute.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/execute.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Execute Action
       operationId: EndpointExecuteAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_download.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_download.schema.yaml
index d34aaaf2a50ab..8eb02883965b1 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_download.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_download.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: File Download schema
       operationId: EndpointFileDownload
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: path
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_info.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_info.schema.yaml
index 892c2df012cbd..5351480738e23 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_info.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_info.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: File Info schema
       operationId: EndpointFileInfo
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: path
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_upload.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_upload.schema.yaml
index e62ffee79b7e7..fa9f0da1b1203 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/file_upload.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/file_upload.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Upload Action
       operationId: EndpointUploadAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/get_file.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/get_file.schema.yaml
index 4f2fdd471bce1..d79c07556da82 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/get_file.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/get_file.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get File Action
       operationId: EndpointGetFileAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.gen.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.gen.ts
new file mode 100644
index 0000000000000..1318e25d827f8
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.gen.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Endpoint Isolate Schema
+ *   version: 2023-10-31
+ */
+
+import type { z } from 'zod';
+
+import { BaseActionSchema, SuccessResponse } from '../model/schema/common.gen';
+
+export type EndpointIsolateRedirectRequestBody = z.infer<typeof EndpointIsolateRedirectRequestBody>;
+export const EndpointIsolateRedirectRequestBody = BaseActionSchema;
+export type EndpointIsolateRedirectRequestBodyInput = z.input<
+  typeof EndpointIsolateRedirectRequestBody
+>;
+
+export type EndpointIsolateRedirectResponse = z.infer<typeof EndpointIsolateRedirectResponse>;
+export const EndpointIsolateRedirectResponse = SuccessResponse;
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.schema.yaml
new file mode 100644
index 0000000000000..4342dd85c7080
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/isolate_route.schema.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.0
+info:
+  title: Endpoint Isolate Schema
+  version: '2023-10-31'
+paths:
+  /api/endpoint/isolate:
+    post:
+      summary: Permanently redirects to a new location
+      operationId: EndpointIsolateRedirect
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '../model/schema/common.schema.yaml#/components/schemas/BaseActionSchema'
+      responses:
+        '308':
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: Permanently redirects to "/api/endpoint/action/isolate"
+              schema:
+                type: string
+                example: "/api/endpoint/action/isolate"
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common.schema.yaml#/components/schemas/SuccessResponse'
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/kill_process_route.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/kill_process_route.ts
index 8652623f93a57..f3c0d4e8f12be 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/kill_process_route.ts
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/kill_process_route.ts
@@ -5,6 +5,39 @@
  * 2.0.
  */
 
-import { KillOrSuspendProcessRequestSchema } from './common/base';
+import { schema } from '@kbn/config-schema';
+import { BaseActionRequestSchema } from './common/base';
 
-export const KillProcessRouteRequestSchema = KillOrSuspendProcessRequestSchema;
+// --------------------------------------------------
+// Tests for this module are at:
+// x-pack/plugins/security_solution/common/endpoint/schema/actions.test.ts:604
+// --------------------------------------------------
+
+export const KillProcessRouteRequestSchema = {
+  body: schema.object(
+    {
+      ...BaseActionRequestSchema,
+      parameters: schema.oneOf([
+        schema.object({ pid: schema.number({ min: 1 }) }),
+        schema.object({ entity_id: schema.string({ minLength: 1 }) }),
+
+        // Process Name currently applies only to SentinelOne (validated below)
+        schema.object({ process_name: schema.string({ minLength: 1 }) }),
+      ]),
+    },
+    {
+      validate(bodyContent) {
+        if ('process_name' in bodyContent.parameters && bodyContent.agent_type !== 'sentinel_one') {
+          return `[parameters.process_name]: is not valid with agent type of ${bodyContent.agent_type}`;
+        }
+
+        if (
+          bodyContent.agent_type === 'sentinel_one' &&
+          !('process_name' in bodyContent.parameters)
+        ) {
+          return `[parameters.process_name]: missing parameter for agent type of ${bodyContent.agent_type}`;
+        }
+      },
+    }
+  ),
+};
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/list.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/list.schema.yaml
index 71382eda8db59..afa844135ecd5 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/list.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/list.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Actions List schema
       operationId: EndpointGetActionsList
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/scan.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/scan.schema.yaml
index be953b1330218..ee7e9c1a9a4a7 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/scan.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/scan.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Scan Action
       operationId: EndpointScanAction
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/suspend_process_route.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/suspend_process_route.ts
index 71801f4b979fc..81edb01197c69 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/actions/suspend_process_route.ts
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/suspend_process_route.ts
@@ -5,6 +5,15 @@
  * 2.0.
  */
 
-import { KillOrSuspendProcessRequestSchema } from './common/base';
+import { schema } from '@kbn/config-schema';
+import { BaseActionRequestSchema } from './common/base';
 
-export const SuspendProcessRouteRequestSchema = KillOrSuspendProcessRequestSchema;
+export const SuspendProcessRouteRequestSchema = {
+  body: schema.object({
+    ...BaseActionRequestSchema,
+    parameters: schema.oneOf([
+      schema.object({ pid: schema.number({ min: 1 }) }),
+      schema.object({ entity_id: schema.string({ minLength: 1 }) }),
+    ]),
+  }),
+};
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.gen.ts b/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.gen.ts
new file mode 100644
index 0000000000000..d4c68a439c172
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.gen.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Endpoint Unisolate Schema
+ *   version: 2023-10-31
+ */
+
+import type { z } from 'zod';
+
+import { BaseActionSchema, SuccessResponse } from '../model/schema/common.gen';
+
+export type EndpointUnisolateRedirectRequestBody = z.infer<
+  typeof EndpointUnisolateRedirectRequestBody
+>;
+export const EndpointUnisolateRedirectRequestBody = BaseActionSchema;
+export type EndpointUnisolateRedirectRequestBodyInput = z.input<
+  typeof EndpointUnisolateRedirectRequestBody
+>;
+
+export type EndpointUnisolateRedirectResponse = z.infer<typeof EndpointUnisolateRedirectResponse>;
+export const EndpointUnisolateRedirectResponse = SuccessResponse;
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.schema.yaml
new file mode 100644
index 0000000000000..570854a054799
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/actions/unisolate_route.schema.yaml
@@ -0,0 +1,33 @@
+openapi: 3.0.0
+info:
+  title: Endpoint Unisolate Schema
+  version: '2023-10-31'
+paths:
+  /api/endpoint/unisolate:
+    post:
+      summary: Permanently redirects to a new location
+      operationId: EndpointUnisolateRedirect
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              $ref: '../model/schema/common.schema.yaml#/components/schemas/BaseActionSchema'
+      responses:
+        '308':
+          description: Permanent Redirect
+          headers:
+            Location:
+              description: Permanently redirects to "/api/endpoint/action/unisolate"
+              schema:
+                type: string
+                example: "/api/endpoint/action/unisolate"
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common.schema.yaml#/components/schemas/SuccessResponse'
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/metadata/metadata.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/metadata/metadata.schema.yaml
index 55a3cfc57c351..a8af6101472d3 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/metadata/metadata.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/metadata/metadata.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Metadata List schema
       operationId: GetEndpointMetadataList
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
@@ -27,6 +30,9 @@ paths:
       summary: Get Metadata Transform schema
       operationId: GetEndpointMetadataTransform
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       responses:
         '200':
           description: OK
@@ -40,6 +46,9 @@ paths:
       summary: Get Metadata schema
       operationId: GetEndpointMetadata
       x-codegen-enabled: false
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: path
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.gen.ts b/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.gen.ts
index f1dec6f3667ab..4e3885391f241 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.gen.ts
@@ -158,5 +158,10 @@ export const ProcessActionSchemas = BaseActionSchema.merge(
   })
 );
 
+export type ProtectionUpdatesNoteResponse = z.infer<typeof ProtectionUpdatesNoteResponse>;
+export const ProtectionUpdatesNoteResponse = z.object({
+  note: z.string().optional(),
+});
+
 export type SuccessResponse = z.infer<typeof SuccessResponse>;
 export const SuccessResponse = z.object({});
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.schema.yaml
index bbac984a7fb15..306bd31f4886b 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/model/schema/common.schema.yaml
@@ -171,6 +171,13 @@ components:
                     entity_id:
                       type: string
                       minLength: 1
+
+    ProtectionUpdatesNoteResponse:
+      type: object
+      properties:
+        note:
+          type: string
+
     SuccessResponse:
       type: object
       properties: {}
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/policy/policy.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/policy/policy.schema.yaml
index c054e54d99c7f..6084ae851bc17 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/policy/policy.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/policy/policy.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get Agent Policy Summary schema
       operationId: GetAgentPolicySummary
       x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
@@ -34,6 +37,9 @@ paths:
       summary: Get Policy Response schema
       operationId: GetPolicyResponse
       x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       parameters:
         - name: query
           in: query
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.gen.ts b/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.gen.ts
new file mode 100644
index 0000000000000..9867ba13e3436
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.gen.ts
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/*
+ * NOTICE: Do not edit this file manually.
+ * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
+ *
+ * info:
+ *   title: Endpoint Protection Updates Note Schema
+ *   version: 2023-10-31
+ */
+
+import { z } from 'zod';
+
+import { ProtectionUpdatesNoteResponse } from '../model/schema/common.gen';
+
+export type CreateUpdateProtectionUpdatesNoteRequestParams = z.infer<
+  typeof CreateUpdateProtectionUpdatesNoteRequestParams
+>;
+export const CreateUpdateProtectionUpdatesNoteRequestParams = z.object({
+  package_policy_id: z.string(),
+});
+export type CreateUpdateProtectionUpdatesNoteRequestParamsInput = z.input<
+  typeof CreateUpdateProtectionUpdatesNoteRequestParams
+>;
+
+export type CreateUpdateProtectionUpdatesNoteRequestBody = z.infer<
+  typeof CreateUpdateProtectionUpdatesNoteRequestBody
+>;
+export const CreateUpdateProtectionUpdatesNoteRequestBody = z.object({
+  note: z.string().optional(),
+});
+export type CreateUpdateProtectionUpdatesNoteRequestBodyInput = z.input<
+  typeof CreateUpdateProtectionUpdatesNoteRequestBody
+>;
+
+export type CreateUpdateProtectionUpdatesNoteResponse = z.infer<
+  typeof CreateUpdateProtectionUpdatesNoteResponse
+>;
+export const CreateUpdateProtectionUpdatesNoteResponse = ProtectionUpdatesNoteResponse;
+
+export type GetProtectionUpdatesNoteRequestParams = z.infer<
+  typeof GetProtectionUpdatesNoteRequestParams
+>;
+export const GetProtectionUpdatesNoteRequestParams = z.object({
+  package_policy_id: z.string(),
+});
+export type GetProtectionUpdatesNoteRequestParamsInput = z.input<
+  typeof GetProtectionUpdatesNoteRequestParams
+>;
+
+export type GetProtectionUpdatesNoteResponse = z.infer<typeof GetProtectionUpdatesNoteResponse>;
+export const GetProtectionUpdatesNoteResponse = ProtectionUpdatesNoteResponse;
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.schema.yaml
new file mode 100644
index 0000000000000..ce2760780b627
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/endpoint/protection_updates_note/protection_updates_note.schema.yaml
@@ -0,0 +1,55 @@
+openapi: 3.0.0
+info:
+  title: Endpoint Protection Updates Note Schema
+  version: '2023-10-31'
+paths:
+  /api/endpoint/protection_updates_note/{package_policy_id}:
+    get:
+      summary: Get Protection Updates Note schema
+      operationId: GetProtectionUpdatesNote
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
+      parameters:
+        - name: package_policy_id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+                $ref: '../model/schema/common.schema.yaml#/components/schemas/ProtectionUpdatesNoteResponse'
+    post:
+      summary: Create Update Protection Updates Note schema
+      operationId: CreateUpdateProtectionUpdatesNote
+      x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
+      requestBody:
+        required: true
+        content:
+          application/json:
+            schema:
+              type: object
+              properties:
+                note:
+                  type: string
+      parameters:
+        - name: package_policy_id
+          in: path
+          required: true
+          schema:
+            type: string
+      responses:
+        '200':
+          description: OK
+          content:
+            application/json:
+              schema:
+               $ref: '../model/schema/common.schema.yaml#/components/schemas/ProtectionUpdatesNoteResponse'
diff --git a/x-pack/plugins/security_solution/common/api/endpoint/suggestions/get_suggestions.schema.yaml b/x-pack/plugins/security_solution/common/api/endpoint/suggestions/get_suggestions.schema.yaml
index d6f3dc8e2f798..b7e1b0f34780e 100644
--- a/x-pack/plugins/security_solution/common/api/endpoint/suggestions/get_suggestions.schema.yaml
+++ b/x-pack/plugins/security_solution/common/api/endpoint/suggestions/get_suggestions.schema.yaml
@@ -8,6 +8,9 @@ paths:
       summary: Get suggestions
       operationId: GetEndpointSuggestions
       x-codegen-enabled: true
+      x-labels:
+        - ess
+        - serverless
       requestBody:
         required: true
         content:
diff --git a/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/index.ts b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/index.ts
index 5394f0c9cf69f..326a20d6c66a7 100644
--- a/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/index.ts
+++ b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/index.ts
@@ -9,3 +9,5 @@ export * from './common.gen';
 export * from './get_asset_criticality_status.gen';
 export * from './get_asset_criticality_privileges.gen';
 export * from './bulk_upload_asset_criticality.gen';
+export * from './list_asset_criticality.gen';
+export * from './list_asset_criticality_query_params';
diff --git a/x-pack/plugins/osquery/common/api/live_query/get_live_query_details.gen.ts b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.gen.ts
similarity index 50%
rename from x-pack/plugins/osquery/common/api/live_query/get_live_query_details.gen.ts
rename to x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.gen.ts
index 503b7f79f5a71..9cf2f7ca7c628 100644
--- a/x-pack/plugins/osquery/common/api/live_query/get_live_query_details.gen.ts
+++ b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.gen.ts
@@ -10,11 +10,18 @@
  * This file is automatically generated by the OpenAPI Generator, @kbn/openapi-generator.
  *
  * info:
- *   title: Get Live Query Details Schema
- *   version: 2023-10-31
+ *   title: Asset Criticality List Schema
+ *   version: 1
  */
 
 import { z } from 'zod';
 
-export type SuccessResponse = z.infer<typeof SuccessResponse>;
-export const SuccessResponse = z.object({});
+import { AssetCriticalityRecord } from './common.gen';
+
+export type AssetCriticalityListResponse = z.infer<typeof AssetCriticalityListResponse>;
+export const AssetCriticalityListResponse = z.object({
+  records: z.array(AssetCriticalityRecord),
+  page: z.number().int().min(1),
+  per_page: z.number().int().min(1).max(1000),
+  total: z.number().int().min(0),
+});
diff --git a/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.schema.yaml b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.schema.yaml
new file mode 100644
index 0000000000000..7c9a28c4eeaaf
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality.schema.yaml
@@ -0,0 +1,92 @@
+openapi: 3.0.0
+info:
+  version: '1'
+  title: Asset Criticality List Schema
+servers:
+  - url: 'http://{kibana_host}:{port}'
+    variables:
+      kibana_host:
+        default: localhost
+      port:
+        default: '5601'
+paths:
+  /api/asset_criticality/list:
+    post:
+      x-labels: [ess, serverless]
+      summary: List asset criticality data, filtering and sorting as needed
+      parameters:
+        - name: sort_field
+          in: query
+          required: false
+          schema:
+            type: string
+            enum:
+              - id_value
+              - id_field
+              - criticality_level
+              - \@timestamp
+          description: The field to sort by.
+        - name: sort_order
+          in: query
+          required: false
+          schema:
+            type: string
+            enum:
+              - asc
+              - desc
+          description: The order to sort by.
+        - name: page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+          description: The page number to return.
+        - name: per_page
+          in: query
+          required: false
+          schema:
+            type: integer
+            minimum: 1
+            maximum: 1000
+          description: The number of records to return per page.
+        - name: kuery
+          in: query
+          required: false
+          schema:
+            type: string
+          description: The kuery to filter by.
+      responses:
+        '200':
+          description: Bulk upload successful
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AssetCriticalityListResponse'
+
+components:
+  schemas:
+    AssetCriticalityListResponse:
+      type: object
+      properties:
+        records:
+          type: array
+          items:
+            $ref: './common.schema.yaml#/components/schemas/AssetCriticalityRecord'
+        page:
+          type: integer
+          minimum: 1
+        per_page:
+          type: integer
+          minimum: 1
+          maximum: 1000
+        total:
+          type: integer
+          minimum: 0
+      required:
+        - records
+        - page
+        - per_page
+        - total
+
+    
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality_query_params.ts b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality_query_params.ts
new file mode 100644
index 0000000000000..b70393056c48f
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/entity_analytics/asset_criticality/list_asset_criticality_query_params.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { z } from 'zod';
+
+export const ListAssetCriticalityQueryParams = z.object({
+  page: z.coerce.number().min(1).optional(),
+  per_page: z.coerce.number().min(1).max(10000).optional(),
+  sort_field: z.enum(['id_field', 'id_value', '@timestamp', 'criticality_level']).optional(),
+  sort_direction: z.enum(['asc', 'desc']).optional(),
+  kuery: z.string().optional(),
+});
+
+export type ListAssetCriticalityQueryParams = z.infer<typeof ListAssetCriticalityQueryParams>;
diff --git a/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route_schema.yaml b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route_schema.yaml
new file mode 100644
index 0000000000000..5c5a4b228339c
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/api/timeline/resolve_timeline/resolve_timeline_route_schema.yaml
@@ -0,0 +1,50 @@
+openapi: 3.0.0
+info:
+  title: Elastic Security - Timeline - Resolve Timeline API
+  version: 8.9.0
+servers:
+  - url: 'http://{kibana_host}:{port}'
+    variables:
+      kibana_host:
+        default: localhost
+      port:
+        default: '5601'
+paths:
+  /api/timeline:
+    get:
+      operationId: resolveTimeline
+      summary: Get an existing saved timeline or timeline template.
+      tags:
+        - access:securitySolution
+      parameters:
+        - in: query
+          name: template_timeline_id
+          schema:
+            type: string
+          description: The ID of the template timeline to resolve
+        - in: query
+          name: id
+          schema:
+            type: string
+          description: The ID of the timeline to resolve
+      responses:
+        '200':
+          description: The (template) timeline has been found
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  data:
+                    type: object
+                    properties:
+                      getOneTimeline:
+                        oneOf:
+                          - $ref: '../model/components.yaml#/components/schemas/TimelineResponse'
+                          - nullable: true
+                required:
+                  - data
+        '400':
+          description: The request is missing parameters
+        '404':
+          description: The (template) timeline was not found
\ No newline at end of file
diff --git a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
index feb53ffd042b7..558a9b8371068 100644
--- a/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/data_generators/endpoint_metadata_generator.ts
@@ -134,6 +134,11 @@ export class EndpointMetadataGenerator extends BaseDataGenerator {
       capabilities.push('upload_file');
     }
 
+    // v8.15 introduced `scan` capability
+    if (gte(agentVersion, '8.15.0')) {
+      capabilities.push('scan');
+    }
+
     const hostMetadataDoc: HostMetadataInterface = {
       '@timestamp': ts,
       event: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/actions.test.ts b/x-pack/plugins/security_solution/common/endpoint/schema/actions.test.ts
index 563633ed8413d..4ea9f59ea179d 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/actions.test.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/actions.test.ts
@@ -14,11 +14,13 @@ import {
 } from '../service/response_actions/constants';
 import { createHapiReadableStreamMock } from '../../../server/endpoint/services/actions/mocks';
 import type { HapiReadableStream } from '../../../server/types';
-import { EndpointActionListRequestSchema, UploadActionRequestSchema } from '../../api/endpoint';
 import {
-  KillOrSuspendProcessRequestSchema,
-  NoParametersRequestSchema,
-} from '../../api/endpoint/actions/common/base';
+  EndpointActionListRequestSchema,
+  KillProcessRouteRequestSchema,
+  SuspendProcessRouteRequestSchema,
+  UploadActionRequestSchema,
+} from '../../api/endpoint';
+import { NoParametersRequestSchema } from '../../api/endpoint/actions/common/base';
 import { ExecuteActionRequestSchema } from '../../api/endpoint/actions/execute_route';
 import { ScanActionRequestSchema } from '../../api/endpoint/actions/scan_route';
 
@@ -507,16 +509,20 @@ describe('actions schemas', () => {
     });
   });
 
-  describe('KillOrSuspendProcessRequestSchema', () => {
+  describe.each`
+    name                                  | killOrSuspendSchema
+    ${'KillProcessRouteRequestSchema'}    | ${KillProcessRouteRequestSchema}
+    ${'SuspendProcessRouteRequestSchema'} | ${SuspendProcessRouteRequestSchema}
+  `('$name', ({ name, killOrSuspendSchema }) => {
     it('should not accept when no endpoint_ids', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({});
+        killOrSuspendSchema.body.validate({});
       }).toThrow();
     });
 
     it('should not accept empty endpoint_ids array', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: [],
         });
       }).toThrow();
@@ -524,7 +530,7 @@ describe('actions schemas', () => {
 
     it('should not accept empty string as endpoint id', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: [' '],
         });
       }).toThrow();
@@ -532,7 +538,7 @@ describe('actions schemas', () => {
 
     it('should not accept any empty string in endpoint_ids array', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['x', ' ', 'y'],
         });
       }).toThrow();
@@ -540,7 +546,7 @@ describe('actions schemas', () => {
 
     it('should accept pid', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['ABC-XYZ-000'],
           parameters: {
             pid: 1234,
@@ -551,7 +557,7 @@ describe('actions schemas', () => {
 
     it('should accept entity_id', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['ABC-XYZ-000'],
           parameters: {
             entity_id: 'abc123',
@@ -562,7 +568,7 @@ describe('actions schemas', () => {
 
     it('should reject pid and entity_id together', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['ABC-XYZ-000'],
           parameters: {
             pid: 1234,
@@ -574,7 +580,7 @@ describe('actions schemas', () => {
 
     it('should reject if no pid or entity_id', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['ABC-XYZ-000'],
           comment: 'a user comment',
           parameters: {},
@@ -584,7 +590,7 @@ describe('actions schemas', () => {
 
     it('should accept a comment', () => {
       expect(() => {
-        KillOrSuspendProcessRequestSchema.body.validate({
+        killOrSuspendSchema.body.validate({
           endpoint_ids: ['ABC-XYZ-000'],
           comment: 'a user comment',
           parameters: {
@@ -595,6 +601,41 @@ describe('actions schemas', () => {
     });
   });
 
+  describe('KillProcessRequestSchema for SentinelOne', () => {
+    it('should error if agentType is not sentinel_one and process_name parameter is used', () => {
+      expect(() => {
+        KillProcessRouteRequestSchema.body.validate({
+          endpoint_ids: ['abc'],
+          parameters: {
+            process_name: 'explorer.exe',
+          },
+        });
+      }).toThrow();
+    });
+
+    it('should error if agentType is sentinel_one but process_name is not defined', () => {
+      expect(() => {
+        KillProcessRouteRequestSchema.body.validate({
+          endpoint_ids: ['abc'],
+          agent_type: 'sentinel_one',
+          parameters: { pid: 4 },
+        });
+      }).toThrow();
+    });
+
+    it('should allow use of process_name if agentType is sentinel_one', () => {
+      expect(() => {
+        KillProcessRouteRequestSchema.body.validate({
+          endpoint_ids: ['abc'],
+          agent_type: 'sentinel_one',
+          parameters: {
+            process_name: 'explorer.exe',
+          },
+        });
+      }).not.toThrow();
+    });
+  });
+
   describe('ExecuteActionRequestSchema', () => {
     it('should not accept when no endpoint_ids', () => {
       expect(() => {
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
index 447ae1f98c653..68d9dc4e83129 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/constants.ts
@@ -65,9 +65,9 @@ export type EndpointCapabilities = typeof ENDPOINT_CAPABILITIES[number];
 export const CONSOLE_RESPONSE_ACTION_COMMANDS = [
   'isolate',
   'release',
+  'processes',
   'kill-process',
   'suspend-process',
-  'processes',
   'get-file',
   'execute',
   'upload',
diff --git a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/is_response_action_supported.ts b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/is_response_action_supported.ts
index 0c0d0db960709..61216afeea1ee 100644
--- a/x-pack/plugins/security_solution/common/endpoint/service/response_actions/is_response_action_supported.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/service/response_actions/is_response_action_supported.ts
@@ -74,7 +74,7 @@ const RESPONSE_ACTIONS_SUPPORT_MAP: SupportMap = {
     },
     manual: {
       endpoint: true,
-      sentinel_one: false,
+      sentinel_one: true,
       crowdstrike: false,
     },
   },
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index 28be6f8d3d139..01da8a39ee723 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -8,12 +8,14 @@
 import type { TypeOf } from '@kbn/config-schema';
 import type { EcsError } from '@elastic/ecs';
 import type { BaseFileMetadata, FileCompression, FileJSON } from '@kbn/files-plugin/common';
-import type { ResponseActionBodySchema, UploadActionApiRequestBody } from '../../api/endpoint';
-import type { ActionStatusRequestSchema } from '../../api/endpoint/actions/action_status_route';
 import type {
-  KillOrSuspendProcessRequestSchema,
-  NoParametersRequestSchema,
-} from '../../api/endpoint/actions/common/base';
+  ResponseActionBodySchema,
+  UploadActionApiRequestBody,
+  KillProcessRouteRequestSchema,
+  SuspendProcessRouteRequestSchema,
+} from '../../api/endpoint';
+import type { ActionStatusRequestSchema } from '../../api/endpoint/actions/action_status_route';
+import type { NoParametersRequestSchema } from '../../api/endpoint/actions/common/base';
 import type {
   ResponseActionAgentType,
   ResponseActionsApiCommandNames,
@@ -178,19 +180,28 @@ export interface LogsEndpointActionResponse<
   meta?: TMeta;
 }
 
-interface ResponseActionParametersWithPid {
+export interface ResponseActionParametersWithPid {
   pid: number;
   entity_id?: never;
+  process_name?: never;
 }
 
-interface ResponseActionParametersWithEntityId {
+export interface ResponseActionParametersWithEntityId {
   pid?: never;
+  process_name?: never;
   entity_id: string;
 }
 
-export type ResponseActionParametersWithPidOrEntityId =
+export interface ResponseActionParametersWithProcessName {
+  pid?: never;
+  entity_id?: never;
+  process_name: string;
+}
+
+export type ResponseActionParametersWithProcessData =
   | ResponseActionParametersWithPid
-  | ResponseActionParametersWithEntityId;
+  | ResponseActionParametersWithEntityId
+  | ResponseActionParametersWithProcessName;
 
 export interface ResponseActionGetFileParameters {
   path: string;
@@ -207,7 +218,7 @@ export interface ResponseActionScanParameters {
 
 export type EndpointActionDataParameterTypes =
   | undefined
-  | ResponseActionParametersWithPidOrEntityId
+  | ResponseActionParametersWithProcessData
   | ResponseActionsExecuteParameters
   | ResponseActionGetFileParameters
   | ResponseActionUploadParameters
@@ -350,7 +361,12 @@ export type HostIsolationRequestBody = TypeOf<typeof NoParametersRequestSchema.b
 
 export type ResponseActionRequestBody = TypeOf<typeof ResponseActionBodySchema>;
 
-export type KillOrSuspendProcessRequestBody = TypeOf<typeof KillOrSuspendProcessRequestSchema.body>;
+export type KillProcessRequestBody = TypeOf<typeof KillProcessRouteRequestSchema.body>;
+
+export type SuspendProcessRequestBody = TypeOf<typeof SuspendProcessRouteRequestSchema.body>;
+
+/** Note: this type should almost never be used. Use instead the response action specific types above */
+export type KillOrSuspendProcessRequestBody = KillProcessRequestBody & SuspendProcessRequestBody;
 
 export interface HostIsolationResponse {
   action: string;
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/index.ts b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
index 9e02fe0f69cef..18bac96ba651e 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -1225,6 +1225,9 @@ export interface HostPolicyResponseAppliedAction {
 export type HostPolicyResponseConfiguration =
   HostPolicyResponse['Endpoint']['policy']['applied']['response']['configurations'];
 
+export type HostPolicyResponseArtifacts =
+  HostPolicyResponse['Endpoint']['policy']['applied']['artifacts'];
+
 interface HostPolicyResponseConfigurationStatus {
   status: HostPolicyResponseActionStatus;
   concerned_actions: HostPolicyActionName[];
@@ -1233,7 +1236,7 @@ interface HostPolicyResponseConfigurationStatus {
 /**
  * Host Policy Response Applied Artifact
  */
-interface HostPolicyResponseAppliedArtifact {
+export interface HostPolicyResponseAppliedArtifact {
   name: string;
   sha256: string;
 }
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/sentinel_one.ts b/x-pack/plugins/security_solution/common/endpoint/types/sentinel_one.ts
index 91a06ffc5ffca..a15557617d9f0 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/sentinel_one.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/sentinel_one.ts
@@ -115,3 +115,11 @@ export interface SentinelOneGetFileResponseMeta {
   createdAt: string;
   filename: string;
 }
+
+export interface SentinelOneKillProcessRequestMeta extends SentinelOneIsolationRequestMeta {
+  /**
+   * The Parent Task Is that is executing the kill process action in SentinelOne.
+   * Used to check on the status of that action
+   */
+  parentTaskId: string;
+}
diff --git a/x-pack/plugins/security_solution/common/entity_analytics/asset_criticality/constants.ts b/x-pack/plugins/security_solution/common/entity_analytics/asset_criticality/constants.ts
index 42be15209624c..2abc0120df67c 100644
--- a/x-pack/plugins/security_solution/common/entity_analytics/asset_criticality/constants.ts
+++ b/x-pack/plugins/security_solution/common/entity_analytics/asset_criticality/constants.ts
@@ -18,6 +18,7 @@ export const ASSET_CRITICALITY_PUBLIC_CSV_UPLOAD_URL =
   `${ASSET_CRITICALITY_PUBLIC_URL}/upload_csv` as const;
 export const ASSET_CRITICALITY_PUBLIC_BULK_UPLOAD_URL =
   `${ASSET_CRITICALITY_PUBLIC_URL}/bulk` as const;
+export const ASSET_CRITICALITY_PUBLIC_LIST_URL = `${ASSET_CRITICALITY_PUBLIC_URL}/list` as const;
 
 export const ASSET_CRITICALITY_INDEX_PATTERN = '.asset-criticality.asset-criticality-*';
 
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index 66b5f4bd948a1..1b4e23d83211b 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -81,6 +81,9 @@ export const allowedExperimentalValues = Object.freeze({
   /** Enables the `get-file` response action for SentinelOne */
   responseActionsSentinelOneGetFileEnabled: true,
 
+  /** Enables the `kill-process` response action for SentinelOne */
+  responseActionsSentinelOneKillProcessEnabled: false,
+
   /**
    * Enables the ability to send Response actions to Crowdstrike and persist the results
    * in ES.
@@ -102,11 +105,6 @@ export const allowedExperimentalValues = Object.freeze({
    */
   alertTypeEnabled: false,
 
-  /**
-   * Disables expandable flyout
-   */
-  expandableFlyoutDisabled: false,
-
   /**
    * Enables new notes
    */
@@ -129,7 +127,6 @@ export const allowedExperimentalValues = Object.freeze({
 
   /**
    * Enables the Managed User section inside the new user details flyout.
-   * To see this section you also need expandableFlyoutDisabled flag set to false.
    */
   newUserDetailsFlyoutManagedUser: false,
 
@@ -239,11 +236,6 @@ export const allowedExperimentalValues = Object.freeze({
    */
   unifiedManifestEnabled: true,
 
-  /**
-   *  Enables Security AI Assistant's Flyout mode
-   */
-  aiAssistantFlyoutMode: true,
-
   /**
    * Enables the new modal for the value list items
    */
diff --git a/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/installation_and_upgrade.md b/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/installation_and_upgrade.md
index e2f98296e199c..beda8a9517830 100644
--- a/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/installation_and_upgrade.md
+++ b/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/installation_and_upgrade.md
@@ -55,14 +55,6 @@ Status: `in progress`. The current test plan matches `Milestone 2` of the [Rule
     - [**Scenario: User can see correct rule information in preview before upgrading**](#scenario-user-can-see-correct-rule-information-in-preview-before-upgrading)
     - [**Scenario: Tabs and sections without content should be hidden in preview before upgrading**](#scenario-tabs-and-sections-without-content-should-be-hidden-in-preview-before-upgrading)
   - [Rule upgrade workflow: filtering, sorting, pagination](#rule-upgrade-workflow-filtering-sorting-pagination)
-  - [Rule upgrade workflow: simple diff algorithm](#rule-upgrade-workflow-simple-diff-algorithm)
-    - [**Scenario: Rule field doesn't have an update and has no custom value**](#scenario-rule-field-doesnt-have-an-update-and-has-no-custom-value)
-    - [**Scenario: Rule field doesn't have an update but has a custom value**](#scenario-rule-field-doesnt-have-an-update-but-has-a-custom-value)
-    - [**Scenario: Rule field has an update and doesn't have a custom value**](#scenario-rule-field-has-an-update-and-doesnt-have-a-custom-value)
-    - [**Scenario: Rule field has an update and a custom value that are the same**](#scenario-rule-field-has-an-update-and-a-custom-value-that-are-the-same)
-    - [**Scenario: Rule field has an update and a custom value that are NOT the same**](#scenario-rule-field-has-an-update-and-a-custom-value-that-are-not-the-same)
-    - [**Scenario: Rule field has an update and a custom value that are NOT the same and the rule base version doesn't exist**](#scenario-rule-field-has-an-update-and-a-custom-value-that-are-not-the-same-and-the-rule-base-version-doesnt-exist)
-    - [**Scenario: Rule field has an update and a custom value that are the same and the rule base version doesn't exist**](#scenario-rule-field-has-an-update-and-a-custom-value-that-are-the-same-and-the-rule-base-version-doesnt-exist)
   - [Rule upgrade workflow: viewing rule changes in JSON diff view](#rule-upgrade-workflow-viewing-rule-changes-in-json-diff-view)
     - [**Scenario: User can see changes in a side-by-side JSON diff view**](#scenario-user-can-see-changes-in-a-side-by-side-json-diff-view)
     - [**Scenario: User can see precisely how property values would change after upgrade**](#scenario-user-can-see-precisely-how-property-values-would-change-after-upgrade)
@@ -823,144 +815,6 @@ And the Investigation Guide tab should NOT be displayed
 
 TODO: add scenarios https://github.com/elastic/kibana/issues/166215
 
-### Rule upgrade workflow: simple diff algorithm
-
-#### **Scenario: Rule field doesn't have an update and has no custom value**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And <field_name> field is not customized by the user (current version == base version)
-And <field_name> field is not updated by Elastic in this upgrade (target version == base version)
-Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
-And <field_name> field should not be returned from the `upgrade/_review` API endpoint
-And <field_name> field should not be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | "A"          | "A"             | "A"            |
-| risk_score | 1            | 1               | 1              |
-```
-
-#### **Scenario: Rule field doesn't have an update but has a custom value**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And <field_name> field is customized by the user (current version != base version)
-And <field_name> field is not updated by Elastic in this upgrade (target version == base version)
-Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
-And <field_name> field should be returned from the `upgrade/_review` API endpoint
-And <field_name> field should be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | "A"          | "B"             | "A"            |
-| risk_score | 1            | 2               | 1              |
-```
-
-#### **Scenario: Rule field has an update and doesn't have a custom value**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And <field_name> field is not customized by the user (current version == base version)
-And <field_name> field is updated by Elastic in this upgrade (target version != base version)
-Then for <field_name> field the diff algorithm should output the target version as the merged one without a conflict
-And <field_name> field should be returned from the `upgrade/_review` API endpoint
-And <field_name> field should be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | "A"          | "A"             | "B"            |
-| risk_score | 1            | 1               | 2              |
-```
-
-#### **Scenario: Rule field has an update and a custom value that are the same**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And <field_name> field is customized by the user (current version != base version)
-And <field_name> field is updated by Elastic in this upgrade (target version != base version)
-And customized <field_name> field is the same as the Elastic update in this upgrade (current version == target version)
-Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
-And <field_name> field should be returned from the `upgrade/_review` API endpoint
-And <field_name> field should be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | "A"          | "B"             | "B"            |
-| risk_score | 1            | 2               | 2              |
-```
-
-#### **Scenario: Rule field has an update and a custom value that are NOT the same**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And <field_name> field is customized by the user (current version != base version)
-And <field_name> field is updated by Elastic in this upgrade (target version != base version)
-And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
-Then for <field_name> field the diff algorithm should output the current version as the merged one with a conflict
-And <field_name> field should be returned from the `upgrade/_review` API endpoint
-And <field_name> field should be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | "A"          | "B"             | "C"            |
-| risk_score | 1            | 2               | 3              |
-```
-
-#### **Scenario: Rule field has an update and a custom value that are NOT the same and the rule base version doesn't exist**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And the base version of the rule cannot be determined
-And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
-Then for <field_name> field the diff algorithm should output the target version as the merged one with a conflict
-And <field_name> field should be returned from the `upgrade/_review` API endpoint
-And <field_name> field should be shown in the upgrade preview UI
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | N/A          | "B"             | "C"            |
-| risk_score | N/A          | 2               | 3              |
-```
-
-#### **Scenario: Rule field has an update and a custom value that are the same and the rule base version doesn't exist**
-
-**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithm
-
-```Gherkin
-Given at least 1 prebuilt rule is installed in Kibana
-And for this rule there is a new version available
-And the base version of the rule cannot be determined
-And customized <field_name> field is the same as the Elastic update in this upgrade (current version == target version)
-Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
-And <field_name> field should not be returned from the `upgrade/_review` API endpoint
-And <field_name> field should not be shown in the upgrade preview UI
-
-
-Examples:
-| field_name | base_version | current_version | target_version |
-| name       | N/A          | "A"             | "A"            |
-| risk_score | N/A          | 1               | 1              |
-```
-
 ### Rule upgrade workflow: viewing rule changes in JSON diff view
 
 #### **Scenario: User can see changes in a side-by-side JSON diff view**
diff --git a/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/upgrade_review_algorithms.md b/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/upgrade_review_algorithms.md
new file mode 100644
index 0000000000000..fad01b9698b9b
--- /dev/null
+++ b/x-pack/plugins/security_solution/docs/testing/test_plans/detection_response/prebuilt_rules/upgrade_review_algorithms.md
@@ -0,0 +1,246 @@
+# Diff Algorithms for `upgrade/_review` Endpoint
+
+This is a test plan for the `upgrade/_review` endpoint diff algorithms that are a part of the larger prebuilt rules customization feature. These algorithms determine what fields get returned when a user makes an API request to review changes as a part of the rule update process and determine what version of those fields should be displayed by the UI.
+
+Status: `in progress`.
+
+## Table of Contents
+
+- [Useful information](#useful-information)
+  - [Tickets](#tickets)
+  - [Terminology](#terminology)
+  - [Assumptions](#assumptions)
+  - [Non-functional requirements](#non-functional-requirements)
+  - [Functional requirements](#functional-requirements)
+- [Scenarios](#scenarios)
+
+  - [Rule field doesn't have an update and has no custom value - `AAA`](#rule-field-doesnt-have-an-update-and-has-no-custom-value---aaa)
+    - [**Scenario: `AAA` - Rule field is any type**](#scenario-aaa---rule-field-is-any-type)
+  - [Rule field doesn't have an update but has a custom value - `ABA`](#rule-field-doesnt-have-an-update-but-has-a-custom-value---aba)
+    - [**Scenario: `ABA` - Rule field is any type**](#scenario-aba---rule-field-is-any-type)
+  - [Rule field has an update and doesn't have a custom value - `AAB`](#rule-field-has-an-update-and-doesnt-have-a-custom-value---aab)
+    - [**Scenario: `AAB` - Rule field is any type**](#scenario-aab---rule-field-is-any-type)
+  - [Rule field has an update and a custom value that are the same - `ABB`](#rule-field-has-an-update-and-a-custom-value-that-are-the-same---abb)
+    - [**Scenario: `ABB` - Rule field is any type**](#scenario-abb---rule-field-is-any-type)
+  - [Rule field has an update and a custom value that are NOT the same - `ABC`](#rule-field-has-an-update-and-a-custom-value-that-are-not-the-same---abc)
+    - [**Scenario: `ABC` - Rule field is a number or single line string**](#scenario-abc---rule-field-is-a-number-or-single-line-string)
+    - [**Scenario: `ABC` - Rule field is an array of scalar values**](#scenario-abc---rule-field-is-an-array-of-scalar-values)
+  - [Rule field has an update and a custom value that are the same and the rule base version doesn't exist - `-AA`](#rule-field-has-an-update-and-a-custom-value-that-are-the-same-and-the-rule-base-version-doesnt-exist----aa)
+    - [**Scenario: `-AA` - Rule field is any type**](#scenario--aa---rule-field-is-any-type)
+  - [Rule field has an update and a custom value that are NOT the same and the rule base version doesn't exist - `-BC`](#rule-field-has-an-update-and-a-custom-value-that-are-not-the-same-and-the-rule-base-version-doesnt-exist----bc)
+    - [**Scenario: `-BC` - Rule field is a number or single line string**](#scenario--bc---rule-field-is-a-number-or-single-line-string)
+    - [**Scenario: `-BC` - Rule field is an array of scalar values**](#scenario--bc---rule-field-is-an-array-of-scalar-values)
+
+## Useful information
+
+### Tickets
+
+- [Users can customize prebuilt detection rules](https://github.com/elastic/kibana/issues/174168) epic
+- [Implement single-line string diff algorithm](https://github.com/elastic/kibana/issues/180158)
+- [Implement number diff algorithm](https://github.com/elastic/kibana/issues/180160)
+- [Implement array of scalar values diff algorithm](https://github.com/elastic/kibana/issues/180162)
+
+### Terminology
+
+- **Base version**: Also labeled as `base_version`. This is the version of a rule authored by Elastic as it is installed from the `security_detection_engine` package, with no customizations to any fields by the user.
+
+- **Current version**: Also labeled as `current_version`. This is the version of the rule that the user currently has installed. Consists of the `base_version` of the rules plus all customization applies to its fields by the user.
+
+- **Target version**: Also labeled as `target_version`. This is the version of the rule that contains the update from Elastic.
+
+- **Merged version**: Also labeled as `merged_version`. This is the version of the rule that we determine via the various algorithms. It could contain a mix of all the rule versions on a per-field basis to create a singluar version of the rule containing all relevant updates and user changes to display to the user.
+
+### Assumptions
+
+- All scenarios will contain at least 1 prebuilt rule installed in Kibana.
+- A new version will be available for rule(s).
+
+## Scenarios
+
+### Rule field doesn't have an update and has no custom value - `AAA`
+
+#### **Scenario: `AAA` - Rule field is any type**
+
+**Automation**: 3 integration tests with mock rules + a set of unit tests for each algorithm
+
+```Gherkin
+Given <field_name> field is not customized by the user (current version == base version)
+And <field_name> field is not updated by Elastic in this upgrade (target version == base version)
+Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
+And <field_name> field should not be returned from the `upgrade/_review` API endpoint
+And <field_name> field should not be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version            | current_version         | target_version          | merged_version          |
+| single line string | name       | "A"                     | "A"                     | "A"                     | "A"                     |
+| number             | risk_score | 1                       | 1                       | 1                       | 1                       |
+| array of scalars   | tags       | ["one", "two", "three"] | ["one", "three", "two"] | ["three", "one", "two"] | ["one", "three", "two"] |
+```
+
+### Rule field doesn't have an update but has a custom value - `ABA`
+
+#### **Scenario: `ABA` - Rule field is any type**
+
+**Automation**: 3 integration tests with mock rules + a set of unit tests for each algorithm
+
+```Gherkin
+Given <field_name> field is customized by the user (current version != base version)
+And <field_name> field is not updated by Elastic in this upgrade (target version == base version)
+Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version            | current_version         | target_version          | merged_version          |
+| single line string | name       | "A"                     | "B"                     | "A"                     | "B"                     |
+| number             | risk_score | 1                       | 2                       | 1                       | 2                       |
+| array of scalars   | tags       | ["one", "two", "three"] | ["one", "two", "four"]  | ["one", "two", "three"] | ["one", "two", "four"]  |
+```
+
+### Rule field has an update and doesn't have a custom value - `AAB`
+
+#### **Scenario: `AAB` - Rule field is any type**
+
+**Automation**: 3 integration tests with mock rules + a set of unit tests for each algorithm
+
+```Gherkin
+Given <field_name> field is not customized by the user (current version == base version)
+And <field_name> field is updated by Elastic in this upgrade (target version != base version)
+Then for <field_name> field the diff algorithm should output the target version as the merged one without a conflict
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version            | current_version         | target_version          | merged_version          |
+| single line string | name       | "A"                     | "A"                     | "B"                     | "B"                     |
+| number             | risk_score | 1                       | 1                       | 2                       | 2                       |
+| array of scalars   | tags       | ["one", "two", "three"] | ["one", "two", "three"] | ["one", "two", "four"]  | ["one", "two", "four"]  |
+```
+
+### Rule field has an update and a custom value that are the same - `ABB`
+
+#### **Scenario: `ABB` - Rule field is any type**
+
+**Automation**: 3 integration tests with mock rules + a set of unit tests for each algorithm
+
+```Gherkin
+Given <field_name> field is customized by the user (current version != base version)
+And <field_name> field is updated by Elastic in this upgrade (target version != base version)
+And customized <field_name> field is the same as the Elastic update in this upgrade (current version == target version)
+Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version            | current_version         | target_version          | merged_version          |
+| single line string | name       | "A"                     | "B"                     | "B"                     | "B"                     |
+| number             | risk_score | 1                       | 2                       | 2                       | 2                       |
+| array of scalars   | tags       | ["one", "two", "three"] | ["one", "two", "four"]  | ["one", "two", "four"]  | ["one", "two", "four"]  |
+```
+
+### Rule field has an update and a custom value that are NOT the same - `ABC`
+
+#### **Scenario: `ABC` - Rule field is a number or single line string**
+
+**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithms
+
+```Gherkin
+Given <field_name> field is customized by the user (current version != base version)
+And <field_name> field is updated by Elastic in this upgrade (target version != base version)
+And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
+Then for <field_name> field the diff algorithm should output the current version as the merged one with a non-solvable conflict
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version | current_version | target_version  | merged_version |
+| single line string | name       | "A"          | "B"             | "C"             | "B"            |
+| number             | risk_score | 1            | 2               | 3               | 2              |
+```
+
+#### **Scenario: `ABC` - Rule field is an array of scalar values**
+
+**Automation**: 5 integration tests with mock rules + a set of unit tests for the algorithm
+
+```Gherkin
+Given <field_name> field is customized by the user (current version != base version)
+And <field_name> field is updated by Elastic in this upgrade (target version != base version)
+And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
+Then for <field_name> field the diff algorithm should output a custom merged version with a solvable conflict
+And arrays should be deduplicated before comparison
+And arrays should be compared sensitive of case
+And arrays should be compared agnostic of order
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm        | field_name | base_version                          | current_version         | target_version                   | merged_version                   |
+| array of scalars | tags       | ["one", "two", "three"]               | ["one", "two", "four"]  | ["one", "two", "five"]           | ["one", "two", "four", "five"]   |
+| array of scalars | tags       | ["one", "two", "three"]               | ["two", "one"]          | ["one", "four"]                  | ["one", "four"]                  |
+| array of scalars | tags       | ["one", "two", "three"]               | []                      | ["one", "two", "five"]           | ["five"]                         |
+| array of scalars | tags       | ["one", "two", "two"]                 | ["two", "one", "three"] | ["three", "three", "one"]        | ["one", "three"]                 |
+| array of scalars | index      | ["logs-*", "endgame-*", "endpoint-*"] | ["Logs-*", "endgame-*"] | ["logs-*", "endgame-*", "new-*"] | ["Logs-*", "endgame-*", "new-*"] |
+| array of scalars | index      | ["logs-*"]                            | ["logs-*", "Logs-*"]    | ["logs-*", "new-*"]              | ["logs-*", "Logs-*", "new-*"]    |
+```
+
+### Rule field has an update and a custom value that are the same and the rule base version doesn't exist - `-AA`
+
+#### **Scenario: `-AA` - Rule field is any type**
+
+**Automation**: 3 integration tests with mock rules + a set of unit tests for each algorithm
+
+```Gherkin
+Given at least 1 installed prebuilt rule has a new version available
+And the base version of the rule cannot be determined
+And customized <field_name> field is the same as the Elastic update in this upgrade (current version == target version)
+Then for <field_name> field the diff algorithm should output the current version as the merged one without a conflict
+And <field_name> field should not be returned from the `upgrade/_review` API endpoint
+And <field_name> field should not be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version | current_version         | target_version          | merged_version          |
+| single line string | name       | N/A          | "A"                     | "A"                     | "A"                     |
+| number             | risk_score | N/A          | 1                       | 1                       | 1                       |
+| array of scalars   | tags       | N/A          | ["one", "three", "two"] | ["three", "one", "two"] | ["one", "three", "two"] |
+```
+
+### Rule field has an update and a custom value that are NOT the same and the rule base version doesn't exist - `-BC`
+
+#### **Scenario: `-BC` - Rule field is a number or single line string**
+
+**Automation**: 2 integration tests with mock rules + a set of unit tests for the algorithms
+
+```Gherkin
+Given at least 1 installed prebuilt rule has a new version available
+And the base version of the rule cannot be determined
+And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
+Then for <field_name> field the diff algorithm should output the target version as the merged one with a solvable conflict
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+Examples:
+| algorithm          | field_name | base_version | current_version | target_version  | merged_version |
+| single line string | name       | N/A          | "B"             | "C"             | "C"            |
+| number             | risk_score | N/A          | 2               | 3               | 3              |
+```
+
+#### **Scenario: `-BC` - Rule field is an array of scalar values**
+
+**Automation**: 1 integration test with mock rules + a set of unit tests for the algorithm
+
+```Gherkin
+Given <field_name> field is customized by the user (current version != base version)
+And <field_name> field is updated by Elastic in this upgrade (target version != base version)
+And customized <field_name> field is different than the Elastic update in this upgrade (current version != target version)
+Then for <field_name> field the diff algorithm should output a custom merged version with a solvable conflict
+And arrays should be deduplicated before comparison
+And arrays should be compared sensitive of case
+And arrays should be compared agnostic of order
+And <field_name> field should be returned from the `upgrade/_review` API endpoint
+And <field_name> field should be shown in the upgrade preview UI
+
+
+Examples:
+| algorithm        | field_name | base_version | current_version        | target_version         | merged_version                 |
+| array of scalars | tags       | N/A          | ["one", "two", "four"] | ["one", "two", "five"] | ["one", "two", "four", "five"] |
+```
diff --git a/x-pack/plugins/security_solution/public/assistant/comment_actions/index.tsx b/x-pack/plugins/security_solution/public/assistant/comment_actions/index.tsx
index df961ac223c4d..baf36e278b71f 100644
--- a/x-pack/plugins/security_solution/public/assistant/comment_actions/index.tsx
+++ b/x-pack/plugins/security_solution/public/assistant/comment_actions/index.tsx
@@ -23,16 +23,15 @@ import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experime
 
 interface Props {
   message: ClientMessage;
-  isFlyoutMode: boolean;
 }
 
-const CommentActionsComponent: React.FC<Props> = ({ message, isFlyoutMode }) => {
+const CommentActionsComponent: React.FC<Props> = ({ message }) => {
   const toasts = useToasts();
   const { cases } = useKibana().services;
   const dispatch = useDispatch();
   const isModelEvaluationEnabled = useIsExperimentalFeatureEnabled('assistantModelEvaluation');
 
-  const { showAssistantOverlay, traceOptions } = useAssistantContext();
+  const { traceOptions } = useAssistantContext();
 
   const associateNote = useCallback(
     (noteId: string) => dispatch(timelineActions.addNote({ id: TimelineId.active, noteId })),
@@ -65,10 +64,6 @@ const CommentActionsComponent: React.FC<Props> = ({ message, isFlyoutMode }) =>
   });
 
   const onAddToExistingCase = useCallback(() => {
-    if (!isFlyoutMode) {
-      showAssistantOverlay({ showOverlay: false });
-    }
-
     selectCaseModal.open({
       getAttachments: () => [
         {
@@ -78,7 +73,7 @@ const CommentActionsComponent: React.FC<Props> = ({ message, isFlyoutMode }) =>
         },
       ],
     });
-  }, [content, isFlyoutMode, selectCaseModal, showAssistantOverlay]);
+  }, [content, selectCaseModal]);
 
   // Note: This feature is behind the `isModelEvaluationEnabled` FF. If ever released, this URL should be configurable
   // as APM data may not go to the same cluster where the Kibana instance is running
diff --git a/x-pack/plugins/security_solution/public/assistant/get_comments/index.test.tsx b/x-pack/plugins/security_solution/public/assistant/get_comments/index.test.tsx
index b59f14684a2ca..884af527f4be0 100644
--- a/x-pack/plugins/security_solution/public/assistant/get_comments/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/assistant/get_comments/index.test.tsx
@@ -39,7 +39,6 @@ const testProps = {
   isFetchingResponse: false,
   currentConversation,
   showAnonymizedValues,
-  isFlyoutMode: false,
 };
 describe('getComments', () => {
   it('Does not add error state message has no error', () => {
diff --git a/x-pack/plugins/security_solution/public/assistant/get_comments/index.tsx b/x-pack/plugins/security_solution/public/assistant/get_comments/index.tsx
index 10d5a15c800ae..8976c851c6e65 100644
--- a/x-pack/plugins/security_solution/public/assistant/get_comments/index.tsx
+++ b/x-pack/plugins/security_solution/public/assistant/get_comments/index.tsx
@@ -60,7 +60,6 @@ export const getComments = ({
   refetchCurrentConversation,
   regenerateMessage,
   showAnonymizedValues,
-  isFlyoutMode,
   currentUserAvatar,
   setIsStreaming,
 }: {
@@ -71,7 +70,6 @@ export const getComments = ({
   refetchCurrentConversation: () => void;
   regenerateMessage: (conversationId: string) => void;
   showAnonymizedValues: boolean;
-  isFlyoutMode: boolean;
   currentUserAvatar?: UserAvatar;
   setIsStreaming: (isStreaming: boolean) => void;
 }): EuiCommentProps[] => {
@@ -187,7 +185,7 @@ export const getComments = ({
 
       return {
         ...messageProps,
-        actions: <CommentActions message={transformedMessage} isFlyoutMode={isFlyoutMode} />,
+        actions: <CommentActions message={transformedMessage} />,
         children: (
           <StreamComment
             actionTypeId={actionTypeId}
diff --git a/x-pack/plugins/security_solution/public/assistant/overlay.tsx b/x-pack/plugins/security_solution/public/assistant/overlay.tsx
index c9d3ecda445fc..145f18875d275 100644
--- a/x-pack/plugins/security_solution/public/assistant/overlay.tsx
+++ b/x-pack/plugins/security_solution/public/assistant/overlay.tsx
@@ -11,7 +11,6 @@ import {
 } from '@kbn/elastic-assistant';
 import { useQuery } from '@tanstack/react-query';
 import type { UserAvatar } from '@kbn/elastic-assistant/impl/assistant_context';
-import { useIsExperimentalFeatureEnabled } from '../common/hooks/use_experimental_features';
 import { useKibana } from '../common/lib/kibana';
 
 export const AssistantOverlay: React.FC = () => {
@@ -31,16 +30,10 @@ export const AssistantOverlay: React.FC = () => {
   });
 
   const { assistantAvailability } = useAssistantContext();
-  const aiAssistantFlyoutMode = useIsExperimentalFeatureEnabled('aiAssistantFlyoutMode');
 
   if (!assistantAvailability.hasAssistantPrivilege) {
     return null;
   }
 
-  return (
-    <ElasticAssistantOverlay
-      isFlyoutMode={aiAssistantFlyoutMode}
-      currentUserAvatar={currentUserAvatar}
-    />
-  );
+  return <ElasticAssistantOverlay currentUserAvatar={currentUserAvatar} />;
 };
diff --git a/x-pack/plugins/security_solution/public/assistant/stack_management/management_settings.tsx b/x-pack/plugins/security_solution/public/assistant/stack_management/management_settings.tsx
index 525315ca36eb2..31f3910fdab49 100644
--- a/x-pack/plugins/security_solution/public/assistant/stack_management/management_settings.tsx
+++ b/x-pack/plugins/security_solution/public/assistant/stack_management/management_settings.tsx
@@ -16,13 +16,10 @@ import {
 } from '@kbn/elastic-assistant';
 import { useConversation } from '@kbn/elastic-assistant/impl/assistant/use_conversation';
 import type { FetchConversationsResponse } from '@kbn/elastic-assistant/impl/assistant/api';
-import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experimental_features';
 
 const defaultSelectedConversationId = WELCOME_CONVERSATION_TITLE;
 
 export const ManagementSettings = React.memo(() => {
-  const isFlyoutMode = useIsExperimentalFeatureEnabled('aiAssistantFlyoutMode');
-
   const {
     baseConversations,
     http,
@@ -49,8 +46,8 @@ export const ManagementSettings = React.memo(() => {
   const currentConversation = useMemo(
     () =>
       conversations?.[defaultSelectedConversationId] ??
-      getDefaultConversation({ cTitle: WELCOME_CONVERSATION_TITLE, isFlyoutMode }),
-    [conversations, getDefaultConversation, isFlyoutMode]
+      getDefaultConversation({ cTitle: WELCOME_CONVERSATION_TITLE }),
+    [conversations, getDefaultConversation]
   );
 
   if (conversations) {
@@ -58,7 +55,6 @@ export const ManagementSettings = React.memo(() => {
       <AssistantSettingsManagement
         conversations={conversations}
         conversationsLoaded={conversationsLoaded}
-        isFlyoutMode={isFlyoutMode}
         refetchConversations={refetchConversations}
         selectedConversation={currentConversation}
       />
diff --git a/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.test.tsx b/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.test.tsx
index 938da7f930d51..4f242cedfc92e 100644
--- a/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.test.tsx
@@ -38,7 +38,7 @@ describe('Header', () => {
       </TestProviders>
     );
 
-    const connectorSelector = screen.getByTestId('connectorSelectorPlaceholderButton');
+    const connectorSelector = screen.getByTestId('addNewConnectorButton');
 
     expect(connectorSelector).toBeInTheDocument();
   });
@@ -61,7 +61,7 @@ describe('Header', () => {
       </TestProviders>
     );
 
-    const connectorSelector = screen.queryByTestId('connectorSelectorPlaceholderButton');
+    const connectorSelector = screen.queryByTestId('addNewConnectorButton');
 
     expect(connectorSelector).not.toBeInTheDocument();
   });
diff --git a/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.tsx b/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.tsx
index 78ad8db6d2f6e..fa4a9caa3dcb1 100644
--- a/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.tsx
+++ b/x-pack/plugins/security_solution/public/attack_discovery/pages/header/index.tsx
@@ -38,7 +38,6 @@ const HeaderComponent: React.FC<Props> = ({
   onCancel,
   stats,
 }) => {
-  const isFlyoutMode = false; // always false for attack discovery
   const { hasAssistantPrivilege } = useAssistantAvailability();
   const { euiTheme } = useEuiTheme();
   const disabled = !hasAssistantPrivilege || connectorId == null;
@@ -85,7 +84,6 @@ const HeaderComponent: React.FC<Props> = ({
       {connectorsAreConfigured && (
         <EuiFlexItem grow={false}>
           <ConnectorSelectorInline
-            isFlyoutMode={isFlyoutMode}
             onConnectorSelected={noop}
             onConnectorIdSelected={onConnectorIdSelected}
             selectedConnectorId={connectorId}
diff --git a/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.test.tsx b/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.test.tsx
index 7881b4b6d5d65..91c1ec1d9b8c7 100644
--- a/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.test.tsx
@@ -38,10 +38,4 @@ describe('Welcome', () => {
 
     expect(bodyText).toHaveTextContent(FIRST_SET_UP);
   });
-
-  it('renders connector prompt', () => {
-    const connectorPrompt = screen.getByTestId('prompt');
-
-    expect(connectorPrompt).toBeInTheDocument();
-  });
 });
diff --git a/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.tsx b/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.tsx
index 3f8488f6f64b4..7ab90b524bb93 100644
--- a/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.tsx
+++ b/x-pack/plugins/security_solution/public/attack_discovery/pages/welcome/index.tsx
@@ -6,21 +6,13 @@
  */
 
 import { AssistantAvatar } from '@kbn/elastic-assistant';
-import { useConnectorSetup } from '@kbn/elastic-assistant/impl/connectorland/connector_setup';
+import { ConnectorSetup } from '@kbn/elastic-assistant/impl/connectorland/connector_setup';
 import { EuiEmptyPrompt, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiText } from '@elastic/eui';
 import React, { useMemo } from 'react';
-import { noop } from 'lodash/fp';
 
 import * as i18n from './translations';
 
 const WelcomeComponent: React.FC = () => {
-  const { prompt: connectorPrompt } = useConnectorSetup({
-    isFlyoutMode: true, // prevents the "Click to skip" button from showing
-    onConversationUpdate: async () => {},
-    onSetupComplete: noop, // this callback cannot be used to select a connector, so it's not used
-    updateConversationsOnSaveConnector: false, // no conversation to update
-  });
-
   const title = useMemo(
     () => (
       <EuiFlexGroup
@@ -70,7 +62,12 @@ const WelcomeComponent: React.FC = () => {
         <EuiEmptyPrompt body={body} title={title} />
       </EuiFlexItem>
 
-      <EuiFlexItem grow={false}>{connectorPrompt}</EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <ConnectorSetup
+          onConversationUpdate={async () => {}}
+          updateConversationsOnSaveConnector={false} // no conversation to update
+        />
+      </EuiFlexItem>
     </EuiFlexGroup>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/cases/pages/index.tsx b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
index 54ece0123738f..8609cdbd991e4 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/index.tsx
@@ -11,7 +11,6 @@ import type { CaseViewRefreshPropInterface } from '@kbn/cases-plugin/common';
 import { CaseMetricsFeature } from '@kbn/cases-plugin/common';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { CaseDetailsRefreshContext } from '../../common/components/endpoint';
-import { useIsExperimentalFeatureEnabled } from '../../common/hooks/use_experimental_features';
 import { DocumentDetailsRightPanelKey } from '../../flyout/document_details/shared/constants/panel_keys';
 import { useTourContext } from '../../common/components/guided_onboarding_tour';
 import {
@@ -58,7 +57,6 @@ const CaseContainerComponent: React.FC = () => {
     SecurityPageName.rules
   );
   const { openFlyout } = useExpandableFlyoutApi();
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
 
   const getDetectionsRuleDetailsHref = useCallback(
     (ruleId) => detectionsFormatUrl(getRuleDetailsUrl(ruleId ?? '', detectionsUrlSearch)),
@@ -69,38 +67,22 @@ const CaseContainerComponent: React.FC = () => {
 
   const showAlertDetails = useCallback(
     (alertId: string, index: string) => {
-      if (!expandableFlyoutDisabled) {
-        openFlyout({
-          right: {
-            id: DocumentDetailsRightPanelKey,
-            params: {
-              id: alertId,
-              indexName: index,
-              scopeId: TimelineId.casePage,
-            },
+      openFlyout({
+        right: {
+          id: DocumentDetailsRightPanelKey,
+          params: {
+            id: alertId,
+            indexName: index,
+            scopeId: TimelineId.casePage,
           },
-        });
-        telemetry.reportDetailsFlyoutOpened({
-          location: TimelineId.casePage,
-          panel: 'right',
-        });
-      }
-      // TODO remove when https://github.com/elastic/security-team/issues/7462 is merged
-      // support of old flyout in cases page
-      else {
-        dispatch(
-          timelineActions.toggleDetailPanel({
-            panelView: 'eventDetail',
-            id: TimelineId.casePage,
-            params: {
-              eventId: alertId,
-              indexName: index,
-            },
-          })
-        );
-      }
+        },
+      });
+      telemetry.reportDetailsFlyoutOpened({
+        location: TimelineId.casePage,
+        panel: 'right',
+      });
     },
-    [dispatch, expandableFlyoutDisabled, openFlyout, telemetry]
+    [openFlyout, telemetry]
   );
 
   const endpointDetailsHref = (endpointId: string) =>
diff --git a/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_banner_background.svg b/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_banner_background.svg
new file mode 100644
index 0000000000000..cd37f26c95f7b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_banner_background.svg
@@ -0,0 +1,329 @@
+<svg width="80" height="108" viewBox="0 0 80 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<mask id="mask0_42_84480" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="80" height="108">
+<path d="M80 6.98955e-07L0 0L8.17243e-07 108L80 108L80 6.98955e-07Z" fill="#C4C4C4"/>
+</mask>
+<g mask="url(#mask0_42_84480)">
+<path d="M64.6069 22.4096C64.4414 22.5824 64.4414 22.7552 64.4414 22.928C64.4414 22.9856 64.4414 23.0432 64.4414 23.1008C64.7724 22.8128 65.1586 22.5824 65.4897 22.2944C65.1586 22.2944 64.7724 22.1792 64.6069 22.4096Z" fill="#1BA9F5"/>
+<path d="M78.8974 13.9988C78.8422 13.8836 78.7319 13.826 78.6767 13.7684C78.0698 13.4228 77.4629 13.7684 77.4629 14.4596C77.4629 14.8052 77.5181 15.1508 77.5732 15.4964C78.125 15.266 78.6767 15.0356 79.2284 14.8628C79.1732 14.5748 79.0629 14.2868 78.8974 13.9988Z" fill="#1BA9F5"/>
+<path d="M71.9443 17.8555C71.6133 17.9707 71.1719 17.9707 71.1719 18.4891C71.1719 18.5467 71.1719 18.5467 71.1719 18.6043C71.5029 18.4315 71.7788 18.2587 72.1098 18.0859C72.0546 18.0283 71.9995 17.9707 71.9443 17.8555Z" fill="#1BA9F5"/>
+<path d="M42.9244 38.3628C42.8141 38.5356 42.8693 38.766 42.8693 38.8812C43.2003 39.2268 43.5313 39.2268 43.6417 38.9964C43.752 38.766 43.752 38.478 43.6968 38.2476C43.5313 38.0172 43.0348 38.0748 42.9244 38.3628Z" fill="#1BA9F5"/>
+<path d="M43.6957 47.8068C43.475 48.0372 43.4198 48.5556 43.6405 48.786C43.8612 49.0164 44.2474 49.0164 44.4681 48.7284C44.6888 48.4404 44.7439 48.0372 44.5232 47.8644C44.3577 47.5764 43.9715 47.5764 43.6957 47.8068Z" fill="#1BA9F5"/>
+<path d="M45.5181 43.2584C45.6836 43.028 45.7388 42.7976 45.5732 42.5672C45.1319 42.0488 44.6353 41.588 43.9181 41.3576C43.8077 41.3 43.6422 41.3576 43.587 41.3576C42.925 41.5304 42.7043 42.2216 43.1456 42.74C43.4215 43.0856 43.7525 43.316 44.1387 43.5464C44.525 43.892 45.2422 43.6616 45.5181 43.2584Z" fill="#1BA9F5"/>
+<path d="M64.4411 18.0311C64.6066 17.9159 64.3859 17.6279 64.3308 17.6279C64.2204 17.5703 64.0549 17.5127 63.9446 17.6855C63.8342 17.8583 63.8894 17.9735 63.9446 18.0311C64.1101 18.0887 64.2756 18.2039 64.4411 18.0311Z" fill="#1BA9F5"/>
+<path d="M42.3724 56.9114C42.5379 57.0266 42.7586 56.969 42.9241 57.0266C43.1448 56.681 43.0896 56.3354 42.8689 56.105C42.6482 55.9322 42.4827 56.0474 42.3172 56.2202C42.1517 56.4506 42.1517 56.7962 42.3724 56.9114Z" fill="#1BA9F5"/>
+<path d="M41.3794 49.1914C41.2139 49.4794 40.8829 49.7674 41.2139 50.1706C41.4346 50.401 41.7105 50.5162 41.9863 50.2858C42.1518 50.1706 42.2622 49.9402 42.2622 49.7674C42.2622 49.4218 41.9863 49.3066 41.3794 49.1914Z" fill="#1BA9F5"/>
+<path d="M45.0771 46.313C45.0219 45.9674 44.5254 45.6218 44.1391 45.9674C43.9736 46.0826 43.8633 46.4282 43.8633 46.6586C43.8633 46.8314 44.1391 47.0618 44.3047 47.1194C44.746 47.2346 45.1322 46.7162 45.0771 46.313Z" fill="#1BA9F5"/>
+<path d="M53.1859 34.3915C53.1307 34.5643 53.1307 34.6795 53.1859 34.7947C53.4066 34.5067 53.5721 34.2187 53.7928 33.9883C53.4618 33.9883 53.2411 34.1611 53.1859 34.3915Z" fill="#1BA9F5"/>
+<path d="M43.0888 52.2426C43.3646 52.5306 43.7508 52.5882 43.9715 52.3002C44.1922 52.0122 44.3026 51.2634 44.0819 51.033C43.7508 50.6874 43.2543 50.745 42.8681 51.0906C42.5922 51.3786 42.7026 51.8394 43.0888 52.2426Z" fill="#1BA9F5"/>
+<path d="M53.352 32.3725C53.5727 32.1421 53.5727 31.7965 53.352 31.5661C53.1313 31.3357 52.7451 31.2781 52.5244 31.5661C52.3037 31.7965 52.3037 32.2573 52.5796 32.4877C52.8003 32.6029 53.1313 32.6029 53.352 32.3725Z" fill="#1BA9F5"/>
+<path d="M55.9998 30.5865C55.7239 30.3561 55.5032 30.4713 55.2825 30.7017C55.0621 30.9897 55.0621 31.3929 55.2825 31.5657C55.3377 31.6233 55.3929 31.6233 55.5032 31.6809C55.7239 31.3929 55.9446 31.1625 56.1653 30.8745C56.1653 30.8169 56.1101 30.7017 55.9998 30.5865Z" fill="#1BA9F5"/>
+<path d="M51.6963 34.3317C52.1928 33.8709 51.917 33.2373 51.7514 32.9493C51.5859 32.6037 50.8135 32.7765 50.5376 33.2949C50.3721 33.5829 50.4273 33.8709 50.648 34.1013C50.8687 34.4469 51.4204 34.5621 51.6963 34.3317Z" fill="#1BA9F5"/>
+<path d="M48.4981 42.2216C48.8291 41.8184 48.774 40.9544 48.3878 40.724C48.1119 40.4936 47.5602 40.6664 47.3395 40.9544C47.0084 41.3576 47.0084 41.8184 47.4498 42.164C47.836 42.452 48.2774 42.5096 48.4981 42.2216Z" fill="#1BA9F5"/>
+<path d="M58.3194 26.0355C58.0987 26.2083 57.9884 26.8419 58.1539 27.0723C58.2643 27.3027 58.816 27.3603 59.0918 27.1299C59.3125 26.9571 59.3677 26.6691 59.147 26.4387C58.816 26.0355 58.4849 25.8627 58.3194 26.0355Z" fill="#1BA9F5"/>
+<path d="M61.0755 21.4276C61.3514 21.1396 61.3514 20.794 61.1307 20.5636C60.91 20.2756 60.0272 20.2756 59.8066 20.506C59.4755 20.8516 59.5307 21.2548 59.9721 21.658C60.3583 21.946 60.7445 21.8884 61.0755 21.4276Z" fill="#1BA9F5"/>
+<path d="M63.8884 16.709C63.9436 16.7666 64.0539 16.7666 64.2194 16.709C64.2194 16.8242 64.1643 16.9394 64.1643 16.997C64.2194 17.5154 64.9918 18.2642 65.4884 18.2066C65.8194 18.2066 66.1505 17.9186 66.316 17.5154C66.316 17.6306 66.3712 17.7458 66.4263 17.861C66.2608 18.2642 66.0953 18.6098 65.9849 18.9554C65.8746 19.301 66.2608 19.6466 66.5367 19.4738C66.8677 19.2434 67.3643 19.1282 67.5298 18.6098C67.4746 18.437 67.3643 18.2066 67.3091 18.0338C67.5849 17.5154 67.6401 16.997 67.3643 16.7666C67.1436 16.5938 66.9229 16.5938 66.7022 16.7666C66.5918 16.8242 66.5367 16.8818 66.4815 16.997C66.4815 16.9394 66.4815 16.9394 66.4815 16.8818C66.4263 16.3058 65.7643 15.7298 65.2677 15.7874C65.1574 15.7874 65.1022 15.845 64.9918 15.845C64.8815 15.557 64.2194 15.3842 63.9436 15.6146C63.6677 15.9602 63.6125 16.4786 63.8884 16.709Z" fill="#1BA9F5"/>
+<path d="M61.1305 24.8299C61.4064 25.0603 61.9029 25.0027 62.1236 24.7723C62.3995 24.4843 62.3995 23.5051 62.1788 23.3323C61.8478 23.1019 61.2409 23.2171 60.9098 23.6203C60.5788 24.0235 60.634 24.4267 61.1305 24.8299Z" fill="#1BA9F5"/>
+<path d="M63.3379 23.9617C63.2827 23.9041 63.1723 23.7313 63.1172 23.7889C63.0068 23.7889 62.8965 24.0193 62.8965 24.1345C62.8965 24.1921 62.8965 24.2497 62.9517 24.3073C63.062 24.1921 63.1723 24.0769 63.3379 23.9617Z" fill="#1BA9F5"/>
+<path d="M68.1919 12.3844C68.3022 12.3268 68.3022 11.9812 68.1919 11.9236C68.1367 11.8084 67.8609 11.8084 67.7505 11.866C67.6402 11.9236 67.5298 12.2692 67.585 12.3844C67.6953 12.5572 68.1367 12.442 68.1919 12.3844Z" fill="#1BA9F5"/>
+<path d="M71.2273 15.0966C71.8894 15.039 72.3307 14.5206 72.2756 13.8294C72.2204 13.2534 71.8342 12.8502 71.3928 12.9078C70.7859 12.9654 70.1238 13.6566 70.179 14.175C70.2342 14.751 70.6756 15.1542 71.2273 15.0966Z" fill="#1BA9F5"/>
+<path d="M56.0004 27.0722C56.4417 26.6114 56.4417 26.0354 55.9452 25.517C55.559 25.1138 54.9523 25.1138 54.5661 25.4594C54.1799 25.805 54.3454 26.6114 54.7868 27.0722C55.1728 27.4754 55.6141 27.4178 56.0004 27.0722Z" fill="#1BA9F5"/>
+<path d="M54.7332 17.9735C55.0091 18.1463 55.5054 17.9159 55.5054 17.5127C55.5054 17.3399 55.1194 17.1671 54.8987 16.9943C54.8436 16.9367 54.6781 16.8215 54.5677 17.0519C54.4022 17.2247 54.4574 17.8007 54.7332 17.9735Z" fill="#1BA9F5"/>
+<path d="M73.5439 8.87378C73.8198 8.93138 73.9853 8.64338 73.9853 8.41298C73.9853 8.24018 73.8198 7.77938 73.4888 7.83698C73.1577 7.89458 73.1577 8.29778 73.2129 8.47058C73.2129 8.64338 73.3784 8.81618 73.5439 8.87378Z" fill="#1BA9F5"/>
+<path d="M56.8262 23.0985C57.1021 22.8105 56.9917 22.2345 56.5503 21.8889C56.3296 21.6585 56.0538 21.7161 55.8331 21.9465C55.5021 22.2345 55.4469 22.8105 55.6676 23.0409C55.9986 23.2713 56.6055 23.3289 56.8262 23.0985Z" fill="#1BA9F5"/>
+<path d="M54.0151 29.5514C54.4013 29.1482 54.4013 28.2266 54.0151 27.8234C53.6289 27.3626 52.9117 27.4778 52.36 28.0538C51.9738 28.457 51.9738 29.0906 52.36 29.4938C52.691 29.9546 53.5738 30.0122 54.0151 29.5514Z" fill="#1BA9F5"/>
+<path d="M58.6483 21.1995C58.869 20.9691 58.869 20.3355 58.7035 20.2203C58.4828 19.9899 57.8759 20.0475 57.7104 20.3355C57.4897 20.5659 57.5449 20.9691 57.8207 21.1995C58.0414 21.3723 58.4828 21.4299 58.6483 21.1995Z" fill="#1BA9F5"/>
+<path d="M58.9781 18.8359C59.1988 18.6055 59.1988 18.2023 58.9781 18.0295C58.7574 17.7991 58.4815 17.8567 58.2609 18.0871C58.0953 18.2599 58.0953 18.5479 58.2609 18.7207C58.4815 18.9511 58.8126 19.0087 58.9781 18.8359Z" fill="#1BA9F5"/>
+<path d="M58.2622 22.9259C58.1518 22.9259 57.9863 23.2715 57.9863 23.4443C57.9863 23.6171 58.0967 23.8475 58.2622 23.9627C58.3725 24.0203 58.6484 23.9627 58.7587 23.8475C59.0346 23.6747 59.2001 23.4443 59.4208 23.1563C59.5863 22.9835 59.5312 22.7531 59.3105 22.5803C59.2553 22.5803 59.0898 22.5227 59.0346 22.5803C58.8139 22.8683 58.5381 22.8683 58.2622 22.9259Z" fill="#1BA9F5"/>
+<path d="M76.1945 11.8086C76.4152 11.6934 76.36 10.7718 76.029 10.7142C75.7531 10.6566 75.4221 10.8294 75.3669 11.1174C75.2566 11.463 75.9738 11.9238 76.1945 11.8086Z" fill="#1BA9F5"/>
+<path d="M79.1703 7.78097C79.2806 7.55057 79.0047 6.85938 78.7289 6.85938C78.2875 6.85938 78.0116 7.03217 78.122 7.55057C78.2323 8.06897 79.0599 8.01137 79.1703 7.78097Z" fill="#1BA9F5"/>
+<path d="M75.4217 15.1515C75.6975 15.1515 75.8631 14.5755 75.6424 14.1147C75.4217 13.7115 74.8699 13.9419 74.7044 14.1147C74.4837 14.2875 75.1458 15.1515 75.4217 15.1515Z" fill="#1BA9F5"/>
+<path d="M77.7368 12.9619C77.792 12.8467 77.792 12.6163 77.6816 12.5587C77.5713 12.5011 77.3506 12.6163 77.2954 12.6739C77.2402 12.7315 77.1851 13.0771 77.3506 13.1923C77.4609 13.2499 77.6816 13.0771 77.7368 12.9619Z" fill="#1BA9F5"/>
+<path d="M79.9448 3.97636C80.2207 3.91876 80.1655 3.63075 80.1655 3.51555C80.1655 3.40035 79.9448 3.28516 79.8345 3.28516C79.7241 3.34276 79.5586 3.51556 79.5586 3.57316C79.6138 3.74596 79.6689 4.03396 79.9448 3.97636Z" fill="#1BA9F5"/>
+<path d="M79.7793 11.349C79.7793 11.8098 80 12.0978 80.2758 11.9826C80.4965 11.8674 80.7172 11.6946 80.7724 11.4642C80.8276 11.2338 80.4414 10.8882 80.1655 11.0034C80 11.061 79.8345 11.2914 79.7793 11.349Z" fill="#1BA9F5"/>
+<path d="M48.1649 20.9673C48.2752 20.8521 48.22 20.6217 48.1649 20.5641C48.1097 20.5065 47.7787 20.3337 47.6683 20.4489C47.558 20.5641 47.6683 20.9097 47.7235 20.9673C47.8338 20.9673 48.0545 21.0825 48.1649 20.9673Z" fill="#1BA9F5"/>
+<path d="M38.1258 33.3518C38.2913 33.1214 38.0706 32.9486 38.0155 32.891C37.9603 32.8334 37.6844 32.891 37.6293 32.9486C37.5741 33.0638 37.5741 33.2942 37.6293 33.3518C37.7396 33.4094 37.9603 33.5246 38.1258 33.3518Z" fill="#1BA9F5"/>
+<path d="M39.1723 37.2124C39.6136 37.558 40.1654 36.8668 40.055 36.6364C39.9447 36.406 39.3378 36.0604 39.1171 36.2908C38.7861 36.5788 38.6757 36.9244 39.1723 37.2124Z" fill="#1BA9F5"/>
+<path d="M36.1387 41.4162C36.249 41.5314 36.5249 41.5314 36.6904 41.4162C36.9111 41.2434 36.9111 40.9554 36.6904 40.7826C36.5801 40.6674 36.1938 40.437 35.918 40.725C35.6973 41.0706 36.0283 41.3586 36.1387 41.4162Z" fill="#1BA9F5"/>
+<path d="M40.8809 44.5266C40.8809 44.757 41.9291 44.9298 42.0947 44.757C42.3153 44.5842 42.0395 44.0082 41.5981 43.893C41.1567 43.6626 40.8809 44.2386 40.8809 44.5266Z" fill="#1BA9F5"/>
+<path d="M35.0356 47.8104C35.0356 47.6952 34.87 47.4648 34.7597 47.4648C34.6493 47.4648 34.4287 47.58 34.3735 47.7528C34.3183 47.868 34.4287 48.2136 34.5942 48.2712C34.7597 48.2712 35.0356 47.9256 35.0356 47.8104Z" fill="#1BA9F5"/>
+<path d="M41.3779 36.1152C41.5986 35.9424 41.3779 35.5968 41.2676 35.4816C41.1572 35.3664 40.9365 35.2513 40.771 35.4241C40.6055 35.5969 40.7158 35.8273 40.771 35.9425C40.8814 36.1153 41.1572 36.3456 41.3779 36.1152Z" fill="#1BA9F5"/>
+<path d="M40.7723 55.5298C40.8826 55.4146 40.8275 55.1842 40.7723 55.1266C40.7171 55.069 40.3861 54.8962 40.2757 55.0114C40.1654 55.1266 40.2757 55.4722 40.3309 55.5298C40.4412 55.5874 40.6619 55.645 40.7723 55.5298Z" fill="#1BA9F5"/>
+<path d="M40.4964 41.7659C40.5515 41.4779 39.9998 40.9019 39.6688 41.0747C39.4481 41.1899 39.2826 41.6507 39.4481 41.8235C39.6136 42.1115 40.4412 41.9963 40.4964 41.7659Z" fill="#1BA9F5"/>
+<path d="M42.2085 41.9331C42.374 41.9331 42.4292 41.5875 42.374 41.4723C42.3188 41.3571 42.2085 41.1843 42.043 41.2419C41.8774 41.2995 41.8223 41.4723 41.8223 41.6451C41.8774 41.7027 42.043 41.9907 42.2085 41.9331Z" fill="#1BA9F5"/>
+<path d="M38.7299 59.8517C38.6747 59.9093 38.7299 60.1397 38.7851 60.2549C38.8402 60.3125 39.0609 60.4277 39.1713 60.3125C39.2816 60.1973 39.1161 59.9093 39.0609 59.8517C39.0057 59.7941 38.7851 59.7365 38.7299 59.8517Z" fill="#1BA9F5"/>
+<path d="M37.7387 45.9662C37.2973 46.427 37.2973 47.4062 37.6835 47.7518C38.0697 48.0974 38.6766 48.0398 39.0628 47.6366C39.5042 47.1182 39.5042 46.3694 39.0076 45.9662C38.5663 45.6206 38.0145 45.6206 37.7387 45.9662Z" fill="#1BA9F5"/>
+<path d="M35.143 52.4194C34.7016 52.9378 34.7016 53.6866 35.0878 54.0322C35.474 54.3778 36.5223 54.3202 36.8533 53.9746C37.2395 53.5714 37.1843 52.765 36.6878 52.3618C36.3568 52.0162 35.474 52.0162 35.143 52.4194Z" fill="#1BA9F5"/>
+<path d="M45.2968 39.3975C45.4623 39.1671 45.4623 38.8215 45.2416 38.7063C45.0761 38.5911 44.8002 38.5335 44.6347 38.6487C44.4692 38.7063 44.3036 39.2823 44.5243 39.5127C44.745 39.6855 45.0761 39.6855 45.2968 39.3975Z" fill="#1BA9F5"/>
+<path d="M47.834 35.8884C47.5581 36.0036 46.9512 35.8308 46.565 35.946C45.9581 36.1188 45.5167 36.5796 45.7374 37.2132C46.0133 37.962 46.565 38.1348 47.1719 37.962C47.9995 37.674 47.5581 36.8676 48.165 36.8676C48.7719 36.8676 48.4409 37.4436 49.2684 37.4436C50.096 37.4436 50.5374 36.6948 50.2615 36.1764C49.9305 35.658 49.434 35.7732 49.3788 35.6004C49.3236 35.4276 49.3236 34.8516 48.8822 34.8516C47.8891 34.9092 48.1098 35.7732 47.834 35.8884Z" fill="#1BA9F5"/>
+<path d="M47.9449 28.4586C47.7794 28.2282 47.338 28.2858 47.2276 28.5738C47.1725 28.7466 47.2276 28.977 47.2276 29.0346C47.5587 29.3226 47.8897 29.265 48.0001 29.0346C48.0552 28.9194 48.0001 28.6314 47.9449 28.4586Z" fill="#1BA9F5"/>
+<path d="M43.6957 26.7274C43.8612 26.5546 43.7509 25.9786 43.5302 25.7482C43.3095 25.5178 42.9233 25.5178 42.7026 25.8058C42.4819 26.0938 42.4819 26.3818 42.7026 26.6122C42.9785 26.9002 43.5302 26.9578 43.6957 26.7274Z" fill="#1BA9F5"/>
+<path d="M49.5453 31.3363C49.766 31.5667 50.4833 31.4515 50.704 31.1635C50.8695 30.9331 50.8695 30.4147 50.704 30.2419C50.2626 29.8387 49.7109 29.7235 49.435 30.0115C49.2143 30.2995 49.2695 31.0483 49.5453 31.3363Z" fill="#1BA9F5"/>
+<path d="M49.599 21.7188C49.7093 21.6036 49.5438 21.3156 49.4887 21.258C49.4335 21.2004 49.2128 21.2004 49.1576 21.258C49.1024 21.3156 49.1576 21.546 49.2128 21.6612C49.2128 21.7188 49.4887 21.834 49.599 21.7188Z" fill="#1BA9F5"/>
+<path d="M48.4951 28.4012C48.771 28.574 49.102 28.3436 49.2676 28.1708C49.4883 27.998 49.3227 27.71 49.1572 27.5372C48.9365 27.3644 48.6055 27.3644 48.4951 27.5948C48.3848 27.8252 48.1641 28.2284 48.4951 28.4012Z" fill="#1BA9F5"/>
+<path d="M43.973 32.1428C43.9178 32.1428 43.9178 32.3156 43.973 32.3156C44.0282 32.3732 44.1385 32.4308 44.1937 32.3732C44.2489 32.3156 44.1937 32.258 44.1937 32.1428C44.1385 32.1428 44.0282 32.0852 43.973 32.1428Z" fill="#1BA9F5"/>
+<path d="M47.8868 26.6732C48.2179 26.4428 48.2731 25.8668 48.0524 25.6364C47.8317 25.406 47.3351 25.3484 47.1144 25.6364C46.8937 25.8668 47.0041 26.3852 47.3903 26.7884C47.5006 26.7308 47.7765 26.7884 47.8868 26.6732Z" fill="#1BA9F5"/>
+<path d="M51.7523 26.669C52.0833 26.2082 52.0281 25.4594 51.6419 25.0562C51.4212 24.8258 50.8143 24.941 50.5937 25.229C50.2074 25.6898 50.2074 26.2082 50.6488 26.6114C50.9799 26.957 51.5316 26.957 51.7523 26.669Z" fill="#1BA9F5"/>
+<path d="M43.0898 30.8186C43.0898 31.2218 43.145 31.2794 43.3657 31.4522C43.5864 31.625 43.7519 31.625 43.8623 31.625C43.9174 31.337 44.3036 30.9338 44.0829 30.7034C43.8623 30.4154 43.4209 30.6458 43.145 30.6458C43.145 30.7034 43.0898 30.761 43.0898 30.8186Z" fill="#1BA9F5"/>
+<path d="M47.0624 31.9642C47.2279 32.0794 47.6693 32.3098 47.8348 32.0794C48.0003 31.849 47.7797 31.3882 47.6693 31.2154C47.4486 30.985 47.1728 31.1002 46.9521 31.3306C46.7314 31.6186 46.8969 31.849 47.0624 31.9642Z" fill="#1BA9F5"/>
+<path d="M46.3992 34.2748C46.7302 33.9292 46.7302 33.4684 46.4544 33.1804C46.0682 32.8348 45.4061 32.7772 45.1854 33.1228C44.9096 33.4684 44.9096 34.1596 45.1854 34.5052C45.4061 34.7356 46.0682 34.6204 46.3992 34.2748Z" fill="#1BA9F5"/>
+<path d="M230.786 161.34L46.1793 161.34C20.6897 161.34 5.66186e-07 139.74 3.64817e-07 113.129C1.63449e-07 86.518 20.6897 64.918 46.1793 64.918L230.786 64.918C256.276 64.918 276.966 86.518 276.966 113.129C276.966 139.74 256.276 161.34 230.786 161.34Z" fill="#E7EBF1"/>
+<path d="M30.8426 78.6289C30.3461 78.6289 29.9598 78.8593 30.015 79.2625C30.015 79.6081 30.6219 80.2993 30.8978 80.2993C31.3392 80.2993 31.615 79.9537 31.615 79.4353C31.6702 78.8017 31.4495 78.6289 30.8426 78.6289Z" fill="#CAD0E2"/>
+<path d="M42.3723 68.8917C42.0413 68.9493 41.9861 69.4101 41.9309 69.6405C41.8758 69.9285 42.1516 70.0437 42.4275 69.9861C42.7033 69.9861 42.9792 69.6981 42.8689 69.4677C42.8137 69.2949 42.7033 68.8341 42.3723 68.8917Z" fill="#CAD0E2"/>
+<path d="M37.793 80.4691C37.793 80.7571 37.9585 80.8723 38.2343 80.8147C38.2895 80.7571 38.3999 80.6995 38.3999 80.5843C38.3999 80.2387 38.6206 80.0659 38.7861 79.8355C38.8412 79.7203 38.7861 79.3747 38.6757 79.2595C38.6206 79.2019 38.5102 79.1443 38.455 79.0867C38.5654 78.9715 38.6757 78.8563 38.7309 78.7987C38.6757 78.3955 38.3447 78.2227 38.0688 78.2803C37.793 78.3379 37.793 78.5683 37.793 78.7987C37.793 78.9715 37.9033 79.0867 38.0137 79.2019C37.9585 79.3171 37.8481 79.4323 37.8481 79.5475C37.793 79.8355 37.793 80.1811 37.793 80.4691Z" fill="#CAD0E2"/>
+<path d="M53.1855 69.065C53.5165 69.065 53.682 68.777 53.682 68.4314C53.682 67.9706 53.2958 67.625 52.9648 67.625C52.6338 67.625 52.3027 67.9706 52.3027 68.3162C52.3027 68.6618 52.7993 69.065 53.1855 69.065Z" fill="#CAD0E2"/>
+<path d="M43.1995 67.8573C43.1443 67.6845 42.9788 67.5693 42.9236 67.5117C42.4822 67.5693 42.2615 67.7997 42.3719 68.0877C42.427 68.2605 42.5926 68.4333 42.7581 68.4909C42.9788 68.4909 43.2546 68.0877 43.1995 67.8573Z" fill="#CAD0E2"/>
+<path d="M34.1509 73.9051C33.9854 73.5019 33.6544 73.5019 33.3234 73.6171C33.1027 74.0779 33.1578 74.3659 33.5992 74.6539C33.9302 74.5387 34.3165 74.3659 34.1509 73.9051Z" fill="#CAD0E2"/>
+<path d="M38.2334 83.6953C38.5644 83.6953 39.2265 83.1193 39.2265 82.8313C39.2265 82.3705 38.8954 82.0825 38.3437 82.1401C37.9023 82.1401 37.6816 82.4857 37.6816 83.0617C37.7368 83.4073 37.9023 83.6377 38.2334 83.6953Z" fill="#CAD0E2"/>
+<path d="M33.2694 71.4844C32.9384 71.4844 32.6625 71.83 32.6625 72.118C32.5522 72.0028 32.4419 71.9452 32.2763 71.9452C31.9453 71.9452 31.7246 72.118 31.7246 72.4636C31.7246 72.8092 31.9453 73.1548 32.2763 73.1548C32.6074 73.1548 32.8281 72.8668 32.8281 72.5212C32.8281 72.5212 32.8281 72.5212 32.8281 72.4636C32.9384 72.6364 33.1591 72.7516 33.3246 72.7516C33.6556 72.7516 33.8763 72.406 33.8212 72.0604C33.8763 71.7724 33.6005 71.4844 33.2694 71.4844Z" fill="#CAD0E2"/>
+<path d="M32.8295 69.3516C32.4433 69.3516 32.0571 69.7548 31.8915 70.158C31.7812 70.2732 31.6708 70.3884 31.6708 70.5612C31.6157 70.7916 31.7812 71.0796 32.0019 71.2524C32.1122 71.3676 32.4433 71.31 32.6088 71.2524C32.664 71.2524 32.7191 71.2524 32.7743 71.2524C33.326 71.1948 33.6019 70.9068 33.5467 70.2732C33.4915 69.8124 33.1605 69.3516 32.8295 69.3516Z" fill="#CAD0E2"/>
+<path d="M62.0137 70.6204C62.0688 70.966 62.455 71.254 62.7309 71.1964C63.0068 71.1388 63.2275 70.9084 63.2275 70.5628C63.1723 70.1596 62.8964 69.8716 62.5654 69.9292C62.2895 69.9292 62.0137 70.2748 62.0137 70.6204Z" fill="#CAD0E2"/>
+<path d="M32.2197 76.4963C32.2749 76.7267 32.7163 77.0147 33.0473 76.9571C33.3232 76.8995 33.4335 76.6691 33.3783 76.3235C33.268 75.9203 33.1576 75.6899 32.9921 75.5747C33.1576 75.5171 33.268 75.3443 33.3232 75.1139C33.3232 74.9411 33.268 74.7107 33.1576 74.5379C32.8818 74.3075 32.6611 74.3651 32.1094 74.8259C32.2197 75.1715 32.2197 75.5747 32.6611 75.6323C32.4404 75.8627 32.2197 76.2659 32.2197 76.4963Z" fill="#CAD0E2"/>
+<path d="M28.6901 69.2349C28.6349 69.5805 28.8556 69.9261 29.1866 69.9837C28.9659 70.0413 28.7453 70.0989 28.5246 70.0413C28.359 70.0413 28.1384 70.2141 28.028 70.3869C27.8625 70.6749 27.697 70.8477 27.4763 71.1357C27.2004 71.4813 27.2556 71.9421 27.5315 72.1725C27.9177 72.5181 28.2487 72.5757 28.5797 72.1725C28.5797 72.1725 28.5797 72.1725 28.6349 72.1149C28.8556 72.0573 29.2418 71.7117 29.4073 71.4813L29.4625 71.4813C29.7384 71.5389 30.0142 71.4237 30.1246 71.1357C30.2901 70.7901 30.1797 70.5021 30.0142 70.1565C29.9039 69.9837 29.7384 69.8685 29.5728 69.8685C29.7935 69.6957 29.959 69.4077 29.9039 69.1197C29.9039 69.0621 29.9039 69.0045 29.8487 69.0045C29.9039 69.0045 29.9039 69.0045 29.959 69.0045C30.4004 68.8893 30.6763 68.1981 30.6211 67.7373C30.6211 67.7373 30.6211 67.7373 30.6211 67.6797C29.7384 68.0253 28.8556 68.3709 27.9728 68.7741C28.0832 69.0621 28.359 69.2349 28.6901 69.2349Z" fill="#CAD0E2"/>
+<path d="M40.6629 65.4344C40.4974 65.492 40.3871 65.6072 40.3871 65.78C40.3871 65.9528 40.5526 66.0681 40.7181 66.1257L40.7181 66.1832C40.2767 66.068 39.5595 66.2408 39.2836 66.5864C39.0629 66.8744 39.0629 67.3352 39.2284 67.6808C39.0078 67.8536 38.8422 68.1993 38.8974 68.4297C38.8974 68.7177 39.2284 69.1208 39.5043 69.1208C39.6147 69.1208 39.725 69.1208 39.8353 69.0632C39.8353 69.3512 40.1112 69.5241 40.3871 69.5817C40.7733 69.2937 40.8284 68.948 40.5526 68.66C40.8284 68.3144 41.1043 68.0264 41.2698 67.7384C41.4353 67.4504 41.325 66.932 41.1595 66.5864C41.3802 66.7016 41.6009 66.7016 41.9319 66.644C42.7595 66.4712 42.9802 66.1832 42.925 65.4344C42.925 65.2616 42.8698 65.1465 42.8147 65.0313C42.0974 65.0889 41.3802 65.1465 40.7181 65.2617C40.7181 65.3193 40.6629 65.3768 40.6629 65.4344Z" fill="#CAD0E2"/>
+<path d="M30.895 90.8945C30.7295 90.8945 30.6191 91.1825 30.6191 91.2401C30.6191 91.3553 30.6191 91.5857 30.8398 91.5857C31.0605 91.5857 31.0605 91.4129 31.0605 91.3553C31.0605 91.2401 31.0605 90.9521 30.895 90.8945Z" fill="#CAD0E2"/>
+<path d="M20.3045 96.5408C20.3597 96.1376 19.9183 95.792 19.3666 95.7344C19.0907 95.7344 18.7597 96.0224 18.7045 96.368C18.6493 96.7712 19.0356 97.232 19.3666 97.2896C19.808 97.2896 20.2493 96.8864 20.3045 96.5408Z" fill="#CAD0E2"/>
+<path d="M37.3512 69.4659C37.3512 69.1203 37.0201 68.8323 36.7443 68.8323C36.6339 68.8323 36.5236 68.8899 36.4132 68.9475C36.3581 68.6595 36.2477 68.3715 36.0822 68.1411C35.8615 67.7955 35.365 67.6803 34.9787 67.7955C34.9787 67.7379 34.9236 67.7379 34.9236 67.6803C35.0339 67.5075 35.0891 67.2771 35.0339 67.1043C34.9787 66.8739 34.8684 66.7011 34.6477 66.5859C34.6477 66.5283 34.6477 66.4131 34.5925 66.3555C33.2684 66.7011 31.9994 67.1043 30.7305 67.6227C30.896 67.9107 31.227 68.1987 31.6684 68.0835C32.0546 67.9107 32.3856 67.5651 32.6063 67.6227C32.827 67.6227 33.1029 67.7379 33.0477 68.0835C32.9925 68.4291 33.2684 68.8899 33.9856 68.9475C34.096 68.9475 34.2063 68.9475 34.2615 68.9475C34.2615 69.3507 34.427 69.6963 34.6477 70.0419C34.7581 70.1571 34.8132 70.3875 34.8132 70.5027C34.8132 71.0211 34.9787 71.3091 35.365 71.4243C35.3098 71.4243 35.3098 71.4243 35.2546 71.4243C34.9236 71.4243 34.7029 71.7123 34.7581 72.0579C34.8132 72.4035 35.0891 72.6915 35.4201 72.6339C35.7512 72.5763 35.8615 72.3459 35.8615 72.0579C35.8615 72.0003 35.8615 71.9427 35.8063 71.8851C35.9718 72.0579 36.1925 72.1731 36.4684 72.1155C36.9098 72.0579 37.1856 71.7123 37.1305 71.3667C37.0753 71.0211 36.7994 70.7907 36.4132 70.8483C36.4684 70.6755 36.4684 70.4451 36.3581 70.2147C36.3029 70.0419 36.2477 69.9267 36.2477 69.7539C36.3581 69.8691 36.4684 69.9843 36.6339 69.9843C37.0753 70.0995 37.3512 69.8115 37.3512 69.4659ZM35.7512 71.7123C35.696 71.5971 35.5856 71.5395 35.5305 71.4819C35.6408 71.4819 35.696 71.4819 35.8063 71.4819C35.7512 71.5395 35.696 71.6547 35.7512 71.7123Z" fill="#CAD0E2"/>
+<path d="M19.201 101.088C18.9251 101.203 18.8148 101.549 18.9251 101.837C19.0906 102.183 19.4768 102.355 19.7527 102.183C20.0285 102.067 20.1389 101.607 20.0285 101.319C19.863 101.088 19.4768 100.973 19.201 101.088Z" fill="#CAD0E2"/>
+<path d="M44.3592 81.849C44.4695 81.9642 44.8557 81.849 45.1316 81.7914C45.1868 81.7914 45.3523 81.7338 45.3523 81.5034C45.3523 81.273 44.9109 80.8698 44.5799 80.9274C44.304 81.0426 44.0833 81.561 44.3592 81.849Z" fill="#CAD0E2"/>
+<path d="M31.6143 87.3801C31.7798 86.9193 31.4488 86.3433 31.0074 86.2281C30.566 86.1129 30.3454 86.3433 30.0695 86.1705C29.7936 85.9977 29.5729 86.1705 29.4074 86.4585C29.2419 86.7465 28.9109 87.2073 29.2971 87.4953C29.6833 87.7833 29.9591 87.5529 30.0143 87.4377C30.0695 87.3225 30.4005 87.2073 30.3454 87.3801C30.2902 87.5529 30.4557 87.7257 30.8419 87.8409C31.1729 87.8985 31.4488 87.7833 31.6143 87.3801Z" fill="#CAD0E2"/>
+<path d="M12.4139 90.7795C12.8002 90.5491 12.745 90.0883 12.745 89.7427C12.745 89.7427 12.745 89.7427 12.6898 89.7427C12.6346 89.6851 12.5795 89.6851 12.5243 89.6851C12.0277 89.4547 11.7519 89.5123 11.5864 89.8003C11.5312 89.8579 11.5312 89.9731 11.476 90.0307C10.6484 89.9155 10.3174 90.3763 10.5381 91.4707C10.4829 91.5283 10.4277 91.5859 10.3726 91.6435C10.0967 91.8163 10.0967 92.0467 10.1519 92.3347C10.207 92.6227 10.4277 92.7379 10.6484 92.7379C10.8139 92.7955 10.9243 92.7955 11.0346 92.7955C11.2002 92.9683 11.476 92.9683 11.6967 92.7955C11.9174 92.6227 12.1933 92.4499 12.0829 92.1619C11.9726 91.9315 11.807 91.7587 11.6415 91.7011C11.6967 91.3555 11.7519 91.0675 11.7519 90.7219C12.0277 90.8371 12.2484 90.8947 12.4139 90.7795Z" fill="#CAD0E2"/>
+<path d="M7.22568 103.336C6.94982 103.394 6.67396 104.027 6.89465 104.258C7.06017 104.43 7.44637 104.43 7.61189 104.258C7.83258 104.027 7.50155 103.336 7.22568 103.336Z" fill="#CAD0E2"/>
+<path d="M6.62049 99.4755C6.62049 99.1299 6.45497 98.9571 6.17911 98.8995C5.68256 98.7843 5.57221 99.1875 5.40669 99.5331C5.18601 99.4755 4.96532 99.4755 4.7998 99.4179C4.85497 99.1299 4.85497 98.8419 4.91014 98.5539C4.74463 98.3811 4.57911 98.2659 4.35842 98.1507C4.08256 98.0355 3.42049 98.1507 3.25497 98.3811C3.08945 98.3235 2.86876 98.3811 2.75842 98.4387C2.64807 98.6115 2.70325 98.8995 2.70325 99.0723C2.97911 99.3027 3.14463 99.3027 3.31014 99.1875C3.36532 99.3027 3.42049 99.4179 3.53083 99.5331C3.64118 99.6483 3.75152 99.7635 3.86187 99.8787C3.75152 100.282 3.64118 100.685 3.80669 101.031C3.75152 101.088 3.64118 101.146 3.58601 101.203C3.25497 101.491 3.1998 102.355 3.53083 102.643C3.86187 102.931 4.74463 102.931 5.07566 102.355C5.29635 102.01 5.29635 101.722 5.24118 101.434C5.29635 101.434 5.35152 101.376 5.40669 101.376C6.01359 101.146 6.01359 100.627 5.95842 100.051C6.17911 99.9939 6.62049 100.051 6.62049 99.4755Z" fill="#CAD0E2"/>
+<path d="M26.9781 79.5481C27.1436 79.4329 27.0333 79.0297 26.9781 78.9145C26.9229 78.7993 26.5919 78.7993 26.5367 78.9145C26.4264 78.9721 26.4264 79.2601 26.4816 79.3753C26.4816 79.4905 26.8126 79.6633 26.9781 79.5481Z" fill="#CAD0E2"/>
+<path d="M4.80058 105.584C4.46955 105.354 3.97299 105.411 3.69713 105.814C3.42127 106.16 3.42127 106.506 3.69713 106.736C3.53161 106.966 3.53161 107.312 3.64196 107.542C3.80748 107.83 4.19368 107.888 4.46954 107.773C4.74541 107.6 4.80058 107.312 4.69023 107.024C4.85575 106.966 4.9661 106.909 5.02127 106.794C5.24196 106.448 5.13161 105.872 4.80058 105.584Z" fill="#CAD0E2"/>
+<path d="M23.7793 78.2778C23.9448 78.6234 24.2207 78.6234 24.4965 78.6234C24.7724 78.6234 24.9931 78.7386 25.2689 78.5082C25.5448 78.2202 25.4344 77.5866 25.1034 77.3562C24.9379 77.241 24.7172 77.1834 24.4965 77.1834C24.4965 76.7802 24.2206 76.4922 23.8896 76.4922C23.6138 76.4922 23.3379 76.7802 23.3379 77.0682C23.3379 77.2986 23.5034 77.5866 23.7793 77.7018C23.6689 77.9322 23.7241 78.2202 23.7793 78.2778Z" fill="#CAD0E2"/>
+<path d="M5.62657 103.678C5.68175 103.275 5.5714 102.987 5.18519 102.93C5.07485 102.93 4.79899 103.045 4.79899 103.16C4.74382 103.39 4.79899 103.678 4.90933 103.794C5.13002 104.082 5.40588 103.851 5.62657 103.678Z" fill="#CAD0E2"/>
+<path d="M20.7988 74.6524C20.4677 74.7676 20.4677 75.0556 20.6333 75.2284C20.7436 75.3436 20.9643 75.574 21.1298 75.6316C21.2402 75.9196 21.4608 76.0924 21.7919 76.2652C22.3436 76.5532 22.6746 76.3228 23.0608 75.6316C23.4471 75.574 23.7781 75.5164 24.0539 75.4012C24.385 75.2284 24.5505 74.7676 24.385 74.4796C24.1643 74.0764 23.8884 73.6732 23.6677 73.27C23.8884 72.694 23.8884 72.6364 23.2815 72.3484C23.0057 72.406 22.8953 72.9244 22.5643 72.5788C22.6746 72.2908 22.785 72.0604 22.8402 71.7724C22.8402 71.6572 22.8402 71.5996 22.8402 71.4844C22.3988 71.7724 21.9574 72.0604 21.516 72.3484C21.6815 72.4636 21.8471 72.5788 22.0677 72.694C21.9574 72.7516 21.8471 72.8092 21.7367 72.8668C21.3505 73.0972 21.1298 73.0396 21.0746 72.6364C20.6884 72.9244 20.3022 73.1548 19.916 73.4428C19.916 73.4428 19.9712 73.4428 19.9712 73.5004C20.2471 73.6156 20.4126 73.7308 20.4677 74.0188C20.5229 74.4796 20.7988 74.5372 21.185 74.422C21.185 74.4796 21.185 74.4796 21.1298 74.5372C21.0746 74.5948 20.9643 74.5948 20.7988 74.6524Z" fill="#CAD0E2"/>
+<path d="M0.716531 107.31C0.992394 106.906 0.826876 106.446 0.716531 106.33C1.15791 106.042 1.3786 105.409 1.15791 104.948C1.04757 104.718 0.937221 104.602 0.771704 104.43C0.606187 105.466 0.440667 106.503 0.330322 107.598C0.49584 107.482 0.606187 107.425 0.716531 107.31Z" fill="#CAD0E2"/>
+<path d="M27.4771 73.273C27.4771 72.9274 27.0909 72.6394 26.7599 72.697C26.7047 72.697 26.7047 72.697 26.6495 72.697C26.5944 72.1786 26.0978 71.6602 25.6564 71.6602C25.1047 71.6602 24.553 72.121 24.553 72.6394C24.553 73.1578 25.2702 73.9642 25.8219 73.9066C26.0426 73.9066 26.2082 73.7914 26.3737 73.6186C26.484 73.7914 26.7047 73.9066 26.9254 73.9066C27.2013 73.9066 27.4771 73.561 27.4771 73.273Z" fill="#CAD0E2"/>
+<path d="M14.8984 78.5695C14.8432 78.6847 14.8432 78.7423 14.8432 78.8575C14.8432 79.2607 15.1743 79.5487 15.5053 79.4911C15.8363 79.4335 16.1674 79.0879 16.1674 78.7999C16.1674 78.5695 15.8363 78.2815 15.5605 78.1663C15.6156 77.9935 15.6708 77.8207 15.6708 77.7055C15.726 77.7055 15.8363 77.7055 15.8915 77.6479C16.2225 77.5327 16.4984 77.5327 16.7743 77.6479C17.2156 77.8207 17.7674 77.4751 17.657 77.0143C17.6018 76.5535 17.6018 76.0351 17.0501 75.8047C17.0501 75.8047 17.0501 75.8047 16.9949 75.8047C16.057 76.6111 15.1191 77.4751 14.2363 78.3967C14.4018 78.5695 14.6225 78.6271 14.8984 78.5695Z" fill="#CAD0E2"/>
+<path d="M25.5452 71.5413C25.8762 71.5989 26.3176 70.9077 26.2072 70.6773C26.0417 70.4469 25.2141 70.5045 25.159 70.8501C25.1038 71.0805 25.3245 71.4837 25.5452 71.5413Z" fill="#CAD0E2"/>
+<path d="M25.3242 70.1002C25.6001 70.273 26.0966 70.6186 26.5932 70.561C27.2553 70.4458 27.7518 69.4666 27.7518 68.8906C26.9242 69.2938 26.0966 69.697 25.3242 70.1002Z" fill="#CAD0E2"/>
+<path d="M24.8264 70.3906C24.5505 70.5634 24.2195 70.6786 23.9436 70.8514C24.0539 70.8514 24.1091 70.8514 24.2195 70.8514C24.5505 70.8514 24.716 70.621 24.8264 70.3906Z" fill="#CAD0E2"/>
+<path d="M6.07039 93.6621C6.34625 94.3533 6.84281 94.5261 7.39453 94.2381C8.00143 93.9501 8.16694 93.3165 7.83591 92.6253C7.78074 92.5101 7.72556 92.4525 7.61522 92.3949C7.56005 92.2797 7.39453 92.1645 7.33936 92.1645C7.0635 92.0493 6.73246 92.0493 6.4566 92.1645C5.96005 92.4525 5.79453 93.0285 6.07039 93.6621Z" fill="#CAD0E2"/>
+<path d="M2.15259 104.085C2.48362 103.97 2.59397 103.567 2.48362 103.279C2.31811 102.991 1.98707 102.818 1.65604 102.991C1.38018 103.106 1.26983 103.394 1.38018 103.74C1.54569 104.028 1.87673 104.2 2.15259 104.085Z" fill="#CAD0E2"/>
+<path d="M30.0156 82.9452C30.0156 83.118 30.0708 83.2332 30.2363 83.2332C30.4018 83.2908 30.5122 83.1756 30.5122 83.0028C30.5122 82.83 30.457 82.7148 30.2915 82.7148C30.126 82.7148 30.0156 82.7724 30.0156 82.9452Z" fill="#CAD0E2"/>
+<path d="M22.0704 80.067C22.1807 80.067 22.3463 80.1246 22.4566 80.1246C22.898 80.2398 23.1738 80.1246 23.229 79.8366C23.2842 79.4334 23.0635 79.203 22.5669 79.1454C22.5118 79.1454 22.4566 79.203 22.4014 79.203C22.1256 79.1454 22.0152 79.0302 22.1256 78.7422C22.1807 78.627 22.2359 78.5694 22.2911 78.4542C22.4566 78.051 22.3463 77.5326 22.0704 77.2446C21.7394 76.899 21.4083 76.8414 20.9118 77.0718C20.4152 77.3598 20.1945 77.8206 20.0842 78.339C19.8083 78.339 19.5876 78.2814 19.3669 78.339C18.6497 78.5118 18.4842 79.0302 18.9807 79.6062C19.4221 80.067 19.9738 80.067 20.3049 79.5486C20.4152 79.3758 20.4704 79.203 20.6359 78.8574C20.8566 79.0878 21.0221 79.203 21.0773 79.3758C21.2428 79.9518 21.5738 80.067 22.0704 80.067Z" fill="#CAD0E2"/>
+<path d="M25.4904 85.9467C26.7042 85.6587 26.7042 84.6795 26.3732 83.8731C26.2628 83.5851 26.0421 83.3547 25.8214 83.2395C25.4904 83.0667 25.1594 83.0666 24.718 83.1818C24.3318 83.297 23.8904 83.1243 23.6145 83.4123C23.449 83.5851 23.2283 83.8731 23.118 84.2187C23.118 84.2187 23.118 84.2187 23.118 84.2763C22.9525 84.6795 22.9525 85.1403 23.1732 85.6587C23.449 86.2347 23.7801 86.5227 24.2214 86.5803C24.6628 86.6379 24.9938 86.0619 25.4904 85.9467Z" fill="#CAD0E2"/>
+<path d="M21.4613 86.9793C21.351 86.5761 21.02 86.5185 20.6338 86.4609C20.4131 86.8065 20.1372 87.0945 20.4682 87.4977C20.4682 87.5553 20.5234 87.5553 20.5786 87.5553C20.3027 87.7857 20.082 88.2465 20.082 88.5921C20.082 88.9377 20.3579 89.1681 20.7441 89.1681C21.2958 89.1681 21.682 88.8225 21.682 88.3617C21.682 88.0161 21.5165 87.7281 21.2958 87.6129C21.4613 87.4401 21.5165 87.2097 21.4613 86.9793Z" fill="#CAD0E2"/>
+<path d="M23.5025 88.418C23.3921 88.4756 23.2818 88.6484 23.3369 88.7636C23.3369 88.8788 23.6128 89.0516 23.7231 89.0516C23.8335 88.994 23.8335 88.706 23.7783 88.5332C23.7783 88.4756 23.5025 88.3604 23.5025 88.418Z" fill="#CAD0E2"/>
+<path d="M28.1909 80.4127C28.0254 80.5279 27.8599 80.7583 27.8047 80.9311C27.6944 81.5647 27.9703 82.0255 28.6875 82.3135C28.853 82.1407 29.1289 82.0255 29.2944 81.8527C29.5703 81.5071 29.6254 80.9887 29.4047 80.7007C29.0737 80.4127 28.5771 80.2399 28.1909 80.4127Z" fill="#CAD0E2"/>
+<path d="M44.1945 69.2969C44.1393 69.4121 43.9187 69.5273 43.8635 69.7001C43.8635 69.8729 43.8635 69.9881 43.9187 70.1609C43.8635 70.1033 43.7531 70.0457 43.698 70.0457C43.3669 69.9305 42.8704 70.1033 42.5393 70.4489C42.4842 70.1609 42.2083 69.9881 41.9876 69.9881C41.7118 69.9881 41.4359 70.3337 41.4911 70.6793C41.4911 71.0249 41.8221 71.3129 42.098 71.2553C42.1531 71.2553 42.1531 71.2553 42.2083 71.2553C42.2083 71.4857 42.2635 71.6585 42.3738 71.7737C42.2635 71.7161 42.098 71.6585 41.9325 71.6585C41.4359 71.6585 41.0497 72.0617 41.1049 72.4073C41.16 72.9833 41.7118 73.5017 42.2083 73.5017C42.3187 73.5017 42.4842 73.4441 42.5945 73.3289C42.5945 73.5017 42.6497 73.6745 42.7049 73.8473C42.5945 73.8473 42.429 73.8473 42.3187 73.9625C41.9876 74.2505 42.0428 74.8265 42.3738 75.1145C42.6497 75.3449 43.1462 75.4601 43.4773 75.2873C43.9187 74.9993 43.8635 74.4809 43.8083 74.3657C44.3049 74.2505 44.7462 73.7321 44.6911 73.2137C44.6359 72.6953 44.36 72.3497 43.9738 72.1769C44.1393 72.0617 44.3049 71.8889 44.4152 71.5433C44.5256 71.0825 44.4704 70.7369 44.3049 70.4489C44.36 70.5065 44.4704 70.5065 44.5256 70.5065C44.8566 70.5065 45.2428 70.1609 45.2428 69.8729C45.1876 69.6425 44.7462 69.3545 44.1945 69.2969ZM42.8704 72.4073C42.8704 72.2921 42.8152 72.2345 42.76 72.1193C42.8152 72.1769 42.8704 72.1769 42.9256 72.2345C42.9256 72.2345 42.9807 72.2345 42.9807 72.2921C42.9256 72.3497 42.8704 72.3497 42.8704 72.4073Z" fill="#CAD0E2"/>
+<path d="M30.5108 73.7321C30.4556 73.1561 29.9591 72.6953 29.4625 72.6953C28.7453 72.6953 28.1936 73.2137 28.2487 73.9049C28.2487 74.2505 28.4142 74.5385 28.6349 74.7113C28.5246 74.7113 28.4142 74.6537 28.2487 74.7113C27.697 74.7689 27.3108 75.1721 27.366 75.6905C27.366 75.7481 27.366 75.8057 27.4211 75.8633L27.366 75.8633C26.8694 75.8633 26.3729 76.5545 26.428 77.2457C26.428 77.7641 26.8694 78.1673 27.366 78.1097C28.1936 77.9945 28.3039 77.7641 28.4142 76.9577C28.4694 76.9577 28.5798 76.9577 28.6349 76.9577C29.1315 76.8425 29.5177 76.3817 29.4625 75.8633C29.628 75.9785 29.8487 76.0361 30.0694 76.0361C30.566 76.0361 31.1729 75.4601 31.1729 74.9417C31.1729 74.3657 30.897 73.9049 30.5108 73.7321Z" fill="#CAD0E2"/>
+<path d="M9.48891 94.3515C9.10271 94.5243 8.82684 95.3883 8.99236 95.7915C9.15788 96.1947 9.76478 96.3675 10.151 96.1947C10.5372 96.0219 10.8131 95.3307 10.6475 94.9275C10.4268 94.4667 9.81995 94.1787 9.48891 94.3515Z" fill="#CAD0E2"/>
+<path d="M11.2007 82.1976C11.2007 82.2552 11.1455 82.3128 11.1455 82.3704C10.98 83.004 11.2558 83.4648 11.5869 83.6952C11.9731 83.9256 12.5248 83.5224 12.911 83.004C13.0765 82.7736 13.0213 82.3704 12.911 82.0824C12.9662 82.0248 12.9662 81.9672 12.9662 81.852C12.9662 81.7368 12.8558 81.4488 12.7455 81.276C13.0765 81.2184 13.242 81.0456 13.242 80.7C13.242 80.3544 12.9662 80.0664 12.58 80.0664C11.9731 80.7576 11.3662 81.4488 10.8145 82.14C10.9248 82.1976 11.0903 82.1976 11.2007 82.1976ZM12.1386 81.3336L12.1938 81.276C12.1386 81.3336 12.0834 81.4488 12.0834 81.564C12.0282 81.564 11.9731 81.564 11.9731 81.564C12.0282 81.5064 12.0834 81.4488 12.1386 81.3336Z" fill="#CAD0E2"/>
+<path d="M11.4764 98.7264C11.7522 98.5536 11.8626 98.1504 11.7522 97.8624C11.6419 97.5744 11.2005 97.4592 10.9246 97.632C10.6488 97.8048 10.5936 98.1504 10.7591 98.496C10.8695 98.784 11.1453 98.8992 11.4764 98.7264Z" fill="#CAD0E2"/>
+<path d="M15.4469 85.5372C15.5572 85.3068 15.3365 85.1916 15.1158 85.1916C15.1158 85.134 15.1158 85.134 15.1158 85.0764C15.1158 84.7884 14.7296 84.4428 14.3986 84.4428C14.2331 84.4428 14.0676 84.5004 13.9572 84.558C14.2331 84.3276 14.3434 84.0972 14.1227 83.8092C14.0676 83.694 13.7917 83.5788 13.6814 83.6364C13.5158 83.694 13.2951 83.8668 13.2951 84.0396C13.24 84.4428 13.571 84.558 13.8469 84.6156C13.6262 84.7884 13.5158 84.9612 13.5158 85.2492C13.5158 85.7676 13.9572 86.286 14.3434 86.286C14.4538 86.286 14.5641 86.1708 14.7296 86.0556C14.84 86.0556 15.0055 85.998 15.1158 85.8828C15.2262 85.7676 15.3917 85.71 15.4469 85.5372Z" fill="#CAD0E2"/>
+<path d="M16.9937 82.1385C16.773 81.6777 16.0006 81.3898 15.5041 81.6202C14.9523 81.8506 14.7868 82.5417 15.0627 83.2329C15.173 83.5209 15.3937 83.7513 15.6144 83.8089C15.5592 83.9241 15.5592 83.9817 15.5592 84.0969C15.5592 84.4425 15.8351 84.7882 16.111 84.7882C16.3868 84.7882 16.8282 84.3849 16.8834 84.1545C16.8834 83.9817 16.773 83.809 16.6075 83.6362C17.0489 83.233 17.2144 82.5993 16.9937 82.1385Z" fill="#CAD0E2"/>
+<path d="M14.123 90.4352C13.9575 90.4352 13.7368 90.6656 13.6816 90.7808C13.6816 91.0112 13.7368 91.3568 13.9023 91.472C14.2334 91.76 14.5092 91.4144 14.7851 91.184C14.7299 90.7808 14.5644 90.3776 14.123 90.4352Z" fill="#CAD0E2"/>
+<path d="M4.91086 92.7385C4.80051 92.7961 4.74534 92.9689 4.74534 93.0841C4.74534 93.1993 4.80051 93.4297 5.0212 93.4297C5.24189 93.4297 5.40741 93.2569 5.40741 93.0265C5.40741 92.8537 5.29706 92.7385 5.18672 92.6809C5.24189 92.6809 5.35223 92.6233 5.40741 92.6233C6.01431 92.3353 6.235 91.5865 5.90396 90.7801C5.79362 90.5497 5.68327 90.3769 5.46258 90.2617C5.07637 91.0105 4.69017 91.7593 4.35913 92.5657C4.57982 92.6809 4.74534 92.7385 4.91086 92.7385Z" fill="#CAD0E2"/>
+<path d="M53.6811 79.6602C53.626 79.6602 53.5156 79.7754 53.5156 79.8906C53.5156 80.0058 53.6811 80.0634 53.7363 80.0058C53.7915 79.9482 53.8467 79.833 53.8467 79.833C53.8467 79.7754 53.7915 79.6602 53.6811 79.6602Z" fill="#CAD0E2"/>
+<path d="M66.5923 65.0332C66.2061 65.3212 66.5371 65.6668 66.6475 66.0124C67.0889 66.0124 67.4751 65.8972 67.5302 65.4364C67.5302 65.2636 67.4199 64.9756 67.2544 64.918C67.1992 64.918 67.1992 64.918 67.144 64.918L66.813 64.918C66.7578 64.918 66.7026 64.9756 66.5923 65.0332Z" fill="#CAD0E2"/>
+<path d="M66.9241 72.6917C66.8137 72.4037 66.3172 72.0581 66.0413 72.1157C65.7654 72.1733 65.5999 72.576 65.6551 72.9216C65.7654 73.2672 66.0413 73.3824 66.4275 73.3248C66.8137 73.152 67.0344 72.9221 66.9241 72.6917Z" fill="#CAD0E2"/>
+<path d="M65.9873 74.1327C65.877 74.1903 65.877 74.3055 65.877 74.3631C65.877 74.4207 66.0425 74.4783 66.0976 74.4783C66.1528 74.4783 66.208 74.3631 66.208 74.3055C66.208 74.2479 66.0976 74.0751 65.9873 74.1327Z" fill="#CAD0E2"/>
+<path d="M67.862 72.0611C67.6965 72.1187 67.6413 72.4067 67.6965 72.4643C67.7516 72.5795 67.862 72.8675 67.9723 72.8099C68.0827 72.7523 68.193 72.5795 68.193 72.4643C68.193 72.3491 68.0275 72.0035 67.862 72.0611Z" fill="#CAD0E2"/>
+<path d="M61.1848 71.6557C61.1296 71.1949 60.7434 70.7917 60.4675 70.8493C59.971 70.9069 59.5296 71.5405 59.5848 72.0589C59.5848 72.4045 60.0261 72.6925 60.4123 72.5773C60.9089 72.5197 61.2399 72.1741 61.1848 71.6557Z" fill="#CAD0E2"/>
+<path d="M46.289 74.8231C46.3442 74.8231 46.5097 74.7079 46.5097 74.5927C46.5097 74.4775 46.3442 74.3623 46.1787 74.3047C46.1235 74.3047 45.8477 74.3623 45.8477 74.5351C45.8477 74.7079 46.1787 74.8231 46.289 74.8231Z" fill="#CAD0E2"/>
+<path d="M68.9105 71.1396C68.9656 71.3124 69.1863 71.4276 69.2967 71.4276C69.407 71.4276 69.5725 71.2548 69.5725 71.1396C69.5725 71.0244 69.407 70.8516 69.2967 70.8516C69.1863 70.8516 68.8553 70.9668 68.9105 71.1396Z" fill="#CAD0E2"/>
+<path d="M47.4492 67.2216C47.5595 67.2792 47.6147 67.2792 47.7251 67.2792C48.0561 67.2792 48.2768 66.9912 48.2768 66.6456C48.2768 66.3 48.0561 66.0696 47.7802 66.0696C47.5595 66.0696 47.394 66.1848 47.2285 66.3C47.0078 65.9544 46.732 65.724 46.4009 65.6088C45.9044 65.4936 45.5733 66.0696 45.0216 66.1272C44.9113 66.1272 44.8561 66.1848 44.7458 66.1848C44.7458 65.9544 44.7457 65.7816 44.5251 65.6088C44.3044 65.436 44.0285 65.3784 43.8078 65.6664C43.6975 65.8392 43.532 66.1848 43.5871 66.3576C43.6423 66.588 43.8078 66.7032 43.9733 66.7032C43.7526 67.1064 43.8078 67.6248 43.9733 68.0856C44.0837 68.3736 44.2492 68.604 44.4699 68.7768C44.7458 69.0072 45.132 69.0072 45.5733 68.892C46.0147 68.7768 46.3458 69.0648 46.732 68.7768C47.063 68.4888 47.5044 67.9128 47.4492 67.2216Z" fill="#CAD0E2"/>
+<path d="M46.4535 72.1737C46.3984 71.8281 46.1225 71.5977 45.7915 71.5977C45.4604 71.5977 45.2949 71.8281 45.2949 72.2313C45.2949 72.6345 45.5708 72.8649 45.9018 72.8649C46.1777 72.8073 46.4535 72.5193 46.4535 72.1737Z" fill="#CAD0E2"/>
+<path d="M54.6766 76.2608C53.7938 75.9152 54.2352 75.3968 53.6835 74.936C53.5731 74.8784 53.4628 74.8208 53.4076 74.8208C52.6904 74.7056 52.3042 75.224 52.5248 75.9152C52.6352 76.3184 52.8559 76.7216 53.1317 77.0672C53.4076 77.4704 54.1249 77.528 54.5111 77.2976C54.6214 77.1824 55.0076 76.664 54.6766 76.2608Z" fill="#CAD0E2"/>
+<path d="M55.3921 68.7766C55.4472 69.0646 55.8886 69.2956 56.1645 69.238C56.4403 69.1228 56.661 68.719 56.6059 68.431C56.6059 68.3158 56.4955 68.2006 56.4403 68.143C56.7162 67.9702 56.9369 67.6246 56.8817 67.3366C56.8265 66.8182 56.3852 66.3574 55.9438 66.415C55.5576 66.4726 55.0059 67.1638 55.0059 67.567C55.061 67.855 55.2817 68.143 55.5576 68.2582C55.3921 68.3734 55.3369 68.6038 55.3921 68.7766Z" fill="#CAD0E2"/>
+<path d="M59.6406 74.7117C59.6406 75.0573 59.8061 75.2877 60.1923 75.2877C60.5786 75.2877 60.7992 74.9997 60.7992 74.6541C60.7992 74.3661 60.5234 74.0781 60.2475 74.0781C59.9165 74.0781 59.6406 74.3661 59.6406 74.7117Z" fill="#CAD0E2"/>
+<path d="M68.8553 66.6473C68.8002 66.2441 68.5795 66.0137 68.3588 66.0713C68.0277 66.1289 67.6415 66.5897 67.6967 66.8777C67.7519 67.1657 68.0829 67.4537 68.4139 67.3961C68.6898 67.3385 68.8553 67.0505 68.8553 66.6473Z" fill="#CAD0E2"/>
+<path d="M79.6658 67.2202C79.8313 67.105 80.052 66.7594 79.9416 66.6442C79.8313 66.529 79.5554 66.3562 79.4451 66.4138C79.3347 66.4714 79.0037 66.817 79.0589 66.9898C79.0589 67.105 79.5554 67.2778 79.6658 67.2202Z" fill="#CAD0E2"/>
+<path d="M78.6196 69.1241C78.7299 69.4697 79.1713 69.7577 79.5024 69.6425C79.8886 69.5273 80.3851 68.7785 80.2748 68.4329C80.1644 68.0297 79.5575 67.7993 79.061 67.9721C78.6196 68.1449 78.4541 68.5481 78.6196 69.1241Z" fill="#CAD0E2"/>
+<path d="M74.2612 78.109C74.0957 78.1666 73.875 78.397 73.875 78.5122C73.875 78.6274 74.1509 78.8577 74.3164 78.8577C74.4267 78.8577 74.8129 78.5698 74.8129 78.397C74.8129 78.2242 74.3716 78.0514 74.2612 78.109Z" fill="#CAD0E2"/>
+<path d="M75.5853 68.6606C75.475 68.0846 74.8681 67.739 74.1508 67.9118C73.5439 68.027 73.2129 68.603 73.3784 69.179C73.4887 69.755 74.206 70.2158 74.7577 70.1006C75.3094 69.9854 75.6956 69.2366 75.5853 68.6606Z" fill="#CAD0E2"/>
+<path d="M74.8125 71.83C74.8125 72.0604 75.1435 72.0028 75.2539 72.0028C75.309 72.0028 75.4746 71.7724 75.4194 71.7148C75.3642 71.5996 75.1987 71.4844 75.1435 71.4844C75.0884 71.4844 74.8125 71.5996 74.8125 71.83Z" fill="#CAD0E2"/>
+<path d="M69.5711 68.4324C69.4608 68.1444 69.2953 68.1444 69.0746 68.202C68.7987 68.2596 68.6332 68.5476 68.7435 68.778C68.8539 68.9508 68.9642 69.1812 69.1298 69.1812C69.3504 69.2388 69.6815 68.7204 69.5711 68.4324Z" fill="#CAD0E2"/>
+<path d="M74.813 65.782C75.144 66.1276 75.9716 66.0124 76.1923 65.6668C76.3026 65.494 76.3578 65.206 76.3026 64.918L74.3164 64.918C74.4268 65.206 74.5923 65.494 74.813 65.782Z" fill="#CAD0E2"/>
+<path d="M80.6626 76.1484C80.9384 76.206 81.0488 75.918 80.9936 75.5724C80.9384 75.2268 80.7177 75.1692 80.497 75.2844C80.3315 75.342 79.9453 75.6876 79.9453 75.8604C79.9453 76.0332 80.4419 76.1484 80.6626 76.1484Z" fill="#CAD0E2"/>
+<path d="M77.7371 65.4364C78.0681 65.782 78.3992 65.6668 78.7854 65.494C78.7854 65.2636 78.8405 65.0908 78.7854 64.918L77.6267 64.918C77.5716 65.0908 77.5716 65.2636 77.7371 65.4364Z" fill="#CAD0E2"/>
+<path d="M53.0762 64.918C53.2417 65.3788 53.5727 65.6092 54.0693 65.5516C54.4555 65.494 54.7865 65.2636 54.952 64.918L53.0762 64.918Z" fill="#CAD0E2"/>
+<path d="M56.6607 83.1219C56.7159 82.9491 56.4952 82.4883 56.109 82.4883C55.9987 82.4883 55.778 82.6611 55.7228 82.8339C55.6676 83.0067 55.7228 83.2947 55.8332 83.4099C56.1642 83.6403 56.5504 83.2947 56.6607 83.1219Z" fill="#CAD0E2"/>
+<path d="M56.1647 69.9293C55.8337 69.9869 55.6682 70.3325 55.7233 70.6781C55.7785 71.0237 55.9992 71.1965 56.3302 71.1389C56.6613 71.0813 56.882 70.7357 56.8268 70.4477C56.8268 70.1597 56.4406 69.8717 56.1647 69.9293Z" fill="#CAD0E2"/>
+<path d="M57.4889 64.9756C57.1579 65.0332 56.9924 65.2636 57.0476 65.6092C57.1027 66.0124 57.3786 66.1852 57.7096 66.1276C57.9303 66.07 58.0958 65.8972 58.151 65.6668C58.2614 65.7244 58.4269 65.782 58.5924 65.7244C58.8683 65.6668 59.1441 65.5516 59.1441 65.2636C59.1441 65.1484 59.0889 64.9756 59.0338 64.918L57.9303 64.918C57.9303 64.9756 57.8752 64.9756 57.8752 65.0332C57.7648 64.9756 57.6545 64.918 57.4889 64.9756Z" fill="#CAD0E2"/>
+<path d="M50.9224 81.162C51.419 81.0468 51.8604 80.4708 51.8052 79.9524C51.8052 79.6068 51.2535 79.2612 50.8121 79.3188C50.3155 79.434 50.0397 79.7796 50.0949 80.298C50.15 80.874 50.5362 81.2196 50.9224 81.162Z" fill="#CAD0E2"/>
+<path d="M50.2068 74.7675C50.3171 74.9979 50.7034 75.1131 50.8689 74.9979C51.1447 74.8251 51.0896 74.0186 50.8137 73.961C50.5378 73.9034 50.0965 74.4795 50.2068 74.7675Z" fill="#CAD0E2"/>
+<path d="M52.0814 64.918L49.709 64.918C49.709 65.206 49.378 65.9548 49.8194 66.5308C50.2607 67.1068 50.978 67.0492 51.5297 66.7036C51.9159 66.4156 52.1366 65.5516 52.0814 64.918Z" fill="#CAD0E2"/>
+<path d="M52.7999 73.3838C53.1861 73.3262 53.6275 72.6926 53.5723 72.2894C53.5171 71.7134 53.1309 71.3678 52.6344 71.483C52.1378 71.5982 51.8619 71.9438 51.9171 72.4622C52.0275 72.9806 52.4688 73.4414 52.7999 73.3838Z" fill="#CAD0E2"/>
+<path d="M36.1925 76.7251C35.9718 76.6675 35.5305 77.0131 35.4753 77.3587C35.4201 77.6467 35.5856 77.8771 35.9167 77.9347C36.4132 77.9923 36.7443 77.9347 36.7994 77.6467C36.7994 77.3587 36.4684 76.7827 36.1925 76.7251Z" fill="#CAD0E2"/>
+<path d="M60.1369 68.6053C60.1369 68.2597 59.7507 67.9141 59.4748 67.9141C58.8127 67.9717 58.3713 68.3173 58.4265 68.7781C58.4817 69.1813 59.0886 69.6421 59.4748 69.5845C59.8058 69.5269 60.192 68.9509 60.1369 68.6053Z" fill="#CAD0E2"/>
+<path d="M61.9587 65.3798C61.9587 65.207 61.9587 65.0918 61.9587 64.9766L59.5863 64.9766C59.5311 65.1494 59.5311 65.3222 59.5863 65.495C59.7518 66.0134 60.138 66.3014 60.5794 66.1862C60.8553 66.1286 61.1311 65.8406 61.2415 65.6102C61.4622 65.6102 61.738 65.4374 61.9587 65.3798Z" fill="#CAD0E2"/>
+<path d="M56.3305 73.5573C56.165 73.6149 56.0547 73.8453 56.0547 74.0181C56.0547 74.1909 56.2754 74.5941 56.4409 74.5941C56.6064 74.5941 56.8271 74.1909 56.8271 74.0181C56.8823 73.7301 56.5512 73.4421 56.3305 73.5573Z" fill="#CAD0E2"/>
+<path d="M58.318 80.3566C58.7042 80.299 58.9249 80.0116 58.8697 79.6084C58.8146 79.3204 58.5387 79.0318 58.2077 79.0894C57.8215 79.147 57.5456 79.435 57.6008 79.7806C57.6008 80.1262 57.9318 80.4142 58.318 80.3566Z" fill="#CAD0E2"/>
+<path d="M57.2695 73.2681C57.3799 73.2681 57.5454 73.2105 57.6557 73.0953C57.8213 73.0953 58.0419 73.0953 58.1523 73.0953C58.3178 73.0377 58.6488 72.6921 58.5937 72.4041C58.5385 72.2313 58.373 72.1161 58.1523 72.0585C58.0419 71.7129 57.7109 71.5977 57.2695 71.5977C56.8281 71.6553 56.6075 72.0009 56.6626 72.5769C56.6626 72.9801 56.9385 73.2681 57.2695 73.2681Z" fill="#CAD0E2"/>
+<path d="M39.8343 75.4001C39.8895 74.8817 39.2275 74.3633 38.6206 74.3633C38.124 74.3633 37.793 74.7089 37.793 75.2273C37.793 75.5729 37.9033 75.8033 38.0688 75.9761C38.124 76.2641 38.3447 76.4369 38.5654 76.3793C38.6206 76.3793 38.6757 76.3217 38.6757 76.3217C38.7309 76.3217 38.7861 76.3217 38.7861 76.3217C39.2826 76.3217 39.7792 75.9185 39.8343 75.4001Z" fill="#CAD0E2"/>
+<path d="M39.3933 89.2254C39.4485 88.8222 39.0623 88.3614 38.7864 88.419C38.5106 88.4766 38.1795 89.4558 38.4002 89.7438C38.6209 90.0318 39.3382 89.6286 39.3933 89.2254Z" fill="#CAD0E2"/>
+<path d="M61.9584 68.0886C62.3446 67.9734 62.5652 67.6854 62.4549 67.2822C62.3446 66.9942 62.0135 66.7638 61.7377 66.8214C61.4066 66.9366 61.1859 67.3398 61.2963 67.6854C61.3515 67.9734 61.6825 68.1462 61.9584 68.0886Z" fill="#CAD0E2"/>
+<path d="M38.6211 83.9843C38.6211 83.8115 38.3452 83.7539 38.1797 83.7539C38.1245 83.7539 37.959 83.9267 37.959 84.0419C37.959 84.1571 38.1797 84.2723 38.29 84.2723C38.4004 84.2723 38.6211 84.1571 38.6211 83.9843Z" fill="#CAD0E2"/>
+<path d="M40.2753 82.1402C40.6064 82.1402 40.9926 81.6794 40.9374 81.3338C40.9374 80.9882 40.6064 80.7578 40.2753 80.7578C39.9443 80.7578 39.6133 81.0458 39.6133 81.3338C39.6685 81.737 40.0547 82.1978 40.2753 82.1402Z" fill="#CAD0E2"/>
+<path d="M38.1792 66.1835C38.124 66.0107 38.0137 65.8379 37.8481 65.7227C37.5723 65.7803 37.2964 65.8379 37.0757 65.8955C36.9654 66.0107 36.9654 66.1259 36.9654 66.2411C36.5792 66.2987 36.2481 66.5291 36.193 66.8171C36.1378 67.5083 36.7447 67.7387 37.0757 67.8539C37.3516 67.9691 37.793 67.3931 37.7378 66.8747C38.0137 66.8171 38.2344 66.4715 38.1792 66.1835Z" fill="#CAD0E2"/>
+<path d="M37.7903 88.0692C37.9007 88.0116 38.0662 87.954 38.0662 87.7812C38.0662 87.6084 37.9007 87.5508 37.8455 87.5508C37.7352 87.5508 37.5145 87.6084 37.4593 87.8388C37.4041 88.0692 37.7352 88.0692 37.7903 88.0692Z" fill="#CAD0E2"/>
+<path d="M48.2773 79.0295C48.6635 78.9719 48.8842 78.7415 48.829 78.3959C48.7739 78.0503 48.5532 77.7623 48.2221 77.8199C47.9463 77.8199 47.6152 78.1655 47.6152 78.4535C47.6704 78.7991 47.9463 79.0295 48.2773 79.0295Z" fill="#CAD0E2"/>
+<path d="M49.2115 73.7316C49.3771 73.386 49.3771 73.0404 49.046 72.8676C48.9357 72.81 48.6598 72.8676 48.6046 72.9252C48.4943 73.098 48.4391 73.386 48.4943 73.5588C48.6598 73.962 48.9357 73.8468 49.2115 73.7316Z" fill="#CAD0E2"/>
+<path d="M50.6493 70.4457C50.9803 70.4457 51.3665 70.6761 51.532 70.1577C51.6424 69.8697 51.532 69.5817 51.3113 69.4089C50.9251 69.1209 50.6493 69.4665 50.3734 69.7545C50.1527 69.6393 49.9872 69.5241 49.8217 69.4089C49.932 69.1209 50.0424 68.8905 50.2079 68.6601C50.0975 68.4297 49.9872 68.2569 49.8217 68.0841C49.601 67.8537 48.9389 67.7385 48.7182 67.9113C48.4424 68.0841 48.3872 68.6025 48.6079 69.0633C48.6631 69.2361 48.7734 69.3513 48.8286 69.5241C48.6079 69.8697 48.3872 70.2153 48.3872 70.5609C48.2768 70.5609 48.2217 70.6185 48.1113 70.6185C47.67 70.7337 47.3941 71.5401 47.6148 72.0009C47.8355 72.4041 48.6079 72.6921 49.1044 72.2889C49.3803 72.0585 49.5458 71.7705 49.601 71.4825C49.6562 71.4825 49.7113 71.4825 49.7665 71.4825C50.3734 71.4825 50.5389 71.0217 50.6493 70.4457Z" fill="#CAD0E2"/>
+<path d="M41.0477 83.7538C41.1581 83.869 41.2684 83.9842 41.4339 83.9842C41.765 83.9842 41.8753 83.7538 41.8753 83.4658C42.2063 83.4082 42.5925 83.2354 42.427 82.6594C42.2615 82.0258 41.5443 81.7378 40.9925 81.853C40.4408 81.9682 39.8339 82.9474 40.1098 83.6386C40.3305 83.9842 40.7719 83.9842 41.0477 83.7538Z" fill="#CAD0E2"/>
+<path d="M49.38 84.1002C49.6007 84.1002 49.7111 83.4666 49.6559 83.409C49.4904 83.1786 49.3249 82.8906 49.049 82.8906C48.7731 82.8906 48.718 83.2938 48.7731 83.409C48.8835 83.5818 49.1593 84.1002 49.38 84.1002Z" fill="#CAD0E2"/>
+<path d="M43.0887 79.6035C43.1439 79.3731 43.1439 79.1427 43.2542 78.9699C43.4749 78.6243 43.5301 78.2787 43.3094 77.8755C43.1439 77.5875 42.3715 77.5299 42.0404 77.7027C41.7646 77.8755 41.4335 78.0483 41.5991 78.5667C41.7094 78.9123 41.7646 79.2579 41.8749 79.6035C41.8198 80.0067 42.0404 80.2371 42.3715 80.2371C42.7577 80.2371 42.9784 80.0067 43.0887 79.6035Z" fill="#CAD0E2"/>
+<path d="M47.7251 74.4237C47.8354 74.4237 48.1665 74.3085 48.1665 74.1357C48.1665 73.9629 47.8906 73.8477 47.7803 73.8477C47.6699 73.8477 47.4492 73.9629 47.4492 74.1357C47.4492 74.3085 47.6147 74.4237 47.7251 74.4237Z" fill="#CAD0E2"/>
+<path d="M60.8 70.1014C61.0207 70.1014 61.2414 69.871 61.131 69.583C61.0207 69.295 60.9103 69.0646 60.5793 69.1222C60.3034 69.1798 60.0827 69.7558 60.1931 69.9286C60.3034 70.1014 60.5793 70.1014 60.8 70.1014Z" fill="#CAD0E2"/>
+<path d="M73.8774 66.8742C73.9877 66.8166 74.1533 66.5862 74.1533 66.471C74.1533 66.2982 73.9877 66.0102 73.8774 65.9526C73.4912 65.7798 73.3257 66.1254 73.1602 66.4134C73.2705 66.759 73.4912 66.9894 73.8774 66.8742Z" fill="#CAD0E2"/>
+<path d="M2.09666 99.4168C2.207 99.1864 2.15183 99.0136 2.04149 98.8984C1.93114 99.1864 1.87597 99.532 1.76563 99.82C1.93114 99.7624 2.04149 99.5896 2.09666 99.4168Z" fill="#CAD0E2"/>
+<path d="M45.9594 83.2929C45.9594 83.2353 45.8491 83.0625 45.7388 83.0625C45.6284 83.0625 45.4629 83.2353 45.4629 83.3505C45.4629 83.4657 45.5732 83.7537 45.7388 83.7537C45.8491 83.7537 45.9043 83.4081 45.9594 83.2929Z" fill="#CAD0E2"/>
+<path d="M45.6292 78.6274C45.4085 78.685 44.9671 78.9154 45.0223 79.2034C45.0775 79.4914 45.4637 79.549 45.6844 79.6066C45.9051 79.6642 46.1258 79.549 46.1809 79.2034C46.1258 78.9154 45.8499 78.5698 45.6292 78.6274Z" fill="#CAD0E2"/>
+<path d="M12.6906 101.893C12.8561 101.836 12.9112 101.375 12.8561 101.202C12.8009 100.914 12.4147 100.799 12.2492 100.972C12.1388 101.087 12.0837 101.375 12.1388 101.548C12.194 101.663 12.4699 101.951 12.6906 101.893Z" fill="#CAD0E2"/>
+<path d="M13.5728 99.0741C13.3522 98.6133 12.9108 98.4981 12.4142 98.7285C12.028 98.9013 11.9728 99.3621 12.1935 99.8805C12.359 100.284 12.6901 100.456 13.0211 100.341C13.3522 100.168 13.6832 99.3621 13.5728 99.0741Z" fill="#CAD0E2"/>
+<path d="M69.793 67.3925C69.8481 67.3925 69.9033 67.2197 69.9033 67.2197C69.9033 67.1621 69.8481 67.0469 69.7378 67.0469C69.6826 67.0469 69.5723 67.1621 69.5723 67.2773C69.6274 67.3925 69.7378 67.3925 69.793 67.3925Z" fill="#CAD0E2"/>
+<path d="M64.7739 72.6327C64.9394 72.5175 64.9946 72.2295 64.9946 72.0567C64.9946 71.8263 64.8291 71.5959 64.5532 71.6535C64.2773 71.7111 64.0566 71.8263 64.0566 72.1719C64.0566 72.4023 64.6084 72.7479 64.7739 72.6327Z" fill="#CAD0E2"/>
+<path d="M66.0394 69.1808C66.3153 69.1232 66.536 68.432 66.4256 67.9712C66.3704 67.6832 65.8739 67.3952 65.598 67.5104C65.1566 67.6832 64.8808 68.0864 64.9911 68.432C65.1015 68.8352 65.7084 69.2384 66.0394 69.1808Z" fill="#CAD0E2"/>
+<path d="M66.979 76.2043C67.1445 76.2043 67.2548 75.9739 67.31 75.6859C67.3652 75.6859 67.5307 75.4555 67.4755 75.3979C67.4755 75.3403 67.4203 75.2827 67.3652 75.2251C67.3652 75.1675 67.3652 75.1675 67.3652 75.1099C67.3652 74.9371 67.0341 74.5339 66.7583 74.5915C66.4824 74.6491 66.3169 75.1099 66.2617 75.3979C66.3169 75.6283 66.7031 76.2043 66.979 76.2043Z" fill="#CAD0E2"/>
+<path d="M64.0007 67.4532C64.442 67.3956 64.8834 66.8772 64.8283 66.474C64.7731 66.1284 64.1662 65.8404 63.7248 65.898C63.3938 65.9556 63.1179 66.3588 63.1731 66.7044C63.2834 67.1652 63.6696 67.5108 64.0007 67.4532Z" fill="#CAD0E2"/>
+<path d="M62.3447 74.6529C62.4551 74.6529 62.5654 74.4225 62.5654 74.3649C62.5654 74.2497 62.3999 73.9617 62.2344 74.0193C62.0688 74.0769 62.0137 74.3649 62.0137 74.4801C62.0137 74.5377 62.2344 74.6529 62.3447 74.6529Z" fill="#CAD0E2"/>
+<path d="M63.005 77.4156C63.2808 77.358 63.5567 77.0124 63.5015 76.7244C63.4464 76.4364 63.1153 76.1484 62.7843 76.1484C62.4533 76.1484 62.2326 76.4364 62.2877 76.782C62.3429 77.1852 62.674 77.4732 63.005 77.4156Z" fill="#CAD0E2"/>
+<path d="M71.34 76.9568C71.671 76.8992 71.8917 76.5536 71.8366 76.208C71.7814 75.92 71.4504 75.6896 71.1745 75.7472C70.8435 75.8048 70.6779 76.1504 70.7331 76.496C70.7883 76.8992 71.009 77.072 71.34 76.9568Z" fill="#CAD0E2"/>
+<path d="M71.834 64.918L71.3926 64.918C71.5029 64.976 71.6684 64.976 71.834 64.918Z" fill="#CAD0E2"/>
+<path d="M72.055 72.8654C72.3308 72.7502 72.5515 72.635 72.4964 72.2894C72.4412 72.0014 72.055 71.7716 71.8343 71.8292C71.6136 71.8868 71.5033 72.2894 71.6136 72.5774C71.6688 72.8078 71.8343 72.923 72.055 72.8654Z" fill="#CAD0E2"/>
+<path d="M71.0063 66.5271C71.1167 66.5271 71.227 66.2391 71.227 66.0663C71.227 66.0087 71.0615 65.8359 71.0063 65.8359C70.896 65.8935 70.7305 66.0087 70.7305 66.1239C70.7305 66.1815 70.9512 66.5271 71.0063 66.5271Z" fill="#CAD0E2"/>
+<path d="M67.8618 64.9756C67.917 65.1484 68.1377 65.206 68.1928 65.206C68.3032 65.206 68.5791 65.0908 68.5239 64.9756C68.5239 64.9756 68.5239 64.918 68.4687 64.918L67.8066 64.918C67.917 64.918 67.8618 64.9756 67.8618 64.9756Z" fill="#CAD0E2"/>
+<path d="M71.1722 68.6612C70.8963 68.7188 70.7308 68.9487 70.786 69.2943C70.786 69.5823 71.3929 69.8703 71.5584 69.6975C71.7239 69.5247 71.7791 69.3519 71.7791 69.1215C71.7791 68.8335 71.448 68.6036 71.1722 68.6612Z" fill="#CAD0E2"/>
+<path d="M71.8899 67.8544C72.0554 67.9696 72.2761 67.7968 72.3313 67.5088C72.3864 67.2784 72.2761 66.9328 72.1106 66.76C71.8899 66.5872 71.7243 66.7024 71.6692 66.8176C71.5588 66.9904 71.614 67.1632 71.6692 67.336C71.7243 67.5664 71.7244 67.7392 71.8899 67.8544Z" fill="#CAD0E2"/>
+<path d="M46.7868 77.1304C47.1179 77.0728 47.2834 76.7848 47.2834 76.3816C47.2282 75.9784 46.9524 75.748 46.5662 75.8056C46.2903 75.8632 46.0144 76.324 46.0696 76.612C46.1248 76.9576 46.4558 77.188 46.7868 77.1304Z" fill="#CAD0E2"/>
+<path d="M39.7782 70.6758C39.5576 70.6758 39.392 70.791 39.2817 70.9062C39.1713 70.8486 39.061 70.791 38.8955 70.791C38.2886 70.7334 37.6265 71.3094 37.5713 71.943C37.5162 72.519 38.1782 73.1526 38.73 73.2102C39.1162 73.2678 39.5024 72.9798 39.6679 72.519C39.7231 72.519 39.7782 72.519 39.7782 72.519C40.2196 72.4614 40.661 71.7702 40.6058 71.2518C40.5507 70.9062 40.2196 70.6758 39.7782 70.6758Z" fill="#CAD0E2"/>
+<path d="M40.7199 79.4283C41.051 79.4283 41.1613 79.1979 41.2165 78.9099C41.2165 78.4491 40.9406 77.9883 40.6096 77.9883C40.2234 77.9883 39.782 78.3915 39.782 78.6795C39.7268 79.0827 40.1682 79.4283 40.7199 79.4283Z" fill="#CAD0E2"/>
+<path d="M48.3862 64.918L48 64.918C48.0552 64.9756 48.1655 64.9756 48.2207 64.9756C48.2759 64.9756 48.331 64.918 48.3862 64.918Z" fill="#CAD0E2"/>
+<path d="M41.4887 73.9612C41.4887 73.558 41.1577 73.2701 40.8266 73.3277C40.5508 73.3853 40.3301 73.6733 40.3301 74.0765C40.3853 74.4221 40.6059 74.6524 40.8818 74.5948C41.3232 74.5948 41.5439 74.3068 41.4887 73.9612Z" fill="#CAD0E2"/>
+<path d="M8.05419 107.194C7.8335 107.424 7.8335 107.77 8.05419 108C8.27488 108.173 8.60591 108.173 8.8266 107.943C9.04729 107.712 9.04729 107.309 8.8266 107.136C8.60591 106.963 8.33005 106.906 8.05419 107.194Z" fill="#CAD0E2"/>
+<path d="M8.88396 102.07C9.21499 101.897 9.43568 101.091 9.27017 100.745C8.9943 100.227 8.55292 100.054 8.11155 100.342C7.67017 100.63 7.55982 101.033 7.78051 101.551C8.0012 101.955 8.55292 102.243 8.88396 102.07Z" fill="#CAD0E2"/>
+<path d="M6.5101 108.98C6.84114 108.808 7.00665 108.52 6.84114 108.174C6.67562 107.828 6.34459 107.713 6.06872 107.828C5.79286 107.944 5.62734 108.404 5.73769 108.635C5.84803 108.98 6.17907 109.096 6.5101 108.98Z" fill="#CAD0E2"/>
+<path d="M9.04776 88.5901C9.43397 88.4173 9.70983 87.9565 9.65466 87.6109C9.65466 87.5533 9.59949 87.4381 9.48914 87.3229C9.70983 87.0925 9.87535 86.7469 9.82017 86.2861C9.82017 85.9405 9.70983 85.6525 9.43397 85.4797C9.70983 85.5373 9.93052 85.4797 10.1512 85.3645C10.5374 85.1341 10.7581 84.6157 10.5926 84.2125C10.7029 84.0397 10.7581 83.8093 10.7581 83.5789C10.7581 83.2333 10.4822 83.0029 10.096 82.9453C9.59948 83.5789 9.10293 84.2701 8.66155 84.9613C8.66155 84.9613 8.66155 85.0189 8.71673 85.0189C8.7719 85.1341 8.88224 85.2493 9.04776 85.3645C8.99259 85.3645 8.99259 85.3645 8.93742 85.3645C8.71673 85.3645 8.44086 85.4797 8.27535 85.6525C8.165 85.8253 7.99949 86.0557 7.88914 86.2285C7.83397 86.3437 7.83397 86.5165 7.83397 86.6317C7.83397 86.8045 7.94431 86.9773 8.05466 87.0925C7.99949 87.1501 7.94431 87.2077 7.94431 87.3805C7.88914 87.8989 7.66845 88.1869 7.33742 88.4749C7.06155 88.7053 7.06155 88.9933 7.28224 89.2813C7.50293 89.5693 8.05466 89.6269 8.165 89.2813C8.33052 88.7629 8.71673 88.6477 9.04776 88.5901Z" fill="#CAD0E2"/>
+<path d="M9.378 91.8766C9.65386 91.7038 9.70903 91.4158 9.54352 91.0702C9.26765 90.5518 8.99179 90.3214 8.71593 90.4942C8.3849 90.667 8.16421 91.3006 8.32972 91.6462C8.44007 91.9918 9.04696 92.107 9.378 91.8766Z" fill="#CAD0E2"/>
+<path d="M27.1431 81.107C27.2534 80.3582 26.7569 80.0126 26.3707 79.8398C25.9845 79.667 25.2121 79.7822 25.0465 80.531C24.9362 80.4158 24.8258 80.3582 24.7155 80.4158C24.55 80.4734 24.4948 80.9342 24.55 80.9918C24.6603 81.1646 24.881 81.3374 24.9914 81.2798C25.1017 81.7406 25.3776 82.0286 25.7086 82.0862C26.2603 82.2014 27.0879 81.683 27.1431 81.107Z" fill="#CAD0E2"/>
+<path d="M9.38086 93.4296C9.38086 93.66 9.4912 93.9479 9.76707 93.8903C9.93258 93.8327 10.2084 93.6023 10.2636 93.4871C10.2636 93.3143 10.0429 93.084 9.93258 92.9688C9.4912 92.9688 9.38086 93.1992 9.38086 93.4296Z" fill="#CAD0E2"/>
+<path d="M3.80612 96.7101C4.41301 97.1133 5.07508 96.7677 5.46129 96.2493C5.8475 95.7309 5.57164 94.3485 5.07508 93.9453C4.57853 93.5421 4.0268 94.0605 3.86129 93.9453C3.86129 93.9453 3.80612 93.8877 3.80612 93.8301C3.58543 94.3485 3.36474 94.8669 3.19922 95.3853C3.30956 95.7885 3.36474 96.4221 3.80612 96.7101Z" fill="#CAD0E2"/>
+<path d="M35.3664 89.916C35.4767 90.492 35.8077 90.8952 36.1388 90.8952C36.4146 90.8376 36.5802 90.6648 36.6353 90.3768C36.7457 89.8584 36.6353 89.6856 36.0836 89.3976C35.9181 88.9944 35.8629 88.5912 35.6974 88.3032C35.5319 87.9576 35.0353 87.9576 34.9802 88.3608C34.8698 88.764 34.6491 89.2248 34.8698 89.6856C34.9802 89.7432 35.1457 89.8008 35.3664 89.916Z" fill="#CAD0E2"/>
+<path d="M7.7786 97.8633C8.05446 97.7481 8.16481 97.4025 7.99929 97.1145C7.83377 96.7113 7.3924 96.4809 7.00619 96.5961C6.67515 96.7113 6.50964 97.1721 6.61998 97.4601C6.84067 97.8057 7.44757 98.0361 7.7786 97.8633Z" fill="#CAD0E2"/>
+<path d="M18.3715 75.8619C18.8129 75.8043 19.3646 74.9979 19.2543 74.7675C19.1991 74.6523 18.9233 74.4795 18.5922 74.4219C18.2612 74.6523 17.9853 74.9403 17.6543 75.1707C17.6543 75.2283 17.6543 75.2859 17.7095 75.3435C17.8198 75.6891 18.0405 75.9195 18.3715 75.8619Z" fill="#CAD0E2"/>
+<path d="M17.765 80.1209C17.765 79.7177 17.3237 79.4297 16.6616 79.4297C16.3857 79.4297 16.0547 79.8905 16.0547 80.1785C16.0547 80.5241 16.5512 81.0425 16.8271 81.0425C17.2133 81.1001 17.765 80.5241 17.765 80.1209Z" fill="#CAD0E2"/>
+<path d="M18.5923 81.7352C18.813 81.6776 18.7026 81.3896 18.6475 81.2168C18.6475 81.1592 18.3716 81.044 18.3716 81.1016C18.2613 81.1592 18.1509 81.332 18.2061 81.4472C18.2613 81.5624 18.3716 81.7928 18.5923 81.7352Z" fill="#CAD0E2"/>
+<path d="M12.2487 88.2433C12.4694 88.1857 12.966 88.1857 12.966 87.7825C12.966 87.3793 12.4694 87.3217 12.2487 87.2641C12.0281 87.1489 11.8074 87.4369 11.7522 87.7825C11.7522 88.1281 11.9177 88.3585 12.2487 88.2433Z" fill="#CAD0E2"/>
+<path d="M11.3113 88.8789C11.5872 88.7061 11.6975 88.3605 11.532 88.0149C11.201 87.4389 10.87 87.2661 10.4838 87.4389C10.2079 87.6117 9.9872 88.3029 10.1527 88.5909C10.3182 88.8789 11.0355 89.0517 11.3113 88.8789Z" fill="#CAD0E2"/>
+<path d="M12.7466 86.9217C12.9121 86.6337 12.9121 86.3457 12.6362 86.1153C12.5259 86.0001 12.4155 85.8273 12.3052 85.6545C12.0293 85.1937 11.7535 85.0209 11.2569 85.1361C10.8155 85.2513 10.65 85.5969 10.9259 86.1729C11.1466 86.4033 11.4776 86.7489 11.919 87.0369C12.1948 87.2673 12.5259 87.2097 12.7466 86.9217Z" fill="#CAD0E2"/>
+<path d="M6.34549 102.527C6.511 102.642 6.73169 102.47 6.78687 102.412C6.84204 102.297 6.95238 102.124 6.78687 101.951C6.62135 101.778 6.40066 101.779 6.23514 102.009C6.1248 102.239 6.17997 102.412 6.34549 102.527Z" fill="#CAD0E2"/>
+<path d="M27.7531 83.7547C27.8083 83.4667 27.5324 83.1211 27.1462 83.1211C27.0358 83.2939 26.8703 83.4667 26.8152 83.6971C26.76 83.9851 26.9807 84.1579 27.2565 84.1579C27.4772 84.1579 27.6979 84.1003 27.7531 83.7547Z" fill="#CAD0E2"/>
+<path d="M25.104 94.6398C25.4902 94.6974 25.7661 94.467 25.9316 94.1214C26.0419 93.891 26.0971 93.603 26.1523 93.315C26.2626 93.2574 26.373 93.2574 26.5385 93.1998C26.9798 92.9694 27.3109 92.451 27.2557 92.0478C27.2005 91.5294 26.8695 91.1838 26.4281 90.9534C26.2626 90.8958 26.0419 90.8958 25.8764 90.9534C25.2695 91.2414 25.104 91.8174 25.2695 92.451C25.3247 92.5662 25.3798 92.6814 25.3798 92.8542C25.1592 92.9118 24.8833 92.9694 24.7178 93.0846C24.3316 93.2574 24.2212 93.4878 24.3316 93.9486C24.4419 94.3518 24.7178 94.5822 25.104 94.6398Z" fill="#CAD0E2"/>
+<path d="M28.6334 94.8697C28.5782 94.3513 27.9713 94.2937 27.8058 94.4665C27.6403 94.6393 27.6403 95.0425 27.8058 95.2153C28.0265 95.4457 28.5782 95.3881 28.6334 94.8697Z" fill="#CAD0E2"/>
+<path d="M24.2751 89.7973C24.2751 89.3941 23.944 89.1061 23.5027 89.0485C23.0061 88.9909 22.4544 89.3941 22.3992 89.7973C22.344 90.3157 22.7854 90.8341 23.282 90.8917C23.7233 90.9493 24.2199 90.4309 24.2751 89.7973Z" fill="#CAD0E2"/>
+<path d="M24.716 88.3577C25.1022 88.1849 25.1574 87.7817 25.0471 87.3785C24.716 87.2057 24.385 87.0905 24.1091 87.3785C23.8884 87.6089 23.8884 87.9546 24.1091 88.185C24.2746 88.3002 24.5505 88.4153 24.716 88.3577Z" fill="#CAD0E2"/>
+<path d="M23.726 94.2947C23.8363 94.2371 23.8915 94.0068 23.8363 93.8916C23.8363 93.7764 23.5604 93.7188 23.5053 93.7188C23.3949 93.7764 23.1742 93.9491 23.2294 94.1219C23.3398 94.2947 23.6156 94.2947 23.726 94.2947Z" fill="#CAD0E2"/>
+<path d="M29.022 90.0884C28.9669 89.57 28.36 89.5124 28.1945 89.6852C28.0289 89.858 28.0289 90.2612 28.1945 90.434C28.4703 90.6644 28.6358 90.6068 29.022 90.0884Z" fill="#6C88DF"/>
+<path d="M32.9927 85.5968C33.2134 85.6544 33.6548 85.712 33.8755 85.4816C34.0962 85.2512 34.4824 85.0784 34.4824 84.7904C34.4824 84.5024 34.4272 84.3872 34.2617 84.272C34.1513 84.1568 34.0962 83.984 33.8203 83.8688C33.5444 83.7536 33.0479 83.7536 32.7169 84.0416C32.3858 84.3296 32.3307 84.6752 32.3858 85.0208C32.4962 85.3664 32.772 85.5392 32.9927 85.5968Z" fill="#CAD0E2"/>
+<path d="M34.7578 81.277C34.7578 81.6802 35.3647 82.3714 35.6957 82.3714C36.0819 82.3138 36.413 81.7954 36.413 81.2194C36.413 80.701 36.0268 80.4706 35.4751 80.5282C35.144 80.5282 34.7578 80.9314 34.7578 81.277Z" fill="#CAD0E2"/>
+<path d="M35.42 75.5748C35.8062 75.5748 36.0821 75.2868 36.0821 74.9412C36.0269 74.538 35.5304 73.962 35.2545 74.0196C34.8131 74.0196 34.4821 74.4228 34.5373 74.9988C34.4821 75.3444 34.8683 75.6324 35.42 75.5748Z" fill="#CAD0E2"/>
+<path d="M36.2482 79.5497C36.2482 79.3769 36.0276 79.2617 35.9172 79.2617C35.8069 79.2617 35.531 79.4345 35.531 79.5497C35.531 79.7225 35.862 79.8377 35.9724 79.8377C36.0827 79.8377 36.2482 79.7225 36.2482 79.5497Z" fill="#CAD0E2"/>
+<path d="M32.6064 81.6201C32.6064 81.5049 32.5512 81.4473 32.5512 81.3321C32.5512 81.2745 32.5512 81.2169 32.5512 81.2169C32.496 81.1593 32.4408 81.1017 32.3857 81.1017C32.165 80.8137 31.7236 80.6409 31.3374 80.6985C30.7857 80.7561 30.2891 81.4473 30.3443 81.9657C30.3995 82.5993 30.9512 83.1753 31.5029 83.1177C31.9443 82.9449 32.6064 82.1385 32.6064 81.6201Z" fill="#CAD0E2"/>
+<path d="M23.1155 99.596C23.3914 99.4808 23.281 98.732 23.1707 98.444C23.0603 98.2712 22.6741 98.0408 22.4534 98.156C22.1776 98.2712 22.1776 98.7896 22.2879 99.0776C22.2879 99.308 22.8397 99.7688 23.1155 99.596Z" fill="#CAD0E2"/>
+<path d="M33.8201 78.7398C33.4339 78.7398 32.9925 79.3734 33.0477 79.7766C33.1028 80.0646 33.5994 80.4678 33.9304 80.4678C34.2063 80.4102 34.5373 80.0646 34.4821 79.7766C34.4821 79.0854 34.2063 78.6822 33.8201 78.7398Z" fill="#CAD0E2"/>
+<path d="M21.516 90.8379C21.7918 90.6651 21.9022 90.3195 21.7367 89.9739C21.5711 89.6283 21.2953 89.4555 21.0746 89.5707C20.7987 89.7435 20.6332 90.3195 20.7435 90.6075C20.7987 90.8955 21.1849 91.0107 21.516 90.8379Z" fill="#CAD0E2"/>
+<path d="M15.7242 98.6141C16.2208 98.3261 16.3863 97.9229 16.1656 97.4621C15.9449 97.0589 15.5035 96.8285 15.1725 96.9437C14.7311 97.1741 14.5104 97.9229 14.7311 98.3837C14.8966 98.6717 15.3932 98.7869 15.7242 98.6141Z" fill="#CAD0E2"/>
+<path d="M16.3303 106.624C16.6613 106.451 16.7716 106.105 16.6061 105.702C16.4958 105.414 16.1096 105.299 15.7785 105.472C15.4475 105.645 15.282 106.048 15.4475 106.336C15.613 106.681 15.9992 106.797 16.3303 106.624Z" fill="#CAD0E2"/>
+<path d="M16.7703 100.343C16.66 100.055 16.329 99.8818 16.0531 99.997C15.7772 100.112 15.6117 100.458 15.7221 100.803C15.8324 101.149 16.1083 101.264 16.3841 101.149C16.7703 101.034 16.9359 100.688 16.7703 100.343Z" fill="#CAD0E2"/>
+<path d="M13.8495 96.0806C14.015 96.023 14.1253 95.7926 14.1805 95.5622C14.2909 95.7926 14.5115 95.8502 14.7322 95.7926C14.8978 95.735 15.1184 95.5622 15.1736 95.447C15.3391 94.9862 15.0081 94.7558 14.5667 94.5254C14.4012 94.6406 14.2357 94.7558 14.1253 94.9286L14.1253 94.871C14.015 94.583 13.5184 94.3526 13.2978 94.4678C12.6909 94.7558 12.415 95.2742 12.5805 95.6774C12.8012 96.0806 13.5184 96.2534 13.8495 96.0806Z" fill="#CAD0E2"/>
+<path d="M11.9166 107.945C11.9718 107.945 11.9718 107.772 11.9718 107.714C11.9166 107.657 11.8615 107.599 11.7511 107.657C11.6408 107.714 11.5856 107.829 11.6408 107.887C11.696 107.945 11.9166 108.002 11.9166 107.945Z" fill="#CAD0E2"/>
+<path d="M18.4276 87.034C18.4276 86.2276 18.0966 85.8244 17.3793 85.7668C17.3793 85.6516 17.3793 85.594 17.3242 85.5364C17.1586 85.3636 16.9379 85.3636 16.7173 85.4212C16.4414 85.4788 16.2759 85.882 16.4414 86.1124L16.4966 86.17C16.331 86.4004 16.2207 86.6884 16.2207 86.9764C16.2207 87.2644 16.3862 87.4948 16.6621 87.7252C16.6069 87.7252 16.6069 87.7252 16.5517 87.7828C16.331 87.9556 16.3862 88.1284 16.4414 88.3588C16.5517 88.6468 16.8828 88.762 17.0483 88.5316C17.2138 88.4164 17.3242 88.2436 17.3242 88.0708C17.3793 88.0708 17.4345 88.0708 17.4897 88.0708C18.0414 88.1284 18.4276 87.61 18.4276 87.034Z" fill="#CAD0E2"/>
+<path d="M19.2543 85.5374C19.806 85.5374 20.4129 84.9038 20.4129 84.3854C20.4129 83.7518 19.9716 83.1758 19.4198 83.1758C18.9233 83.1758 18.1509 83.9246 18.0957 84.443C18.0957 84.9614 18.6474 85.5374 19.2543 85.5374Z" fill="#CAD0E2"/>
+<path d="M21.0199 92.5627C21.0199 92.1595 20.6889 91.6411 20.413 91.6411C19.9716 91.5835 19.4199 92.1019 19.4199 92.5627C19.4199 92.9659 19.8613 93.4267 20.3027 93.4843C20.7441 93.4843 20.9647 93.1387 21.0199 92.5627Z" fill="#CAD0E2"/>
+<path d="M11.6421 105.179C11.8077 104.949 12.0283 104.373 11.5318 104.085C10.5939 104.085 10.8145 103.451 10.1525 103.221C10.0421 103.163 9.87662 103.221 9.82145 103.221C9.1042 103.394 8.88352 104.027 9.32489 104.546C9.60076 104.891 9.93179 105.179 10.2628 105.41C10.649 105.698 11.3663 105.525 11.6421 105.179Z" fill="#CAD0E2"/>
+<path d="M17.4898 96.4261C17.7657 96.2533 17.876 95.9653 17.7105 95.6773C17.545 95.2741 17.214 95.1589 16.8829 95.3317C16.6071 95.5045 16.4415 95.9077 16.6071 96.1957C16.7726 96.4261 17.214 96.5989 17.4898 96.4261Z" fill="#CAD0E2"/>
+<path d="M22.6204 82.4269C23.0066 82.2541 23.2825 81.3901 23.0066 81.0445C22.7859 80.6413 21.9583 80.4109 21.4618 80.8717C21.0204 81.3325 20.9652 81.8509 21.1307 82.2541C21.3514 82.6573 22.0687 82.6573 22.6204 82.4269Z" fill="#CAD0E2"/>
+<path d="M17.9313 91.2399C17.8209 91.0671 17.5451 90.9519 17.2692 90.9519C17.214 90.4911 16.883 90.2031 16.3865 90.2031C15.7796 90.2031 15.283 90.7215 15.3382 91.4127C15.3934 91.9311 15.8347 92.3919 16.3865 92.3343C16.4968 92.3343 16.6071 92.2767 16.6623 92.2767C16.883 92.5071 17.214 92.5647 17.4899 92.4495C17.8209 92.2767 18.0968 91.5855 17.9313 91.2399Z" fill="#CAD0E2"/>
+<path d="M281.544 116.411L96.9371 116.411C71.4475 116.411 50.7578 94.8106 50.7578 68.1994C50.7578 41.5883 71.4475 19.9883 96.9371 19.9883L281.544 19.9883C307.034 19.9883 327.723 41.5883 327.723 68.1994C327.723 94.8106 307.034 116.411 281.544 116.411Z" fill="#7DE2D1"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M276.859 116.412L96.9371 116.412C71.4475 116.412 50.7578 94.8124 50.7578 68.2012C50.7578 67.0981 50.7934 66.0032 50.8634 64.918L230.785 64.918C256.275 64.918 276.965 86.518 276.965 113.129C276.965 114.233 276.929 115.328 276.859 116.412Z" fill="#00BFB3"/>
+<path d="M56.221 61.2859C56.3865 60.9403 56.1658 60.1915 55.8348 59.9611C55.3382 59.6731 54.8415 59.8459 54.6208 60.3067C54.4001 60.7675 54.5656 61.2283 55.007 61.4587C55.1173 61.5163 55.2831 61.5739 55.4486 61.5739C55.3934 61.6315 55.3382 61.6891 55.3382 61.7467C55.3382 61.8619 55.4486 62.1499 55.6141 62.1499C55.7796 62.1499 55.8348 61.8619 55.8348 61.6891C55.8348 61.6315 55.8348 61.5739 55.7796 61.5163C56.0003 61.5163 56.1658 61.4011 56.221 61.2859Z" fill="#42D4C6"/>
+<path d="M68.4697 30.9909C68.5249 31.1637 68.58 31.2789 68.8007 31.3365C68.9111 31.3941 69.1869 31.2789 69.2421 31.1637C69.3525 30.9909 69.4076 30.7029 69.2973 30.5877C69.1869 30.3573 69.0214 30.2997 68.8559 30.3573C68.8559 30.2421 68.8559 30.1845 68.8007 30.1269C68.8007 30.0693 68.7456 30.0693 68.7456 30.0117C68.4697 30.2421 68.1938 30.4725 67.918 30.7029C68.1387 30.8757 68.3042 30.9909 68.4697 30.9909Z" fill="#42D4C6"/>
+<path d="M79.3384 28.9767C79.2832 28.9767 79.2281 28.9767 79.1729 28.9767C79.2281 28.8039 79.2832 28.5159 79.2832 28.4007C79.2832 28.1127 79.0625 27.9975 78.7867 28.0551C78.5108 28.1127 78.2901 28.2855 78.4005 28.5159C78.4556 28.6311 78.5108 28.8039 78.6212 28.9191C78.2901 28.9191 77.9039 28.9191 77.5729 28.8615C77.4074 28.8039 77.1867 28.8615 76.966 28.9191C77.0212 28.8039 77.0763 28.6887 77.0763 28.5159C77.0763 28.1127 76.7453 27.8247 76.4143 27.8823C76.0832 27.9399 75.8074 28.2855 75.8625 28.5735C75.9177 28.9191 76.2487 29.2071 76.5798 29.1495C76.5246 29.2071 76.4694 29.3223 76.4694 29.3799C76.4143 29.7255 76.8556 30.0711 77.0212 30.0711C77.4625 30.0135 77.5177 30.3591 77.7384 30.5895C77.9039 30.7623 78.2349 30.8775 78.5108 30.9351C78.6763 30.9927 78.897 30.9351 79.0625 30.9351C79.2281 30.9351 79.4487 30.8775 79.6143 30.8199C80.2212 30.7047 80.4418 30.3591 80.4418 29.8983C80.2763 29.3223 79.8901 28.9767 79.3384 28.9767Z" fill="#42D4C6"/>
+<path d="M72.7183 36.865C72.8286 36.577 72.7183 36.2314 72.4424 35.9434C72.7183 35.8858 72.9941 35.7706 73.2148 35.5978C73.27 35.5402 73.3252 35.4826 73.3803 35.3674C73.4907 35.3098 73.5459 35.2522 73.5459 35.1946C73.5459 35.137 73.5459 35.0218 73.4907 34.9066C73.5459 34.6186 73.4355 34.273 73.27 34.1002C72.939 33.7546 72.1114 33.7546 71.7252 34.273C71.3941 34.7338 71.4493 35.1946 71.6148 35.5402C71.339 35.5978 71.1183 35.7706 70.9528 36.1738C70.8424 36.4042 70.9527 36.8074 71.1183 36.9802C71.0631 36.9802 71.0079 36.9226 70.8976 36.9226C70.4562 36.865 70.1803 37.0954 70.2355 37.7866C70.401 38.0746 70.5665 38.5354 70.8424 38.9386C71.0079 39.2266 71.339 39.2842 71.6148 39.1114C71.8355 38.9386 72.001 38.6506 71.8355 38.305C71.7803 38.1322 71.7252 37.9594 71.67 37.7866C71.6148 37.4986 71.5596 37.3258 71.3941 37.153C71.8907 37.3258 72.6079 37.0954 72.7183 36.865Z" fill="#42D4C6"/>
+<path d="M79.7795 31.2238C79.5036 31.051 79.0071 31.1662 78.8415 31.3966C78.5105 31.9726 78.5657 32.5486 78.8967 32.7214C79.2278 32.9518 79.8347 32.7214 80.1105 32.3182C80.3312 32.0878 80.1657 31.4542 79.7795 31.2238Z" fill="#42D4C6"/>
+<path d="M61.7933 55.1245C61.5726 54.9517 61.1864 55.0093 61.0208 55.2973C60.8553 55.5853 60.9105 55.9885 61.1864 56.1613C61.4622 56.3917 61.7381 56.3341 61.9036 55.9885C62.1243 55.6429 62.0691 55.2973 61.7933 55.1245Z" fill="#42D4C6"/>
+<path d="M62.896 51.901C63.2822 51.8434 63.7236 51.2098 63.7236 50.8066C63.6684 50.2306 63.2822 49.885 62.7856 49.9426C62.565 50.0002 62.4546 50.0578 62.2891 50.173C62.2339 50.1154 62.1787 50.0578 62.0684 50.0002C61.9029 49.8274 61.627 49.8274 61.4615 50.173C61.3512 50.461 61.296 50.6914 61.5718 50.9218C61.6822 50.9794 61.8477 50.9794 62.0132 50.9218L62.0132 50.9794C62.1236 51.4978 62.5649 51.9586 62.896 51.901Z" fill="#42D4C6"/>
+<path d="M61.6827 64.1113C61.6276 64.1689 61.6276 64.3417 61.7379 64.3417C61.8482 64.3993 61.9586 64.2841 61.9586 64.2265C61.9586 64.1689 61.9034 64.0537 61.8482 63.9961C61.8482 63.9961 61.7379 63.9961 61.6827 64.1113Z" fill="#42D4C6"/>
+<path d="M73.3784 33.5829C73.6543 33.2949 73.9853 33.0645 73.7646 32.6613C73.7094 32.5461 73.6543 32.4885 73.5439 32.4309C73.7095 32.2005 73.6543 31.9125 73.5991 31.5669C73.2129 31.5093 72.8267 31.2789 72.606 31.6821C72.4405 31.9701 72.4957 32.2581 72.7163 32.4885C72.6612 32.5461 72.606 32.6613 72.606 32.8341C72.6612 33.2949 72.9922 33.4101 73.3784 33.5829Z" fill="#42D4C6"/>
+<path d="M72.0538 30.872C72.44 30.8144 72.6607 30.584 72.6056 30.2384C72.5504 29.72 72.2193 29.3744 71.8331 29.432C71.7228 29.432 71.5021 29.6624 71.3918 29.8352C71.2262 29.7776 71.0607 29.72 70.84 29.7776C70.3987 29.8352 70.178 30.5264 70.2331 31.16C70.2331 31.3904 70.4538 31.6784 70.7297 31.8512C70.3987 32.024 70.178 32.2544 69.9021 32.5424C69.6262 32.8304 69.9021 33.2912 69.4607 33.2336C69.3504 33.2336 69.24 33.2336 69.1297 33.2336C69.0193 32.888 68.7987 32.6 68.4124 32.3696C67.8607 32.0816 67.309 32.2544 67.0331 32.8304C66.7573 33.3488 67.0331 34.2128 67.5297 34.4432C67.7504 34.5584 67.9711 34.5584 68.2469 34.5008C68.4124 34.7888 68.6883 34.9616 69.0193 35.0192C68.7987 35.2496 68.6331 35.6528 68.6883 35.9984C68.7435 36.5168 69.4056 36.9776 69.9573 36.92C70.4538 36.8048 70.84 36.344 70.7849 35.8832C70.7297 35.4224 70.178 34.9616 69.7366 34.8464C69.9021 34.7312 70.0124 34.616 70.0124 34.4432C70.0676 34.0976 70.7849 34.5008 70.9504 34.04C71.0607 33.5792 71.6676 33.5216 71.778 32.9456C71.8331 32.6 71.778 32.1968 71.5573 31.9664C71.778 31.6784 72.0538 31.2752 72.0538 30.872Z" fill="#42D4C6"/>
+<path d="M59.2553 43.7786C59.1449 44.0666 59.3105 44.7002 59.5311 44.8154C59.6415 44.873 59.807 44.873 59.9174 44.8154C59.9174 44.873 59.9725 44.9306 59.9725 44.9306C60.4139 45.5066 61.1311 45.449 61.6829 45.1034C62.2346 44.7578 62.4553 43.3178 62.1242 42.857C61.7932 42.3386 61.1311 42.569 61.0208 42.3962C60.9656 42.3386 61.0208 42.0506 61.076 41.705L61.1311 41.705C61.1311 41.6474 61.1311 41.5898 61.076 41.5322C61.076 41.3018 61.0208 41.0138 60.9105 40.7834C60.5794 40.3226 59.8622 40.1498 59.3105 40.265C58.8691 40.8986 58.4829 41.5322 58.0415 42.2234L58.0415 42.281C57.9863 42.3386 57.9311 42.3962 57.876 42.3962C57.876 42.4538 57.8208 42.4538 57.8208 42.5114C57.7656 42.6266 57.7656 42.6842 57.7656 42.7994C57.7656 42.9722 57.9311 43.145 58.0967 43.2602C58.0967 43.3754 58.0967 43.4906 58.1518 43.5482C58.2622 43.6058 58.4829 43.4906 58.538 43.3754C58.7036 43.3178 58.8139 43.2026 58.8691 43.0874C59.3105 43.2026 59.807 43.2026 59.9174 43.3178C59.9725 43.3754 59.9174 43.4906 59.9174 43.6058C59.5863 43.4906 59.3656 43.5482 59.2553 43.7786Z" fill="#42D4C6"/>
+<path d="M73.1581 27.0165C73.1581 26.9589 73.2132 26.9014 73.2132 26.8438C72.4408 27.3046 71.7236 27.8229 70.9512 28.3413C71.0615 28.5141 71.1719 28.6869 71.3374 28.7445C71.7236 28.9173 72.3857 28.6869 72.7167 28.3413C72.7167 28.5141 72.7719 28.6869 72.8822 28.8021C73.1581 29.0325 72.4408 29.4933 72.7719 29.8389C73.1029 30.1845 72.827 30.7606 73.2684 31.1638C73.7098 31.567 74.3719 31.6822 74.5925 31.1638C74.5925 31.1062 74.5925 31.1061 74.5925 31.0485C74.7029 31.2213 74.9236 31.4518 75.0339 31.4518C75.1994 31.4518 75.4201 30.9334 75.365 30.8758C75.2546 30.703 74.9788 30.4149 74.8684 30.4725C74.8132 30.4725 74.7581 30.5877 74.7029 30.6453C74.7029 30.3573 74.6477 30.0694 74.5374 29.7238C74.427 29.3206 73.9305 29.3205 74.2063 28.9749C74.4822 28.6293 74.9236 27.7077 74.1512 27.3045C73.765 27.1317 73.2132 27.3045 72.9925 27.6501C72.9925 27.5925 72.9374 27.4774 72.9374 27.4198C72.9925 27.3046 73.1029 27.1893 73.1581 27.0165Z" fill="#42D4C6"/>
+<path d="M54.7304 51.67C54.6752 51.1516 54.3993 50.7484 54.0683 50.6332C54.289 50.518 54.3993 50.3452 54.5097 50.0572C54.5648 49.942 54.5648 49.7692 54.5648 49.654C55.0062 49.7116 55.0062 49.2508 55.1717 48.8476C55.0614 48.7324 54.951 48.6748 54.8407 48.6172C54.1235 50.2876 53.4614 52.0732 52.9648 53.8588C53.1855 53.9164 53.4062 53.9164 53.5717 53.8012C54.0131 53.5132 53.9579 52.9948 53.9028 52.8796C54.3442 52.7068 54.7855 52.1884 54.7304 51.67Z" fill="#42D4C6"/>
+<path d="M76.3047 25.7493C76.1944 26.0373 76.4151 26.9013 76.6358 27.0165C76.9668 27.1893 77.4634 26.9589 77.7392 26.4405C77.9599 25.9797 77.8496 25.6917 77.2978 25.4037C76.9116 25.2309 76.4703 25.4037 76.3047 25.7493Z" fill="#42D4C6"/>
+<path d="M59.8616 49.9386C60.5237 49.9386 60.6892 49.4778 60.7995 48.9018C61.1306 48.9018 61.5168 49.1322 61.6823 48.6138C61.7926 48.3258 61.6823 48.0378 61.4616 47.865C61.0754 47.577 60.7995 47.9226 60.5237 48.153C60.3582 48.0378 60.1375 47.9226 59.972 47.8074C60.0823 47.5194 60.2478 47.289 60.3582 47.0586C60.2478 46.8282 60.1375 46.6554 59.972 46.4826C59.7513 46.2522 59.0892 46.137 58.8685 46.2522C58.5926 46.425 58.5375 46.9434 58.703 47.4042C58.7582 47.577 58.8685 47.6922 58.9237 47.865C58.703 48.2106 58.4271 48.5562 58.4271 48.9018C58.3168 48.9018 58.2616 48.9594 58.1513 48.9594C57.7099 49.0746 57.3789 49.881 57.5995 50.2842C57.8202 50.6874 58.5375 50.9754 59.034 50.6298C58.9789 50.6874 58.9789 50.6874 58.9237 50.745C58.8685 50.8602 58.8685 51.033 58.8685 51.2058C58.7582 51.2058 58.5926 51.2634 58.5375 51.321C58.4271 51.4938 58.372 51.7818 58.4271 51.9546C58.5926 52.3002 58.9237 52.185 59.1444 52.0698C59.1995 51.9546 59.2547 51.7818 59.2547 51.6666C59.5306 51.7242 59.8616 51.5514 59.972 51.321C60.0823 51.033 60.0271 50.6874 59.7513 50.5722C59.5306 50.457 59.3099 50.457 59.1444 50.5146C59.3651 50.2842 59.4754 50.0538 59.5306 49.8234C59.7513 49.9386 59.8064 49.9386 59.8616 49.9386Z" fill="#42D4C6"/>
+<path d="M76.0278 33.0625C76.1382 32.8321 75.8623 32.0833 75.5865 31.9105C75.3106 31.7377 74.9796 31.9105 74.8141 32.3137C74.5934 32.8321 74.6485 33.1201 74.9796 33.2929C75.4209 33.5809 75.8623 33.4657 76.0278 33.0625Z" fill="#42D4C6"/>
+<path d="M79.6679 24.0191C80.2748 23.8463 80.9369 23.7311 81.5438 23.6159C81.9852 24.8831 82.0955 24.9983 82.9783 24.4223C83.0334 23.7311 82.7024 23.3855 82.0955 23.2703C82.0403 23.0399 82.0403 22.8095 81.9852 22.6367C80.8817 23.0399 79.8334 23.4431 78.7852 23.9039C78.8955 24.0767 79.2265 24.1343 79.6679 24.0191Z" fill="#42D4C6"/>
+<path d="M59.9185 54.3165C60.1392 53.7981 60.0289 53.3373 59.6427 53.1069C59.2565 52.8765 58.7047 52.9917 58.5944 53.2797C58.3737 53.7405 58.5944 54.4893 59.0358 54.7197C59.3116 54.8925 59.753 54.6621 59.9185 54.3165Z" fill="#42D4C6"/>
+<path d="M66.0957 44.9302C65.7095 44.9878 65.1026 45.679 65.1578 46.0822C65.213 46.543 65.6544 46.8886 66.1509 46.8886C66.5923 46.8886 67.0888 46.3702 67.0337 45.9094C66.9785 45.391 66.482 44.8726 66.0957 44.9302Z" fill="#42D4C6"/>
+<path d="M67.2538 41.9382C67.1987 41.3622 66.978 41.0742 66.7021 41.0742C66.3711 41.0742 65.9297 41.5926 65.9297 41.9958C65.9297 42.3414 66.4814 42.6294 66.8124 42.5718C67.1435 42.5718 67.309 42.2838 67.2538 41.9382Z" fill="#42D4C6"/>
+<path d="M68.8544 42.7974C69.0199 42.5094 68.8544 42.279 68.6337 42.2214C68.4682 42.1638 67.9716 42.1638 67.8613 42.279C67.7509 42.3942 68.0268 42.855 68.1923 43.0278C68.413 43.2006 68.6889 43.0854 68.8544 42.7974Z" fill="#42D4C6"/>
+<path d="M67.697 39.4006C68.1384 39.4006 68.5246 39.055 68.5798 38.7094C68.635 38.3638 68.1936 37.7302 67.8074 37.615C67.5315 37.5574 67.1453 37.4422 67.035 37.7302C66.8143 38.191 66.4832 38.3638 66.097 38.479C65.766 38.5942 65.6556 38.8822 65.766 39.2278C65.8763 39.5734 66.3729 39.8038 66.5936 39.5734C66.9798 39.2854 67.366 39.2854 67.697 39.4006Z" fill="#42D4C6"/>
+<path d="M65.2133 42.7419C65.1582 42.2235 64.6616 41.8203 64.0547 41.8203C63.4478 41.8203 63.1168 42.2811 63.172 43.0299C63.2271 43.7787 63.5582 44.1243 64.2202 44.0667C64.8823 44.0091 65.2685 43.4907 65.2133 42.7419Z" fill="#42D4C6"/>
+<path d="M65.9308 49.708C65.7653 49.5928 65.3239 49.6504 65.1584 49.9384C64.9929 50.2264 65.3239 50.6296 65.4894 50.8024C65.5998 50.9176 66.317 50.9752 66.4825 50.6872C66.648 50.3992 66.1515 49.8808 65.9308 49.708Z" fill="#42D4C6"/>
+<path d="M66.9796 49.018C66.9796 48.73 66.5934 48.442 66.2624 48.4996C65.9313 48.5572 65.7658 48.9028 65.821 49.2484C65.8762 49.594 66.0969 49.7668 66.4279 49.7092C66.7589 49.7092 67.0348 49.3636 66.9796 49.018Z" fill="#42D4C6"/>
+<path d="M65.7104 32.8884C66.0415 32.8308 66.5932 32.1972 66.5932 31.9092C66.5932 31.9092 66.5932 31.9092 66.5932 31.8516C66.2622 32.1972 65.876 32.4852 65.5449 32.8308C65.5449 32.8884 65.6001 32.8884 65.7104 32.8884Z" fill="#42D4C6"/>
+<path d="M73.7092 43.4869C73.7644 43.3717 73.8196 43.0261 73.6541 42.9685C73.5437 42.9109 73.2679 43.0837 73.2127 43.1989C73.1575 43.3141 73.1575 43.5445 73.323 43.6021C73.4885 43.6597 73.6541 43.6021 73.7092 43.4869Z" fill="#42D4C6"/>
+<path d="M74.2609 39.1122C74.4264 39.1122 74.5919 39.1122 74.7575 38.9394C74.923 38.7666 74.7575 38.5362 74.5368 38.421C74.3161 38.3634 73.985 38.421 73.8195 38.5362C73.5988 38.709 73.7092 38.9394 73.7644 38.997C73.8747 39.1698 74.0402 39.1122 74.2609 39.1122Z" fill="#42D4C6"/>
+<path d="M68.8004 44.3531C69.0763 44.2955 69.3522 44.2379 69.3522 43.8923C69.297 43.3739 69.0211 43.0859 68.6901 43.0859C68.3039 43.1435 68.028 43.4891 68.0832 43.8923C68.1935 44.2379 68.4694 44.4683 68.8004 44.3531Z" fill="#42D4C6"/>
+<path d="M74.6485 37.0945C74.483 37.0369 74.2623 37.0369 74.0968 37.1521C74.1519 37.0369 74.2071 36.9217 74.1519 36.8065C74.1519 36.6913 73.9312 36.4609 73.8209 36.4609C73.6554 36.4609 73.3795 36.5761 73.3243 36.6913C73.1036 37.0945 73.3795 37.2673 73.6554 37.4977C73.7657 37.4977 73.8209 37.4401 73.8761 37.3825L73.8209 37.4401C73.7105 37.7281 73.8209 38.0737 74.0968 38.1889C74.4278 38.3617 74.814 38.2465 74.9795 37.9585C75.0347 37.6705 74.8692 37.2097 74.6485 37.0945Z" fill="#42D4C6"/>
+<path d="M70.235 39.8038C70.1798 39.1126 69.9039 38.8246 69.4626 38.8822C69.1315 38.9398 68.6901 39.5158 68.8005 39.8614C68.8557 40.207 69.4626 40.5526 69.7936 40.495C70.0695 40.4374 70.2901 40.1494 70.235 39.8038Z" fill="#42D4C6"/>
+<path d="M64.0547 45.9661C64.1098 45.8509 64.0547 45.6205 63.9443 45.5629C63.8892 45.5053 63.6133 45.5629 63.5581 45.6205C63.5029 45.7357 63.3926 46.0237 63.5581 46.1389C63.7788 46.2541 63.9995 46.0813 64.0547 45.9661Z" fill="#42D4C6"/>
+<path d="M70.1234 42.6811C70.6199 42.6235 70.6751 42.1627 70.7855 41.8171C70.2889 41.2987 70.013 41.1835 69.7372 41.4139C69.5165 41.5867 69.4062 41.8171 69.4613 42.1051C69.5165 42.4507 69.7924 42.7387 70.1234 42.6811Z" fill="#42D4C6"/>
+<path d="M72.992 40.2021C73.2127 40.3173 73.4334 40.2597 73.5437 39.9141C73.5989 39.6261 73.5989 39.3957 73.323 39.2805C73.1024 39.2229 72.5506 39.2229 72.4403 39.3957C72.3851 39.7413 72.8265 40.0869 72.992 40.2021Z" fill="#42D4C6"/>
+<path d="M64.3315 36.2922C64.7729 36.0042 65.0487 36.3498 65.3798 36.5226C65.8211 36.753 66.1522 36.5802 66.3177 36.1194C66.3177 36.0618 66.3177 36.0042 66.3729 36.0042C66.428 36.0042 66.4832 36.0618 66.5384 36.0618C66.5936 36.1194 66.7039 36.177 66.7039 36.2346C66.7591 36.2922 66.9798 36.177 67.0349 36.177C67.0349 36.1194 67.0349 36.0618 67.0349 36.0042C67.1453 35.9466 67.2005 35.889 67.3108 35.889L67.3108 35.9466C67.3108 35.6586 67.2556 35.3706 67.2556 35.025C67.0349 34.9674 66.8694 34.9098 66.7039 34.9098C66.4832 34.9098 66.2625 35.025 66.1522 35.1978C65.9867 35.0826 65.8211 34.9674 65.5453 35.025C65.2694 35.025 64.9936 35.1402 64.7177 34.737C64.7729 34.5642 64.9384 34.3914 64.9384 34.2186C64.8832 34.0458 64.828 33.873 64.7729 33.7578C64.3315 34.2186 63.8901 34.6794 63.5039 35.1402C63.6143 35.6586 63.8901 36.2922 64.2211 36.4074C64.2211 36.3498 64.2763 36.3498 64.3315 36.2922Z" fill="#42D4C6"/>
+<path d="M64.0547 40.2644C64.0547 39.5732 63.3926 38.9972 62.7306 39.0548C62.1237 39.1124 61.7926 39.5156 61.7375 40.1492C61.6823 40.1492 61.6271 40.2068 61.6271 40.2068C61.5719 40.322 61.6271 40.6676 61.7375 40.7252C61.8478 41.4164 62.2892 41.8196 62.8961 41.762C63.6133 41.762 64.0547 41.1284 64.0547 40.2644Z" fill="#42D4C6"/>
+<path d="M55.7798 53.7976C56.1108 53.9704 56.8281 53.74 56.9936 53.3368C57.1591 53.0488 56.9384 52.4152 56.6074 52.1848C56.3315 52.012 55.835 52.1272 55.6694 52.3576C55.3936 52.9912 55.3936 53.6248 55.7798 53.7976Z" fill="#42D4C6"/>
+<path d="M57.9306 48.2695C58.0961 47.8663 57.9857 47.1751 57.6547 47.0023C57.3788 46.8295 56.772 47.1751 56.5513 47.6359C56.3857 47.9239 56.5513 48.4423 56.8823 48.5575C57.2685 48.7303 57.7651 48.6151 57.9306 48.2695Z" fill="#42D4C6"/>
+<path d="M61.1855 37.7281C61.5718 37.7857 61.7924 37.5553 62.0683 37.1521C62.1235 37.0945 62.1786 36.9793 62.1786 36.9217C62.289 37.1521 62.4545 37.2673 62.62 37.2097C62.7855 37.1521 62.9511 36.9217 62.9511 36.7489C62.9511 36.4609 62.8407 36.2881 62.5097 36.3457C62.4545 36.3457 62.4545 36.3457 62.3993 36.3457C62.3993 36.2881 62.3993 36.2881 62.3993 36.2305C61.958 36.6913 61.5718 37.2097 61.1855 37.7281Z" fill="#42D4C6"/>
+<path d="M55.7231 47.3477C56.1645 47.2325 56.4955 47.5205 56.8817 47.2325C57.3783 46.8869 57.93 46.0805 57.5438 45.1013C57.3783 44.6405 57.1576 44.3525 56.8817 44.1797C56.33 45.2165 55.7783 46.3109 55.2266 47.4053C55.3921 47.4053 55.5576 47.3477 55.7231 47.3477Z" fill="#42D4C6"/>
+<path d="M55.9443 51.2639C56.2753 51.2639 56.5512 50.9183 56.5512 50.6303C56.496 50.2847 56.2202 49.9967 55.8891 50.0543C55.5581 50.0543 55.3926 50.2847 55.3926 50.6303C55.3926 50.9759 55.6133 51.2639 55.9443 51.2639Z" fill="#42D4C6"/>
+<path d="M63.0605 46.1406C62.7295 46.1406 62.3984 46.4862 62.3984 46.8318C62.3984 47.1774 62.895 47.6382 63.2812 47.5806C63.6122 47.5806 63.7777 47.2926 63.7777 46.947C63.8329 46.5438 63.4467 46.1406 63.0605 46.1406Z" fill="#42D4C6"/>
+<path d="M60.9666 53.5139C61.2424 53.3411 61.1873 52.5923 60.9114 52.4771C60.6355 52.4195 60.139 52.9379 60.3045 53.2259C60.4148 53.5139 60.7459 53.6291 60.9666 53.5139Z" fill="#42D4C6"/>
+<path d="M58.5944 58.8721C58.7048 58.9297 59.1461 59.0449 59.2565 58.8721C59.3668 58.6993 59.1461 58.2961 59.0358 58.1809C58.8703 58.0081 58.4289 58.1233 58.3737 58.3537C58.3186 58.5265 58.4289 58.8145 58.5944 58.8721Z" fill="#42D4C6"/>
+<path d="M57.7115 57.4839C58.0978 57.7146 58.4288 57.657 58.6495 57.3111C58.6495 57.3111 58.6495 57.3111 58.6495 57.2535C58.815 57.1383 58.8702 56.9655 58.8702 56.7351C58.8702 56.5047 58.7598 56.3319 58.5943 56.2167C58.5391 56.0439 58.484 55.9287 58.3736 55.8711C57.9874 55.6407 57.546 55.8135 57.2702 56.2743C57.0495 56.8503 57.2702 57.2535 57.7115 57.4839Z" fill="#42D4C6"/>
+<path d="M56.4972 56.9681C56.6075 56.6801 56.4972 56.2769 56.2213 56.1041C55.9454 55.9313 55.5592 56.1041 55.4489 56.3921C55.3385 56.6225 55.3937 56.8529 55.5592 57.0257C55.3385 57.1409 54.9521 57.3137 55.0073 57.6017C55.0625 57.8894 55.4489 57.947 55.6696 58.0046C55.8903 58.0622 56.111 57.947 56.1661 57.6017C56.1661 57.4865 56.1661 57.3713 56.0558 57.2561C56.2213 57.3137 56.3868 57.1985 56.4972 56.9681Z" fill="#42D4C6"/>
+<path d="M57.322 54.8387C57.2668 54.4355 56.9909 54.2051 56.6599 54.2627C56.384 54.3203 56.1082 54.7235 56.1634 55.0691C56.2185 55.4147 56.5496 55.6451 56.8806 55.5875C57.1565 55.4723 57.3771 55.1843 57.322 54.8387Z" fill="#42D4C6"/>
+<path d="M79.5029 39.5723C79.4478 39.2843 79.3374 39.0539 79.0064 39.0539C78.9512 39.0539 78.896 39.0539 78.8409 39.1115C78.896 39.0539 78.896 39.0539 78.896 38.9963C79.1167 38.6507 79.0616 38.3051 78.7857 38.1323C78.4547 37.9019 77.7926 38.0747 77.5719 38.4203C77.4064 38.7083 77.5167 39.1691 77.7926 39.3419C78.0133 39.4571 78.2891 39.4571 78.5098 39.3419C78.4547 39.4571 78.3995 39.5723 78.3995 39.6874C78.3995 39.9178 78.7857 40.0907 79.1167 40.0331C79.3926 39.9755 79.5029 39.8027 79.5029 39.5723Z" fill="#42D4C6"/>
+<path d="M78.7859 43.7763C78.7859 43.6035 78.5652 43.4883 78.4549 43.4883C78.3445 43.4883 78.0135 43.6035 78.0687 43.7763C78.1238 43.9491 78.3445 44.0067 78.3997 44.0067C78.5652 43.9491 78.8411 43.8915 78.7859 43.7763Z" fill="#42D4C6"/>
+<path d="M71.2824 50.2885C71.2272 49.8277 70.8962 49.4245 70.5652 49.4821C70.0686 49.5397 69.6272 50.1733 69.6824 50.6917C69.6824 51.0373 70.1238 51.3253 70.51 51.2677C71.0065 51.1525 71.3376 50.8069 71.2824 50.2885Z" fill="#42D4C6"/>
+<path d="M79.7783 46.0244C79.7783 46.1396 79.9439 46.1972 79.999 46.1972C80.0542 46.1972 80.1094 46.0244 80.1094 46.0244C80.1094 45.9668 80.0542 45.8516 79.9439 45.8516C79.8335 45.8516 79.7232 45.9092 79.7783 46.0244Z" fill="#42D4C6"/>
+<path d="M78.5665 46.1382C78.8976 46.0806 79.0631 45.7926 79.0631 45.3894C79.0079 44.9862 78.8424 44.7558 78.5665 44.8134C78.2355 44.871 77.8493 45.3318 77.9045 45.6198C77.8493 45.9654 78.1803 46.1958 78.5665 46.1382Z" fill="#42D4C6"/>
+<path d="M80.9375 42.107C81.1582 41.5886 80.9375 41.0702 80.3858 40.8398C79.9996 40.667 79.3927 40.955 79.2271 41.4158C79.0065 41.8766 79.2271 42.3373 79.7789 42.6253C80.2754 42.7981 80.7168 42.6254 80.9375 42.107Z" fill="#42D4C6"/>
+<path d="M69.7383 53.3412C69.7383 53.6868 69.9038 53.9172 70.29 53.9172C70.6762 53.9172 70.8969 53.6868 70.8969 53.3412C70.8969 53.0532 70.621 52.7652 70.3452 52.7652C70.0141 52.7076 69.7383 52.9956 69.7383 53.3412Z" fill="#42D4C6"/>
+<path d="M54.013 55.7005C54.2337 55.2973 54.0682 54.6061 53.7372 54.3757C53.4061 54.2029 52.9648 54.2029 52.6889 54.3757C52.5786 54.6637 52.5234 55.0093 52.413 55.2973C52.4682 55.5277 52.5786 55.7581 52.6889 55.9309C52.5234 55.9309 52.3579 55.9309 52.2475 55.9885C52.082 56.5645 51.9717 57.1405 51.8613 57.7166L51.8613 57.7742C51.8613 57.7742 51.8613 57.7742 51.8061 57.8318C51.751 58.0622 51.6958 58.2926 51.6406 58.523C51.6958 58.6382 51.751 58.7534 51.8613 58.8686C52.1372 59.0414 52.7992 58.8686 52.9648 58.523C53.0751 58.3502 53.0751 58.1774 52.9648 58.0622L52.9648 58.0046C53.0199 57.7742 53.0199 57.5437 53.1303 57.3709C53.351 57.0253 53.4061 56.6797 53.2406 56.2765L53.1855 56.2189C53.5717 56.1037 53.8475 55.9309 54.013 55.7005Z" fill="#42D4C6"/>
+<path d="M53.2416 63.8827C53.2416 63.4795 53.076 63.1915 52.9105 63.0187C52.9657 62.9611 52.9657 62.9035 53.0209 62.9035C53.3519 62.3275 53.1312 61.9243 52.745 61.5211C52.9657 61.2331 53.2967 61.0027 53.0209 60.5995C52.8554 60.3115 52.5795 60.2539 52.3036 60.3691C52.2485 60.4267 52.1933 60.4267 52.1381 60.4843C51.9174 60.3115 51.6967 60.2539 51.476 60.2539C51.3105 61.1179 51.2002 62.0395 51.0898 62.9611C51.2002 63.2491 51.3105 63.4795 51.5312 63.5947C51.476 63.7099 51.476 63.7675 51.4209 63.8827C51.3105 64.3435 51.7519 65.0347 52.1933 65.0923C52.5795 65.0347 53.2967 64.5163 53.2416 63.8827Z" fill="#42D4C6"/>
+<path d="M63.5039 58.4111C63.5039 58.5263 63.6694 58.5839 63.7246 58.5839C63.7798 58.5839 63.8349 58.4111 63.8349 58.4111C63.8349 58.3535 63.7798 58.2383 63.6694 58.2383C63.5591 58.2383 63.5039 58.2959 63.5039 58.4111Z" fill="#42D4C6"/>
+<path d="M64.4413 55.8161C64.6068 55.7009 64.8826 55.4129 64.8826 55.0673C65.0482 55.0097 65.1585 54.9521 65.2137 54.7793C65.3792 54.4913 65.2137 54.0305 64.9378 53.9153C64.662 53.8001 64.2757 53.9153 64.1102 54.2033C63.9999 53.9729 63.9999 53.6849 63.724 53.3969C63.6137 53.3393 63.5033 53.2817 63.4482 53.2817C62.7309 53.1665 62.2895 53.6849 62.5102 54.3761C62.6206 54.7793 62.8413 55.1825 63.062 55.5281C63.2826 55.9889 63.9999 56.0465 64.4413 55.8161Z" fill="#42D4C6"/>
+<path d="M64.8266 60.5374C64.9922 60.1918 64.8818 59.8462 64.5508 59.6158C64.2749 59.443 63.8887 59.6158 63.7232 59.9038C63.5577 60.2494 63.6128 60.6526 63.9439 60.8254C64.2749 60.9982 64.6611 60.8254 64.8266 60.5374Z" fill="#42D4C6"/>
+<path d="M66.9228 52.5891C66.978 52.3587 66.6469 52.0132 66.4263 52.1284C66.2607 52.186 66.1504 52.4163 66.1504 52.5891C66.1504 52.7619 66.3159 53.1651 66.5366 53.1651C66.7021 53.1651 66.8676 52.7619 66.9228 52.5891Z" fill="#42D4C6"/>
+<path d="M61.7935 58.4641C61.7935 58.1185 61.2418 57.7729 60.8004 57.8305C60.3038 57.8881 60.028 58.2913 60.0831 58.8097C60.1383 59.3281 60.4693 59.7313 60.8555 59.6737C61.4073 59.5585 61.8487 58.9825 61.7935 58.4641Z" fill="#42D4C6"/>
+<path d="M60.1919 62.1523C60.2471 61.8643 60.0815 61.2307 59.5298 61.3459C59.4195 61.4035 59.3643 61.4611 59.3091 61.5187C59.254 61.4611 59.1436 61.4035 59.0333 61.4035C58.8677 61.4035 58.8126 61.5187 58.7574 61.6339C58.5367 61.5763 58.316 61.4611 57.9298 61.5763C57.8195 61.6339 57.7091 61.7491 57.654 61.7491C57.1574 62.2675 57.3229 62.9587 57.985 63.1315C58.3712 63.2467 58.8126 63.3043 59.254 63.3043C59.6953 63.1891 60.1919 62.6131 60.1919 62.1523Z" fill="#42D4C6"/>
+<path d="M53.9594 65.1495C54.2905 65.2071 54.4008 64.8615 54.456 64.5735C54.2905 64.2279 54.0146 64.0551 53.6836 64.2279C53.5732 64.2855 53.4629 64.5735 53.4629 64.6887C53.6284 64.8615 53.7939 65.0919 53.9594 65.1495Z" fill="#42D4C6"/>
+<path d="M56.4405 63.8261C56.4957 63.4805 55.7784 63.1349 55.6129 63.3077C55.4474 63.4805 55.5577 64.2293 55.8336 64.2869C56.1095 64.2869 56.4405 64.0565 56.4405 63.8261Z" fill="#42D4C6"/>
+<path d="M68.3024 58.9816C68.6886 58.9816 68.9093 58.636 68.8541 58.2328C68.7989 57.9448 68.5231 57.6568 68.1921 57.7144C67.8058 57.772 67.53 58.06 67.5852 58.4056C67.5852 58.7512 67.9162 58.9816 68.3024 58.9816Z" fill="#42D4C6"/>
+<path d="M67.3652 51.8413C67.7514 51.8413 68.3032 51.2077 68.3032 50.8621C68.248 50.3437 67.917 50.1133 67.3652 50.1133C66.9238 50.1709 66.7032 50.5165 66.7583 51.0925C66.7583 51.5533 67.0342 51.8413 67.3652 51.8413Z" fill="#42D4C6"/>
+<path d="M70.3458 47.2342C70.3458 46.8886 69.9596 46.543 69.6838 46.543C69.0217 46.6006 68.5803 46.9462 68.6355 47.407C68.6907 47.8102 69.2424 48.271 69.6838 48.2134C69.9596 48.1558 70.3458 47.5798 70.3458 47.2342Z" fill="#42D4C6"/>
+<path d="M76.2488 37.6155C76.8557 37.5579 77.4074 36.9243 77.3523 36.3483C77.2971 35.8299 76.6902 35.2539 76.1385 35.2539C75.5316 35.2539 75.1454 35.8299 75.2005 36.5787C75.2005 37.2123 75.6419 37.6731 76.2488 37.6155Z" fill="#42D4C6"/>
+<path d="M65.8189 64.3422C66.2051 64.227 66.15 63.7086 66.0396 63.5358C65.9293 63.363 65.4327 63.3054 65.212 63.651C65.1568 63.7662 65.1569 64.0542 65.2672 64.1694C65.4327 64.227 65.7086 64.3422 65.8189 64.3422Z" fill="#42D4C6"/>
+<path d="M66.5924 61.6922C66.6476 61.5194 66.4269 61.0586 66.0407 61.0586C65.9303 61.0586 65.7096 61.2314 65.6545 61.3466C65.5993 61.5194 65.6545 61.8074 65.7648 61.9226C66.0958 62.2106 66.5372 61.865 66.5924 61.6922Z" fill="#42D4C6"/>
+<path d="M80.3857 24.9407C80.1099 24.8255 79.834 24.7103 79.6133 24.5951C79.2271 24.4223 78.6754 24.5951 78.4547 24.9407C78.2892 25.2287 78.3995 25.7471 78.6202 25.8047C79.0064 25.9199 79.3926 26.1503 79.834 25.9199C80.4961 25.7471 80.5512 25.6895 80.3857 24.9407Z" fill="#42D4C6"/>
+<path d="M77.6274 31.3969C77.5722 30.9937 76.9101 30.3601 76.6343 30.4177C76.2481 30.4753 75.917 31.0513 76.0274 31.6273C76.0825 32.1457 76.4688 32.3185 77.0205 32.2609C77.3515 32.2033 77.6825 31.7425 77.6274 31.3969Z" fill="#42D4C6"/>
+<path d="M72.1656 44.0092C72.2207 43.5484 72.2208 43.1452 71.7794 42.9724C71.6139 42.9148 71.338 43.03 71.2828 43.1452C71.1725 43.3756 71.1725 43.7212 71.2276 43.894C71.4483 44.3548 71.8345 44.1244 72.1656 44.0092Z" fill="#42D4C6"/>
+<path d="M72.8825 49.8839C73.1584 49.8263 73.3791 49.5959 73.3791 49.2503C73.3791 48.8471 73.1032 48.5591 72.717 48.6167C72.386 48.6743 72.1101 49.0199 72.1653 49.3079C72.1653 49.5959 72.5515 49.8839 72.8825 49.8839Z" fill="#42D4C6"/>
+<path d="M75.3101 47.9273C75.3653 47.8697 75.3101 47.6393 75.1998 47.5817C75.0894 47.5241 74.9239 47.6393 74.8136 47.7545C74.7584 47.8121 74.7584 48.1001 74.8688 48.1577C75.0343 48.2729 75.255 48.0425 75.3101 47.9273Z" fill="#42D4C6"/>
+<path d="M77.0215 54.9514C77.2973 54.9514 77.4628 54.2026 77.4628 53.9146C77.4628 53.7418 77.187 53.3386 76.8559 53.3962C76.5249 53.4538 76.4145 53.9146 76.3594 54.145C76.3594 54.3178 76.7456 54.9514 77.0215 54.9514Z" fill="#42D4C6"/>
+<path d="M76.4682 39.6303C76.3579 39.3999 76.1372 39.3423 75.9716 39.2847C75.6958 39.2271 75.4199 39.5151 75.4199 39.8607C75.4751 40.1487 75.6406 40.3215 75.9165 40.3791C76.1923 40.3791 76.5785 39.8607 76.4682 39.6303Z" fill="#42D4C6"/>
+<path d="M75.5864 41.9911C75.6415 41.8183 75.2002 41.3575 74.9243 41.4151C74.6484 41.4727 74.6484 41.7031 74.6484 41.9335C74.6484 42.2215 74.9243 42.4519 75.145 42.3367C75.3657 42.2791 75.5864 42.1639 75.5864 41.9911Z" fill="#42D4C6"/>
+<path d="M72.9943 56.1031C73.2701 56.0455 73.546 55.6999 73.546 55.4119C73.4908 55.1239 73.1598 54.8359 72.8839 54.8359C72.5529 54.8359 72.3322 55.1239 72.3874 55.4119C72.3874 55.8151 72.6632 56.1607 72.9943 56.1031Z" fill="#42D4C6"/>
+<path d="M74.2053 46.1401C74.6466 46.0825 75.088 45.5641 75.088 45.1609C75.0328 44.8153 74.4811 44.5273 73.9846 44.5273C73.6535 44.5849 73.3777 44.9881 73.4328 45.3337C73.488 45.8521 73.8742 46.1977 74.2053 46.1401Z" fill="#42D4C6"/>
+<path d="M74.8676 51.3788C75.0332 51.2636 75.0883 51.0332 75.0883 50.8028C75.0883 50.5724 74.978 50.342 74.6469 50.3996C74.3711 50.4572 74.1504 50.5724 74.1504 50.918C74.1504 51.1484 74.7021 51.4364 74.8676 51.3788Z" fill="#42D4C6"/>
+<path d="M78.7315 35.2558C79.0074 35.5438 79.2281 35.947 79.6695 35.6014C79.9453 35.4286 80.0557 35.1406 79.9453 34.795C79.8902 34.6798 79.7798 34.507 79.7246 34.507C79.4488 34.4494 79.1177 34.507 78.7867 34.4494C78.3453 33.8734 77.7936 33.643 77.4626 33.8734C77.1315 34.1614 77.0212 34.9678 77.3522 35.371C77.5729 35.8894 77.9039 35.8894 78.7315 35.2558Z" fill="#42D4C6"/>
+<path d="M82.0977 37.3838C82.3736 36.8078 82.3184 36.059 81.877 35.8286C81.3804 35.5406 80.3873 35.771 80.1667 36.2894C79.946 36.8078 80.1667 37.5566 80.608 37.787C81.1598 38.0174 81.8218 37.8446 82.0977 37.3838Z" fill="#42D4C6"/>
+<path d="M78.7305 36.1747C78.7305 36.2899 78.7856 36.5779 79.0063 36.5779C79.227 36.5779 79.227 36.2899 79.227 36.1171C79.227 36.0595 79.0615 35.8867 79.0063 35.8867C78.896 35.9443 78.7305 36.0595 78.7305 36.1747Z" fill="#42D4C6"/>
+<path d="M79.3924 50.1737C79.5027 50.1737 79.6682 50.0009 79.6682 49.8857C79.6682 49.7705 79.5027 49.5977 79.3924 49.5977C79.282 49.5977 78.951 49.7129 79.0062 49.8857C79.0613 50.1161 79.3372 50.1737 79.3924 50.1737Z" fill="#42D4C6"/>
+</g>
+</svg>
diff --git a/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_results_banner_2024.tsx b/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_results_banner_2024.tsx
new file mode 100644
index 0000000000000..0c73af1ef4861
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/avc_banner/avc_results_banner_2024.tsx
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { css } from '@emotion/css';
+import { i18n } from '@kbn/i18n';
+import { EuiButton, EuiCallOut, EuiSpacer, useEuiTheme } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import { useKibana } from '../../lib/kibana';
+import avcBannerBackground from './avc_banner_background.svg';
+
+export const AVCResultsBanner2024: React.FC<{ onDismiss: () => void }> = ({ onDismiss }) => {
+  const { docLinks } = useKibana().services;
+  const { euiTheme } = useEuiTheme();
+  const bannerTitle = i18n.translate('xpack.securitySolution.common.avcResultsBanner.title', {
+    defaultMessage: '100% protection with zero false positives.',
+  });
+
+  const calloutStyles = css({
+    paddingLeft: `${euiTheme.size.xl}`,
+    backgroundImage: `url(${avcBannerBackground})`,
+    backgroundRepeat: 'no-repeat',
+    backgroundPositionX: 'right',
+    backgroundPositionY: 'bottom',
+  });
+
+  return (
+    <EuiCallOut
+      title={bannerTitle}
+      color="success"
+      iconType="cheer"
+      onDismiss={onDismiss}
+      className={calloutStyles}
+      data-test-subj="avcResultsBanner"
+    >
+      <FormattedMessage
+        id="xpack.securitySolution.common.avcResultsBanner.body"
+        defaultMessage="Elastic Security shines in Malware Protection Test by AV-Comparatives"
+      />
+      <EuiSpacer size="s" />
+      <EuiButton
+        size="s"
+        color="success"
+        href={docLinks.links.securitySolution.avcResults}
+        data-test-subj="avcReadTheBlog"
+      >
+        <FormattedMessage
+          id="xpack.securitySolution.common.avcResults.readTheBlog.link"
+          defaultMessage="Read the blog"
+        />
+      </EuiButton>
+    </EuiCallOut>
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx b/x-pack/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx
index 416dfcae71c99..5c61900876aae 100644
--- a/x-pack/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/control_columns/row_action/index.tsx
@@ -7,14 +7,9 @@
 
 import type { EuiDataGridCellValueElementProps } from '@elastic/eui';
 import React, { useCallback, useMemo } from 'react';
-import { useDispatch } from 'react-redux';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { dataTableActions, TableId } from '@kbn/securitysolution-data-table';
 import { LeftPanelNotesTab } from '../../../../flyout/document_details/left';
-import { useRouteSpy } from '../../../utils/route/use_route_spy';
 import { useKibana } from '../../../lib/kibana';
-import { timelineActions } from '../../../../timelines/store';
-import { SecurityPageName } from '../../../../../common/constants';
 import {
   DocumentDetailsLeftPanelKey,
   DocumentDetailsRightPanelKey,
@@ -23,12 +18,10 @@ import type {
   SetEventsDeleted,
   SetEventsLoading,
   ControlColumnProps,
-  ExpandedDetailType,
 } from '../../../../../common/types';
 import { getMappedNonEcsValue } from '../../../../timelines/components/timeline/body/data_driven_columns';
 import type { TimelineItem, TimelineNonEcsData } from '../../../../../common/search_strategy';
 import type { ColumnHeaderOptions, OnRowSelected } from '../../../../../common/types/timeline';
-import { TimelineId } from '../../../../../common/types';
 import { useIsExperimentalFeatureEnabled } from '../../../hooks/use_experimental_features';
 import { useTourContext } from '../../guided_onboarding_tour';
 import { AlertsCasesTourSteps, SecurityStepId } from '../../guided_onboarding_tour/tour_config';
@@ -79,8 +72,6 @@ const RowActionComponent = ({
   const { telemetry } = useKibana().services;
   const { openFlyout } = useExpandableFlyoutApi();
 
-  const dispatch = useDispatch();
-  const [{ pageName }] = useRouteSpy();
   const { activeStep, isTourShown } = useTourContext();
   const shouldFocusOnOverviewTab =
     (activeStep === AlertsCasesTourSteps.expandEvent ||
@@ -102,72 +93,27 @@ const RowActionComponent = ({
     [columnHeaders, timelineNonEcsData]
   );
 
-  // TODO remove when https://github.com/elastic/security-team/issues/7462 is merged
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
     'securitySolutionNotesEnabled'
   );
-  const showExpandableFlyout =
-    pageName === SecurityPageName.attackDiscovery ? true : !expandableFlyoutDisabled;
 
   const handleOnEventDetailPanelOpened = useCallback(() => {
-    const updatedExpandedDetail: ExpandedDetailType = {
-      panelView: 'eventDetail',
-      params: {
-        eventId: eventId ?? '',
-        indexName: indexName ?? '',
-      },
-    };
-
-    if (showExpandableFlyout) {
-      openFlyout({
-        right: {
-          id: DocumentDetailsRightPanelKey,
-          path: shouldFocusOnOverviewTab ? { tab: 'overview' } : undefined,
-          params: {
-            id: eventId,
-            indexName,
-            scopeId: tableId,
-          },
+    openFlyout({
+      right: {
+        id: DocumentDetailsRightPanelKey,
+        path: shouldFocusOnOverviewTab ? { tab: 'overview' } : undefined,
+        params: {
+          id: eventId,
+          indexName,
+          scopeId: tableId,
         },
-      });
-      telemetry.reportDetailsFlyoutOpened({
-        location: tableId,
-        panel: 'right',
-      });
-    }
-    // TODO remove when https://github.com/elastic/security-team/issues/7462 is merged
-    // support of old flyout in cases page
-    else if (tableId === TableId.alertsOnCasePage) {
-      dispatch(
-        timelineActions.toggleDetailPanel({
-          ...updatedExpandedDetail,
-          id: TimelineId.casePage,
-        })
-      );
-    }
-    // TODO remove when https://github.com/elastic/security-team/issues/7462 is merged
-    // support of old flyout
-    else {
-      dispatch(
-        dataTableActions.toggleDetailPanel({
-          ...updatedExpandedDetail,
-          tabType,
-          id: tableId,
-        })
-      );
-    }
-  }, [
-    eventId,
-    indexName,
-    showExpandableFlyout,
-    tableId,
-    openFlyout,
-    shouldFocusOnOverviewTab,
-    telemetry,
-    dispatch,
-    tabType,
-  ]);
+      },
+    });
+    telemetry.reportDetailsFlyoutOpened({
+      location: tableId,
+      panel: 'right',
+    });
+  }, [eventId, indexName, tableId, openFlyout, shouldFocusOnOverviewTab, telemetry]);
 
   const toggleShowNotes = useCallback(() => {
     openFlyout({
@@ -229,14 +175,12 @@ const RowActionComponent = ({
           showCheckboxes={showCheckboxes}
           tabType={tabType}
           timelineId={tableId}
-          toggleShowNotes={
-            !expandableFlyoutDisabled && securitySolutionNotesEnabled ? toggleShowNotes : undefined
-          }
+          toggleShowNotes={securitySolutionNotesEnabled ? toggleShowNotes : undefined}
           width={width}
           setEventsLoading={setEventsLoading}
           setEventsDeleted={setEventsDeleted}
           refetch={refetch}
-          showNotes={!expandableFlyoutDisabled && securitySolutionNotesEnabled ? true : false}
+          showNotes={securitySolutionNotesEnabled ? true : false}
         />
       )}
     </>
diff --git a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
index 87f926e5b2b7f..661db3720db9a 100644
--- a/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/drag_and_drop/__snapshots__/drag_drop_context_wrapper.test.tsx.snap
@@ -12,11 +12,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.ephemeral_id",
             "searchable": true,
             "type": "string",
@@ -27,11 +22,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.hostname",
             "searchable": true,
             "type": "string",
@@ -42,11 +32,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.id",
             "searchable": true,
             "type": "string",
@@ -57,11 +42,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.name",
             "searchable": true,
             "type": "string",
@@ -76,9 +56,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a0",
             "searchable": true,
             "type": "string",
@@ -89,9 +66,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a1",
             "searchable": true,
             "type": "string",
@@ -102,9 +76,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a2",
             "searchable": true,
             "type": "string",
@@ -119,11 +90,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "date",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "@timestamp",
             "readFromDocValues": true,
             "searchable": true,
@@ -132,11 +98,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
           "_id": Object {
             "aggregatable": false,
             "esTypes": Array [],
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "_id",
             "searchable": true,
             "type": "string",
@@ -147,11 +108,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "text",
             ],
             "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "message",
             "searchable": true,
             "type": "string",
@@ -166,11 +122,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.address",
             "searchable": true,
             "type": "string",
@@ -181,11 +132,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.bytes",
             "searchable": true,
             "type": "number",
@@ -196,11 +142,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.domain",
             "searchable": true,
             "type": "string",
@@ -211,11 +152,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.geo.country_iso_code",
             "searchable": true,
             "type": "string",
@@ -230,11 +166,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "cloud.account.id",
             "searchable": true,
             "type": "string",
@@ -245,11 +176,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "cloud.availability_zone",
             "searchable": true,
             "type": "string",
@@ -264,11 +190,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.id",
             "searchable": true,
             "type": "string",
@@ -279,11 +200,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.image.name",
             "searchable": true,
             "type": "string",
@@ -294,11 +210,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.image.tag",
             "searchable": true,
             "type": "string",
@@ -313,11 +224,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.address",
             "searchable": true,
             "type": "string",
@@ -328,11 +234,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.bytes",
             "searchable": true,
             "type": "number",
@@ -343,11 +244,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.domain",
             "searchable": true,
             "type": "string",
@@ -358,11 +254,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "ip",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.ip",
             "searchable": true,
             "type": "ip",
@@ -373,11 +264,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.port",
             "searchable": true,
             "type": "number",
@@ -392,17 +278,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.action",
             "searchable": true,
             "type": "string",
@@ -413,17 +288,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.category",
             "searchable": true,
             "type": "string",
@@ -434,17 +298,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "date",
             ],
             "format": "",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.end",
             "searchable": true,
             "type": "date",
@@ -455,17 +308,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.kind",
             "searchable": true,
             "type": "string",
@@ -476,17 +318,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "long",
             ],
             "format": "number",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.severity",
             "searchable": true,
             "type": "number",
@@ -501,17 +332,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "host.name",
             "searchable": true,
             "type": "string",
@@ -523,11 +343,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
           "nestedField.firstAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.firstAttributes",
             "searchable": true,
             "subType": Object {
@@ -540,11 +355,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
           "nestedField.secondAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.secondAttributes",
             "searchable": true,
             "subType": Object {
@@ -557,11 +367,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
           "nestedField.thirdAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.thirdAttributes",
             "searchable": true,
             "subType": Object {
@@ -596,11 +401,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "ip",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "source.ip",
             "searchable": true,
             "type": "ip",
@@ -611,11 +411,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "source.port",
             "searchable": true,
             "type": "number",
@@ -630,11 +425,6 @@ exports[`DragDropContextWrapper rendering it renders against the snapshot 1`] =
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "user.name",
             "searchable": true,
             "type": "string",
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.tsx
index af878acd8b104..3f32ba4fd5a00 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/cti_details/threat_summary_view.tsx
@@ -18,7 +18,7 @@ import type {
   TimelineEventsDetailsItem,
   RiskSeverity,
 } from '../../../../../common/search_strategy';
-import { RiskSummary } from '../../../../entity_analytics/components/risk_summary';
+import { RiskSummaryPanel } from '../../../../entity_analytics/components/risk_summary_panel';
 import { EnrichmentSummary } from './enrichment_summary';
 import { RiskScoreEntity } from '../../../../../common/search_strategy';
 import { useHasSecurityCapability } from '../../../../helper_hooks';
@@ -137,7 +137,7 @@ const ThreatSummaryViewComponent: React.FC<{
         {hasEntityAnalyticsCapability && (
           <>
             <EuiFlexItem grow={false}>
-              <RiskSummary
+              <RiskSummaryPanel
                 riskEntity={RiskScoreEntity.host}
                 risk={hostRisk}
                 originalRisk={originalHostRisk}
@@ -145,7 +145,7 @@ const ThreatSummaryViewComponent: React.FC<{
             </EuiFlexItem>
 
             <EuiFlexItem grow={false}>
-              <RiskSummary
+              <RiskSummaryPanel
                 riskEntity={RiskScoreEntity.user}
                 risk={userRisk}
                 originalRisk={originalUserRisk}
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/summary_view.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/summary_view.test.tsx
index 9913c733446e3..228bb87c56bb1 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/summary_view.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/summary_view.test.tsx
@@ -22,7 +22,6 @@ const hostIpValues = ['127.0.0.1', '::1', '10.1.2.3', '2001:0DB8:AC10:FE01::'];
 const hostIpFieldFromBrowserField: BrowserField = {
   aggregatable: true,
   format: '',
-  indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
   name: 'host.ip',
   readFromDocValues: false,
   searchable: true,
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
index 95c6890360637..962fabf53915c 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/field_value_cell.test.tsx
@@ -22,7 +22,6 @@ const hostIpData: EventFieldsData = {
   ariaRowindex: 35,
   field: 'host.ip',
   format: '',
-  indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
   isObjectArray: false,
   name: 'host.ip',
   originalValue: ['127.0.0.1', '::1', '10.1.2.3', '2001:0DB8:AC10:FE01::'],
@@ -87,7 +86,6 @@ describe('FieldValueCell', () => {
       ariaRowindex: 50,
       field: 'message',
       format: '',
-      indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
       isObjectArray: false,
       name: 'message',
       originalValue: ['Endpoint network event'],
@@ -101,7 +99,6 @@ describe('FieldValueCell', () => {
     const messageFieldFromBrowserField: BrowserField = {
       aggregatable: false,
       format: '',
-      indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
       name: 'message',
       readFromDocValues: false,
       searchable: true,
@@ -137,7 +134,6 @@ describe('FieldValueCell', () => {
     const hostIpFieldFromBrowserField: BrowserField = {
       aggregatable: true,
       format: '',
-      indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
       name: 'host.ip',
       readFromDocValues: false,
       searchable: true,
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
index 7facc4e30149e..a3a65e6fe9a2f 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/prevalence_cell.test.tsx
@@ -28,7 +28,6 @@ const hostIpValues = ['127.0.0.1', '::1', '10.1.2.3', '2001:0DB8:AC10:FE01::'];
 const hostIpFieldFromBrowserField: BrowserField = {
   aggregatable: true,
   format: '',
-  indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
   name: 'host.ip',
   readFromDocValues: false,
   searchable: true,
diff --git a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
index 183e634a641c3..4aea3da638972 100644
--- a/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/event_details/table/summary_value_cell.test.tsx
@@ -25,7 +25,6 @@ const hostIpValues = ['127.0.0.1', '::1', '10.1.2.3', '2001:0DB8:AC10:FE01::'];
 const hostIpFieldFromBrowserField: BrowserField = {
   aggregatable: true,
   format: '',
-  indexes: ['auditbeat-*', 'filebeat-*', 'logs-*', 'winlogbeat-*'],
   name: 'host.ip',
   readFromDocValues: false,
   searchable: true,
@@ -56,7 +55,6 @@ const enrichedAgentStatusData: AlertSummaryRow['description'] = {
     format: '',
     type: '',
     aggregatable: false,
-    indexes: [],
     name: AGENT_STATUS_FIELD_NAME,
     searchable: false,
     readFromDocValues: false,
diff --git a/x-pack/plugins/security_solution/public/common/components/header_actions/actions.tsx b/x-pack/plugins/security_solution/public/common/components/header_actions/actions.tsx
index 9ae3f3adfed80..e8ba1e8c22d05 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_actions/actions.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_actions/actions.tsx
@@ -220,8 +220,6 @@ const ActionsComponent: React.FC<ActionProps> = ({
     'securitySolutionNotesEnabled'
   );
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
-
   /* only applicable for new event based notes */
   const documentBasedNotes = useSelector((state: State) => selectNotesByDocumentId(state, eventId));
 
@@ -232,18 +230,15 @@ const ActionsComponent: React.FC<ActionProps> = ({
   );
 
   const notesCount = useMemo(
-    () =>
-      securitySolutionNotesEnabled && !expandableFlyoutDisabled
-        ? documentBasedNotes.length
-        : timelineNoteIds.length,
-    [documentBasedNotes, timelineNoteIds, securitySolutionNotesEnabled, expandableFlyoutDisabled]
+    () => (securitySolutionNotesEnabled ? documentBasedNotes.length : timelineNoteIds.length),
+    [documentBasedNotes, timelineNoteIds, securitySolutionNotesEnabled]
   );
 
   const noteIds = useMemo(() => {
-    return securitySolutionNotesEnabled && !expandableFlyoutDisabled
+    return securitySolutionNotesEnabled
       ? documentBasedNotes.map((note) => note.noteId)
       : timelineNoteIds;
-  }, [documentBasedNotes, timelineNoteIds, securitySolutionNotesEnabled, expandableFlyoutDisabled]);
+  }, [documentBasedNotes, timelineNoteIds, securitySolutionNotesEnabled]);
 
   return (
     <ActionsContainer>
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.test.tsx b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.test.tsx
index f3e6dfdd644c3..fb7b6b4c9ec6b 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.test.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import React from 'react';
-import { render } from '@testing-library/react';
 import { OnboardingComponent } from './onboarding';
 import {
   AddIntegrationsSteps,
@@ -15,44 +14,19 @@ import {
   ViewDashboardSteps,
 } from './types';
 import { ProductLine, ProductTier } from './configs';
+import { useCurrentUser, useKibana } from '../../../lib/kibana';
+import type { AppContextTestRender } from '../../../mock/endpoint';
+import { createAppRootMockRenderer } from '../../../mock/endpoint';
+
 jest.mock('./toggle_panel');
-jest.mock('./hooks/use_project_features_url');
-jest.mock('./hooks/use_projects_url');
-jest.mock('../../../lib/kibana', () => {
-  const original = jest.requireActual('../../../lib/kibana');
-  return {
-    ...original,
-    useCurrentUser: jest.fn().mockReturnValue({ fullName: 'UserFullName' }),
-    useAppUrl: jest.fn().mockReturnValue({ getAppUrl: jest.fn().mockReturnValue('mock url') }),
-  };
-});
-jest.mock('@elastic/eui', () => {
-  const original = jest.requireActual('@elastic/eui');
-  return {
-    ...original,
-    useEuiTheme: jest.fn().mockReturnValue({
-      euiTheme: {
-        base: 16,
-        size: { xs: '4px', m: '12px', l: '24px', xl: '32px', xxl: '40px' },
-        colors: { lightestShade: '' },
-        font: {
-          weight: { bold: 700 },
-        },
-      },
-    }),
-  };
-});
-jest.mock('react-router-dom', () => ({
-  useLocation: jest.fn().mockReturnValue({ hash: '#watch_the_overview_video' }),
-}));
-jest.mock('@kbn/security-solution-navigation', () => ({
-  useNavigateTo: jest.fn().mockReturnValue({ navigateTo: jest.fn() }),
-  SecurityPageName: {
-    landing: 'landing',
-  },
-}));
+jest.mock('../../../lib/kibana');
+
+(useCurrentUser as jest.Mock).mockReturnValue({ fullName: 'UserFullName' });
 
 describe('OnboardingComponent', () => {
+  let render: () => ReturnType<AppContextTestRender['render']>;
+  let renderResult: ReturnType<typeof render>;
+  let mockedContext: AppContextTestRender;
   const props = {
     indicesExist: true,
     productTypes: [{ product_line: ProductLine.security, product_tier: ProductTier.complete }],
@@ -65,16 +39,22 @@ describe('OnboardingComponent', () => {
     ],
     spaceId: 'spaceId',
   };
+
   beforeEach(() => {
+    mockedContext = createAppRootMockRenderer();
+    render = () => (renderResult = mockedContext.render(<OnboardingComponent {...props} />));
+  });
+
+  afterEach(() => {
     jest.clearAllMocks();
   });
 
   it('should render page title, subtitle, and description', () => {
-    const { getByText } = render(<OnboardingComponent {...props} />);
+    render();
 
-    const pageTitle = getByText('Hi UserFullName!');
-    const subtitle = getByText(`Get started with Security`);
-    const description = getByText(
+    const pageTitle = renderResult.getByText('Hi UserFullName!');
+    const subtitle = renderResult.getByText(`Get started with Security`);
+    const description = renderResult.getByText(
       `This area shows you everything you need to know. Feel free to explore all content. You can always come back here at any time.`
     );
 
@@ -84,12 +64,41 @@ describe('OnboardingComponent', () => {
   });
 
   it('should render welcomeHeader and TogglePanel', () => {
-    const { getByTestId } = render(<OnboardingComponent {...props} />);
+    render();
 
-    const welcomeHeader = getByTestId('welcome-header');
-    const togglePanel = getByTestId('toggle-panel');
+    const welcomeHeader = renderResult.getByTestId('welcome-header');
+    const togglePanel = renderResult.getByTestId('toggle-panel');
 
     expect(welcomeHeader).toBeInTheDocument();
     expect(togglePanel).toBeInTheDocument();
   });
+  describe('AVC 2024 Results banner', () => {
+    it('should render on the page', () => {
+      render();
+      expect(renderResult.getByTestId('avcResultsBanner')).toBeTruthy();
+    });
+
+    it('should link to the blog post', () => {
+      render();
+      expect(renderResult.getByTestId('avcReadTheBlog')).toHaveAttribute(
+        'href',
+        'https://www.elastic.co/blog/elastic-security-malware-protection-test-av-comparatives'
+      );
+    });
+
+    it('on closing the callout should store dismissal state in local storage', () => {
+      render();
+      renderResult.getByTestId('euiDismissCalloutButton').click();
+      expect(renderResult.queryByTestId('avcResultsBanner')).toBeNull();
+      expect(useKibana().services.storage.set).toHaveBeenCalledWith(
+        'securitySolution.showAvcBanner',
+        false
+      );
+    });
+    it('should stay dismissed if it has been closed once', () => {
+      (useKibana().services.storage.get as jest.Mock).mockReturnValue(false);
+      render();
+      expect(renderResult.queryByTestId('avcResultsBanner')).toBeNull();
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.tsx b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.tsx
index 624070c812ed7..c19f03f63461d 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/onboarding.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback, useMemo } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import { KibanaPageTemplate } from '@kbn/shared-ux-page-kibana-template';
 
 import { TogglePanel } from './toggle_panel';
@@ -24,6 +24,7 @@ import type { StepId } from './types';
 import { useOnboardingStyles } from './styles/onboarding.styles';
 import { useKibana } from '../../../lib/kibana';
 import type { OnboardingHubStepLinkClickedParams } from '../../../lib/telemetry/events/onboarding/types';
+import { AVCResultsBanner2024 } from '../../avc_banner/avc_results_banner_2024';
 
 interface OnboardingProps {
   indicesExist?: boolean;
@@ -55,8 +56,9 @@ export const OnboardingComponent: React.FC<OnboardingProps> = ({
       productTypes?.find((product) => product.product_line === ProductLine.security)?.product_tier,
     [productTypes]
   );
-  const { wrapperStyles, progressSectionStyles, stepsSectionStyles } = useOnboardingStyles();
-  const { telemetry } = useKibana().services;
+  const { wrapperStyles, progressSectionStyles, stepsSectionStyles, bannerStyles } =
+    useOnboardingStyles();
+  const { telemetry, storage } = useKibana().services;
   const onStepLinkClicked = useCallback(
     (params: OnboardingHubStepLinkClickedParams) => {
       telemetry.reportOnboardingHubStepLinkClicked(params);
@@ -64,10 +66,23 @@ export const OnboardingComponent: React.FC<OnboardingProps> = ({
     [telemetry]
   );
 
+  const [showAVCBanner, setShowAVCBanner] = useState(
+    storage.get('securitySolution.showAvcBanner') ?? true
+  );
+  const onBannerDismiss = useCallback(() => {
+    setShowAVCBanner(false);
+    storage.set('securitySolution.showAvcBanner', false);
+  }, [storage]);
+
   useScrollToHash();
 
   return (
     <div className={wrapperStyles}>
+      {showAVCBanner && (
+        <KibanaPageTemplate.Section paddingSize="none" className={bannerStyles}>
+          <AVCResultsBanner2024 onDismiss={onBannerDismiss} />
+        </KibanaPageTemplate.Section>
+      )}
       <KibanaPageTemplate.Section restrictWidth={CONTENT_WIDTH} paddingSize="xl">
         <WelcomeHeader productTier={productTier} />
       </KibanaPageTemplate.Section>
diff --git a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/styles/onboarding.styles.ts b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/styles/onboarding.styles.ts
index f4a3901f4e2c0..4f2eb59f06bf2 100644
--- a/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/styles/onboarding.styles.ts
+++ b/x-pack/plugins/security_solution/public/common/components/landing_page/onboarding/styles/onboarding.styles.ts
@@ -25,6 +25,9 @@ export const useOnboardingStyles = () => {
         padding: `0 ${euiTheme.size.xxl} ${euiTheme.size.xxxl}`,
         backgroundColor: euiTheme.colors.lightestShade,
       }),
+      bannerStyles: css({
+        margin: `-${euiTheme.size.l} 0`,
+      }),
     }),
     [
       euiTheme.colors.lightestShade,
diff --git a/x-pack/plugins/security_solution/public/common/containers/source/mock.ts b/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
index ad0a86d2490df..f2101d6214ecd 100644
--- a/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
+++ b/x-pack/plugins/security_solution/public/common/containers/source/mock.ts
@@ -7,7 +7,6 @@
 
 import type { MappingRuntimeFieldType } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import { flatten } from 'lodash';
-import { DEFAULT_INDEX_PATTERN } from '../../../../common/constants';
 import type { BrowserFields } from '../../../../common/search_strategy/index_fields';
 
 export const mocksSource = {
@@ -54,7 +53,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.ephemeral_id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.ephemeral_id',
         searchable: true,
         type: 'string',
@@ -63,7 +61,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.hostname': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.hostname',
         searchable: true,
         type: 'string',
@@ -72,7 +69,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.id',
         searchable: true,
         type: 'string',
@@ -81,7 +77,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.name',
         searchable: true,
         type: 'string',
@@ -94,7 +89,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a0': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a0',
         searchable: true,
         type: 'string',
@@ -103,7 +97,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a1': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a1',
         searchable: true,
         type: 'string',
@@ -112,7 +105,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a2': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a2',
         searchable: true,
         type: 'string',
@@ -125,7 +117,6 @@ export const mockBrowserFields: BrowserFields = {
       '@timestamp': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: '@timestamp',
         searchable: true,
         type: 'date',
@@ -138,7 +129,6 @@ export const mockBrowserFields: BrowserFields = {
         esTypes: [],
         searchable: true,
         aggregatable: false,
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
       message: {
         name: 'message',
@@ -147,7 +137,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: false,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -156,7 +145,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.address',
         searchable: true,
         type: 'string',
@@ -165,7 +153,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.bytes',
         searchable: true,
         type: 'number',
@@ -174,7 +161,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.domain',
         searchable: true,
         type: 'string',
@@ -183,7 +169,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.geo.country_iso_code': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.geo.country_iso_code',
         searchable: true,
         type: 'string',
@@ -196,7 +181,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.account.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.account.id',
         searchable: true,
         type: 'string',
@@ -205,7 +189,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.availability_zone': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.availability_zone',
         searchable: true,
         type: 'string',
@@ -218,7 +201,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.id',
         searchable: true,
         type: 'string',
@@ -227,7 +209,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.name',
         searchable: true,
         type: 'string',
@@ -236,7 +217,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.tag': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.tag',
         searchable: true,
         type: 'string',
@@ -249,7 +229,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.address',
         searchable: true,
         type: 'string',
@@ -258,7 +237,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.bytes',
         searchable: true,
         type: 'number',
@@ -267,7 +245,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.domain',
         searchable: true,
         type: 'string',
@@ -276,7 +253,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.ip',
         searchable: true,
         type: 'ip',
@@ -285,7 +261,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.port',
         searchable: true,
         type: 'number',
@@ -297,7 +272,6 @@ export const mockBrowserFields: BrowserFields = {
     fields: {
       'event.end': {
         format: '',
-        indexes: DEFAULT_INDEX_PATTERN,
         name: 'event.end',
         searchable: true,
         type: 'date',
@@ -311,7 +285,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.category': {
         name: 'event.category',
@@ -320,7 +293,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.severity': {
         name: 'event.severity',
@@ -329,7 +301,6 @@ export const mockBrowserFields: BrowserFields = {
         format: 'number',
         searchable: true,
         aggregatable: true,
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.kind': {
         name: 'event.kind',
@@ -338,7 +309,6 @@ export const mockBrowserFields: BrowserFields = {
         format: 'string',
         searchable: true,
         aggregatable: true,
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -351,7 +321,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -360,7 +329,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.ip',
         searchable: true,
         type: 'ip',
@@ -369,7 +337,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.port',
         searchable: true,
         type: 'number',
@@ -386,7 +353,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -395,7 +361,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.firstAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.firstAttributes',
         searchable: true,
         type: 'string',
@@ -408,7 +373,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.secondAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.secondAttributes',
         searchable: true,
         type: 'string',
@@ -421,7 +385,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.thirdAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.thirdAttributes',
         searchable: true,
         type: 'date',
diff --git a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_alert_response_actions_support.ts b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_alert_response_actions_support.ts
index 60917dfb3a9f7..e56c10d589f5f 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_alert_response_actions_support.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/endpoint/use_alert_response_actions_support.ts
@@ -184,7 +184,7 @@ export const useAlertResponseActionsSupport = (
       );
     }
 
-    return getAlertDetailsFieldValue({ category: 'host', field: 'host.os.family' }, eventData);
+    return getAlertDetailsFieldValue({ category: 'host', field: 'host.os.type' }, eventData);
   }, [agentType, eventData]);
 
   const unsupportedReason = useMemo(() => {
diff --git a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts b/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts
deleted file mode 100644
index 659fc15ca5ea5..0000000000000
--- a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_init_flyout_url_param.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useCallback, useEffect, useState } from 'react';
-import { useDispatch } from 'react-redux';
-import { useLocation } from 'react-router-dom';
-import {
-  dataTableSelectors,
-  TableId,
-  tableDefaults,
-  dataTableActions,
-} from '@kbn/securitysolution-data-table';
-import { useIsExperimentalFeatureEnabled } from '../use_experimental_features';
-import { useInitializeUrlParam } from '../../utils/global_query_string';
-import { URL_PARAM_KEY } from '../use_url_state';
-import type { FlyoutUrlState } from './types';
-import { useShallowEqualSelector } from '../use_selector';
-import { getQueryStringKeyValue } from '../timeline/use_query_timeline_by_id_on_url_change';
-
-/**
- * The state of the old flyout of the table in the Alerts page is stored in local storage.
- * This hook was created to initialize things and populate the url with the correct param and its value.
- * This is only be needed with the old flyout.
- * // TODO remove this hook entirely when we delete the old flyout code
- */
-
-export const useInitFlyoutFromUrlParam = () => {
-  const { search } = useLocation();
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
-  const [urlDetails, setUrlDetails] = useState<FlyoutUrlState | null>(null);
-  const [hasLoadedUrlDetails, updateHasLoadedUrlDetails] = useState(false);
-  const dispatch = useDispatch();
-  const getDataTable = dataTableSelectors.getTableByIdSelector();
-
-  // Only allow the alerts page for now to be saved in the url state.
-  // Allowing only one makes the transition to the expanded flyout much easier as well
-  const dataTableCurrent = useShallowEqualSelector(
-    (state) => getDataTable(state, TableId.alertsOnAlertsPage) ?? tableDefaults
-  );
-
-  const onInitialize = useCallback(
-    (initialState: FlyoutUrlState | null) => {
-      if (expandableFlyoutDisabled && initialState != null && initialState.panelView) {
-        setUrlDetails(initialState);
-      }
-    },
-    [expandableFlyoutDisabled]
-  );
-
-  const loadExpandedDetailFromUrl = useCallback(() => {
-    if (!expandableFlyoutDisabled) return;
-
-    const { initialized, isLoading, totalCount, additionalFilters } = dataTableCurrent;
-    const isTableLoaded = initialized && !isLoading && totalCount > 0;
-    if (urlDetails) {
-      if (!additionalFilters || !additionalFilters.showBuildingBlockAlerts) {
-        // We want to show building block alerts when loading the flyout in case the alert is a building block alert
-        dispatch(
-          dataTableActions.updateShowBuildingBlockAlertsFilter({
-            id: TableId.alertsOnAlertsPage,
-            showBuildingBlockAlerts: true,
-          })
-        );
-      }
-
-      if (isTableLoaded) {
-        updateHasLoadedUrlDetails(true);
-        dispatch(
-          dataTableActions.toggleDetailPanel({
-            id: TableId.alertsOnAlertsPage,
-            ...urlDetails,
-          })
-        );
-      }
-    }
-  }, [dataTableCurrent, dispatch, expandableFlyoutDisabled, urlDetails]);
-
-  // The alert page creates a default dataTable slice in redux initially that is later overriden when data is retrieved
-  // We use the below to store the urlDetails on app load, and then set it when the table is done loading and has data
-  useEffect(() => {
-    if (expandableFlyoutDisabled && !hasLoadedUrlDetails) {
-      loadExpandedDetailFromUrl();
-    }
-  }, [hasLoadedUrlDetails, expandableFlyoutDisabled, loadExpandedDetailFromUrl]);
-
-  // We check the url for the presence of the old `evenFlyout` parameter. If it exists replace it with the new `flyout` key.
-  const eventFlyoutKey = getQueryStringKeyValue({ urlKey: URL_PARAM_KEY.eventFlyout, search });
-  let currentKey = '';
-  let newKey = '';
-  if (expandableFlyoutDisabled) {
-    if (eventFlyoutKey) {
-      currentKey = URL_PARAM_KEY.eventFlyout;
-      newKey = URL_PARAM_KEY.flyout;
-    } else {
-      currentKey = URL_PARAM_KEY.flyout;
-    }
-  }
-  useInitializeUrlParam(currentKey, onInitialize, newKey);
-};
diff --git a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_sync_flyout_url_param.ts b/x-pack/plugins/security_solution/public/common/hooks/flyout/use_sync_flyout_url_param.ts
deleted file mode 100644
index a6f4904d37cd9..0000000000000
--- a/x-pack/plugins/security_solution/public/common/hooks/flyout/use_sync_flyout_url_param.ts
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-import { useDispatch } from 'react-redux';
-import {
-  dataTableActions,
-  dataTableSelectors,
-  tableDefaults,
-  TableId,
-} from '@kbn/securitysolution-data-table';
-import { useIsExperimentalFeatureEnabled } from '../use_experimental_features';
-import { ALERTS_PATH } from '../../../../common/constants';
-import { useUpdateUrlParam } from '../../utils/global_query_string';
-import { useShallowEqualSelector } from '../use_selector';
-import { URL_PARAM_KEY } from '../use_url_state';
-import type { FlyoutUrlState } from './types';
-
-/**
- * The state of the old flyout of the table in the Alerts page is stored in local storage.
- * This hook was created to sync the data stored in local storage to the url.
- * This is only be needed with the old flyout.
- * // TODO remove this hook entirely when we delete the old flyout code
- */
-export const useSyncFlyoutUrlParam = () => {
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
-  const updateUrlParam = useUpdateUrlParam<FlyoutUrlState>(URL_PARAM_KEY.flyout);
-  const { pathname } = useLocation();
-  const dispatch = useDispatch();
-  const getDataTable = dataTableSelectors.getTableByIdSelector();
-
-  // Only allow the alerts page for now to be saved in the url state
-  const { expandedDetail } = useShallowEqualSelector(
-    (state) => getDataTable(state, TableId.alertsOnAlertsPage) ?? tableDefaults
-  );
-
-  useEffect(() => {
-    if (!expandableFlyoutDisabled) return;
-
-    const isOnAlertsPage = pathname === ALERTS_PATH;
-    if (isOnAlertsPage && expandedDetail != null && expandedDetail?.query) {
-      updateUrlParam(expandedDetail.query.panelView ? expandedDetail.query : null);
-    } else if (!isOnAlertsPage && expandedDetail?.query?.panelView) {
-      // Close the detail panel as it's stored in a top level redux store maintained across views
-      dispatch(
-        dataTableActions.toggleDetailPanel({
-          id: TableId.alertsOnAlertsPage,
-        })
-      );
-      // Clear the reference from the url
-      updateUrlParam(null);
-    }
-  }, [dispatch, expandedDetail, expandableFlyoutDisabled, pathname, updateUrlParam]);
-};
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_url_state.ts b/x-pack/plugins/security_solution/public/common/hooks/use_url_state.ts
index 597a87f6844d2..47168d76e8ec3 100644
--- a/x-pack/plugins/security_solution/public/common/hooks/use_url_state.ts
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_url_state.ts
@@ -12,8 +12,6 @@ import { useUpdateTimerangeOnPageChange } from './search_bar/use_update_timerang
 import { useInitTimelineFromUrlParam } from './timeline/use_init_timeline_url_param';
 import { useSyncTimelineUrlParam } from './timeline/use_sync_timeline_url_param';
 import { useQueryTimelineByIdOnUrlChange } from './timeline/use_query_timeline_by_id_on_url_change';
-import { useInitFlyoutFromUrlParam } from './flyout/use_init_flyout_url_param';
-import { useSyncFlyoutUrlParam } from './flyout/use_sync_flyout_url_param';
 
 export const useUrlState = () => {
   useSyncGlobalQueryString();
@@ -23,8 +21,6 @@ export const useUrlState = () => {
   useInitTimelineFromUrlParam();
   useSyncTimelineUrlParam();
   useQueryTimelineByIdOnUrlChange();
-  useInitFlyoutFromUrlParam();
-  useSyncFlyoutUrlParam();
 };
 
 export const URL_PARAM_KEY = {
diff --git a/x-pack/plugins/security_solution/public/common/lib/process_actions/index.ts b/x-pack/plugins/security_solution/public/common/lib/process_actions/index.ts
index ef38144a5c53c..b8cb7c04f469c 100644
--- a/x-pack/plugins/security_solution/public/common/lib/process_actions/index.ts
+++ b/x-pack/plugins/security_solution/public/common/lib/process_actions/index.ts
@@ -6,16 +6,15 @@
  */
 
 import type {
-  KillOrSuspendProcessRequestBody,
   ResponseActionApiResponse,
+  KillProcessRequestBody,
+  SuspendProcessRequestBody,
 } from '../../../../common/endpoint/types';
 import { KibanaServices } from '../kibana';
 import { KILL_PROCESS_ROUTE, SUSPEND_PROCESS_ROUTE } from '../../../../common/endpoint/constants';
 
 /** Kills a process specified by pid or entity id on a host running Endpoint Security */
-export const killProcess = (
-  params: KillOrSuspendProcessRequestBody
-): Promise<ResponseActionApiResponse> => {
+export const killProcess = (params: KillProcessRequestBody): Promise<ResponseActionApiResponse> => {
   return KibanaServices.get().http.post<ResponseActionApiResponse>(KILL_PROCESS_ROUTE, {
     body: JSON.stringify(params),
     version: '2023-10-31',
@@ -24,7 +23,7 @@ export const killProcess = (
 
 /** Suspends a process specified by pid or entity id on a host running Endpoint Security */
 export const suspendProcess = (
-  params: KillOrSuspendProcessRequestBody
+  params: SuspendProcessRequestBody
 ): Promise<ResponseActionApiResponse> => {
   return KibanaServices.get().http.post<ResponseActionApiResponse>(SUSPEND_PROCESS_ROUTE, {
     body: JSON.stringify(params),
diff --git a/x-pack/plugins/security_solution/public/common/mock/endpoint/endpoint_alert_data_mock.ts b/x-pack/plugins/security_solution/public/common/mock/endpoint/endpoint_alert_data_mock.ts
index 0de961badd9b1..98b94d05353ca 100644
--- a/x-pack/plugins/security_solution/public/common/mock/endpoint/endpoint_alert_data_mock.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/endpoint/endpoint_alert_data_mock.ts
@@ -119,6 +119,13 @@ const generateEndpointAlertDetailsItemDataMock = (
     {
       category: 'host',
       field: 'host.os.family',
+      values: ['Windows Server'],
+      originalValue: ['Windows Server'],
+      isObjectArray: false,
+    },
+    {
+      category: 'host',
+      field: 'host.os.type',
       values: ['windows'],
       originalValue: ['windows'],
       isObjectArray: false,
@@ -191,13 +198,6 @@ const generateCrowdStrikeAlertDetailsItemDataMock = (
       originalValue: ['abfe4a35-d5b4-42a0-a539-bd054c791769'],
       isObjectArray: false,
     },
-    {
-      category: 'host',
-      field: 'host.os.type',
-      values: ['windows'],
-      originalValue: ['windows'],
-      isObjectArray: false,
-    },
     {
       category: 'host',
       field: 'host.os.platform',
diff --git a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
index 36466231b64a4..24be4de96cf9b 100644
--- a/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/mock_local_storage.ts
@@ -27,10 +27,21 @@ export const localStorageMock = (): IStorage => {
   };
 };
 
+const createStorageMock = (storeMock: IStorage): Storage => {
+  const storage = new Storage(storeMock);
+  return {
+    store: storeMock,
+    get: jest.fn((...args) => storage.get(...args)),
+    clear: jest.fn((...args) => storage.clear(...args)),
+    set: jest.fn((...args) => storage.set(...args)),
+    remove: jest.fn((...args) => storage.remove(...args)),
+  } as Storage;
+};
+
 export const createSecuritySolutionStorageMock = () => {
   const localStorage = localStorageMock();
   return {
     localStorage,
-    storage: new Storage(localStorage),
+    storage: createStorageMock(localStorage),
   };
 };
diff --git a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
index 0800d5cc14c81..586ae080b5764 100644
--- a/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/timeline_results.ts
@@ -2133,7 +2133,7 @@ export const defaultTimelineProps: CreateTimelineProps = {
     savedSearch: null,
     isDataProviderVisible: false,
     sampleSize: 500,
-    rowHeight: 3,
+    rowHeight: 1,
   },
   to: '2018-11-05T19:03:25.937Z',
   notes: null,
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/constants.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/constants.ts
index 45cb8f0633e65..0672e599160ad 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/constants.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/constants.ts
@@ -51,7 +51,6 @@ export const DEFINITION_UPGRADE_FIELD_ORDER: Array<keyof DiffableAllFields> = [
   'threat_indicator_path',
   'concurrent_searches',
   'items_per_search',
-  'alert_suppression',
   'new_terms_fields',
   'history_window_start',
   'max_signals',
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/per_field_diff/get_field_diffs_for_grouped_fields.ts b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/per_field_diff/get_field_diffs_for_grouped_fields.ts
index 2c5c20da928dd..21717998483ea 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/per_field_diff/get_field_diffs_for_grouped_fields.ts
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/per_field_diff/get_field_diffs_for_grouped_fields.ts
@@ -8,6 +8,9 @@
 import stringify from 'json-stable-stringify';
 import type {
   AllFieldsDiff,
+  RuleFieldsDiffWithDataSource,
+  RuleFieldsDiffWithEqlQuery,
+  RuleFieldsDiffWithEsqlQuery,
   RuleFieldsDiffWithKqlQuery,
 } from '../../../../../../common/api/detection_engine';
 import type { FieldDiff } from '../../../model/rule_details/rule_field_diff';
@@ -24,7 +27,7 @@ export const sortAndStringifyJson = (fieldValue: unknown): string => {
 };
 
 export const getFieldDiffsForDataSource = (
-  dataSourceThreeWayDiff: AllFieldsDiff['data_source']
+  dataSourceThreeWayDiff: RuleFieldsDiffWithDataSource['data_source']
 ): FieldDiff[] => {
   const currentType = sortAndStringifyJson(dataSourceThreeWayDiff.current_version?.type);
   const targetType = sortAndStringifyJson(dataSourceThreeWayDiff.target_version?.type);
@@ -171,7 +174,9 @@ export const getFieldDiffsForKqlQuery = (
   ];
 };
 
-export const getFieldDiffsForEqlQuery = (eqlQuery: AllFieldsDiff['eql_query']): FieldDiff[] => {
+export const getFieldDiffsForEqlQuery = (
+  eqlQuery: RuleFieldsDiffWithEqlQuery['eql_query']
+): FieldDiff[] => {
   const currentQuery = sortAndStringifyJson(eqlQuery.current_version?.query);
   const targetQuery = sortAndStringifyJson(eqlQuery.target_version?.query);
 
@@ -199,7 +204,9 @@ export const getFieldDiffsForEqlQuery = (eqlQuery: AllFieldsDiff['eql_query']):
   ];
 };
 
-export const getFieldDiffsForEsqlQuery = (esqlQuery: AllFieldsDiff['esql_query']): FieldDiff[] => {
+export const getFieldDiffsForEsqlQuery = (
+  esqlQuery: RuleFieldsDiffWithEsqlQuery['esql_query']
+): FieldDiff[] => {
   const currentQuery = sortAndStringifyJson(esqlQuery.current_version?.query);
   const targetQuery = sortAndStringifyJson(esqlQuery.target_version?.query);
 
diff --git a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/rule_diff_tab.tsx b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/rule_diff_tab.tsx
index b22fc1b73bbe6..dd6d0417d3bb6 100644
--- a/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/rule_diff_tab.tsx
+++ b/x-pack/plugins/security_solution/public/detection_engine/rule_management/components/rule_details/rule_diff_tab.tsx
@@ -28,7 +28,7 @@ import * as i18n from './json_diff/translations';
 import { getHumanizedDuration } from '../../../../detections/pages/detection_engine/rules/helpers';
 
 /* Inclding these properties in diff display might be confusing to users. */
-const HIDDEN_PROPERTIES = [
+const HIDDEN_PROPERTIES: Array<keyof RuleResponse> = [
   /*
     By default, prebuilt rules don't have any actions or exception lists. So if a user has defined actions or exception lists for a rule, it'll show up as diff. This looks confusing as the user might think that their actions and exceptions lists will get removed after the upgrade, which is not the case - they will be preserved.
   */
@@ -44,13 +44,13 @@ const HIDDEN_PROPERTIES = [
   'revision',
 
   /*
-    "updated_at" value is regenerated on every '/upgrade/_review' endpoint run 
+    "updated_at" value is regenerated on every '/upgrade/_review' endpoint run
     and will therefore always show a diff. It adds no value to display it to the user.
   */
   'updated_at',
 
   /*
-    These values make sense only for installed prebuilt rules. 
+    These values make sense only for installed prebuilt rules.
     They are not present in the prebuilt rule package.
     So, showing them in the diff doesn't add value.
   */
@@ -76,11 +76,11 @@ const normalizeRule = (originalRule: RuleResponse): RuleResponse => {
   const rule = { ...originalRule };
 
   /*
-    Convert the "from" property value to a humanized duration string, like 'now-1m' or 'now-2h'. 
-    Conversion is needed to skip showing the diff for the "from" property when the same 
-    duration is represented in different time units. For instance, 'now-1h' and 'now-3600s' 
+    Convert the "from" property value to a humanized duration string, like 'now-1m' or 'now-2h'.
+    Conversion is needed to skip showing the diff for the "from" property when the same
+    duration is represented in different time units. For instance, 'now-1h' and 'now-3600s'
     indicate a one-hour duration.
-    The same helper is used in the rule editing UI to format "from" before submitting the edits. 
+    The same helper is used in the rule editing UI to format "from" before submitting the edits.
     So, after the rule is saved, the "from" property unit/value might differ from what's in the package.
   */
   rule.from = formatScheduleStepData({
@@ -91,8 +91,8 @@ const normalizeRule = (originalRule: RuleResponse): RuleResponse => {
 
   /*
     Default "note" to an empty string if it's not present.
-    Sometimes, in a new version of a rule, the "note" value equals an empty string, while 
-    in the old version, it wasn't specified at all (undefined becomes ''). In this case, 
+    Sometimes, in a new version of a rule, the "note" value equals an empty string, while
+    in the old version, it wasn't specified at all (undefined becomes ''). In this case,
     it doesn't make sense to show diff, so we default falsy values to ''.
   */
   rule.note = rule.note ?? '';
@@ -104,9 +104,9 @@ const normalizeRule = (originalRule: RuleResponse): RuleResponse => {
   rule.threat = filterEmptyThreats(rule.threat);
 
   /*
-    The "machine_learning_job_id" property is converted from the legacy string format 
-    to the new array format during installation and upgrade. Thus, all installed rules 
-    use the new format. For correct comparison, we must ensure that the rule update is 
+    The "machine_learning_job_id" property is converted from the legacy string format
+    to the new array format during installation and upgrade. Thus, all installed rules
+    use the new format. For correct comparison, we must ensure that the rule update is
     also in the new format before showing the diff.
   */
   if ('machine_learning_job_id' in rule) {
@@ -115,7 +115,7 @@ const normalizeRule = (originalRule: RuleResponse): RuleResponse => {
 
   /*
     Default the "alias" property to null for all threat filters that don't have it.
-    Setting a default is needed to match the behavior of the rule editing UI, 
+    Setting a default is needed to match the behavior of the rule editing UI,
     which also defaults the "alias" property to null.
   */
   if (rule.type === 'threat_match' && Array.isArray(rule.threat_filters)) {
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
index 91ef01befe175..d5fc7b5450961 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/actions.test.tsx
@@ -454,7 +454,7 @@ describe('alert actions', () => {
             savedSearchId: null,
             savedSearch: null,
             isDataProviderVisible: false,
-            rowHeight: 3,
+            rowHeight: 1,
             sampleSize: 500,
           },
           to: '2018-11-05T19:03:25.937Z',
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
index 13e9d739017c6..fd7ca232ca8ea 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_grouping.tsx
@@ -104,7 +104,7 @@ const GroupedAlertsTableComponent: React.FC<AlertsTableComponentProps> = (props)
   const { getGrouping, selectedGroups, setSelectedGroups } = useGrouping({
     componentProps: {
       groupPanelRenderer: renderGroupPanel,
-      groupStatsRenderer: getStats,
+      getGroupStats: getStats,
       onGroupToggle,
       unit: defaultUnit,
     },
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
index 94f5c3abda160..4b8c912c61a65 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/alerts_sub_grouping.tsx
@@ -13,8 +13,8 @@ import type { GroupingAggregation } from '@kbn/grouping';
 import { isNoneGroup } from '@kbn/grouping';
 import { getEsQueryConfig } from '@kbn/data-plugin/common';
 import type { DynamicGroupingProps } from '@kbn/grouping/src';
-import type { TableIdLiteral } from '@kbn/securitysolution-data-table';
 import { parseGroupingQuery } from '@kbn/grouping/src';
+import type { TableIdLiteral } from '@kbn/securitysolution-data-table';
 import type { RunTimeMappings } from '../../../sourcerer/store/model';
 import { combineQueries } from '../../../common/lib/kuery';
 import { SourcererScopeName } from '../../../sourcerer/store/model';
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_stats.tsx b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_stats.tsx
index 96cc365d93fab..428df04b86509 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_stats.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/grouping_settings/group_stats.tsx
@@ -7,7 +7,7 @@
 
 import { EuiIcon } from '@elastic/eui';
 import React from 'react';
-import type { RawBucket, StatRenderer } from '@kbn/grouping';
+import type { RawBucket, GroupStatsItem } from '@kbn/grouping';
 import type { AlertsGroupingAggregation } from './types';
 import * as i18n from '../translations';
 
@@ -67,7 +67,7 @@ const multiSeverity = (
 export const getStats = (
   selectedGroup: string,
   bucket: RawBucket<AlertsGroupingAggregation>
-): StatRenderer[] => {
+): GroupStatsItem[] => {
   const singleSeverityComponent =
     bucket.severitiesSubAggregation?.buckets && bucket.severitiesSubAggregation?.buckets?.length
       ? getSeverity(bucket.severitiesSubAggregation?.buckets[0].key.toString())
diff --git a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_actions_column.tsx b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_actions_column.tsx
index 2e838e9f2ba23..4f2c995b163d5 100644
--- a/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_actions_column.tsx
+++ b/x-pack/plugins/security_solution/public/detections/hooks/trigger_actions_alert_table/use_actions_column.tsx
@@ -29,11 +29,10 @@ export const getUseActionColumnHook =
 
     // we only want to show the note icon if the expandable flyout and the new notes system are enabled
     // TODO delete most likely in 8.16
-    const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
     const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
       'securitySolutionNotesEnabled'
     );
-    if (expandableFlyoutDisabled || !securitySolutionNotesEnabled) {
+    if (!securitySolutionNotesEnabled) {
       ACTION_BUTTON_COUNT--;
     }
 
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx
index 509d59338fe4d..d1f3bfea2aafe 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.test.tsx
@@ -11,9 +11,6 @@ import { AlertDetailsRedirect } from './alert_details_redirect';
 import { TestProviders } from '../../../common/mock';
 import { ALERTS_PATH, ALERT_DETAILS_REDIRECT_PATH } from '../../../../common/constants';
 import { mockHistory } from '../../../common/utils/route/mocks';
-import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
-
-jest.mock('../../../common/hooks/use_experimental_features');
 
 jest.mock('../../../common/lib/kibana');
 
@@ -149,37 +146,4 @@ describe('AlertDetailsRedirect', () => {
       });
     });
   });
-
-  describe('When expandable flyout is enabled', () => {
-    beforeEach(() => {
-      jest.mocked(useIsExperimentalFeatureEnabled).mockReturnValue(true);
-    });
-
-    describe('when eventFlyout or flyout are not in the query', () => {
-      it('redirects to the expected path with the correct query parameters', () => {
-        const testSearch = `?index=${testIndex}&timestamp=${testTimestamp}`;
-        const historyMock = {
-          ...mockHistory,
-          location: {
-            hash: '',
-            pathname: mockPathname,
-            search: testSearch,
-            state: '',
-          },
-        };
-        render(
-          <TestProviders>
-            <Router history={historyMock}>
-              <AlertDetailsRedirect />
-            </Router>
-          </TestProviders>
-        );
-
-        const [{ search, pathname }] = historyMock.replace.mock.lastCall;
-
-        expect(search as string).toMatch(/flyout.*/);
-        expect(pathname).toEqual(ALERTS_PATH);
-      });
-    });
-  });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
index 9655e6fb84f92..01e52d3ab7505 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/alert_details_redirect.tsx
@@ -13,7 +13,6 @@ import moment from 'moment';
 import { encode } from '@kbn/rison';
 import { ALERT_WORKFLOW_STATUS } from '@kbn/rule-data-utils';
 import type { FilterControlConfig } from '@kbn/alerts-ui-shared';
-import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_experimental_features';
 import { ALERTS_PATH, DEFAULT_ALERTS_INDEX } from '../../../../common/constants';
 import { URL_PARAM_KEY } from '../../../common/hooks/use_url_state';
 import { inputsSelectors } from '../../../common/store';
@@ -69,16 +68,11 @@ export const AlertDetailsRedirect = () => {
 
   const currentFlyoutParams = searchParams.get(URL_PARAM_KEY.flyout);
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
-
   const urlParams = new URLSearchParams({
     [URL_PARAM_KEY.appQuery]: kqlAppQuery,
     [URL_PARAM_KEY.timerange]: timerange,
     [URL_PARAM_KEY.pageFilter]: pageFiltersQuery,
-    [URL_PARAM_KEY.flyout]: resolveFlyoutParams(
-      { index, alertId, expandableFlyoutDisabled },
-      currentFlyoutParams
-    ),
+    [URL_PARAM_KEY.flyout]: resolveFlyoutParams({ index, alertId }, currentFlyoutParams),
   });
 
   const url = `${ALERTS_PATH}?${urlParams.toString()}`;
diff --git a/x-pack/plugins/security_solution/public/detections/pages/alerts/utils.ts b/x-pack/plugins/security_solution/public/detections/pages/alerts/utils.ts
index ac1d2a862b92c..4bbb386bc86dd 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/alerts/utils.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/alerts/utils.ts
@@ -11,7 +11,6 @@ import { expandableFlyoutStateFromEventMeta } from '../../../flyout/document_det
 export interface ResolveFlyoutParamsConfig {
   index: string;
   alertId: string;
-  expandableFlyoutDisabled: boolean;
 }
 
 /**
@@ -21,27 +20,14 @@ export interface ResolveFlyoutParamsConfig {
  * with Share Button on the Expandable Flyout
  */
 export const resolveFlyoutParams = (
-  { index, alertId, expandableFlyoutDisabled }: ResolveFlyoutParamsConfig,
+  { index, alertId }: ResolveFlyoutParamsConfig,
   currentParamsString: string | null
 ) => {
-  if (expandableFlyoutDisabled) {
-    const legacyFlyoutString = encode({
-      panelView: 'eventDetail',
-      params: {
-        eventId: alertId,
-        indexName: index,
-      },
-    });
-    return legacyFlyoutString;
-  }
-
   if (currentParamsString) {
     return currentParamsString;
   }
 
-  const modernFlyoutString = encode(
+  return encode(
     expandableFlyoutStateFromEventMeta({ index, eventId: alertId, scopeId: 'alerts-page' })
   );
-
-  return modernFlyoutString;
 };
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/enable_risk_score/index.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/enable_risk_score/index.tsx
index 994158104df5b..93fce26b3c475 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/enable_risk_score/index.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/enable_risk_score/index.tsx
@@ -11,7 +11,7 @@ import { useCheckSignalIndex } from '../../../detections/containers/detection_en
 import type { inputsModel } from '../../../common/store';
 import { RiskScoreHeaderTitle } from '../risk_score_onboarding/risk_score_header_title';
 import { HeaderSection } from '../../../common/components/header_section';
-import { RiskScoreDocLink } from '../risk_score_onboarding/risk_score_doc_link';
+import { EntityAnalyticsLearnMoreLink } from '../risk_score_onboarding/entity_analytics_doc_link';
 import { RiskScoreEnableButton } from '../risk_score_onboarding/risk_score_enable_button';
 import * as i18n from './translations';
 
@@ -55,7 +55,7 @@ const EnableRiskScoreComponent = ({
           <>
             {text.body}
             {` `}
-            <RiskScoreDocLink riskScoreEntity={entityType} />
+            <EntityAnalyticsLearnMoreLink />
           </>
         }
         actions={
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/translations.ts b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/translations.ts
index 5816accea220a..d87f0a8b899fc 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/translations.ts
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_analytics_risk_score/translations.ts
@@ -25,14 +25,6 @@ export const VIEW_ALL = i18n.translate(
   }
 );
 
-export const LEARN_MORE = (riskEntity?: RiskScoreEntity) =>
-  i18n.translate('xpack.securitySolution.entityAnalytics.riskDashboard.learnMore', {
-    defaultMessage: 'Learn more about {riskEntity} risk',
-    values: {
-      riskEntity: getRiskEntityTranslation(riskEntity, true),
-    },
-  });
-
 export const LAST_UPDATED = i18n.translate(
   'xpack.securitySolution.entityAnalytics.riskDashboard.lastUpdatedTitle',
   {
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/index.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/index.tsx
index 4c92512e13344..c863904da6c66 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/index.tsx
@@ -14,7 +14,7 @@ import { RiskInputsTab } from './tabs/risk_inputs/risk_inputs_tab';
 
 export const RISK_INPUTS_TAB_TEST_ID = `${PREFIX}RiskInputsTab` as const;
 
-export const getRiskInputTab = ({ entityType, entityName }: RiskInputsTabProps) => ({
+export const getRiskInputTab = ({ entityType, entityName, scopeId }: RiskInputsTabProps) => ({
   id: EntityDetailsLeftPanelTab.RISK_INPUTS,
   'data-test-subj': RISK_INPUTS_TAB_TEST_ID,
   name: (
@@ -23,5 +23,5 @@ export const getRiskInputTab = ({ entityType, entityName }: RiskInputsTabProps)
       defaultMessage="Risk contributions"
     />
   ),
-  content: <RiskInputsTab entityType={entityType} entityName={entityName} />,
+  content: <RiskInputsTab entityType={entityType} entityName={entityName} scopeId={scopeId} />,
 });
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs.test.tsx
index 8524a2a6a26ea..d6a247f6558a7 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs.test.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs.test.tsx
@@ -9,7 +9,7 @@ import { render } from '@testing-library/react';
 import React from 'react';
 import { TestProviders } from '../../../../../common/mock';
 import { times } from 'lodash/fp';
-import { RiskInputsTab } from './risk_inputs_tab';
+import { EXPAND_ALERT_TEST_ID, RiskInputsTab } from './risk_inputs_tab';
 import { alertInputDataMock } from '../../mocks';
 import { RiskSeverity } from '../../../../../../common/search_strategy';
 import { RiskScoreEntity } from '../../../../../../common/entity_analytics/risk_engine';
@@ -49,6 +49,12 @@ const riskScore = {
   },
 };
 
+const mockUseIsExperimentalFeatureEnabled = jest.fn().mockReturnValue(false);
+
+jest.mock('../../../../../common/hooks/use_experimental_features', () => ({
+  useIsExperimentalFeatureEnabled: () => mockUseIsExperimentalFeatureEnabled(),
+}));
+
 const riskScoreWithAssetCriticalityContribution = (contribution: number) => {
   const score = JSON.parse(JSON.stringify(riskScore));
   score.user.risk.category_2_score = contribution;
@@ -74,7 +80,7 @@ describe('RiskInputsTab', () => {
 
     const { getByTestId, queryByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
 
@@ -87,7 +93,7 @@ describe('RiskInputsTab', () => {
 
     const { queryByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
 
@@ -116,13 +122,57 @@ describe('RiskInputsTab', () => {
 
     const { queryByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
 
     expect(queryByTestId('risk-input-contexts-title')).toBeInTheDocument();
   });
 
+  it('it renders alert preview button when feature flag is enable', () => {
+    mockUseIsExperimentalFeatureEnabled.mockReturnValue(true);
+    mockUseRiskScore.mockReturnValue({
+      loading: false,
+      error: false,
+      data: [riskScore],
+    });
+    mockUseRiskContributingAlerts.mockReturnValue({
+      loading: false,
+      error: false,
+      data: [alertInputDataMock],
+    });
+
+    const { getByTestId } = render(
+      <TestProviders>
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
+      </TestProviders>
+    );
+
+    expect(getByTestId(EXPAND_ALERT_TEST_ID)).toBeInTheDocument();
+  });
+
+  it('it does not render alert preview button when feature flag is disable', () => {
+    mockUseIsExperimentalFeatureEnabled.mockReturnValue(false);
+    mockUseRiskScore.mockReturnValue({
+      loading: false,
+      error: false,
+      data: [riskScore],
+    });
+    mockUseRiskContributingAlerts.mockReturnValue({
+      loading: false,
+      error: false,
+      data: [alertInputDataMock],
+    });
+
+    const { queryByTestId } = render(
+      <TestProviders>
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
+      </TestProviders>
+    );
+
+    expect(queryByTestId(EXPAND_ALERT_TEST_ID)).not.toBeInTheDocument();
+  });
+
   it('Displays 0.00 for the asset criticality contribution if the contribution value is less than -0.01', () => {
     mockUseUiSetting.mockReturnValue([true]);
 
@@ -134,7 +184,7 @@ describe('RiskInputsTab', () => {
 
     const { getByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
     const contextsTable = getByTestId('risk-input-contexts-table');
@@ -153,7 +203,7 @@ describe('RiskInputsTab', () => {
 
     const { getByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
     const contextsTable = getByTestId('risk-input-contexts-table');
@@ -172,7 +222,7 @@ describe('RiskInputsTab', () => {
 
     const { getByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
 
@@ -201,7 +251,7 @@ describe('RiskInputsTab', () => {
 
     const { queryByTestId } = render(
       <TestProviders>
-        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" />
+        <RiskInputsTab entityType={RiskScoreEntity.user} entityName="elastic" scopeId={'scopeId'} />
       </TestProviders>
     );
 
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs_tab.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs_tab.tsx
index 48f004cbd7069..f4514c6bf8f2b 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs_tab.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/entity_details_flyout/tabs/risk_inputs/risk_inputs_tab.tsx
@@ -14,6 +14,8 @@ import { useUiSetting$ } from '@kbn/kibana-react-plugin/public';
 import { ALERT_RULE_NAME } from '@kbn/rule-data-utils';
 
 import { get } from 'lodash/fp';
+import { AlertPreviewButton } from '../../../../../flyout/shared/components/alert_preview_button';
+import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { useGlobalTime } from '../../../../../common/containers/use_global_time';
 import { useQueryInspector } from '../../../../../common/components/page/manage_query';
 import { formatRiskScore } from '../../../../common';
@@ -40,6 +42,7 @@ import { ActionColumn } from '../../components/action_column';
 export interface RiskInputsTabProps extends Record<string, unknown> {
   entityType: RiskScoreEntity;
   entityName: string;
+  scopeId: string;
 }
 
 const FIRST_RECORD_PAGINATION = {
@@ -47,9 +50,10 @@ const FIRST_RECORD_PAGINATION = {
   querySize: 1,
 };
 
+export const EXPAND_ALERT_TEST_ID = 'risk-input-alert-preview-button';
 export const RISK_INPUTS_TAB_QUERY_ID = 'RiskInputsTabQuery';
 
-export const RiskInputsTab = ({ entityType, entityName }: RiskInputsTabProps) => {
+export const RiskInputsTab = ({ entityType, entityName, scopeId }: RiskInputsTabProps) => {
   const { setQuery, deleteQuery } = useGlobalTime();
   const [selectedItems, setSelectedItems] = useState<InputAlert[]>([]);
 
@@ -96,9 +100,26 @@ export const RiskInputsTab = ({ entityType, entityName }: RiskInputsTabProps) =>
     }),
     []
   );
+  const isPreviewEnabled = useIsExperimentalFeatureEnabled('entityAlertPreviewEnabled');
 
   const inputColumns: Array<EuiBasicTableColumn<InputAlert>> = useMemo(
     () => [
+      ...(isPreviewEnabled
+        ? [
+            {
+              render: (data: InputAlert) => (
+                <AlertPreviewButton
+                  id={data._id}
+                  indexName={data.input.index}
+                  scopeId={scopeId}
+                  data-test-subj={EXPAND_ALERT_TEST_ID}
+                />
+              ),
+              width: '5%',
+            },
+          ]
+        : []),
+
       {
         name: (
           <FormattedMessage
@@ -153,7 +174,7 @@ export const RiskInputsTab = ({ entityType, entityName }: RiskInputsTabProps) =>
         render: formatContribution,
       },
     ],
-    []
+    [isPreviewEnabled, scopeId]
   );
 
   const [isAssetCriticalityEnabled] = useUiSetting$<boolean>(ENABLE_ASSET_CRITICALITY_SETTING);
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_information/index.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_information/index.tsx
index 8596c7869edcb..0b08c8976cf67 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_information/index.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_information/index.tsx
@@ -37,7 +37,7 @@ import {
   CriticalityLevels,
   CriticalityModifiers,
 } from '../../../../common/entity_analytics/asset_criticality';
-import { RiskScoreDocLink } from '../risk_score_onboarding/risk_score_doc_link';
+import { EntityAnalyticsLearnMoreLink } from '../risk_score_onboarding/entity_analytics_doc_link';
 import { BETA } from '../risk_score_onboarding/translations';
 import { AssetCriticalityBadge } from '../asset_criticality';
 
@@ -262,14 +262,7 @@ export const RiskInformationFlyout = ({ handleOnClose }: { handleOnClose: () =>
           </SpacedOrderedList>
         </EuiText>
         <EuiSpacer size="m" />
-        <RiskScoreDocLink
-          title={
-            <FormattedMessage
-              id="xpack.securitySolution.riskInformation.learnMore"
-              defaultMessage="Learn more about Entity risk"
-            />
-          }
-        />
+        <EntityAnalyticsLearnMoreLink />
       </EuiFlyoutBody>
 
       <EuiFlyoutFooter>
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score/translations.ts b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score/translations.ts
index d072607544d4f..4ad2314afb859 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score/translations.ts
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score/translations.ts
@@ -40,6 +40,13 @@ export const RISK_SCORE_TITLE = (riskEntity: RiskScoreEntity) =>
     },
   });
 
+export const RISK_SCORING_TITLE = i18n.translate(
+  'xpack.securitySolution.riskScore.overview.riskScoringTitle',
+  {
+    defaultMessage: 'Entity Risk Scoring',
+  }
+);
+
 export const ENTITY_RISK_LEVEL = (riskEntity: RiskScoreEntity) =>
   i18n.translate('xpack.securitySolution.entityAnalytics.riskDashboard.riskLevelTitle', {
     defaultMessage: '{riskEntity} risk level',
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/entity_analytics_doc_link.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/entity_analytics_doc_link.tsx
new file mode 100644
index 0000000000000..b0d421c743411
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/entity_analytics_doc_link.tsx
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiLink } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n-react';
+import React from 'react';
+import { useKibana } from '../../../common/lib/kibana';
+
+const EntityAnalyticsLearnMoreLinkComponent = ({ title }: { title?: string | React.ReactNode }) => {
+  const { docLinks } = useKibana().services;
+  const entityAnalyticsLinks = docLinks.links.securitySolution.entityAnalytics;
+
+  return (
+    <EuiLink
+      target="_blank"
+      rel="noopener nofollow noreferrer"
+      href={entityAnalyticsLinks.entityRiskScoring}
+    >
+      {title ? (
+        title
+      ) : (
+        <FormattedMessage
+          id="xpack.securitySolution.entityAnalytics.learnMore"
+          defaultMessage="Learn more about entity risk scoring"
+        />
+      )}
+    </EuiLink>
+  );
+};
+
+export const EntityAnalyticsLearnMoreLink = React.memo(EntityAnalyticsLearnMoreLinkComponent);
+
+EntityAnalyticsLearnMoreLink.displayName = 'EntityAnalyticsLearnMoreLink';
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_doc_link.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_doc_link.tsx
deleted file mode 100644
index ca7b67134b29d..0000000000000
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_doc_link.tsx
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiLink } from '@elastic/eui';
-import React, { useMemo } from 'react';
-import { RiskScoreEntity } from '../../../../common/search_strategy';
-import { useKibana } from '../../../common/lib/kibana';
-import { LEARN_MORE } from '../entity_analytics_risk_score/translations';
-
-const useLearnMoreLinkForEntity = (riskScoreEntity?: RiskScoreEntity) => {
-  const { docLinks } = useKibana().services;
-  const entityAnalyticsLinks = docLinks.links.securitySolution.entityAnalytics;
-  return useMemo(() => {
-    if (!riskScoreEntity) {
-      return entityAnalyticsLinks.entityRiskScoring;
-    }
-    if (riskScoreEntity === RiskScoreEntity.user) {
-      return entityAnalyticsLinks.userRiskScore;
-    }
-    return entityAnalyticsLinks.hostRiskScore;
-  }, [riskScoreEntity, entityAnalyticsLinks]);
-};
-
-const RiskScoreDocLinkComponent = ({
-  riskScoreEntity,
-  title,
-}: {
-  riskScoreEntity?: RiskScoreEntity;
-  title?: string | React.ReactNode;
-}) => {
-  const learnMoreLink = useLearnMoreLinkForEntity(riskScoreEntity);
-
-  return (
-    <EuiLink target="_blank" rel="noopener nofollow noreferrer" href={learnMoreLink}>
-      {title ? title : LEARN_MORE(riskScoreEntity)}
-    </EuiLink>
-  );
-};
-
-export const RiskScoreDocLink = React.memo(RiskScoreDocLinkComponent);
-
-RiskScoreDocLink.displayName = 'RiskScoreDocLink';
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_enable_button.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_enable_button.tsx
index f75204ad5ffd2..6878f9aab0512 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_enable_button.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_enable_button.tsx
@@ -36,7 +36,7 @@ const RiskScoreEnableButtonComponent = ({
 }) => {
   const spaceId = useSpaceId();
   const { http, dashboard, ...startServices } = useKibana().services;
-  const { renderDocLink, renderDashboardLink } = useRiskScoreToastContent(riskScoreEntity);
+  const { renderDocLink, renderDashboardLink } = useRiskScoreToastContent();
   const { fetch, isLoading } = useFetch(REQUEST_NAMES.ENABLE_RISK_SCORE, installRiskScoreModule);
   const isRiskEngineEnabled = useIsExperimentalFeatureEnabled('riskScoringRoutesEnabled');
 
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_restart_button.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_restart_button.tsx
index 70f28df4420f9..87ef0df078c09 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_restart_button.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/risk_score_restart_button.tsx
@@ -30,7 +30,7 @@ const RiskScoreRestartButtonComponent = ({
   );
   const spaceId = useSpaceId();
 
-  const { renderDocLink } = useRiskScoreToastContent(riskScoreEntity);
+  const { renderDocLink } = useRiskScoreToastContent();
   const { http, ...startServices } = useKibana().services;
 
   const onClick = useCallback(async () => {
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/use_risk_score_toast_content.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/use_risk_score_toast_content.tsx
index 7df01d9f8bd86..30fdc0f9204f2 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/use_risk_score_toast_content.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_score_onboarding/use_risk_score_toast_content.tsx
@@ -10,21 +10,20 @@ import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 
-import type { RiskScoreEntity } from '../../../../common/search_strategy';
-import { RiskScoreDocLink } from './risk_score_doc_link';
+import { EntityAnalyticsLearnMoreLink } from './entity_analytics_doc_link';
 
 const StyledButton = styled(EuiButton)`
   float: right;
 `;
 
-export const useRiskScoreToastContent = (riskScoreEntity: RiskScoreEntity) => {
+export const useRiskScoreToastContent = () => {
   const renderDocLink = useCallback(
     (message: string) => (
       <>
-        {message} <RiskScoreDocLink riskScoreEntity={riskScoreEntity} />
+        {message} <EntityAnalyticsLearnMoreLink />
       </>
     ),
-    [riskScoreEntity]
+    []
   );
   const renderDashboardLink = useCallback(
     (message: string, targetUrl: string) => (
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.stories.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.stories.tsx
index 2d0d8f9525713..76105e78a815b 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.stories.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.stories.tsx
@@ -10,11 +10,11 @@ import type { Story } from '@storybook/react';
 import { TestProvider } from '@kbn/expandable-flyout/src/test/provider';
 import { StorybookProviders } from '../../../common/mock/storybook_providers';
 import { mockRiskScoreState } from '../../../timelines/components/side_panel/new_user_detail/__mocks__';
-import { RiskSummary } from './risk_summary';
+import { FlyoutRiskSummary } from './risk_summary';
 
 export default {
-  component: RiskSummary,
-  title: 'Components/RiskSummary',
+  component: FlyoutRiskSummary,
+  title: 'Components/FlyoutRiskSummary',
 };
 
 export const Default: Story<void> = () => {
@@ -22,7 +22,7 @@ export const Default: Story<void> = () => {
     <StorybookProviders>
       <TestProvider>
         <div style={{ maxWidth: '300px' }}>
-          <RiskSummary
+          <FlyoutRiskSummary
             openDetailsPanel={() => {}}
             riskScoreData={{ ...mockRiskScoreState, data: [] }}
             queryId={'testQuery'}
@@ -39,7 +39,7 @@ export const PreviewMode: Story<void> = () => {
     <StorybookProviders>
       <TestProvider>
         <div style={{ maxWidth: '300px' }}>
-          <RiskSummary
+          <FlyoutRiskSummary
             riskScoreData={{ ...mockRiskScoreState, data: [] }}
             queryId={'testQuery'}
             recalculatingScore={false}
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx
index e35e0d4130500..aa0eab9902520 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.test.tsx
@@ -12,7 +12,7 @@ import {
 import { render } from '@testing-library/react';
 import React from 'react';
 import { TestProviders } from '../../../common/mock';
-import { RiskSummary } from './risk_summary';
+import { FlyoutRiskSummary } from './risk_summary';
 import type {
   LensAttributes,
   VisualizationEmbeddableProps,
@@ -37,7 +37,7 @@ jest.mock('@kbn/kibana-react-plugin/public', () => {
   };
 });
 
-describe('RiskSummary', () => {
+describe('FlyoutRiskSummary', () => {
   beforeEach(() => {
     mockVisualizationEmbeddable.mockClear();
   });
@@ -45,7 +45,7 @@ describe('RiskSummary', () => {
   it('renders risk summary table with alerts only', () => {
     const { getByTestId, queryByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -76,7 +76,7 @@ describe('RiskSummary', () => {
 
     const { getByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -108,7 +108,7 @@ describe('RiskSummary', () => {
   it('renders risk summary table when riskScoreData is empty', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={{ ...mockHostRiskScoreState, data: undefined }}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -122,7 +122,7 @@ describe('RiskSummary', () => {
   it('risk summary header does not render link when riskScoreData is loading', () => {
     const { queryByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={{ ...mockHostRiskScoreState, data: undefined, loading: true }}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -137,7 +137,7 @@ describe('RiskSummary', () => {
   it('risk summary header does not render expand icon when in preview mode', () => {
     const { queryByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={{ ...mockHostRiskScoreState, data: undefined, loading: true }}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -154,7 +154,7 @@ describe('RiskSummary', () => {
   it('renders visualization embeddable', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -169,7 +169,7 @@ describe('RiskSummary', () => {
   it('renders updated at', () => {
     const { getByTestId } = render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -184,7 +184,7 @@ describe('RiskSummary', () => {
   it('builds lens attributes for host risk score', () => {
     render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -211,7 +211,7 @@ describe('RiskSummary', () => {
   it('builds lens cases attachment metadata for host risk score', () => {
     render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockHostRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -233,7 +233,7 @@ describe('RiskSummary', () => {
   it('builds lens cases attachment metadata for user risk score', () => {
     render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockUserRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
@@ -255,7 +255,7 @@ describe('RiskSummary', () => {
   it('builds lens attributes for user risk score', () => {
     render(
       <TestProviders>
-        <RiskSummary
+        <FlyoutRiskSummary
           riskScoreData={mockUserRiskScoreState}
           queryId={'testQuery'}
           openDetailsPanel={() => {}}
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx
index ce70b5fb211e7..8d0b00129057e 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_flyout/risk_summary.tsx
@@ -55,7 +55,7 @@ export interface RiskSummaryProps<T extends RiskScoreEntity> {
   isPreviewMode?: boolean;
 }
 
-const RiskSummaryComponent = <T extends RiskScoreEntity>({
+const FlyoutRiskSummaryComponent = <T extends RiskScoreEntity>({
   riskScoreData,
   recalculatingScore,
   queryId,
@@ -287,5 +287,5 @@ const RiskSummaryComponent = <T extends RiskScoreEntity>({
   );
 };
 
-export const RiskSummary = React.memo(RiskSummaryComponent);
-RiskSummary.displayName = 'RiskSummary';
+export const FlyoutRiskSummary = React.memo(FlyoutRiskSummaryComponent);
+FlyoutRiskSummary.displayName = 'RiskSummary';
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.test.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.test.tsx
similarity index 91%
rename from x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.test.tsx
rename to x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.test.tsx
index 75722d781bbc7..cfe1e4ec898c4 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.test.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.test.tsx
@@ -9,9 +9,9 @@ import React from 'react';
 
 import { render } from '@testing-library/react';
 import { TestProviders } from '../../common/mock';
-import type { RiskEntity } from './risk_summary';
+import type { RiskEntity } from './risk_summary_panel';
 import * as i18n from '../../common/components/event_details/cti_details/translations';
-import { RiskSummary } from './risk_summary';
+import { RiskSummaryPanel } from './risk_summary_panel';
 import { RiskScoreEntity, RiskSeverity } from '../../../common/search_strategy';
 import { getEmptyValue } from '../../common/components/empty_value';
 
@@ -46,7 +46,7 @@ describe.each([RiskScoreEntity.host, RiskScoreEntity.user])(
 
       const { getByText } = render(
         <TestProviders>
-          <RiskSummary {...props} />
+          <RiskSummaryPanel {...props} />
         </TestProviders>
       );
 
@@ -67,7 +67,7 @@ describe.each([RiskScoreEntity.host, RiskScoreEntity.user])(
       } as RiskEntity;
       const { getByTestId } = render(
         <TestProviders>
-          <RiskSummary {...props} />
+          <RiskSummaryPanel {...props} />
         </TestProviders>
       );
 
@@ -86,7 +86,7 @@ describe.each([RiskScoreEntity.host, RiskScoreEntity.user])(
       } as RiskEntity;
       const { getByText } = render(
         <TestProviders>
-          <RiskSummary {...props} />
+          <RiskSummaryPanel {...props} />
         </TestProviders>
       );
 
diff --git a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.tsx b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.tsx
similarity index 89%
rename from x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.tsx
rename to x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.tsx
index df3933ae50e5b..80d0558f5cf55 100644
--- a/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary.tsx
+++ b/x-pack/plugins/security_solution/public/entity_analytics/components/risk_summary_panel.tsx
@@ -17,7 +17,7 @@ import { RiskScoreLevel } from './severity/common';
 import type { RiskSeverity } from '../../../common/search_strategy';
 import { RiskScoreEntity } from '../../../common/search_strategy';
 import { getEmptyValue } from '../../common/components/empty_value';
-import { RiskScoreDocLink } from './risk_score_onboarding/risk_score_doc_link';
+import { EntityAnalyticsLearnMoreLink } from './risk_score_onboarding/entity_analytics_doc_link';
 import { RiskScoreHeaderTitle } from './risk_score_onboarding/risk_score_header_title';
 import type { HostRisk, UserRisk } from '../api/types';
 
@@ -35,7 +35,7 @@ interface UserRiskEntity {
 
 export type RiskEntity = HostRiskEntity | UserRiskEntity;
 
-const RiskSummaryComponent: React.FC<RiskEntity> = ({ risk, riskEntity, originalRisk }) => {
+const RiskSummaryPanelComponent: React.FC<RiskEntity> = ({ risk, riskEntity, originalRisk }) => {
   const currentRiskScore =
     riskEntity === RiskScoreEntity.host
       ? risk?.result?.[0]?.host?.risk?.calculated_level
@@ -64,10 +64,7 @@ const RiskSummaryComponent: React.FC<RiskEntity> = ({ risk, riskEntity, original
               values={{
                 riskEntity,
                 riskScoreDocumentationLink: (
-                  <RiskScoreDocLink
-                    riskScoreEntity={riskEntity}
-                    title={i18n.RISK_SCORE_TITLE(riskEntity)}
-                  />
+                  <EntityAnalyticsLearnMoreLink title={i18n.RISK_SCORING_TITLE} />
                 ),
               }}
             />
@@ -103,4 +100,4 @@ const RiskSummaryComponent: React.FC<RiskEntity> = ({ risk, riskEntity, original
     </>
   );
 };
-export const RiskSummary = React.memo(RiskSummaryComponent);
+export const RiskSummaryPanel = React.memo(RiskSummaryPanelComponent);
diff --git a/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
index d1148af03a41a..1d337e9116556 100644
--- a/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
+++ b/x-pack/plugins/security_solution/public/explore/users/containers/users/observed_details/index.tsx
@@ -13,7 +13,6 @@ import { UsersQueries } from '../../../../../../common/search_strategy/security_
 import type { UserItem } from '../../../../../../common/search_strategy/security_solution/users/common';
 import { NOT_EVENT_KIND_ASSET_FILTER } from '../../../../../../common/search_strategy/security_solution/users/common';
 import { useSearchStrategy } from '../../../../../common/containers/use_search_strategy';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 
 export const OBSERVED_USER_QUERY_ID = 'observedUsersDetailsQuery';
 
@@ -43,7 +42,6 @@ export const useObservedUserDetails = ({
   skip = false,
   startDate,
 }: UseUserDetails): [boolean, UserDetailsArgs] => {
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const {
     loading,
     result: response,
@@ -81,9 +79,9 @@ export const useObservedUserDetails = ({
         from: startDate,
         to: endDate,
       },
-      filterQuery: !expandableFlyoutDisabled ? NOT_EVENT_KIND_ASSET_FILTER : undefined,
+      filterQuery: NOT_EVENT_KIND_ASSET_FILTER,
     }),
-    [endDate, indexNames, startDate, userName, expandableFlyoutDisabled]
+    [endDate, indexNames, startDate, userName]
   );
 
   useEffect(() => {
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.test.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.test.tsx
index 1fce080352a08..fec6a1efaa08f 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.test.tsx
@@ -16,7 +16,7 @@ import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_ex
 import { mockFlyoutApi } from '../../shared/mocks/mock_flyout_context';
 import { mockContextValue } from '../../shared/mocks/mock_context';
 import { DocumentDetailsPreviewPanelKey } from '../../shared/constants/panel_keys';
-import { ALERT_PREVIEW_BANNER } from '../../preview';
+import { ALERT_PREVIEW_BANNER } from '../../preview/constants';
 import { DocumentDetailsContext } from '../../shared/context';
 
 jest.mock('../hooks/use_paginated_alerts');
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.tsx
index bf1a28201fc87..5253aa1cd272b 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/left/components/correlations_details_alerts_table.tsx
@@ -7,16 +7,14 @@
 
 import type { ReactElement, ReactNode } from 'react';
 import React, { type FC, useMemo, useCallback } from 'react';
-import { type Criteria, EuiBasicTable, formatDate, EuiButtonIcon } from '@elastic/eui';
+import { type Criteria, EuiBasicTable, formatDate } from '@elastic/eui';
 import { Severity } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { Filter } from '@kbn/es-query';
 import { isRight } from 'fp-ts/lib/Either';
-import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { ALERT_REASON, ALERT_RULE_NAME } from '@kbn/rule-data-utils';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
-import { useDocumentDetailsContext } from '../../shared/context';
 import { CORRELATIONS_DETAILS_ALERT_PREVIEW_BUTTON_TEST_ID } from './test_ids';
 import { CellTooltipWrapper } from '../../shared/components/cell_tooltip_wrapper';
 import type { DataProvider } from '../../../../../common/types';
@@ -26,51 +24,11 @@ import { ExpandablePanel } from '../../../shared/components/expandable_panel';
 import { InvestigateInTimelineButton } from '../../../../common/components/event_details/table/investigate_in_timeline_button';
 import { ACTION_INVESTIGATE_IN_TIMELINE } from '../../../../detections/components/alerts_table/translations';
 import { getDataProvider } from '../../../../common/components/event_details/table/use_action_cell_data_provider';
-import { DocumentDetailsPreviewPanelKey } from '../../shared/constants/panel_keys';
-import { ALERT_PREVIEW_BANNER } from '../../preview';
+import { AlertPreviewButton } from '../../../shared/components/alert_preview_button';
 
 export const TIMESTAMP_DATE_FORMAT = 'MMM D, YYYY @ HH:mm:ss.SSS';
 const dataProviderLimit = 5;
 
-interface AlertPreviewButtonProps {
-  /**
-   * Id of the document
-   */
-  id: string;
-  /**
-   * Name of the index used in the parent's page
-   */
-  indexName: string;
-}
-
-const AlertPreviewButton: FC<AlertPreviewButtonProps> = ({ id, indexName }) => {
-  const { openPreviewPanel } = useExpandableFlyoutApi();
-  const { scopeId } = useDocumentDetailsContext();
-
-  const openAlertPreview = useCallback(
-    () =>
-      openPreviewPanel({
-        id: DocumentDetailsPreviewPanelKey,
-        params: {
-          id,
-          indexName,
-          scopeId,
-          isPreviewMode: true,
-          banner: ALERT_PREVIEW_BANNER,
-        },
-      }),
-    [openPreviewPanel, id, indexName, scopeId]
-  );
-
-  return (
-    <EuiButtonIcon
-      iconType="expand"
-      data-test-subj={CORRELATIONS_DETAILS_ALERT_PREVIEW_BUTTON_TEST_ID}
-      onClick={openAlertPreview}
-    />
-  );
-};
-
 export interface CorrelationsDetailsAlertsTableProps {
   /**
    * Text to display in the ExpandablePanel title section
@@ -172,7 +130,12 @@ export const CorrelationsDetailsAlertsTable: FC<CorrelationsDetailsAlertsTablePr
         ? [
             {
               render: (row: Record<string, unknown>) => (
-                <AlertPreviewButton id={row.id as string} indexName={row.index as string} />
+                <AlertPreviewButton
+                  id={row.id as string}
+                  indexName={row.index as string}
+                  data-test-subj={CORRELATIONS_DETAILS_ALERT_PREVIEW_BUTTON_TEST_ID}
+                  scopeId={scopeId}
+                />
               ),
               width: '5%',
             },
@@ -247,7 +210,7 @@ export const CorrelationsDetailsAlertsTable: FC<CorrelationsDetailsAlertsTablePr
         },
       },
     ],
-    [isPreviewEnabled]
+    [isPreviewEnabled, scopeId]
   );
 
   return (
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx
index 8facaef0885ca..f4a89cbc2b7bc 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/left/index.tsx
@@ -32,7 +32,7 @@ export const LeftPanelNotesTab: LeftPanelPaths = 'notes';
 export const LeftPanel: FC<Partial<DocumentDetailsProps>> = memo(({ path }) => {
   const { telemetry } = useKibana().services;
   const { openLeftPanel } = useExpandableFlyoutApi();
-  const { eventId, indexName, scopeId, getFieldsData } = useDocumentDetailsContext();
+  const { eventId, indexName, scopeId, getFieldsData, isPreview } = useDocumentDetailsContext();
   const eventKind = getField(getFieldsData('event.kind'));
   const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
     'securitySolutionNotesEnabled'
@@ -43,11 +43,11 @@ export const LeftPanel: FC<Partial<DocumentDetailsProps>> = memo(({ path }) => {
       eventKind === EventKind.signal
         ? [tabs.insightsTab, tabs.investigationTab, tabs.responseTab]
         : [tabs.insightsTab];
-    if (securitySolutionNotesEnabled) {
+    if (securitySolutionNotesEnabled && !isPreview) {
       tabList.push(tabs.notesTab);
     }
     return tabList;
-  }, [eventKind, securitySolutionNotesEnabled]);
+  }, [eventKind, isPreview, securitySolutionNotesEnabled]);
 
   const selectedTabId = useMemo(() => {
     const defaultTab = tabsDisplayed[0].id;
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/preview/constants.ts b/x-pack/plugins/security_solution/public/flyout/document_details/preview/constants.ts
new file mode 100644
index 0000000000000..0c07633c4c11e
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/preview/constants.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const ALERT_PREVIEW_BANNER = {
+  title: i18n.translate(
+    'xpack.securitySolution.flyout.left.insights.correlations.alertPreviewTitle',
+    {
+      defaultMessage: 'Preview alert details',
+    }
+  ),
+  backgroundColor: 'warning',
+  textColor: 'warning',
+};
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/preview/index.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/preview/index.tsx
index ff65d4c264c42..6b5eb418774a1 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/preview/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/preview/index.tsx
@@ -8,7 +8,6 @@
 import type { FC } from 'react';
 import React, { memo } from 'react';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { i18n } from '@kbn/i18n';
 import { DocumentDetailsPreviewPanelKey } from '../shared/constants/panel_keys';
 import { useTabs } from '../right/hooks/use_tabs';
 import { useFlyoutIsExpandable } from '../right/hooks/use_flyout_is_expandable';
@@ -18,17 +17,7 @@ import { PanelHeader } from '../right/header';
 import { PanelContent } from '../right/content';
 import { PreviewPanelFooter } from './footer';
 import type { RightPanelTabType } from '../right/tabs';
-
-export const ALERT_PREVIEW_BANNER = {
-  title: i18n.translate(
-    'xpack.securitySolution.flyout.left.insights.correlations.alertPreviewTitle',
-    {
-      defaultMessage: 'Preview alert details',
-    }
-  ),
-  backgroundColor: 'warning',
-  textColor: 'warning',
-};
+import { ALERT_PREVIEW_BANNER } from './constants';
 
 /**
  * Panel to be displayed in the document details expandable flyout on top of right section
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
index e48b5f8fd4f9d..ddcb5a805cd46 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/host_entity_overview.tsx
@@ -67,7 +67,7 @@ export interface HostEntityOverviewProps {
 
 export const HOST_PREVIEW_BANNER = {
   title: i18n.translate('xpack.securitySolution.flyout.right.host.hostPreviewTitle', {
-    defaultMessage: 'Preview host',
+    defaultMessage: 'Preview host details',
   }),
   backgroundColor: 'warning',
   textColor: 'warning',
@@ -187,7 +187,7 @@ export const HostEntityOverview: React.FC<HostEntityOverviewProps> = ({ hostName
           <EuiFlexGroup alignItems="flexEnd" gutterSize="none" responsive={false}>
             <EuiFlexItem grow={false}>{HOST_RISK_LEVEL}</EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <RiskScoreDocTooltip riskScoreEntity={RiskScoreEntity.host} />
+              <RiskScoreDocTooltip />
             </EuiFlexItem>
           </EuiFlexGroup>
         ),
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.test.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.test.tsx
index 1ccf79664512e..74f532fc6809b 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.test.tsx
@@ -29,7 +29,8 @@ const mockFlyoutContextValue = { openLeftPanel: jest.fn() };
 
 const NO_DATA_MESSAGE = "Investigation guideThere's no investigation guide for this rule.";
 const PREVIEW_MESSAGE = 'Investigation guide is not available in alert preview.';
-const OPEN_FLYOUT_MESSAGE = 'Open alert details to access investigation guides.';
+const OPEN_FLYOUT_MESSAGE =
+  'Investigation guide availableOpen alert details to access investigation guides.';
 
 const renderInvestigationGuide = () =>
   render(
@@ -56,7 +57,6 @@ describe('<InvestigationGuide />', () => {
     });
     const { getByTestId, queryByTestId } = renderInvestigationGuide();
     expect(getByTestId(INVESTIGATION_GUIDE_TEST_ID)).toBeInTheDocument();
-    expect(getByTestId(INVESTIGATION_GUIDE_TEST_ID)).toHaveTextContent('Investigation guide');
     expect(getByTestId(INVESTIGATION_GUIDE_BUTTON_TEST_ID)).toBeInTheDocument();
     expect(getByTestId(INVESTIGATION_GUIDE_BUTTON_TEST_ID)).toHaveTextContent(
       'Show investigation guide'
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.tsx
index efbe095ae9e4d..f490266113533 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_guide.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import React, { useCallback, useMemo } from 'react';
-import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiTitle, EuiSkeletonText } from '@elastic/eui';
+import { EuiButton, EuiSkeletonText, EuiCallOut } from '@elastic/eui';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { i18n } from '@kbn/i18n';
@@ -46,29 +46,38 @@ export const InvestigationGuide: React.FC = () => {
     });
   }, [eventId, indexName, openLeftPanel, scopeId]);
 
-  const hasInvesigationGuide = useMemo(
+  const hasInvestigationGuide = useMemo(
     () => !error && basicAlertData && basicAlertData.ruleId && ruleNote,
     [error, basicAlertData, ruleNote]
   );
 
-  return (
-    <EuiFlexGroup direction="column" gutterSize="s" data-test-subj={INVESTIGATION_GUIDE_TEST_ID}>
-      <EuiFlexItem>
-        <EuiTitle size="xxs">
-          <h5>
+  const content = useMemo(() => {
+    if (isPreview) {
+      return (
+        <EuiCallOut
+          iconType="documentation"
+          size="s"
+          title={
             <FormattedMessage
-              id="xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideTitle"
+              id="xpack.securitySolution.flyout.right.investigation.investigationGuide.previewTitle"
               defaultMessage="Investigation guide"
             />
-          </h5>
-        </EuiTitle>
-      </EuiFlexItem>
-      {isPreview ? (
-        <FormattedMessage
-          id="xpack.securitySolution.flyout.right.investigation.investigationGuide.previewMessage"
-          defaultMessage="Investigation guide is not available in alert preview."
-        />
-      ) : loading ? (
+          }
+          aria-label={i18n.translate(
+            'xpack.securitySolution.flyout.right.investigation.investigationGuide.previewAriaLabel',
+            { defaultMessage: 'Investigation guide' }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.investigation.investigationGuide.previewMessage"
+            defaultMessage="Investigation guide is not available in alert preview."
+          />
+        </EuiCallOut>
+      );
+    }
+
+    if (loading) {
+      return (
         <EuiSkeletonText
           data-test-subj={INVESTIGATION_GUIDE_LOADING_TEST_ID}
           contentAriaLabel={i18n.translate(
@@ -76,38 +85,78 @@ export const InvestigationGuide: React.FC = () => {
             { defaultMessage: 'investigation guide' }
           )}
         />
-      ) : hasInvesigationGuide && isPreviewMode ? (
-        <FormattedMessage
-          id="xpack.securitySolution.flyout.right.investigation.investigationGuide.openFlyoutMessage"
-          defaultMessage="Open alert details to access investigation guides."
-        />
-      ) : hasInvesigationGuide ? (
-        <EuiFlexItem>
-          <EuiButton
-            onClick={goToInvestigationsTab}
-            iconType="documentation"
-            data-test-subj={INVESTIGATION_GUIDE_BUTTON_TEST_ID}
-            aria-label={i18n.translate(
-              'xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonAriaLabel',
-              {
-                defaultMessage: 'Show investigation guide',
-              }
-            )}
-          >
+      );
+    }
+
+    if (hasInvestigationGuide && isPreviewMode) {
+      return (
+        <EuiCallOut
+          iconType="documentation"
+          size="s"
+          title={
             <FormattedMessage
-              id="xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonLabel"
-              defaultMessage="Show investigation guide"
+              id="xpack.securitySolution.flyout.right.investigation.investigationGuide.openFlyoutTitle"
+              defaultMessage="Investigation guide available"
             />
-          </EuiButton>
-        </EuiFlexItem>
-      ) : (
+          }
+          aria-label={i18n.translate(
+            'xpack.securitySolution.flyout.right.investigation.investigationGuide.openFlyoutAriaLabel',
+            { defaultMessage: 'Investigation guide available' }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.investigation.investigationGuide.openFlyoutMessage"
+            defaultMessage="Open alert details to access investigation guides."
+          />
+        </EuiCallOut>
+      );
+    }
+
+    if (hasInvestigationGuide) {
+      return (
+        <EuiButton
+          onClick={goToInvestigationsTab}
+          iconType="documentation"
+          size="s"
+          fullWidth
+          data-test-subj={INVESTIGATION_GUIDE_BUTTON_TEST_ID}
+          aria-label={i18n.translate(
+            'xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonAriaLabel',
+            { defaultMessage: 'Show investigation guide' }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonLabel"
+            defaultMessage="Show investigation guide"
+          />
+        </EuiButton>
+      );
+    }
+
+    return (
+      <EuiCallOut
+        iconType="documentation"
+        size="s"
+        title={
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataTitle"
+            defaultMessage="Investigation guide"
+          />
+        }
+        aria-label={i18n.translate(
+          'xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataAriaLabel',
+          { defaultMessage: 'Investigation guide' }
+        )}
+      >
         <FormattedMessage
           id="xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataDescription"
           defaultMessage="There's no investigation guide for this rule."
         />
-      )}
-    </EuiFlexGroup>
-  );
+      </EuiCallOut>
+    );
+  }, [loading, isPreview, isPreviewMode, goToInvestigationsTab, hasInvestigationGuide]);
+
+  return <div data-test-subj={INVESTIGATION_GUIDE_TEST_ID}>{content}</div>;
 };
 
 InvestigationGuide.displayName = 'InvestigationGuideButton';
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_section.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_section.tsx
index b211fa597df5f..8d97df702c1d8 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_section.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/investigation_section.tsx
@@ -39,13 +39,13 @@ export const InvestigationSection = memo(() => {
         />
       }
       localStorageKey={KEY}
-      gutterSize="s"
+      gutterSize="none"
       data-test-subj={INVESTIGATION_SECTION_TEST_ID}
     >
       {eventKind === EventKind.signal && (
         <>
           <InvestigationGuide />
-          <EuiSpacer size="s" />
+          <EuiSpacer size="m" />
         </>
       )}
       <HighlightedFields />
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_button.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_button.tsx
index 206c4d32a4238..291ce9687ae27 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_button.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_button.tsx
@@ -38,6 +38,7 @@ export const ResponseButton: React.FC = () => {
         onClick={goToResponseTab}
         iconType="documentation"
         data-test-subj={RESPONSE_BUTTON_TEST_ID}
+        size="s"
       >
         <FormattedMessage
           id="xpack.securitySolution.flyout.right.response.responseButtonLabel"
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_section.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_section.tsx
index 19c77b6d9478b..168e5b05357b5 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_section.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/response_section.tsx
@@ -5,8 +5,10 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React, { memo, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n-react';
+import { EuiCallOut } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { useExpandSection } from '../hooks/use_expand_section';
 import { ResponseButton } from './response_button';
 import { ExpandableSection } from './expandable_section';
@@ -24,8 +26,60 @@ export const ResponseSection = memo(() => {
   const { isPreview, getFieldsData, isPreviewMode } = useDocumentDetailsContext();
 
   const expanded = useExpandSection({ title: KEY, defaultValue: false });
-
   const eventKind = getField(getFieldsData('event.kind'));
+
+  const content = useMemo(() => {
+    if (isPreview) {
+      return (
+        <EuiCallOut
+          iconType="documentation"
+          size="s"
+          title={
+            <FormattedMessage
+              id="xpack.securitySolution.flyout.right.response.previewTitle"
+              defaultMessage="Response actions"
+            />
+          }
+          aria-label={i18n.translate(
+            'xpack.securitySolution.flyout.right.response.previewAriaLabel',
+            { defaultMessage: 'Response actions' }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.response.previewMessage"
+            defaultMessage="Response is not available in alert preview."
+          />
+        </EuiCallOut>
+      );
+    }
+
+    if (isPreviewMode) {
+      return (
+        <EuiCallOut
+          iconType="documentation"
+          size="s"
+          title={
+            <FormattedMessage
+              id="xpack.securitySolution.flyout.right.response.openFlyoutTitle"
+              defaultMessage="Response actions"
+            />
+          }
+          aria-label={i18n.translate(
+            'xpack.securitySolution.flyout.right.response.openFlyoutAriaLabel',
+            { defaultMessage: 'Response actions' }
+          )}
+        >
+          <FormattedMessage
+            id="xpack.securitySolution.flyout.right.response.openFlyoutMessage"
+            defaultMessage="Open alert details to access response actions."
+          />
+        </EuiCallOut>
+      );
+    }
+
+    return <ResponseButton />;
+  }, [isPreview, isPreviewMode]);
+
   if (eventKind !== EventKind.signal) {
     return null;
   }
@@ -42,19 +96,7 @@ export const ResponseSection = memo(() => {
       localStorageKey={KEY}
       data-test-subj={RESPONSE_SECTION_TEST_ID}
     >
-      {isPreview ? (
-        <FormattedMessage
-          id="xpack.securitySolution.flyout.right.response.previewMessage"
-          defaultMessage="Response is not available in alert preview."
-        />
-      ) : isPreviewMode ? (
-        <FormattedMessage
-          id="xpack.securitySolution.flyout.right.response.openFlyoutMessage"
-          defaultMessage="Open alert details to access response actions."
-        />
-      ) : (
-        <ResponseButton />
-      )}
+      {content}
     </ExpandableSection>
   );
 });
diff --git a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
index 47938e5212e7c..f8b9a49abc306 100644
--- a/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/document_details/right/components/user_entity_overview.tsx
@@ -68,7 +68,7 @@ export interface UserEntityOverviewProps {
 
 export const USER_PREVIEW_BANNER = {
   title: i18n.translate('xpack.securitySolution.flyout.right.user.userPreviewTitle', {
-    defaultMessage: 'Preview user',
+    defaultMessage: 'Preview user details',
   }),
   backgroundColor: 'warning',
   textColor: 'warning',
@@ -187,7 +187,7 @@ export const UserEntityOverview: React.FC<UserEntityOverviewProps> = ({ userName
           <EuiFlexGroup alignItems="flexEnd" gutterSize="none" responsive={false}>
             <EuiFlexItem grow={false}>{USER_RISK_LEVEL}</EuiFlexItem>
             <EuiFlexItem grow={false}>
-              <RiskScoreDocTooltip riskScoreEntity={RiskScoreEntity.user} />
+              <RiskScoreDocTooltip />
             </EuiFlexItem>
           </EuiFlexGroup>
         ),
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.test.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.test.tsx
index fdda420616cc6..afe0bebcf802b 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.test.tsx
@@ -41,16 +41,22 @@ jest.mock('../../../entity_analytics/api/hooks/use_risk_score', () => ({
 
 describe('HostDetailsPanel', () => {
   it('render risk inputs panel', () => {
-    const { getByTestId } = render(<HostDetailsPanel name="elastic" isRiskScoreExist={true} />, {
-      wrapper: TestProviders,
-    });
+    const { getByTestId } = render(
+      <HostDetailsPanel name="elastic" isRiskScoreExist={true} scopeId={'scopeId'} />,
+      {
+        wrapper: TestProviders,
+      }
+    );
     expect(getByTestId(RISK_INPUTS_TAB_TEST_ID)).toBeInTheDocument();
   });
 
   it("doesn't render risk inputs panel when no alerts ids are provided", () => {
-    const { queryByTestId } = render(<HostDetailsPanel name="elastic" isRiskScoreExist={false} />, {
-      wrapper: TestProviders,
-    });
+    const { queryByTestId } = render(
+      <HostDetailsPanel name="elastic" isRiskScoreExist={false} scopeId={'scopeId'} />,
+      {
+        wrapper: TestProviders,
+      }
+    );
     expect(queryByTestId(RISK_INPUTS_TAB_TEST_ID)).not.toBeInTheDocument();
   });
 });
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.tsx
index 853a68c4fb95e..ba34ac3d8aa3a 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/host_details_left/index.tsx
@@ -18,6 +18,7 @@ import { RiskScoreEntity } from '../../../../common/entity_analytics/risk_engine
 export interface HostDetailsPanelProps extends Record<string, unknown> {
   isRiskScoreExist: boolean;
   name: string;
+  scopeId: string;
 }
 export interface HostDetailsExpandableFlyoutProps extends FlyoutPanelProps {
   key: 'host_details';
@@ -25,18 +26,18 @@ export interface HostDetailsExpandableFlyoutProps extends FlyoutPanelProps {
 }
 export const HostDetailsPanelKey: HostDetailsExpandableFlyoutProps['key'] = 'host_details';
 
-export const HostDetailsPanel = ({ name, isRiskScoreExist }: HostDetailsPanelProps) => {
+export const HostDetailsPanel = ({ name, isRiskScoreExist, scopeId }: HostDetailsPanelProps) => {
   // Temporary implementation while Host details left panel don't have Asset tabs
   const [tabs, selectedTabId, setSelectedTabId] = useMemo(() => {
     const isRiskScoreTabAvailable = isRiskScoreExist && name;
     return [
       isRiskScoreTabAvailable
-        ? [getRiskInputTab({ entityName: name, entityType: RiskScoreEntity.host })]
+        ? [getRiskInputTab({ entityName: name, entityType: RiskScoreEntity.host, scopeId })]
         : [],
       EntityDetailsLeftPanelTab.RISK_INPUTS,
       () => {},
     ];
-  }, [name, isRiskScoreExist]);
+  }, [name, isRiskScoreExist, scopeId]);
 
   return (
     <>
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/host_preview/footer.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/host_preview/footer.tsx
index 4632c20e517af..e550da28b532a 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/host_preview/footer.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/host_preview/footer.tsx
@@ -47,7 +47,7 @@ export const HostPreviewPanelFooter = ({
         <EuiFlexItem grow={false}>
           <EuiLink onClick={openHostFlyout} target="_blank" data-test-subj={'open-host-flyout'}>
             {i18n.translate('xpack.securitySolution.flyout.host.preview.viewDetailsLabel', {
-              defaultMessage: 'Open host details flyout',
+              defaultMessage: 'Show full host details',
             })}
           </EuiLink>
         </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/content.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/content.tsx
index 26dcb462a1609..af3eae38fc1f8 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/content.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/content.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { EuiHorizontalRule } from '@elastic/eui';
 import { AssetCriticalityAccordion } from '../../../entity_analytics/components/asset_criticality/asset_criticality_selector';
-import { RiskSummary } from '../../../entity_analytics/components/risk_summary_flyout/risk_summary';
+import { FlyoutRiskSummary } from '../../../entity_analytics/components/risk_summary_flyout/risk_summary';
 import type { RiskScoreState } from '../../../entity_analytics/api/hooks/use_risk_score';
 import type { RiskScoreEntity, HostItem } from '../../../../common/search_strategy';
 import { FlyoutBody } from '../../shared/components/flyout_body';
@@ -49,7 +49,7 @@ export const HostPanelContent = ({
     <FlyoutBody>
       {riskScoreState.isModuleEnabled && riskScoreState.data?.length !== 0 && (
         <>
-          <RiskSummary
+          <FlyoutRiskSummary
             riskScoreData={riskScoreState}
             recalculatingScore={recalculatingScore}
             queryId={HOST_PANEL_RISK_SCORE_QUERY_ID}
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/index.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/index.tsx
index 518e423fe0077..798bff18b9c16 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/host_right/index.tsx
@@ -112,12 +112,13 @@ export const HostPanel = ({
         id: HostDetailsPanelKey,
         params: {
           name: hostName,
+          scopeId,
           isRiskScoreExist,
           path: tab ? { tab } : undefined,
         },
       });
     },
-    [telemetry, openLeftPanel, hostName, isRiskScoreExist]
+    [telemetry, openLeftPanel, hostName, isRiskScoreExist, scopeId]
   );
 
   const openDefaultPanel = useCallback(() => openTabPanel(), [openTabPanel]);
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.test.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.test.tsx
index 2c88a0ecdfb0b..bdff465e0b982 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.test.tsx
@@ -20,6 +20,7 @@ describe('LeftPanel', () => {
         }}
         isRiskScoreExist
         user={{ name: 'test user', email: [] }}
+        scopeId={'scopeId'}
       />,
       {
         wrapper: TestProviders,
@@ -39,6 +40,7 @@ describe('LeftPanel', () => {
         }}
         isRiskScoreExist={false}
         user={{ name: 'test user', email: [] }}
+        scopeId={'scopeId'}
       />,
       {
         wrapper: TestProviders,
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.tsx
index 3a682ba125864..757c6799a6da1 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/index.tsx
@@ -27,6 +27,7 @@ export interface UserDetailsPanelProps extends Record<string, unknown> {
   isRiskScoreExist: boolean;
   user: UserParam;
   path?: PanelPath;
+  scopeId: string;
 }
 export interface UserDetailsExpandableFlyoutProps extends FlyoutPanelProps {
   key: 'user_details';
@@ -34,9 +35,14 @@ export interface UserDetailsExpandableFlyoutProps extends FlyoutPanelProps {
 }
 export const UserDetailsPanelKey: UserDetailsExpandableFlyoutProps['key'] = 'user_details';
 
-export const UserDetailsPanel = ({ isRiskScoreExist, user, path }: UserDetailsPanelProps) => {
+export const UserDetailsPanel = ({
+  isRiskScoreExist,
+  user,
+  path,
+  scopeId,
+}: UserDetailsPanelProps) => {
   const managedUser = useManagedUser(user.name, user.email);
-  const tabs = useTabs(managedUser.data, user.name, isRiskScoreExist);
+  const tabs = useTabs(managedUser.data, user.name, isRiskScoreExist, scopeId);
   const { selectedTabId, setSelectedTabId } = useSelectedTab(isRiskScoreExist, user, tabs, path);
 
   if (managedUser.isLoading) return <FlyoutLoading />;
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/tabs.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/tabs.tsx
index 358dd5357ae2f..3a6814a28e62c 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/tabs.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_details_left/tabs.tsx
@@ -25,7 +25,8 @@ import { EntityDetailsLeftPanelTab } from '../shared/components/left_panel/left_
 export const useTabs = (
   managedUser: ManagedUserHits,
   name: string,
-  isRiskScoreExist: boolean
+  isRiskScoreExist: boolean,
+  scopeId: string
 ): LeftPanelTabsType =>
   useMemo(() => {
     const tabs: LeftPanelTabsType = [];
@@ -37,6 +38,7 @@ export const useTabs = (
         getRiskInputTab({
           entityName: name,
           entityType: RiskScoreEntity.user,
+          scopeId,
         })
       );
     }
@@ -50,7 +52,7 @@ export const useTabs = (
     }
 
     return tabs;
-  }, [isRiskScoreExist, managedUser, name]);
+  }, [isRiskScoreExist, managedUser, name, scopeId]);
 
 const getOktaTab = (oktaManagedUser: ManagedUserHit) => ({
   id: EntityDetailsLeftPanelTab.OKTA,
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_preview/footer.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_preview/footer.tsx
index 5fb1b73e1683b..7f55feb7a347c 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_preview/footer.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_preview/footer.tsx
@@ -47,7 +47,7 @@ export const UserPreviewPanelFooter = ({
         <EuiFlexItem grow={false}>
           <EuiLink onClick={openUserFlyout} target="_blank" data-test-subj={'open-user-flyout'}>
             {i18n.translate('xpack.securitySolution.flyout.user.preview.viewDetailsLabel', {
-              defaultMessage: 'Open user details flyout',
+              defaultMessage: 'Show full user details',
             })}
           </EuiLink>
         </EuiFlexItem>
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/content.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/content.tsx
index d7b01fe8905d5..1631f5c1bc58b 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/content.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/content.tsx
@@ -12,7 +12,7 @@ import { useIsExperimentalFeatureEnabled } from '../../../common/hooks/use_exper
 import { AssetCriticalityAccordion } from '../../../entity_analytics/components/asset_criticality/asset_criticality_selector';
 
 import { OBSERVED_USER_QUERY_ID } from '../../../explore/users/containers/users/observed_details';
-import { RiskSummary } from '../../../entity_analytics/components/risk_summary_flyout/risk_summary';
+import { FlyoutRiskSummary } from '../../../entity_analytics/components/risk_summary_flyout/risk_summary';
 import type { RiskScoreState } from '../../../entity_analytics/api/hooks/use_risk_score';
 import { ManagedUser } from '../../../timelines/components/side_panel/new_user_detail/managed_user';
 import type { ManagedUserData } from '../../../timelines/components/side_panel/new_user_detail/types';
@@ -58,7 +58,7 @@ export const UserPanelContent = ({
     <FlyoutBody>
       {riskScoreState.isModuleEnabled && riskScoreState.data?.length !== 0 && (
         <>
-          <RiskSummary
+          <FlyoutRiskSummary
             riskScoreData={riskScoreState}
             recalculatingScore={recalculatingScore}
             queryId={USER_PANEL_RISK_SCORE_QUERY_ID}
diff --git a/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/index.tsx b/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/index.tsx
index bdfc967fd1508..97f36c3a525c5 100644
--- a/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/index.tsx
+++ b/x-pack/plugins/security_solution/public/flyout/entity_details/user_right/index.tsx
@@ -115,6 +115,7 @@ export const UserPanel = ({
         id: UserDetailsPanelKey,
         params: {
           isRiskScoreExist: !!userRiskData?.user?.risk,
+          scopeId,
           user: {
             name: userName,
             email,
@@ -123,7 +124,7 @@ export const UserPanel = ({
         path: tab ? { tab } : undefined,
       });
     },
-    [telemetry, email, openLeftPanel, userName, userRiskData]
+    [telemetry, openLeftPanel, userRiskData?.user?.risk, userName, email, scopeId]
   );
 
   const openPanelFirstTab = useCallback(() => openPanelTab(), [openPanelTab]);
diff --git a/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.test.tsx b/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.test.tsx
new file mode 100644
index 0000000000000..f478812f96f93
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.test.tsx
@@ -0,0 +1,65 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { fireEvent, render } from '@testing-library/react';
+import { ExpandableFlyoutProvider } from '@kbn/expandable-flyout';
+import React from 'react';
+import { AlertPreviewButton } from './alert_preview_button';
+import { DocumentDetailsPreviewPanelKey } from '../../document_details/shared/constants/panel_keys';
+import { ALERT_PREVIEW_BANNER } from '../../document_details/preview/constants';
+
+const mockOpenPreviewPanel = jest.fn();
+jest.mock('@kbn/expandable-flyout', () => {
+  return {
+    useExpandableFlyoutApi: () => ({
+      openPreviewPanel: mockOpenPreviewPanel,
+    }),
+  };
+});
+
+describe('AlertPreviewButton', () => {
+  it('renders the icon', () => {
+    const { getByTestId } = render(
+      <AlertPreviewButton
+        id="1"
+        indexName="index"
+        scopeId="scope"
+        data-test-subj="alertPreviewButton"
+      />,
+      { wrapper: ExpandableFlyoutProvider }
+    );
+    expect(getByTestId('alertPreviewButton')).toBeInTheDocument();
+  });
+
+  it('opens the preview panel when clicked', () => {
+    const id = '1';
+    const indexName = 'index';
+    const scopeId = 'scope';
+
+    const { getByTestId } = render(
+      <AlertPreviewButton
+        id={id}
+        indexName={indexName}
+        scopeId={scopeId}
+        data-test-subj="alertPreviewButton"
+      />,
+      { wrapper: ExpandableFlyoutProvider }
+    );
+    fireEvent.click(getByTestId('alertPreviewButton'));
+
+    expect(mockOpenPreviewPanel).toHaveBeenCalledWith({
+      id: DocumentDetailsPreviewPanelKey,
+      params: {
+        id,
+        indexName,
+        scopeId,
+        isPreviewMode: true,
+        banner: ALERT_PREVIEW_BANNER,
+      },
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.tsx b/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.tsx
new file mode 100644
index 0000000000000..62426476e3c1f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/flyout/shared/components/alert_preview_button.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiButtonIcon } from '@elastic/eui';
+import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
+import React, { useCallback } from 'react';
+import type { FC } from 'react';
+import { i18n } from '@kbn/i18n';
+import { ALERT_PREVIEW_BANNER } from '../../document_details/preview/constants';
+import { DocumentDetailsPreviewPanelKey } from '../../document_details/shared/constants/panel_keys';
+
+interface AlertPreviewButtonProps {
+  /**
+   * Name of the index used in the parent's page
+   */
+  indexName: string;
+  /**
+   * Id of the alert to preview
+   */
+  id: string;
+  /**
+   * Data attribute used for testing.
+   */
+  'data-test-subj'?: string;
+  /**
+   * Maintain backwards compatibility // TODO remove when possible
+   */
+  scopeId: string;
+}
+
+/**
+ * Icon button showed on tables to launch a preview of the alert details panel.
+ */
+export const AlertPreviewButton: FC<AlertPreviewButtonProps> = ({
+  id,
+  indexName,
+  'data-test-subj': dataTestSubj,
+  scopeId,
+}) => {
+  const { openPreviewPanel } = useExpandableFlyoutApi();
+
+  const openAlertPreview = useCallback(
+    () =>
+      openPreviewPanel({
+        id: DocumentDetailsPreviewPanelKey,
+        params: {
+          id,
+          indexName,
+          scopeId,
+          isPreviewMode: true,
+          banner: ALERT_PREVIEW_BANNER,
+        },
+      }),
+    [openPreviewPanel, id, indexName, scopeId]
+  );
+
+  return (
+    <EuiButtonIcon
+      iconType="expand"
+      data-test-subj={dataTestSubj}
+      onClick={openAlertPreview}
+      aria-label={i18n.translate('xpack.securitySolution.flyout.right.alertPreview.ariaLabel', {
+        defaultMessage: 'Preview alert with id {id}',
+        values: { id },
+      })}
+    />
+  );
+};
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/kill_process_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/kill_process_action.tsx
index 657b6847e7839..a6b2951615381 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/kill_process_action.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/kill_process_action.tsx
@@ -6,18 +6,18 @@
  */
 
 import { memo, useMemo } from 'react';
-import type { KillOrSuspendProcessRequestBody } from '../../../../../common/endpoint/types';
 import { parsedPidOrEntityIdParameter } from '../lib/utils';
 import { useSendKillProcessRequest } from '../../../hooks/response_actions/use_send_kill_process_endpoint_request';
 import type { ActionRequestComponentProps } from '../types';
 import { useConsoleActionSubmitter } from '../hooks/use_console_action_submitter';
+import type { KillProcessRequestBody } from '../../../../../common/endpoint/types';
 
 export const KillProcessActionResult = memo<
   ActionRequestComponentProps<{ pid?: string[]; entityId?: string[] }>
 >(({ command, setStore, store, status, setStatus, ResultComponent }) => {
   const actionCreator = useSendKillProcessRequest();
 
-  const actionRequestBody = useMemo<undefined | KillOrSuspendProcessRequestBody>(() => {
+  const actionRequestBody = useMemo<undefined | KillProcessRequestBody>(() => {
     const endpointId = command.commandDefinition?.meta?.endpointId;
     const parameters = parsedPidOrEntityIdParameter(command.args.args);
 
@@ -30,7 +30,7 @@ export const KillProcessActionResult = memo<
       : undefined;
   }, [command.args.args, command.commandDefinition?.meta?.endpointId]);
 
-  return useConsoleActionSubmitter<KillOrSuspendProcessRequestBody>({
+  return useConsoleActionSubmitter<KillProcessRequestBody>({
     ResultComponent,
     setStore,
     store,
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/suspend_process_action.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/suspend_process_action.tsx
index fbb18aabd7b00..70893689c0439 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/suspend_process_action.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/command_render_components/suspend_process_action.tsx
@@ -8,8 +8,8 @@
 import { memo, useMemo } from 'react';
 import { parsedPidOrEntityIdParameter } from '../lib/utils';
 import type {
-  KillOrSuspendProcessRequestBody,
   SuspendProcessActionOutputContent,
+  SuspendProcessRequestBody,
 } from '../../../../../common/endpoint/types';
 import { useSendSuspendProcessRequest } from '../../../hooks/response_actions/use_send_suspend_process_endpoint_request';
 import type { ActionRequestComponentProps } from '../types';
@@ -20,7 +20,7 @@ export const SuspendProcessActionResult = memo<
 >(({ command, setStore, store, status, setStatus, ResultComponent }) => {
   const actionCreator = useSendSuspendProcessRequest();
 
-  const actionRequestBody = useMemo<undefined | KillOrSuspendProcessRequestBody>(() => {
+  const actionRequestBody = useMemo<undefined | SuspendProcessRequestBody>(() => {
     const endpointId = command.commandDefinition?.meta?.endpointId;
     const parameters = parsedPidOrEntityIdParameter(command.args.args);
 
@@ -33,10 +33,7 @@ export const SuspendProcessActionResult = memo<
       : undefined;
   }, [command.args.args, command.commandDefinition?.meta?.endpointId]);
 
-  return useConsoleActionSubmitter<
-    KillOrSuspendProcessRequestBody,
-    SuspendProcessActionOutputContent
-  >({
+  return useConsoleActionSubmitter<SuspendProcessRequestBody, SuspendProcessActionOutputContent>({
     ResultComponent,
     setStore,
     store,
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/console_commands_definition.ts b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/console_commands_definition.ts
index 84624c2ce595b..b57bd57ecd85b 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/console_commands_definition.ts
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/console_commands_definition.ts
@@ -571,9 +571,13 @@ const adjustCommandsForSentinelOne = ({
 }: {
   commandList: CommandDefinition[];
 }): CommandDefinition[] => {
+  const featureFlags = ExperimentalFeaturesService.get();
+  const isKillProcessEnabled = featureFlags.responseActionsSentinelOneKillProcessEnabled;
+
   return commandList.map((command) => {
     if (
       command.name === 'status' ||
+      (command.name === 'kill-process' && !isKillProcessEnabled) ||
       !isAgentTypeAndActionSupported(
         'sentinel_one',
         RESPONSE_CONSOLE_COMMAND_TO_API_COMMAND_MAP[command.name as ConsoleResponseActionCommands],
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/integration_tests/console_commands_definition.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/integration_tests/console_commands_definition.test.tsx
index cff88c4e9854d..a20aa3bd61a2e 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/integration_tests/console_commands_definition.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/integration_tests/console_commands_definition.test.tsx
@@ -18,6 +18,7 @@ import { HELP_GROUPS } from '../console_commands_definition';
 import { ExperimentalFeaturesService } from '../../../../../common/experimental_features_service';
 import type { CommandDefinition } from '../../../console';
 import type { HostMetadataInterface } from '../../../../../../common/endpoint/types';
+import { CONSOLE_RESPONSE_ACTION_COMMANDS } from '../../../../../../common/endpoint/service/response_actions/constants';
 
 jest.mock('../../../../../common/experimental_features_service');
 
@@ -43,8 +44,9 @@ describe('When displaying Endpoint Response Actions', () => {
 
   describe('for agent type endpoint', () => {
     beforeEach(() => {
-      (ExperimentalFeaturesService.get as jest.Mock).mockReturnValueOnce({
+      (ExperimentalFeaturesService.get as jest.Mock).mockReturnValue({
         responseActionUploadEnabled: true,
+        responseActionScanEnabled: true,
       });
       commands = getEndpointConsoleCommands({
         agentType: 'endpoint',
@@ -71,17 +73,14 @@ describe('When displaying Endpoint Response Actions', () => {
         HELP_GROUPS.responseActions.label
       );
 
-      expect(commandsInPanel).toEqual([
-        'isolate',
-        'release',
-        'status',
-        'processes',
-        'kill-process --pid',
-        'suspend-process --pid',
-        'get-file --path',
-        'execute --command',
-        'upload --file',
-      ]);
+      const expectedCommands: string[] = [...CONSOLE_RESPONSE_ACTION_COMMANDS];
+      // add status to the list of expected commands in that order
+      expectedCommands.splice(2, 0, 'status');
+
+      const helpCommandsString = commandsInPanel.map((command) => command.split(' ')[0]).join(',');
+
+      // verify that the help commands map to the command list in the same order
+      expect(helpCommandsString).toEqual(expectedCommands.join(','));
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/utils.ts b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/utils.ts
index d5c40347ebf80..41c57feb5c76c 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/utils.ts
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_responder/lib/utils.ts
@@ -4,12 +4,15 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { ResponseActionParametersWithPidOrEntityId } from '../../../../../common/endpoint/types';
+import type {
+  ResponseActionParametersWithEntityId,
+  ResponseActionParametersWithPid,
+} from '../../../../../common/endpoint/types';
 
 export const parsedPidOrEntityIdParameter = (parameters: {
   pid?: string[];
   entityId?: string[];
-}): ResponseActionParametersWithPidOrEntityId => {
+}): ResponseActionParametersWithPid | ResponseActionParametersWithEntityId => {
   if (parameters.pid) {
     return { pid: Number(parameters.pid[0]) };
   }
diff --git a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/integration_tests/response_actions_log.test.tsx b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/integration_tests/response_actions_log.test.tsx
index bf13fec9086b1..48cc21f4f5a55 100644
--- a/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/integration_tests/response_actions_log.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/endpoint_response_actions_list/integration_tests/response_actions_log.test.tsx
@@ -39,6 +39,7 @@ import { getEndpointAuthzInitialStateMock } from '../../../../../common/endpoint
 import { useGetEndpointActionList as _useGetEndpointActionList } from '../../../hooks/response_actions/use_get_endpoint_action_list';
 import { OUTPUT_MESSAGES } from '../translations';
 import { EndpointActionGenerator } from '../../../../../common/endpoint/data_generators/endpoint_action_generator';
+import type { ExperimentalFeatures } from '../../../../../common';
 
 const useGetEndpointActionListMock = _useGetEndpointActionList as jest.Mock;
 
@@ -1490,6 +1491,17 @@ describe('Response actions history', () => {
   });
 
   describe('Actions filter', () => {
+    let featureFlags: Partial<ExperimentalFeatures>;
+
+    beforeEach(() => {
+      featureFlags = {
+        responseActionUploadEnabled: true,
+        responseActionScanEnabled: false,
+      };
+
+      mockedContext.setExperimentalFlag(featureFlags);
+    });
+
     const filterPrefix = 'actions-filter';
 
     it('should have a search bar', () => {
@@ -1505,7 +1517,10 @@ describe('Response actions history', () => {
     });
 
     it('should show a list of actions (without `scan`) when opened', () => {
-      mockedContext.setExperimentalFlag({ responseActionUploadEnabled: true });
+      mockedContext.setExperimentalFlag({
+        ...featureFlags,
+        responseActionScanEnabled: false,
+      });
       render();
       const { getByTestId, getAllByTestId } = renderResult;
 
@@ -1529,7 +1544,7 @@ describe('Response actions history', () => {
 
     it('should show a list of actions (with `scan`) when opened', () => {
       mockedContext.setExperimentalFlag({
-        responseActionUploadEnabled: true,
+        ...featureFlags,
         responseActionScanEnabled: true,
       });
       render();
diff --git a/x-pack/plugins/security_solution/public/management/components/policy_response/integration_tests/policy_response_wrapper.test.tsx b/x-pack/plugins/security_solution/public/management/components/policy_response/integration_tests/policy_response_wrapper.test.tsx
index f23e3bb005fba..63fd435e4a046 100644
--- a/x-pack/plugins/security_solution/public/management/components/policy_response/integration_tests/policy_response_wrapper.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/policy_response/integration_tests/policy_response_wrapper.test.tsx
@@ -136,6 +136,16 @@ describe('when on the policy response', () => {
       for (const action of actions) {
         userEvent.click(action);
       }
+      const artifactsTitle = component.getByTestId('endpointPolicyResponseArtifactsTitle');
+
+      userEvent.click(artifactsTitle);
+
+      const globalArtifacts = component.getByTestId(`endpointPolicyResponseArtifactGlobal`);
+      const userArtifacts = component.getByTestId(`endpointPolicyResponseArtifactUser`);
+
+      userEvent.click(globalArtifacts);
+      userEvent.click(userArtifacts);
+
       return component;
     };
   });
@@ -209,6 +219,42 @@ describe('when on the policy response', () => {
     // );
   });
 
+  it('should show a configuration section for artifacts', async () => {
+    runMock();
+    const component = await renderOpenedTree();
+
+    const globalArtifacts = component.getByTestId(`endpointPolicyResponseArtifactGlobal`);
+    const userArtifacts = component.getByTestId(`endpointPolicyResponseArtifactUser`);
+    expect(globalArtifacts.textContent).toBe(
+      `Global (v${commonPolicyResponse.Endpoint.policy.applied.artifacts.global.version})`
+    );
+    expect(userArtifacts.textContent).toBe(
+      `User (v${commonPolicyResponse.Endpoint.policy.applied.artifacts.user.version})`
+    );
+  });
+
+  it('should show artifact section for each configuration section', async () => {
+    runMock();
+    const component = await renderOpenedTree();
+
+    const artifacts = [
+      ...commonPolicyResponse.Endpoint.policy.applied.artifacts.global.identifiers,
+      ...commonPolicyResponse.Endpoint.policy.applied.artifacts.user.identifiers,
+    ];
+
+    const names = component.queryAllByTestId('endpointPolicyResponseArtifactName');
+    const sha256s = component.queryAllByTestId('endpointPolicyResponseArtifactSha256');
+    const copyButtons = component.queryAllByTestId('endpointPolicyResponseArtifactCopyButton');
+
+    expect(names).toHaveLength(artifacts.length);
+    expect(sha256s).toHaveLength(artifacts.length);
+    expect(copyButtons).toHaveLength(artifacts.length);
+    expect(names[0].textContent).toBe(artifacts[0].name);
+    expect(names[1].textContent).toBe(artifacts[1].name);
+    expect(sha256s[0].textContent).toContain(artifacts[0].sha256.substring(0, 5)); // Rendered sha256 is truncated
+    expect(sha256s[1].textContent).toContain(artifacts[1].sha256.substring(0, 5));
+  });
+
   it('should not show any numbered badges if all actions are successful', async () => {
     const policyResponse = createPolicyResponse(HostPolicyResponseActionStatus.success);
     runMock(policyResponse);
diff --git a/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response.tsx b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response.tsx
index 4f2c53c15fb60..8871ef5ba3540 100644
--- a/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response.tsx
@@ -6,12 +6,15 @@
  */
 
 import React, { memo, useCallback } from 'react';
+import { capitalize } from 'lodash';
 import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n-react';
 import { EuiHealth, EuiText, EuiTreeView, EuiNotificationBadge } from '@elastic/eui';
+import { PolicyResponseArtifactItem } from './policy_response_artifact_item';
 import { useKibana } from '../../../common/lib/kibana';
 import type {
   HostPolicyResponseAppliedAction,
+  HostPolicyResponseArtifacts,
   HostPolicyResponseConfiguration,
   Immutable,
   ImmutableArray,
@@ -23,33 +26,46 @@ import { PolicyResponseActionItem } from './policy_response_action_item';
 
 // Most of them are needed in order to display large react nodes (PolicyResponseActionItem) in child levels.
 const StyledEuiTreeView = styled(EuiTreeView)`
-  .policy-response-action-item-expanded {
+  & .policy-response-artifact-item {
+    & .euiTreeView__nodeLabel {
+      width: 100%;
+    }
+  }
+
+  & .policy-response-action-item-expanded {
     height: auto;
     padding-top: ${({ theme }) => theme.eui.euiSizeS};
     padding-bottom: ${({ theme }) => theme.eui.euiSizeS};
-    .euiTreeView__nodeLabel {
+
+    & .euiTreeView__nodeLabel {
       width: 100%;
     }
   }
-  .policyResponseStatusHealth {
+
+  & .policyResponseStatusHealth {
     padding-top: 5px;
   }
-  .euiTreeView__node--expanded {
+
+  & .euiTreeView__node--expanded {
     max-height: none !important;
-    .policy-response-action-expanded + div {
-      .euiTreeView__node {
+
+    & .policy-response-action-expanded + div {
+      & .euiTreeView__node {
         // When response action item displays a callout, this needs to be overwritten to remove the default max height of EuiTreeView
         max-height: none !important;
       }
     }
   }
-  .euiTreeView__node {
+
+  & .euiTreeView__node {
     max-height: none !important;
-    .euiNotificationBadge {
+
+    & .euiNotificationBadge {
       margin-right: 5px;
     }
-    .euiTreeView__nodeLabel {
-      .euiText {
+
+    & .euiTreeView__nodeLabel {
+      & .euiText {
         font-size: ${({ theme }) => theme.eui.euiFontSize};
       }
     }
@@ -60,6 +76,7 @@ interface PolicyResponseProps {
   hostOs: string;
   policyResponseConfig: Immutable<HostPolicyResponseConfiguration>;
   policyResponseActions: Immutable<HostPolicyResponseAppliedAction[]>;
+  policyResponseArtifacts: Immutable<HostPolicyResponseArtifacts>;
   policyResponseAttentionCount: Map<string, number>;
 }
 
@@ -71,6 +88,7 @@ export const PolicyResponse = memo(
     hostOs,
     policyResponseConfig,
     policyResponseActions,
+    policyResponseArtifacts,
     policyResponseAttentionCount,
   }: PolicyResponseProps) => {
     const { docLinks } = useKibana().services;
@@ -155,37 +173,100 @@ export const PolicyResponse = memo(
       ]
     );
 
-    const getResponseConfigs = useCallback(
-      () =>
-        Object.entries(policyResponseConfig).map(([key, val]) => {
-          const attentionCount = policyResponseAttentionCount.get(key);
+    const getArtifacts = useCallback(
+      (
+        artifactIdentifiers: PolicyResponseProps['policyResponseArtifacts'][
+          | 'global'
+          | 'user']['identifiers']
+      ) => {
+        return artifactIdentifiers.map((artifact) => {
+          return {
+            label: <PolicyResponseArtifactItem artifact={artifact} key={artifact.sha256} />,
+            id: artifact.name,
+            className: 'policy-response-artifact-item',
+          };
+        });
+      },
+      []
+    );
+
+    const getResponseConfigs = useCallback(() => {
+      const config = Object.entries(policyResponseConfig).map(([key, val]) => {
+        const attentionCount = policyResponseAttentionCount.get(key);
+        return {
+          label: (
+            <EuiText
+              color={attentionCount ? 'danger' : 'default'}
+              size="s"
+              data-test-subj="endpointPolicyResponseConfig"
+            >
+              {formatResponse(key)}
+            </EuiText>
+          ),
+          id: key,
+          icon: attentionCount ? (
+            <EuiNotificationBadge data-test-subj="endpointPolicyResponseStatusAttentionHealth">
+              {attentionCount}
+            </EuiNotificationBadge>
+          ) : (
+            <EuiHealth
+              color="success"
+              data-test-subj="endpointPolicyResponseStatusSuccessHealth"
+              className="policyResponseStatusHealth"
+            />
+          ),
+          children: getConcernedActions(val.concerned_actions),
+        };
+      });
+
+      const artifacts = {
+        label: (
+          <EuiText color={'default'} size="s" data-test-subj="endpointPolicyResponseArtifactsTitle">
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.policyResponse.artifacts.title"
+              defaultMessage="Artifacts"
+            />
+          </EuiText>
+        ),
+        id: 'policyResponseArtifacts',
+        icon: (
+          <EuiHealth
+            color="success"
+            data-test-subj="endpointPolicyResponseStatusSuccessHealth"
+            className="policyResponseStatusHealth"
+          />
+        ),
+        children: Object.entries(policyResponseArtifacts).map(([key, val]) => {
           return {
             label: (
               <EuiText
-                color={attentionCount ? 'danger' : 'default'}
+                color="default"
                 size="s"
-                data-test-subj="endpointPolicyResponseConfig"
+                data-test-subj={`endpointPolicyResponseArtifact${capitalize(key)}`}
               >
-                {formatResponse(key)}
+                {`${capitalize(key)} (v${val.version})`}
               </EuiText>
             ),
             id: key,
-            icon: attentionCount ? (
-              <EuiNotificationBadge data-test-subj="endpointPolicyResponseStatusAttentionHealth">
-                {attentionCount}
-              </EuiNotificationBadge>
-            ) : (
+            icon: (
               <EuiHealth
                 color="success"
                 data-test-subj="endpointPolicyResponseStatusSuccessHealth"
                 className="policyResponseStatusHealth"
               />
             ),
-            children: getConcernedActions(val.concerned_actions),
+            children: getArtifacts(val.identifiers),
           };
         }),
-      [getConcernedActions, policyResponseAttentionCount, policyResponseConfig]
-    );
+      };
+      return [...config, artifacts];
+    }, [
+      getArtifacts,
+      getConcernedActions,
+      policyResponseArtifacts,
+      policyResponseAttentionCount,
+      policyResponseConfig,
+    ]);
 
     const generateTreeView = useCallback(() => {
       let policyTotalErrors = 0;
diff --git a/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_artifact_item.tsx b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_artifact_item.tsx
new file mode 100644
index 0000000000000..1d252f1ed9f37
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_artifact_item.tsx
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { truncate } from 'lodash';
+import styled from 'styled-components';
+import { EuiCopy, EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText, EuiToolTip } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import type { HostPolicyResponseAppliedArtifact } from '../../../../common/endpoint/types';
+
+const StyledArtifactName = styled(EuiText)`
+  white-space: nowrap;
+  line-height: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const StyledShaValue = styled(EuiText)`
+  width: 80px;
+  white-space: nowrap;
+  line-height: inherit;
+  overflow: hidden;
+  text-overflow: ellipsis;
+`;
+
+const IconContainer = styled(EuiText)`
+  padding: 2px;
+  border: ${({ theme }) => theme.eui.euiBorderThin};
+  border-radius: ${({ theme }) => theme.eui.euiBorderRadiusSmall};
+`;
+
+interface PolicyResponseArtifactItemProps {
+  artifact: HostPolicyResponseAppliedArtifact;
+}
+
+const COPY_TOOLTIP = {
+  BEFORE: i18n.translate(
+    'xpack.securitySolution.endpoint.details.policyResponse.artifact.copyButton.beforeCopyTooltip',
+    {
+      defaultMessage: 'Copy artifact ID',
+    }
+  ),
+  AFTER: i18n.translate(
+    'xpack.securitySolution.endpoint.details.policyResponse.artifact.copyButton.afterCopyTooltip',
+    {
+      defaultMessage: 'Artifact ID copied!',
+    }
+  ),
+};
+
+export const PolicyResponseArtifactItem = memo(({ artifact }: PolicyResponseArtifactItemProps) => {
+  return (
+    <EuiFlexGroup
+      direction="row"
+      alignItems="center"
+      justifyContent="spaceBetween"
+      style={{ flexWrap: 'nowrap' }}
+    >
+      <EuiFlexItem grow={true} style={{ alignItems: 'flex-start' }} className={'eui-textTruncate'}>
+        <EuiToolTip position="top" content={artifact.name} anchorClassName={'eui-textTruncate'}>
+          <StyledArtifactName data-test-subj="endpointPolicyResponseArtifactName">
+            {artifact.name}
+          </StyledArtifactName>
+        </EuiToolTip>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiFlexGroup
+          direction="row"
+          alignItems="center"
+          justifyContent="flexEnd"
+          gutterSize="s"
+          style={{ flexWrap: 'nowrap' }}
+        >
+          <EuiFlexItem grow={false}>
+            <IconContainer size={'xs'}>{'sha256'}</IconContainer>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <StyledShaValue data-test-subj="endpointPolicyResponseArtifactSha256">
+              <EuiToolTip position="top" content={artifact.sha256}>
+                <>{truncate(artifact.sha256, { length: 12 })}</>
+              </EuiToolTip>
+            </StyledShaValue>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false} style={{ marginTop: '-4px' }}>
+            <EuiCopy
+              textToCopy={artifact.sha256}
+              beforeMessage={COPY_TOOLTIP.BEFORE}
+              afterMessage={COPY_TOOLTIP.AFTER}
+            >
+              {(copy) => (
+                <EuiIcon
+                  size="m"
+                  color="primary"
+                  type="copyClipboard"
+                  onClick={copy}
+                  data-test-subj="endpointPolicyResponseArtifactCopyButton"
+                />
+              )}
+            </EuiCopy>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+});
+
+PolicyResponseArtifactItem.displayName = 'PolicyResponseArtifactItem';
diff --git a/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_wrapper.tsx b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_wrapper.tsx
index d80f7403e8e72..6c0ae3c4ddb14 100644
--- a/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_wrapper.tsx
+++ b/x-pack/plugins/security_solution/public/management/components/policy_response/policy_response_wrapper.tsx
@@ -32,6 +32,8 @@ export const PolicyResponseWrapper = memo<PolicyResponseWrapperProps>(
 
     const [policyResponseConfig, setPolicyResponseConfig] =
       useState<HostPolicyResponse['Endpoint']['policy']['applied']['response']['configurations']>();
+    const [policyResponseArtifacts, setPolicyResponseArtifacts] =
+      useState<HostPolicyResponse['Endpoint']['policy']['applied']['artifacts']>();
     const [policyResponseActions, setPolicyResponseActions] =
       useState<HostPolicyResponse['Endpoint']['policy']['applied']['actions']>();
     const [policyResponseAttentionCount, setPolicyResponseAttentionCount] = useState<
@@ -43,6 +45,7 @@ export const PolicyResponseWrapper = memo<PolicyResponseWrapperProps>(
         setPolicyResponseConfig(
           data.policy_response.Endpoint.policy.applied.response.configurations
         );
+        setPolicyResponseArtifacts(data.policy_response.Endpoint.policy.applied.artifacts);
         setPolicyResponseActions(data.policy_response.Endpoint.policy.applied.actions);
         setPolicyResponseAttentionCount(
           getFailedOrWarningActionCountFromPolicyResponse(
@@ -125,23 +128,26 @@ export const PolicyResponseWrapper = memo<PolicyResponseWrapperProps>(
           />
         )}
         {isLoading && <EuiLoadingSpinner size="m" />}
-        {policyResponseConfig !== undefined && policyResponseActions !== undefined && (
-          <>
-            <PolicyResponse
-              hostOs={endpointDetails?.metadata.host.os.name.toLowerCase() ?? ''}
-              policyResponseConfig={policyResponseConfig}
-              policyResponseActions={policyResponseActions}
-              policyResponseAttentionCount={policyResponseAttentionCount}
-            />
-            <EuiSpacer size="m" />
-            {genericErrors?.map((genericActionError) => (
-              <React.Fragment key={genericActionError.key}>
-                <PolicyResponseActionItem policyResponseActionFormatter={genericActionError} />
-                <EuiSpacer size="m" />
-              </React.Fragment>
-            ))}
-          </>
-        )}
+        {policyResponseConfig !== undefined &&
+          policyResponseActions !== undefined &&
+          policyResponseArtifacts !== undefined && (
+            <>
+              <PolicyResponse
+                hostOs={endpointDetails?.metadata.host.os.name.toLowerCase() ?? ''}
+                policyResponseConfig={policyResponseConfig}
+                policyResponseActions={policyResponseActions}
+                policyResponseArtifacts={policyResponseArtifacts}
+                policyResponseAttentionCount={policyResponseAttentionCount}
+              />
+              <EuiSpacer size="m" />
+              {genericErrors?.map((genericActionError) => (
+                <React.Fragment key={genericActionError.key}>
+                  <PolicyResponseActionItem policyResponseActionFormatter={genericActionError} />
+                  <EuiSpacer size="m" />
+                </React.Fragment>
+              ))}
+            </>
+          )}
       </>
     );
   }
diff --git a/x-pack/plugins/security_solution/public/management/cypress/README.md b/x-pack/plugins/security_solution/public/management/cypress/README.md
index 7e574caa469f0..482a2bac99595 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/README.md
+++ b/x-pack/plugins/security_solution/public/management/cypress/README.md
@@ -34,7 +34,7 @@ for more information.
 Similarly to Security Solution cypress tests, we use tags in order to select which tests we want to execute on which environment:
 
 - `@serverless` includes a test in the Serverless test suite. You need to explicitly add this tag to any test you want to run against a Serverless environment.
-- `@serverlessQA` includes a test in the Serverless test suite for the Kibana release process of serverless. You need to explicitly add this tag to any test you want you run in CI for the second quality gate. These tests should be stable, otherwise they will be blocking the release pipeline. They should be also critical enough, so that when they fail, there's a high chance of an SDH or blocker issue to be reported.
+- `@serverlessQA` includes a test in the Serverless test suite for the Kibana release process of serverless. You need to explicitly add this tag to any test you want you run in CI for the Kibana QA quality gate. These tests should be stable, otherwise they will be blocking the release pipeline. They should be also critical enough, so that when they fail, there's a high chance of an SDH or blocker issue to be reported.
 - `@ess` includes a test in the normal, non-Serverless test suite. You need to explicitly add this tag to any test you want to run against a non-Serverless environment.
 - `@brokenInServerless` excludes a test from the Serverless test suite (even if it's tagged as `@serverless`). Indicates that a test should run in Serverless, but currently is broken.
 - `@skipInServerless` excludes a test from the Serverless test suite (even if it's tagged as `@serverless`). Indicates that we don't want to run the given test in Serverless.
diff --git a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/metering.cy.ts b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/metering.cy.ts
index f7c18433b07ad..6e436e2a529f8 100644
--- a/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/metering.cy.ts
+++ b/x-pack/plugins/security_solution/public/management/cypress/e2e/serverless/metering.cy.ts
@@ -17,7 +17,8 @@ import type { ReturnTypeFromChainable } from '../../types';
 import { indexEndpointHeartbeats } from '../../tasks/index_endpoint_heartbeats';
 import { login, ROLE } from '../../tasks/login';
 
-describe(
+// Failing: See https://github.com/elastic/kibana/issues/187083
+describe.skip(
   'Metering',
   {
     tags: ['@serverless', '@skipInServerlessMKI'],
diff --git a/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_kill_process_endpoint_request.ts b/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_kill_process_endpoint_request.ts
index 2d86f15f81d40..b17d34ab4e463 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_kill_process_endpoint_request.ts
+++ b/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_kill_process_endpoint_request.ts
@@ -9,8 +9,8 @@ import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-quer
 import { useMutation } from '@tanstack/react-query';
 import type { IHttpFetchError } from '@kbn/core-http-browser';
 import type {
-  KillOrSuspendProcessRequestBody,
   ResponseActionApiResponse,
+  KillProcessRequestBody,
 } from '../../../../common/endpoint/types';
 import { killProcess } from '../../../common/lib/process_actions';
 
@@ -22,15 +22,11 @@ export const useSendKillProcessRequest = (
   customOptions?: UseMutationOptions<
     ResponseActionApiResponse,
     IHttpFetchError,
-    KillOrSuspendProcessRequestBody
+    KillProcessRequestBody
   >
-): UseMutationResult<
-  ResponseActionApiResponse,
-  IHttpFetchError,
-  KillOrSuspendProcessRequestBody
-> => {
-  return useMutation<ResponseActionApiResponse, IHttpFetchError, KillOrSuspendProcessRequestBody>(
-    (processData: KillOrSuspendProcessRequestBody) => {
+): UseMutationResult<ResponseActionApiResponse, IHttpFetchError, KillProcessRequestBody> => {
+  return useMutation<ResponseActionApiResponse, IHttpFetchError, KillProcessRequestBody>(
+    (processData: KillProcessRequestBody) => {
       return killProcess(processData);
     },
     customOptions
diff --git a/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_suspend_process_endpoint_request.ts b/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_suspend_process_endpoint_request.ts
index d6c2f56cb627f..787344ffd54dc 100644
--- a/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_suspend_process_endpoint_request.ts
+++ b/x-pack/plugins/security_solution/public/management/hooks/response_actions/use_send_suspend_process_endpoint_request.ts
@@ -9,8 +9,8 @@ import { useMutation } from '@tanstack/react-query';
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
 import type { IHttpFetchError } from '@kbn/core-http-browser';
 import type {
-  KillOrSuspendProcessRequestBody,
   ResponseActionApiResponse,
+  SuspendProcessRequestBody,
 } from '../../../../common/endpoint/types';
 import { suspendProcess } from '../../../common/lib/process_actions';
 
@@ -22,15 +22,11 @@ export const useSendSuspendProcessRequest = (
   customOptions?: UseMutationOptions<
     ResponseActionApiResponse,
     IHttpFetchError,
-    KillOrSuspendProcessRequestBody
+    SuspendProcessRequestBody
   >
-): UseMutationResult<
-  ResponseActionApiResponse,
-  IHttpFetchError,
-  KillOrSuspendProcessRequestBody
-> => {
-  return useMutation<ResponseActionApiResponse, IHttpFetchError, KillOrSuspendProcessRequestBody>(
-    (processData: KillOrSuspendProcessRequestBody) => {
+): UseMutationResult<ResponseActionApiResponse, IHttpFetchError, SuspendProcessRequestBody> => {
+  return useMutation<ResponseActionApiResponse, IHttpFetchError, SuspendProcessRequestBody>(
+    (processData: SuspendProcessRequestBody) => {
       return suspendProcess(processData);
     },
     customOptions
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.test.tsx
index c355cc8bdea0b..7dc11f828187a 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.test.tsx
@@ -546,90 +546,294 @@ describe('Event filter form', () => {
   });
 
   describe('Warnings', () => {
-    beforeEach(() => {
-      render();
-    });
+    describe('duplicate fields', () => {
+      it('should not show warning text when unique fields are added', async () => {
+        formProps.item.entries = [
+          {
+            field: 'event.category',
+            operator: 'included',
+            type: 'match',
+            value: 'some value',
+          },
+          {
+            field: 'file.name',
+            operator: 'excluded',
+            type: 'match',
+            value: 'some other value',
+          },
+        ];
+        render();
+        expect(await renderResult.findByDisplayValue('some value')).toBeInTheDocument();
 
-    it('should not show warning text when unique fields are added', async () => {
-      formProps.item.entries = [
-        {
-          field: 'event.category',
-          operator: 'included',
-          type: 'match',
-          value: 'some value',
-        },
-        {
-          field: 'file.name',
-          operator: 'excluded',
-          type: 'match',
-          value: 'some other value',
-        },
-      ];
-      rerender();
-      expect(renderResult.queryByTestId('duplicate-fields-warning-message')).toBeNull();
-    });
+        expect(
+          renderResult.queryByTestId('duplicate-fields-warning-message')
+        ).not.toBeInTheDocument();
+      });
 
-    it('should not show warning text when field values are not added', async () => {
-      formProps.item.entries = [
-        {
-          field: 'event.category',
-          operator: 'included',
-          type: 'match',
-          value: '',
-        },
-        {
-          field: 'event.category',
-          operator: 'excluded',
-          type: 'match',
-          value: '',
-        },
-      ];
-      rerender();
-      expect(renderResult.queryByTestId('duplicate-fields-warning-message')).toBeNull();
-    });
+      it('should not show warning text when field values are not added', async () => {
+        formProps.item.entries = [
+          {
+            field: 'event.category',
+            operator: 'included',
+            type: 'match',
+            value: '',
+          },
+          {
+            field: 'event.category',
+            operator: 'excluded',
+            type: 'match',
+            value: '',
+          },
+        ];
+        render();
+        expect((await renderResult.findAllByTestId('fieldAutocompleteComboBox')).length).toBe(2);
 
-    it('should show warning text when duplicate fields are added with values', async () => {
-      formProps.item.entries = [
-        {
-          field: 'event.category',
-          operator: 'included',
-          type: 'match',
-          value: 'some value',
-        },
-        {
-          field: 'event.category',
-          operator: 'excluded',
-          type: 'match',
-          value: 'some other value',
-        },
-      ];
-      rerender();
-      expect(renderResult.findByTestId('duplicate-fields-warning-message')).not.toBeNull();
+        expect(
+          renderResult.queryByTestId('duplicate-fields-warning-message')
+        ).not.toBeInTheDocument();
+      });
+
+      it('should show warning text when duplicate fields are added with values', async () => {
+        formProps.item.entries = [
+          {
+            field: 'event.category',
+            operator: 'included',
+            type: 'match',
+            value: 'some value',
+          },
+          {
+            field: 'event.category',
+            operator: 'excluded',
+            type: 'match',
+            value: 'some other value',
+          },
+        ];
+        render();
+
+        expect(
+          await renderResult.findByTestId('duplicate-fields-warning-message')
+        ).toBeInTheDocument();
+      });
+
+      describe('in relation with Process Descendant filtering', () => {
+        it('should not show warning text when event.category is added but feature flag is disabled', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: false,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 1',
+            },
+          ];
+          formProps.item.tags = [FILTER_PROCESS_DESCENDANTS_TAG];
+
+          render();
+          expect(await renderResult.findByDisplayValue('some value 1')).toBeInTheDocument();
+
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+        });
+
+        it('should not show warning text when event.category is added but process descendant filter is disabled', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 2',
+            },
+          ];
+          formProps.item.tags = [];
+
+          render();
+          expect(await renderResult.findByDisplayValue('some value 2')).toBeInTheDocument();
+
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+        });
+
+        it('should not show warning text when event.category is NOT added and process descendant filter is enabled', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.action',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 3',
+            },
+          ];
+          formProps.item.tags = [FILTER_PROCESS_DESCENDANTS_TAG];
+
+          render();
+          expect(await renderResult.findByDisplayValue('some value 3')).toBeInTheDocument();
+
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+        });
+
+        it('should show warning text when event.category is added and process descendant filter is enabled', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 4',
+            },
+          ];
+          formProps.item.tags = [FILTER_PROCESS_DESCENDANTS_TAG];
+
+          render();
+          expect(await renderResult.findByDisplayValue('some value 4')).toBeInTheDocument();
+
+          expect(
+            await renderResult.findByTestId('duplicate-fields-warning-message')
+          ).toBeInTheDocument();
+        });
+
+        it('should add warning text when switching to process descendant filtering', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 5',
+            },
+          ];
+          formProps.item.tags = [];
+
+          render();
+          expect(await renderResult.findByDisplayValue('some value 5')).toBeInTheDocument();
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+
+          // switch to Process Descendant filtering
+          userEvent.click(renderResult.getByTestId(`${formPrefix}-filterProcessDescendantsButton`));
+          rerenderWithLatestProps();
+
+          expect(
+            await renderResult.findByTestId('duplicate-fields-warning-message')
+          ).toBeInTheDocument();
+        });
+
+        it('should remove warning text when switching from process descendant filtering', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 6',
+            },
+          ];
+          formProps.item.tags = [FILTER_PROCESS_DESCENDANTS_TAG];
+
+          render();
+
+          expect(
+            await renderResult.findByTestId('duplicate-fields-warning-message')
+          ).toBeInTheDocument();
+
+          // switch to classic Event filtering
+          userEvent.click(renderResult.getByTestId(`${formPrefix}-filterEventsButton`));
+          rerenderWithLatestProps();
+
+          expect(await renderResult.findByDisplayValue('some value 6')).toBeInTheDocument();
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+        });
+
+        it('should remove warning text when removing `event.category`', async () => {
+          mockedContext.setExperimentalFlag({
+            filterProcessDescendantsForEventFiltersEnabled: true,
+          });
+
+          formProps.item.entries = [
+            {
+              field: 'event.category',
+              operator: 'included',
+              type: 'match',
+              value: 'some value 6',
+            },
+          ];
+          formProps.item.tags = [FILTER_PROCESS_DESCENDANTS_TAG];
+
+          render();
+
+          expect(
+            await renderResult.findByTestId('duplicate-fields-warning-message')
+          ).toBeInTheDocument();
+
+          // switch to classic Event filtering
+          userEvent.click(renderResult.getByTestId(`builderItemEntryDeleteButton`));
+          rerenderWithLatestProps();
+
+          expect(
+            renderResult.queryByTestId('duplicate-fields-warning-message')
+          ).not.toBeInTheDocument();
+        });
+      });
     });
 
-    it('should not show warning callout when wildcard is used with the "MATCHES" operator', async () => {
-      formProps.item.entries = [
-        {
-          field: 'event.category',
-          operator: 'included',
-          type: 'wildcard',
-          value: 'valuewithwildcard*',
-        },
-      ];
-      rerender();
-      expect(renderResult.queryByTestId('wildcardWithWrongOperatorCallout')).toBeNull();
-    });
-    it('should show warning callout when wildcard is used with the "IS" operator', async () => {
-      formProps.item.entries = [
-        {
-          field: 'event.category',
-          operator: 'included',
-          type: 'match',
-          value: 'valuewithwildcard*',
-        },
-      ];
-      rerender();
-      await expect(renderResult.findByTestId('wildcardWithWrongOperatorCallout')).not.toBeNull();
+    describe('wildcard with wrong operator', () => {
+      it('should not show warning callout when wildcard is used with the "MATCHES" operator', async () => {
+        formProps.item.entries = [
+          {
+            field: 'event.category',
+            operator: 'included',
+            type: 'wildcard',
+            value: 'valuewithwildcard*',
+          },
+        ];
+        render();
+        expect(await renderResult.findByDisplayValue('valuewithwildcard*')).toBeInTheDocument();
+
+        expect(
+          renderResult.queryByTestId('wildcardWithWrongOperatorCallout')
+        ).not.toBeInTheDocument();
+      });
+
+      it('should show warning callout when wildcard is used with the "IS" operator', async () => {
+        formProps.item.entries = [
+          {
+            field: 'event.category',
+            operator: 'included',
+            type: 'match',
+            value: 'valuewithwildcard*',
+          },
+        ];
+        render();
+
+        expect(
+          await renderResult.findByTestId('wildcardWithWrongOperatorCallout')
+        ).toBeInTheDocument();
+      });
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.tsx
index 4275502961848..afdab70202f12 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form.tsx
@@ -41,6 +41,7 @@ import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use
 import { useGetUpdatedTags } from '../../../../hooks/artifacts';
 import {
   FILTER_PROCESS_DESCENDANTS_TAG,
+  PROCESS_DESCENDANT_EVENT_FILTER_EXTRA_ENTRY,
   PROCESS_DESCENDANT_EVENT_FILTER_EXTRA_ENTRY_TEXT,
 } from '../../../../../../common/endpoint/service/artifacts/constants';
 import {
@@ -545,11 +546,19 @@ export const EventFiltersForm: React.FC<ArtifactFormComponentProps & { allowSele
         const hasDuplicates =
           (!hasFormChanged && arg.exceptionItems[0] === undefined) ||
           isEqual(arg.exceptionItems[0]?.entries, exception?.entries);
+
         if (hasDuplicates) {
           const addedFields = arg.exceptionItems[0]?.entries.map((e) => e.field) || [''];
+
+          if (isFilterProcessDescendantsFeatureEnabled && isFilterProcessDescendantsSelected) {
+            addedFields.push(PROCESS_DESCENDANT_EVENT_FILTER_EXTRA_ENTRY.field);
+          }
+
           setHasDuplicateFields(computeHasDuplicateFields(getAddedFieldsCounts(addedFields)));
           if (!hasFormChanged) setHasFormChanged(true);
           return;
+        } else {
+          setHasDuplicateFields(false);
         }
 
         // handle wildcard with wrong operator case
@@ -576,7 +585,13 @@ export const EventFiltersForm: React.FC<ArtifactFormComponentProps & { allowSele
         processChanged(updatedItem);
         if (!hasFormChanged) setHasFormChanged(true);
       },
-      [exception, hasFormChanged, processChanged]
+      [
+        exception,
+        hasFormChanged,
+        isFilterProcessDescendantsFeatureEnabled,
+        isFilterProcessDescendantsSelected,
+        processChanged,
+      ]
     );
     const exceptionBuilderComponentMemo = useMemo(
       () =>
diff --git a/x-pack/plugins/security_solution/public/management/pages/response_actions/view/response_actions_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/response_actions/view/response_actions_list_page.test.tsx
index 43afb4bd9054f..e49385ccc7eca 100644
--- a/x-pack/plugins/security_solution/public/management/pages/response_actions/view/response_actions_list_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/response_actions/view/response_actions_list_page.test.tsx
@@ -20,8 +20,6 @@ import { MANAGEMENT_PATH } from '../../../../../common/constants';
 import { getActionListMock } from '../../../components/endpoint_response_actions_list/mocks';
 import { useGetEndpointsList } from '../../../hooks/endpoint/use_get_endpoints_list';
 
-jest.mock('../../../../common/experimental_features_service');
-
 let mockUseGetEndpointActionList: {
   isFetched?: boolean;
   isFetching?: boolean;
@@ -463,7 +461,12 @@ describe('Response actions history page', () => {
       expect(history.location.search).toEqual('?page=1&pageSize=20');
     });
 
-    it('should set selected command filter options to URL params ', () => {
+    // TODO: remove this test when responseActionScanEnabled is removed
+    it('should set selected command filter options to URL params (without `responseActionScanEnabled`)', () => {
+      mockedContext.setExperimentalFlag({
+        responseActionScanEnabled: false,
+      });
+
       const filterPrefix = 'actions-filter';
       render();
       const { getAllByTestId, getByTestId } = renderResult;
@@ -480,6 +483,27 @@ describe('Response actions history page', () => {
       );
     });
 
+    it('should set selected command filter options to URL params (with `responseActionScanEnabled`)', () => {
+      mockedContext.setExperimentalFlag({
+        responseActionScanEnabled: true,
+      });
+
+      const filterPrefix = 'actions-filter';
+      render();
+      const { getAllByTestId, getByTestId } = renderResult;
+      userEvent.click(getByTestId(`${testPrefix}-${filterPrefix}-popoverButton`));
+      const allFilterOptions = getAllByTestId(`${filterPrefix}-option`);
+
+      allFilterOptions.forEach((option) => {
+        option.style.pointerEvents = 'all';
+        userEvent.click(option);
+      });
+
+      expect(history.location.search).toEqual(
+        '?commands=isolate%2Crelease%2Ckill-process%2Csuspend-process%2Cprocesses%2Cget-file%2Cexecute%2Cupload%2Cscan'
+      );
+    });
+
     it('should set selected hosts filter options to URL params ', () => {
       const filterPrefix = 'hosts-filter';
       render();
@@ -607,7 +631,12 @@ describe('Response actions history page', () => {
   });
 
   describe('Clear all selected options on a filter', () => {
-    it('should clear all selected options on `actions` filter', () => {
+    // TODO: remove this test when responseActionScanEnabled is removed
+    it('should clear all selected options on `actions` filter (without `responseActionScanEnabled`)', () => {
+      mockedContext.setExperimentalFlag({
+        responseActionScanEnabled: false,
+      });
+
       const filterPrefix = 'actions-filter';
       render();
       const { getAllByTestId, getByTestId } = renderResult;
@@ -629,6 +658,32 @@ describe('Response actions history page', () => {
       expect(history.location.search).toEqual('');
     });
 
+    it('should clear all selected options on `actions` filter (with `responseActionScanEnabled`)', () => {
+      mockedContext.setExperimentalFlag({
+        responseActionScanEnabled: true,
+      });
+
+      const filterPrefix = 'actions-filter';
+      render();
+      const { getAllByTestId, getByTestId } = renderResult;
+      userEvent.click(getByTestId(`${testPrefix}-${filterPrefix}-popoverButton`));
+      const allFilterOptions = getAllByTestId(`${filterPrefix}-option`);
+
+      allFilterOptions.forEach((option) => {
+        option.style.pointerEvents = 'all';
+        userEvent.click(option);
+      });
+
+      expect(history.location.search).toEqual(
+        '?commands=isolate%2Crelease%2Ckill-process%2Csuspend-process%2Cprocesses%2Cget-file%2Cexecute%2Cupload%2Cscan'
+      );
+
+      const clearAllButton = getByTestId(`${testPrefix}-${filterPrefix}-clearAllButton`);
+      clearAllButton.style.pointerEvents = 'all';
+      userEvent.click(clearAllButton);
+      expect(history.location.search).toEqual('');
+    });
+
     it('should clear all selected options on `hosts` filter', () => {
       const filterPrefix = 'hosts-filter';
       render();
diff --git a/x-pack/plugins/security_solution/public/notes/components/open_event_in_timeline.tsx b/x-pack/plugins/security_solution/public/notes/components/open_event_in_timeline.tsx
new file mode 100644
index 0000000000000..43f039836ccad
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/notes/components/open_event_in_timeline.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { memo } from 'react';
+import { EuiLink } from '@elastic/eui';
+import type { EcsSecurityExtension as Ecs } from '@kbn/securitysolution-ecs';
+import { useInvestigateInTimeline } from '../../detections/components/alerts_table/timeline_actions/use_investigate_in_timeline';
+import * as i18n from './translations';
+
+export const OpenEventInTimeline: React.FC<{ eventId?: string | null }> = memo(({ eventId }) => {
+  const ecsRowData = { event: { id: [eventId] }, _id: eventId } as Ecs;
+  const { investigateInTimelineAlertClick } = useInvestigateInTimeline({ ecsRowData });
+
+  return (
+    <EuiLink onClick={investigateInTimelineAlertClick} data-test-subj="open-event-in-timeline">
+      {i18n.VIEW_EVENT_IN_TIMELINE}
+    </EuiLink>
+  );
+});
+
+OpenEventInTimeline.displayName = 'OpenEventInTimeline';
diff --git a/x-pack/plugins/security_solution/public/notes/components/search_row.tsx b/x-pack/plugins/security_solution/public/notes/components/search_row.tsx
index 1e88a47b2e2d2..f2e86d324a54a 100644
--- a/x-pack/plugins/security_solution/public/notes/components/search_row.tsx
+++ b/x-pack/plugins/security_solution/public/notes/components/search_row.tsx
@@ -7,9 +7,9 @@
 
 import { EuiFlexGroup, EuiFlexItem, EuiSearchBar } from '@elastic/eui';
 import React, { useMemo, useCallback } from 'react';
-import { useDispatch, useSelector } from 'react-redux';
+import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import { userSearchedNotes, selectNotesTableSearch } from '..';
+import { userSearchedNotes } from '..';
 
 const SearchRowContainer = styled.div`
   &:not(:last-child) {
@@ -36,8 +36,6 @@ export const SearchRow = React.memo(() => {
     []
   );
 
-  const notesSearch = useSelector(selectNotesTableSearch);
-
   const onQueryChange = useCallback(
     ({ queryText }) => {
       dispatch(userSearchedNotes(queryText.trim()));
@@ -49,12 +47,7 @@ export const SearchRow = React.memo(() => {
     <SearchRowContainer>
       <SearchRowFlexGroup gutterSize="s">
         <EuiFlexItem>
-          <EuiSearchBar
-            box={searchBox}
-            onChange={onQueryChange}
-            query={notesSearch}
-            defaultQuery={''}
-          />
+          <EuiSearchBar box={searchBox} onChange={onQueryChange} defaultQuery="" />
         </EuiFlexItem>
       </SearchRowFlexGroup>
     </SearchRowContainer>
diff --git a/x-pack/plugins/security_solution/public/notes/components/translations.ts b/x-pack/plugins/security_solution/public/notes/components/translations.ts
index 471c28cbc9d4c..f2846d6daab62 100644
--- a/x-pack/plugins/security_solution/public/notes/components/translations.ts
+++ b/x-pack/plugins/security_solution/public/notes/components/translations.ts
@@ -31,14 +31,14 @@ export const CREATED_BY_COLUMN = i18n.translate(
 export const EVENT_ID_COLUMN = i18n.translate(
   'xpack.securitySolution.notes.management.eventIdColumnTitle',
   {
-    defaultMessage: 'Document ID',
+    defaultMessage: 'View Document',
   }
 );
 
 export const TIMELINE_ID_COLUMN = i18n.translate(
-  'xpack.securitySolution.notes.management.timelineIdColumnTitle',
+  'xpack.securitySolution.notes.management.timelineColumnTitle',
   {
-    defaultMessage: 'Timeline ID',
+    defaultMessage: 'Timeline',
   }
 );
 
@@ -60,13 +60,6 @@ export const DELETE_SINGLE_NOTE_DESCRIPTION = i18n.translate(
   }
 );
 
-export const NOTES_MANAGEMENT_TITLE = i18n.translate(
-  'xpack.securitySolution.notes.management.pageTitle',
-  {
-    defaultMessage: 'Notes management',
-  }
-);
-
 export const TABLE_ERROR = i18n.translate('xpack.securitySolution.notes.management.tableError', {
   defaultMessage: 'Unable to load notes',
 });
@@ -102,3 +95,17 @@ export const DELETE_SELECTED = i18n.translate(
 export const REFRESH = i18n.translate('xpack.securitySolution.notes.management.refresh', {
   defaultMessage: 'Refresh',
 });
+
+export const OPEN_TIMELINE = i18n.translate(
+  'xpack.securitySolution.notes.management.openTimeline',
+  {
+    defaultMessage: 'Open timeline',
+  }
+);
+
+export const VIEW_EVENT_IN_TIMELINE = i18n.translate(
+  'xpack.securitySolution.notes.management.viewEventInTimeline',
+  {
+    defaultMessage: 'View event in timeline',
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/notes/pages/note_management_page.tsx b/x-pack/plugins/security_solution/public/notes/pages/note_management_page.tsx
index 1c39265a1b02f..a951968612ba7 100644
--- a/x-pack/plugins/security_solution/public/notes/pages/note_management_page.tsx
+++ b/x-pack/plugins/security_solution/public/notes/pages/note_management_page.tsx
@@ -7,7 +7,7 @@
 
 import React, { useCallback, useMemo, useEffect } from 'react';
 import type { DefaultItemAction, EuiBasicTableColumn } from '@elastic/eui';
-import { EuiBasicTable, EuiEmptyPrompt } from '@elastic/eui';
+import { EuiBasicTable, EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import { useDispatch, useSelector } from 'react-redux';
 // TODO unify this type from the api with the one in public/common/lib/note
 import type { Note } from '../../../common/api/timeline';
@@ -33,41 +33,58 @@ import { SearchRow } from '../components/search_row';
 import { NotesUtilityBar } from '../components/utility_bar';
 import { DeleteConfirmModal } from '../components/delete_confirm_modal';
 import * as i18n from '../components/translations';
+import type { OpenTimelineProps } from '../../timelines/components/open_timeline/types';
+import { OpenEventInTimeline } from '../components/open_event_in_timeline';
+
+const columns: (
+  onOpenTimeline: OpenTimelineProps['onOpenTimeline']
+) => Array<EuiBasicTableColumn<Note>> = (onOpenTimeline) => {
+  return [
+    {
+      field: 'created',
+      name: i18n.CREATED_COLUMN,
+      sortable: true,
+      render: (created: Note['created']) => <FormattedRelativePreferenceDate value={created} />,
+    },
+    {
+      field: 'createdBy',
+      name: i18n.CREATED_BY_COLUMN,
+    },
+    {
+      field: 'eventId',
+      name: i18n.EVENT_ID_COLUMN,
+      sortable: true,
+      render: (eventId: Note['eventId']) => <OpenEventInTimeline eventId={eventId} />,
+    },
+    {
+      field: 'timelineId',
+      name: i18n.TIMELINE_ID_COLUMN,
+      render: (timelineId: Note['timelineId']) =>
+        timelineId ? (
+          <EuiLink onClick={() => onOpenTimeline({ timelineId, duplicate: false })}>
+            {i18n.OPEN_TIMELINE}
+          </EuiLink>
+        ) : null,
+    },
+    {
+      field: 'note',
+      name: i18n.NOTE_CONTENT_COLUMN,
+    },
+  ];
+};
 
-const columns: Array<EuiBasicTableColumn<Note>> = [
-  {
-    field: 'created',
-    name: i18n.CREATED_COLUMN,
-    sortable: true,
-    render: (created: Note['created']) => <FormattedRelativePreferenceDate value={created} />,
-  },
-  {
-    field: 'createdBy',
-    name: i18n.CREATED_BY_COLUMN,
-  },
-  {
-    field: 'eventId',
-    name: i18n.EVENT_ID_COLUMN,
-    sortable: true,
-  },
-  {
-    field: 'timelineId',
-    name: i18n.TIMELINE_ID_COLUMN,
-  },
-  {
-    field: 'note',
-    name: i18n.NOTE_CONTENT_COLUMN,
-  },
-];
-
-const pageSizeOptions = [50, 25, 10, 0];
+const pageSizeOptions = [10, 25, 50, 100];
 
 /**
  * Allows user to search and delete notes.
  * This component uses the same slices of state as the notes functionality of the rest of the Security Solution applicaiton.
  * Therefore, changes made in this page (like fetching or deleting notes) will have an impact everywhere.
  */
-export const NoteManagementPage = () => {
+export const NoteManagementPage = ({
+  onOpenTimeline,
+}: {
+  onOpenTimeline: OpenTimelineProps['onOpenTimeline'];
+}) => {
   const dispatch = useDispatch();
   const notes = useSelector(selectAllNotes);
   const pagination = useSelector(selectNotesPagination);
@@ -147,13 +164,13 @@ export const NoteManagementPage = () => {
       },
     ];
     return [
-      ...columns,
+      ...columns(onOpenTimeline),
       {
         name: 'actions',
         actions,
       },
     ];
-  }, [selectRowForDeletion]);
+  }, [selectRowForDeletion, onOpenTimeline]);
 
   const currentPagination = useMemo(() => {
     return {
diff --git a/x-pack/plugins/security_solution/public/overview/components/common.tsx b/x-pack/plugins/security_solution/public/overview/components/common.tsx
index fcf4072db1afd..078b2bbe17fa2 100644
--- a/x-pack/plugins/security_solution/public/overview/components/common.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/common.tsx
@@ -8,14 +8,14 @@
 import { EuiButtonIcon, EuiPopover, EuiPopoverTitle, EuiText } from '@elastic/eui';
 import React, { useCallback, useState } from 'react';
 import * as i18n from './translations';
-import { RiskScoreDocLink } from '../../entity_analytics/components/risk_score_onboarding/risk_score_doc_link';
-import type { RiskScoreEntity } from '../../../common/entity_analytics/risk_engine';
+import { EntityAnalyticsLearnMoreLink } from '../../entity_analytics/components/risk_score_onboarding/entity_analytics_doc_link';
 
 export const RiskScoreInfoTooltip: React.FC<{
   toolTipContent: React.ReactNode;
   toolTipTitle?: React.ReactNode;
   width?: number;
-}> = ({ toolTipContent, toolTipTitle, width = 270 }) => {
+  anchorPosition?: EuiPopover['props']['anchorPosition'];
+}> = ({ toolTipContent, toolTipTitle, width = 270, anchorPosition = 'leftCenter' }) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
 
   const onClick = useCallback(() => {
@@ -30,7 +30,7 @@ export const RiskScoreInfoTooltip: React.FC<{
     <EuiPopover
       isOpen={isPopoverOpen}
       closePopover={closePopover}
-      anchorPosition="leftCenter"
+      anchorPosition={anchorPosition}
       button={
         <EuiButtonIcon
           color="text"
@@ -50,9 +50,13 @@ export const RiskScoreInfoTooltip: React.FC<{
   );
 };
 
-export const RiskScoreDocTooltip = ({ riskScoreEntity }: { riskScoreEntity: RiskScoreEntity }) => (
+export const RiskScoreDocTooltip = ({
+  anchorPosition,
+}: {
+  anchorPosition?: React.ComponentProps<typeof RiskScoreInfoTooltip>['anchorPosition'];
+}) => (
   <RiskScoreInfoTooltip
-    toolTipContent={<RiskScoreDocLink riskScoreEntity={riskScoreEntity} />}
-    width={200} // Magic number to match the width of the doc link
+    anchorPosition={anchorPosition}
+    toolTipContent={<EntityAnalyticsLearnMoreLink />}
   />
 );
diff --git a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
index 6ac68b9522762..b25509c1b88f5 100644
--- a/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/host_overview/index.tsx
@@ -158,7 +158,7 @@ export const HostOverview = React.memo<HostSummaryProps>(
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <RiskScoreDocTooltip riskScoreEntity={RiskScoreEntity.host} />
+                <RiskScoreDocTooltip anchorPosition="upCenter" />
               </EuiFlexItem>
             </EuiFlexGroup>
           ),
diff --git a/x-pack/plugins/security_solution/public/overview/components/user_overview/index.tsx b/x-pack/plugins/security_solution/public/overview/components/user_overview/index.tsx
index 30e528509b9c1..102e39cf1b740 100644
--- a/x-pack/plugins/security_solution/public/overview/components/user_overview/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/user_overview/index.tsx
@@ -156,7 +156,7 @@ export const UserOverview = React.memo<UserSummaryProps>(
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <RiskScoreDocTooltip riskScoreEntity={RiskScoreEntity.user} />
+                <RiskScoreDocTooltip anchorPosition="upCenter" />
               </EuiFlexItem>
             </EuiFlexGroup>
           ),
diff --git a/x-pack/plugins/security_solution/public/sourcerer/containers/mocks.ts b/x-pack/plugins/security_solution/public/sourcerer/containers/mocks.ts
index a763383f4a731..cdee31b50b6f3 100644
--- a/x-pack/plugins/security_solution/public/sourcerer/containers/mocks.ts
+++ b/x-pack/plugins/security_solution/public/sourcerer/containers/mocks.ts
@@ -30,7 +30,6 @@ export const mockSourcererScope: SelectedDataView = {
           aggregatable: false,
           esTypes: undefined,
           format: undefined,
-          indexes: mockPatterns,
           name: '_id',
           searchable: true,
           subType: undefined,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.tsx
index 116cddf36f5f5..1921dfe190420 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/note_previews/index.tsx
@@ -20,7 +20,6 @@ import React, { useCallback, useMemo, useState } from 'react';
 import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { useKibana } from '../../../../common/lib/kibana';
 import { DocumentDetailsRightPanelKey } from '../../../../flyout/document_details/shared/constants/panel_keys';
 import type { TimelineResultNote } from '../types';
@@ -29,7 +28,7 @@ import { MarkdownRenderer } from '../../../../common/components/markdown_editor'
 import { timelineActions, timelineSelectors } from '../../../store';
 import { NOTE_CONTENT_CLASS_NAME } from '../../timeline/body/helpers';
 import * as i18n from './translations';
-import { TimelineTabs, TimelineId } from '../../../../../common/types/timeline';
+import { TimelineId } from '../../../../../common/types/timeline';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { SourcererScopeName } from '../../../../sourcerer/store/model';
 import { useSourcererDataView } from '../../../../sourcerer/containers';
@@ -51,53 +50,27 @@ const ToggleEventDetailsButtonComponent: React.FC<ToggleEventDetailsButtonProps>
   eventId,
   timelineId,
 }) => {
-  const dispatch = useDispatch();
   const { selectedPatterns } = useSourcererDataView(SourcererScopeName.timeline);
 
   const { telemetry } = useKibana().services;
   const { openFlyout } = useExpandableFlyoutApi();
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
 
   const handleClick = useCallback(() => {
-    const indexName = selectedPatterns.join(',');
-
-    if (!expandableFlyoutDisabled) {
-      openFlyout({
-        right: {
-          id: DocumentDetailsRightPanelKey,
-          params: {
-            id: eventId,
-            indexName,
-            scopeId: timelineId,
-          },
+    openFlyout({
+      right: {
+        id: DocumentDetailsRightPanelKey,
+        params: {
+          id: eventId,
+          indexName: selectedPatterns.join(','),
+          scopeId: timelineId,
         },
-      });
-      telemetry.reportDetailsFlyoutOpened({
-        location: timelineId,
-        panel: 'right',
-      });
-    } else {
-      dispatch(
-        timelineActions.toggleDetailPanel({
-          panelView: 'eventDetail',
-          tabType: TimelineTabs.notes,
-          id: timelineId,
-          params: {
-            eventId,
-            indexName,
-          },
-        })
-      );
-    }
-  }, [
-    dispatch,
-    eventId,
-    expandableFlyoutDisabled,
-    openFlyout,
-    selectedPatterns,
-    telemetry,
-    timelineId,
-  ]);
+      },
+    });
+    telemetry.reportDetailsFlyoutOpened({
+      location: timelineId,
+      panel: 'right',
+    });
+  }, [eventId, openFlyout, selectedPatterns, telemetry, timelineId]);
 
   return (
     <EuiButtonIcon
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
index 3dc686229e4fa..015a36717475e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
@@ -312,7 +312,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
               />
             </>
           ) : (
-            <NoteManagementPage />
+            <NoteManagementPage onOpenTimeline={onOpenTimeline} />
           )}
         </div>
       </>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.test.tsx
index f0b22e4f48359..5f6e69ce2a051 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.test.tsx
@@ -8,7 +8,6 @@ import { renderHook, act } from '@testing-library/react-hooks';
 import React from 'react';
 import type { UseDetailPanelConfig } from './use_detail_panel';
 import { useDetailPanel } from './use_detail_panel';
-import { timelineActions } from '../../../store';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
 import { SourcererScopeName } from '../../../../sourcerer/store/model';
 import { TimelineId, TimelineTabs } from '../../../../../common/types/timeline';
@@ -33,14 +32,6 @@ jest.mock('../../../../common/lib/kibana', () => {
 jest.mock('../../../../common/hooks/use_selector');
 jest.mock('../../../store');
 
-const mockDispatch = jest.fn();
-jest.mock('react-redux', () => {
-  const original = jest.requireActual('react-redux');
-  return {
-    ...original,
-    useDispatch: () => mockDispatch,
-  };
-});
 jest.mock('../../../../sourcerer/containers', () => {
   const mockSourcererReturn = {
     browserFields: {},
@@ -88,18 +79,6 @@ describe('useDetailPanel', () => {
     });
   });
 
-  test('should fire redux action to open event details panel', async () => {
-    await act(async () => {
-      const { result, waitForNextUpdate } = renderUseDetailPanel();
-      await waitForNextUpdate();
-
-      result.current?.openEventDetailsPanel('123');
-
-      expect(mockDispatch).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-    });
-  });
-
   test('should show the details panel', async () => {
     mockGetExpandedDetail.mockImplementation(() => ({
       [TimelineTabs.session]: {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
index d66053c1128e4..4d76510c12b77 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/hooks/use_detail_panel.tsx
@@ -5,15 +5,12 @@
  * 2.0.
  */
 
-import React, { useMemo, useCallback, useRef } from 'react';
-import { useDispatch } from 'react-redux';
+import React, { useMemo, useCallback } from 'react';
 import type { EntityType } from '@kbn/timelines-plugin/common';
 import { dataTableSelectors } from '@kbn/securitysolution-data-table';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { useKibana } from '../../../../common/lib/kibana';
-import type { ExpandedDetailType } from '../../../../../common/types';
-import { getScopedActions, isInTableScope, isTimelineScope } from '../../../../helpers';
+import { isInTableScope, isTimelineScope } from '../../../../helpers';
 import { timelineSelectors } from '../../../store';
 import { useSourcererDataView } from '../../../../sourcerer/containers';
 import type { SourcererScopeName } from '../../../../sourcerer/store/model';
@@ -45,10 +42,8 @@ export const useDetailPanel = ({
 }: UseDetailPanelConfig): UseDetailPanelReturn => {
   const { telemetry } = useKibana().services;
   const { browserFields, selectedPatterns, runtimeMappings } = useSourcererDataView(sourcererScope);
-  const dispatch = useDispatch();
 
   const { openFlyout } = useExpandableFlyoutApi();
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
 
   const getScope = useMemo(() => {
     if (isTimelineScope(scopeId)) {
@@ -62,8 +57,6 @@ export const useDetailPanel = ({
   const expandedDetail = useDeepEqualSelector(
     (state) => ((getScope && getScope(state, scopeId)) ?? timelineDefaults)?.expandedDetail
   );
-  const onPanelClose = useRef(() => {});
-  const noopPanelClose = () => {};
 
   const shouldShowDetailsPanel = useMemo(() => {
     if (
@@ -76,68 +69,34 @@ export const useDetailPanel = ({
     }
     return false;
   }, [expandedDetail, tabType]);
-  const scopedActions = getScopedActions(scopeId);
-
-  // We could just surface load details panel, but rather than have users be concerned
-  // of the config for a panel, they can just pass the base necessary values to a panel specific function
-  const loadDetailsPanel = useCallback(
-    (panelConfig?: ExpandedDetailType) => {
-      if (panelConfig && scopedActions) {
-        dispatch(
-          scopedActions.toggleDetailPanel({
-            ...panelConfig,
-            tabType,
-            id: scopeId,
-          })
-        );
-      }
-    },
-    [scopedActions, scopeId, dispatch, tabType]
-  );
 
   const openEventDetailsPanel = useCallback(
     (eventId?: string, onClose?: () => void) => {
-      if (!expandableFlyoutDisabled) {
-        openFlyout({
-          right: {
-            id: DocumentDetailsRightPanelKey,
-            params: {
-              id: eventId,
-              indexName: eventDetailsIndex,
-              scopeId,
-            },
+      openFlyout({
+        right: {
+          id: DocumentDetailsRightPanelKey,
+          params: {
+            id: eventId,
+            indexName: eventDetailsIndex,
+            scopeId,
           },
-        });
-        telemetry.reportDetailsFlyoutOpened({
-          location: scopeId,
-          panel: 'right',
-        });
-      } else if (eventId) {
-        loadDetailsPanel({
-          panelView: 'eventDetail',
-          params: { eventId, indexName: eventDetailsIndex },
-        });
-        onPanelClose.current = onClose ?? noopPanelClose;
-      }
+        },
+      });
+      telemetry.reportDetailsFlyoutOpened({
+        location: scopeId,
+        panel: 'right',
+      });
     },
-    [expandableFlyoutDisabled, openFlyout, eventDetailsIndex, scopeId, telemetry, loadDetailsPanel]
+    [openFlyout, eventDetailsIndex, scopeId, telemetry]
   );
 
-  const handleOnDetailsPanelClosed = useCallback(() => {
-    if (!expandableFlyoutDisabled) return;
-    if (onPanelClose.current) onPanelClose.current();
-    if (scopedActions) {
-      dispatch(scopedActions.toggleDetailPanel({ tabType, id: scopeId }));
-    }
-  }, [expandableFlyoutDisabled, scopedActions, dispatch, tabType, scopeId]);
-
   const DetailsPanel = useMemo(
     () =>
       shouldShowDetailsPanel ? (
         <DetailsPanelComponent
           browserFields={browserFields}
           entityType={entityType}
-          handleOnPanelClosed={handleOnDetailsPanelClosed}
+          handleOnPanelClosed={() => {}}
           isFlyoutView={isFlyoutView}
           runtimeMappings={runtimeMappings}
           tabType={tabType}
@@ -147,7 +106,6 @@ export const useDetailPanel = ({
     [
       browserFields,
       entityType,
-      handleOnDetailsPanelClosed,
       isFlyoutView,
       runtimeMappings,
       shouldShowDetailsPanel,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
index 6844342e8b2f0..00e0091833632 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/__snapshots__/index.test.tsx.snap
@@ -13,11 +13,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.ephemeral_id",
             "searchable": true,
             "type": "string",
@@ -28,11 +23,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.hostname",
             "searchable": true,
             "type": "string",
@@ -43,11 +33,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.id",
             "searchable": true,
             "type": "string",
@@ -58,11 +43,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "agent.name",
             "searchable": true,
             "type": "string",
@@ -77,9 +57,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a0",
             "searchable": true,
             "type": "string",
@@ -90,9 +67,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a1",
             "searchable": true,
             "type": "string",
@@ -103,9 +77,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-            ],
             "name": "auditd.data.a2",
             "searchable": true,
             "type": "string",
@@ -120,11 +91,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "date",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "@timestamp",
             "readFromDocValues": true,
             "searchable": true,
@@ -133,11 +99,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
           "_id": Object {
             "aggregatable": false,
             "esTypes": Array [],
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "_id",
             "searchable": true,
             "type": "string",
@@ -148,11 +109,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "text",
             ],
             "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "message",
             "searchable": true,
             "type": "string",
@@ -167,11 +123,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.address",
             "searchable": true,
             "type": "string",
@@ -182,11 +133,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.bytes",
             "searchable": true,
             "type": "number",
@@ -197,11 +143,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.domain",
             "searchable": true,
             "type": "string",
@@ -212,11 +153,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "client.geo.country_iso_code",
             "searchable": true,
             "type": "string",
@@ -231,11 +167,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "cloud.account.id",
             "searchable": true,
             "type": "string",
@@ -246,11 +177,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "cloud.availability_zone",
             "searchable": true,
             "type": "string",
@@ -265,11 +191,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.id",
             "searchable": true,
             "type": "string",
@@ -280,11 +201,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.image.name",
             "searchable": true,
             "type": "string",
@@ -295,11 +211,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "container.image.tag",
             "searchable": true,
             "type": "string",
@@ -314,11 +225,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.address",
             "searchable": true,
             "type": "string",
@@ -329,11 +235,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.bytes",
             "searchable": true,
             "type": "number",
@@ -344,11 +245,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.domain",
             "searchable": true,
             "type": "string",
@@ -359,11 +255,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "ip",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.ip",
             "searchable": true,
             "type": "ip",
@@ -374,11 +265,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "destination.port",
             "searchable": true,
             "type": "number",
@@ -393,17 +279,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.action",
             "searchable": true,
             "type": "string",
@@ -414,17 +289,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.category",
             "searchable": true,
             "type": "string",
@@ -435,17 +299,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "date",
             ],
             "format": "",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.end",
             "searchable": true,
             "type": "date",
@@ -456,17 +309,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.kind",
             "searchable": true,
             "type": "string",
@@ -477,17 +319,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "long",
             ],
             "format": "number",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "event.severity",
             "searchable": true,
             "type": "number",
@@ -502,17 +333,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "apm-*-transaction*",
-              "auditbeat-*",
-              "endgame-*",
-              "filebeat-*",
-              "logs-*",
-              "packetbeat-*",
-              "traces-apm*",
-              "winlogbeat-*",
-              "-*elastic-cloud-logs-*",
-            ],
             "name": "host.name",
             "searchable": true,
             "type": "string",
@@ -524,11 +344,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
           "nestedField.firstAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.firstAttributes",
             "searchable": true,
             "subType": Object {
@@ -541,11 +356,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
           "nestedField.secondAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.secondAttributes",
             "searchable": true,
             "subType": Object {
@@ -558,11 +368,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
           "nestedField.thirdAttributes": Object {
             "aggregatable": false,
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "nestedField.thirdAttributes",
             "searchable": true,
             "subType": Object {
@@ -597,11 +402,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "ip",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "source.ip",
             "searchable": true,
             "type": "ip",
@@ -612,11 +412,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "long",
             ],
             "format": "",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "source.port",
             "searchable": true,
             "type": "number",
@@ -631,11 +426,6 @@ exports[`ColumnHeaders rendering renders correctly against snapshot 1`] = `
               "keyword",
             ],
             "format": "string",
-            "indexes": Array [
-              "auditbeat",
-              "filebeat",
-              "packetbeat",
-            ],
             "name": "user.name",
             "searchable": true,
             "type": "string",
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
index b205f7c73a94e..0925e8cb2e1ed 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/column_headers/helpers.test.ts
@@ -108,7 +108,6 @@ describe('helpers', () => {
           columnHeaderType: 'not-filtered',
           format: '',
           id: '@timestamp',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           name: '@timestamp',
           readFromDocValues: true,
           searchable: true,
@@ -121,7 +120,6 @@ describe('helpers', () => {
           columnHeaderType: 'not-filtered',
           format: '',
           id: 'source.ip',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           name: 'source.ip',
           searchable: true,
           type: 'ip',
@@ -133,7 +131,6 @@ describe('helpers', () => {
           columnHeaderType: 'not-filtered',
           format: '',
           id: 'destination.ip',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           name: 'destination.ip',
           searchable: true,
           type: 'ip',
@@ -162,7 +159,6 @@ describe('helpers', () => {
           columnHeaderType: 'not-filtered',
           esTypes: [],
           id: '_id',
-          indexes: ['auditbeat', 'filebeat', 'packetbeat'],
           initialWidth: 180,
           name: '_id',
           searchable: true,
@@ -187,18 +183,6 @@ describe('helpers', () => {
               aggregatable: true,
               esTypes: ['keyword'],
               format: 'string',
-              indexes: [
-                '-*elastic-cloud-logs-*',
-                '.alerts-security.alerts-default',
-                'apm-*-transaction*',
-                'auditbeat-*',
-                'endgame-*',
-                'filebeat-*',
-                'logs-*',
-                'packetbeat-*',
-                'traces-apm*',
-                'winlogbeat-*',
-              ],
               name: 'test_field_1',
               readFromDocValues: true,
               searchable: true,
@@ -215,18 +199,6 @@ describe('helpers', () => {
           esTypes: ['keyword'],
           format: 'string',
           id: 'test_field_1',
-          indexes: [
-            '-*elastic-cloud-logs-*',
-            '.alerts-security.alerts-default',
-            'apm-*-transaction*',
-            'auditbeat-*',
-            'endgame-*',
-            'filebeat-*',
-            'logs-*',
-            'packetbeat-*',
-            'traces-apm*',
-            'winlogbeat-*',
-          ],
           initialWidth: 180,
           name: 'test_field_1',
           readFromDocValues: true,
@@ -252,18 +224,6 @@ describe('helpers', () => {
               aggregatable: true,
               esTypes: ['keyword'],
               format: 'string',
-              indexes: [
-                '-*elastic-cloud-logs-*',
-                '.alerts-security.alerts-default',
-                'apm-*-transaction*',
-                'auditbeat-*',
-                'endgame-*',
-                'filebeat-*',
-                'logs-*',
-                'packetbeat-*',
-                'traces-apm*',
-                'winlogbeat-*',
-              ],
               name: 'foo.bar',
               readFromDocValues: true,
               searchable: true,
@@ -280,18 +240,6 @@ describe('helpers', () => {
           esTypes: ['keyword'],
           format: 'string',
           id: 'foo.bar',
-          indexes: [
-            '-*elastic-cloud-logs-*',
-            '.alerts-security.alerts-default',
-            'apm-*-transaction*',
-            'auditbeat-*',
-            'endgame-*',
-            'filebeat-*',
-            'logs-*',
-            'packetbeat-*',
-            'traces-apm*',
-            'winlogbeat-*',
-          ],
           initialWidth: 180,
           name: 'foo.bar',
           readFromDocValues: true,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
index 000837ff83500..479d4d0defc1f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_event.tsx
@@ -11,7 +11,6 @@ import React, { useCallback, useMemo, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { isEventBuildingBlockType } from '@kbn/securitysolution-data-table';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { DocumentDetailsRightPanelKey } from '../../../../../flyout/document_details/shared/constants/panel_keys';
 import { useDeepEqualSelector } from '../../../../../common/hooks/use_selector';
 import { useKibana } from '../../../../../common/lib/kibana';
@@ -43,7 +42,6 @@ import { useGetMappedNonEcsValue } from '../data_driven_columns';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
 import type {
   ControlColumnProps,
-  ExpandedDetailType,
   SetEventsDeleted,
   SetEventsLoading,
 } from '../../../../../../common/types';
@@ -112,7 +110,6 @@ const StatefulEventComponent: React.FC<Props> = ({
   const trGroupRef = useRef<HTMLDivElement | null>(null);
   const dispatch = useDispatch();
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const { openFlyout } = useExpandableFlyoutApi();
 
   // Store context in state rather than creating object in provider value={} to prevent re-renders caused by a new object being created
@@ -206,51 +203,21 @@ const StatefulEventComponent: React.FC<Props> = ({
   );
 
   const handleOnEventDetailPanelOpened = useCallback(() => {
-    const updatedExpandedDetail: ExpandedDetailType = {
-      panelView: 'eventDetail',
-      params: {
-        eventId,
-        indexName,
-        refetch,
-      },
-    };
-
-    if (!expandableFlyoutDisabled) {
-      openFlyout({
-        right: {
-          id: DocumentDetailsRightPanelKey,
-          params: {
-            id: eventId,
-            indexName,
-            scopeId: timelineId,
-          },
+    openFlyout({
+      right: {
+        id: DocumentDetailsRightPanelKey,
+        params: {
+          id: eventId,
+          indexName,
+          scopeId: timelineId,
         },
-      });
-      telemetry.reportDetailsFlyoutOpened({
-        location: timelineId,
-        panel: 'right',
-      });
-    } else {
-      // opens the panel when clicking on the table row action
-      dispatch(
-        timelineActions.toggleDetailPanel({
-          ...updatedExpandedDetail,
-          tabType,
-          id: timelineId,
-        })
-      );
-    }
-  }, [
-    eventId,
-    indexName,
-    refetch,
-    expandableFlyoutDisabled,
-    openFlyout,
-    timelineId,
-    telemetry,
-    dispatch,
-    tabType,
-  ]);
+      },
+    });
+    telemetry.reportDetailsFlyoutOpened({
+      location: timelineId,
+      panel: 'right',
+    });
+  }, [eventId, indexName, openFlyout, timelineId, telemetry]);
 
   const setEventsLoading = useCallback<SetEventsLoading>(
     ({ eventIds, isLoading }) => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
index 155c92403af3b..b6df692dcabfd 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/events/stateful_row_renderer/index.tsx
@@ -6,7 +6,13 @@
  */
 
 import { noop } from 'lodash/fp';
-import { EuiFocusTrap, EuiOutsideClickDetector, EuiScreenReaderOnly } from '@elastic/eui';
+import {
+  EuiFlexGroup,
+  EuiFocusTrap,
+  EuiOutsideClickDetector,
+  EuiScreenReaderOnly,
+  EuiFlexItem,
+} from '@elastic/eui';
 import React, { useMemo } from 'react';
 
 import {
@@ -73,13 +79,15 @@ export const StatefulRowRenderer = ({
               <EuiScreenReaderOnly data-test-subj="eventRendererScreenReaderOnly">
                 <p>{i18n.YOU_ARE_IN_AN_EVENT_RENDERER(ariaRowindex)}</p>
               </EuiScreenReaderOnly>
-              <div onKeyDown={onKeyDown}>
-                {rowRenderer.renderRow({
-                  data: event.ecs,
-                  isDraggable: true,
-                  scopeId: timelineId,
-                })}
-              </div>
+              <EuiFlexGroup direction="column" onKeyDown={onKeyDown}>
+                <EuiFlexItem grow={true}>
+                  {rowRenderer.renderRow({
+                    data: event.ecs,
+                    isDraggable: true,
+                    scopeId: timelineId,
+                  })}
+                </EuiFlexItem>
+              </EuiFlexGroup>
             </EuiFocusTrap>
           </EuiOutsideClickDetector>
         </div>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
index 0a9c53a88d689..d00ad83b9b556 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.test.tsx
@@ -11,17 +11,13 @@ import { waitFor } from '@testing-library/react';
 import { HostName } from './host_name';
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types/timeline';
-import { timelineActions } from '../../../../store';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
 import { createTelemetryServiceMock } from '../../../../../common/lib/telemetry/telemetry_service.mock';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
-import { dataTableActions, TableId } from '@kbn/securitysolution-data-table';
+import { TableId } from '@kbn/securitysolution-data-table';
 
 const mockedTelemetry = createTelemetryServiceMock();
 const mockOpenRightPanel = jest.fn();
 
-jest.mock('../../../../../common/hooks/use_experimental_features');
-
 jest.mock('@kbn/expandable-flyout', () => {
   return {
     useExpandableFlyoutApi: () => ({
@@ -31,14 +27,6 @@ jest.mock('@kbn/expandable-flyout', () => {
   };
 });
 
-jest.mock('react-redux', () => {
-  const origin = jest.requireActual('react-redux');
-  return {
-    ...origin,
-    useDispatch: jest.fn().mockReturnValue(jest.fn()),
-  };
-});
-
 jest.mock('../../../../../common/lib/kibana/kibana_react', () => {
   return {
     useKibana: () => ({
@@ -57,28 +45,6 @@ jest.mock('../../../../../common/components/draggables', () => ({
   DefaultDraggable: () => <div data-test-subj="DefaultDraggable" />,
 }));
 
-jest.mock('../../../../store', () => {
-  const original = jest.requireActual('../../../../store');
-  return {
-    ...original,
-    timelineActions: {
-      ...original.timelineActions,
-      toggleDetailPanel: jest.fn(),
-    },
-  };
-});
-
-jest.mock('@kbn/securitysolution-data-table', () => {
-  const original = jest.requireActual('@kbn/securitysolution-data-table');
-  return {
-    ...original,
-    dataTableActions: {
-      ...original.dataTableActions,
-      toggleDetailPanel: jest.fn(),
-    },
-  };
-});
-
 describe('HostName', () => {
   afterEach(() => {
     jest.clearAllMocks();
@@ -129,8 +95,6 @@ describe('HostName', () => {
 
     wrapper.find('[data-test-subj="host-details-button"]').last().simulate('click');
     await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
       expect(mockOpenRightPanel).not.toHaveBeenCalled();
     });
   });
@@ -153,8 +117,6 @@ describe('HostName', () => {
 
     wrapper.find('[data-test-subj="host-details-button"]').last().simulate('click');
     await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
       expect(mockOpenRightPanel).not.toHaveBeenCalled();
     });
   });
@@ -177,82 +139,11 @@ describe('HostName', () => {
 
     wrapper.find('[data-test-subj="host-details-button"]').last().simulate('click');
     await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(mockOpenRightPanel).not.toHaveBeenCalled();
-    });
-  });
-
-  test('should open old flyout on table', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return true;
-    });
-    const context = {
-      enableHostDetailsFlyout: true,
-      enableIpDetailsFlyout: true,
-      timelineID: TableId.alertsOnAlertsPage,
-      tabType: TimelineTabs.query,
-    };
-    const wrapper = mount(
-      <TestProviders>
-        <StatefulEventContext.Provider value={context}>
-          <HostName {...props} />
-        </StatefulEventContext.Provider>
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="host-details-button"]').last().simulate('click');
-    await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).toHaveBeenCalledWith({
-        id: context.timelineID,
-        panelView: 'hostDetail',
-        params: {
-          hostName: props.value,
-        },
-        tabType: context.tabType,
-      });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(mockOpenRightPanel).not.toHaveBeenCalled();
-    });
-  });
-
-  test('should open old flyout in timeline', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return true;
-    });
-    const context = {
-      enableHostDetailsFlyout: true,
-      enableIpDetailsFlyout: true,
-      timelineID: TimelineId.active,
-      tabType: TimelineTabs.query,
-    };
-    const wrapper = mount(
-      <TestProviders>
-        <StatefulEventContext.Provider value={context}>
-          <HostName {...props} />
-        </StatefulEventContext.Provider>
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="host-details-button"]').last().simulate('click');
-    await waitFor(() => {
-      expect(timelineActions.toggleDetailPanel).toHaveBeenCalledWith({
-        id: context.timelineID,
-        panelView: 'hostDetail',
-        params: {
-          hostName: props.value,
-        },
-        tabType: context.tabType,
-      });
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
       expect(mockOpenRightPanel).not.toHaveBeenCalled();
     });
   });
 
   test('should open expandable flyout on table', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return false;
-    });
     const context = {
       enableHostDetailsFlyout: true,
       enableIpDetailsFlyout: true,
@@ -278,15 +169,10 @@ describe('HostName', () => {
           isDraggable: false,
         },
       });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
     });
   });
 
   test('should open expandable flyout in timeline', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return false;
-    });
     const context = {
       enableHostDetailsFlyout: true,
       enableIpDetailsFlyout: true,
@@ -312,8 +198,6 @@ describe('HostName', () => {
           isDraggable: false,
         },
       });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
index 42c5344c7445c..d1a9c3a00bf37 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/host_name.tsx
@@ -7,16 +7,11 @@
 
 import React, { useCallback, useContext, useMemo } from 'react';
 import type { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
-import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { HostPanelKey } from '../../../../../flyout/entity_details/host_right';
-import type { ExpandedDetailType } from '../../../../../../common/types';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
-import { getScopedActions } from '../../../../../helpers';
 import { HostDetailsLink } from '../../../../../common/components/links';
-import type { TimelineTabs } from '../../../../../../common/types/timeline';
 import { DefaultDraggable } from '../../../../../common/components/draggables';
 import { getEmptyTagValue } from '../../../../../common/components/empty_value';
 import { TruncatableText } from '../../../../../common/components/truncatable_text';
@@ -48,10 +43,8 @@ const HostNameComponent: React.FC<Props> = ({
   title,
   value,
 }) => {
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const { openRightPanel } = useExpandableFlyoutApi();
 
-  const dispatch = useDispatch();
   const eventContext = useContext(StatefulEventContext);
   const hostName = `${value}`;
   const isInTimelineContext =
@@ -69,48 +62,19 @@ const HostNameComponent: React.FC<Props> = ({
         return;
       }
 
-      const { timelineID, tabType } = eventContext;
+      const { timelineID } = eventContext;
 
-      if (!expandableFlyoutDisabled) {
-        openRightPanel({
-          id: HostPanelKey,
-          params: {
-            hostName,
-            contextID: contextId,
-            scopeId: timelineID,
-            isDraggable,
-          },
-        });
-      } else {
-        const updatedExpandedDetail: ExpandedDetailType = {
-          panelView: 'hostDetail',
-          params: {
-            hostName,
-          },
-        };
-        const scopedActions = getScopedActions(timelineID);
-        if (scopedActions) {
-          dispatch(
-            scopedActions.toggleDetailPanel({
-              ...updatedExpandedDetail,
-              id: timelineID,
-              tabType: tabType as TimelineTabs,
-            })
-          );
-        }
-      }
+      openRightPanel({
+        id: HostPanelKey,
+        params: {
+          hostName,
+          contextID: contextId,
+          scopeId: timelineID,
+          isDraggable,
+        },
+      });
     },
-    [
-      contextId,
-      dispatch,
-      eventContext,
-      expandableFlyoutDisabled,
-      hostName,
-      isDraggable,
-      isInTimelineContext,
-      onClick,
-      openRightPanel,
-    ]
+    [contextId, eventContext, hostName, isDraggable, isInTimelineContext, onClick, openRightPanel]
   );
 
   // The below is explicitly defined this way as the onClick takes precedence when it and the href are both defined
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
index 16f881fe90130..471d43dcf8462 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.test.tsx
@@ -10,18 +10,14 @@ import { waitFor } from '@testing-library/react';
 
 import { TestProviders } from '../../../../../common/mock';
 import { TimelineId, TimelineTabs } from '../../../../../../common/types/timeline';
-import { timelineActions } from '../../../../store';
 import { UserName } from './user_name';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
 import { createTelemetryServiceMock } from '../../../../../common/lib/telemetry/telemetry_service.mock';
-import { dataTableActions, TableId } from '@kbn/securitysolution-data-table';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
+import { TableId } from '@kbn/securitysolution-data-table';
 
 const mockedTelemetry = createTelemetryServiceMock();
 const mockOpenRightPanel = jest.fn();
 
-jest.mock('../../../../../common/hooks/use_experimental_features');
-
 jest.mock('@kbn/expandable-flyout', () => {
   return {
     useExpandableFlyoutApi: () => ({
@@ -31,14 +27,6 @@ jest.mock('@kbn/expandable-flyout', () => {
   };
 });
 
-jest.mock('react-redux', () => {
-  const origin = jest.requireActual('react-redux');
-  return {
-    ...origin,
-    useDispatch: jest.fn().mockReturnValue(jest.fn()),
-  };
-});
-
 jest.mock('../../../../../common/lib/kibana/kibana_react', () => {
   return {
     useKibana: () => ({
@@ -57,28 +45,6 @@ jest.mock('../../../../../common/components/draggables', () => ({
   DefaultDraggable: () => <div data-test-subj="DefaultDraggable" />,
 }));
 
-jest.mock('../../../../store', () => {
-  const original = jest.requireActual('../../../../store');
-  return {
-    ...original,
-    timelineActions: {
-      ...original.timelineActions,
-      toggleDetailPanel: jest.fn(),
-    },
-  };
-});
-
-jest.mock('@kbn/securitysolution-data-table', () => {
-  const original = jest.requireActual('@kbn/securitysolution-data-table');
-  return {
-    ...original,
-    dataTableActions: {
-      ...original.dataTableActions,
-      toggleDetailPanel: jest.fn(),
-    },
-  };
-});
-
 describe('UserName', () => {
   afterEach(() => {
     jest.clearAllMocks();
@@ -127,8 +93,6 @@ describe('UserName', () => {
 
     wrapper.find('[data-test-subj="users-link-anchor"]').last().simulate('click');
     await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
       expect(mockOpenRightPanel).not.toHaveBeenCalled();
     });
   });
@@ -151,82 +115,11 @@ describe('UserName', () => {
 
     wrapper.find('[data-test-subj="users-link-anchor"]').last().simulate('click');
     await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(mockOpenRightPanel).not.toHaveBeenCalled();
-    });
-  });
-
-  test('should open old flyout on table', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return true;
-    });
-    const context = {
-      enableHostDetailsFlyout: true,
-      enableIpDetailsFlyout: true,
-      timelineID: TableId.alertsOnAlertsPage,
-      tabType: TimelineTabs.query,
-    };
-    const wrapper = mount(
-      <TestProviders>
-        <StatefulEventContext.Provider value={context}>
-          <UserName {...props} />
-        </StatefulEventContext.Provider>
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="users-link-anchor"]').last().simulate('click');
-    await waitFor(() => {
-      expect(dataTableActions.toggleDetailPanel).toHaveBeenCalledWith({
-        id: context.timelineID,
-        panelView: 'userDetail',
-        params: {
-          userName: props.value,
-        },
-        tabType: context.tabType,
-      });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(mockOpenRightPanel).not.toHaveBeenCalled();
-    });
-  });
-
-  test('should open old flyout in timeline', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return true;
-    });
-    const context = {
-      enableHostDetailsFlyout: true,
-      enableIpDetailsFlyout: true,
-      timelineID: TimelineId.active,
-      tabType: TimelineTabs.query,
-    };
-    const wrapper = mount(
-      <TestProviders>
-        <StatefulEventContext.Provider value={context}>
-          <UserName {...props} />
-        </StatefulEventContext.Provider>
-      </TestProviders>
-    );
-
-    wrapper.find('[data-test-subj="users-link-anchor"]').last().simulate('click');
-    await waitFor(() => {
-      expect(timelineActions.toggleDetailPanel).toHaveBeenCalledWith({
-        id: context.timelineID,
-        panelView: 'userDetail',
-        params: {
-          userName: props.value,
-        },
-        tabType: context.tabType,
-      });
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
       expect(mockOpenRightPanel).not.toHaveBeenCalled();
     });
   });
 
   test('should open expandable flyout on table', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return false;
-    });
     const context = {
       enableHostDetailsFlyout: true,
       enableIpDetailsFlyout: true,
@@ -252,15 +145,10 @@ describe('UserName', () => {
           isDraggable: false,
         },
       });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
     });
   });
 
   test('should open expandable flyout in timeline', async () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation((feature: string) => {
-      if (feature === 'expandableFlyoutDisabled') return false;
-    });
     const context = {
       enableHostDetailsFlyout: true,
       enableIpDetailsFlyout: true,
@@ -286,8 +174,6 @@ describe('UserName', () => {
           isDraggable: false,
         },
       });
-      expect(timelineActions.toggleDetailPanel).not.toHaveBeenCalled();
-      expect(dataTableActions.toggleDetailPanel).not.toHaveBeenCalled();
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
index 78d9ad9c3bdfd..48ce6255725d3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/renderers/user_name.tsx
@@ -7,15 +7,10 @@
 
 import React, { useCallback, useContext, useMemo } from 'react';
 import type { EuiButtonEmpty, EuiButtonIcon } from '@elastic/eui';
-import { useDispatch } from 'react-redux';
 import { isString } from 'lodash/fp';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { UserPanelKey } from '../../../../../flyout/entity_details/user_right';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
-import type { ExpandedDetailType } from '../../../../../../common/types';
-import { getScopedActions } from '../../../../../helpers';
-import type { TimelineTabs } from '../../../../../../common/types/timeline';
 import { DefaultDraggable } from '../../../../../common/components/draggables';
 import { getEmptyTagValue } from '../../../../../common/components/empty_value';
 import { UserDetailsLink } from '../../../../../common/components/links';
@@ -48,9 +43,7 @@ const UserNameComponent: React.FC<Props> = ({
   title,
   value,
 }) => {
-  const dispatch = useDispatch();
   const eventContext = useContext(StatefulEventContext);
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const userName = `${value}`;
   const isInTimelineContext = userName && eventContext?.timelineID;
   const { openRightPanel } = useExpandableFlyoutApi();
@@ -67,48 +60,19 @@ const UserNameComponent: React.FC<Props> = ({
         return;
       }
 
-      const { timelineID, tabType } = eventContext;
+      const { timelineID } = eventContext;
 
-      if (!expandableFlyoutDisabled) {
-        openRightPanel({
-          id: UserPanelKey,
-          params: {
-            userName,
-            contextID: contextId,
-            scopeId: timelineID,
-            isDraggable,
-          },
-        });
-      } else {
-        const updatedExpandedDetail: ExpandedDetailType = {
-          panelView: 'userDetail',
-          params: {
-            userName,
-          },
-        };
-        const scopedActions = getScopedActions(timelineID);
-        if (scopedActions) {
-          dispatch(
-            scopedActions.toggleDetailPanel({
-              ...updatedExpandedDetail,
-              id: timelineID,
-              tabType: tabType as TimelineTabs,
-            })
-          );
-        }
-      }
+      openRightPanel({
+        id: UserPanelKey,
+        params: {
+          userName,
+          contextID: contextId,
+          scopeId: timelineID,
+          isDraggable,
+        },
+      });
     },
-    [
-      contextId,
-      dispatch,
-      eventContext,
-      expandableFlyoutDisabled,
-      isDraggable,
-      isInTimelineContext,
-      onClick,
-      openRightPanel,
-      userName,
-    ]
+    [contextId, eventContext, isDraggable, isInTimelineContext, onClick, openRightPanel, userName]
   );
 
   // The below is explicitly defined this way as the onClick takes precedence when it and the href are both defined
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx
index 576812016dee8..d832eee22bb64 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/unified_timeline_body.tsx
@@ -9,7 +9,7 @@ import type { ComponentProps, ReactElement } from 'react';
 import React, { useEffect, useState, useMemo } from 'react';
 import { RootDragDropProvider } from '@kbn/dom-drag-drop';
 import { isEmpty } from 'lodash';
-import { StyledTableFlexGroup, StyledTableFlexItem } from '../unified_components/styles';
+import { StyledTableFlexGroup, StyledUnifiedTableFlexItem } from '../unified_components/styles';
 import { UnifiedTimeline } from '../unified_components';
 import { defaultUdtHeaders } from '../unified_components/default_headers';
 import type { PaginationInputPaginated, TimelineItem } from '../../../../../common/search_strategy';
@@ -65,8 +65,11 @@ export const UnifiedTimelineBody = (props: UnifiedTimelineBodyProps) => {
 
   return (
     <StyledTableFlexGroup direction="column" gutterSize="s">
-      <StyledTableFlexItem grow={false}>{header}</StyledTableFlexItem>
-      <StyledTableFlexItem className="unifiedTimelineBody" data-test-subj="unifiedTimelineBody">
+      <StyledUnifiedTableFlexItem grow={false}>{header}</StyledUnifiedTableFlexItem>
+      <StyledUnifiedTableFlexItem
+        className="unifiedTimelineBody"
+        data-test-subj="unifiedTimelineBody"
+      >
         <RootDragDropProvider>
           <UnifiedTimeline
             columns={columnsHeader}
@@ -91,7 +94,7 @@ export const UnifiedTimelineBody = (props: UnifiedTimelineBodyProps) => {
             leadingControlColumns={leadingControlColumns}
           />
         </RootDragDropProvider>
-      </StyledTableFlexItem>
+      </StyledUnifiedTableFlexItem>
     </StyledTableFlexGroup>
   );
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/assistant/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/assistant/index.tsx
deleted file mode 100644
index a71b7c8231f59..0000000000000
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/assistant/index.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import styled from 'styled-components';
-import { Assistant } from '@kbn/elastic-assistant';
-import type { Dispatch, SetStateAction } from 'react';
-import React, { memo } from 'react';
-import { TIMELINE_CONVERSATION_TITLE } from '../../../../../assistant/content/conversations/translations';
-
-const AssistantTabContainer = styled.div`
-  overflow-y: auto;
-  width: 100%;
-`;
-
-const AssistantTab: React.FC<{
-  shouldRefocusPrompt: boolean;
-  setConversationTitle: Dispatch<SetStateAction<string>>;
-}> = memo(({ shouldRefocusPrompt, setConversationTitle }) => (
-  <AssistantTabContainer>
-    <Assistant
-      conversationTitle={TIMELINE_CONVERSATION_TITLE}
-      embeddedLayout
-      setConversationTitle={setConversationTitle}
-      shouldRefocusPrompt={shouldRefocusPrompt}
-    />
-  </AssistantTabContainer>
-));
-
-AssistantTab.displayName = 'AssistantTab';
-
-// eslint-disable-next-line import/no-default-export
-export { AssistantTab as default };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/eql/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/eql/index.tsx
index 0d6332ffe805c..60ae1682241c8 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/eql/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/eql/index.tsx
@@ -145,7 +145,6 @@ export const EqlTabContentComponent: React.FC<Props> = ({
     timerangeKind,
   });
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const { openFlyout } = useExpandableFlyoutApi();
   const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
     'securitySolutionNotesEnabled'
@@ -168,7 +167,7 @@ export const EqlTabContentComponent: React.FC<Props> = ({
   const onToggleShowNotes = useCallback(
     (eventId?: string) => {
       const indexName = selectedPatterns.join(',');
-      if (eventId && !expandableFlyoutDisabled && securitySolutionNotesEnabled) {
+      if (eventId && securitySolutionNotesEnabled) {
         openFlyout({
           right: {
             id: DocumentDetailsRightPanelKey,
@@ -205,7 +204,6 @@ export const EqlTabContentComponent: React.FC<Props> = ({
       }
     },
     [
-      expandableFlyoutDisabled,
       openFlyout,
       securitySolutionNotesEnabled,
       selectedPatterns,
@@ -285,31 +283,29 @@ export const EqlTabContentComponent: React.FC<Props> = ({
           </InPortal>
           {NotesFlyoutMemo}
           <FullWidthFlexGroup>
-            <ScrollableFlexItem grow={2}>
-              <UnifiedTimelineBody
-                header={unifiedHeader}
-                columns={augmentedColumnHeaders}
-                isSortEnabled={false}
-                rowRenderers={rowRenderers}
-                timelineId={timelineId}
-                itemsPerPage={itemsPerPage}
-                itemsPerPageOptions={itemsPerPageOptions}
-                sort={TIMELINE_NO_SORTING}
-                events={events}
-                refetch={refetch}
-                dataLoadingState={dataLoadingState}
-                totalCount={isBlankTimeline ? 0 : totalCount}
-                onEventClosed={onEventClosed}
-                expandedDetail={expandedDetail}
-                showExpandedDetails={showExpandedDetails}
-                onChangePage={loadPage}
-                activeTab={activeTab}
-                updatedAt={refreshedAt}
-                isTextBasedQuery={false}
-                pageInfo={pageInfo}
-                leadingControlColumns={leadingControlColumns as EuiDataGridControlColumn[]}
-              />
-            </ScrollableFlexItem>
+            <UnifiedTimelineBody
+              header={unifiedHeader}
+              columns={augmentedColumnHeaders}
+              isSortEnabled={false}
+              rowRenderers={rowRenderers}
+              timelineId={timelineId}
+              itemsPerPage={itemsPerPage}
+              itemsPerPageOptions={itemsPerPageOptions}
+              sort={TIMELINE_NO_SORTING}
+              events={events}
+              refetch={refetch}
+              dataLoadingState={dataLoadingState}
+              totalCount={isBlankTimeline ? 0 : totalCount}
+              onEventClosed={onEventClosed}
+              expandedDetail={expandedDetail}
+              showExpandedDetails={showExpandedDetails}
+              onChangePage={loadPage}
+              activeTab={activeTab}
+              updatedAt={refreshedAt}
+              isTextBasedQuery={false}
+              pageInfo={pageInfo}
+              leadingControlColumns={leadingControlColumns as EuiDataGridControlColumn[]}
+            />
           </FullWidthFlexGroup>
         </>
       ) : (
@@ -325,14 +321,9 @@ export const EqlTabContentComponent: React.FC<Props> = ({
             loading={isQueryLoading}
             refetch={refetch}
           />
-          <FullWidthFlexGroup>
-            <ScrollableFlexItem grow={2}>
-              <EqlTabHeader
-                activeTab={activeTab}
-                setTimelineFullScreen={setTimelineFullScreen}
-                timelineFullScreen={timelineFullScreen}
-                timelineId={timelineId}
-              />
+          <FullWidthFlexGroup gutterSize="s" direction="column">
+            <ScrollableFlexItem grow={false}>{unifiedHeader}</ScrollableFlexItem>
+            <ScrollableFlexItem grow={true}>
               <EventDetailsWidthProvider>
                 <StyledEuiFlyoutBody
                   data-test-subj={`${TimelineTabs.eql}-tab-flyout-body`}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/esql/utils/index.ts b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/esql/utils/index.ts
index 1f908f5a5fe6f..fa7da2f1ac6f6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/esql/utils/index.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/esql/utils/index.ts
@@ -24,8 +24,6 @@ export const savedSearchComparator = (
 
   const keysToSelect = [
     'columns',
-    'grid',
-    'hideChart',
     'sort',
     'timeRange',
     'fields.filter',
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/index.tsx
index 643a5b54be415..7f5ab6f316a62 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/index.tsx
@@ -6,17 +6,13 @@
  */
 
 import { EuiBadge, EuiSkeletonText, EuiTabs, EuiTab } from '@elastic/eui';
-import { css } from '@emotion/react';
 import { isEmpty } from 'lodash/fp';
-import type { Ref, ReactElement, ComponentType, Dispatch, SetStateAction } from 'react';
-import React, { lazy, memo, Suspense, useCallback, useEffect, useMemo, useState } from 'react';
+import type { Ref, ReactElement, ComponentType } from 'react';
+import React, { lazy, memo, Suspense, useCallback, useEffect, useMemo } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 import { useEsqlAvailability } from '../../../../common/hooks/esql/use_esql_availability';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
-import { useAssistantTelemetry } from '../../../../assistant/use_assistant_telemetry';
-import { useAssistantAvailability } from '../../../../assistant/use_assistant_availability';
 import type { SessionViewConfig } from '../../../../../common/types';
 import type { RowRenderer, TimelineId } from '../../../../../common/types/timeline';
 import { TimelineTabs } from '../../../../../common/types/timeline';
@@ -41,7 +37,6 @@ import {
 } from './selectors';
 import * as i18n from './translations';
 import { useLicense } from '../../../../common/hooks/use_license';
-import { TIMELINE_CONVERSATION_TITLE } from '../../../../assistant/content/conversations/translations';
 import { initializeTimelineSettings } from '../../../store/actions';
 import { selectTimelineESQLSavedSearchId } from '../../../store/selectors';
 
@@ -96,7 +91,6 @@ interface BasicTimelineTab {
 type ActiveTimelineTabProps = BasicTimelineTab & {
   activeTimelineTab: TimelineTabs;
   showTimeline: boolean;
-  setConversationTitle: Dispatch<SetStateAction<string>>;
 };
 
 const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
@@ -106,10 +100,8 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
     rowRenderers,
     timelineId,
     timelineType,
-    setConversationTitle,
     showTimeline,
   }) => {
-    const { hasAssistantPrivilege } = useAssistantAvailability();
     const { isTimelineEsqlEnabledByFeatureFlag, isEsqlAdvancedSettingEnabled } =
       useEsqlAvailability();
     const timelineESQLSavedSearch = useShallowEqualSelector((state) =>
@@ -124,7 +116,6 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
       }
       return isEsqlAdvancedSettingEnabled || timelineESQLSavedSearch != null;
     }, [isEsqlAdvancedSettingEnabled, isTimelineEsqlEnabledByFeatureFlag, timelineESQLSavedSearch]);
-    const aiAssistantFlyoutMode = useIsExperimentalFeatureEnabled('aiAssistantFlyoutMode');
     const getTab = useCallback(
       (tab: TimelineTabs) => {
         switch (tab) {
@@ -147,33 +138,6 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
       [activeTimelineTab]
     );
 
-    const getAssistantTab = useCallback(() => {
-      if (showTimeline) {
-        const AssistantTab = tabWithSuspense(lazy(() => import('./assistant')));
-        return (
-          <HideShowContainer
-            $isVisible={activeTimelineTab === TimelineTabs.securityAssistant}
-            isOverflowYScroll={activeTimelineTab === TimelineTabs.securityAssistant}
-            data-test-subj={`timeline-tab-content-security-assistant`}
-            css={css`
-              overflow: hidden !important;
-            `}
-          >
-            {activeTimelineTab === TimelineTabs.securityAssistant ? (
-              <AssistantTab
-                setConversationTitle={setConversationTitle}
-                shouldRefocusPrompt={
-                  showTimeline && activeTimelineTab === TimelineTabs.securityAssistant
-                }
-              />
-            ) : null}
-          </HideShowContainer>
-        );
-      } else {
-        return null;
-      }
-    }, [activeTimelineTab, setConversationTitle, showTimeline]);
-
     /* Future developer -> why are we doing that
      * It is really expansive to re-render the QueryTab because the drag/drop
      * Therefore, we are only hiding its dom when switching to another tab
@@ -228,7 +192,6 @@ const ActiveTimelineTab = memo<ActiveTimelineTabProps>(
         >
           {isGraphOrNotesTabs && getTab(activeTimelineTab)}
         </HideShowContainer>
-        {hasAssistantPrivilege && !aiAssistantFlyoutMode ? getAssistantTab() : null}
       </>
     );
   }
@@ -271,8 +234,6 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
   sessionViewConfig,
   timelineDescription,
 }) => {
-  const aiAssistantFlyoutMode = useIsExperimentalFeatureEnabled('aiAssistantFlyoutMode');
-  const { hasAssistantPrivilege } = useAssistantAvailability();
   const dispatch = useDispatch();
   const getActiveTab = useMemo(() => getActiveTabSelector(), []);
   const getShowTimeline = useMemo(() => getShowTimelineSelector(), []);
@@ -312,9 +273,6 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
 
   const isEnterprisePlus = useLicense().isEnterprise();
 
-  const [conversationTitle, setConversationTitle] = useState<string>(TIMELINE_CONVERSATION_TITLE);
-  const { reportAssistantInvoked } = useAssistantTelemetry();
-
   const allTimelineNoteIds = useMemo(() => {
     const eventNoteIds = Object.values(eventIdToNoteIds).reduce<string[]>(
       (acc, v) => [...acc, ...v],
@@ -361,16 +319,6 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
     setActiveTab(TimelineTabs.session);
   }, [setActiveTab]);
 
-  const setSecurityAssistantAsActiveTab = useCallback(() => {
-    setActiveTab(TimelineTabs.securityAssistant);
-    if (activeTab !== TimelineTabs.securityAssistant) {
-      reportAssistantInvoked({
-        conversationId: conversationTitle,
-        invokedBy: TIMELINE_CONVERSATION_TITLE,
-      });
-    }
-  }, [activeTab, conversationTitle, reportAssistantInvoked, setActiveTab]);
-
   const setEsqlAsActiveTab = useCallback(() => {
     dispatch(
       initializeTimelineSettings({
@@ -471,17 +419,6 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
               </div>
             )}
           </StyledEuiTab>
-          {hasAssistantPrivilege && !aiAssistantFlyoutMode && (
-            <StyledEuiTab
-              data-test-subj={`timelineTabs-${TimelineTabs.securityAssistant}`}
-              onClick={setSecurityAssistantAsActiveTab}
-              disabled={timelineType === TimelineType.template}
-              isSelected={activeTab === TimelineTabs.securityAssistant}
-              key={TimelineTabs.securityAssistant}
-            >
-              <span>{i18n.SECURITY_ASSISTANT}</span>
-            </StyledEuiTab>
-          )}
         </StyledEuiTabs>
       )}
 
@@ -492,7 +429,6 @@ const TabsContentComponent: React.FC<BasicTimelineTab> = ({
         timelineId={timelineId}
         timelineType={timelineType}
         timelineDescription={timelineDescription}
-        setConversationTitle={setConversationTitle}
         showTimeline={showTimeline}
       />
     </>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx
index 76db7bcde9afe..5b29c180ab9e3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/pinned/index.tsx
@@ -181,7 +181,6 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
       timerangeKind: undefined,
     });
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const { openFlyout } = useExpandableFlyoutApi();
   const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
     'securitySolutionNotesEnabled'
@@ -204,7 +203,7 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
   const onToggleShowNotes = useCallback(
     (eventId?: string) => {
       const indexName = selectedPatterns.join(',');
-      if (eventId && !expandableFlyoutDisabled && securitySolutionNotesEnabled) {
+      if (eventId && securitySolutionNotesEnabled) {
         openFlyout({
           right: {
             id: DocumentDetailsRightPanelKey,
@@ -241,7 +240,6 @@ export const PinnedTabContentComponent: React.FC<Props> = ({
       }
     },
     [
-      expandableFlyoutDisabled,
       openFlyout,
       securitySolutionNotesEnabled,
       selectedPatterns,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx
index 017031e1ffba6..73c7c91708c6d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/index.tsx
@@ -211,7 +211,6 @@ export const QueryTabContentComponent: React.FC<Props> = ({
     timerangeKind,
   });
 
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
   const { openFlyout } = useExpandableFlyoutApi();
   const securitySolutionNotesEnabled = useIsExperimentalFeatureEnabled(
     'securitySolutionNotesEnabled'
@@ -234,7 +233,7 @@ export const QueryTabContentComponent: React.FC<Props> = ({
   const onToggleShowNotes = useCallback(
     (eventId?: string) => {
       const indexName = selectedPatterns.join(',');
-      if (eventId && !expandableFlyoutDisabled && securitySolutionNotesEnabled) {
+      if (eventId && securitySolutionNotesEnabled) {
         openFlyout({
           right: {
             id: DocumentDetailsRightPanelKey,
@@ -271,7 +270,6 @@ export const QueryTabContentComponent: React.FC<Props> = ({
       }
     },
     [
-      expandableFlyoutDisabled,
       openFlyout,
       securitySolutionNotesEnabled,
       selectedPatterns,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/query_tab_unified_components.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/query_tab_unified_components.test.tsx
index 9a712a8fbeaf1..20d38f9d047cc 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/query_tab_unified_components.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/query/query_tab_unified_components.test.tsx
@@ -776,332 +776,148 @@ describe('query tab with unified timeline', () => {
 
   describe('Leading actions - notes', () => {
     describe('securitySolutionNotesEnabled = true', () => {
-      describe('expandableFlyoutDisabled = false', () => {
-        beforeEach(() => {
-          (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
-            jest.fn((feature: keyof ExperimentalFeatures) => {
-              if (feature === 'unifiedComponentsInTimelineEnabled') {
-                return true;
-              }
-              if (feature === 'securitySolutionNotesEnabled') {
-                return true;
-              }
-              return allowedExperimentalValues[feature];
-            })
-          );
-        });
-
-        it(
-          'should have the notification dot & correct tooltip',
-          async () => {
-            renderTestComponents();
-
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
-            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-
-            expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
-
-            fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
-                '1 Note available. Click to view it & add more.'
-              );
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-        it(
-          'should be able to add notes through expandable flyout',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
-
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(mockOpenFlyout).toHaveBeenCalled();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
+      beforeEach(() => {
+        (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
+          jest.fn((feature: keyof ExperimentalFeatures) => {
+            if (feature === 'unifiedComponentsInTimelineEnabled') {
+              return true;
+            }
+            if (feature === 'securitySolutionNotesEnabled') {
+              return true;
+            }
+            return allowedExperimentalValues[feature];
+          })
         );
       });
 
-      describe('expandableFlyoutDisabled = true', () => {
-        beforeEach(() => {
-          (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
-            jest.fn((feature: keyof ExperimentalFeatures) => {
-              if (feature === 'unifiedComponentsInTimelineEnabled') {
-                return true;
-              }
-              if (feature === 'expandableFlyoutDisabled') {
-                return true;
-              }
-              if (feature === 'securitySolutionNotesEnabled') {
-                return true;
-              }
-              return allowedExperimentalValues[feature];
-            })
-          );
-        });
-
-        it(
-          'should have the notification dot & correct tooltip',
-          async () => {
-            renderTestComponents();
-
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
-            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-
-            expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
-
-            fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
-                '1 Note available. Click to view it & add more.'
-              );
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-        it(
-          'should be able to add notes using EuiFlyout',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
-
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
+      it(
+        'should have the notification dot & correct tooltip',
+        async () => {
+          renderTestComponents();
 
-        it(
-          'should be cancel adding notes',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+          expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
 
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
+          expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
+          expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
 
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
+          expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
 
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
+          fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
 
-            userEvent.type(screen.getByTestId('euiMarkdownEditorTextArea'), 'Test Note 1');
+          await waitFor(() => {
+            expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
+            expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
+              '1 Note available. Click to view it & add more.'
+            );
+          });
+        },
+        SPECIAL_TEST_TIMEOUT
+      );
+      it(
+        'should be able to add notes through expandable flyout',
+        async () => {
+          renderTestComponents();
+          expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
 
-            expect(screen.getByTestId('cancel')).not.toBeDisabled();
+          await waitFor(() => {
+            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
+          });
 
-            fireEvent.click(screen.getByTestId('cancel'));
+          fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
 
-            await waitFor(() => {
-              expect(screen.queryByTestId('add-note-container')).not.toBeInTheDocument();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-      });
+          await waitFor(() => {
+            expect(mockOpenFlyout).toHaveBeenCalled();
+          });
+        },
+        SPECIAL_TEST_TIMEOUT
+      );
     });
 
     describe('securitySolutionNotesEnabled = false', () => {
-      describe('expandableFlyoutDisabled = false', () => {
-        beforeEach(() => {
-          (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
-            jest.fn((feature: keyof ExperimentalFeatures) => {
-              if (feature === 'unifiedComponentsInTimelineEnabled') {
-                return true;
-              }
-              if (feature === 'securitySolutionNotesEnabled') {
-                return false;
-              }
-              return allowedExperimentalValues[feature];
-            })
-          );
-        });
-
-        it(
-          'should have the notification dot & correct tooltip',
-          async () => {
-            renderTestComponents();
-
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
-            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-
-            expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
-
-            fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
-                '1 Note available. Click to view it & add more.'
-              );
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-        it(
-          'should be able to add notes using EuiFlyout',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
-
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-
-        it(
-          'should be cancel adding notes',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
-
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
-
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
-
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
-
-            userEvent.type(screen.getByTestId('euiMarkdownEditorTextArea'), 'Test Note 1');
-
-            expect(screen.getByTestId('cancel')).not.toBeDisabled();
-
-            fireEvent.click(screen.getByTestId('cancel'));
-
-            await waitFor(() => {
-              expect(screen.queryByTestId('add-note-container')).not.toBeInTheDocument();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
+      beforeEach(() => {
+        (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
+          jest.fn((feature: keyof ExperimentalFeatures) => {
+            if (feature === 'unifiedComponentsInTimelineEnabled') {
+              return true;
+            }
+            if (feature === 'securitySolutionNotesEnabled') {
+              return false;
+            }
+            return allowedExperimentalValues[feature];
+          })
         );
       });
 
-      describe('expandableFlyoutDisabled = true', () => {
-        beforeEach(() => {
-          (useIsExperimentalFeatureEnabled as jest.Mock).mockImplementation(
-            jest.fn((feature: keyof ExperimentalFeatures) => {
-              if (feature === 'unifiedComponentsInTimelineEnabled') {
-                return true;
-              }
-              if (feature === 'expandableFlyoutDisabled') {
-                return true;
-              }
-              if (feature === 'securitySolutionNotesEnabled') {
-                return true;
-              }
-              return allowedExperimentalValues[feature];
-            })
-          );
-        });
-
-        it(
-          'should have the notification dot & correct tooltip',
-          async () => {
-            renderTestComponents();
+      it(
+        'should have the notification dot & correct tooltip',
+        async () => {
+          renderTestComponents();
 
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+          expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
 
-            expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
-            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
+          expect(screen.getAllByTestId('timeline-notes-button-small')).toHaveLength(1);
+          expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
 
-            expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
+          expect(screen.getByTestId('timeline-notes-notification-dot')).toBeVisible();
 
-            fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
+          fireEvent.mouseOver(screen.getByTestId('timeline-notes-button-small'));
 
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
-              expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
-                '1 Note available. Click to view it & add more.'
-              );
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-        it(
-          'should be able to add notes using EuiFlyout',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+          await waitFor(() => {
+            expect(screen.getByTestId('timeline-notes-tool-tip')).toBeVisible();
+            expect(screen.getByTestId('timeline-notes-tool-tip')).toHaveTextContent(
+              '1 Note available. Click to view it & add more.'
+            );
+          });
+        },
+        SPECIAL_TEST_TIMEOUT
+      );
+      it(
+        'should be able to add notes using EuiFlyout',
+        async () => {
+          renderTestComponents();
+          expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
 
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
+          await waitFor(() => {
+            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
+          });
 
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
+          fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
 
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
+          await waitFor(() => {
+            expect(screen.getByTestId('add-note-container')).toBeVisible();
+          });
+        },
+        SPECIAL_TEST_TIMEOUT
+      );
 
-        it(
-          'should be cancel adding notes',
-          async () => {
-            renderTestComponents();
-            expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
+      it(
+        'should be cancel adding notes',
+        async () => {
+          renderTestComponents();
+          expect(await screen.findByTestId('discoverDocTable')).toBeVisible();
 
-            await waitFor(() => {
-              expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
-            });
+          await waitFor(() => {
+            expect(screen.getByTestId('timeline-notes-button-small')).not.toBeDisabled();
+          });
 
-            fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
+          fireEvent.click(screen.getByTestId('timeline-notes-button-small'));
 
-            await waitFor(() => {
-              expect(screen.getByTestId('add-note-container')).toBeVisible();
-            });
+          await waitFor(() => {
+            expect(screen.getByTestId('add-note-container')).toBeVisible();
+          });
 
-            userEvent.type(screen.getByTestId('euiMarkdownEditorTextArea'), 'Test Note 1');
+          userEvent.type(screen.getByTestId('euiMarkdownEditorTextArea'), 'Test Note 1');
 
-            expect(screen.getByTestId('cancel')).not.toBeDisabled();
+          expect(screen.getByTestId('cancel')).not.toBeDisabled();
 
-            fireEvent.click(screen.getByTestId('cancel'));
+          fireEvent.click(screen.getByTestId('cancel'));
 
-            await waitFor(() => {
-              expect(screen.queryByTestId('add-note-container')).not.toBeInTheDocument();
-            });
-          },
-          SPECIAL_TEST_TIMEOUT
-        );
-      });
+          await waitFor(() => {
+            expect(screen.queryByTestId('add-note-container')).not.toBeInTheDocument();
+          });
+        },
+        SPECIAL_TEST_TIMEOUT
+      );
     });
   });
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/__snapshots__/use_timeline_columns.test.ts.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/__snapshots__/use_timeline_columns.test.ts.snap
index 709438a5fcb74..3c09d847e8797 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/__snapshots__/use_timeline_columns.test.ts.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/__snapshots__/use_timeline_columns.test.ts.snap
@@ -10,11 +10,6 @@ Array [
     ],
     "format": "",
     "id": "@timestamp",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 190,
     "name": "@timestamp",
     "readFromDocValues": true,
@@ -29,11 +24,6 @@ Array [
     ],
     "format": "string",
     "id": "message",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 180,
     "name": "message",
     "searchable": true,
@@ -47,17 +37,6 @@ Array [
     ],
     "format": "string",
     "id": "event.category",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "initialWidth": 180,
     "name": "event.category",
     "searchable": true,
@@ -71,17 +50,6 @@ Array [
     ],
     "format": "string",
     "id": "event.action",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "initialWidth": 180,
     "name": "event.action",
     "searchable": true,
@@ -95,17 +63,6 @@ Array [
     ],
     "format": "string",
     "id": "host.name",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "initialWidth": 180,
     "name": "host.name",
     "searchable": true,
@@ -119,11 +76,6 @@ Array [
     ],
     "format": "",
     "id": "source.ip",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 180,
     "name": "source.ip",
     "searchable": true,
@@ -137,11 +89,6 @@ Array [
     ],
     "format": "",
     "id": "destination.ip",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 180,
     "name": "destination.ip",
     "searchable": true,
@@ -155,11 +102,6 @@ Array [
     ],
     "format": "string",
     "id": "user.name",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 180,
     "name": "user.name",
     "searchable": true,
@@ -178,11 +120,6 @@ Array [
     ],
     "format": "",
     "id": "@timestamp",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 215,
     "name": "@timestamp",
     "readFromDocValues": true,
@@ -197,11 +134,6 @@ Array [
     ],
     "format": "string",
     "id": "message",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 360,
     "name": "message",
     "searchable": true,
@@ -215,17 +147,6 @@ Array [
     ],
     "format": "string",
     "id": "event.category",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "name": "event.category",
     "searchable": true,
     "type": "string",
@@ -238,17 +159,6 @@ Array [
     ],
     "format": "string",
     "id": "event.action",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "name": "event.action",
     "searchable": true,
     "type": "string",
@@ -261,17 +171,6 @@ Array [
     ],
     "format": "string",
     "id": "host.name",
-    "indexes": Array [
-      "apm-*-transaction*",
-      "auditbeat-*",
-      "endgame-*",
-      "filebeat-*",
-      "logs-*",
-      "packetbeat-*",
-      "traces-apm*",
-      "winlogbeat-*",
-      "-*elastic-cloud-logs-*",
-    ],
     "name": "host.name",
     "searchable": true,
     "type": "string",
@@ -284,11 +183,6 @@ Array [
     ],
     "format": "",
     "id": "source.ip",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "name": "source.ip",
     "searchable": true,
     "type": "ip",
@@ -301,11 +195,6 @@ Array [
     ],
     "format": "",
     "id": "destination.ip",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "name": "destination.ip",
     "searchable": true,
     "type": "ip",
@@ -318,11 +207,6 @@ Array [
     ],
     "format": "string",
     "id": "user.name",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "name": "user.name",
     "searchable": true,
     "type": "string",
@@ -340,11 +224,6 @@ Array [
     ],
     "format": "",
     "id": "source.ip",
-    "indexes": Array [
-      "auditbeat",
-      "filebeat",
-      "packetbeat",
-    ],
     "initialWidth": 150,
     "name": "source.ip",
     "searchable": true,
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/layout.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/layout.tsx
index f3a8981e70ad2..aacb38ea2e798 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/layout.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/tabs/shared/layout.tsx
@@ -16,7 +16,6 @@ import {
 import styled from 'styled-components';
 
 export const TabHeaderContainer = styled.div`
-  margin-top: ${(props) => props.theme.eui.euiSizeS};
   width: 100%;
 `;
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/__snapshots__/custom_timeline_data_grid_body.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/__snapshots__/custom_timeline_data_grid_body.test.tsx.snap
index 4e220a4d2db51..eaac9cb5dada6 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/__snapshots__/custom_timeline_data_grid_body.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/__snapshots__/custom_timeline_data_grid_body.test.tsx.snap
@@ -9,8 +9,8 @@ exports[`CustomTimelineDataGridBody should render exactly as snapshots 1`] = `
 }
 
 .c0 . euiDataGridRowCell--controlColumn {
-  height: 40px;
-  min-height: 40px;
+  height: auto;
+  min-height: 34px;
 }
 
 .c0 .udt--customRow {
@@ -32,50 +32,22 @@ exports[`CustomTimelineDataGridBody should render exactly as snapshots 1`] = `
 }
 
 .c1 {
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-align-items: center;
-  -webkit-box-align: center;
-  -ms-flex-align: center;
-  align-items: center;
-  height: 40px;
+  height: auto;
 }
 
 .c1 .euiDataGridRowCell,
 .c1 .euiDataGridRowCell__content {
-  -webkit-align-items: flex-start;
-  -webkit-box-align: flex-start;
-  -ms-flex-align: flex-start;
-  align-items: flex-start;
-  display: -webkit-box;
-  display: -webkit-flex;
-  display: -ms-flexbox;
-  display: flex;
-  -webkit-flex-direction: column;
-  -ms-flex-direction: column;
-  flex-direction: column;
-  -webkit-box-pack: center;
-  -webkit-justify-content: center;
-  -ms-flex-pack: center;
-  justify-content: center;
-  height: 100%;
-  min-height: 40px;
+  min-height: 34px;
 }
 
 .c1 .euiDataGridRowCell .unifiedDataTable__rowControl,
 .c1 .euiDataGridRowCell__content .unifiedDataTable__rowControl {
-  margin-top: 0;
-}
-
-.c1 .euiDataGridRowCell--controlColumn .euiDataGridRowCell__content {
-  padding: 0;
+  margin-top: -4px;
 }
 
 <div>
   <div
-    class="c0 euiDataGridRow--striped euiDataGridRow euiDataGridRow--striped"
+    class="c0 euiDataGridRow "
     role="row"
   >
     <div
@@ -97,7 +69,7 @@ exports[`CustomTimelineDataGridBody should render exactly as snapshots 1`] = `
     </div>
   </div>
   <div
-    class="c0 euiDataGridRow "
+    class="c0 euiDataGridRow--striped euiDataGridRow euiDataGridRow--striped"
     role="row"
   >
     <div
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/custom_timeline_data_grid_body.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/custom_timeline_data_grid_body.tsx
index fd8d3a9011f3d..284452074a82a 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/custom_timeline_data_grid_body.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/custom_timeline_data_grid_body.tsx
@@ -25,7 +25,7 @@ export type CustomTimelineDataGridBodyProps = EuiDataGridCustomBodyProps & {
 };
 
 // THE DataGrid Row default is 34px, but we make ours 40 to account for our row actions
-const DEFAULT_UDT_ROW_HEIGHT = 40;
+const DEFAULT_UDT_ROW_HEIGHT = 34;
 
 /**
  *
@@ -117,24 +117,14 @@ const CustomGridRowCellWrapper = styled.div.attrs<{
   className: `rowCellWrapper ${props.className ?? ''}`,
   role: 'row',
 }))`
-  display: flex;
-  align-items: center;
   height: ${(props: { $cssRowHeight: string }) => props.$cssRowHeight};
   .euiDataGridRowCell,
   .euiDataGridRowCell__content {
-    align-items: flex-start;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    height: 100%;
     min-height: ${DEFAULT_UDT_ROW_HEIGHT}px;
     .unifiedDataTable__rowControl {
-      margin-top: 0;
+      margin-top: -4px;
     }
   }
-  .euiDataGridRowCell--controlColumn .euiDataGridRowCell__content {
-    padding: 0;
-  }
 `;
 
 type CustomTimelineDataGridSingleRowProps = {
@@ -176,7 +166,7 @@ const CustomDataGridSingleRow = memo(function CustomDataGridSingleRow(
     rowRenderers: enabledRowRenderers,
   });
 
-  const cssRowHeight: string = calculateRowHeightInPixels(rowHeightMultiple);
+  const cssRowHeight: string = calculateRowHeightInPixels(rowHeightMultiple - 1);
   /**
    * removes the border between the actual row ( timelineEvent) and `TimelineEventDetail` row
    * which renders the row-renderer, notes and notes editor
@@ -195,7 +185,7 @@ const CustomDataGridSingleRow = memo(function CustomDataGridSingleRow(
 
   return (
     <CustomGridRow
-      className={`${rowIndex % 2 === 0 ? 'euiDataGridRow--striped' : ''}`}
+      className={`${rowIndex % 2 !== 0 ? 'euiDataGridRow--striped' : ''}`}
       $cssRowHeight={cssRowHeight}
       key={rowIndex}
     >
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
index 52cc643cbf2e4..b9807e08572b4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.test.tsx
@@ -36,7 +36,6 @@ const onChangePageMock = jest.fn();
 
 const openFlyoutMock = jest.fn();
 const closeFlyoutMock = jest.fn();
-const isExpandableFlyoutDisabled = false;
 
 jest.mock('../hooks/use_unified_timeline_expandable_flyout');
 
@@ -99,7 +98,6 @@ describe('unified data table', () => {
   beforeEach(() => {
     (useSourcererDataView as jest.Mock).mockReturnValue(mockSourcererScope);
     (useUnifiedTableExpandableFlyout as jest.Mock).mockReturnValue({
-      isExpandableFlyoutDisabled,
       openFlyout: openFlyoutMock,
       closeFlyout: closeFlyoutMock,
     });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
index e1ecabcc06c9a..e4433a0fd56a1 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/data_table/index.tsx
@@ -19,7 +19,7 @@ import { RowRendererCount } from '../../../../../../common/api/timeline';
 import { EmptyComponent } from '../../../../../common/lib/cell_actions/helpers';
 import { withDataView } from '../../../../../common/components/with_data_view';
 import { StatefulEventContext } from '../../../../../common/components/events_viewer/stateful_event_context';
-import type { ExpandedDetailTimeline, ExpandedDetailType } from '../../../../../../common/types';
+import type { ExpandedDetailTimeline } from '../../../../../../common/types';
 import type { TimelineItem } from '../../../../../../common/search_strategy';
 import { useKibana } from '../../../../../common/lib/kibana';
 import type {
@@ -29,12 +29,7 @@ import type {
   ToggleDetailPanel,
   TimelineTabs,
 } from '../../../../../../common/types/timeline';
-import { TimelineId } from '../../../../../../common/types/timeline';
 import type { State, inputsModel } from '../../../../../common/store';
-import { SourcererScopeName } from '../../../../../sourcerer/store/model';
-import { useSourcererDataView } from '../../../../../sourcerer/containers';
-import { activeTimeline } from '../../../../containers/active_timeline_context';
-import { DetailsPanel } from '../../../side_panel';
 import { SecurityCellActionsTrigger } from '../../../../../app/actions/constants';
 import { getFormattedFields } from '../../body/renderers/formatted_field_udt';
 import ToolbarAdditionalControls from './toolbar_additional_controls';
@@ -147,13 +142,9 @@ export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
       setExpandedDoc((prev) => (!prev ? prev : undefined));
     }, []);
 
-    const { openFlyout, closeFlyout, isExpandableFlyoutDisabled } = useUnifiedTableExpandableFlyout(
-      {
-        onClose: onCloseExpandableFlyout,
-      }
-    );
-
-    const { browserFields, runtimeMappings } = useSourcererDataView(SourcererScopeName.timeline);
+    const { openFlyout, closeFlyout } = useUnifiedTableExpandableFlyout({
+      onClose: onCloseExpandableFlyout,
+    });
 
     const showTimeCol = useMemo(() => !!dataView && !!dataView.timeFieldName, [dataView]);
 
@@ -168,57 +159,24 @@ export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
 
     const handleOnEventDetailPanelOpened = useCallback(
       (eventData: DataTableRecord & TimelineItem) => {
-        const updatedExpandedDetail: ExpandedDetailType = {
-          panelView: 'eventDetail',
-          params: {
-            eventId: eventData._id,
-            indexName: eventData.ecs._index ?? '', // TODO: fix type error
-            refetch,
-          },
-        };
-
-        if (!isExpandableFlyoutDisabled) {
-          openFlyout({
-            right: {
-              id: DocumentDetailsRightPanelKey,
-              params: {
-                id: eventData._id,
-                indexName: eventData.ecs._index ?? '',
-                scopeId: timelineId,
-              },
+        openFlyout({
+          right: {
+            id: DocumentDetailsRightPanelKey,
+            params: {
+              id: eventData._id,
+              indexName: eventData.ecs._index ?? '',
+              scopeId: timelineId,
             },
-          });
-          telemetry.reportDetailsFlyoutOpened({
-            location: timelineId,
-            panel: 'right',
-          });
-        } else {
-          dispatch(
-            timelineActions.toggleDetailPanel({
-              ...updatedExpandedDetail,
-              tabType: activeTab,
-              id: timelineId,
-            })
-          );
-        }
-
-        activeTimeline.toggleExpandedDetail({ ...updatedExpandedDetail });
+          },
+        });
+        telemetry.reportDetailsFlyoutOpened({
+          location: timelineId,
+          panel: 'right',
+        });
       },
-      [refetch, isExpandableFlyoutDisabled, openFlyout, timelineId, telemetry, dispatch, activeTab]
+      [openFlyout, timelineId, telemetry]
     );
 
-    const onTimelineLegacyFlyoutClose = useCallback(() => {
-      if (
-        expandedDetail[activeTab]?.panelView &&
-        timelineId === TimelineId.active &&
-        showExpandedDetails
-      ) {
-        activeTimeline.toggleExpandedDetail({});
-      }
-      setExpandedDoc(undefined);
-      onEventClosed({ tabType: activeTab, id: timelineId });
-    }, [expandedDetail, activeTab, timelineId, showExpandedDetails, onEventClosed]);
-
     const onSetExpandedDoc = useCallback(
       (newDoc?: DataTableRecord) => {
         if (newDoc) {
@@ -228,20 +186,10 @@ export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
             handleOnEventDetailPanelOpened(timelineDoc);
           }
         } else {
-          if (!isExpandableFlyoutDisabled) {
-            closeFlyout();
-            return;
-          }
-          onTimelineLegacyFlyoutClose();
+          closeFlyout();
         }
       },
-      [
-        tableRows,
-        handleOnEventDetailPanelOpened,
-        onTimelineLegacyFlyoutClose,
-        closeFlyout,
-        isExpandableFlyoutDisabled,
-      ]
+      [tableRows, handleOnEventDetailPanelOpened, closeFlyout]
     );
 
     const onColumnResize = useCallback(
@@ -393,10 +341,11 @@ export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
           visibleRowData={visibleRowData}
           setCustomGridBodyProps={setCustomGridBodyProps}
           enabledRowRenderers={enabledRowRenderers}
+          rowHeight={rowHeight}
           refetch={refetch}
         />
       ),
-      [tableRows, enabledRowRenderers, refetch]
+      [tableRows, enabledRowRenderers, rowHeight, refetch]
     );
 
     const cellContext: UnifiedTimelineDataGridCellContext = useMemo(() => {
@@ -467,16 +416,6 @@ export const TimelineDataTableComponent: React.FC<DataTableProps> = memo(
             externalControlColumns={leadingControlColumns}
             cellContext={cellContext}
           />
-          {showExpandedDetails && isExpandableFlyoutDisabled && (
-            <DetailsPanel
-              browserFields={browserFields}
-              handleOnPanelClosed={onTimelineLegacyFlyoutClose}
-              runtimeMappings={runtimeMappings}
-              tabType={activeTab}
-              scopeId={timelineId}
-              isFlyoutView
-            />
-          )}
         </StyledTimelineUnifiedDataTable>
       </StatefulEventContext.Provider>
     );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.test.tsx
index 54e227c79e86b..a1b89511de6c3 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.test.tsx
@@ -5,14 +5,12 @@
  * 2.0.
  */
 
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { renderHook } from '@testing-library/react-hooks';
 import { useUnifiedTableExpandableFlyout } from './use_unified_timeline_expandable_flyout';
 import { useLocation } from 'react-router-dom';
 import { URL_PARAM_KEY } from '../../../../../common/hooks/use_url_state';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 
-jest.mock('../../../../../common/hooks/use_experimental_features');
 jest.mock('@kbn/kibana-react-plugin/public');
 jest.mock('react-router-dom', () => {
   return {
@@ -24,60 +22,20 @@ jest.mock('@kbn/expandable-flyout');
 const onFlyoutCloseMock = jest.fn();
 
 describe('useUnifiedTimelineExpandableFlyout', () => {
-  it('should disable expandable flyout when expandableFlyoutDisabled flag is true', () => {
-    (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(true);
-    (useLocation as jest.Mock).mockReturnValue({
-      search: `?${URL_PARAM_KEY.timelineFlyout}=(test:value)`,
-    });
-    (useExpandableFlyoutApi as jest.Mock).mockReturnValue({
-      openFlyout: jest.fn(),
-      closeFlyout: jest.fn(),
-    });
-
-    const { result } = renderHook(() =>
-      useUnifiedTableExpandableFlyout({
-        onClose: onFlyoutCloseMock,
-      })
-    );
-
-    expect(result.current.isExpandableFlyoutDisabled).toBe(true);
-  });
-
   describe('when expandable flyout is enabled', () => {
     beforeEach(() => {
-      (useIsExperimentalFeatureEnabled as jest.Mock).mockReturnValue(false);
-    });
-
-    afterEach(() => {
-      jest.clearAllMocks();
-    });
-
-    it('should mark flyout as closed when location is empty', () => {
-      (useLocation as jest.Mock).mockReturnValue({
-        search: '',
+      (useExpandableFlyoutApi as jest.Mock).mockReturnValue({
+        openFlyout: jest.fn(),
+        closeFlyout: jest.fn(),
       });
 
-      const { result } = renderHook(() =>
-        useUnifiedTableExpandableFlyout({
-          onClose: onFlyoutCloseMock,
-        })
-      );
-
-      expect(result.current.isExpandableFlyoutDisabled).toBe(false);
-    });
-
-    it('should mark flyout as open when location has `timelineFlyout`', () => {
       (useLocation as jest.Mock).mockReturnValue({
         search: `${URL_PARAM_KEY.timelineFlyout}=(test:value)`,
       });
+    });
 
-      const { result } = renderHook(() =>
-        useUnifiedTableExpandableFlyout({
-          onClose: onFlyoutCloseMock,
-        })
-      );
-
-      expect(result.current.isExpandableFlyoutDisabled).toBe(false);
+    afterEach(() => {
+      jest.clearAllMocks();
     });
 
     it('should mark flyout as close when location has  empty `timelineFlyout`', () => {
@@ -87,8 +45,6 @@ describe('useUnifiedTimelineExpandableFlyout', () => {
         })
       );
 
-      expect(result.current.isExpandableFlyoutDisabled).toBe(false);
-
       (useLocation as jest.Mock).mockReturnValue({
         search: `${URL_PARAM_KEY.timelineFlyout}=()`,
       });
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.tsx
index 83050110eb090..fb28b6f44f367 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/hooks/use_unified_timeline_expandable_flyout.tsx
@@ -8,7 +8,6 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useExpandableFlyoutApi } from '@kbn/expandable-flyout';
 import { useLocation } from 'react-router-dom';
-import { useIsExperimentalFeatureEnabled } from '../../../../../common/hooks/use_experimental_features';
 import { URL_PARAM_KEY } from '../../../../../common/hooks/use_url_state';
 
 const EMPTY_TIMELINE_FLYOUT_SEARCH_PARAMS = '()';
@@ -20,8 +19,6 @@ interface UseUnifiedTableExpandableFlyoutArgs {
 export const useUnifiedTableExpandableFlyout = ({
   onClose,
 }: UseUnifiedTableExpandableFlyoutArgs) => {
-  const expandableFlyoutDisabled = useIsExperimentalFeatureEnabled('expandableFlyoutDisabled');
-
   const location = useLocation();
 
   const { openFlyout, closeFlyout } = useExpandableFlyoutApi();
@@ -33,7 +30,7 @@ export const useUnifiedTableExpandableFlyout = ({
 
   const isFlyoutOpen = useMemo(() => {
     /**
-     *  Currently, if new expanable flyout is closed, there is not way for
+     *  Currently, if new expandable flyout is closed, there is no way for
      *  consumer to trigger an effect `onClose` of flyout. So, we are using
      *  this hack to know if flyout is open or not.
      *
@@ -71,6 +68,5 @@ export const useUnifiedTableExpandableFlyout = ({
     isTimelineExpandableFlyoutOpen,
     openFlyout,
     closeFlyout: closeFlyoutWithEffect,
-    isExpandableFlyoutDisabled: expandableFlyoutDisabled,
   };
 };
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
index 78ab042155e7e..2d32767ea19c0 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/unified_components/styles.tsx
@@ -22,7 +22,7 @@ export const StyledTableFlexGroup = styled(EuiFlexGroup).attrs(({ className = ''
   }
 `;
 
-export const StyledTableFlexItem = styled(EuiFlexItem).attrs(({ className = '' }) => ({
+export const StyledUnifiedTableFlexItem = styled(EuiFlexItem).attrs(({ className = '' }) => ({
   className: `${className}`,
 }))`
   ${({ theme }) => `margin: 0 ${theme.eui.euiSizeM};`}
diff --git a/x-pack/plugins/security_solution/public/timelines/links.ts b/x-pack/plugins/security_solution/public/timelines/links.ts
index 97667c0ce8aa3..169ef6da01910 100644
--- a/x-pack/plugins/security_solution/public/timelines/links.ts
+++ b/x-pack/plugins/security_solution/public/timelines/links.ts
@@ -37,8 +37,6 @@ export const links: LinkItem = {
         defaultMessage: 'Visualize and delete notes.',
       }),
       path: `${TIMELINES_PATH}/notes`,
-      skipUrlState: true,
-      hideTimeline: true,
       experimentalKey: 'securitySolutionNotesEnabled',
     },
   ],
diff --git a/x-pack/plugins/security_solution/public/timelines/routes.tsx b/x-pack/plugins/security_solution/public/timelines/routes.tsx
index a7d6373007192..e7f28eb9d71e3 100644
--- a/x-pack/plugins/security_solution/public/timelines/routes.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/routes.tsx
@@ -5,39 +5,15 @@
  * 2.0.
  */
 
-import React, { memo } from 'react';
+import React from 'react';
 import { TrackApplicationView } from '@kbn/usage-collection-plugin/public';
 
-import { Switch } from 'react-router-dom';
-import { Route } from '@kbn/shared-ux-router';
-import { SpyRoute } from '../common/utils/route/spy_routes';
-import { NotFoundPage } from '../app/404';
-import { NoteManagementPage } from '../notes/pages/note_management_page';
 import { PluginTemplateWrapper } from '../common/components/plugin_template_wrapper';
 import { SecurityPageName } from '../app/types';
 import type { SecuritySubPluginRoutes } from '../app/types';
-import { NOTES_MANAGEMENT_PATH, TIMELINES_PATH } from '../../common/constants';
+import { TIMELINES_PATH } from '../../common/constants';
 import { Timelines } from './pages';
 
-const NoteManagementTelemetry = () => (
-  <PluginTemplateWrapper>
-    <TrackApplicationView viewId={SecurityPageName.notesManagement}>
-      <NoteManagementPage />
-      <SpyRoute pageName={SecurityPageName.notesManagement} />
-    </TrackApplicationView>
-  </PluginTemplateWrapper>
-);
-
-const NoteManagementContainer = memo(() => {
-  return (
-    <Switch>
-      <Route path={NOTES_MANAGEMENT_PATH} exact component={NoteManagementTelemetry} />
-      <Route component={NotFoundPage} />
-    </Switch>
-  );
-});
-NoteManagementContainer.displayName = 'NoteManagementContainer';
-
 const TimelinesRoutes = () => (
   <PluginTemplateWrapper>
     <TrackApplicationView viewId={SecurityPageName.timelines}>
@@ -51,8 +27,4 @@ export const routes: SecuritySubPluginRoutes = [
     path: TIMELINES_PATH,
     component: TimelinesRoutes,
   },
-  {
-    path: NOTES_MANAGEMENT_PATH,
-    component: NoteManagementContainer,
-  },
 ];
diff --git a/x-pack/plugins/security_solution/public/timelines/store/defaults.ts b/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
index 27ca80320ff06..8e78b5773b259 100644
--- a/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
+++ b/x-pack/plugins/security_solution/public/timelines/store/defaults.ts
@@ -101,7 +101,7 @@ export const timelineDefaults: SubsetTimelineModel &
   savedSearch: null,
   isDataProviderVisible: false,
   sampleSize: 500,
-  rowHeight: 3,
+  rowHeight: 1,
 };
 
 export const getTimelineManageDefaults = (id: string) => ({
diff --git a/x-pack/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts b/x-pack/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts
index e9d2f3ba52b24..ab75bc27fe5a3 100644
--- a/x-pack/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts
+++ b/x-pack/plugins/security_solution/scripts/run_cypress/parallel_serverless.ts
@@ -343,8 +343,7 @@ ${JSON.stringify(argv, null, 2)}
       const cypressConfigFilePath = require.resolve(`../../${argv.configFile}`) as string;
       const cypressConfigFile = await import(cypressConfigFilePath);
 
-      // if KIBANA_MKI_QUALITY_GATE exists and has a value, it means that we are running the tests against the second
-      // quality gate.
+      // if KIBANA_MKI_QUALITY_GATE exists and has a value, we are running the tests against the Kibana QA quality gate.
       if (process.env.KIBANA_MKI_QUALITY_GATE) {
         log.info(
           'KIBANA_MKI_QUALITY_GATE is provided, so @serverlessQA --@skipInServerless --@skipInServerlessMKI tags will run.'
diff --git a/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_retrieval_tool.ts b/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_retrieval_tool.ts
index 47cb35e244d51..7908d817e13ff 100644
--- a/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_retrieval_tool.ts
+++ b/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_retrieval_tool.ts
@@ -41,7 +41,9 @@ export const KNOWLEDGE_BASE_RETRIEVAL_TOOL: AssistantTool = {
         query: z.string().describe(`Summary of items/things to search for in the knowledge base`),
       }),
       func: async (input, _, cbManager) => {
-        logger.debug(`KnowledgeBaseRetrievalToolParams:input\n ${JSON.stringify(input, null, 2)}`);
+        logger.debug(
+          () => `KnowledgeBaseRetrievalToolParams:input\n ${JSON.stringify(input, null, 2)}`
+        );
 
         const docs = await kbDataClient.getKnowledgeBaseDocuments({
           query: input.query,
diff --git a/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_write_tool.ts b/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_write_tool.ts
index addb2a5580dfc..5d37d230d87a3 100644
--- a/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_write_tool.ts
+++ b/x-pack/plugins/security_solution/server/assistant/tools/knowledge_base/knowledge_base_write_tool.ts
@@ -47,14 +47,16 @@ export const KNOWLEDGE_BASE_WRITE_TOOL: AssistantTool = {
           ),
       }),
       func: async (input, _, cbManager) => {
-        logger.debug(`KnowledgeBaseWriteToolParams:input\n ${JSON.stringify(input, null, 2)}`);
+        logger.debug(
+          () => `KnowledgeBaseWriteToolParams:input\n ${JSON.stringify(input, null, 2)}`
+        );
 
         const knowledgeBaseEntry: KnowledgeBaseEntryCreateProps = {
           metadata: { kbResource: 'user', source: 'conversation', required: input.required },
           text: input.query,
         };
 
-        logger.debug(`knowledgeBaseEntry\n ${JSON.stringify(knowledgeBaseEntry, null, 2)}`);
+        logger.debug(() => `knowledgeBaseEntry\n ${JSON.stringify(knowledgeBaseEntry, null, 2)}`);
 
         const resp = await kbDataClient.createKnowledgeBaseEntry({ knowledgeBaseEntry });
 
diff --git a/x-pack/plugins/security_solution/server/config.mock.ts b/x-pack/plugins/security_solution/server/config.mock.ts
index a5b8f404bab47..2db82b039484c 100644
--- a/x-pack/plugins/security_solution/server/config.mock.ts
+++ b/x-pack/plugins/security_solution/server/config.mock.ts
@@ -12,7 +12,10 @@ import { getDefaultConfigSettings } from '../common/config_settings';
 import type { ConfigType } from './config';
 
 export const createMockConfig = (): ConfigType => {
-  const enableExperimental: Array<keyof ExperimentalFeatures> = ['responseActionUploadEnabled'];
+  const enableExperimental: Array<keyof ExperimentalFeatures> = [
+    'responseActionUploadEnabled',
+    'responseActionScanEnabled',
+  ];
 
   return {
     [SIGNALS_INDEX_KEY]: DEFAULT_SIGNALS_INDEX,
diff --git a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
index 6f80a018319fa..d7181b3ce49c6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/endpoint_app_context_services.ts
@@ -11,10 +11,10 @@ import type {
   Logger,
   LoggerFactory,
   SavedObjectsClientContract,
+  SecurityServiceStart,
 } from '@kbn/core/server';
 import type { ExceptionListClient, ListsServerExtensionRegistrar } from '@kbn/lists-plugin/server';
 import type { CasesClient, CasesServerStart } from '@kbn/cases-plugin/server';
-import type { SecurityPluginStart } from '@kbn/security-plugin/server';
 import type {
   FleetFromHostFileClientInterface,
   FleetStartContract,
@@ -68,7 +68,7 @@ export interface EndpointAppContextServiceStartContract {
   endpointMetadataService: EndpointMetadataService;
   endpointFleetServicesFactory: EndpointFleetServicesFactoryInterface;
   manifestManager?: ManifestManager;
-  security: SecurityPluginStart;
+  security: SecurityServiceStart;
   alerting: AlertsPluginStartContract;
   config: ConfigType;
   registerIngestCallback?: FleetStartContract['registerExternalCallback'];
@@ -93,7 +93,7 @@ export class EndpointAppContextService {
   private setupDependencies: EndpointAppContextServiceSetupContract | null = null;
   private startDependencies: EndpointAppContextServiceStartContract | null = null;
   private fleetServicesFactory: EndpointFleetServicesFactoryInterface | null = null;
-  public security: SecurityPluginStart | undefined;
+  public security: SecurityServiceStart | undefined;
 
   public setup(dependencies: EndpointAppContextServiceSetupContract) {
     this.setupDependencies = dependencies;
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
index d0c4d825d57d6..b1bb21dfbf261 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/artifacts/task.ts
@@ -185,9 +185,10 @@ export class ManifestTask {
       const diff = newManifest.diff(oldManifest);
 
       this.logger.debug(
-        `New -vs- old manifest diff counts: ${Object.entries(diff).map(
-          ([diffType, diffItems]) => `${diffType}: ${diffItems.length}`
-        )}`
+        () =>
+          `New -vs- old manifest diff counts: ${Object.entries(diff).map(
+            ([diffType, diffItems]) => `${diffType}: ${diffItems.length}`
+          )}`
       );
 
       const persistErrors = await manifestManager.pushArtifacts(
diff --git a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
index dbc57c2a55a84..0207a3b5d1460 100644
--- a/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/lib/response_actions/complete_external_actions_task_runner.ts
@@ -152,7 +152,7 @@ export class CompleteExternalActionsTaskRunner
                 return null;
               }
 
-              this.errors.push(err.message);
+              this.errors.push(err.stack);
             });
         }
       )
@@ -164,7 +164,7 @@ export class CompleteExternalActionsTaskRunner
     if (this.errors.length) {
       this.log.error(
         `${this.errors.length} errors were encountered while running task:\n${this.errors.join(
-          '\n'
+          '\n----'
         )}`
       );
     }
diff --git a/x-pack/plugins/security_solution/server/endpoint/migrations/turn_off_policy_protections.ts b/x-pack/plugins/security_solution/server/endpoint/migrations/turn_off_policy_protections.ts
index ec469fad233d4..fa93e8c0b62f6 100644
--- a/x-pack/plugins/security_solution/server/endpoint/migrations/turn_off_policy_protections.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/migrations/turn_off_policy_protections.ts
@@ -135,7 +135,7 @@ export const turnOffPolicyProtectionsIfNotSupported = async (
       }
     );
 
-    log.debug(`Bulk update response:\n${JSON.stringify(bulkUpdateResponse, null, 2)}`);
+    log.debug(() => `Bulk update response:\n${JSON.stringify(bulkUpdateResponse, null, 2)}`);
 
     if (bulkUpdateResponse.failedPolicies.length > 0) {
       log.error(
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks/mocks.ts
index 3cd77526942ff..9b6f001934910 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks/mocks.ts
@@ -15,6 +15,7 @@ import {
   loggingSystemMock,
   savedObjectsClientMock,
   savedObjectsServiceMock,
+  securityServiceMock,
 } from '@kbn/core/server/mocks';
 import type {
   IRouter,
@@ -154,7 +155,7 @@ export const createMockEndpointAppContextServiceStartContract =
 
     const logger = loggingSystemMock.create().get('mock_endpoint_app_context');
     const savedObjectsStart = savedObjectsServiceMock.createStartContract();
-    const security = securityMock.createStart();
+    const security = securityServiceMock.createStart();
     const agentService = createMockAgentService();
     const agentPolicyService = createMockAgentPolicyService();
     const packagePolicyService = createPackagePolicyServiceMock();
@@ -196,10 +197,6 @@ export const createMockEndpointAppContextServiceStartContract =
       securityMock.createMockAuthenticatedUser({ roles: ['superuser'] })
     );
 
-    security.authz.checkPrivilegesDynamicallyWithRequest.mockReturnValue(
-      jest.fn(() => ({ privileges: { kibana: [] } }))
-    );
-
     const casesMock = casesPluginMock.createStartContract();
     const fleetActionsClientMock = createFleetActionsClientMock();
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts
index cb4afe4496472..0037d5dded81f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_download_handler.ts
@@ -66,11 +66,12 @@ export const getActionFileDownloadRouteHandler = (
 
   return async (context, req, res) => {
     const { action_id: actionId, file_id: fileId } = req.params;
+    const coreContext = await context.core;
 
     try {
-      const esClient = (await context.core).elasticsearch.client.asInternalUser;
+      const esClient = coreContext.elasticsearch.client.asInternalUser;
       const { agentType } = await getActionAgentType(esClient, actionId);
-      const user = endpointContext.service.security?.authc.getCurrentUser(req);
+      const user = coreContext.security.authc.getCurrentUser();
       const casesClient = await endpointContext.service.getCasesClient(req);
       const connectorActions = (await context.actions).getActionsClient();
       const responseActionsClient: ResponseActionsClient = getResponseActionsClient(agentType, {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts
index 0576cec69b01c..4b1d67ff88718 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/file_info_handler.ts
@@ -36,11 +36,12 @@ export const getActionFileInfoRouteHandler = (
 
   return async (context, req, res) => {
     const { action_id: requestActionId, file_id: fileId } = req.params;
+    const coreContext = await context.core;
 
     try {
-      const esClient = (await context.core).elasticsearch.client.asInternalUser;
+      const esClient = coreContext.elasticsearch.client.asInternalUser;
       const { agentType } = await getActionAgentType(esClient, requestActionId);
-      const user = endpointContext.service.security?.authc.getCurrentUser(req);
+      const user = coreContext.security.authc.getCurrentUser();
       const casesClient = await endpointContext.service.getCasesClient(req);
       const connectorActions = (await context.actions).getActionsClient();
       const responseActionsClient: ResponseActionsClient = getResponseActionsClient(agentType, {
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts
index 8c1ba19ca626d..47099ae060efa 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.test.ts
@@ -192,11 +192,6 @@ describe('Response actions', () => {
         }: CallRouteInterface,
         indexExists?: { endpointDsExists: boolean }
       ): Promise<AwaitedProperties<SecuritySolutionRequestHandlerContextMock>> => {
-        const asUser = mockUser ? mockUser : superUser;
-        (startContract.security.authc.getCurrentUser as jest.Mock).mockImplementationOnce(
-          () => asUser
-        );
-
         const ctx = createRouteHandlerContext(mockScopedClient, mockSavedObjectClient);
 
         ctx.securitySolution.getEndpointAuthz.mockResolvedValue(
@@ -218,6 +213,9 @@ describe('Response actions', () => {
             };
           }
         );
+        const asUser = mockUser ? mockUser : superUser;
+        (ctx.core.security.authc.getCurrentUser as jest.Mock).mockImplementationOnce(() => asUser);
+
         const metadataResponse = docGen.generateHostMetadata();
 
         const withErrorResponse = indexErrorResponse ? indexErrorResponse : { statusCode: 201 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts
index cf8a5325b9f9a..723daf576c38e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/response_actions.ts
@@ -47,10 +47,11 @@ import {
 import type {
   ActionDetails,
   EndpointActionDataParameterTypes,
-  KillOrSuspendProcessRequestBody,
-  ResponseActionParametersWithPidOrEntityId,
+  ResponseActionParametersWithProcessData,
   ResponseActionsExecuteParameters,
   ResponseActionScanParameters,
+  KillProcessRequestBody,
+  SuspendProcessRequestBody,
 } from '../../../../common/endpoint/types';
 import type { ResponseActionsApiCommandNames } from '../../../../common/endpoint/service/response_actions/constants';
 import type {
@@ -165,7 +166,7 @@ export function registerResponseActionRoutes(
       withEndpointAuthz(
         { all: ['canKillProcess'] },
         logger,
-        responseActionRequestHandler<ResponseActionParametersWithPidOrEntityId>(
+        responseActionRequestHandler<ResponseActionParametersWithProcessData>(
           endpointContext,
           'kill-process'
         )
@@ -188,7 +189,7 @@ export function registerResponseActionRoutes(
       withEndpointAuthz(
         { all: ['canSuspendProcess'] },
         logger,
-        responseActionRequestHandler<ResponseActionParametersWithPidOrEntityId>(
+        responseActionRequestHandler<ResponseActionParametersWithProcessData>(
           endpointContext,
           'suspend-process'
         )
@@ -319,7 +320,7 @@ function responseActionRequestHandler<T extends EndpointActionDataParameterTypes
   const logger = endpointContext.logFactory.get('responseActionsHandler');
 
   return async (context, req, res) => {
-    logger.debug(`response action [${command}]:\n${stringify(req.body)}`);
+    logger.debug(() => `response action [${command}]:\n${stringify(req.body)}`);
 
     // Note:  because our API schemas are defined as module static variables (as opposed to a
     //        `getter` function), we need to include this additional validation here, since
@@ -337,8 +338,9 @@ function responseActionRequestHandler<T extends EndpointActionDataParameterTypes
       );
     }
 
-    const user = endpointContext.service.security?.authc.getCurrentUser(req);
-    const esClient = (await context.core).elasticsearch.client.asInternalUser;
+    const coreContext = await context.core;
+    const user = coreContext.security.authc.getCurrentUser();
+    const esClient = coreContext.elasticsearch.client.asInternalUser;
     const casesClient = await endpointContext.service.getCasesClient(req);
     const connectorActions = (await context.actions).getActionsClient();
     const responseActionsClient: ResponseActionsClient = getResponseActionsClient(
@@ -374,14 +376,12 @@ function responseActionRequestHandler<T extends EndpointActionDataParameterTypes
 
         case 'suspend-process':
           action = await responseActionsClient.suspendProcess(
-            req.body as KillOrSuspendProcessRequestBody
+            req.body as SuspendProcessRequestBody
           );
           break;
 
         case 'kill-process':
-          action = await responseActionsClient.killProcess(
-            req.body as KillOrSuspendProcessRequestBody
-          );
+          action = await responseActionsClient.killProcess(req.body as KillProcessRequestBody);
           break;
 
         case 'get-file':
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.test.ts
index fd1f597cf3ef1..cba00e7645e9f 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.test.ts
@@ -133,7 +133,7 @@ describe('CrowdstrikeActionsClient class', () => {
           subActionParams: {
             actionParameters: {
               comment:
-                'Action triggered from Elastic Security by user foo for action 123-345-456: test comment',
+                'Action triggered from Elastic Security by user [foo] for action [isolate (action id: 123-345-456)]: test comment',
             },
             command: 'contain',
             ids: ['1-2-3'],
@@ -232,7 +232,7 @@ describe('CrowdstrikeActionsClient class', () => {
             command: 'lift_containment',
             ids: ['1-2-3'],
             comment:
-              'Action triggered from Elastic Security by user foo for action 123-345-456: test comment',
+              'Action triggered from Elastic Security by user [foo] for action [unisolate (action id: 123-345-456)]: test comment',
           },
         },
       });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.ts
index b4b11610e5c02..958c51014c6a0 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/crowdstrike/crowdstrike_actions_client.ts
@@ -12,6 +12,7 @@ import {
 } from '@kbn/stack-connectors-plugin/common/crowdstrike/constants';
 import type { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import type { CrowdstrikeBaseApiResponse } from '@kbn/stack-connectors-plugin/common/crowdstrike/types';
+import { v4 as uuidv4 } from 'uuid';
 import type { CrowdstrikeActionRequestCommonMeta } from '../../../../../../common/endpoint/types/crowdstrike';
 import type {
   CommonResponseActionMethodOptions,
@@ -37,7 +38,6 @@ import type {
   NormalizedExternalConnectorClient,
   NormalizedExternalConnectorClientExecuteOptions,
 } from '../lib/normalized_external_connector_client';
-import { ELASTIC_RESPONSE_ACTION_MESSAGE } from '../../utils';
 
 export type CrowdstrikeActionsClientOptions = ResponseActionsClientOptions & {
   connectorActions: NormalizedExternalConnectorClient;
@@ -98,7 +98,8 @@ export class CrowdstrikeActionsClient extends ResponseActionsClientImpl {
     };
 
     this.log.debug(
-      `calling connector actions 'execute()' for Crowdstrike with:\n${stringify(executeOptions)}`
+      () =>
+        `calling connector actions 'execute()' for Crowdstrike with:\n${stringify(executeOptions)}`
     );
 
     const actionSendResponse = await this.connectorActionsClient.execute(executeOptions);
@@ -114,7 +115,7 @@ export class CrowdstrikeActionsClient extends ResponseActionsClientImpl {
         actionSendResponse
       );
     } else {
-      this.log.debug(`Response:\n${stringify(actionSendResponse)}`);
+      this.log.debug(() => `Response:\n${stringify(actionSendResponse)}`);
     }
 
     return actionSendResponse;
@@ -189,19 +190,15 @@ export class CrowdstrikeActionsClient extends ResponseActionsClientImpl {
     let actionResponse: ActionTypeExecutorResult<CrowdstrikeBaseApiResponse> | undefined;
     if (!reqIndexOptions.error) {
       let error = (await this.validateRequest(reqIndexOptions)).error;
-      const actionCommentMessage = ELASTIC_RESPONSE_ACTION_MESSAGE(
-        this.options.username,
-        reqIndexOptions.actionId
-      );
       if (!error) {
+        if (!reqIndexOptions.actionId) {
+          reqIndexOptions.actionId = uuidv4();
+        }
+
         try {
           actionResponse = (await this.sendAction(SUB_ACTION.HOST_ACTIONS, {
             ids: actionRequest.endpoint_ids,
-            actionParameters: {
-              comment: reqIndexOptions.comment
-                ? `${actionCommentMessage}: ${reqIndexOptions.comment}`
-                : actionCommentMessage,
-            },
+            actionParameters: { comment: this.buildExternalComment(reqIndexOptions) },
             command: 'contain',
           })) as ActionTypeExecutorResult<CrowdstrikeBaseApiResponse>;
         } catch (err) {
@@ -253,18 +250,13 @@ export class CrowdstrikeActionsClient extends ResponseActionsClientImpl {
     let actionResponse: ActionTypeExecutorResult<CrowdstrikeBaseApiResponse> | undefined;
     if (!reqIndexOptions.error) {
       let error = (await this.validateRequest(reqIndexOptions)).error;
-      const actionCommentMessage = ELASTIC_RESPONSE_ACTION_MESSAGE(
-        this.options.username,
-        reqIndexOptions.actionId
-      );
+
       if (!error) {
         try {
           actionResponse = (await this.sendAction(SUB_ACTION.HOST_ACTIONS, {
             ids: actionRequest.endpoint_ids,
             command: 'lift_containment',
-            comment: reqIndexOptions.comment
-              ? `${actionCommentMessage}: ${reqIndexOptions.comment}`
-              : actionCommentMessage,
+            comment: this.buildExternalComment(reqIndexOptions),
           })) as ActionTypeExecutorResult<CrowdstrikeBaseApiResponse>;
         } catch (err) {
           error = err;
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.test.ts
index 1fa046496f231..21a4196ba84e5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.test.ts
@@ -263,7 +263,8 @@ describe('EndpointActionsClient', () => {
     });
   });
 
-  it('should create an action with error', async () => {
+  it('should create an action with error and not trow when in automated mode', async () => {
+    classConstructorOptions.isAutomated = true;
     await endpointActionsClient.isolate(getCommonResponseActionOptions(), {
       error: 'something is wrong',
     });
@@ -283,7 +284,8 @@ describe('EndpointActionsClient', () => {
     );
   });
 
-  it('should create an action with error when agents are invalid', async () => {
+  it('should create an action with error when agents are invalid (automated mode)', async () => {
+    classConstructorOptions.isAutomated = true;
     // @ts-expect-error mocking this for testing purposes
     endpointActionsClient.checkAgentIds = jest.fn().mockResolvedValueOnce({
       isValid: false,
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.ts
index 2c908bd1a3f30..59328beb46c12 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/endpoint/endpoint_actions_client.ts
@@ -30,12 +30,11 @@ import type {
   ActionDetails,
   HostMetadata,
   GetProcessesActionOutputContent,
-  KillOrSuspendProcessRequestBody,
   KillProcessActionOutputContent,
   ResponseActionExecuteOutputContent,
   ResponseActionGetFileOutputContent,
   ResponseActionGetFileParameters,
-  ResponseActionParametersWithPidOrEntityId,
+  ResponseActionParametersWithProcessData,
   ResponseActionsExecuteParameters,
   ResponseActionUploadOutputContent,
   ResponseActionUploadParameters,
@@ -45,6 +44,8 @@ import type {
   UploadedFileInfo,
   ResponseActionScanParameters,
   ResponseActionScanOutputContent,
+  KillProcessRequestBody,
+  SuspendProcessRequestBody,
 } from '../../../../../../common/endpoint/types';
 import type {
   CommonResponseActionMethodOptions,
@@ -107,6 +108,10 @@ export class EndpointActionsClient extends ResponseActionsClientImpl {
     const { hosts, ruleName, ruleId, error } = this.getMethodOptions<TMethodOptions>(options);
     let actionError: string | undefined = validationError?.message || error;
 
+    if (actionError && !this.options.isAutomated) {
+      throw new ResponseActionsClientError(actionError, 400);
+    }
+
     // Dispatch action to Endpoint using Fleet
     if (!actionError) {
       try {
@@ -242,26 +247,26 @@ export class EndpointActionsClient extends ResponseActionsClientImpl {
   }
 
   async killProcess(
-    actionRequest: KillOrSuspendProcessRequestBody,
+    actionRequest: KillProcessRequestBody,
     options: CommonResponseActionMethodOptions = {}
   ): Promise<
-    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithProcessData>
   > {
     return this.handleResponseAction<
-      KillOrSuspendProcessRequestBody,
-      ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+      KillProcessRequestBody,
+      ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithProcessData>
     >('kill-process', actionRequest, options);
   }
 
   async suspendProcess(
-    actionRequest: KillOrSuspendProcessRequestBody,
+    actionRequest: SuspendProcessRequestBody,
     options: CommonResponseActionMethodOptions = {}
   ): Promise<
-    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithProcessData>
   > {
     return this.handleResponseAction<
-      KillOrSuspendProcessRequestBody,
-      ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+      SuspendProcessRequestBody,
+      ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithProcessData>
     >('suspend-process', actionRequest, options);
   }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts
index 163ea887da398..927875855eb11 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/base_response_actions_client.ts
@@ -13,6 +13,7 @@ import { AttachmentType, ExternalReferenceStorageType } from '@kbn/cases-plugin/
 import type { CaseAttachments } from '@kbn/cases-plugin/public/types';
 import { i18n } from '@kbn/i18n';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
+import { SimpleMemCache } from './simple_mem_cache';
 import { validateActionId } from '../../utils/validate_action_id';
 import {
   fetchActionResponses,
@@ -49,14 +50,13 @@ import type {
   EndpointActionDataParameterTypes,
   EndpointActionResponseDataOutput,
   GetProcessesActionOutputContent,
-  KillOrSuspendProcessRequestBody,
   KillProcessActionOutputContent,
   LogsEndpointAction,
   LogsEndpointActionResponse,
   ResponseActionExecuteOutputContent,
   ResponseActionGetFileOutputContent,
   ResponseActionGetFileParameters,
-  ResponseActionParametersWithPidOrEntityId,
+  ResponseActionParametersWithProcessData,
   ResponseActionScanOutputContent,
   ResponseActionsExecuteParameters,
   ResponseActionScanParameters,
@@ -65,6 +65,8 @@ import type {
   SuspendProcessActionOutputContent,
   UploadedFileInfo,
   WithAllKeys,
+  KillProcessRequestBody,
+  SuspendProcessRequestBody,
 } from '../../../../../../common/endpoint/types';
 import type {
   ExecuteActionRequestBody,
@@ -79,6 +81,17 @@ import { stringify } from '../../../../utils/stringify';
 import { CASE_ATTACHMENT_ENDPOINT_TYPE_ID } from '../../../../../../common/constants';
 import { EMPTY_COMMENT } from '../../../../utils/translations';
 
+const ELASTIC_RESPONSE_ACTION_MESSAGE = (
+  username: string = 'system',
+  command: ResponseActionsApiCommandNames,
+  responseActionId: string
+): string => {
+  return i18n.translate('xpack.securitySolution.responseActions.comment.message', {
+    values: { username, command, responseActionId },
+    defaultMessage: `Action triggered from Elastic Security by user [{username}] for action [{command} (action id: {responseActionId})]`,
+  });
+};
+
 const ENTERPRISE_LICENSE_REQUIRED_MSG = i18n.translate(
   'xpack.securitySolution.responseActionsList.error.licenseTooLow',
   {
@@ -176,6 +189,8 @@ export interface ResponseActionsClientPendingAction<
 export abstract class ResponseActionsClientImpl implements ResponseActionsClient {
   protected readonly log: Logger;
 
+  protected readonly cache = new SimpleMemCache();
+
   protected abstract readonly agentType: ResponseActionAgentType;
 
   constructor(protected readonly options: ResponseActionsClientOptions) {
@@ -242,7 +257,7 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
       return;
     }
 
-    this.log.debug(`Updating cases:\n${stringify(allCases)}`);
+    this.log.debug(() => `Updating cases:\n${stringify(allCases)}`);
 
     const attachments: CaseAttachments = [
       {
@@ -283,7 +298,7 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
       })
     );
 
-    this.log.debug(`Update to cases done:\n${stringify(casesUpdateResponse)}`);
+    this.log.debug(() => `Update to cases done:\n${stringify(casesUpdateResponse)}`);
   }
 
   protected getMethodOptions<
@@ -527,7 +542,7 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
   ): Promise<LogsEndpointActionResponse<TOutputContent>> {
     const doc = this.buildActionResponseEsDoc(options);
 
-    this.log.debug(`Writing response action response:\n${stringify(doc)}`);
+    this.log.debug(() => `Writing response action response:\n${stringify(doc)}`);
 
     await this.options.esClient
       .index<LogsEndpointActionResponse<TOutputContent>>({
@@ -560,6 +575,26 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
     usageService.notifyUsage(featureKey);
   }
 
+  /**
+   * Builds a comment for use in response action requests sent to external EDR systems
+   * @protected
+   */
+  protected buildExternalComment(
+    actionRequestIndexOptions: ResponseActionsClientWriteActionRequestToEndpointIndexOptions
+  ): string {
+    const { actionId = uuidv4(), comment, command } = actionRequestIndexOptions;
+
+    // If the action request index options does not yet have an actionId assigned to it, then do it now.
+    // Need to ensure we have an action id for cross-reference.
+    if (!actionRequestIndexOptions.actionId) {
+      actionRequestIndexOptions.actionId = actionId;
+    }
+
+    return (
+      ELASTIC_RESPONSE_ACTION_MESSAGE(this.options.username, command, actionId) +
+      (comment ? `: ${comment}` : '')
+    );
+  }
   protected async ensureValidActionId(actionId: string): Promise<void> {
     return validateActionId(this.options.esClient, actionId, this.agentType);
   }
@@ -650,19 +685,19 @@ export abstract class ResponseActionsClientImpl implements ResponseActionsClient
   }
 
   public async killProcess(
-    actionRequest: KillOrSuspendProcessRequestBody,
+    actionRequest: KillProcessRequestBody,
     options?: CommonResponseActionMethodOptions
   ): Promise<
-    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithProcessData>
   > {
     throw new ResponseActionsNotSupportedError('kill-process');
   }
 
   public async suspendProcess(
-    actionRequest: KillOrSuspendProcessRequestBody,
+    actionRequest: SuspendProcessRequestBody,
     options?: CommonResponseActionMethodOptions
   ): Promise<
-    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithProcessData>
   > {
     throw new ResponseActionsNotSupportedError('suspend-process');
   }
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts
index 9d998a4b137b0..43c07f0050b80 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/normalized_external_connector_client.ts
@@ -57,7 +57,7 @@ export class NormalizedExternalConnectorClient {
       });
 
       if (!connector) {
-        this.log.debug(stringify(connectorList));
+        this.log.debug(() => stringify(connectorList));
         throw new ResponseActionsConnectorNotConfiguredError(connectorTypeId);
       }
 
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.test.ts
new file mode 100644
index 0000000000000..f351e2e40d5be
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.test.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+import { SimpleMemCache } from './simple_mem_cache';
+
+describe('SimpleMemCache class', () => {
+  let cache: SimpleMemCache;
+  let key: any;
+  let value: any;
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  beforeEach(() => {
+    cache = new SimpleMemCache();
+    key = Symbol('foo');
+    value = () => {};
+  });
+
+  it('should `set` and `get` a value to cache', () => {
+    cache.set(key, value);
+
+    expect(cache.get(key)).toEqual(value);
+  });
+
+  it('should accept strings as keys', () => {
+    key = 'mykey';
+    cache.set(key, value);
+
+    expect(cache.get(key)).toEqual(value);
+  });
+
+  it('should delete a value from cache', () => {
+    cache.set(key, value);
+
+    expect(cache.get(key)).toEqual(value);
+
+    cache.delete(key);
+
+    expect(cache.get(key)).toEqual(undefined);
+  });
+
+  it('should cleanup expired cache entries', () => {
+    const key2 = 'myKey';
+    cache.set(key, value); // Default ttl of 10s
+    cache.set(key2, value, 60); // ttl 60s
+    const dateObj = new Date();
+    dateObj.setSeconds(dateObj.getSeconds() + 11);
+    jest.setSystemTime(dateObj);
+    cache.cleanup();
+
+    expect(cache.get(key)).toBeUndefined();
+    expect(cache.get(key2)).toEqual(value);
+  });
+
+  it('should return undefined when a cache entry exists, but it is expired', () => {
+    cache.set(key, value);
+    const dateObj = new Date();
+    dateObj.setSeconds(dateObj.getSeconds() + 11);
+    jest.setSystemTime(dateObj);
+
+    expect(cache.get(key)).toBeUndefined();
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.ts
new file mode 100644
index 0000000000000..fc355bf6c3797
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/simple_mem_cache.ts
@@ -0,0 +1,89 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+
+export interface SimpleMemCacheInterface {
+  /** Store a piece of data in cache */
+  set(
+    key: any,
+    value: any,
+    /** Time-to-live for this entry only (in seconds) */
+    ttl?: number
+  ): void;
+  /** Retrieve a piece of data from cache */
+  get<TValue = any>(key: any): TValue | undefined;
+  /** Delete a piece of data from cache */
+  delete(key: any): void;
+  /** Clean up the cache by removing all expired entries */
+  cleanup(): void;
+}
+
+export interface SimpleMemCacheOptions {
+  /**
+   * Default Time-to-live (in seconds) for each piece of data that is cached.
+   * Defaults to `10` seconds. Can also be set on each entry explicitly
+   */
+  ttl?: number;
+}
+
+interface CachedEntry {
+  value: any;
+  expires: number;
+}
+
+/**
+ * A simple memory caching mechanism. Entries are given a time-to-live (`ttl`) and deleted only when
+ * attempted to be retrieved and entry is expired.
+ *
+ * > **NOTE**:  There is no automated "cache cleanup" to remove expired entries over time due to the
+ * >            fact that it could lead to memory leaks. A `cleanup()` method, however, is provided
+ * >            which can be called periodically to clean up the cache
+ */
+export class SimpleMemCache implements SimpleMemCacheInterface {
+  private readonly ttl: number;
+  private readonly cache = new Map<any, CachedEntry>();
+
+  constructor({ ttl = 10 }: SimpleMemCacheOptions = {}) {
+    this.ttl = ttl;
+  }
+
+  private isExpired(entry: CachedEntry): boolean {
+    return entry.expires < Date.now();
+  }
+
+  public set(key: any, value: any, ttl = this.ttl): void {
+    const expiresDt = new Date();
+    expiresDt.setSeconds(expiresDt.getSeconds() + ttl);
+    this.cache.set(key, { value, expires: expiresDt.getTime() });
+  }
+
+  public get<TValue = any>(key: any): TValue | undefined {
+    const cachedValue = this.cache.get(key);
+
+    if (cachedValue) {
+      if (this.isExpired(cachedValue)) {
+        this.delete(key);
+        return;
+      }
+
+      return cachedValue.value as TValue;
+    }
+  }
+
+  public delete(key: any): void {
+    this.cache.delete(key);
+  }
+
+  public cleanup(): void {
+    for (const [cacheKey, cacheData] of this.cache.entries()) {
+      if (this.isExpired(cacheData)) {
+        this.delete(cacheKey);
+      }
+    }
+  }
+}
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/types.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/types.ts
index f95d0b7144a54..4a7b7efd4d4a5 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/types.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/lib/types.ts
@@ -8,9 +8,8 @@
 import type { Readable } from 'stream';
 import type {
   ActionDetails,
-  KillOrSuspendProcessRequestBody,
   KillProcessActionOutputContent,
-  ResponseActionParametersWithPidOrEntityId,
+  ResponseActionParametersWithProcessData,
   SuspendProcessActionOutputContent,
   GetProcessesActionOutputContent,
   ResponseActionGetFileOutputContent,
@@ -24,6 +23,8 @@ import type {
   UploadedFileInfo,
   ResponseActionScanOutputContent,
   ResponseActionScanParameters,
+  KillProcessRequestBody,
+  SuspendProcessRequestBody,
 } from '../../../../../../common/endpoint/types';
 import type {
   IsolationRouteRequestBody,
@@ -88,17 +89,17 @@ export interface ResponseActionsClient {
   ) => Promise<ActionDetails>;
 
   killProcess: (
-    actionRequest: OmitUnsupportedAttributes<KillOrSuspendProcessRequestBody>,
+    actionRequest: OmitUnsupportedAttributes<KillProcessRequestBody>,
     options?: CommonResponseActionMethodOptions
   ) => Promise<
-    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithProcessData>
   >;
 
   suspendProcess: (
-    actionRequest: OmitUnsupportedAttributes<KillOrSuspendProcessRequestBody>,
+    actionRequest: OmitUnsupportedAttributes<SuspendProcessRequestBody>,
     options?: CommonResponseActionMethodOptions
   ) => Promise<
-    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithPidOrEntityId>
+    ActionDetails<SuspendProcessActionOutputContent, ResponseActionParametersWithProcessData>
   >;
 
   runningProcesses: (
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
index e8b62fb014306..a721bda2f38ab 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/mocks.ts
@@ -172,11 +172,10 @@ const createNoParamsResponseActionOptionsMock = (
 const createKillOrSuspendProcessOptionsMock = (
   overrides: Partial<KillOrSuspendProcessRequestBody> = {}
 ): KillOrSuspendProcessRequestBody => {
+  const parameters = overrides.parameters ?? { pid: 999 };
   const options: KillOrSuspendProcessRequestBody = {
     ...createNoParamsResponseActionOptionsMock(),
-    parameters: {
-      pid: 999,
-    },
+    parameters,
   };
   return merge(options, overrides);
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/mocks.ts
index 0971ed7045655..dac3a5c8f1ddb 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/mocks.ts
@@ -8,6 +8,7 @@
 import type {
   SentinelOneGetAgentsResponse,
   SentinelOneGetActivitiesResponse,
+  SentinelOneGetRemoteScriptsResponse,
 } from '@kbn/stack-connectors-plugin/common/sentinelone/types';
 import {
   SENTINELONE_CONNECTOR_ID,
@@ -130,6 +131,53 @@ const createSentinelOneAgentDetailsMock = (
   );
 };
 
+const createSentinelOneGetRemoteScriptsApiResponseMock =
+  (): SentinelOneGetRemoteScriptsResponse => {
+    return {
+      errors: null,
+      data: [
+        {
+          bucketName: 'us-east-1-prod-remote-scripts',
+          createdAt: '2022-07-17T14:02:45.309427Z',
+          createdByUser: 'SentinelOne',
+          createdByUserId: '-1',
+          creator: 'SentinelOne',
+          creatorId: '-1',
+          fileName:
+            '-1/-1/75cYNKCLYJ7kEsjtBSrha0dXTSANJeMmBDQpXlRzPQA%3D/multi-operations-script-bash.sh',
+          fileSize: 13701,
+          id: '1466645476786791838',
+          inputExample: '--terminate --processes ping,chrome --force',
+          inputInstructions: '--terminate --processes <processes-name-templates> [-f|--force]',
+          inputRequired: true,
+          isAvailableForArs: false,
+          isAvailableForLite: false,
+          mgmtId: -1,
+          osTypes: ['macos', 'linux'],
+          outputFilePaths: null,
+          package: null,
+          scopeId: '-1',
+          scopeLevel: 'sentinel',
+          scopeName: null,
+          scopePath: 'Global',
+          scriptDescription: null,
+          scriptName: 'Terminate Processes (Linux/macOS)',
+          scriptRuntimeTimeoutSeconds: 3600,
+          scriptType: 'action',
+          shortFileName: 'multi-operations-script-bash.sh',
+          signature: '75cYNKCLYJ7kEsjtBSrha0dXTSANJeMmBDQpXlRzPQA=',
+          signatureType: 'SHA-256',
+          supportedDestinations: null,
+          updatedAt: '2024-06-30T06:37:53.904005Z',
+          updater: null,
+          updaterId: null,
+          version: '1.0.0',
+        },
+      ],
+      pagination: { nextCursor: null, totalItems: 1 },
+    };
+  };
+
 const createSentinelOneGetActivitiesApiResponseMock = (): SentinelOneGetActivitiesResponse => {
   return {
     errors: undefined,
@@ -225,6 +273,21 @@ const createConnectorActionsClientMock = (): ActionsClientMock => {
             data: createSentinelOneGetActivitiesApiResponseMock(),
           });
 
+        case SUB_ACTION.GET_REMOTE_SCRIPTS:
+          return responseActionsClientMock.createConnectorActionExecuteResponse({
+            data: createSentinelOneGetRemoteScriptsApiResponseMock(),
+          });
+
+        case SUB_ACTION.EXECUTE_SCRIPT:
+          return responseActionsClientMock.createConnectorActionExecuteResponse({
+            data: {
+              data: {
+                affected: 1,
+                parentTaskId: 'task-789',
+              },
+            },
+          });
+
         default:
           return responseActionsClientMock.createConnectorActionExecuteResponse();
       }
@@ -249,4 +312,5 @@ export const sentinelOneMock = {
   createConnectorActionsClient: createConnectorActionsClientMock,
   createConstructorOptions: createConstructorOptionsMock,
   createSentinelOneActivitiesApiResponse: createSentinelOneGetActivitiesApiResponseMock,
+  createSentinelOneGetRemoteScriptsApiResponse: createSentinelOneGetRemoteScriptsApiResponseMock,
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
index df326a269f0a3..6a5304f17b82e 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.test.ts
@@ -34,6 +34,7 @@ import type {
   ResponseActionGetFileOutputContent,
   ResponseActionGetFileParameters,
   SentinelOneGetFileRequestMeta,
+  KillOrSuspendProcessRequestBody,
 } from '../../../../../../common/endpoint/types';
 import type { SearchHit, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import type { ResponseActionGetFileRequestBody } from '../../../../../../common/api/endpoint';
@@ -42,6 +43,7 @@ import { ACTIONS_SEARCH_PAGE_SIZE } from '../../constants';
 import type { ElasticsearchClientMock } from '@kbn/core-elasticsearch-client-server-mocks';
 import { Readable } from 'stream';
 import { RESPONSE_ACTIONS_ZIP_PASSCODE } from '../../../../../../common/endpoint/service/response_actions/constants';
+import type { DeeplyMockedKeys } from '@kbn/utility-types-jest';
 
 jest.mock('../../action_details_by_id', () => {
   const originalMod = jest.requireActual('../../action_details_by_id');
@@ -57,7 +59,7 @@ const getActionDetailsByIdMock = _getActionDetailsById as jest.Mock;
 describe('SentinelOneActionsClient class', () => {
   let classConstructorOptions: SentinelOneActionsClientOptionsMock;
   let s1ActionsClient: ResponseActionsClient;
-  let connectorActionsMock: NormalizedExternalConnectorClient;
+  let connectorActionsMock: DeeplyMockedKeys<NormalizedExternalConnectorClient>;
 
   const createS1IsolationOptions = (
     overrides: Omit<
@@ -68,11 +70,12 @@ describe('SentinelOneActionsClient class', () => {
 
   beforeEach(() => {
     classConstructorOptions = sentinelOneMock.createConstructorOptions();
-    connectorActionsMock = classConstructorOptions.connectorActions;
+    connectorActionsMock =
+      classConstructorOptions.connectorActions as DeeplyMockedKeys<NormalizedExternalConnectorClient>;
     s1ActionsClient = new SentinelOneActionsClient(classConstructorOptions);
   });
 
-  it.each(['killProcess', 'suspendProcess', 'runningProcesses', 'execute', 'upload'] as Array<
+  it.each(['suspendProcess', 'runningProcesses', 'execute', 'upload', 'scan'] as Array<
     keyof ResponseActionsClient
   >)('should throw an un-supported error for %s', async (methodName) => {
     // @ts-expect-error Purposely passing in empty object for options
@@ -794,7 +797,8 @@ describe('SentinelOneActionsClient class', () => {
       classConstructorOptions.isAutomated = true;
       classConstructorOptions.connectorActions =
         responseActionsClientMock.createNormalizedExternalConnectorClient(subActionsClient);
-      connectorActionsMock = classConstructorOptions.connectorActions;
+      connectorActionsMock =
+        classConstructorOptions.connectorActions as DeeplyMockedKeys<NormalizedExternalConnectorClient>;
       // @ts-expect-error readonly prop assignment
       classConstructorOptions.endpointService.experimentalFeatures.responseActionsSentinelOneGetFileEnabled =
         true;
@@ -1125,4 +1129,169 @@ describe('SentinelOneActionsClient class', () => {
       });
     });
   });
+
+  describe('#killProcess()', () => {
+    let killProcessActionRequest: KillOrSuspendProcessRequestBody;
+
+    beforeEach(() => {
+      // @ts-expect-error readonly prop assignment
+      classConstructorOptions.endpointService.experimentalFeatures.responseActionsSentinelOneKillProcessEnabled =
+        true;
+
+      killProcessActionRequest = responseActionsClientMock.createKillProcessOptions({
+        // @ts-expect-error TS2322 due to type being overloaded to handle kill/suspend process and specific option for S1
+        parameters: { process_name: 'foo' },
+      });
+    });
+
+    it('should throw an error if feature flag is disabled', async () => {
+      // @ts-expect-error readonly prop assignment
+      classConstructorOptions.endpointService.experimentalFeatures.responseActionsSentinelOneKillProcessEnabled =
+        false;
+
+      await expect(s1ActionsClient.killProcess(killProcessActionRequest)).rejects.toThrow(
+        `kill-process not supported for sentinel_one agent type. Feature disabled`
+      );
+    });
+
+    it('should throw an error if `process_name` is not defined (manual mode)', async () => {
+      // @ts-expect-error
+      killProcessActionRequest.parameters.process_name = '';
+
+      await expect(s1ActionsClient.killProcess(killProcessActionRequest)).rejects.toThrow(
+        '[body.parameters.process_name]: missing parameter or value is empty'
+      );
+    });
+
+    it('should still create action at error if something goes wrong in automated mode', async () => {
+      // @ts-expect-error
+      killProcessActionRequest.parameters.process_name = '';
+      classConstructorOptions.isAutomated = true;
+      classConstructorOptions.connectorActions =
+        responseActionsClientMock.createNormalizedExternalConnectorClient(
+          sentinelOneMock.createConnectorActionsClient()
+        );
+      s1ActionsClient = new SentinelOneActionsClient(classConstructorOptions);
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(classConstructorOptions.esClient.index).toHaveBeenCalledWith(
+        expect.objectContaining({
+          document: expect.objectContaining({
+            error: {
+              message: '[body.parameters.process_name]: missing parameter or value is empty',
+            },
+          }),
+        }),
+        { meta: true }
+      );
+    });
+
+    it('should retrieve script execution information from S1 using host OS', async () => {
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(connectorActionsMock.execute as jest.Mock).toHaveBeenCalledWith({
+        params: {
+          subAction: SUB_ACTION.GET_REMOTE_SCRIPTS,
+          subActionParams: {
+            osTypes: 'linux',
+            query: 'terminate',
+            scriptType: 'action',
+          },
+        },
+      });
+    });
+
+    it('should throw error if unable to retrieve S1 script information', async () => {
+      const executeMockImplementation = connectorActionsMock.execute.getMockImplementation()!;
+      connectorActionsMock.execute.mockImplementation(async (options) => {
+        if (options.params.subAction === SUB_ACTION.GET_REMOTE_SCRIPTS) {
+          return responseActionsClientMock.createConnectorActionExecuteResponse({
+            data: { data: [] },
+          });
+        }
+        return executeMockImplementation.call(connectorActionsMock, options);
+      });
+
+      await expect(s1ActionsClient.killProcess(killProcessActionRequest)).rejects.toThrow(
+        'Unable to find a script from SentinelOne to handle [kill-process] response action for host running [linux])'
+      );
+    });
+
+    it('should send execute script request to S1 for kill-process', async () => {
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(connectorActionsMock.execute).toHaveBeenCalledWith({
+        params: {
+          subAction: 'executeScript',
+          subActionParams: {
+            filter: { uuids: '1-2-3' },
+            script: {
+              inputParams: '--terminate --processes "foo" --force',
+              outputDestination: 'SentinelCloud',
+              requiresApproval: false,
+              scriptId: '1466645476786791838',
+              taskDescription: expect.stringContaining(
+                'Action triggered from Elastic Security by user [foo] for action [kill-process'
+              ),
+            },
+          },
+        },
+      });
+    });
+
+    it('should return action details on success', async () => {
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(getActionDetailsByIdMock).toHaveBeenCalled();
+    });
+
+    it('should create action request doc with expected meta info', async () => {
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(classConstructorOptions.esClient.index).toHaveBeenCalledWith(
+        {
+          document: {
+            '@timestamp': expect.any(String),
+            EndpointActions: {
+              action_id: expect.any(String),
+              data: {
+                command: 'kill-process',
+                comment: 'test comment',
+                parameters: { process_name: 'foo' },
+                hosts: {
+                  '1-2-3': {
+                    name: 'sentinelone-1460',
+                  },
+                },
+              },
+              expiration: expect.any(String),
+              input_type: 'sentinel_one',
+              type: 'INPUT_ACTION',
+            },
+            agent: { id: ['1-2-3'] },
+            user: { id: 'foo' },
+            meta: {
+              agentId: '1845174760470303882',
+              agentUUID: '1-2-3',
+              hostName: 'sentinelone-1460',
+              parentTaskId: 'task-789',
+            },
+          },
+          index: ENDPOINT_ACTIONS_INDEX,
+          refresh: 'wait_for',
+        },
+        { meta: true }
+      );
+    });
+
+    it('should update cases', async () => {
+      killProcessActionRequest = {
+        ...killProcessActionRequest,
+        case_ids: ['case-1'],
+      };
+      await s1ActionsClient.killProcess(killProcessActionRequest);
+
+      expect(classConstructorOptions.casesClient?.attachments.bulkCreate).toHaveBeenCalled();
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
index 470bb8f4d4914..54d2147cbe2e2 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/sentinel_one_actions_client.ts
@@ -12,11 +12,13 @@ import {
 import { groupBy } from 'lodash';
 import type { ActionTypeExecutorResult } from '@kbn/actions-plugin/common';
 import type {
+  SentinelOneDownloadAgentFileParams,
   SentinelOneGetActivitiesParams,
   SentinelOneGetActivitiesResponse,
-  SentinelOneGetAgentsParams,
   SentinelOneGetAgentsResponse,
-  SentinelOneDownloadAgentFileParams,
+  SentinelOneGetRemoteScriptsParams,
+  SentinelOneGetRemoteScriptsResponse,
+  SentinelOneExecuteScriptResponse,
 } from '@kbn/stack-connectors-plugin/common/sentinelone/types';
 import type {
   QueryDslQueryContainer,
@@ -24,11 +26,10 @@ import type {
   SearchRequest,
 } from '@elastic/elasticsearch/lib/api/types';
 import type { Readable } from 'stream';
+import type { Mutable } from 'utility-types';
+import type { SentinelOneKillProcessScriptArgs, SentinelOneScriptArgs } from './types';
 import { ACTIONS_SEARCH_PAGE_SIZE } from '../../constants';
-import type {
-  NormalizedExternalConnectorClient,
-  NormalizedExternalConnectorClientExecuteOptions,
-} from '../lib/normalized_external_connector_client';
+import type { NormalizedExternalConnectorClient } from '../lib/normalized_external_connector_client';
 import { SENTINEL_ONE_ACTIVITY_INDEX_PATTERN } from '../../../../../../common';
 import { catchAndWrapError } from '../../../../utils';
 import type {
@@ -40,16 +41,20 @@ import type {
   ResponseActionAgentType,
   ResponseActionsApiCommandNames,
 } from '../../../../../../common/endpoint/service/response_actions/constants';
+import { RESPONSE_ACTIONS_ZIP_PASSCODE } from '../../../../../../common/endpoint/service/response_actions/constants';
 import { stringify } from '../../../../utils/stringify';
 import { ResponseActionAgentResponseEsDocNotFound, ResponseActionsClientError } from '../errors';
 import type {
   ActionDetails,
   EndpointActionDataParameterTypes,
   EndpointActionResponseDataOutput,
+  KillProcessActionOutputContent,
+  KillProcessRequestBody,
   LogsEndpointAction,
   LogsEndpointActionResponse,
   ResponseActionGetFileOutputContent,
   ResponseActionGetFileParameters,
+  ResponseActionParametersWithProcessData,
   SentinelOneActionRequestCommonMeta,
   SentinelOneActivityDataForType80,
   SentinelOneActivityEsDoc,
@@ -57,7 +62,9 @@ import type {
   SentinelOneGetFileResponseMeta,
   SentinelOneIsolationRequestMeta,
   SentinelOneIsolationResponseMeta,
+  SentinelOneKillProcessRequestMeta,
   UploadedFileInfo,
+  ResponseActionParametersWithProcessName,
 } from '../../../../../../common/endpoint/types';
 import type {
   IsolationRouteRequestBody,
@@ -65,17 +72,29 @@ import type {
 } from '../../../../../../common/api/endpoint';
 import type {
   ResponseActionsClientOptions,
+  ResponseActionsClientPendingAction,
   ResponseActionsClientValidateRequestResponse,
   ResponseActionsClientWriteActionRequestToEndpointIndexOptions,
-  ResponseActionsClientPendingAction,
 } from '../lib/base_response_actions_client';
 import { ResponseActionsClientImpl } from '../lib/base_response_actions_client';
-import { RESPONSE_ACTIONS_ZIP_PASSCODE } from '../../../../../../common/endpoint/service/response_actions/constants';
+
+const NOOP_THROW = () => {
+  throw new ResponseActionsClientError('not implemented!');
+};
 
 export type SentinelOneActionsClientOptions = ResponseActionsClientOptions & {
   connectorActions: NormalizedExternalConnectorClient;
 };
 
+interface FetchScriptInfoResponse<
+  TScriptOptions extends SentinelOneScriptArgs = SentinelOneScriptArgs
+> {
+  scriptId: string;
+  scriptInfo: SentinelOneGetRemoteScriptsResponse['data'][number];
+  /** A helper method that will build the arguments for the given script */
+  buildScriptArgs: (options: TScriptOptions) => string;
+}
+
 export class SentinelOneActionsClient extends ResponseActionsClientImpl {
   protected readonly agentType: ResponseActionAgentType = 'sentinel_one';
   private readonly connectorActionsClient: NormalizedExternalConnectorClient;
@@ -181,7 +200,8 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     };
 
     this.log.debug(
-      `calling connector actions 'execute()' for SentinelOne with:\n${stringify(executeOptions)}`
+      () =>
+        `calling connector actions 'execute()' for SentinelOne with:\n${stringify(executeOptions)}`
     );
 
     const actionSendResponse = await this.connectorActionsClient.execute(executeOptions);
@@ -198,7 +218,7 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
       );
     }
 
-    this.log.debug(`Response:\n${stringify(actionSendResponse)}`);
+    this.log.debug(() => `Response:\n${stringify(actionSendResponse)}`);
 
     return actionSendResponse as ActionTypeExecutorResult<T>;
   }
@@ -207,28 +227,21 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
   private async getAgentDetails(
     agentUUID: string
   ): Promise<SentinelOneGetAgentsResponse['data'][number]> {
-    const executeOptions: NormalizedExternalConnectorClientExecuteOptions<
-      SentinelOneGetAgentsParams,
-      SUB_ACTION
-    > = {
-      params: {
-        subAction: SUB_ACTION.GET_AGENTS,
-        subActionParams: {
-          uuid: agentUUID,
-        },
-      },
-    };
+    const cachedEntry = this.cache.get<SentinelOneGetAgentsResponse['data'][number]>(agentUUID);
+
+    if (cachedEntry) {
+      this.log.debug(
+        `Found cached agent details for UUID [${agentUUID}]:\n${stringify(cachedEntry)}`
+      );
+      return cachedEntry;
+    }
 
     let s1ApiResponse: SentinelOneGetAgentsResponse | undefined;
 
     try {
-      const response = (await this.connectorActionsClient.execute(
-        executeOptions
-      )) as ActionTypeExecutorResult<SentinelOneGetAgentsResponse>;
-
-      this.log.debug(
-        `Response for SentinelOne agent id [${agentUUID}] returned:\n${stringify(response)}`
-      );
+      const response = await this.sendAction<SentinelOneGetAgentsResponse>(SUB_ACTION.GET_AGENTS, {
+        uuid: agentUUID,
+      });
 
       s1ApiResponse = response.data;
     } catch (err) {
@@ -243,6 +256,8 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
       throw new ResponseActionsClientError(`SentinelOne agent id [${agentUUID}] not found`, 404);
     }
 
+    this.cache.set(agentUUID, s1ApiResponse.data[0]);
+
     return s1ApiResponse.data[0];
   }
 
@@ -260,6 +275,23 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
       };
     }
 
+    // validate that we have a `process_name`. We need this here because the schema for this command
+    // specifically because `KillProcessRequestBody` allows 3 types of parameters.
+    if (payload.command === 'kill-process') {
+      if (
+        !payload.parameters ||
+        !('process_name' in payload.parameters) ||
+        !payload.parameters.process_name
+      ) {
+        return {
+          isValid: false,
+          error: new ResponseActionsClientError(
+            '[body.parameters.process_name]: missing parameter or value is empty'
+          ),
+        };
+      }
+    }
+
     return super.validateRequest(payload);
   }
 
@@ -438,12 +470,6 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
           SentinelOneGetActivitiesResponse<{ commandBatchUuid: string }>
         >(SUB_ACTION.GET_ACTIVITIES, activitySearchCriteria);
 
-        this.log.debug(
-          `Search of activity log with:\n${stringify(
-            activitySearchCriteria
-          )}\n returned:\n${stringify(activityLogSearchResponse.data)}`
-        );
-
         if (activityLogSearchResponse.data?.data.length) {
           const activityLogItem = activityLogSearchResponse.data?.data[0];
 
@@ -557,6 +583,86 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     };
   }
 
+  async killProcess(
+    actionRequest: KillProcessRequestBody,
+    options?: CommonResponseActionMethodOptions
+  ): Promise<
+    ActionDetails<KillProcessActionOutputContent, ResponseActionParametersWithProcessData>
+  > {
+    if (
+      !this.options.endpointService.experimentalFeatures
+        .responseActionsSentinelOneKillProcessEnabled
+    ) {
+      throw new ResponseActionsClientError(
+        `kill-process not supported for ${this.agentType} agent type. Feature disabled`,
+        400
+      );
+    }
+
+    const reqIndexOptions: ResponseActionsClientWriteActionRequestToEndpointIndexOptions<
+      ResponseActionParametersWithProcessName,
+      KillProcessActionOutputContent,
+      Partial<SentinelOneKillProcessRequestMeta>
+    > = {
+      ...actionRequest,
+      ...this.getMethodOptions(options),
+      command: 'kill-process',
+      meta: { parentTaskId: '' },
+    };
+
+    if (!reqIndexOptions.error) {
+      let error = (await this.validateRequest(reqIndexOptions)).error;
+
+      if (!error) {
+        const s1AgentDetails = await this.getAgentDetails(reqIndexOptions.endpoint_ids[0]);
+        const terminateScriptInfo = await this.fetchScriptInfo<SentinelOneKillProcessScriptArgs>(
+          'kill-process',
+          s1AgentDetails.osType
+        );
+
+        try {
+          const s1Response = await this.sendAction<SentinelOneExecuteScriptResponse>(
+            SUB_ACTION.EXECUTE_SCRIPT,
+            {
+              filter: {
+                uuids: actionRequest.endpoint_ids[0],
+              },
+              script: {
+                scriptId: terminateScriptInfo.scriptId,
+                taskDescription: this.buildExternalComment(reqIndexOptions),
+                requiresApproval: false,
+                outputDestination: 'SentinelCloud',
+                inputParams: terminateScriptInfo.buildScriptArgs({
+                  // @ts-expect-error TS2339: Property 'process_name' does not exist (`.validateRequest()` has already validated that `process_name` exists)
+                  processName: reqIndexOptions.parameters.process_name,
+                }),
+              },
+            }
+          );
+
+          reqIndexOptions.meta = {
+            parentTaskId: s1Response.data?.data?.parentTaskId ?? '',
+          };
+        } catch (err) {
+          error = err;
+        }
+      }
+
+      reqIndexOptions.error = error?.message;
+
+      if (!this.options.isAutomated && error) {
+        throw error;
+      }
+    }
+
+    const { actionDetails } = await this.handleResponseActionCreation<
+      ResponseActionParametersWithProcessData,
+      KillProcessActionOutputContent
+    >(reqIndexOptions);
+
+    return actionDetails;
+  }
+
   async processPendingActions({
     abortSignal,
     addToQueue,
@@ -614,6 +720,93 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     }
   }
 
+  /**
+   * retrieve script info. for scripts that are used to handle Elastic response actions
+   * @param scriptType
+   * @param osType
+   * @private
+   */
+  private async fetchScriptInfo<
+    TScriptOptions extends SentinelOneScriptArgs = SentinelOneScriptArgs
+  >(
+    scriptType: Extract<ResponseActionsApiCommandNames, 'kill-process'>,
+    osType: string | 'linux' | 'macos' | 'windows'
+  ): Promise<FetchScriptInfoResponse<TScriptOptions>> {
+    const searchQueryParams: Mutable<Partial<SentinelOneGetRemoteScriptsParams>> = {
+      query: '',
+      osTypes: osType,
+    };
+    let buildScriptArgs = NOOP_THROW as FetchScriptInfoResponse<TScriptOptions>['buildScriptArgs'];
+    let isDesiredScript: (
+      scriptInfo: SentinelOneGetRemoteScriptsResponse['data'][number]
+    ) => boolean = () => false;
+
+    // Set the query value for filtering the list of scripts in S1
+    switch (scriptType) {
+      case 'kill-process':
+        searchQueryParams.query = 'terminate';
+        searchQueryParams.scriptType = 'action';
+
+        isDesiredScript = (scriptInfo) => {
+          return (
+            scriptInfo.creator === 'SentinelOne' &&
+            scriptInfo.creatorId === '-1' &&
+            // Using single `-` (instead of double `--`) in match below to ensure both windows and macos/linux are matched
+            /-terminate/i.test(scriptInfo.inputInstructions ?? '') &&
+            /-processes/i.test(scriptInfo.inputInstructions ?? '')
+          );
+        };
+        break;
+
+      default:
+        throw new ResponseActionsClientError(
+          `Unable to fetch SentinelOne script for OS [${osType}]. Unknown script type [${scriptType}]`
+        );
+    }
+
+    const { data: scriptSearchResults } =
+      await this.sendAction<SentinelOneGetRemoteScriptsResponse>(
+        SUB_ACTION.GET_REMOTE_SCRIPTS,
+        searchQueryParams
+      );
+
+    const s1Script: SentinelOneGetRemoteScriptsResponse['data'][number] | undefined = (
+      scriptSearchResults?.data ?? []
+    ).find(isDesiredScript);
+
+    if (!s1Script) {
+      throw new ResponseActionsClientError(
+        `Unable to find a script from SentinelOne to handle [${scriptType}] response action for host running [${osType}])`
+      );
+    }
+
+    switch (scriptType) {
+      case 'kill-process':
+        buildScriptArgs = (args: SentinelOneKillProcessScriptArgs) => {
+          if (!args.processName) {
+            throw new ResponseActionsClientError(
+              `'processName' missing while building script args for [${s1Script.scriptName} (id: ${s1Script.id})] script`
+            );
+          }
+
+          if (osType === 'windows') {
+            return `-Terminate -Processes "${args.processName}" -Force`;
+          }
+
+          // Linux + Macos
+          return `--terminate --processes "${args.processName}" --force`;
+        };
+
+        break;
+    }
+
+    return {
+      scriptId: s1Script.id,
+      scriptInfo: s1Script,
+      buildScriptArgs,
+    } as FetchScriptInfoResponse<TScriptOptions>;
+  }
+
   private async fetchGetFileResponseEsDocForAgentId(
     actionId: string,
     agentId: string
@@ -771,10 +964,11 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
       };
 
       this.log.debug(
-        `searching for ${command} responses from [${SENTINEL_ONE_ACTIVITY_INDEX_PATTERN}] index with:\n${stringify(
-          searchRequestOptions,
-          15
-        )}`
+        () =>
+          `searching for ${command} responses from [${SENTINEL_ONE_ACTIVITY_INDEX_PATTERN}] index with:\n${stringify(
+            searchRequestOptions,
+            15
+          )}`
       );
 
       const searchResults = await this.options.esClient
@@ -782,7 +976,10 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
         .catch(catchAndWrapError);
 
       this.log.debug(
-        `Search results for SentinelOne ${command} activity documents:\n${stringify(searchResults)}`
+        () =>
+          `Search results for SentinelOne ${command} activity documents:\n${stringify(
+            searchResults
+          )}`
       );
 
       for (const searchResultHit of searchResults.hits.hits) {
@@ -831,9 +1028,10 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     }
 
     this.log.debug(
-      `${completedResponses.length} ${command} action responses generated:\n${stringify(
-        completedResponses
-      )}`
+      () =>
+        `${completedResponses.length} ${command} action responses generated:\n${stringify(
+          completedResponses
+        )}`
     );
 
     if (warnings.length > 0) {
@@ -928,10 +1126,11 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
 
     if (Object.keys(actionsByAgentAndBatchId).length) {
       this.log.debug(
-        `searching for get-file responses from [${SENTINEL_ONE_ACTIVITY_INDEX_PATTERN}] index with:\n${stringify(
-          searchRequestOptions,
-          15
-        )}`
+        () =>
+          `searching for get-file responses from [${SENTINEL_ONE_ACTIVITY_INDEX_PATTERN}] index with:\n${stringify(
+            searchRequestOptions,
+            15
+          )}`
       );
 
       const searchResults = await this.options.esClient
@@ -939,7 +1138,8 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
         .catch(catchAndWrapError);
 
       this.log.debug(
-        `Search results for SentinelOne get-file activity documents:\n${stringify(searchResults)}`
+        () =>
+          `Search results for SentinelOne get-file activity documents:\n${stringify(searchResults)}`
       );
 
       for (const s1Hit of searchResults.hits.hits) {
@@ -1008,9 +1208,10 @@ export class SentinelOneActionsClient extends ResponseActionsClientImpl {
     }
 
     this.log.debug(
-      `${completedResponses.length} get-file action responses generated:\n${stringify(
-        completedResponses
-      )}`
+      () =>
+        `${completedResponses.length} get-file action responses generated:\n${stringify(
+          completedResponses
+        )}`
     );
 
     if (warnings.length > 0) {
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/types.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/types.ts
index fbb28df5e4449..a51a9ec981765 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/types.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/clients/sentinelone/types.ts
@@ -5,22 +5,11 @@
  * 2.0.
  */
 
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-import type { ActionsClient } from '@kbn/actions-plugin/server';
-import type { SUB_ACTION } from '@kbn/stack-connectors-plugin/common/sentinelone/constants';
-
-type ConnectorActionsExecuteOptions = Parameters<ActionsClient['execute']>[0];
-
-interface SentinelOneConnectorExecuteParams<
-  P extends Record<string, unknown> = Record<string, unknown>
-> {
-  subAction: SUB_ACTION;
-  subActionParams: P;
+export interface SentinelOneKillProcessScriptArgs {
+  processName: string;
 }
 
-export type SentinelOneConnectorExecuteOptions<
-  P extends Record<string, unknown> = Record<string, any>
-> = Omit<ConnectorActionsExecuteOptions, 'params'> & {
-  params: SentinelOneConnectorExecuteParams<P> & Record<string, unknown>;
-};
+/**
+ * All the possible set of arguments running SentinelOne scripts that we support for response actions
+ */
+export type SentinelOneScriptArgs = SentinelOneKillProcessScriptArgs;
diff --git a/x-pack/plugins/security_solution/server/endpoint/services/actions/utils/utils.ts b/x-pack/plugins/security_solution/server/endpoint/services/actions/utils/utils.ts
index f5087b18e03d6..9c9f8e5b62cac 100644
--- a/x-pack/plugins/security_solution/server/endpoint/services/actions/utils/utils.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/services/actions/utils/utils.ts
@@ -9,7 +9,6 @@ import type { ElasticsearchClient } from '@kbn/core/server';
 import type * as estypes from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { EcsError } from '@elastic/ecs';
 import moment from 'moment/moment';
-import { i18n } from '@kbn/i18n';
 import type { QueryDslQueryContainer } from '@elastic/elasticsearch/lib/api/types';
 import type { FetchActionResponsesResult } from '../..';
 import type {
@@ -611,12 +610,3 @@ export const createActionDetailsRecord = <T extends ActionDetails = ActionDetail
 export const getActionRequestExpiration = (): string => {
   return moment().add(2, 'weeks').toISOString();
 };
-
-export const ELASTIC_RESPONSE_ACTION_MESSAGE = (
-  username: string = 'system',
-  responseActionId: string = 'response-action-id' // I believe actionId exists always and there is a mismatch in types, but this default is just a safety net
-): string =>
-  i18n.translate('xpack.securitySolution.responseActions.comment.message', {
-    values: { username, responseActionId },
-    defaultMessage: `Action triggered from Elastic Security by user {username} for action {responseActionId}`,
-  });
diff --git a/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.test.ts b/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.test.ts
index 4c9fe188fdffb..dfd38ab8e6eea 100644
--- a/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.test.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 import type { Logger, SavedObjectsFindResponse } from '@kbn/core/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { INTERNAL_DASHBOARDS_URL } from '../../../../common/constants';
 import {
   serverMock,
   requestContextMock,
-  mockGetCurrentUser,
   requestMock,
 } from '../../detection_engine/routes/__mocks__';
 import { mockGetDashboardsResult } from '../__mocks__';
@@ -18,7 +16,6 @@ import { getDashboardsByTagsRoute } from './get_dashboards_by_tags';
 
 describe('getDashboardsByTagsRoute', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   const { context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
 
@@ -36,14 +33,7 @@ describe('getDashboardsByTagsRoute', () => {
     jest.clearAllMocks();
     server = serverMock.create();
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    getDashboardsByTagsRoute(server.router, logger, securitySetup);
+    getDashboardsByTagsRoute(server.router, logger);
   });
 
   it('should return dashboards with Security Solution tags', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.ts b/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.ts
index ef4695aea6ea5..e7a3ebf9a7f10 100644
--- a/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.ts
+++ b/x-pack/plugins/security_solution/server/lib/dashboards/routes/get_dashboards_by_tags.ts
@@ -10,18 +10,13 @@ import { i18n } from '@kbn/i18n';
 import type { DashboardAttributes } from '@kbn/dashboard-plugin/common';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { INTERNAL_DASHBOARDS_URL } from '../../../../common/constants';
-import type { SetupPlugins } from '../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { buildSiemResponse } from '../../detection_engine/routes/utils';
 import { buildFrameworkRequest } from '../../timeline/utils/common';
 import { getDashboardsRequest } from '../../../../common/api/tags';
 import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 
-export const getDashboardsByTagsRoute = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
+export const getDashboardsByTagsRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.versioned
     .post({
       path: INTERNAL_DASHBOARDS_URL,
@@ -36,7 +31,7 @@ export const getDashboardsByTagsRoute = (
         validate: { request: { body: buildRouteValidationWithExcess(getDashboardsRequest) } },
       },
       async (context, request, response) => {
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const savedObjectsClient = (await frameworkRequest.context.core).savedObjects.client;
         const { tagIds } = request.body;
 
diff --git a/x-pack/plugins/security_solution/server/lib/dashboards/routes/index.ts b/x-pack/plugins/security_solution/server/lib/dashboards/routes/index.ts
index 17b6cec643ec4..dfbb6fbb8771d 100644
--- a/x-pack/plugins/security_solution/server/lib/dashboards/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/dashboards/routes/index.ts
@@ -5,14 +5,9 @@
  * 2.0.
  */
 import type { Logger } from '@kbn/core/server';
-import type { SetupPlugins } from '../../../plugin_contract';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { getDashboardsByTagsRoute } from './get_dashboards_by_tags';
 
-export const registerDashboardsRoutes = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
-  getDashboardsByTagsRoute(router, logger, security);
+export const registerDashboardsRoutes = (router: SecuritySolutionPluginRouter, logger: Logger) => {
+  getDashboardsByTagsRoute(router, logger);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.test.ts
index 9e9bd77e81a1c..8e029f939d111 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.test.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { securityServiceMock } from '@kbn/core/server/mocks';
 import { getPrebuiltRulesAndTimelinesStatusRoute } from './get_prebuilt_rules_and_timelines_status_route';
 
 import {
@@ -13,7 +14,6 @@ import {
   getPrepackagedRulesStatusRequest,
 } from '../../../routes/__mocks__/request_responses';
 import { requestContextMock, serverMock } from '../../../routes/__mocks__';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { checkTimelinesStatus } from '../../../../timeline/utils/check_timelines_status';
 import {
   mockCheckTimelinesStatusBeforeInstallResult,
@@ -56,6 +56,7 @@ jest.mock('../../../../timeline/utils/check_timelines_status', () => {
 });
 
 describe('get_prepackaged_rule_status_route', () => {
+  const securityCore = securityServiceMock.createStart();
   const mockGetCurrentUser = {
     user: {
       username: 'mockUser',
@@ -64,19 +65,13 @@ describe('get_prepackaged_rule_status_route', () => {
 
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
-  let securitySetup: SecurityPluginSetup;
 
   beforeEach(() => {
     jest.clearAllMocks();
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
+    jest.spyOn(securityCore.authc, 'getCurrentUser').mockReturnValue(mockGetCurrentUser);
 
     clients.rulesClient.find.mockResolvedValue(getEmptyFindResult());
 
@@ -86,7 +81,7 @@ describe('get_prepackaged_rule_status_route', () => {
       prepackagedTimelines: [],
     });
 
-    getPrebuiltRulesAndTimelinesStatusRoute(server.router, securitySetup);
+    getPrebuiltRulesAndTimelinesStatusRoute(server.router);
   });
 
   describe('status codes', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.ts
index 4848cb5e52c4e..84cb18032f50e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route.ts
@@ -9,7 +9,6 @@ import { transformError } from '@kbn/securitysolution-es-utils';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
 import { checkTimelineStatusRt } from '../../../../../../common/api/timeline';
 import { buildSiemResponse } from '../../../routes/utils';
-import type { SetupPlugins } from '../../../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../../../types';
 
 import {
@@ -27,10 +26,7 @@ import { rulesToMap } from '../../logic/utils';
 import { buildFrameworkRequest } from '../../../../timeline/utils/common';
 import { checkTimelinesStatus } from '../../../../timeline/utils/check_timelines_status';
 
-export const getPrebuiltRulesAndTimelinesStatusRoute = (
-  router: SecuritySolutionPluginRouter,
-  security: SetupPlugins['security']
-) => {
+export const getPrebuiltRulesAndTimelinesStatusRoute = (router: SecuritySolutionPluginRouter) => {
   router.versioned
     .get({
       access: 'public',
@@ -71,7 +67,7 @@ export const getPrebuiltRulesAndTimelinesStatusRoute = (
           const rulesToInstall = getRulesToInstall(latestPrebuiltRules, installedPrebuiltRules);
           const rulesToUpdate = getRulesToUpdate(latestPrebuiltRules, installedPrebuiltRules);
 
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const prebuiltTimelineStatus = await checkTimelinesStatus(frameworkRequest);
           const [validatedPrebuiltTimelineStatus] = validate(
             prebuiltTimelineStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/register_routes.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/register_routes.ts
index 1ac2ef2a3954d..71740086e3fa5 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/register_routes.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/register_routes.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { SetupPlugins } from '../../../../plugin_contract';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 
 import { getPrebuiltRulesAndTimelinesStatusRoute } from './get_prebuilt_rules_and_timelines_status/get_prebuilt_rules_and_timelines_status_route';
@@ -16,12 +15,9 @@ import { reviewRuleUpgradeRoute } from './review_rule_upgrade/review_rule_upgrad
 import { performRuleInstallationRoute } from './perform_rule_installation/perform_rule_installation_route';
 import { performRuleUpgradeRoute } from './perform_rule_upgrade/perform_rule_upgrade_route';
 
-export const registerPrebuiltRulesRoutes = (
-  router: SecuritySolutionPluginRouter,
-  security: SetupPlugins['security']
-) => {
+export const registerPrebuiltRulesRoutes = (router: SecuritySolutionPluginRouter) => {
   // Legacy endpoints that we're going to deprecate
-  getPrebuiltRulesAndTimelinesStatusRoute(router, security);
+  getPrebuiltRulesAndTimelinesStatusRoute(router);
   installPrebuiltRulesAndTimelinesRoute(router);
 
   // New endpoints for the rule upgrade and installation workflows
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts
index 0b30c9bab4782..ec3ca342bf8c9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_installation/review_rule_installation_route.ts
@@ -18,7 +18,7 @@ import { createPrebuiltRuleObjectsClient } from '../../logic/rule_objects/prebui
 import { fetchRuleVersionsTriad } from '../../logic/rule_versions/fetch_rule_versions_triad';
 import type { PrebuiltRuleAsset } from '../../model/rule_assets/prebuilt_rule_asset';
 import { getVersionBuckets } from '../../model/rule_versions/get_version_buckets';
-import { convertPrebuiltRuleAssetToRuleResponse } from '../../../rule_management/normalization/rule_converters';
+import { convertPrebuiltRuleAssetToRuleResponse } from '../../../rule_management/logic/detection_rules_client/converters/convert_prebuilt_rule_asset_to_rule_response';
 import { PREBUILT_RULES_OPERATION_SOCKET_TIMEOUT_MS } from '../../constants';
 
 export const reviewRuleInstallationRoute = (router: SecuritySolutionPluginRouter) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts
index de7db929790de..f38fcc7953641 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/api/review_rule_upgrade/review_rule_upgrade_route.ts
@@ -27,7 +27,7 @@ import { createPrebuiltRuleAssetsClient } from '../../logic/rule_assets/prebuilt
 import { createPrebuiltRuleObjectsClient } from '../../logic/rule_objects/prebuilt_rule_objects_client';
 import { fetchRuleVersionsTriad } from '../../logic/rule_versions/fetch_rule_versions_triad';
 import { getVersionBuckets } from '../../model/rule_versions/get_version_buckets';
-import { convertPrebuiltRuleAssetToRuleResponse } from '../../../rule_management/normalization/rule_converters';
+import { convertPrebuiltRuleAssetToRuleResponse } from '../../../rule_management/logic/detection_rules_client/converters/convert_prebuilt_rule_asset_to_rule_response';
 import { PREBUILT_RULES_OPERATION_SOCKET_TIMEOUT_MS } from '../../constants';
 
 export const reviewRuleUpgradeRoute = (router: SecuritySolutionPluginRouter) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
index ea482858650fb..cc27fe928b27c 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff.ts
@@ -39,6 +39,7 @@ import { MissingVersion } from '../../../../../../../common/api/detection_engine
 import { calculateFieldsDiffFor } from './diff_calculation_helpers';
 import {
   numberDiffAlgorithm,
+  scalarArrayDiffAlgorithm,
   simpleDiffAlgorithm,
   singleLineStringDiffAlgorithm,
 } from './algorithms';
@@ -173,26 +174,23 @@ const calculateCommonFieldsDiff = (
 const commonFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCommonFields> = {
   rule_id: simpleDiffAlgorithm,
   version: numberDiffAlgorithm,
-  meta: simpleDiffAlgorithm,
   name: singleLineStringDiffAlgorithm,
-  tags: simpleDiffAlgorithm,
+  tags: scalarArrayDiffAlgorithm,
   description: simpleDiffAlgorithm,
   severity: singleLineStringDiffAlgorithm,
   severity_mapping: simpleDiffAlgorithm,
   risk_score: numberDiffAlgorithm,
   risk_score_mapping: simpleDiffAlgorithm,
-  references: simpleDiffAlgorithm,
+  references: scalarArrayDiffAlgorithm,
   false_positives: simpleDiffAlgorithm,
   threat: simpleDiffAlgorithm,
   note: simpleDiffAlgorithm,
   setup: simpleDiffAlgorithm,
   related_integrations: simpleDiffAlgorithm,
   required_fields: simpleDiffAlgorithm,
-  author: simpleDiffAlgorithm,
+  author: scalarArrayDiffAlgorithm,
   license: singleLineStringDiffAlgorithm,
   rule_schedule: simpleDiffAlgorithm,
-  actions: simpleDiffAlgorithm,
-  throttle: simpleDiffAlgorithm,
   exceptions_list: simpleDiffAlgorithm,
   max_signals: numberDiffAlgorithm,
   rule_name_override: simpleDiffAlgorithm,
@@ -211,7 +209,6 @@ const customQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableCustomQue
   type: simpleDiffAlgorithm,
   kql_query: simpleDiffAlgorithm,
   data_source: simpleDiffAlgorithm,
-  alert_suppression: simpleDiffAlgorithm,
 };
 
 const calculateSavedQueryFieldsDiff = (
@@ -224,7 +221,6 @@ const savedQueryFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableSavedQuery
   type: simpleDiffAlgorithm,
   kql_query: simpleDiffAlgorithm,
   data_source: simpleDiffAlgorithm,
-  alert_suppression: simpleDiffAlgorithm,
 };
 
 const calculateEqlFieldsDiff = (
@@ -264,7 +260,7 @@ const threatMatchFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableThreatMat
   kql_query: simpleDiffAlgorithm,
   data_source: simpleDiffAlgorithm,
   threat_query: simpleDiffAlgorithm,
-  threat_index: simpleDiffAlgorithm,
+  threat_index: scalarArrayDiffAlgorithm,
   threat_mapping: simpleDiffAlgorithm,
   threat_indicator_path: singleLineStringDiffAlgorithm,
   concurrent_searches: simpleDiffAlgorithm,
@@ -307,7 +303,7 @@ const newTermsFieldsDiffAlgorithms: FieldsDiffAlgorithmsFor<DiffableNewTermsFiel
   type: simpleDiffAlgorithm,
   kql_query: simpleDiffAlgorithm,
   data_source: simpleDiffAlgorithm,
-  new_terms_fields: simpleDiffAlgorithm,
+  new_terms_fields: scalarArrayDiffAlgorithm,
   history_window_start: singleLineStringDiffAlgorithm,
 };
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/convert_rule_to_diffable.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/convert_rule_to_diffable.ts
index c08edbc0c5cc5..525af83d48b99 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/convert_rule_to_diffable.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/convert_rule_to_diffable.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { RuleActionArray } from '@kbn/securitysolution-io-ts-alerting-types';
+import type { RequiredOptional } from '@kbn/zod-helpers';
 import { requiredOptional } from '@kbn/zod-helpers';
 import { DEFAULT_MAX_SIGNALS } from '../../../../../../../common/constants';
 import { assertUnreachable } from '../../../../../../../common/utility_types';
@@ -110,13 +110,12 @@ export const convertRuleToDiffable = (rule: RuleResponse | PrebuiltRuleAsset): D
 
 const extractDiffableCommonFields = (
   rule: RuleResponse | PrebuiltRuleAsset
-): DiffableCommonFields => {
+): RequiredOptional<DiffableCommonFields> => {
   return {
     // --------------------- REQUIRED FIELDS
     // Technical fields
     rule_id: rule.rule_id,
     version: rule.version,
-    meta: rule.meta ?? {},
 
     // Main domain fields
     name: rule.name,
@@ -140,8 +139,6 @@ const extractDiffableCommonFields = (
 
     // Other domain fields
     rule_schedule: extractRuleSchedule(rule),
-    actions: (rule.actions ?? []) as RuleActionArray,
-    throttle: rule.throttle ?? 'no_actions',
     exceptions_list: rule.exceptions_list ?? [],
     max_signals: rule.max_signals ?? DEFAULT_MAX_SIGNALS,
 
@@ -155,29 +152,27 @@ const extractDiffableCommonFields = (
 
 const extractDiffableCustomQueryFields = (
   rule: QueryRule | QueryRuleCreateProps
-): DiffableCustomQueryFields => {
+): RequiredOptional<DiffableCustomQueryFields> => {
   return {
     type: rule.type,
     kql_query: extractRuleKqlQuery(rule.query, rule.language, rule.filters, rule.saved_id),
     data_source: extractRuleDataSource(rule.index, rule.data_view_id),
-    alert_suppression: rule.alert_suppression,
   };
 };
 
 const extractDiffableSavedQueryFieldsFromRuleObject = (
   rule: SavedQueryRule | SavedQueryRuleCreateProps
-): DiffableSavedQueryFields => {
+): RequiredOptional<DiffableSavedQueryFields> => {
   return {
     type: rule.type,
     kql_query: extractRuleKqlQuery(rule.query, rule.language, rule.filters, rule.saved_id),
     data_source: extractRuleDataSource(rule.index, rule.data_view_id),
-    alert_suppression: rule.alert_suppression,
   };
 };
 
 const extractDiffableEqlFieldsFromRuleObject = (
   rule: EqlRule | EqlRuleCreateProps
-): DiffableEqlFields => {
+): RequiredOptional<DiffableEqlFields> => {
   return {
     type: rule.type,
     eql_query: extractRuleEqlQuery(rule.query, rule.language, rule.filters),
@@ -190,7 +185,7 @@ const extractDiffableEqlFieldsFromRuleObject = (
 
 const extractDiffableEsqlFieldsFromRuleObject = (
   rule: EsqlRule | EsqlRuleCreateProps
-): DiffableEsqlFields => {
+): RequiredOptional<DiffableEsqlFields> => {
   return {
     type: rule.type,
     esql_query: extractRuleEsqlQuery(rule.query, rule.language),
@@ -199,7 +194,7 @@ const extractDiffableEsqlFieldsFromRuleObject = (
 
 const extractDiffableThreatMatchFieldsFromRuleObject = (
   rule: ThreatMatchRule | ThreatMatchRuleCreateProps
-): DiffableThreatMatchFields => {
+): RequiredOptional<DiffableThreatMatchFields> => {
   return {
     type: rule.type,
     kql_query: extractRuleKqlQuery(rule.query, rule.language, rule.filters, rule.saved_id),
@@ -219,7 +214,7 @@ const extractDiffableThreatMatchFieldsFromRuleObject = (
 
 const extractDiffableThresholdFieldsFromRuleObject = (
   rule: ThresholdRule | ThresholdRuleCreateProps
-): DiffableThresholdFields => {
+): RequiredOptional<DiffableThresholdFields> => {
   return {
     type: rule.type,
     kql_query: extractRuleKqlQuery(rule.query, rule.language, rule.filters, rule.saved_id),
@@ -230,7 +225,7 @@ const extractDiffableThresholdFieldsFromRuleObject = (
 
 const extractDiffableMachineLearningFieldsFromRuleObject = (
   rule: MachineLearningRule | MachineLearningRuleCreateProps
-): DiffableMachineLearningFields => {
+): RequiredOptional<DiffableMachineLearningFields> => {
   return {
     type: rule.type,
     machine_learning_job_id: rule.machine_learning_job_id,
@@ -240,7 +235,7 @@ const extractDiffableMachineLearningFieldsFromRuleObject = (
 
 const extractDiffableNewTermsFieldsFromRuleObject = (
   rule: NewTermsRule | NewTermsRuleCreateProps
-): DiffableNewTermsFields => {
+): RequiredOptional<DiffableNewTermsFields> => {
   return {
     type: rule.type,
     kql_query: extractInlineKqlQuery(rule.query, rule.language, rule.filters),
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/extract_rule_schedule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/extract_rule_schedule.ts
index 28880523c774c..a15a4fcb930cd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/extract_rule_schedule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/diff/normalization/extract_rule_schedule.ts
@@ -9,7 +9,10 @@ import moment from 'moment';
 import dateMath from '@elastic/datemath';
 import { parseDuration } from '@kbn/alerting-plugin/common';
 
-import type { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type {
+  RuleMetadata,
+  RuleResponse,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
 import type { RuleSchedule } from '../../../../../../../common/api/detection_engine/prebuilt_rules';
 import type { PrebuiltRuleAsset } from '../../../model/rule_assets/prebuilt_rule_asset';
 
@@ -18,8 +21,7 @@ export const extractRuleSchedule = (rule: RuleResponse | PrebuiltRuleAsset): Rul
   const from = rule.from ?? 'now-6m';
   const to = rule.to ?? 'now';
 
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const ruleMeta = (rule.meta ?? {}) as any;
+  const ruleMeta: RuleMetadata = ('meta' in rule ? rule.meta : undefined) ?? {};
   const lookbackFromMeta = String(ruleMeta.from ?? '');
 
   const intervalDuration = parseInterval(interval);
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client.ts
new file mode 100644
index 0000000000000..0776fefb98656
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const createPrebuiltRuleAssetsClient = () => {
+  return {
+    fetchLatestAssets: jest.fn(),
+    fetchLatestVersions: jest.fn(),
+    fetchAssetsByVersion: jest.fn(),
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client.ts
index 7ad4df3cddabd..1138a48cc39d4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/logic/rule_objects/prebuilt_rule_objects_client.ts
@@ -13,7 +13,7 @@ import type {
 import { withSecuritySpan } from '../../../../../utils/with_security_span';
 import { findRules } from '../../../rule_management/logic/search/find_rules';
 import { getExistingPrepackagedRules } from '../../../rule_management/logic/search/get_existing_prepackaged_rules';
-import { internalRuleToAPIResponse } from '../../../rule_management/normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../../../rule_management/logic/detection_rules_client/converters/internal_rule_to_api_response';
 
 export interface IPrebuiltRuleObjectsClient {
   fetchAllInstalledRules(): Promise<RuleResponse[]>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.test.ts
index 06ccf0a2b97f4..e4d9255dc2b95 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.test.ts
@@ -32,6 +32,33 @@ describe('Prebuilt rule asset schema', () => {
     expect(result.data).toEqual(getPrebuiltRuleMock());
   });
 
+  describe('ommited fields from the rule schema are ignored', () => {
+    // The PrebuiltRuleAsset schema is built out of the rule schema,
+    // but the following fields are manually omitted.
+    // See: detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.ts
+    const omittedFields = [
+      'actions',
+      'throttle',
+      'meta',
+      'output_index',
+      'namespace',
+      'alias_purpose',
+      'alias_target_id',
+      'outcome',
+    ];
+
+    test.each(omittedFields)('ignores %s since it`s an omitted field', (field) => {
+      const payload: Partial<PrebuiltRuleAsset> & Record<string, unknown> = {
+        ...getPrebuiltRuleMock(),
+        [field]: 'some value',
+      };
+
+      const result = PrebuiltRuleAsset.safeParse(payload);
+      expectParseSuccess(result);
+      expect(result.data).toEqual(getPrebuiltRuleMock());
+    });
+  });
+
   test('[rule_id] does not validate', () => {
     const payload: Partial<PrebuiltRuleAsset> = {
       rule_id: 'rule-1',
@@ -64,17 +91,6 @@ describe('Prebuilt rule asset schema', () => {
     expect(result.data).toEqual(payload);
   });
 
-  test('You can send in a namespace', () => {
-    const payload: PrebuiltRuleAsset = {
-      ...getPrebuiltRuleMock(),
-      namespace: 'a namespace',
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseSuccess(result);
-    expect(result.data).toEqual(payload);
-  });
-
   test('You can send in an empty array to threat', () => {
     const payload: PrebuiltRuleAsset = {
       ...getPrebuiltRuleMock(),
@@ -449,32 +465,6 @@ describe('Prebuilt rule asset schema', () => {
     expect(result.data).toEqual(payload);
   });
 
-  test('You can set meta to any object you want', () => {
-    const payload: PrebuiltRuleAsset = {
-      ...getPrebuiltRuleMock(),
-      meta: {
-        somethingMadeUp: { somethingElse: true },
-      },
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseSuccess(result);
-    expect(result.data).toEqual(payload);
-  });
-
-  test('You cannot create meta as a string', () => {
-    const payload: Omit<PrebuiltRuleAsset, 'meta'> & { meta: string } = {
-      ...getPrebuiltRuleMock(),
-      meta: 'should not work',
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
-      `"meta: Expected object, received string"`
-    );
-  });
-
   test('validates with timeline_id and timeline_title', () => {
     const payload: PrebuiltRuleAsset = {
       ...getPrebuiltRuleMock(),
@@ -500,71 +490,6 @@ describe('Prebuilt rule asset schema', () => {
     );
   });
 
-  test('You cannot send in an array of actions that are missing "group"', () => {
-    const payload: Omit<PrebuiltRuleAsset['actions'], 'group'> = {
-      ...getPrebuiltRuleMock(),
-      actions: [{ id: 'id', action_type_id: 'action_type_id', params: {} }],
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(`"actions.0.group: Required"`);
-  });
-
-  test('You cannot send in an array of actions that are missing "id"', () => {
-    const payload: Omit<PrebuiltRuleAsset['actions'], 'id'> = {
-      ...getPrebuiltRuleMock(),
-      actions: [{ group: 'group', action_type_id: 'action_type_id', params: {} }],
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(`"actions.0.id: Required"`);
-  });
-
-  test('You cannot send in an array of actions that are missing "action_type_id"', () => {
-    const payload: Omit<PrebuiltRuleAsset['actions'], 'action_type_id'> = {
-      ...getPrebuiltRuleMock(),
-      actions: [{ group: 'group', id: 'id', params: {} }],
-    };
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
-      `"actions.0.action_type_id: Required"`
-    );
-  });
-
-  test('You cannot send in an array of actions that are missing "params"', () => {
-    const payload: Omit<PrebuiltRuleAsset['actions'], 'params'> = {
-      ...getPrebuiltRuleMock(),
-      actions: [{ group: 'group', id: 'id', action_type_id: 'action_type_id' }],
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(`"actions.0.params: Required"`);
-  });
-
-  test('You cannot send in an array of actions that are including "actionTypeId"', () => {
-    const payload: Omit<PrebuiltRuleAsset['actions'], 'actions'> = {
-      ...getPrebuiltRuleMock(),
-      actions: [
-        {
-          group: 'group',
-          id: 'id',
-          actionTypeId: 'actionTypeId',
-          params: {},
-        },
-      ],
-    };
-
-    const result = PrebuiltRuleAsset.safeParse(payload);
-    expectParseError(result);
-    expect(stringifyZodError(result.error)).toMatchInlineSnapshot(
-      `"actions.0.action_type_id: Required"`
-    );
-  });
-
   describe('note', () => {
     test('You can set note to a string', () => {
       const payload: PrebuiltRuleAsset = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.ts
index 38ead608a3b75..056a3998e3b3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/prebuilt_rules/model/rule_assets/prebuilt_rule_asset.ts
@@ -10,9 +10,64 @@ import {
   RuleSignatureId,
   RuleVersion,
   BaseCreateProps,
-  TypeSpecificCreateProps,
+  EqlRuleCreateFields,
+  EsqlRuleCreateFields,
+  MachineLearningRuleCreateFields,
+  NewTermsRuleCreateFields,
+  QueryRuleCreateFields,
+  SavedQueryRuleCreateFields,
+  ThreatMatchRuleCreateFields,
+  ThresholdRuleCreateFields,
 } from '../../../../../../common/api/detection_engine/model/rule_schema';
 
+/**
+ * The PrebuiltRuleAsset schema is created based on the rule schema defined in our OpenAPI specs.
+ * However, we don't need all the rule schema fields to be present in the PrebuiltRuleAsset.
+ * We omit some of them because they are not present in https://github.com/elastic/detection-rules.
+ * Context: https://github.com/elastic/kibana/issues/180393
+ */
+const BASE_PROPS_REMOVED_FROM_PREBUILT_RULE_ASSET = zodMaskFor<BaseCreateProps>()([
+  'actions',
+  'throttle',
+  'meta',
+  'output_index',
+  'namespace',
+  'alias_purpose',
+  'alias_target_id',
+  'outcome',
+]);
+
+// `response_actions` is only part of the optional fields in QueryRuleCreateFields and SavedQueryRuleCreateFields
+const TYPE_SPECIFIC_PROPS_REMOVED_FROM_PREBUILT_RULE_ASSET = zodMaskFor<
+  QueryRuleCreateFields | SavedQueryRuleCreateFields
+>()(['response_actions']);
+
+const QueryRuleAssetFields = QueryRuleCreateFields.omit(
+  TYPE_SPECIFIC_PROPS_REMOVED_FROM_PREBUILT_RULE_ASSET
+);
+const SavedQueryRuleAssetFields = SavedQueryRuleCreateFields.omit(
+  TYPE_SPECIFIC_PROPS_REMOVED_FROM_PREBUILT_RULE_ASSET
+);
+
+export const RuleAssetTypeSpecificCreateProps = z.discriminatedUnion('type', [
+  EqlRuleCreateFields,
+  QueryRuleAssetFields,
+  SavedQueryRuleAssetFields,
+  ThresholdRuleCreateFields,
+  ThreatMatchRuleCreateFields,
+  MachineLearningRuleCreateFields,
+  NewTermsRuleCreateFields,
+  EsqlRuleCreateFields,
+]);
+
+function zodMaskFor<T>() {
+  return function <U extends keyof T>(props: U[]): Record<U, true> {
+    type PropObject = Record<string, boolean>;
+    const propObjects: PropObject[] = props.map((p: U) => ({ [p]: true }));
+    return Object.assign({}, ...propObjects);
+  };
+}
+
 /**
  * Asset containing source content of a prebuilt Security detection rule.
  * Is defined for each prebuilt rule in https://github.com/elastic/detection-rules.
@@ -24,13 +79,16 @@ import {
  *   - Data Exfiltration Detection
  *
  * Big differences between this schema and RuleCreateProps:
- *  - rule_id is required here
- *  - version is a required field that must exist
+ *  - rule_id is a required field
+ *  - version is a required field
+ *  - some fields are omitted because they are not present in https://github.com/elastic/detection-rules
  */
 export type PrebuiltRuleAsset = z.infer<typeof PrebuiltRuleAsset>;
-export const PrebuiltRuleAsset = BaseCreateProps.and(TypeSpecificCreateProps).and(
-  z.object({
-    rule_id: RuleSignatureId,
-    version: RuleVersion,
-  })
-);
+export const PrebuiltRuleAsset = BaseCreateProps.omit(BASE_PROPS_REMOVED_FROM_PREBUILT_RULE_ASSET)
+  .and(RuleAssetTypeSpecificCreateProps)
+  .and(
+    z.object({
+      rule_id: RuleSignatureId,
+      version: RuleVersion,
+    })
+  );
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.test.ts
index 5d81134325c50..094f3e560ec3e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.test.ts
@@ -6,7 +6,6 @@
  */
 
 import { requestMock, serverMock } from '../__mocks__';
-import type { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_MIGRATION_URL } from '../../../../../common/constants';
 import { getCreateSignalsMigrationSchemaMock } from '../../../../../common/api/detection_engine/signals_migration/create_signals_migration/create_signals_migration_route.mock';
 import { getIndexVersionsByIndex } from '../../migrations/get_index_versions_by_index';
@@ -43,13 +42,7 @@ describe('creating signals migrations route', () => {
     (getIndexVersionsByIndex as jest.Mock).mockResolvedValue({ 'my-signals-index': -1 });
     (getSignalVersionsByIndex as jest.Mock).mockResolvedValue({ 'my-signals-index': [] });
 
-    const securityMock = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue({ user: { username: 'my-username' } }),
-      },
-    } as unknown as SetupPlugins['security'];
-
-    createSignalsMigrationRoute(server.router, securityMock);
+    createSignalsMigrationRoute(server.router);
   });
 
   it('passes options to the createMigration', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
index b6e7ae696b755..8d8d80a700478 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts
@@ -9,7 +9,6 @@ import { transformError, BadRequestError, getIndexAliases } from '@kbn/securitys
 import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import { CreateAlertsMigrationRequestBody } from '../../../../../common/api/detection_engine/signals_migration';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
-import type { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_MIGRATION_URL } from '../../../../../common/constants';
 import { buildSiemResponse } from '../utils';
 
@@ -20,10 +19,7 @@ import { isOutdated, signalsAreOutdated } from '../../migrations/helpers';
 import { getIndexVersionsByIndex } from '../../migrations/get_index_versions_by_index';
 import { getSignalVersionsByIndex } from '../../migrations/get_signal_versions_by_index';
 
-export const createSignalsMigrationRoute = (
-  router: SecuritySolutionPluginRouter,
-  security: SetupPlugins['security']
-) => {
+export const createSignalsMigrationRoute = (router: SecuritySolutionPluginRouter) => {
   router.versioned
     .post({
       path: DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
@@ -53,7 +49,7 @@ export const createSignalsMigrationRoute = (
           if (!appClient) {
             return siemResponse.error({ statusCode: 404 });
           }
-          const user = await security?.authc.getCurrentUser(request);
+          const user = core.security.authc.getCurrentUser();
           const migrationService = signalsMigrationService({
             esClient,
             soClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
index f4452c73eaf78..c4838280ac6a4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts
@@ -9,17 +9,13 @@ import { transformError } from '@kbn/securitysolution-es-utils';
 import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import { AlertsMigrationCleanupRequestBody } from '../../../../../common/api/detection_engine/signals_migration';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
-import type { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_MIGRATION_URL } from '../../../../../common/constants';
 import { buildSiemResponse } from '../utils';
 
 import { signalsMigrationService } from '../../migrations/migration_service';
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
 
-export const deleteSignalsMigrationRoute = (
-  router: SecuritySolutionPluginRouter,
-  security: SetupPlugins['security']
-) => {
+export const deleteSignalsMigrationRoute = (router: SecuritySolutionPluginRouter) => {
   router.versioned
     .delete({
       path: DETECTION_ENGINE_SIGNALS_MIGRATION_URL,
@@ -50,7 +46,7 @@ export const deleteSignalsMigrationRoute = (
             return siemResponse.error({ statusCode: 404 });
           }
 
-          const user = await security?.authc.getCurrentUser(request);
+          const user = core.security.authc.getCurrentUser();
           const migrationService = signalsMigrationService({
             esClient,
             soClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
index 341cff93ccc63..8183c0bbac7bd 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.test.ts
@@ -6,7 +6,6 @@
  */
 
 import { serverMock } from '../__mocks__';
-import type { SetupPlugins } from '../../../../plugin';
 import { getFinalizeSignalsMigrationRequest } from '../__mocks__/request_responses';
 import { getMigrationSavedObjectsById } from '../../migrations/get_migration_saved_objects_by_id';
 import { getSignalsMigrationSavedObjectMock } from '../../migrations/saved_objects_schema.mock';
@@ -22,14 +21,9 @@ describe('finalizing signals migrations', () => {
   beforeEach(() => {
     server = serverMock.create();
 
-    const securityMock = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue({ user: { username: 'my-username' } }),
-      },
-    } as unknown as SetupPlugins['security'];
     const ruleDataPluginServiceMock =
       ruleDataServiceMock.create() as unknown as RuleDataPluginService;
-    finalizeSignalsMigrationRoute(server.router, ruleDataPluginServiceMock, securityMock);
+    finalizeSignalsMigrationRoute(server.router, ruleDataPluginServiceMock);
   });
 
   it('returns an empty array error if no migrations exists', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
index 468baae7fdcad..9e09ffe0cf895 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts
@@ -10,7 +10,6 @@ import type { RuleDataPluginService } from '@kbn/rule-registry-plugin/server';
 import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import { FinalizeAlertsMigrationRequestBody } from '../../../../../common/api/detection_engine/signals_migration';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
-import type { SetupPlugins } from '../../../../plugin';
 import { DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL } from '../../../../../common/constants';
 import { isMigrationFailed, isMigrationPending } from '../../migrations/helpers';
 import { signalsMigrationService } from '../../migrations/migration_service';
@@ -20,8 +19,7 @@ import { getMigrationSavedObjectsById } from '../../migrations/get_migration_sav
 
 export const finalizeSignalsMigrationRoute = (
   router: SecuritySolutionPluginRouter,
-  ruleDataService: RuleDataPluginService,
-  security: SetupPlugins['security']
+  ruleDataService: RuleDataPluginService
 ) => {
   router.versioned
     .post({
@@ -53,7 +51,7 @@ export const finalizeSignalsMigrationRoute = (
           if (!appClient) {
             return siemResponse.error({ statusCode: 404 });
           }
-          const user = await security?.authc.getCurrentUser(request);
+          const user = core.security.authc.getCurrentUser();
           const migrationService = signalsMigrationService({
             esClient,
             soClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
index 1b2bdb6ca1ef4..a1569e8bcab07 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { coreMock, loggingSystemMock } from '@kbn/core/server/mocks';
+import { loggingSystemMock } from '@kbn/core/server/mocks';
 
 import { DETECTION_ENGINE_SIGNALS_STATUS_URL } from '../../../../../common/constants';
 import {
@@ -24,18 +24,8 @@ describe('set signal status', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { context } = requestContextMock.createTools();
   let logger: ReturnType<typeof loggingSystemMock.createLogger>;
-  let mockCore: ReturnType<typeof coreMock.createSetup>;
 
   beforeEach(() => {
-    mockCore = coreMock.createSetup({
-      pluginStartDeps: {
-        security: {
-          authc: {
-            getCurrentUser: jest.fn().mockReturnValue({ user: { username: 'my-username' } }),
-          },
-        },
-      },
-    });
     server = serverMock.create();
     logger = loggingSystemMock.createLogger();
     ({ context } = requestContextMock.createTools());
@@ -44,7 +34,7 @@ describe('set signal status', () => {
       getSuccessfulSignalUpdateResponse()
     );
     const telemetrySenderMock = createMockTelemetryEventsSender();
-    setSignalsStatusRoute(server.router, logger, telemetrySenderMock, mockCore.getStartServices);
+    setSignalsStatusRoute(server.router, logger, telemetrySenderMock);
   });
 
   describe('status on signal', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
index 5db7cc16b05ec..dde24af7007c4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/open_close_signals_route.ts
@@ -12,8 +12,7 @@ import {
   ALERT_WORKFLOW_STATUS_UPDATED_AT,
   ALERT_WORKFLOW_USER,
 } from '@kbn/rule-data-utils';
-import type { ElasticsearchClient, Logger, StartServicesAccessor } from '@kbn/core/server';
-import type { AuthenticatedUser } from '@kbn/security-plugin/common';
+import type { AuthenticatedUser, ElasticsearchClient, Logger } from '@kbn/core/server';
 import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import { SetAlertsStatusRequestBody } from '../../../../../common/api/detection_engine/signals';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
@@ -24,7 +23,6 @@ import {
 import { buildSiemResponse } from '../utils';
 import type { ITelemetryEventsSender } from '../../../telemetry/sender';
 import { INSIGHTS_CHANNEL } from '../../../telemetry/constants';
-import type { StartPlugins } from '../../../../plugin';
 import {
   getSessionIDfromKibanaRequest,
   createAlertStatusPayloads,
@@ -33,8 +31,7 @@ import {
 export const setSignalsStatusRoute = (
   router: SecuritySolutionPluginRouter,
   logger: Logger,
-  sender: ITelemetryEventsSender,
-  startServices: StartServicesAccessor<StartPlugins>
+  sender: ITelemetryEventsSender
 ) => {
   router.versioned
     .post({
@@ -65,14 +62,10 @@ export const setSignalsStatusRoute = (
         if (!siemClient) {
           return siemResponse.error({ statusCode: 404 });
         }
-        const [_, { security }] = await startServices();
-        const user = security.authc.getCurrentUser(request);
+        const user = core.security.authc.getCurrentUser();
 
         const clusterId = sender.getClusterID();
-        const [isTelemetryOptedIn, username] = await Promise.all([
-          sender.isTelemetryOptedIn(),
-          security?.authc.getCurrentUser(request)?.username,
-        ]);
+        const isTelemetryOptedIn = await sender.isTelemetryOptedIn();
 
         if (isTelemetryOptedIn && clusterId) {
           // Sometimes the ids are in the query not passed in the request?
@@ -82,16 +75,16 @@ export const setSignalsStatusRoute = (
               : (get(request.body.query, 'bool.filter.terms._id') as string[]);
           // Get Context for Insights Payloads
           const sessionId = getSessionIDfromKibanaRequest(clusterId, request);
-          if (username && toSendAlertIds && sessionId && status) {
+          if (user?.username && toSendAlertIds && sessionId && status) {
             const insightsPayloads = createAlertStatusPayloads(
               clusterId,
               toSendAlertIds,
               sessionId,
-              username,
+              user.username,
               DETECTION_ENGINE_SIGNALS_STATUS_URL,
               status
             );
-            logger.debug(`Sending Insights Payloads ${JSON.stringify(insightsPayloads)}`);
+            logger.debug(() => `Sending Insights Payloads ${JSON.stringify(insightsPayloads)}`);
             await sender.sendOnDemand(INSIGHTS_CHANNEL, insightsPayloads);
           }
         }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.test.ts
index a5381504e98fd..cabb7b002667b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.test.ts
@@ -246,11 +246,11 @@ describe('schedule_throttle_notification_actions', () => {
       logger,
       signals: [],
     });
+
+    const debugMessages = loggingSystemMock.collect(logger).debug.map((values) => values[0]);
     // We only test the first part since it has date math using math
-    expect(logger.debug.mock.calls[0][0]).toMatch(
-      /The notification throttle resultsLink created is/
-    );
-    expect(logger.debug.mock.calls[1][0]).toEqual(
+    expect(debugMessages[0]).toMatch(/The notification throttle resultsLink created is/);
+    expect(debugMessages[1]).toEqual(
       'The notification throttle query result size before deconflicting duplicates is: 1. The notification throttle passed in signals size before deconflicting duplicates is: 0. The deconflicted size and size of the signals sent into throttle notification is: 1. The signals count from results size is: 1. The final signals count being sent to the notification is: 1.'
     );
     // error should not have been called in this case.
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.ts
index 27ffd575029c5..19922f5a53b30 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_actions_legacy/logic/notifications/schedule_throttle_notification_actions.ts
@@ -69,7 +69,7 @@ export const scheduleThrottledNotificationActions = async ({
       kibanaSiemAppUrl,
     });
 
-    logger.debug(
+    logger.debug(() =>
       [
         `The notification throttle resultsLink created is: ${resultsLink}.`,
         ' Notification throttle is querying the results using',
@@ -117,7 +117,7 @@ export const scheduleThrottledNotificationActions = async ({
 
     // Subtract any deconflicted differences from the total count.
     const signalsCount = signalsCountFromResults + signals.length - deconflictedDiff;
-    logger.debug(
+    logger.debug(() =>
       [
         `The notification throttle query result size before deconflicting duplicates is: ${resultsFlattened.length}.`,
         ` The notification throttle passed in signals size before deconflicting duplicates is: ${signals.length}.`,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts
index c8c257770e26a..060043c14819f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_exceptions/api/create_rule_exceptions/route.ts
@@ -295,7 +295,7 @@ export const createAndAssociateDefaultExceptionList = async ({
     : existingRuleExceptionLists;
 
   await detectionRulesClient.patchRule({
-    nextParams: {
+    rulePatch: {
       rule_id: rule.params.ruleId,
       ...rule.params,
       exceptions_list: [
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/bulk_actions_response.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/bulk_actions_response.ts
index 2bf14ccbf085e..1b78da705e346 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/bulk_actions_response.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_actions/bulk_actions_response.ts
@@ -25,7 +25,7 @@ import type { BulkActionsDryRunErrCode } from '../../../../../../../common/const
 import type { PromisePoolError } from '../../../../../../utils/promise_pool';
 import type { RuleAlertType } from '../../../../rule_schema';
 import type { DryRunError } from '../../../logic/bulk_actions/dry_run';
-import { internalRuleToAPIResponse } from '../../../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../../../logic/detection_rules_client/converters/internal_rule_to_api_response';
 
 const MAX_ERROR_MESSAGE_LENGTH = 1000;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
index 3b16ba5fa4742..da75e4e33362a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/bulk_patch_rules/route.ts
@@ -86,7 +86,7 @@ export const bulkPatchRulesRoute = (router: SecuritySolutionPluginRouter, logger
                 });
 
                 const patchedRule = await detectionRulesClient.patchRule({
-                  nextParams: payloadRule,
+                  rulePatch: payloadRule,
                 });
 
                 return patchedRule;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
index 0e508f43103d6..3886f63c482b0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/api/rules/patch_rule/route.ts
@@ -76,7 +76,7 @@ export const patchRuleRoute = (router: SecuritySolutionPluginRouter) => {
           });
 
           const patchedRule = await detectionRulesClient.patchRule({
-            nextParams: params,
+            rulePatch: params,
           });
 
           return response.ok({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
index 7e379651b2faf..f2e147ef3154f 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/index.ts
@@ -7,12 +7,7 @@
 
 export * from './api/register_routes';
 
-// TODO: https://github.com/elastic/kibana/pull/142950
-// TODO: Revisit and consider moving to the rule_schema subdomain
-export {
-  commonParamsCamelToSnake,
-  typeSpecificCamelToSnake,
-  convertCreateAPIToInternalSchema,
-} from './normalization/rule_converters';
+export { commonParamsCamelToSnake } from './logic/detection_rules_client/converters/common_params_camel_to_snake';
+export { typeSpecificCamelToSnake } from './logic/detection_rules_client/converters/type_specific_camel_to_snake';
 
 export { transformFromAlertThrottle, transformToNotifyWhen } from './normalization/rule_actions';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/actions/duplicate_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/actions/duplicate_rule.ts
index dd22dac3adc77..1dfa3a9b0e9ad 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/actions/duplicate_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/actions/duplicate_rule.ts
@@ -12,7 +12,6 @@ import type { SanitizedRule } from '@kbn/alerting-plugin/common';
 import { SERVER_APP_ID } from '../../../../../../common/constants';
 import type { InternalRuleCreate, RuleParams } from '../../../rule_schema';
 import { transformToActionFrequency } from '../../normalization/rule_actions';
-import { convertImmutableToRuleSource } from '../../normalization/rule_converters';
 
 const DUPLICATE_TITLE = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.cloneRule.duplicateTitle',
@@ -47,7 +46,9 @@ export const duplicateRule = async ({ rule }: DuplicateRuleParams): Promise<Inte
     params: {
       ...rule.params,
       immutable,
-      ruleSource: convertImmutableToRuleSource(immutable),
+      ruleSource: {
+        type: 'internal',
+      },
       ruleId,
       relatedIntegrations,
       requiredFields,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.test.ts
new file mode 100644
index 0000000000000..ad4fd20243850
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.test.ts
@@ -0,0 +1,29 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getBaseRuleParams } from '../../../../rule_schema/mocks';
+import { commonParamsCamelToSnake } from './common_params_camel_to_snake';
+
+describe('commonParamsCamelToSnake', () => {
+  test('should convert rule_source params to snake case', () => {
+    const transformedParams = commonParamsCamelToSnake({
+      ...getBaseRuleParams(),
+      ruleSource: {
+        type: 'external',
+        isCustomized: false,
+      },
+    });
+    expect(transformedParams).toEqual(
+      expect.objectContaining({
+        rule_source: {
+          type: 'external',
+          is_customized: false,
+        },
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.ts
new file mode 100644
index 0000000000000..6f98230043e74
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/common_params_camel_to_snake.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { convertObjectKeysToSnakeCase } from '../../../../../../utils/object_case_converters';
+import type { BaseRuleParams } from '../../../../rule_schema';
+import { migrateLegacyInvestigationFields } from '../../../utils/utils';
+
+export const commonParamsCamelToSnake = (params: BaseRuleParams) => {
+  return {
+    description: params.description,
+    risk_score: params.riskScore,
+    severity: params.severity,
+    building_block_type: params.buildingBlockType,
+    namespace: params.namespace,
+    note: params.note,
+    license: params.license,
+    output_index: params.outputIndex,
+    timeline_id: params.timelineId,
+    timeline_title: params.timelineTitle,
+    meta: params.meta,
+    rule_name_override: params.ruleNameOverride,
+    timestamp_override: params.timestampOverride,
+    timestamp_override_fallback_disabled: params.timestampOverrideFallbackDisabled,
+    investigation_fields: migrateLegacyInvestigationFields(params.investigationFields),
+    author: params.author,
+    false_positives: params.falsePositives,
+    from: params.from,
+    rule_id: params.ruleId,
+    max_signals: params.maxSignals,
+    risk_score_mapping: params.riskScoreMapping,
+    severity_mapping: params.severityMapping,
+    threat: params.threat,
+    to: params.to,
+    references: params.references,
+    version: params.version,
+    exceptions_list: params.exceptionsList,
+    immutable: params.immutable,
+    rule_source: convertObjectKeysToSnakeCase(params.ruleSource),
+    related_integrations: params.relatedIntegrations ?? [],
+    required_fields: params.requiredFields ?? [],
+    setup: params.setup ?? '',
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_alerting_rule_to_rule_response.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_alerting_rule_to_rule_response.ts
new file mode 100644
index 0000000000000..ab7fb237e64f1
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_alerting_rule_to_rule_response.ts
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { SanitizedRule } from '@kbn/alerting-plugin/common';
+import { stringifyZodError } from '@kbn/zod-helpers';
+import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { RuleParams } from '../../../../rule_schema';
+import { internalRuleToAPIResponse } from './internal_rule_to_api_response';
+import { RuleResponseValidationError } from '../utils';
+
+export function convertAlertingRuleToRuleResponse(rule: SanitizedRule<RuleParams>): RuleResponse {
+  const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(rule));
+
+  if (!parseResult.success) {
+    throw new RuleResponseValidationError({
+      message: stringifyZodError(parseResult.error),
+      ruleId: rule.params.ruleId,
+    });
+  }
+
+  return parseResult.data;
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_prebuilt_rule_asset_to_rule_response.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_prebuilt_rule_asset_to_rule_response.ts
new file mode 100644
index 0000000000000..0cb42100d4512
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_prebuilt_rule_asset_to_rule_response.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { addEcsToRequiredFields } from '../../../utils/utils';
+import type { PrebuiltRuleAsset } from '../../../../prebuilt_rules';
+import { RULE_DEFAULTS } from '../mergers/apply_rule_defaults';
+
+export const convertPrebuiltRuleAssetToRuleResponse = (
+  prebuiltRuleAsset: PrebuiltRuleAsset
+): RuleResponse => {
+  const immutable = true;
+
+  const ruleResponseSpecificFields = {
+    id: uuidv4(),
+    updated_at: new Date().toISOString(),
+    updated_by: '',
+    created_at: new Date().toISOString(),
+    created_by: '',
+    immutable,
+    rule_source: {
+      type: 'external',
+      is_customized: false,
+    },
+    revision: 1,
+  };
+
+  return RuleResponse.parse({
+    ...RULE_DEFAULTS,
+    ...prebuiltRuleAsset,
+    required_fields: addEcsToRequiredFields(prebuiltRuleAsset.required_fields),
+    ...ruleResponseSpecificFields,
+  });
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_rule_response_to_alerting_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_rule_response_to_alerting_rule.ts
new file mode 100644
index 0000000000000..60a41211a66c5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/convert_rule_response_to_alerting_rule.ts
@@ -0,0 +1,210 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { UpdateRuleData } from '@kbn/alerting-plugin/server/application/rule/methods/update';
+import type {
+  RuleResponse,
+  TypeSpecificCreateProps,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import {
+  transformRuleToAlertAction,
+  transformRuleToAlertResponseAction,
+} from '../../../../../../../common/detection_engine/transform_actions';
+import {
+  normalizeMachineLearningJobIds,
+  normalizeThresholdObject,
+} from '../../../../../../../common/detection_engine/utils';
+import { assertUnreachable } from '../../../../../../../common/utility_types';
+import { convertObjectKeysToCamelCase } from '../../../../../../utils/object_case_converters';
+import type { RuleParams, TypeSpecificRuleParams } from '../../../../rule_schema';
+import { transformToActionFrequency } from '../../../normalization/rule_actions';
+import { addEcsToRequiredFields } from '../../../utils/utils';
+
+/**
+ * These are the fields that are added to the rule response that are not part of the rule params
+ */
+type RuntimeFields =
+  | 'id'
+  | 'created_at'
+  | 'updated_at'
+  | 'created_by'
+  | 'updated_by'
+  | 'revision'
+  | 'execution_summary';
+
+export const convertRuleResponseToAlertingRule = (
+  rule: Omit<RuleResponse, RuntimeFields>
+): UpdateRuleData<RuleParams> => {
+  const alertActions = rule.actions.map((action) => transformRuleToAlertAction(action));
+  const actions = transformToActionFrequency(alertActions, rule.throttle);
+
+  // Because of Omit<RuleResponse, RuntimeFields> Typescript doesn't recognize
+  // that rule is assignable to TypeSpecificCreateProps despite omitted fields
+  // are not part of type specific props. So we need to cast here.
+  const typeSpecificParams = typeSpecificSnakeToCamel(rule as TypeSpecificCreateProps);
+
+  return {
+    name: rule.name,
+    tags: rule.tags,
+    params: {
+      author: rule.author,
+      buildingBlockType: rule.building_block_type,
+      description: rule.description,
+      ruleId: rule.rule_id,
+      falsePositives: rule.false_positives,
+      from: rule.from,
+      investigationFields: rule.investigation_fields,
+      immutable: rule.immutable,
+      ruleSource: convertObjectKeysToCamelCase(rule.rule_source),
+      license: rule.license,
+      outputIndex: rule.output_index ?? '',
+      timelineId: rule.timeline_id,
+      timelineTitle: rule.timeline_title,
+      meta: rule.meta,
+      maxSignals: rule.max_signals,
+      relatedIntegrations: rule.related_integrations,
+      requiredFields: addEcsToRequiredFields(rule.required_fields),
+      riskScore: rule.risk_score,
+      riskScoreMapping: rule.risk_score_mapping,
+      ruleNameOverride: rule.rule_name_override,
+      setup: rule.setup,
+      severity: rule.severity,
+      severityMapping: rule.severity_mapping,
+      threat: rule.threat,
+      timestampOverride: rule.timestamp_override,
+      timestampOverrideFallbackDisabled: rule.timestamp_override_fallback_disabled,
+      to: rule.to,
+      references: rule.references,
+      namespace: rule.namespace,
+      note: rule.note,
+      version: rule.version,
+      exceptionsList: rule.exceptions_list,
+      ...typeSpecificParams,
+    },
+    schedule: { interval: rule.interval },
+    actions,
+  };
+};
+
+// Converts params from the snake case API format to the internal camel case format AND applies default values where needed.
+// Notice that params.language is possibly undefined for most rule types in the API but we default it to kuery to match
+// the legacy API behavior
+const typeSpecificSnakeToCamel = (params: TypeSpecificCreateProps): TypeSpecificRuleParams => {
+  switch (params.type) {
+    case 'eql': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        dataViewId: params.data_view_id,
+        query: params.query,
+        filters: params.filters,
+        timestampField: params.timestamp_field,
+        eventCategoryOverride: params.event_category_override,
+        tiebreakerField: params.tiebreaker_field,
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'esql': {
+      return {
+        type: params.type,
+        language: params.language,
+        query: params.query,
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'threat_match': {
+      return {
+        type: params.type,
+        language: params.language ?? 'kuery',
+        index: params.index,
+        dataViewId: params.data_view_id,
+        query: params.query,
+        filters: params.filters,
+        savedId: params.saved_id,
+        threatFilters: params.threat_filters,
+        threatQuery: params.threat_query,
+        threatMapping: params.threat_mapping,
+        threatLanguage: params.threat_language,
+        threatIndex: params.threat_index,
+        threatIndicatorPath: params.threat_indicator_path,
+        concurrentSearches: params.concurrent_searches,
+        itemsPerSearch: params.items_per_search,
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'query': {
+      return {
+        type: params.type,
+        language: params.language ?? 'kuery',
+        index: params.index,
+        dataViewId: params.data_view_id,
+        query: params.query ?? '',
+        filters: params.filters,
+        savedId: params.saved_id,
+        responseActions: params.response_actions?.map((rule) =>
+          transformRuleToAlertResponseAction(rule)
+        ),
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'saved_query': {
+      return {
+        type: params.type,
+        language: params.language ?? 'kuery',
+        index: params.index,
+        query: params.query,
+        filters: params.filters,
+        savedId: params.saved_id,
+        dataViewId: params.data_view_id,
+        responseActions: params.response_actions?.map((rule) =>
+          transformRuleToAlertResponseAction(rule)
+        ),
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'threshold': {
+      return {
+        type: params.type,
+        language: params.language ?? 'kuery',
+        index: params.index,
+        dataViewId: params.data_view_id,
+        query: params.query,
+        filters: params.filters,
+        savedId: params.saved_id,
+        threshold: normalizeThresholdObject(params.threshold),
+        alertSuppression: params.alert_suppression?.duration
+          ? { duration: params.alert_suppression.duration }
+          : undefined,
+      };
+    }
+    case 'machine_learning': {
+      return {
+        type: params.type,
+        anomalyThreshold: params.anomaly_threshold,
+        machineLearningJobId: normalizeMachineLearningJobIds(params.machine_learning_job_id),
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    case 'new_terms': {
+      return {
+        type: params.type,
+        query: params.query,
+        newTermsFields: params.new_terms_fields,
+        historyWindowStart: params.history_window_start,
+        index: params.index,
+        filters: params.filters,
+        language: params.language ?? 'kuery',
+        dataViewId: params.data_view_id,
+        alertSuppression: convertObjectKeysToCamelCase(params.alert_suppression),
+      };
+    }
+    default: {
+      return assertUnreachable(params);
+    }
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/internal_rule_to_api_response.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/internal_rule_to_api_response.ts
new file mode 100644
index 0000000000000..452f59df8dcf9
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/internal_rule_to_api_response.ts
@@ -0,0 +1,61 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
+import type { RequiredOptional } from '@kbn/zod-helpers';
+import type { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { transformAlertToRuleAction } from '../../../../../../../common/detection_engine/transform_actions';
+import { createRuleExecutionSummary } from '../../../../rule_monitoring';
+import type { RuleParams } from '../../../../rule_schema';
+import {
+  transformFromAlertThrottle,
+  transformToActionFrequency,
+} from '../../../normalization/rule_actions';
+import { typeSpecificCamelToSnake } from './type_specific_camel_to_snake';
+import { commonParamsCamelToSnake } from './common_params_camel_to_snake';
+
+export const internalRuleToAPIResponse = (
+  rule: SanitizedRule<RuleParams> | ResolvedSanitizedRule<RuleParams>
+): RequiredOptional<RuleResponse> => {
+  const executionSummary = createRuleExecutionSummary(rule);
+
+  const isResolvedRule = (obj: unknown): obj is ResolvedSanitizedRule<RuleParams> => {
+    const outcome = (obj as ResolvedSanitizedRule<RuleParams>).outcome;
+    return outcome != null && outcome !== 'exactMatch';
+  };
+
+  const alertActions = rule.actions.map(transformAlertToRuleAction);
+  const throttle = transformFromAlertThrottle(rule);
+  const actions = transformToActionFrequency(alertActions, throttle);
+
+  return {
+    // saved object properties
+    outcome: isResolvedRule(rule) ? rule.outcome : undefined,
+    alias_target_id: isResolvedRule(rule) ? rule.alias_target_id : undefined,
+    alias_purpose: isResolvedRule(rule) ? rule.alias_purpose : undefined,
+    // Alerting framework params
+    id: rule.id,
+    updated_at: rule.updatedAt.toISOString(),
+    updated_by: rule.updatedBy ?? 'elastic',
+    created_at: rule.createdAt.toISOString(),
+    created_by: rule.createdBy ?? 'elastic',
+    name: rule.name,
+    tags: rule.tags,
+    interval: rule.schedule.interval,
+    enabled: rule.enabled,
+    revision: rule.revision,
+    // Security solution shared rule params
+    ...commonParamsCamelToSnake(rule.params),
+    // Type specific security solution rule params
+    ...typeSpecificCamelToSnake(rule.params),
+    // Actions
+    throttle: undefined,
+    actions,
+    // Execution summary
+    execution_summary: executionSummary ?? undefined,
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.test.ts
new file mode 100644
index 0000000000000..08e6d3cc64b0a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.test.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  AlertSuppressionDuration,
+  AlertSuppressionMissingFieldsStrategy,
+} from '../../../../../../../common/api/detection_engine';
+import { getEqlRuleParams } from '../../../../rule_schema/mocks';
+import { typeSpecificCamelToSnake } from './type_specific_camel_to_snake';
+
+describe('typeSpecificCamelToSnake', () => {
+  describe('EQL', () => {
+    test('should accept EQL params when existing rule type is EQL', () => {
+      const params = {
+        timestampField: 'event.created',
+        eventCategoryOverride: 'event.not_category',
+        tiebreakerField: 'event.created',
+      };
+      const eqlRule = { ...getEqlRuleParams(), ...params };
+      const transformedParams = typeSpecificCamelToSnake(eqlRule);
+      expect(transformedParams).toEqual(
+        expect.objectContaining({
+          timestamp_field: 'event.created',
+          event_category_override: 'event.not_category',
+          tiebreaker_field: 'event.created',
+        })
+      );
+    });
+
+    test('should accept EQL params with suppression in camel case and convert to snake case when rule type is EQL', () => {
+      const params = {
+        timestampField: 'event.created',
+        eventCategoryOverride: 'event.not_category',
+        tiebreakerField: 'event.created',
+        alertSuppression: {
+          groupBy: ['event.type'],
+          duration: {
+            value: 10,
+            unit: 'm',
+          } as AlertSuppressionDuration,
+          missingFieldsStrategy: 'suppress' as AlertSuppressionMissingFieldsStrategy,
+        },
+      };
+      const eqlRule = { ...getEqlRuleParams(), ...params };
+      const transformedParams = typeSpecificCamelToSnake(eqlRule);
+      expect(transformedParams).toEqual(
+        expect.objectContaining({
+          timestamp_field: 'event.created',
+          event_category_override: 'event.not_category',
+          tiebreaker_field: 'event.created',
+          alert_suppression: {
+            group_by: ['event.type'],
+            duration: {
+              value: 10,
+              unit: 'm',
+            } as AlertSuppressionDuration,
+            missing_fields_strategy: 'suppress',
+          },
+        })
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.ts
new file mode 100644
index 0000000000000..0808d1921e9bf
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/converters/type_specific_camel_to_snake.ts
@@ -0,0 +1,127 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RequiredOptional } from '@kbn/zod-helpers';
+import type { TypeSpecificResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { transformAlertToRuleResponseAction } from '../../../../../../../common/detection_engine/transform_actions';
+import { assertUnreachable } from '../../../../../../../common/utility_types';
+import { convertObjectKeysToSnakeCase } from '../../../../../../utils/object_case_converters';
+import type { TypeSpecificRuleParams } from '../../../../rule_schema';
+
+export const typeSpecificCamelToSnake = (
+  params: TypeSpecificRuleParams
+): RequiredOptional<TypeSpecificResponse> => {
+  switch (params.type) {
+    case 'eql': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        data_view_id: params.dataViewId,
+        query: params.query,
+        filters: params.filters,
+        timestamp_field: params.timestampField,
+        event_category_override: params.eventCategoryOverride,
+        tiebreaker_field: params.tiebreakerField,
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'esql': {
+      return {
+        type: params.type,
+        language: params.language,
+        query: params.query,
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'threat_match': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        data_view_id: params.dataViewId,
+        query: params.query,
+        filters: params.filters,
+        saved_id: params.savedId,
+        threat_filters: params.threatFilters,
+        threat_query: params.threatQuery,
+        threat_mapping: params.threatMapping,
+        threat_language: params.threatLanguage,
+        threat_index: params.threatIndex,
+        threat_indicator_path: params.threatIndicatorPath,
+        concurrent_searches: params.concurrentSearches,
+        items_per_search: params.itemsPerSearch,
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'query': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        data_view_id: params.dataViewId,
+        query: params.query,
+        filters: params.filters,
+        saved_id: params.savedId,
+        response_actions: params.responseActions?.map(transformAlertToRuleResponseAction),
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'saved_query': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        query: params.query,
+        filters: params.filters,
+        saved_id: params.savedId,
+        data_view_id: params.dataViewId,
+        response_actions: params.responseActions?.map(transformAlertToRuleResponseAction),
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'threshold': {
+      return {
+        type: params.type,
+        language: params.language,
+        index: params.index,
+        data_view_id: params.dataViewId,
+        query: params.query,
+        filters: params.filters,
+        saved_id: params.savedId,
+        threshold: params.threshold,
+        alert_suppression: params.alertSuppression?.duration
+          ? { duration: params.alertSuppression?.duration }
+          : undefined,
+      };
+    }
+    case 'machine_learning': {
+      return {
+        type: params.type,
+        anomaly_threshold: params.anomalyThreshold,
+        machine_learning_job_id: params.machineLearningJobId,
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    case 'new_terms': {
+      return {
+        type: params.type,
+        query: params.query,
+        new_terms_fields: params.newTermsFields,
+        history_window_start: params.historyWindowStart,
+        index: params.index,
+        filters: params.filters,
+        language: params.language,
+        data_view_id: params.dataViewId,
+        alert_suppression: convertObjectKeysToSnakeCase(params.alertSuppression),
+      };
+    }
+    default: {
+      return assertUnreachable(params);
+    }
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_custom_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_custom_rule.test.ts
index 7aab6640a1b52..5578854ed95b2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_custom_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_custom_rule.test.ts
@@ -6,6 +6,7 @@
  */
 
 import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import {
   getCreateRulesSchemaMock,
@@ -35,7 +36,8 @@ describe('DetectionRulesClient.createCustomRule', () => {
     rulesClient = rulesClientMock.create();
     rulesClient.create.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('should create a rule with the correct parameters and options', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_prebuilt_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_prebuilt_rule.test.ts
index fd3ac991a968f..f91c577f3b2a0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_prebuilt_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.create_prebuilt_rule.test.ts
@@ -6,6 +6,7 @@
  */
 
 import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 import {
   getCreateRulesSchemaMock,
@@ -35,7 +36,8 @@ describe('DetectionRulesClient.createPrebuiltRule', () => {
     rulesClient = rulesClientMock.create();
     rulesClient.create.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('creates a rule with the correct parameters and options', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.delete_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.delete_rule.test.ts
index 37cb8e0aa709e..166656701f304 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.delete_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.delete_rule.test.ts
@@ -6,6 +6,7 @@
  */
 
 import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 import { buildMlAuthz } from '../../../../machine_learning/authz';
 import { createDetectionRulesClient } from './detection_rules_client';
 import type { IDetectionRulesClient } from './detection_rules_client_interface';
@@ -20,7 +21,8 @@ describe('DetectionRulesClient.deleteRule', () => {
 
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('should call rulesClient.delete passing the expected ruleId', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.import_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.import_rule.test.ts
index 474fecc186519..fb9b4f7995c90 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.import_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.import_rule.test.ts
@@ -6,19 +6,23 @@
  */
 
 import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
-import { readRules } from './read_rules';
-import { getCreateRulesSchemaMock } from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
-import { getRuleMock } from '../../../routes/__mocks__/request_responses';
-import { getQueryRuleParams } from '../../../rule_schema/mocks';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
+import {
+  getCreateRulesSchemaMock,
+  getRulesSchemaMock,
+} from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
 import { buildMlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
+import { getRuleMock } from '../../../routes/__mocks__/request_responses';
+import { getQueryRuleParams } from '../../../rule_schema/mocks';
 import { createDetectionRulesClient } from './detection_rules_client';
 import type { IDetectionRulesClient } from './detection_rules_client_interface';
+import { getRuleByRuleId } from './methods/get_rule_by_rule_id';
 
 jest.mock('../../../../machine_learning/authz');
 jest.mock('../../../../machine_learning/validation');
 
-jest.mock('./read_rules');
+jest.mock('./methods/get_rule_by_rule_id');
 
 describe('DetectionRulesClient.importRule', () => {
   let rulesClient: ReturnType<typeof rulesClientMock.create>;
@@ -34,21 +38,19 @@ describe('DetectionRulesClient.importRule', () => {
     version: 1,
     immutable,
   };
-  const existingRule = getRuleMock({
-    ...getQueryRuleParams({
-      ruleId: ruleToImport.rule_id,
-    }),
-  });
+  const existingRule = getRulesSchemaMock();
+  existingRule.rule_id = ruleToImport.rule_id;
 
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
     rulesClient.create.mockResolvedValue(getRuleMock(getQueryRuleParams()));
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('calls rulesClient.create with the correct parameters when rule_id does not match an installed rule', async () => {
-    (readRules as jest.Mock).mockResolvedValue(null);
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(null);
     await detectionRulesClient.importRule({
       ruleToImport,
       overwriteRules: true,
@@ -90,7 +92,8 @@ describe('DetectionRulesClient.importRule', () => {
 
   describe('when rule_id matches an installed rule', () => {
     it('calls rulesClient.update with the correct parameters when overwriteRules is true', async () => {
-      (readRules as jest.Mock).mockResolvedValue(existingRule);
+      (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
       await detectionRulesClient.importRule({
         ruleToImport,
         overwriteRules: true,
@@ -122,12 +125,9 @@ describe('DetectionRulesClient.importRule', () => {
     it('ensures overwritten rule DOES NOT preserve fields missed in the imported rule when "overwriteRules" is "true" and matching rule found', async () => {
       const existingRuleWithTimestampOverride = {
         ...existingRule,
-        params: {
-          ...existingRule.params,
-          timestamp_override: '2020-01-01T00:00:00Z',
-        },
+        timestamp_override: '2020-01-01T00:00:00Z',
       };
-      (readRules as jest.Mock).mockResolvedValue(existingRuleWithTimestampOverride);
+      (getRuleByRuleId as jest.Mock).mockResolvedValue(existingRuleWithTimestampOverride);
 
       await detectionRulesClient.importRule({
         ruleToImport: {
@@ -151,7 +151,7 @@ describe('DetectionRulesClient.importRule', () => {
     });
 
     it('rejects when overwriteRules is false', async () => {
-      (readRules as jest.Mock).mockResolvedValue(existingRule);
+      (getRuleByRuleId as jest.Mock).mockResolvedValue(existingRule);
       await expect(
         detectionRulesClient.importRule({
           ruleToImport,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.patch_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.patch_rule.test.ts
index 7f1c219888636..d17b12415642a 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.patch_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.patch_rule.test.ts
@@ -12,17 +12,20 @@ import { getMlRuleParams, getQueryRuleParams } from '../../../rule_schema/mocks'
 import {
   getCreateMachineLearningRulesSchemaMock,
   getCreateRulesSchemaMock,
+  getRulesMlSchemaMock,
+  getRulesSchemaMock,
 } from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
-import { readRules } from './read_rules';
+import { getRuleByRuleId } from './methods/get_rule_by_rule_id';
 import { buildMlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
 import { createDetectionRulesClient } from './detection_rules_client';
 import type { IDetectionRulesClient } from './detection_rules_client_interface';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../../machine_learning/authz');
 jest.mock('../../../../machine_learning/validation');
 
-jest.mock('./read_rules');
+jest.mock('./methods/get_rule_by_rule_id');
 
 describe('DetectionRulesClient.patchRule', () => {
   let rulesClient: ReturnType<typeof rulesClientMock.create>;
@@ -32,97 +35,78 @@ describe('DetectionRulesClient.patchRule', () => {
 
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('calls the rulesClient with expected params', async () => {
-    const nextParams = getCreateRulesSchemaMock();
-    const existingRule = getRuleMock(getQueryRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
+    // Mock the rule update
+    const rulePatch = getCreateRulesSchemaMock('query-rule-id');
+    rulePatch.name = 'new name';
+    rulePatch.description = 'new description';
+
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-    await detectionRulesClient.patchRule({ nextParams });
+    await detectionRulesClient.patchRule({ rulePatch });
 
     expect(rulesClient.update).toHaveBeenCalledWith(
       expect.objectContaining({
         data: expect.objectContaining({
-          name: nextParams.name,
+          name: rulePatch.name,
           params: expect.objectContaining({
-            ruleId: nextParams.rule_id,
-            description: nextParams.description,
+            ruleId: rulePatch.rule_id,
+            description: rulePatch.description,
           }),
         }),
       })
     );
   });
 
-  it('returns rule enabled: true if the nexParams have enabled: true', async () => {
-    const nextParams = { ...getCreateRulesSchemaMock(), enabled: true };
-    const existingRule = getRuleMock(getQueryRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
+  it('enables the rule if the nexParams have enabled: true', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    existingRule.enabled = false;
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
 
-    const rule = await detectionRulesClient.patchRule({ nextParams });
+    // Mock the rule update
+    const rulePatch = { ...getCreateRulesSchemaMock(), enabled: true };
 
-    expect(rule.enabled).toBe(true);
-  });
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
+    rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-  it('calls the rulesClient with legacy ML params', async () => {
-    const nextParams = getCreateMachineLearningRulesSchemaMock();
-    const existingRule = getRuleMock(getMlRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getMlRuleParams()));
+    const rule = await detectionRulesClient.patchRule({ rulePatch });
 
-    await detectionRulesClient.patchRule({ nextParams });
-    expect(rulesClient.update).toHaveBeenCalledWith(
+    expect(rule.enabled).toBe(true);
+    expect(rulesClient.enable).toHaveBeenCalledWith(
       expect.objectContaining({
-        data: expect.objectContaining({
-          params: expect.objectContaining({
-            anomalyThreshold: 58,
-            machineLearningJobId: ['typical-ml-job-id'],
-          }),
-        }),
+        id: existingRule.id,
       })
     );
   });
 
-  it('calls the rulesClient with new ML params', async () => {
-    const nextParams = {
-      ...getCreateMachineLearningRulesSchemaMock(),
-      machine_learning_job_id: ['new_job_1', 'new_job_2'],
-    };
-    const existingRule = getRuleMock(getMlRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getMlRuleParams()));
-
-    await detectionRulesClient.patchRule({ nextParams });
+  it('disables the rule if the nexParams have enabled: false', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    existingRule.enabled = true;
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
 
-    expect(rulesClient.update).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({
-          params: expect.objectContaining({
-            anomalyThreshold: 58,
-            machineLearningJobId: ['new_job_1', 'new_job_2'],
-          }),
-        }),
-      })
-    );
-  });
+    // Mock the rule update
+    const rulePatch = { ...getCreateRulesSchemaMock(), enabled: false };
 
-  it('should call rulesClient.disable if the rule was enabled and enabled is false', async () => {
-    const nextParams = {
-      ...getCreateRulesSchemaMock(),
-      enabled: false,
-    };
-    const existingRule = {
-      ...getRuleMock(getQueryRuleParams()),
-      enabled: true,
-    };
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-    await detectionRulesClient.patchRule({ nextParams });
+    const rule = await detectionRulesClient.patchRule({ rulePatch });
 
+    expect(rule.enabled).toBe(false);
     expect(rulesClient.disable).toHaveBeenCalledWith(
       expect.objectContaining({
         id: existingRule.id,
@@ -130,23 +114,29 @@ describe('DetectionRulesClient.patchRule', () => {
     );
   });
 
-  it('should call rulesClient.enable if the rule was disabled and enabled is true', async () => {
-    const nextParams = {
-      ...getCreateRulesSchemaMock(),
-      enabled: true,
-    };
-    const existingRule = {
-      ...getRuleMock(getQueryRuleParams()),
-      enabled: false,
-    };
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
+  it('calls the rulesClient with new ML params', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesMlSchemaMock();
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
 
-    await detectionRulesClient.patchRule({ nextParams });
+    // Mock the rule update
+    const rulePatch = getCreateMachineLearningRulesSchemaMock();
+    rulePatch.anomaly_threshold = 42;
+    rulePatch.machine_learning_job_id = ['new-job-id'];
 
-    expect(rulesClient.enable).toHaveBeenCalledWith(
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
+    rulesClient.update.mockResolvedValue(getRuleMock(getMlRuleParams()));
+
+    await detectionRulesClient.patchRule({ rulePatch });
+    expect(rulesClient.update).toHaveBeenCalledWith(
       expect.objectContaining({
-        id: existingRule.id,
+        data: expect.objectContaining({
+          params: expect.objectContaining({
+            anomalyThreshold: rulePatch.anomaly_threshold,
+            machineLearningJobId: rulePatch.machine_learning_job_id,
+          }),
+        }),
       })
     );
   });
@@ -156,21 +146,23 @@ describe('DetectionRulesClient.patchRule', () => {
       throw new Error('mocked MLAuth error');
     });
 
-    const nextParams = {
-      ...getCreateRulesSchemaMock(),
-      enabled: true,
-    };
+    const rulePatch = getCreateRulesSchemaMock();
 
-    await expect(detectionRulesClient.patchRule({ nextParams })).rejects.toThrow(
+    await expect(detectionRulesClient.patchRule({ rulePatch })).rejects.toThrow(
       'mocked MLAuth error'
     );
 
     expect(rulesClient.create).not.toHaveBeenCalled();
   });
 
-  describe('regression tests', () => {
+  describe('actions', () => {
     it("updates the rule's actions if provided", async () => {
-      const nextParams = {
+      // Mock the existing rule
+      const existingRule = getRulesSchemaMock();
+      (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
+      // Mock the rule update
+      const rulePatch = {
         ...getCreateRulesSchemaMock(),
         actions: [
           {
@@ -183,11 +175,12 @@ describe('DetectionRulesClient.patchRule', () => {
           },
         ],
       };
-      const existingRule = getRuleMock(getQueryRuleParams());
-      (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+
+      // Mock the rule returned after update; not used for this test directly but
+      // needed so that the patchRule method does not throw
       rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-      await detectionRulesClient.patchRule({ nextParams });
+      await detectionRulesClient.patchRule({ rulePatch });
 
       expect(rulesClient.update).toHaveBeenCalledWith(
         expect.objectContaining({
@@ -209,12 +202,12 @@ describe('DetectionRulesClient.patchRule', () => {
     });
 
     it('does not update actions if none are specified', async () => {
-      const nextParams = getCreateRulesSchemaMock();
-      delete nextParams.actions;
-      const existingRule = getRuleMock(getQueryRuleParams());
+      // Mock the existing rule
+      const existingRule = getRulesSchemaMock();
+      (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
       existingRule.actions = [
         {
-          actionTypeId: '.slack',
+          action_type_id: '.slack',
           id: '2933e581-d81c-4fe3-88fe-c57c6b8a5bfd',
           params: {
             message: 'Rule {{context.rule.name}} generated {{state.signals_count}} signals',
@@ -222,10 +215,16 @@ describe('DetectionRulesClient.patchRule', () => {
           group: 'default',
         },
       ];
-      (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+
+      // Mock the rule update
+      const rulePatch = getCreateRulesSchemaMock();
+      delete rulePatch.actions;
+
+      // Mock the rule returned after update; not used for this test directly but
+      // needed so that the patchRule method does not throw
       rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
-      await detectionRulesClient.patchRule({ nextParams });
+      await detectionRulesClient.patchRule({ rulePatch });
 
       expect(rulesClient.update).toHaveBeenCalledWith(
         expect.objectContaining({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.ts
index ce6043a420907..dfcfc8f7fa393 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.ts
@@ -6,73 +6,110 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import type { MlAuthz } from '../../../../machine_learning/authz';
-
+import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type { RuleResponse } from '../../../../../../common/api/detection_engine/model/rule_schema';
+import { withSecuritySpan } from '../../../../../utils/with_security_span';
+import type { MlAuthz } from '../../../../machine_learning/authz';
+import { createPrebuiltRuleAssetsClient } from '../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
 import type {
-  IDetectionRulesClient,
   CreateCustomRuleArgs,
   CreatePrebuiltRuleArgs,
-  UpdateRuleArgs,
-  PatchRuleArgs,
   DeleteRuleArgs,
-  UpgradePrebuiltRuleArgs,
+  IDetectionRulesClient,
   ImportRuleArgs,
+  PatchRuleArgs,
+  UpdateRuleArgs,
+  UpgradePrebuiltRuleArgs,
 } from './detection_rules_client_interface';
-
-import { createCustomRule } from './methods/create_custom_rule';
-import { createPrebuiltRule } from './methods/create_prebuilt_rule';
-import { updateRule } from './methods/update_rule';
-import { patchRule } from './methods/patch_rule';
+import { createRule } from './methods/create_rule';
 import { deleteRule } from './methods/delete_rule';
-import { upgradePrebuiltRule } from './methods/upgrade_prebuilt_rule';
 import { importRule } from './methods/import_rule';
+import { patchRule } from './methods/patch_rule';
+import { updateRule } from './methods/update_rule';
+import { upgradePrebuiltRule } from './methods/upgrade_prebuilt_rule';
 
-import { withSecuritySpan } from '../../../../../utils/with_security_span';
+interface DetectionRulesClientParams {
+  rulesClient: RulesClient;
+  savedObjectsClient: SavedObjectsClientContract;
+  mlAuthz: MlAuthz;
+}
+
+export const createDetectionRulesClient = ({
+  rulesClient,
+  mlAuthz,
+  savedObjectsClient,
+}: DetectionRulesClientParams): IDetectionRulesClient => {
+  const prebuiltRuleAssetClient = createPrebuiltRuleAssetsClient(savedObjectsClient);
 
-export const createDetectionRulesClient = (
-  rulesClient: RulesClient,
-  mlAuthz: MlAuthz
-): IDetectionRulesClient => ({
-  async createCustomRule(args: CreateCustomRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.createCustomRule', async () => {
-      return createCustomRule(rulesClient, args, mlAuthz);
-    });
-  },
+  return {
+    async createCustomRule(args: CreateCustomRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.createCustomRule', async () => {
+        return createRule({
+          rulesClient,
+          rule: {
+            ...args.params,
+            // For backwards compatibility, we default to true if not provided.
+            // The default enabled value is false for prebuilt rules, and true
+            // for custom rules.
+            enabled: args.params.enabled ?? true,
+            immutable: false,
+          },
+          mlAuthz,
+        });
+      });
+    },
 
-  async createPrebuiltRule(args: CreatePrebuiltRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.createPrebuiltRule', async () => {
-      return createPrebuiltRule(rulesClient, args, mlAuthz);
-    });
-  },
+    async createPrebuiltRule(args: CreatePrebuiltRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.createPrebuiltRule', async () => {
+        return createRule({
+          rulesClient,
+          rule: {
+            ...args.params,
+            immutable: true,
+          },
+          mlAuthz,
+        });
+      });
+    },
 
-  async updateRule(args: UpdateRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.updateRule', async () => {
-      return updateRule(rulesClient, args, mlAuthz);
-    });
-  },
+    async updateRule({ ruleUpdate }: UpdateRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.updateRule', async () => {
+        return updateRule({ rulesClient, prebuiltRuleAssetClient, mlAuthz, ruleUpdate });
+      });
+    },
 
-  async patchRule(args: PatchRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.patchRule', async () => {
-      return patchRule(rulesClient, args, mlAuthz);
-    });
-  },
+    async patchRule({ rulePatch }: PatchRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.patchRule', async () => {
+        return patchRule({ rulesClient, prebuiltRuleAssetClient, mlAuthz, rulePatch });
+      });
+    },
 
-  async deleteRule(args: DeleteRuleArgs): Promise<void> {
-    return withSecuritySpan('DetectionRulesClient.deleteRule', async () => {
-      return deleteRule(rulesClient, args);
-    });
-  },
+    async deleteRule({ ruleId }: DeleteRuleArgs): Promise<void> {
+      return withSecuritySpan('DetectionRulesClient.deleteRule', async () => {
+        return deleteRule({ rulesClient, ruleId });
+      });
+    },
 
-  async upgradePrebuiltRule(args: UpgradePrebuiltRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.upgradePrebuiltRule', async () => {
-      return upgradePrebuiltRule(rulesClient, args, mlAuthz);
-    });
-  },
+    async upgradePrebuiltRule({ ruleAsset }: UpgradePrebuiltRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.upgradePrebuiltRule', async () => {
+        return upgradePrebuiltRule({
+          rulesClient,
+          ruleAsset,
+          mlAuthz,
+          prebuiltRuleAssetClient,
+        });
+      });
+    },
 
-  async importRule(args: ImportRuleArgs): Promise<RuleResponse> {
-    return withSecuritySpan('DetectionRulesClient.importRule', async () => {
-      return importRule(rulesClient, args, mlAuthz);
-    });
-  },
-});
+    async importRule(args: ImportRuleArgs): Promise<RuleResponse> {
+      return withSecuritySpan('DetectionRulesClient.importRule', async () => {
+        return importRule({
+          rulesClient,
+          importRulePayload: args,
+          mlAuthz,
+          prebuiltRuleAssetClient,
+        });
+      });
+    },
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.update_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.update_rule.test.ts
index 671460b046fea..db9d122e7d912 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.update_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.update_rule.test.ts
@@ -12,17 +12,20 @@ import { getMlRuleParams, getQueryRuleParams } from '../../../rule_schema/mocks'
 import {
   getCreateMachineLearningRulesSchemaMock,
   getCreateRulesSchemaMock,
+  getRulesMlSchemaMock,
+  getRulesSchemaMock,
 } from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
-import { readRules } from './read_rules';
+import { getRuleByRuleId } from './methods/get_rule_by_rule_id';
 import { buildMlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
 import { createDetectionRulesClient } from './detection_rules_client';
 import type { IDetectionRulesClient } from './detection_rules_client_interface';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../../machine_learning/authz');
 jest.mock('../../../../machine_learning/validation');
 
-jest.mock('./read_rules');
+jest.mock('./methods/get_rule_by_rule_id');
 
 describe('DetectionRulesClient.updateRule', () => {
   let rulesClient: ReturnType<typeof rulesClientMock.create>;
@@ -32,13 +35,22 @@ describe('DetectionRulesClient.updateRule', () => {
 
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('calls the rulesClient with expected params', async () => {
-    const ruleUpdate = getCreateRulesSchemaMock();
-    const existingRule = getRuleMock(getQueryRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
+    // Mock the rule update
+    const ruleUpdate = getCreateRulesSchemaMock('query-rule-id');
+    ruleUpdate.name = 'new name';
+    ruleUpdate.description = 'new description';
+
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
     await detectionRulesClient.updateRule({ ruleUpdate });
@@ -56,21 +68,18 @@ describe('DetectionRulesClient.updateRule', () => {
     );
   });
 
-  it('returns rule enabled: true if the nexParams have enabled: true', async () => {
-    const ruleUpdate = { ...getCreateRulesSchemaMock(), enabled: true };
-    const existingRule = getRuleMock(getQueryRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-
-    const rule = await detectionRulesClient.updateRule({ ruleUpdate });
-
-    expect(rule.enabled).toBe(true);
-  });
+  it('calls the rulesClient with new ML params', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesMlSchemaMock();
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
 
-  it('calls the rulesClient with legacy ML params', async () => {
+    // Mock the rule update
     const ruleUpdate = getCreateMachineLearningRulesSchemaMock();
-    const existingRule = getRuleMock(getMlRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+    ruleUpdate.anomaly_threshold = 42;
+    ruleUpdate.machine_learning_job_id = ['new-job-id'];
+
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getMlRuleParams()));
 
     await detectionRulesClient.updateRule({ ruleUpdate });
@@ -79,48 +88,26 @@ describe('DetectionRulesClient.updateRule', () => {
       expect.objectContaining({
         data: expect.objectContaining({
           params: expect.objectContaining({
-            anomalyThreshold: 58,
-            machineLearningJobId: ['typical-ml-job-id'],
+            anomalyThreshold: ruleUpdate.anomaly_threshold,
+            machineLearningJobId: ruleUpdate.machine_learning_job_id,
           }),
         }),
       })
     );
   });
 
-  it('calls the rulesClient with new ML params', async () => {
-    const ruleUpdate = {
-      ...getCreateMachineLearningRulesSchemaMock(),
-      machine_learning_job_id: ['new_job_1', 'new_job_2'],
-    };
-    const existingRule = getRuleMock(getMlRuleParams());
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
-    rulesClient.update.mockResolvedValue(getRuleMock(getMlRuleParams()));
+  it('disables rule if the rule was enabled and enabled is false', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    existingRule.enabled = true;
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
 
-    await detectionRulesClient.updateRule({ ruleUpdate });
+    // Mock the rule update
+    const ruleUpdate = { ...getCreateRulesSchemaMock(), enabled: false };
 
-    expect(rulesClient.update).toHaveBeenCalledWith(
-      expect.objectContaining({
-        data: expect.objectContaining({
-          params: expect.objectContaining({
-            anomalyThreshold: 58,
-            machineLearningJobId: ['new_job_1', 'new_job_2'],
-          }),
-        }),
-      })
-    );
-  });
-
-  it('should call rulesClient.disable if the rule was enabled and enabled is false', async () => {
-    const ruleUpdate = {
-      ...getCreateRulesSchemaMock(),
-      enabled: false,
-    };
-    const existingRule = {
-      ...getRuleMock(getQueryRuleParams()),
-      enabled: true,
-    };
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
 
     await detectionRulesClient.updateRule({ ruleUpdate });
 
@@ -131,17 +118,18 @@ describe('DetectionRulesClient.updateRule', () => {
     );
   });
 
-  it('should call rulesClient.enable if the rule was disabled and enabled is true', async () => {
-    const ruleUpdate = {
-      ...getCreateRulesSchemaMock(),
-      enabled: true,
-    };
-    const existingRule = {
-      ...getRuleMock(getQueryRuleParams()),
-      enabled: false,
-    };
+  it('enables rule if the rule was disabled and enabled is true', async () => {
+    // Mock the existing rule
+    const existingRule = getRulesSchemaMock();
+    existingRule.enabled = false;
+    (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
+    // Mock the rule update
+    const ruleUpdate = { ...getCreateRulesSchemaMock(), enabled: true };
+
+    // Mock the rule returned after update; not used for this test directly but
+    // needed so that the patchRule method does not throw
     rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-    (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
 
     await detectionRulesClient.updateRule({ ruleUpdate });
 
@@ -169,8 +157,13 @@ describe('DetectionRulesClient.updateRule', () => {
     expect(rulesClient.create).not.toHaveBeenCalled();
   });
 
-  describe('regression tests', () => {
+  describe('actions', () => {
     it("updates the rule's actions if provided", async () => {
+      // Mock the existing rule
+      const existingRule = getRulesSchemaMock();
+      (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
+
+      // Mock the rule update
       const ruleUpdate = {
         ...getCreateRulesSchemaMock(),
         actions: [
@@ -184,8 +177,9 @@ describe('DetectionRulesClient.updateRule', () => {
           },
         ],
       };
-      const existingRule = getRuleMock(getQueryRuleParams());
-      (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
+
+      // Mock the rule returned after update; not used for this test directly but
+      // needed so that the patchRule method does not throw
       rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
 
       await detectionRulesClient.updateRule({ ruleUpdate });
@@ -210,12 +204,12 @@ describe('DetectionRulesClient.updateRule', () => {
     });
 
     it('updates actions to empty if none are specified', async () => {
-      const ruleUpdate = getCreateRulesSchemaMock();
-      delete ruleUpdate.actions;
-      const existingRule = getRuleMock(getQueryRuleParams());
+      // Mock the existing rule
+      const existingRule = getRulesSchemaMock();
+      (getRuleByRuleId as jest.Mock).mockResolvedValueOnce(existingRule);
       existingRule.actions = [
         {
-          actionTypeId: '.slack',
+          action_type_id: '.slack',
           id: '2933e581-d81c-4fe3-88fe-c57c6b8a5bfd',
           params: {
             message: 'Rule {{context.rule.name}} generated {{state.signals_count}} signals',
@@ -223,8 +217,14 @@ describe('DetectionRulesClient.updateRule', () => {
           group: 'default',
         },
       ];
+
+      // Mock the rule update
+      const ruleUpdate = getCreateRulesSchemaMock();
+      delete ruleUpdate.actions;
+
+      // Mock the rule returned after update; not used for this test directly but
+      // needed so that the patchRule method does not throw
       rulesClient.update.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-      (readRules as jest.Mock).mockResolvedValueOnce(existingRule);
 
       await detectionRulesClient.updateRule({ ruleUpdate });
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.upgrade_prebuilt_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.upgrade_prebuilt_rule.test.ts
index 38f3507d2f7ae..7a5ae76371532 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.upgrade_prebuilt_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client.upgrade_prebuilt_rule.test.ts
@@ -10,21 +10,22 @@ import { rulesClientMock } from '@kbn/alerting-plugin/server/mocks';
 import {
   getCreateEqlRuleSchemaMock,
   getCreateRulesSchemaMock,
+  getRulesEqlSchemaMock,
+  getRulesSchemaMock,
 } from '../../../../../../common/api/detection_engine/model/rule_schema/mocks';
 import type { PrebuiltRuleAsset } from '../../../prebuilt_rules';
-
-import { readRules } from './read_rules';
+import { getRuleByRuleId } from './methods/get_rule_by_rule_id';
 import { getRuleMock } from '../../../routes/__mocks__/request_responses';
 import { getEqlRuleParams, getQueryRuleParams } from '../../../rule_schema/mocks';
-
 import { buildMlAuthz } from '../../../../machine_learning/authz';
 import { throwAuthzError } from '../../../../machine_learning/validation';
 import { createDetectionRulesClient } from './detection_rules_client';
 import type { IDetectionRulesClient } from './detection_rules_client_interface';
+import { savedObjectsClientMock } from '@kbn/core/server/mocks';
 
 jest.mock('../../../../machine_learning/authz');
 jest.mock('../../../../machine_learning/validation');
-jest.mock('./read_rules');
+jest.mock('./methods/get_rule_by_rule_id');
 
 describe('DetectionRulesClient.upgradePrebuiltRule', () => {
   let rulesClient: ReturnType<typeof rulesClientMock.create>;
@@ -34,7 +35,8 @@ describe('DetectionRulesClient.upgradePrebuiltRule', () => {
 
   beforeEach(() => {
     rulesClient = rulesClientMock.create();
-    detectionRulesClient = createDetectionRulesClient(rulesClient, mlAuthz);
+    const savedObjectsClient = savedObjectsClientMock.create();
+    detectionRulesClient = createDetectionRulesClient({ rulesClient, mlAuthz, savedObjectsClient });
   });
 
   it('throws if no matching rule_id is found', async () => {
@@ -44,7 +46,7 @@ describe('DetectionRulesClient.upgradePrebuiltRule', () => {
       rule_id: 'rule-id',
     };
 
-    (readRules as jest.Mock).mockResolvedValue(null);
+    (getRuleByRuleId as jest.Mock).mockResolvedValue(null);
     await expect(detectionRulesClient.upgradePrebuiltRule({ ruleAsset })).rejects.toThrow(
       `Failed to find rule ${ruleAsset.rule_id}`
     );
@@ -80,28 +82,24 @@ describe('DetectionRulesClient.upgradePrebuiltRule', () => {
       rule_id: 'rule-id',
     };
     // Installed version is "query"
-    const installedRule = getRuleMock({
-      ...getQueryRuleParams({
-        exceptionsList: [
-          { id: 'test_id', list_id: 'hi', type: 'detection', namespace_type: 'agnostic' },
-        ],
-      }),
-      actions: [
-        {
-          group: 'default',
-          id: 'test_id',
-          action_type_id: '.index',
-          config: {
-            index: ['index-1', 'index-2'],
-          },
-        },
-      ],
-      ruleId: 'rule-id',
-    });
+    const installedRule = getRulesSchemaMock();
+    installedRule.exceptions_list = [
+      { id: 'test_id', list_id: 'hi', type: 'detection', namespace_type: 'agnostic' },
+    ];
+    installedRule.actions = [
+      {
+        group: 'default',
+        id: 'test_id',
+        action_type_id: '.index',
+        params: {},
+      },
+    ];
+    installedRule.rule_id = 'rule-id';
+
     beforeEach(() => {
       jest.resetAllMocks();
       rulesClient.create.mockResolvedValue(getRuleMock(getQueryRuleParams()));
-      (readRules as jest.Mock).mockResolvedValue(installedRule);
+      (getRuleByRuleId as jest.Mock).mockResolvedValue(installedRule);
     });
 
     it('deletes the old rule', async () => {
@@ -117,16 +115,23 @@ describe('DetectionRulesClient.upgradePrebuiltRule', () => {
             name: ruleAsset.name,
             tags: ruleAsset.tags,
             // enabled and actions are kept from original rule
-            actions: installedRule.actions,
+            actions: [
+              expect.objectContaining({
+                actionTypeId: '.index',
+                group: 'default',
+                id: 'test_id',
+                params: {},
+              }),
+            ],
             enabled: installedRule.enabled,
             params: expect.objectContaining({
               index: ruleAsset.index,
               description: ruleAsset.description,
               immutable: true,
               // exceptions_lists, actions, timeline_id and timeline_title are maintained
-              timelineTitle: installedRule.params.timelineTitle,
-              timelineId: installedRule.params.timelineId,
-              exceptionsList: installedRule.params.exceptionsList,
+              timelineTitle: installedRule.timeline_title,
+              timelineId: installedRule.timeline_id,
+              exceptionsList: installedRule.exceptions_list,
             }),
           }),
           options: {
@@ -147,11 +152,9 @@ describe('DetectionRulesClient.upgradePrebuiltRule', () => {
       rule_id: 'rule-id',
     };
     // Installed version is "eql"
-    const installedRule = getRuleMock({
-      ...getEqlRuleParams(),
-    });
+    const installedRule = getRulesEqlSchemaMock();
     beforeEach(() => {
-      (readRules as jest.Mock).mockResolvedValue(installedRule);
+      (getRuleByRuleId as jest.Mock).mockResolvedValue(installedRule);
     });
 
     it('patches the existing rule with the new params from the rule asset', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client_interface.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client_interface.ts
index 34c39153206b1..d7b45f83e8bf8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client_interface.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/detection_rules_client_interface.ts
@@ -38,7 +38,7 @@ export interface UpdateRuleArgs {
 }
 
 export interface PatchRuleArgs {
-  nextParams: RulePatchProps;
+  rulePatch: RulePatchProps;
 }
 
 export interface DeleteRuleArgs {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_defaults.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_defaults.ts
new file mode 100644
index 0000000000000..837df0b3b2f1f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_defaults.ts
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { v4 as uuidv4 } from 'uuid';
+import type {
+  RuleCreateProps,
+  RuleSource,
+  TypeSpecificCreateProps,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import {
+  DEFAULT_INDICATOR_SOURCE_PATH,
+  DEFAULT_MAX_SIGNALS,
+} from '../../../../../../../common/constants';
+import {
+  normalizeMachineLearningJobIds,
+  normalizeThresholdObject,
+} from '../../../../../../../common/detection_engine/utils';
+import { assertUnreachable } from '../../../../../../../common/utility_types';
+import { addEcsToRequiredFields } from '../../../utils/utils';
+
+export const RULE_DEFAULTS = {
+  enabled: false,
+  risk_score_mapping: [],
+  severity_mapping: [],
+  interval: '5m' as const,
+  to: 'now' as const,
+  from: 'now-6m' as const,
+  exceptions_list: [],
+  false_positives: [],
+  max_signals: DEFAULT_MAX_SIGNALS,
+  actions: [],
+  related_integrations: [],
+  required_fields: [],
+  setup: '',
+  references: [],
+  threat: [],
+  tags: [],
+  author: [],
+  output_index: '',
+  version: 1,
+};
+
+export function applyRuleDefaults(rule: RuleCreateProps & { immutable?: boolean }) {
+  const typeSpecificParams = setTypeSpecificDefaults(rule);
+  const immutable = rule.immutable ?? false;
+
+  return {
+    ...RULE_DEFAULTS,
+    ...rule,
+    ...typeSpecificParams,
+    rule_id: rule.rule_id ?? uuidv4(),
+    immutable,
+    rule_source: convertImmutableToRuleSource(immutable),
+    required_fields: addEcsToRequiredFields(rule.required_fields),
+  };
+}
+
+const convertImmutableToRuleSource = (immutable: boolean): RuleSource => {
+  if (immutable) {
+    return {
+      type: 'external',
+      is_customized: false,
+    };
+  }
+
+  return {
+    type: 'internal',
+  };
+};
+
+export const setTypeSpecificDefaults = (props: TypeSpecificCreateProps) => {
+  switch (props.type) {
+    case 'eql': {
+      return {
+        type: props.type,
+        language: props.language,
+        index: props.index,
+        data_view_id: props.data_view_id,
+        query: props.query,
+        filters: props.filters,
+        timestamp_field: props.timestamp_field,
+        event_category_override: props.event_category_override,
+        tiebreaker_field: props.tiebreaker_field,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'esql': {
+      return {
+        type: props.type,
+        language: props.language,
+        query: props.query,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'threat_match': {
+      return {
+        type: props.type,
+        language: props.language ?? 'kuery',
+        index: props.index,
+        data_view_id: props.data_view_id,
+        query: props.query,
+        filters: props.filters,
+        saved_id: props.saved_id,
+        threat_filters: props.threat_filters,
+        threat_query: props.threat_query,
+        threat_mapping: props.threat_mapping,
+        threat_language: props.threat_language,
+        threat_index: props.threat_index,
+        threat_indicator_path: props.threat_indicator_path ?? DEFAULT_INDICATOR_SOURCE_PATH,
+        concurrent_searches: props.concurrent_searches,
+        items_per_search: props.items_per_search,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'query': {
+      return {
+        type: props.type,
+        language: props.language ?? 'kuery',
+        index: props.index,
+        data_view_id: props.data_view_id,
+        query: props.query ?? '',
+        filters: props.filters,
+        saved_id: props.saved_id,
+        response_actions: props.response_actions,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'saved_query': {
+      return {
+        type: props.type,
+        language: props.language ?? 'kuery',
+        index: props.index,
+        query: props.query,
+        filters: props.filters,
+        saved_id: props.saved_id,
+        data_view_id: props.data_view_id,
+        response_actions: props.response_actions,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'threshold': {
+      return {
+        type: props.type,
+        language: props.language ?? 'kuery',
+        index: props.index,
+        data_view_id: props.data_view_id,
+        query: props.query,
+        filters: props.filters,
+        saved_id: props.saved_id,
+        threshold: normalizeThresholdObject(props.threshold),
+        alert_suppression: props.alert_suppression?.duration
+          ? { duration: props.alert_suppression.duration }
+          : undefined,
+      };
+    }
+    case 'machine_learning': {
+      return {
+        type: props.type,
+        anomaly_threshold: props.anomaly_threshold,
+        machine_learning_job_id: normalizeMachineLearningJobIds(props.machine_learning_job_id),
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    case 'new_terms': {
+      return {
+        type: props.type,
+        query: props.query,
+        new_terms_fields: props.new_terms_fields,
+        history_window_start: props.history_window_start,
+        index: props.index,
+        filters: props.filters,
+        language: props.language ?? 'kuery',
+        data_view_id: props.data_view_id,
+        alert_suppression: props.alert_suppression,
+      };
+    }
+    default: {
+      return assertUnreachable(props);
+    }
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.test.ts
new file mode 100644
index 0000000000000..49592aff28f95
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.test.ts
@@ -0,0 +1,456 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  AlertSuppressionDuration,
+  PatchRuleRequestBody,
+} from '../../../../../../../common/api/detection_engine';
+import {
+  getEsqlRuleSchemaMock,
+  getRulesEqlSchemaMock,
+  getRulesMlSchemaMock,
+  getRulesNewTermsSchemaMock,
+  getRulesSchemaMock,
+  getRulesThresholdSchemaMock,
+  getSavedQuerySchemaMock,
+  getThreatMatchingSchemaMock,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema/mocks';
+import { createPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client';
+import { applyRulePatch } from './apply_rule_patch';
+
+const prebuiltRuleAssetClient = createPrebuiltRuleAssetsClient();
+
+describe('applyRulePatch', () => {
+  describe('EQL', () => {
+    test('should accept EQL params when existing rule type is EQL', async () => {
+      const rulePatch = {
+        timestamp_field: 'event.created',
+        event_category_override: 'event.not_category',
+        tiebreaker_field: 'event.created',
+      };
+      const existingRule = getRulesEqlSchemaMock();
+      const patchedRule = await applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      });
+      expect(patchedRule).toEqual(
+        expect.objectContaining({
+          timestamp_field: 'event.created',
+          event_category_override: 'event.not_category',
+          tiebreaker_field: 'event.created',
+        })
+      );
+    });
+    test('should accept EQL params with suppression in snake case and convert to camel case when rule type is EQL', async () => {
+      const rulePatch = {
+        timestamp_field: 'event.created',
+        event_category_override: 'event.not_category',
+        tiebreaker_field: 'event.created',
+        alert_suppression: {
+          group_by: ['event.type'],
+          duration: {
+            value: 10,
+            unit: 'm',
+          } as AlertSuppressionDuration,
+          missing_fields_strategy: 'suppress',
+        },
+      };
+      const existingRule = getRulesEqlSchemaMock();
+      const patchedRule = await applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      });
+      expect(patchedRule).toEqual(
+        expect.objectContaining({
+          timestamp_field: 'event.created',
+          event_category_override: 'event.not_category',
+          tiebreaker_field: 'event.created',
+          alert_suppression: {
+            group_by: ['event.type'],
+            duration: {
+              value: 10,
+              unit: 'm',
+            },
+            missing_fields_strategy: 'suppress',
+          },
+        })
+      );
+    });
+    test('should reject invalid EQL params when existing rule type is EQL', async () => {
+      const rulePatch = {
+        timestamp_field: 1,
+        event_category_override: 1,
+        tiebreaker_field: 1,
+      } as PatchRuleRequestBody;
+      const existingRule = getRulesEqlSchemaMock();
+      await expect(
+        applyRulePatch({
+          rulePatch,
+          existingRule,
+          prebuiltRuleAssetClient,
+        })
+      ).rejects.toThrowError(
+        'event_category_override: Expected string, received number, tiebreaker_field: Expected string, received number, timestamp_field: Expected string, received number'
+      );
+    });
+    test('should reject EQL params with invalid suppression group_by field', async () => {
+      const rulePatch = {
+        timestamp_field: 'event.created',
+        event_category_override: 'event.not_category',
+        tiebreaker_field: 'event.created',
+        alert_suppression: {
+          group_by: 'event.type',
+          duration: {
+            value: 10,
+            unit: 'm',
+          } as AlertSuppressionDuration,
+          missing_fields_strategy: 'suppress',
+        },
+      };
+      const existingRule = getRulesEqlSchemaMock();
+      await expect(
+        applyRulePatch({
+          rulePatch,
+          existingRule,
+          prebuiltRuleAssetClient,
+        })
+      ).rejects.toThrowError('alert_suppression.group_by: Expected array, received string');
+    });
+  });
+
+  test('should accept threat match params when existing rule type is threat match', async () => {
+    const rulePatch = {
+      threat_indicator_path: 'my.indicator',
+      threat_query: 'test-query',
+    };
+    const existingRule = getThreatMatchingSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        threat_indicator_path: 'my.indicator',
+        threat_query: 'test-query',
+      })
+    );
+  });
+
+  test('should reject invalid threat match params when existing rule type is threat match', async () => {
+    const rulePatch = {
+      threat_indicator_path: 1,
+      threat_query: 1,
+    } as PatchRuleRequestBody;
+    const existingRule = getThreatMatchingSchemaMock();
+    await expect(
+      applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      })
+    ).rejects.toThrowError(
+      'threat_query: Expected string, received number, threat_indicator_path: Expected string, received number'
+    );
+  });
+
+  test('should accept query params when existing rule type is query', async () => {
+    const rulePatch = {
+      index: ['new-test-index'],
+      language: 'lucene',
+    } as PatchRuleRequestBody;
+    const existingRule = getRulesSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        index: ['new-test-index'],
+        language: 'lucene',
+      })
+    );
+  });
+
+  test('should reject invalid query params when existing rule type is query', async () => {
+    const rulePatch = {
+      index: [1],
+      language: 'non-language',
+    } as PatchRuleRequestBody;
+    const existingRule = getRulesSchemaMock();
+    await expect(
+      applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      })
+    ).rejects.toThrowError(
+      "index.0: Expected string, received number, language: Invalid enum value. Expected 'kuery' | 'lucene', received 'non-language'"
+    );
+  });
+
+  test('should accept saved query params when existing rule type is saved query', async () => {
+    const rulePatch = {
+      index: ['new-test-index'],
+      language: 'lucene',
+    } as PatchRuleRequestBody;
+    const existingRule = getSavedQuerySchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        index: ['new-test-index'],
+        language: 'lucene',
+      })
+    );
+  });
+
+  test('should reject invalid saved query params when existing rule type is saved query', async () => {
+    const rulePatch = {
+      index: [1],
+      language: 'non-language',
+    } as PatchRuleRequestBody;
+    const existingRule = getSavedQuerySchemaMock();
+    await expect(
+      applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      })
+    ).rejects.toThrowError(
+      "index.0: Expected string, received number, language: Invalid enum value. Expected 'kuery' | 'lucene', received 'non-language'"
+    );
+  });
+
+  test('should accept threshold params when existing rule type is threshold', async () => {
+    const rulePatch = {
+      threshold: {
+        field: ['host.name'],
+        value: 107,
+      },
+    };
+    const existingRule = getRulesThresholdSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        threshold: {
+          field: ['host.name'],
+          value: 107,
+        },
+      })
+    );
+  });
+
+  test('should reject invalid threshold params when existing rule type is threshold', async () => {
+    const rulePatch = {
+      threshold: {
+        field: ['host.name'],
+        value: 'invalid',
+      },
+    } as PatchRuleRequestBody;
+    const existingRule = getRulesThresholdSchemaMock();
+    await expect(
+      applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      })
+    ).rejects.toThrowError('threshold.value: Expected number, received string');
+  });
+
+  test('should accept ES|QL alerts suppression params', async () => {
+    const rulePatch = {
+      alert_suppression: {
+        group_by: ['agent.name'],
+        duration: { value: 4, unit: 'h' as const },
+        missing_fields_strategy: 'doNotSuppress' as const,
+      },
+    };
+    const existingRule = getEsqlRuleSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        alert_suppression: {
+          group_by: ['agent.name'],
+          missing_fields_strategy: 'doNotSuppress',
+          duration: { value: 4, unit: 'h' },
+        },
+      })
+    );
+  });
+
+  test('should accept threshold alerts suppression params', async () => {
+    const rulePatch = {
+      alert_suppression: {
+        duration: { value: 4, unit: 'h' as const },
+      },
+    };
+    const existingRule = getRulesThresholdSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        alert_suppression: {
+          duration: { value: 4, unit: 'h' },
+        },
+      })
+    );
+  });
+
+  test('should accept threat_match alerts suppression params', async () => {
+    const rulePatch = {
+      alert_suppression: {
+        group_by: ['agent.name'],
+        missing_fields_strategy: 'suppress' as const,
+      },
+    };
+    const existingRule = getThreatMatchingSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        alert_suppression: {
+          group_by: ['agent.name'],
+          missing_fields_strategy: 'suppress',
+        },
+      })
+    );
+  });
+
+  test('should accept new_terms alerts suppression params', async () => {
+    const rulePatch = {
+      alert_suppression: {
+        group_by: ['agent.name'],
+        duration: { value: 4, unit: 'h' as const },
+        missing_fields_strategy: 'suppress' as const,
+      },
+    };
+    const existingRule = getRulesNewTermsSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        alert_suppression: {
+          group_by: ['agent.name'],
+          missing_fields_strategy: 'suppress',
+          duration: { value: 4, unit: 'h' },
+        },
+      })
+    );
+  });
+
+  describe('machine learning rules', () => {
+    test('should accept machine learning params when existing rule type is machine learning', async () => {
+      const rulePatch = {
+        anomaly_threshold: 5,
+      };
+      const existingRule = getRulesMlSchemaMock();
+      const patchedRule = await applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      });
+      expect(patchedRule).toEqual(
+        expect.objectContaining({
+          anomaly_threshold: 5,
+        })
+      );
+    });
+
+    test('should reject invalid machine learning params when existing rule type is machine learning', async () => {
+      const rulePatch = {
+        anomaly_threshold: 'invalid',
+      } as PatchRuleRequestBody;
+      const existingRule = getRulesMlSchemaMock();
+      await expect(
+        applyRulePatch({
+          rulePatch,
+          existingRule,
+          prebuiltRuleAssetClient,
+        })
+      ).rejects.toThrowError('anomaly_threshold: Expected number, received string');
+    });
+
+    it('accepts suppression params', async () => {
+      const rulePatch = {
+        alert_suppression: {
+          group_by: ['agent.name'],
+          missing_fields_strategy: 'suppress' as const,
+        },
+      };
+      const existingRule = getRulesMlSchemaMock();
+      const patchedRule = await applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      });
+
+      expect(patchedRule).toEqual(
+        expect.objectContaining({
+          alert_suppression: {
+            group_by: ['agent.name'],
+            missing_fields_strategy: 'suppress',
+          },
+        })
+      );
+    });
+  });
+
+  test('should accept new terms params when existing rule type is new terms', async () => {
+    const rulePatch = {
+      new_terms_fields: ['event.new_field'],
+    };
+    const existingRule = getRulesNewTermsSchemaMock();
+    const patchedRule = await applyRulePatch({
+      rulePatch,
+      existingRule,
+      prebuiltRuleAssetClient,
+    });
+    expect(patchedRule).toEqual(
+      expect.objectContaining({
+        new_terms_fields: ['event.new_field'],
+      })
+    );
+  });
+
+  test('should reject invalid new terms params when existing rule type is new terms', async () => {
+    const rulePatch = {
+      new_terms_fields: 'invalid',
+    } as PatchRuleRequestBody;
+    const existingRule = getRulesNewTermsSchemaMock();
+    await expect(
+      applyRulePatch({
+        rulePatch,
+        existingRule,
+        prebuiltRuleAssetClient,
+      })
+    ).rejects.toThrowError('new_terms_fields: Expected array, received string');
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.ts
new file mode 100644
index 0000000000000..9d02cd8dbb9df
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_patch.ts
@@ -0,0 +1,334 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { BadRequestError } from '@kbn/securitysolution-es-utils';
+import { stringifyZodError } from '@kbn/zod-helpers';
+import type {
+  EqlRule,
+  EqlRuleResponseFields,
+  EsqlRule,
+  EsqlRuleResponseFields,
+  MachineLearningRule,
+  MachineLearningRuleResponseFields,
+  NewTermsRule,
+  NewTermsRuleResponseFields,
+  QueryRule,
+  QueryRuleResponseFields,
+  RuleResponse,
+  SavedQueryRule,
+  SavedQueryRuleResponseFields,
+  ThreatMatchRule,
+  ThreatMatchRuleResponseFields,
+  ThresholdRule,
+  ThresholdRuleResponseFields,
+  TypeSpecificResponse,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import {
+  EqlRulePatchFields,
+  EsqlRulePatchFields,
+  MachineLearningRulePatchFields,
+  NewTermsRulePatchFields,
+  QueryRulePatchFields,
+  SavedQueryRulePatchFields,
+  ThreatMatchRulePatchFields,
+  ThresholdRulePatchFields,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { PatchRuleRequestBody } from '../../../../../../../common/api/detection_engine/rule_management';
+import {
+  normalizeMachineLearningJobIds,
+  normalizeThresholdObject,
+} from '../../../../../../../common/detection_engine/utils';
+import { assertUnreachable } from '../../../../../../../common/utility_types';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { addEcsToRequiredFields } from '../../../utils/utils';
+import { calculateRuleSource } from './rule_source/calculate_rule_source';
+
+interface ApplyRulePatchProps {
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  existingRule: RuleResponse;
+  rulePatch: PatchRuleRequestBody;
+}
+
+// eslint-disable-next-line complexity
+export const applyRulePatch = async ({
+  rulePatch,
+  existingRule,
+  prebuiltRuleAssetClient,
+}: ApplyRulePatchProps): Promise<RuleResponse> => {
+  const typeSpecificParams = patchTypeSpecificParams(rulePatch, existingRule);
+
+  const nextRule: RuleResponse = {
+    // Keep existing values for these fields
+    id: existingRule.id,
+    rule_id: existingRule.rule_id,
+    revision: existingRule.revision,
+    immutable: existingRule.immutable,
+    rule_source: existingRule.rule_source,
+    updated_at: existingRule.updated_at,
+    updated_by: existingRule.updated_by,
+    created_at: existingRule.created_at,
+    created_by: existingRule.created_by,
+
+    // Update values for these fields
+    enabled: rulePatch.enabled ?? existingRule.enabled,
+    name: rulePatch.name ?? existingRule.name,
+    tags: rulePatch.tags ?? existingRule.tags,
+    author: rulePatch.author ?? existingRule.author,
+    building_block_type: rulePatch.building_block_type ?? existingRule.building_block_type,
+    description: rulePatch.description ?? existingRule.description,
+    false_positives: rulePatch.false_positives ?? existingRule.false_positives,
+    investigation_fields: rulePatch.investigation_fields ?? existingRule.investigation_fields,
+    from: rulePatch.from ?? existingRule.from,
+    license: rulePatch.license ?? existingRule.license,
+    output_index: rulePatch.output_index ?? existingRule.output_index,
+    timeline_id: rulePatch.timeline_id ?? existingRule.timeline_id,
+    timeline_title: rulePatch.timeline_title ?? existingRule.timeline_title,
+    meta: rulePatch.meta ?? existingRule.meta,
+    max_signals: rulePatch.max_signals ?? existingRule.max_signals,
+    related_integrations: rulePatch.related_integrations ?? existingRule.related_integrations,
+    required_fields: addEcsToRequiredFields(rulePatch.required_fields),
+    risk_score: rulePatch.risk_score ?? existingRule.risk_score,
+    risk_score_mapping: rulePatch.risk_score_mapping ?? existingRule.risk_score_mapping,
+    rule_name_override: rulePatch.rule_name_override ?? existingRule.rule_name_override,
+    setup: rulePatch.setup ?? existingRule.setup,
+    severity: rulePatch.severity ?? existingRule.severity,
+    severity_mapping: rulePatch.severity_mapping ?? existingRule.severity_mapping,
+    threat: rulePatch.threat ?? existingRule.threat,
+    timestamp_override: rulePatch.timestamp_override ?? existingRule.timestamp_override,
+    timestamp_override_fallback_disabled:
+      rulePatch.timestamp_override_fallback_disabled ??
+      existingRule.timestamp_override_fallback_disabled,
+    to: rulePatch.to ?? existingRule.to,
+    references: rulePatch.references ?? existingRule.references,
+    namespace: rulePatch.namespace ?? existingRule.namespace,
+    note: rulePatch.note ?? existingRule.note,
+    version: rulePatch.version ?? existingRule.version,
+    exceptions_list: rulePatch.exceptions_list ?? existingRule.exceptions_list,
+    interval: rulePatch.interval ?? existingRule.interval,
+    throttle: rulePatch.throttle ?? existingRule.throttle,
+    actions: rulePatch.actions ?? existingRule.actions,
+    ...typeSpecificParams,
+  };
+
+  nextRule.rule_source = await calculateRuleSource({
+    rule: nextRule,
+    prebuiltRuleAssetClient,
+  });
+
+  return nextRule;
+};
+
+const patchEqlParams = (
+  rulePatch: EqlRulePatchFields,
+  existingRule: EqlRule
+): EqlRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    index: rulePatch.index ?? existingRule.index,
+    data_view_id: rulePatch.data_view_id ?? existingRule.data_view_id,
+    query: rulePatch.query ?? existingRule.query,
+    filters: rulePatch.filters ?? existingRule.filters,
+    timestamp_field: rulePatch.timestamp_field ?? existingRule.timestamp_field,
+    event_category_override:
+      rulePatch.event_category_override ?? existingRule.event_category_override,
+    tiebreaker_field: rulePatch.tiebreaker_field ?? existingRule.tiebreaker_field,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchEsqlParams = (
+  rulePatch: EsqlRulePatchFields,
+  existingRule: EsqlRule
+): EsqlRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    query: rulePatch.query ?? existingRule.query,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchThreatMatchParams = (
+  rulePatch: ThreatMatchRulePatchFields,
+  existingRule: ThreatMatchRule
+): ThreatMatchRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    index: rulePatch.index ?? existingRule.index,
+    data_view_id: rulePatch.data_view_id ?? existingRule.data_view_id,
+    query: rulePatch.query ?? existingRule.query,
+    filters: rulePatch.filters ?? existingRule.filters,
+    saved_id: rulePatch.saved_id ?? existingRule.saved_id,
+    threat_filters: rulePatch.threat_filters ?? existingRule.threat_filters,
+    threat_query: rulePatch.threat_query ?? existingRule.threat_query,
+    threat_mapping: rulePatch.threat_mapping ?? existingRule.threat_mapping,
+    threat_language: rulePatch.threat_language ?? existingRule.threat_language,
+    threat_index: rulePatch.threat_index ?? existingRule.threat_index,
+    threat_indicator_path: rulePatch.threat_indicator_path ?? existingRule.threat_indicator_path,
+    concurrent_searches: rulePatch.concurrent_searches ?? existingRule.concurrent_searches,
+    items_per_search: rulePatch.items_per_search ?? existingRule.items_per_search,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchQueryParams = (
+  rulePatch: QueryRulePatchFields,
+  existingRule: QueryRule
+): QueryRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    index: rulePatch.index ?? existingRule.index,
+    data_view_id: rulePatch.data_view_id ?? existingRule.data_view_id,
+    query: rulePatch.query ?? existingRule.query,
+    filters: rulePatch.filters ?? existingRule.filters,
+    saved_id: rulePatch.saved_id ?? existingRule.saved_id,
+    response_actions: rulePatch.response_actions ?? existingRule.response_actions,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchSavedQueryParams = (
+  rulePatch: SavedQueryRulePatchFields,
+  existingRule: SavedQueryRule
+): SavedQueryRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    index: rulePatch.index ?? existingRule.index,
+    data_view_id: rulePatch.data_view_id ?? existingRule.data_view_id,
+    query: rulePatch.query ?? existingRule.query,
+    filters: rulePatch.filters ?? existingRule.filters,
+    saved_id: rulePatch.saved_id ?? existingRule.saved_id,
+    response_actions: rulePatch.response_actions ?? existingRule.response_actions,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchThresholdParams = (
+  rulePatch: ThresholdRulePatchFields,
+  existingRule: ThresholdRule
+): ThresholdRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: rulePatch.language ?? existingRule.language,
+    index: rulePatch.index ?? existingRule.index,
+    data_view_id: rulePatch.data_view_id ?? existingRule.data_view_id,
+    query: rulePatch.query ?? existingRule.query,
+    filters: rulePatch.filters ?? existingRule.filters,
+    saved_id: rulePatch.saved_id ?? existingRule.saved_id,
+    threshold: rulePatch.threshold
+      ? normalizeThresholdObject(rulePatch.threshold)
+      : existingRule.threshold,
+    alert_suppression: rulePatch.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchMachineLearningParams = (
+  params: MachineLearningRulePatchFields,
+  existingRule: MachineLearningRule
+): MachineLearningRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    anomaly_threshold: params.anomaly_threshold ?? existingRule.anomaly_threshold,
+    machine_learning_job_id: params.machine_learning_job_id
+      ? normalizeMachineLearningJobIds(params.machine_learning_job_id)
+      : existingRule.machine_learning_job_id,
+    alert_suppression: params.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+const patchNewTermsParams = (
+  params: NewTermsRulePatchFields,
+  existingRule: NewTermsRule
+): NewTermsRuleResponseFields => {
+  return {
+    type: existingRule.type,
+    language: params.language ?? existingRule.language,
+    index: params.index ?? existingRule.index,
+    data_view_id: params.data_view_id ?? existingRule.data_view_id,
+    query: params.query ?? existingRule.query,
+    filters: params.filters ?? existingRule.filters,
+    new_terms_fields: params.new_terms_fields ?? existingRule.new_terms_fields,
+    history_window_start: params.history_window_start ?? existingRule.history_window_start,
+    alert_suppression: params.alert_suppression ?? existingRule.alert_suppression,
+  };
+};
+
+export const patchTypeSpecificParams = (
+  params: PatchRuleRequestBody,
+  existingRule: RuleResponse
+): TypeSpecificResponse => {
+  // Here we do the validation of patch params by rule type to ensure that the fields that are
+  // passed in to patch are of the correct type, e.g. `query` is a string. Since the combined patch schema
+  // is a union of types where everything is optional, it's hard to do the validation before we know the rule type -
+  // a patch request that defines `event_category_override` as a number would not be assignable to the EQL patch schema,
+  // but would be assignable to the other rule types since they don't specify `event_category_override`.
+  switch (existingRule.type) {
+    case 'eql': {
+      const result = EqlRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchEqlParams(result.data, existingRule);
+    }
+    case 'esql': {
+      const result = EsqlRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchEsqlParams(result.data, existingRule);
+    }
+    case 'threat_match': {
+      const result = ThreatMatchRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchThreatMatchParams(result.data, existingRule);
+    }
+    case 'query': {
+      const result = QueryRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchQueryParams(result.data, existingRule);
+    }
+    case 'saved_query': {
+      const result = SavedQueryRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchSavedQueryParams(result.data, existingRule);
+    }
+    case 'threshold': {
+      const result = ThresholdRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchThresholdParams(result.data, existingRule);
+    }
+    case 'machine_learning': {
+      const result = MachineLearningRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchMachineLearningParams(result.data, existingRule);
+    }
+    case 'new_terms': {
+      const result = NewTermsRulePatchFields.safeParse(params);
+      if (!result.success) {
+        throw new BadRequestError(stringifyZodError(result.error));
+      }
+      return patchNewTermsParams(result.data, existingRule);
+    }
+    default: {
+      return assertUnreachable(existingRule);
+    }
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_update.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_update.ts
new file mode 100644
index 0000000000000..b911e66a1fc45
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/apply_rule_update.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  RuleResponse,
+  RuleUpdateProps,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { applyRuleDefaults } from './apply_rule_defaults';
+import { calculateRuleSource } from './rule_source/calculate_rule_source';
+
+interface ApplyRuleUpdateProps {
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  existingRule: RuleResponse;
+  ruleUpdate: RuleUpdateProps;
+}
+
+export const applyRuleUpdate = async ({
+  prebuiltRuleAssetClient,
+  existingRule,
+  ruleUpdate,
+}: ApplyRuleUpdateProps): Promise<RuleResponse> => {
+  const nextRule: RuleResponse = {
+    ...applyRuleDefaults(ruleUpdate),
+
+    // Use existing values
+    enabled: ruleUpdate.enabled ?? existingRule.enabled,
+    version: ruleUpdate.version ?? existingRule.version,
+
+    // Always keep existing values for these fields
+    id: existingRule.id,
+    rule_id: existingRule.rule_id,
+    revision: existingRule.revision,
+    immutable: existingRule.immutable,
+    rule_source: existingRule.rule_source,
+    updated_at: existingRule.updated_at,
+    updated_by: existingRule.updated_by,
+    created_at: existingRule.created_at,
+    created_by: existingRule.created_by,
+  };
+
+  nextRule.rule_source = await calculateRuleSource({
+    rule: nextRule,
+    prebuiltRuleAssetClient,
+  });
+
+  return nextRule;
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_is_customized.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_is_customized.ts
new file mode 100644
index 0000000000000..4f9bb4a060f6f
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_is_customized.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RuleResponse } from '../../../../../../../../common/api/detection_engine';
+import { MissingVersion } from '../../../../../../../../common/api/detection_engine';
+import type { PrebuiltRuleAsset } from '../../../../../prebuilt_rules';
+import { calculateRuleFieldsDiff } from '../../../../../prebuilt_rules/logic/diff/calculation/calculate_rule_fields_diff';
+import { convertRuleToDiffable } from '../../../../../prebuilt_rules/logic/diff/normalization/convert_rule_to_diffable';
+import { convertPrebuiltRuleAssetToRuleResponse } from '../../converters/convert_prebuilt_rule_asset_to_rule_response';
+
+export function calculateIsCustomized(
+  baseRule: PrebuiltRuleAsset | undefined,
+  nextRule: RuleResponse
+) {
+  if (baseRule == null) {
+    // If the base version is missing, we consider the rule to be customized
+    return true;
+  }
+
+  const baseRuleWithDefaults = convertPrebuiltRuleAssetToRuleResponse(baseRule);
+
+  const fieldsDiff = calculateRuleFieldsDiff({
+    base_version: MissingVersion,
+    current_version: convertRuleToDiffable(baseRuleWithDefaults),
+    target_version: convertRuleToDiffable(nextRule),
+  });
+
+  return Object.values(fieldsDiff).some((diff) => diff.has_update);
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.test.ts
new file mode 100644
index 0000000000000..e44c69d2705d5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.test.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createPrebuiltRuleAssetsClient } from '../../../../../prebuilt_rules/logic/rule_assets/__mocks__/prebuilt_rule_assets_client';
+import { applyRuleDefaults } from '../apply_rule_defaults';
+import { calculateRuleSource } from './calculate_rule_source';
+
+const prebuiltRuleAssetClient = createPrebuiltRuleAssetsClient();
+
+const getSampleRuleAsset = () => {
+  return applyRuleDefaults({
+    rule_id: 'test-rule-id',
+    name: 'Test rule',
+    description: 'Test description',
+    type: 'query',
+    query: 'user.name: root or user.name: admin',
+    severity: 'high',
+    risk_score: 55,
+  });
+};
+
+const getSampleRule = () => {
+  return {
+    ...getSampleRuleAsset(),
+    id: 'test-rule-id',
+    updated_at: '2021-01-01T00:00:00Z',
+    updated_by: 'test-user',
+    created_at: '2021-01-01T00:00:00Z',
+    created_by: 'test-user',
+    revision: 1,
+  };
+};
+
+describe('calculateRuleSource', () => {
+  it('returns an internal rule source when the rule is not prebuilt', async () => {
+    const rule = getSampleRule();
+    rule.immutable = false;
+
+    const result = await calculateRuleSource({
+      prebuiltRuleAssetClient,
+      rule,
+    });
+    expect(result).toEqual({
+      type: 'internal',
+    });
+  });
+
+  it('returns an external rule source with customized false when the rule is prebuilt', async () => {
+    const rule = getSampleRule();
+    rule.immutable = true;
+
+    const baseRule = getSampleRuleAsset();
+    prebuiltRuleAssetClient.fetchAssetsByVersion.mockResolvedValueOnce([baseRule]);
+
+    const result = await calculateRuleSource({
+      prebuiltRuleAssetClient,
+      rule,
+    });
+    expect(result).toEqual(
+      expect.objectContaining({
+        type: 'external',
+        is_customized: false,
+      })
+    );
+  });
+
+  it('returns is_customized true when the rule is prebuilt and has been customized', async () => {
+    const rule = getSampleRule();
+    rule.immutable = true;
+    rule.name = 'Updated name';
+
+    const baseRule = getSampleRuleAsset();
+    prebuiltRuleAssetClient.fetchAssetsByVersion.mockResolvedValueOnce([baseRule]);
+
+    const result = await calculateRuleSource({
+      prebuiltRuleAssetClient,
+      rule,
+    });
+    expect(result).toEqual(
+      expect.objectContaining({
+        type: 'external',
+        is_customized: true,
+      })
+    );
+  });
+
+  it('returns is_customized false when the rule has only changes to revision, updated_at, updated_by', async () => {
+    const rule = getSampleRule();
+    rule.immutable = true;
+    rule.revision = 5;
+    rule.updated_at = '2024-01-01T00:00:00Z';
+    rule.updated_by = 'new-user';
+
+    const baseRule = getSampleRuleAsset();
+    prebuiltRuleAssetClient.fetchAssetsByVersion.mockResolvedValueOnce([baseRule]);
+
+    const result = await calculateRuleSource({
+      prebuiltRuleAssetClient,
+      rule,
+    });
+    expect(result).toEqual(
+      expect.objectContaining({
+        type: 'external',
+        is_customized: false,
+      })
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.ts
new file mode 100644
index 0000000000000..742cd20544a60
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/mergers/rule_source/calculate_rule_source.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type {
+  RuleResponse,
+  RuleSource,
+} from '../../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { PrebuiltRuleAsset } from '../../../../../prebuilt_rules';
+import type { IPrebuiltRuleAssetsClient } from '../../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { calculateIsCustomized } from './calculate_is_customized';
+
+interface CalculateRuleSourceProps {
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  rule: RuleResponse;
+}
+
+export async function calculateRuleSource({
+  prebuiltRuleAssetClient,
+  rule,
+}: CalculateRuleSourceProps): Promise<RuleSource> {
+  if (rule.immutable) {
+    // This is a prebuilt rule and, despite the name, they are not immutable. So
+    // we need to recalculate `ruleSource.isCustomized` based on the rule's contents.
+    const prebuiltRulesResponse = await prebuiltRuleAssetClient.fetchAssetsByVersion([
+      {
+        rule_id: rule.rule_id,
+        version: rule.version,
+      },
+    ]);
+    const baseRule: PrebuiltRuleAsset | undefined = prebuiltRulesResponse.at(0);
+
+    const isCustomized = calculateIsCustomized(baseRule, rule);
+
+    return {
+      type: 'external',
+      is_customized: isCustomized,
+    };
+  }
+
+  return {
+    type: 'internal',
+  };
+}
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/__mocks__/get_rule_by_rule_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/__mocks__/get_rule_by_rule_id.ts
new file mode 100644
index 0000000000000..251cd7f699195
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/__mocks__/get_rule_by_rule_id.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RuleResponse } from '../../../../../../../../common/api/detection_engine';
+import { getRulesSchemaMock } from '../../../../../../../../common/api/detection_engine/model/rule_schema/rule_response_schema.mock';
+
+export const getRuleByRuleId = jest
+  .fn()
+  .mockImplementation(async (): Promise<RuleResponse | null> => getRulesSchemaMock());
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_custom_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_custom_rule.ts
deleted file mode 100644
index 963cac7e10dd1..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_custom_rule.ts
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
-import type { CreateCustomRuleArgs } from '../detection_rules_client_interface';
-import type { MlAuthz } from '../../../../../machine_learning/authz';
-import type { RuleParams } from '../../../../rule_schema';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
-import {
-  convertCreateAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { validateMlAuth, RuleResponseValidationError } from '../utils';
-
-export const createCustomRule = async (
-  rulesClient: RulesClient,
-  args: CreateCustomRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
-  const { params } = args;
-  await validateMlAuth(mlAuthz, params.type);
-
-  const internalRule = convertCreateAPIToInternalSchema(params, { immutable: false });
-  const rule = await rulesClient.create<RuleParams>({
-    data: internalRule,
-  });
-
-  /* Trying to convert the rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(rule));
-
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: rule.params.ruleId,
-    });
-  }
-
-  return parseResult.data;
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_prebuilt_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_prebuilt_rule.ts
deleted file mode 100644
index 0f0a4aea12d7b..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_prebuilt_rule.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
-import type { CreatePrebuiltRuleArgs } from '../detection_rules_client_interface';
-import type { MlAuthz } from '../../../../../machine_learning/authz';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
-import type { RuleParams } from '../../../../rule_schema';
-import {
-  convertCreateAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { validateMlAuth, RuleResponseValidationError } from '../utils';
-
-export const createPrebuiltRule = async (
-  rulesClient: RulesClient,
-  args: CreatePrebuiltRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
-  const { params } = args;
-
-  await validateMlAuth(mlAuthz, params.type);
-
-  const internalRule = convertCreateAPIToInternalSchema(params, {
-    immutable: true,
-    defaultEnabled: false,
-  });
-
-  const rule = await rulesClient.create<RuleParams>({
-    data: internalRule,
-  });
-
-  /* Trying to convert the rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(rule));
-
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: rule.params.ruleId,
-    });
-  }
-
-  return parseResult.data;
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_rule.ts
new file mode 100644
index 0000000000000..772e0c775d8b4
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/create_rule.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import { ruleTypeMappings } from '@kbn/securitysolution-rules';
+import { SERVER_APP_ID } from '../../../../../../../common';
+import type {
+  RuleCreateProps,
+  RuleResponse,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { MlAuthz } from '../../../../../machine_learning/authz';
+import type { RuleParams } from '../../../../rule_schema';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+import { convertRuleResponseToAlertingRule } from '../converters/convert_rule_response_to_alerting_rule';
+import { applyRuleDefaults } from '../mergers/apply_rule_defaults';
+import { validateMlAuth } from '../utils';
+
+interface CreateRuleOptions {
+  rulesClient: RulesClient;
+  mlAuthz: MlAuthz;
+  rule: RuleCreateProps & { immutable: boolean };
+  id?: string;
+  allowMissingConnectorSecrets?: boolean;
+}
+
+export const createRule = async ({
+  rulesClient,
+  mlAuthz,
+  rule,
+  id,
+  allowMissingConnectorSecrets,
+}: CreateRuleOptions): Promise<RuleResponse> => {
+  await validateMlAuth(mlAuthz, rule.type);
+
+  const ruleWithDefaults = applyRuleDefaults(rule);
+
+  const payload = {
+    ...convertRuleResponseToAlertingRule(ruleWithDefaults),
+    alertTypeId: ruleTypeMappings[rule.type],
+    consumer: SERVER_APP_ID,
+    enabled: rule.enabled ?? false,
+  };
+
+  const createdRule = await rulesClient.create<RuleParams>({
+    data: payload,
+    options: { id },
+    allowMissingConnectorSecrets,
+  });
+
+  return convertAlertingRuleToRuleResponse(createdRule);
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/delete_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/delete_rule.ts
index ec1491e8159d7..4a9ca8abcdeb1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/delete_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/delete_rule.ts
@@ -6,9 +6,13 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import type { DeleteRuleArgs } from '../detection_rules_client_interface';
+import type { RuleObjectId } from '../../../../../../../common/api/detection_engine';
 
-export const deleteRule = async (rulesClient: RulesClient, args: DeleteRuleArgs): Promise<void> => {
-  const { ruleId } = args;
+interface DeleteRuleParams {
+  rulesClient: RulesClient;
+  ruleId: RuleObjectId;
+}
+
+export const deleteRule = async ({ rulesClient, ruleId }: DeleteRuleParams): Promise<void> => {
   await rulesClient.delete({ id: ruleId });
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id.ts
new file mode 100644
index 0000000000000..39ca15fda42f3
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type {
+  RuleObjectId,
+  RuleResponse,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import type { RuleParams } from '../../../../rule_schema';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+
+interface GethRuleByIdOptions {
+  rulesClient: RulesClient;
+  id: RuleObjectId;
+}
+
+export const getRuleById = async ({
+  rulesClient,
+  id,
+}: GethRuleByIdOptions): Promise<RuleResponse | null> => {
+  try {
+    const rule = await rulesClient.resolve<RuleParams>({ id });
+    return convertAlertingRuleToRuleResponse(rule);
+  } catch (err) {
+    if (err?.output?.statusCode === 404) {
+      return null;
+    }
+    throw err;
+  }
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id_or_rule_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id_or_rule_id.ts
new file mode 100644
index 0000000000000..fce28d1a1c030
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_id_or_rule_id.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type {
+  RuleObjectId,
+  RuleResponse,
+  RuleSignatureId,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { invariant } from '../../../../../../../common/utils/invariant';
+import { getRuleById } from './get_rule_by_id';
+import { getRuleByRuleId } from './get_rule_by_rule_id';
+
+interface GetRuleByIdOptions {
+  rulesClient: RulesClient;
+  id: RuleObjectId | undefined;
+  ruleId: RuleSignatureId | undefined;
+}
+
+export const getRuleByIdOrRuleId = async ({
+  rulesClient,
+  id,
+  ruleId,
+}: GetRuleByIdOptions): Promise<RuleResponse | null> => {
+  if (id != null) {
+    return getRuleById({ rulesClient, id });
+  }
+  if (ruleId != null) {
+    return getRuleByRuleId({ rulesClient, ruleId });
+  }
+  invariant(false, 'Either id or ruleId must be provided');
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_rule_id.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_rule_id.ts
new file mode 100644
index 0000000000000..fda00cd292b88
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/get_rule_by_rule_id.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { RulesClient } from '@kbn/alerting-plugin/server';
+import type {
+  RuleResponse,
+  RuleSignatureId,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { findRules } from '../../search/find_rules';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+
+interface GetRuleByRuleIdOptions {
+  rulesClient: RulesClient;
+  ruleId: RuleSignatureId;
+}
+
+export const getRuleByRuleId = async ({
+  rulesClient,
+  ruleId,
+}: GetRuleByRuleIdOptions): Promise<RuleResponse | null> => {
+  const findRuleResponse = await findRules({
+    rulesClient,
+    filter: `alert.attributes.params.ruleId: "${ruleId}"`,
+    page: 1,
+    fields: undefined,
+    perPage: undefined,
+    sortField: undefined,
+    sortOrder: undefined,
+  });
+  if (findRuleResponse.data.length === 0) {
+    return null;
+  }
+  return convertAlertingRuleToRuleResponse(findRuleResponse.data[0]);
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/import_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/import_rule.ts
index 55a0399f1a528..adb28133b62f3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/import_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/import_rule.ts
@@ -6,78 +6,67 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
+import type { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
 import type { MlAuthz } from '../../../../../machine_learning/authz';
-import type { ImportRuleArgs } from '../detection_rules_client_interface';
-import type { RuleAlertType, RuleParams } from '../../../../rule_schema';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
 import { createBulkErrorObject } from '../../../../routes/utils';
-import {
-  convertCreateAPIToInternalSchema,
-  convertUpdateAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
-
-import { validateMlAuth, RuleResponseValidationError } from '../utils';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+import { convertRuleResponseToAlertingRule } from '../converters/convert_rule_response_to_alerting_rule';
+import type { ImportRuleArgs } from '../detection_rules_client_interface';
+import { applyRuleUpdate } from '../mergers/apply_rule_update';
+import { validateMlAuth } from '../utils';
+import { createRule } from './create_rule';
+import { getRuleByRuleId } from './get_rule_by_rule_id';
 
-import { readRules } from '../read_rules';
+interface ImportRuleOptions {
+  rulesClient: RulesClient;
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  importRulePayload: ImportRuleArgs;
+  mlAuthz: MlAuthz;
+}
 
-export const importRule = async (
-  rulesClient: RulesClient,
-  importRulePayload: ImportRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
+export const importRule = async ({
+  rulesClient,
+  importRulePayload,
+  prebuiltRuleAssetClient,
+  mlAuthz,
+}: ImportRuleOptions): Promise<RuleResponse> => {
   const { ruleToImport, overwriteRules, allowMissingConnectorSecrets } = importRulePayload;
 
   await validateMlAuth(mlAuthz, ruleToImport.type);
 
-  const existingRule = await readRules({
+  const existingRule = await getRuleByRuleId({
     rulesClient,
     ruleId: ruleToImport.rule_id,
-    id: undefined,
   });
 
   if (existingRule && !overwriteRules) {
     throw createBulkErrorObject({
-      ruleId: existingRule.params.ruleId,
+      ruleId: existingRule.rule_id,
       statusCode: 409,
-      message: `rule_id: "${existingRule.params.ruleId}" already exists`,
+      message: `rule_id: "${existingRule.rule_id}" already exists`,
     });
   }
 
-  let importedInternalRule: RuleAlertType;
-
   if (existingRule && overwriteRules) {
-    const ruleUpdateParams = convertUpdateAPIToInternalSchema({
+    const ruleWithUpdates = await applyRuleUpdate({
+      prebuiltRuleAssetClient,
       existingRule,
       ruleUpdate: ruleToImport,
     });
 
-    importedInternalRule = await rulesClient.update({
+    const updatedRule = await rulesClient.update({
       id: existingRule.id,
-      data: ruleUpdateParams,
-    });
-  } else {
-    /* Rule does not exist, so we'll create it */
-    const ruleCreateParams = convertCreateAPIToInternalSchema(ruleToImport, {
-      immutable: false,
-    });
-
-    importedInternalRule = await rulesClient.create<RuleParams>({
-      data: ruleCreateParams,
-      allowMissingConnectorSecrets,
+      data: convertRuleResponseToAlertingRule(ruleWithUpdates),
     });
+    return convertAlertingRuleToRuleResponse(updatedRule);
   }
 
-  /* Trying to convert an internal rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(importedInternalRule));
-
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: importedInternalRule.params.ruleId,
-    });
-  }
-
-  return parseResult.data;
+  /* Rule does not exist, so we'll create it */
+  return createRule({
+    rulesClient,
+    mlAuthz,
+    rule: ruleToImport,
+    allowMissingConnectorSecrets,
+  });
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/patch_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/patch_rule.ts
index ce9956c5eec84..d615d5fc5a817 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/patch_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/patch_rule.ts
@@ -6,34 +6,35 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
+import type {
+  RulePatchProps,
+  RuleResponse,
+} from '../../../../../../../common/api/detection_engine/model/rule_schema';
 import type { MlAuthz } from '../../../../../machine_learning/authz';
-import type { PatchRuleArgs } from '../detection_rules_client_interface';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { applyRulePatch } from '../mergers/apply_rule_patch';
 import { getIdError } from '../../../utils/utils';
-import {
-  convertPatchAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+import { convertRuleResponseToAlertingRule } from '../converters/convert_rule_response_to_alerting_rule';
+import { ClientError, toggleRuleEnabledOnUpdate, validateMlAuth } from '../utils';
+import { getRuleByIdOrRuleId } from './get_rule_by_id_or_rule_id';
 
-import {
-  validateMlAuth,
-  ClientError,
-  toggleRuleEnabledOnUpdate,
-  RuleResponseValidationError,
-} from '../utils';
+interface PatchRuleOptions {
+  rulesClient: RulesClient;
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  rulePatch: RulePatchProps;
+  mlAuthz: MlAuthz;
+}
 
-import { readRules } from '../read_rules';
+export const patchRule = async ({
+  rulesClient,
+  prebuiltRuleAssetClient,
+  rulePatch,
+  mlAuthz,
+}: PatchRuleOptions): Promise<RuleResponse> => {
+  const { rule_id: ruleId, id } = rulePatch;
 
-export const patchRule = async (
-  rulesClient: RulesClient,
-  args: PatchRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
-  const { nextParams } = args;
-  const { rule_id: ruleId, id } = nextParams;
-
-  const existingRule = await readRules({
+  const existingRule = await getRuleByIdOrRuleId({
     rulesClient,
     ruleId,
     id,
@@ -44,32 +45,20 @@ export const patchRule = async (
     throw new ClientError(error.message, error.statusCode);
   }
 
-  await validateMlAuth(mlAuthz, nextParams.type ?? existingRule.params.type);
+  await validateMlAuth(mlAuthz, rulePatch.type ?? existingRule.type);
 
-  const patchedRule = convertPatchAPIToInternalSchema(nextParams, existingRule);
+  const patchedRule = await applyRulePatch({
+    prebuiltRuleAssetClient,
+    existingRule,
+    rulePatch,
+  });
 
   const patchedInternalRule = await rulesClient.update({
     id: existingRule.id,
-    data: patchedRule,
+    data: convertRuleResponseToAlertingRule(patchedRule),
   });
 
-  const { enabled } = await toggleRuleEnabledOnUpdate(
-    rulesClient,
-    existingRule,
-    nextParams.enabled
-  );
-
-  /* Trying to convert the internal rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(
-    internalRuleToAPIResponse({ ...patchedInternalRule, enabled })
-  );
-
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: patchedInternalRule.params.ruleId,
-    });
-  }
+  const { enabled } = await toggleRuleEnabledOnUpdate(rulesClient, existingRule, patchedRule);
 
-  return parseResult.data;
+  return convertAlertingRuleToRuleResponse({ ...patchedInternalRule, enabled });
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/update_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/update_rule.ts
index 8684a7ccd2c61..cf42074c2a042 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/update_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/update_rule.ts
@@ -6,36 +6,37 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
+import type { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
 import type { MlAuthz } from '../../../../../machine_learning/authz';
-import type { UpdateRuleArgs } from '../detection_rules_client_interface';
+import { applyRuleUpdate } from '../mergers/apply_rule_update';
 import { getIdError } from '../../../utils/utils';
-import {
-  convertUpdateAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
+import { convertRuleResponseToAlertingRule } from '../converters/convert_rule_response_to_alerting_rule';
 
-import {
-  validateMlAuth,
-  ClientError,
-  toggleRuleEnabledOnUpdate,
-  RuleResponseValidationError,
-} from '../utils';
+import { ClientError, toggleRuleEnabledOnUpdate, validateMlAuth } from '../utils';
 
-import { readRules } from '../read_rules';
+import type { RuleUpdateProps } from '../../../../../../../common/api/detection_engine';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { getRuleByIdOrRuleId } from './get_rule_by_id_or_rule_id';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
 
-export const updateRule = async (
-  rulesClient: RulesClient,
-  args: UpdateRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
-  const { ruleUpdate } = args;
+interface UpdateRuleArguments {
+  rulesClient: RulesClient;
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+  ruleUpdate: RuleUpdateProps;
+  mlAuthz: MlAuthz;
+}
+
+export const updateRule = async ({
+  rulesClient,
+  prebuiltRuleAssetClient,
+  ruleUpdate,
+  mlAuthz,
+}: UpdateRuleArguments): Promise<RuleResponse> => {
   const { rule_id: ruleId, id } = ruleUpdate;
 
   await validateMlAuth(mlAuthz, ruleUpdate.type);
 
-  const existingRule = await readRules({
+  const existingRule = await getRuleByIdOrRuleId({
     rulesClient,
     ruleId,
     id,
@@ -46,33 +47,21 @@ export const updateRule = async (
     throw new ClientError(error.message, error.statusCode);
   }
 
-  const newInternalRule = convertUpdateAPIToInternalSchema({
+  const ruleWithUpdates = await applyRuleUpdate({
+    prebuiltRuleAssetClient,
     existingRule,
     ruleUpdate,
   });
 
-  const updatedInternalRule = await rulesClient.update({
+  const updatedRule = await rulesClient.update({
     id: existingRule.id,
-    data: newInternalRule,
+    data: convertRuleResponseToAlertingRule(ruleWithUpdates),
   });
 
-  const { enabled } = await toggleRuleEnabledOnUpdate(
-    rulesClient,
-    existingRule,
-    ruleUpdate.enabled
-  );
-
-  /* Trying to convert the internal rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(
-    internalRuleToAPIResponse({ ...updatedInternalRule, enabled })
-  );
+  const { enabled } = await toggleRuleEnabledOnUpdate(rulesClient, existingRule, ruleWithUpdates);
 
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: updatedInternalRule.params.ruleId,
-    });
-  }
-
-  return parseResult.data;
+  return convertAlertingRuleToRuleResponse({
+    ...updatedRule,
+    enabled,
+  });
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/upgrade_prebuilt_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/upgrade_prebuilt_rule.ts
index 8c1079f5716db..4eef323be2fd9 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/upgrade_prebuilt_rule.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/methods/upgrade_prebuilt_rule.ts
@@ -6,94 +6,74 @@
  */
 
 import type { RulesClient } from '@kbn/alerting-plugin/server';
-import { stringifyZodError } from '@kbn/zod-helpers';
+import type { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
 import type { MlAuthz } from '../../../../../machine_learning/authz';
-import type { RuleParams } from '../../../../rule_schema';
-import type { UpgradePrebuiltRuleArgs } from '../detection_rules_client_interface';
-import {
-  convertPatchAPIToInternalSchema,
-  convertCreateAPIToInternalSchema,
-  internalRuleToAPIResponse,
-} from '../../../normalization/rule_converters';
-import { transformAlertToRuleAction } from '../../../../../../../common/detection_engine/transform_actions';
-import { RuleResponse } from '../../../../../../../common/api/detection_engine/model/rule_schema';
-
-import { validateMlAuth, ClientError, RuleResponseValidationError } from '../utils';
-
-import { readRules } from '../read_rules';
-
-export const upgradePrebuiltRule = async (
-  rulesClient: RulesClient,
-  upgradePrebuiltRulePayload: UpgradePrebuiltRuleArgs,
-  mlAuthz: MlAuthz
-): Promise<RuleResponse> => {
-  const { ruleAsset } = upgradePrebuiltRulePayload;
-
+import type { PrebuiltRuleAsset } from '../../../../prebuilt_rules';
+import type { IPrebuiltRuleAssetsClient } from '../../../../prebuilt_rules/logic/rule_assets/prebuilt_rule_assets_client';
+import { convertAlertingRuleToRuleResponse } from '../converters/convert_alerting_rule_to_rule_response';
+import { convertRuleResponseToAlertingRule } from '../converters/convert_rule_response_to_alerting_rule';
+import { applyRulePatch } from '../mergers/apply_rule_patch';
+import { ClientError, validateMlAuth } from '../utils';
+import { createRule } from './create_rule';
+import { getRuleByRuleId } from './get_rule_by_rule_id';
+
+export const upgradePrebuiltRule = async ({
+  rulesClient,
+  ruleAsset,
+  mlAuthz,
+  prebuiltRuleAssetClient,
+}: {
+  rulesClient: RulesClient;
+  ruleAsset: PrebuiltRuleAsset;
+  mlAuthz: MlAuthz;
+  prebuiltRuleAssetClient: IPrebuiltRuleAssetsClient;
+}): Promise<RuleResponse> => {
   await validateMlAuth(mlAuthz, ruleAsset.type);
 
-  const existingRule = await readRules({
+  const existingRule = await getRuleByRuleId({
     rulesClient,
     ruleId: ruleAsset.rule_id,
-    id: undefined,
   });
 
   if (!existingRule) {
     throw new ClientError(`Failed to find rule ${ruleAsset.rule_id}`, 500);
   }
 
-  if (ruleAsset.type !== existingRule.params.type) {
+  if (ruleAsset.type !== existingRule.type) {
     // If we're trying to change the type of a prepackaged rule, we need to delete the old one
     // and replace it with the new rule, keeping the enabled setting, actions, throttle, id,
     // and exception lists from the old rule
     await rulesClient.delete({ id: existingRule.id });
 
-    const internalRule = convertCreateAPIToInternalSchema(
-      {
+    const createdRule = await createRule({
+      rulesClient,
+      mlAuthz,
+      rule: {
         ...ruleAsset,
+        immutable: true,
         enabled: existingRule.enabled,
-        exceptions_list: existingRule.params.exceptionsList,
-        actions: existingRule.actions.map(transformAlertToRuleAction),
-        timeline_id: existingRule.params.timelineId,
-        timeline_title: existingRule.params.timelineTitle,
+        exceptions_list: existingRule.exceptions_list,
+        actions: existingRule.actions,
+        timeline_id: existingRule.timeline_id,
+        timeline_title: existingRule.timeline_title,
       },
-      { immutable: true, defaultEnabled: existingRule.enabled }
-    );
-
-    const createdRule = await rulesClient.create<RuleParams>({
-      data: internalRule,
-      options: { id: existingRule.id },
+      id: existingRule.id,
     });
 
-    /* Trying to convert the rule to a RuleResponse object */
-    const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(createdRule));
-
-    if (!parseResult.success) {
-      throw new RuleResponseValidationError({
-        message: stringifyZodError(parseResult.error),
-        ruleId: createdRule.params.ruleId,
-      });
-    }
-
-    return parseResult.data;
+    return createdRule;
   }
 
   // Else, simply patch it.
-  const patchedRule = convertPatchAPIToInternalSchema(ruleAsset, existingRule);
+  const patchedRule = await applyRulePatch({
+    prebuiltRuleAssetClient,
+    existingRule,
+    rulePatch: ruleAsset,
+  });
 
   const patchedInternalRule = await rulesClient.update({
     id: existingRule.id,
-    data: patchedRule,
+    data: convertRuleResponseToAlertingRule(patchedRule),
   });
 
-  /* Trying to convert the internal rule to a RuleResponse object */
-  const parseResult = RuleResponse.safeParse(internalRuleToAPIResponse(patchedInternalRule));
-
-  if (!parseResult.success) {
-    throw new RuleResponseValidationError({
-      message: stringifyZodError(parseResult.error),
-      ruleId: patchedInternalRule.params.ruleId,
-    });
-  }
-
-  return parseResult.data;
+  return convertAlertingRuleToRuleResponse(patchedInternalRule);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/read_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/read_rules.ts
index d699d5ee7dd55..67c7746bd0eb3 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/read_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/read_rules.ts
@@ -30,6 +30,8 @@ export interface ReadRuleOptions {
  * be returned as a not-found or a thrown error that is not 404.
  * @param ruleId - This is a close second to being fast as long as it can find the rule_id from
  * a filter query against the ruleId property in params using `alert.attributes.params.ruleId: "${ruleId}"`
+ *
+ * @deprecated Should be replaced with DetectionRulesClient.getRuleById once it's implemented
  */
 export const readRules = async ({
   rulesClient,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/utils.ts
index 4f25497b30564..db2af377eb5b1 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/detection_rules_client/utils.ts
@@ -12,21 +12,21 @@ import type { RulesClient } from '@kbn/alerting-plugin/server';
 import type { Type } from '@kbn/securitysolution-io-ts-alerting-types';
 import type { MlAuthz } from '../../../../machine_learning/authz';
 
-import type { RuleAlertType } from '../../../rule_schema';
 import type { RuleSignatureId } from '../../../../../../common/api/detection_engine/model/rule_schema/common_attributes.gen';
 import { throwAuthzError } from '../../../../machine_learning/validation';
+import type { RuleResponse } from '../../../../../../common/api/detection_engine';
 
 export const toggleRuleEnabledOnUpdate = async (
   rulesClient: RulesClient,
-  existingRule: RuleAlertType,
-  updatedRuleEnabled?: boolean
+  existingRule: RuleResponse,
+  updatedRule: RuleResponse
 ): Promise<{ enabled: boolean }> => {
-  if (existingRule.enabled && updatedRuleEnabled === false) {
+  if (existingRule.enabled && !updatedRule.enabled) {
     await rulesClient.disable({ id: existingRule.id });
     return { enabled: false };
   }
 
-  if (!existingRule.enabled && updatedRuleEnabled === true) {
+  if (!existingRule.enabled && updatedRule.enabled) {
     await rulesClient.enable({ id: existingRule.id });
     return { enabled: true };
   }
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts
index 08794143ce161..5093393d6d657 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.test.ts
@@ -15,7 +15,7 @@ import {
   getRuleMock,
 } from '../../../routes/__mocks__/request_responses';
 import { getThreatMock } from '../../../../../../common/detection_engine/schemas/types/threat.mock';
-import { internalRuleToAPIResponse } from '../../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../detection_rules_client/converters/internal_rule_to_api_response';
 import { getEqlRuleParams, getQueryRuleParams } from '../../../rule_schema/mocks';
 import { getExportByObjectIds } from './get_export_by_object_ids';
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
index ce57b33227ca4..7c3142aed85f6 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/logic/export/get_export_by_object_ids.ts
@@ -13,7 +13,7 @@ import type { ExceptionListClient } from '@kbn/lists-plugin/server';
 import type { RulesClient, PartialRule } from '@kbn/alerting-plugin/server';
 import type { ActionsClient } from '@kbn/actions-plugin/server';
 import { withSecuritySpan } from '../../../../../utils/with_security_span';
-import { internalRuleToAPIResponse } from '../../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../detection_rules_client/converters/internal_rule_to_api_response';
 import type { RuleParams } from '../../../rule_schema';
 import { hasValidRuleType } from '../../../rule_schema';
 import { findRules } from '../search/find_rules';
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.test.ts
deleted file mode 100644
index 5df02371befa2..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.test.ts
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  commonParamsCamelToSnake,
-  patchTypeSpecificSnakeToCamel,
-  typeSpecificCamelToSnake,
-} from './rule_converters';
-import {
-  getBaseRuleParams,
-  getEqlRuleParams,
-  getEsqlRuleParams,
-  getMlRuleParams,
-  getNewTermsRuleParams,
-  getQueryRuleParams,
-  getSavedQueryRuleParams,
-  getThreatRuleParams,
-  getThresholdRuleParams,
-} from '../../rule_schema/mocks';
-import type {
-  AlertSuppressionDuration,
-  PatchRuleRequestBody,
-  AlertSuppressionMissingFieldsStrategy,
-} from '../../../../../common/api/detection_engine';
-
-describe('rule_converters', () => {
-  describe('patchTypeSpecificSnakeToCamel', () => {
-    describe('EQL', () => {
-      test('should accept EQL params when existing rule type is EQL', () => {
-        const patchParams = {
-          timestamp_field: 'event.created',
-          event_category_override: 'event.not_category',
-          tiebreaker_field: 'event.created',
-        };
-        const rule = getEqlRuleParams();
-        const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-        expect(patchedParams).toEqual(
-          expect.objectContaining({
-            timestampField: 'event.created',
-            eventCategoryOverride: 'event.not_category',
-            tiebreakerField: 'event.created',
-          })
-        );
-      });
-      test('should accept EQL params with suppression in snake case and convert to camel case when rule type is EQL', () => {
-        const patchParams = {
-          timestamp_field: 'event.created',
-          event_category_override: 'event.not_category',
-          tiebreaker_field: 'event.created',
-          alert_suppression: {
-            group_by: ['event.type'],
-            duration: {
-              value: 10,
-              unit: 'm',
-            } as AlertSuppressionDuration,
-            missing_fields_strategy: 'suppress',
-          },
-        };
-        const rule = getEqlRuleParams();
-        const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-        expect(patchedParams).toEqual(
-          expect.objectContaining({
-            timestampField: 'event.created',
-            eventCategoryOverride: 'event.not_category',
-            tiebreakerField: 'event.created',
-            alertSuppression: {
-              groupBy: ['event.type'],
-              duration: {
-                value: 10,
-                unit: 'm',
-              },
-              missingFieldsStrategy: 'suppress',
-            },
-          })
-        );
-      });
-      test('should reject invalid EQL params when existing rule type is EQL', () => {
-        const patchParams = {
-          timestamp_field: 1,
-          event_category_override: 1,
-          tiebreaker_field: 1,
-        } as PatchRuleRequestBody;
-        const rule = getEqlRuleParams();
-        expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-          'event_category_override: Expected string, received number, tiebreaker_field: Expected string, received number, timestamp_field: Expected string, received number'
-        );
-      });
-      test('should reject EQL params with invalid suppression group_by field', () => {
-        const patchParams = {
-          timestamp_field: 'event.created',
-          event_category_override: 'event.not_category',
-          tiebreaker_field: 'event.created',
-          alert_suppression: {
-            group_by: 'event.type',
-            duration: {
-              value: 10,
-              unit: 'm',
-            } as AlertSuppressionDuration,
-            missing_fields_strategy: 'suppress',
-          },
-        };
-        const rule = getEqlRuleParams();
-        expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-          'alert_suppression.group_by: Expected array, received string'
-        );
-      });
-    });
-
-    describe('machine learning rules', () => {
-      test('should accept machine learning params when existing rule type is machine learning', () => {
-        const patchParams = {
-          anomaly_threshold: 5,
-        };
-        const rule = getMlRuleParams();
-        const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-        expect(patchedParams).toEqual(
-          expect.objectContaining({
-            anomalyThreshold: 5,
-          })
-        );
-      });
-
-      test('should reject invalid machine learning params when existing rule type is machine learning', () => {
-        const patchParams = {
-          anomaly_threshold: 'invalid',
-        } as PatchRuleRequestBody;
-        const rule = getMlRuleParams();
-        expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-          'anomaly_threshold: Expected number, received string'
-        );
-      });
-
-      it('accepts suppression params', () => {
-        const patchParams = {
-          alert_suppression: {
-            group_by: ['agent.name'],
-            missing_fields_strategy: 'suppress' as const,
-          },
-        };
-        const rule = getMlRuleParams();
-        const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-
-        expect(patchedParams).toEqual(
-          expect.objectContaining({
-            alertSuppression: {
-              groupBy: ['agent.name'],
-              missingFieldsStrategy: 'suppress',
-            },
-          })
-        );
-      });
-    });
-
-    test('should accept threat match params when existing rule type is threat match', () => {
-      const patchParams = {
-        threat_indicator_path: 'my.indicator',
-        threat_query: 'test-query',
-      };
-      const rule = getThreatRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          threatIndicatorPath: 'my.indicator',
-          threatQuery: 'test-query',
-        })
-      );
-    });
-
-    test('should reject invalid threat match params when existing rule type is threat match', () => {
-      const patchParams = {
-        threat_indicator_path: 1,
-        threat_query: 1,
-      } as PatchRuleRequestBody;
-      const rule = getThreatRuleParams();
-      expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-        'threat_query: Expected string, received number, threat_indicator_path: Expected string, received number'
-      );
-    });
-
-    test('should accept query params when existing rule type is query', () => {
-      const patchParams = {
-        index: ['new-test-index'],
-        language: 'lucene',
-      } as PatchRuleRequestBody;
-      const rule = getQueryRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          index: ['new-test-index'],
-          language: 'lucene',
-        })
-      );
-    });
-
-    test('should reject invalid query params when existing rule type is query', () => {
-      const patchParams = {
-        index: [1],
-        language: 'non-language',
-      } as PatchRuleRequestBody;
-      const rule = getQueryRuleParams();
-      expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-        "index.0: Expected string, received number, language: Invalid enum value. Expected 'kuery' | 'lucene', received 'non-language'"
-      );
-    });
-
-    test('should accept saved query params when existing rule type is saved query', () => {
-      const patchParams = {
-        index: ['new-test-index'],
-        language: 'lucene',
-      } as PatchRuleRequestBody;
-      const rule = getSavedQueryRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          index: ['new-test-index'],
-          language: 'lucene',
-        })
-      );
-    });
-
-    test('should reject invalid saved query params when existing rule type is saved query', () => {
-      const patchParams = {
-        index: [1],
-        language: 'non-language',
-      } as PatchRuleRequestBody;
-      const rule = getSavedQueryRuleParams();
-      expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-        "index.0: Expected string, received number, language: Invalid enum value. Expected 'kuery' | 'lucene', received 'non-language'"
-      );
-    });
-
-    test('should accept threshold params when existing rule type is threshold', () => {
-      const patchParams = {
-        threshold: {
-          field: ['host.name'],
-          value: 107,
-        },
-      };
-      const rule = getThresholdRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          threshold: {
-            field: ['host.name'],
-            value: 107,
-          },
-        })
-      );
-    });
-
-    test('should reject invalid threshold params when existing rule type is threshold', () => {
-      const patchParams = {
-        threshold: {
-          field: ['host.name'],
-          value: 'invalid',
-        },
-      } as PatchRuleRequestBody;
-      const rule = getThresholdRuleParams();
-      expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-        'threshold.value: Expected number, received string'
-      );
-    });
-
-    test('should accept ES|QL alerts suppression params', () => {
-      const patchParams = {
-        alert_suppression: {
-          group_by: ['agent.name'],
-          duration: { value: 4, unit: 'h' as const },
-          missing_fields_strategy: 'doNotSuppress' as const,
-        },
-      };
-      const rule = getEsqlRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          alertSuppression: {
-            groupBy: ['agent.name'],
-            missingFieldsStrategy: 'doNotSuppress',
-            duration: { value: 4, unit: 'h' },
-          },
-        })
-      );
-    });
-
-    test('should accept threshold alerts suppression params', () => {
-      const patchParams = {
-        alert_suppression: {
-          duration: { value: 4, unit: 'h' as const },
-        },
-      };
-      const rule = getThresholdRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          alertSuppression: {
-            duration: { value: 4, unit: 'h' },
-          },
-        })
-      );
-    });
-
-    test('should accept threat_match alerts suppression params', () => {
-      const patchParams = {
-        alert_suppression: {
-          group_by: ['agent.name'],
-          missing_fields_strategy: 'suppress' as const,
-        },
-      };
-      const rule = getThreatRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          alertSuppression: {
-            groupBy: ['agent.name'],
-            missingFieldsStrategy: 'suppress',
-          },
-        })
-      );
-    });
-
-    test('should accept new_terms alerts suppression params', () => {
-      const patchParams = {
-        alert_suppression: {
-          group_by: ['agent.name'],
-          duration: { value: 4, unit: 'h' as const },
-          missing_fields_strategy: 'suppress' as const,
-        },
-      };
-      const rule = getNewTermsRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          alertSuppression: {
-            groupBy: ['agent.name'],
-            missingFieldsStrategy: 'suppress',
-            duration: { value: 4, unit: 'h' },
-          },
-        })
-      );
-    });
-
-    test('should accept new terms params when existing rule type is new terms', () => {
-      const patchParams = {
-        new_terms_fields: ['event.new_field'],
-      };
-      const rule = getNewTermsRuleParams();
-      const patchedParams = patchTypeSpecificSnakeToCamel(patchParams, rule);
-      expect(patchedParams).toEqual(
-        expect.objectContaining({
-          newTermsFields: ['event.new_field'],
-        })
-      );
-    });
-
-    test('should reject invalid new terms params when existing rule type is new terms', () => {
-      const patchParams = {
-        new_terms_fields: 'invalid',
-      } as PatchRuleRequestBody;
-      const rule = getNewTermsRuleParams();
-      expect(() => patchTypeSpecificSnakeToCamel(patchParams, rule)).toThrowError(
-        'new_terms_fields: Expected array, received string'
-      );
-    });
-  });
-
-  describe('typeSpecificCamelToSnake', () => {
-    describe('EQL', () => {
-      test('should accept EQL params when existing rule type is EQL', () => {
-        const params = {
-          timestampField: 'event.created',
-          eventCategoryOverride: 'event.not_category',
-          tiebreakerField: 'event.created',
-        };
-        const eqlRule = { ...getEqlRuleParams(), ...params };
-        const transformedParams = typeSpecificCamelToSnake(eqlRule);
-        expect(transformedParams).toEqual(
-          expect.objectContaining({
-            timestamp_field: 'event.created',
-            event_category_override: 'event.not_category',
-            tiebreaker_field: 'event.created',
-          })
-        );
-      });
-
-      test('should accept EQL params with suppression in camel case and convert to snake case when rule type is EQL', () => {
-        const params = {
-          timestampField: 'event.created',
-          eventCategoryOverride: 'event.not_category',
-          tiebreakerField: 'event.created',
-          alertSuppression: {
-            groupBy: ['event.type'],
-            duration: {
-              value: 10,
-              unit: 'm',
-            } as AlertSuppressionDuration,
-            missingFieldsStrategy: 'suppress' as AlertSuppressionMissingFieldsStrategy,
-          },
-        };
-        const eqlRule = { ...getEqlRuleParams(), ...params };
-        const transformedParams = typeSpecificCamelToSnake(eqlRule);
-        expect(transformedParams).toEqual(
-          expect.objectContaining({
-            timestamp_field: 'event.created',
-            event_category_override: 'event.not_category',
-            tiebreaker_field: 'event.created',
-            alert_suppression: {
-              group_by: ['event.type'],
-              duration: {
-                value: 10,
-                unit: 'm',
-              } as AlertSuppressionDuration,
-              missing_fields_strategy: 'suppress',
-            },
-          })
-        );
-      });
-    });
-
-    describe('machine learning rules', () => {
-      it('accepts normal params', () => {
-        const params = {
-          anomalyThreshold: 74,
-          machineLearningJobId: ['job-1'],
-        };
-        const ruleParams = { ...getMlRuleParams(), ...params };
-        const transformedParams = typeSpecificCamelToSnake(ruleParams);
-        expect(transformedParams).toEqual(
-          expect.objectContaining({
-            anomaly_threshold: 74,
-            machine_learning_job_id: ['job-1'],
-          })
-        );
-      });
-
-      it('accepts suppression params', () => {
-        const params = {
-          anomalyThreshold: 74,
-          machineLearningJobId: ['job-1'],
-          alertSuppression: {
-            groupBy: ['event.type'],
-            duration: {
-              value: 10,
-              unit: 'm',
-            } as AlertSuppressionDuration,
-            missingFieldsStrategy: 'suppress' as AlertSuppressionMissingFieldsStrategy,
-          },
-        };
-        const ruleParams = { ...getMlRuleParams(), ...params };
-        const transformedParams = typeSpecificCamelToSnake(ruleParams);
-        expect(transformedParams).toEqual(
-          expect.objectContaining({
-            anomaly_threshold: 74,
-            machine_learning_job_id: ['job-1'],
-            alert_suppression: {
-              group_by: ['event.type'],
-              duration: {
-                value: 10,
-                unit: 'm',
-              },
-              missing_fields_strategy: 'suppress',
-            },
-          })
-        );
-      });
-    });
-  });
-
-  describe('commonParamsCamelToSnake', () => {
-    test('should convert rule_source params to snake case', () => {
-      const transformedParams = commonParamsCamelToSnake({
-        ...getBaseRuleParams(),
-        ruleSource: {
-          type: 'external',
-          isCustomized: false,
-        },
-      });
-      expect(transformedParams).toEqual(
-        expect.objectContaining({
-          rule_source: {
-            type: 'external',
-            is_customized: false,
-          },
-        })
-      );
-    });
-  });
-});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts
deleted file mode 100644
index db815f32fb5ed..0000000000000
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/normalization/rule_converters.ts
+++ /dev/null
@@ -1,869 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { v4 as uuidv4 } from 'uuid';
-
-import { stringifyZodError } from '@kbn/zod-helpers';
-import { BadRequestError } from '@kbn/securitysolution-es-utils';
-import { ruleTypeMappings } from '@kbn/securitysolution-rules';
-import type { ResolvedSanitizedRule, SanitizedRule } from '@kbn/alerting-plugin/common';
-
-import type { RequiredOptional } from '@kbn/zod-helpers';
-import {
-  DEFAULT_INDICATOR_SOURCE_PATH,
-  DEFAULT_MAX_SIGNALS,
-  SERVER_APP_ID,
-} from '../../../../../common/constants';
-
-import type { PatchRuleRequestBody } from '../../../../../common/api/detection_engine/rule_management';
-import type {
-  RuleCreateProps,
-  RuleUpdateProps,
-  TypeSpecificCreateProps,
-  TypeSpecificResponse,
-} from '../../../../../common/api/detection_engine/model/rule_schema';
-import {
-  EqlRulePatchFields,
-  EsqlRulePatchFields,
-  MachineLearningRulePatchFields,
-  NewTermsRulePatchFields,
-  QueryRulePatchFields,
-  SavedQueryRulePatchFields,
-  ThreatMatchRulePatchFields,
-  ThresholdRulePatchFields,
-  RuleResponse,
-} from '../../../../../common/api/detection_engine/model/rule_schema';
-
-import {
-  transformAlertToRuleAction,
-  transformAlertToRuleResponseAction,
-  transformRuleToAlertAction,
-  transformRuleToAlertResponseAction,
-} from '../../../../../common/detection_engine/transform_actions';
-
-import {
-  normalizeMachineLearningJobIds,
-  normalizeThresholdObject,
-} from '../../../../../common/detection_engine/utils';
-
-import { assertUnreachable } from '../../../../../common/utility_types';
-
-import type {
-  InternalRuleCreate,
-  RuleParams,
-  TypeSpecificRuleParams,
-  BaseRuleParams,
-  EqlRuleParams,
-  EqlSpecificRuleParams,
-  EsqlRuleParams,
-  EsqlSpecificRuleParams,
-  ThreatRuleParams,
-  ThreatSpecificRuleParams,
-  QueryRuleParams,
-  QuerySpecificRuleParams,
-  SavedQuerySpecificRuleParams,
-  SavedQueryRuleParams,
-  ThresholdRuleParams,
-  ThresholdSpecificRuleParams,
-  MachineLearningRuleParams,
-  MachineLearningSpecificRuleParams,
-  InternalRuleUpdate,
-  NewTermsRuleParams,
-  NewTermsSpecificRuleParams,
-  RuleSourceCamelCased,
-} from '../../rule_schema';
-import { transformFromAlertThrottle, transformToActionFrequency } from './rule_actions';
-import {
-  addEcsToRequiredFields,
-  convertAlertSuppressionToCamel,
-  convertAlertSuppressionToSnake,
-  migrateLegacyInvestigationFields,
-} from '../utils/utils';
-import { createRuleExecutionSummary } from '../../rule_monitoring';
-import type { PrebuiltRuleAsset } from '../../prebuilt_rules';
-import { convertObjectKeysToSnakeCase } from '../../../../utils/object_case_converters';
-
-const DEFAULT_FROM = 'now-6m' as const;
-const DEFAULT_TO = 'now' as const;
-const DEFAULT_INTERVAL = '5m' as const;
-
-// These functions provide conversions from the request API schema to the internal rule schema and from the internal rule schema
-// to the response API schema. This provides static type-check assurances that the internal schema is in sync with the API schema for
-// required and default-able fields. However, it is still possible to add an optional field to the API schema
-// without causing a type-check error here.
-
-// Converts params from the snake case API format to the internal camel case format AND applies default values where needed.
-// Notice that params.language is possibly undefined for most rule types in the API but we default it to kuery to match
-// the legacy API behavior
-export const typeSpecificSnakeToCamel = (
-  params: TypeSpecificCreateProps
-): TypeSpecificRuleParams => {
-  switch (params.type) {
-    case 'eql': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        dataViewId: params.data_view_id,
-        query: params.query,
-        filters: params.filters,
-        timestampField: params.timestamp_field,
-        eventCategoryOverride: params.event_category_override,
-        tiebreakerField: params.tiebreaker_field,
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'esql': {
-      return {
-        type: params.type,
-        language: params.language,
-        query: params.query,
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'threat_match': {
-      return {
-        type: params.type,
-        language: params.language ?? 'kuery',
-        index: params.index,
-        dataViewId: params.data_view_id,
-        query: params.query,
-        filters: params.filters,
-        savedId: params.saved_id,
-        threatFilters: params.threat_filters,
-        threatQuery: params.threat_query,
-        threatMapping: params.threat_mapping,
-        threatLanguage: params.threat_language,
-        threatIndex: params.threat_index,
-        threatIndicatorPath: params.threat_indicator_path ?? DEFAULT_INDICATOR_SOURCE_PATH,
-        concurrentSearches: params.concurrent_searches,
-        itemsPerSearch: params.items_per_search,
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'query': {
-      return {
-        type: params.type,
-        language: params.language ?? 'kuery',
-        index: params.index,
-        dataViewId: params.data_view_id,
-        query: params.query ?? '',
-        filters: params.filters,
-        savedId: params.saved_id,
-        responseActions: params.response_actions?.map(transformRuleToAlertResponseAction),
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'saved_query': {
-      return {
-        type: params.type,
-        language: params.language ?? 'kuery',
-        index: params.index,
-        query: params.query,
-        filters: params.filters,
-        savedId: params.saved_id,
-        dataViewId: params.data_view_id,
-        responseActions: params.response_actions?.map(transformRuleToAlertResponseAction),
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'threshold': {
-      return {
-        type: params.type,
-        language: params.language ?? 'kuery',
-        index: params.index,
-        dataViewId: params.data_view_id,
-        query: params.query,
-        filters: params.filters,
-        savedId: params.saved_id,
-        threshold: normalizeThresholdObject(params.threshold),
-        alertSuppression: params.alert_suppression?.duration
-          ? { duration: params.alert_suppression.duration }
-          : undefined,
-      };
-    }
-    case 'machine_learning': {
-      return {
-        type: params.type,
-        anomalyThreshold: params.anomaly_threshold,
-        machineLearningJobId: normalizeMachineLearningJobIds(params.machine_learning_job_id),
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    case 'new_terms': {
-      return {
-        type: params.type,
-        query: params.query,
-        newTermsFields: params.new_terms_fields,
-        historyWindowStart: params.history_window_start,
-        index: params.index,
-        filters: params.filters,
-        language: params.language ?? 'kuery',
-        dataViewId: params.data_view_id,
-        alertSuppression: convertAlertSuppressionToCamel(params.alert_suppression),
-      };
-    }
-    default: {
-      return assertUnreachable(params);
-    }
-  }
-};
-
-const patchEqlParams = (
-  params: EqlRulePatchFields,
-  existingRule: EqlRuleParams
-): EqlSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    timestampField: params.timestamp_field ?? existingRule.timestampField,
-    eventCategoryOverride: params.event_category_override ?? existingRule.eventCategoryOverride,
-    tiebreakerField: params.tiebreaker_field ?? existingRule.tiebreakerField,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchEsqlParams = (
-  params: EsqlRulePatchFields,
-  existingRule: EsqlRuleParams
-): EsqlSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    query: params.query ?? existingRule.query,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchThreatMatchParams = (
-  params: ThreatMatchRulePatchFields,
-  existingRule: ThreatRuleParams
-): ThreatSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    savedId: params.saved_id ?? existingRule.savedId,
-    threatFilters: params.threat_filters ?? existingRule.threatFilters,
-    threatQuery: params.threat_query ?? existingRule.threatQuery,
-    threatMapping: params.threat_mapping ?? existingRule.threatMapping,
-    threatLanguage: params.threat_language ?? existingRule.threatLanguage,
-    threatIndex: params.threat_index ?? existingRule.threatIndex,
-    threatIndicatorPath: params.threat_indicator_path ?? existingRule.threatIndicatorPath,
-    concurrentSearches: params.concurrent_searches ?? existingRule.concurrentSearches,
-    itemsPerSearch: params.items_per_search ?? existingRule.itemsPerSearch,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchQueryParams = (
-  params: QueryRulePatchFields,
-  existingRule: QueryRuleParams
-): QuerySpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    savedId: params.saved_id ?? existingRule.savedId,
-    responseActions:
-      params.response_actions?.map(transformRuleToAlertResponseAction) ??
-      existingRule.responseActions,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchSavedQueryParams = (
-  params: SavedQueryRulePatchFields,
-  existingRule: SavedQueryRuleParams
-): SavedQuerySpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    savedId: params.saved_id ?? existingRule.savedId,
-    responseActions:
-      params.response_actions?.map(transformRuleToAlertResponseAction) ??
-      existingRule.responseActions,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchThresholdParams = (
-  params: ThresholdRulePatchFields,
-  existingRule: ThresholdRuleParams
-): ThresholdSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    savedId: params.saved_id ?? existingRule.savedId,
-    threshold: params.threshold
-      ? normalizeThresholdObject(params.threshold)
-      : existingRule.threshold,
-    alertSuppression: params.alert_suppression ?? existingRule.alertSuppression,
-  };
-};
-
-const patchMachineLearningParams = (
-  params: MachineLearningRulePatchFields,
-  existingRule: MachineLearningRuleParams
-): MachineLearningSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    anomalyThreshold: params.anomaly_threshold ?? existingRule.anomalyThreshold,
-    machineLearningJobId: params.machine_learning_job_id
-      ? normalizeMachineLearningJobIds(params.machine_learning_job_id)
-      : existingRule.machineLearningJobId,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-const patchNewTermsParams = (
-  params: NewTermsRulePatchFields,
-  existingRule: NewTermsRuleParams
-): NewTermsSpecificRuleParams => {
-  return {
-    type: existingRule.type,
-    language: params.language ?? existingRule.language,
-    index: params.index ?? existingRule.index,
-    dataViewId: params.data_view_id ?? existingRule.dataViewId,
-    query: params.query ?? existingRule.query,
-    filters: params.filters ?? existingRule.filters,
-    newTermsFields: params.new_terms_fields ?? existingRule.newTermsFields,
-    historyWindowStart: params.history_window_start ?? existingRule.historyWindowStart,
-    alertSuppression:
-      convertAlertSuppressionToCamel(params.alert_suppression) ?? existingRule.alertSuppression,
-  };
-};
-
-export const patchTypeSpecificSnakeToCamel = (
-  params: PatchRuleRequestBody,
-  existingRule: RuleParams
-): TypeSpecificRuleParams => {
-  // Here we do the validation of patch params by rule type to ensure that the fields that are
-  // passed in to patch are of the correct type, e.g. `query` is a string. Since the combined patch schema
-  // is a union of types where everything is optional, it's hard to do the validation before we know the rule type -
-  // a patch request that defines `event_category_override` as a number would not be assignable to the EQL patch schema,
-  // but would be assignable to the other rule types since they don't specify `event_category_override`.
-  switch (existingRule.type) {
-    case 'eql': {
-      const result = EqlRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchEqlParams(result.data, existingRule);
-    }
-    case 'esql': {
-      const result = EsqlRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchEsqlParams(result.data, existingRule);
-    }
-    case 'threat_match': {
-      const result = ThreatMatchRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchThreatMatchParams(result.data, existingRule);
-    }
-    case 'query': {
-      const result = QueryRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchQueryParams(result.data, existingRule);
-    }
-    case 'saved_query': {
-      const result = SavedQueryRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchSavedQueryParams(result.data, existingRule);
-    }
-    case 'threshold': {
-      const result = ThresholdRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchThresholdParams(result.data, existingRule);
-    }
-    case 'machine_learning': {
-      const result = MachineLearningRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchMachineLearningParams(result.data, existingRule);
-    }
-    case 'new_terms': {
-      const result = NewTermsRulePatchFields.safeParse(params);
-      if (!result.success) {
-        throw new BadRequestError(stringifyZodError(result.error));
-      }
-      return patchNewTermsParams(result.data, existingRule);
-    }
-    default: {
-      return assertUnreachable(existingRule);
-    }
-  }
-};
-
-interface ConvertUpdateAPIToInternalSchemaProps {
-  existingRule: SanitizedRule<RuleParams>;
-  ruleUpdate: RuleUpdateProps;
-}
-
-export const convertUpdateAPIToInternalSchema = ({
-  existingRule,
-  ruleUpdate,
-}: ConvertUpdateAPIToInternalSchemaProps) => {
-  const alertActions =
-    ruleUpdate.actions?.map((action) => transformRuleToAlertAction(action)) ?? [];
-  const actions = transformToActionFrequency(alertActions, ruleUpdate.throttle);
-
-  const typeSpecificParams = typeSpecificSnakeToCamel(ruleUpdate);
-
-  const newInternalRule: InternalRuleUpdate = {
-    name: ruleUpdate.name,
-    tags: ruleUpdate.tags ?? [],
-    params: {
-      author: ruleUpdate.author ?? [],
-      buildingBlockType: ruleUpdate.building_block_type,
-      description: ruleUpdate.description,
-      ruleId: existingRule.params.ruleId,
-      falsePositives: ruleUpdate.false_positives ?? [],
-      from: ruleUpdate.from ?? 'now-6m',
-      investigationFields: ruleUpdate.investigation_fields,
-      immutable: existingRule.params.immutable,
-      ruleSource: convertImmutableToRuleSource(existingRule.params.immutable),
-      license: ruleUpdate.license,
-      outputIndex: ruleUpdate.output_index ?? '',
-      timelineId: ruleUpdate.timeline_id,
-      timelineTitle: ruleUpdate.timeline_title,
-      meta: ruleUpdate.meta,
-      maxSignals: ruleUpdate.max_signals ?? DEFAULT_MAX_SIGNALS,
-      relatedIntegrations: ruleUpdate.related_integrations ?? [],
-      requiredFields: addEcsToRequiredFields(ruleUpdate.required_fields),
-      riskScore: ruleUpdate.risk_score,
-      riskScoreMapping: ruleUpdate.risk_score_mapping ?? [],
-      ruleNameOverride: ruleUpdate.rule_name_override,
-      setup: ruleUpdate.setup,
-      severity: ruleUpdate.severity,
-      severityMapping: ruleUpdate.severity_mapping ?? [],
-      threat: ruleUpdate.threat ?? [],
-      timestampOverride: ruleUpdate.timestamp_override,
-      timestampOverrideFallbackDisabled: ruleUpdate.timestamp_override_fallback_disabled,
-      to: ruleUpdate.to ?? 'now',
-      references: ruleUpdate.references ?? [],
-      namespace: ruleUpdate.namespace,
-      note: ruleUpdate.note,
-      version: ruleUpdate.version ?? existingRule.params.version,
-      exceptionsList: ruleUpdate.exceptions_list ?? [],
-      ...typeSpecificParams,
-    },
-    schedule: { interval: ruleUpdate.interval ?? '5m' },
-    actions,
-  };
-
-  return newInternalRule;
-};
-
-// eslint-disable-next-line complexity
-export const convertPatchAPIToInternalSchema = (
-  nextParams: PatchRuleRequestBody,
-  existingRule: SanitizedRule<RuleParams>
-): InternalRuleUpdate => {
-  const typeSpecificParams = patchTypeSpecificSnakeToCamel(nextParams, existingRule.params);
-  const existingParams = existingRule.params;
-
-  const alertActions =
-    nextParams.actions?.map((action) => transformRuleToAlertAction(action)) ?? existingRule.actions;
-  const throttle = nextParams.throttle ?? transformFromAlertThrottle(existingRule);
-  const actions = transformToActionFrequency(alertActions, throttle);
-
-  return {
-    name: nextParams.name ?? existingRule.name,
-    tags: nextParams.tags ?? existingRule.tags,
-    params: {
-      author: nextParams.author ?? existingParams.author,
-      buildingBlockType: nextParams.building_block_type ?? existingParams.buildingBlockType,
-      description: nextParams.description ?? existingParams.description,
-      ruleId: existingParams.ruleId,
-      falsePositives: nextParams.false_positives ?? existingParams.falsePositives,
-      investigationFields: nextParams.investigation_fields ?? existingParams.investigationFields,
-      from: nextParams.from ?? existingParams.from,
-      immutable: existingParams.immutable,
-      ruleSource: convertImmutableToRuleSource(existingParams.immutable),
-      license: nextParams.license ?? existingParams.license,
-      outputIndex: nextParams.output_index ?? existingParams.outputIndex,
-      timelineId: nextParams.timeline_id ?? existingParams.timelineId,
-      timelineTitle: nextParams.timeline_title ?? existingParams.timelineTitle,
-      meta: nextParams.meta ?? existingParams.meta,
-      maxSignals: nextParams.max_signals ?? existingParams.maxSignals,
-      relatedIntegrations: nextParams.related_integrations ?? existingParams.relatedIntegrations,
-      requiredFields: addEcsToRequiredFields(nextParams.required_fields),
-      riskScore: nextParams.risk_score ?? existingParams.riskScore,
-      riskScoreMapping: nextParams.risk_score_mapping ?? existingParams.riskScoreMapping,
-      ruleNameOverride: nextParams.rule_name_override ?? existingParams.ruleNameOverride,
-      setup: nextParams.setup ?? existingParams.setup,
-      severity: nextParams.severity ?? existingParams.severity,
-      severityMapping: nextParams.severity_mapping ?? existingParams.severityMapping,
-      threat: nextParams.threat ?? existingParams.threat,
-      timestampOverride: nextParams.timestamp_override ?? existingParams.timestampOverride,
-      timestampOverrideFallbackDisabled:
-        nextParams.timestamp_override_fallback_disabled ??
-        existingParams.timestampOverrideFallbackDisabled,
-      to: nextParams.to ?? existingParams.to,
-      references: nextParams.references ?? existingParams.references,
-      namespace: nextParams.namespace ?? existingParams.namespace,
-      note: nextParams.note ?? existingParams.note,
-      version: nextParams.version ?? existingParams.version,
-      exceptionsList: nextParams.exceptions_list ?? existingParams.exceptionsList,
-      ...typeSpecificParams,
-    },
-    schedule: { interval: nextParams.interval ?? existingRule.schedule.interval },
-    actions,
-  };
-};
-
-interface RuleCreateOptions {
-  immutable?: boolean;
-  defaultEnabled?: boolean;
-}
-
-// eslint-disable-next-line complexity
-export const convertCreateAPIToInternalSchema = (
-  input: RuleCreateProps,
-  options?: RuleCreateOptions
-): InternalRuleCreate => {
-  const { immutable = false, defaultEnabled = true } = options ?? {};
-
-  const typeSpecificParams = typeSpecificSnakeToCamel(input);
-  const newRuleId = input.rule_id ?? uuidv4();
-
-  const alertActions = input.actions?.map((action) => transformRuleToAlertAction(action)) ?? [];
-  const actions = transformToActionFrequency(alertActions, input.throttle);
-
-  return {
-    name: input.name,
-    tags: input.tags ?? [],
-    alertTypeId: ruleTypeMappings[input.type],
-    consumer: SERVER_APP_ID,
-    params: {
-      author: input.author ?? [],
-      buildingBlockType: input.building_block_type,
-      description: input.description,
-      ruleId: newRuleId,
-      falsePositives: input.false_positives ?? [],
-      investigationFields: input.investigation_fields,
-      from: input.from ?? DEFAULT_FROM,
-      immutable,
-      ruleSource: convertImmutableToRuleSource(immutable),
-      license: input.license,
-      outputIndex: input.output_index ?? '',
-      timelineId: input.timeline_id,
-      timelineTitle: input.timeline_title,
-      meta: input.meta,
-      maxSignals: input.max_signals ?? DEFAULT_MAX_SIGNALS,
-      riskScore: input.risk_score,
-      riskScoreMapping: input.risk_score_mapping ?? [],
-      ruleNameOverride: input.rule_name_override,
-      severity: input.severity,
-      severityMapping: input.severity_mapping ?? [],
-      threat: input.threat ?? [],
-      timestampOverride: input.timestamp_override,
-      timestampOverrideFallbackDisabled: input.timestamp_override_fallback_disabled,
-      to: input.to ?? DEFAULT_TO,
-      references: input.references ?? [],
-      namespace: input.namespace,
-      note: input.note,
-      version: input.version ?? 1,
-      exceptionsList: input.exceptions_list ?? [],
-      relatedIntegrations: input.related_integrations ?? [],
-      requiredFields: addEcsToRequiredFields(input.required_fields),
-      setup: input.setup ?? '',
-      ...typeSpecificParams,
-    },
-    schedule: { interval: input.interval ?? '5m' },
-    enabled: input.enabled ?? defaultEnabled,
-    actions,
-  };
-};
-
-// Converts the internal rule data structure to the response API schema
-export const typeSpecificCamelToSnake = (
-  params: TypeSpecificRuleParams
-): RequiredOptional<TypeSpecificResponse> => {
-  switch (params.type) {
-    case 'eql': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        data_view_id: params.dataViewId,
-        query: params.query,
-        filters: params.filters,
-        timestamp_field: params.timestampField,
-        event_category_override: params.eventCategoryOverride,
-        tiebreaker_field: params.tiebreakerField,
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'esql': {
-      return {
-        type: params.type,
-        language: params.language,
-        query: params.query,
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'threat_match': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        data_view_id: params.dataViewId,
-        query: params.query,
-        filters: params.filters,
-        saved_id: params.savedId,
-        threat_filters: params.threatFilters,
-        threat_query: params.threatQuery,
-        threat_mapping: params.threatMapping,
-        threat_language: params.threatLanguage,
-        threat_index: params.threatIndex,
-        threat_indicator_path: params.threatIndicatorPath,
-        concurrent_searches: params.concurrentSearches,
-        items_per_search: params.itemsPerSearch,
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'query': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        data_view_id: params.dataViewId,
-        query: params.query,
-        filters: params.filters,
-        saved_id: params.savedId,
-        response_actions: params.responseActions?.map(transformAlertToRuleResponseAction),
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'saved_query': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        query: params.query,
-        filters: params.filters,
-        saved_id: params.savedId,
-        data_view_id: params.dataViewId,
-        response_actions: params.responseActions?.map(transformAlertToRuleResponseAction),
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'threshold': {
-      return {
-        type: params.type,
-        language: params.language,
-        index: params.index,
-        data_view_id: params.dataViewId,
-        query: params.query,
-        filters: params.filters,
-        saved_id: params.savedId,
-        threshold: params.threshold,
-        alert_suppression: params.alertSuppression?.duration
-          ? { duration: params.alertSuppression?.duration }
-          : undefined,
-      };
-    }
-    case 'machine_learning': {
-      return {
-        type: params.type,
-        anomaly_threshold: params.anomalyThreshold,
-        machine_learning_job_id: params.machineLearningJobId,
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    case 'new_terms': {
-      return {
-        type: params.type,
-        query: params.query,
-        new_terms_fields: params.newTermsFields,
-        history_window_start: params.historyWindowStart,
-        index: params.index,
-        filters: params.filters,
-        language: params.language,
-        data_view_id: params.dataViewId,
-        alert_suppression: convertAlertSuppressionToSnake(params.alertSuppression),
-      };
-    }
-    default: {
-      return assertUnreachable(params);
-    }
-  }
-};
-
-// TODO: separate out security solution defined common params from Alerting framework common params
-// so we can explicitly specify the return type of this function
-export const commonParamsCamelToSnake = (params: BaseRuleParams) => {
-  return {
-    description: params.description,
-    risk_score: params.riskScore,
-    severity: params.severity,
-    building_block_type: params.buildingBlockType,
-    namespace: params.namespace,
-    note: params.note,
-    license: params.license,
-    output_index: params.outputIndex,
-    timeline_id: params.timelineId,
-    timeline_title: params.timelineTitle,
-    meta: params.meta,
-    rule_name_override: params.ruleNameOverride,
-    timestamp_override: params.timestampOverride,
-    timestamp_override_fallback_disabled: params.timestampOverrideFallbackDisabled,
-    investigation_fields: migrateLegacyInvestigationFields(params.investigationFields),
-    author: params.author,
-    false_positives: params.falsePositives,
-    from: params.from,
-    rule_id: params.ruleId,
-    max_signals: params.maxSignals,
-    risk_score_mapping: params.riskScoreMapping,
-    severity_mapping: params.severityMapping,
-    threat: params.threat,
-    to: params.to,
-    references: params.references,
-    version: params.version,
-    exceptions_list: params.exceptionsList,
-    immutable: params.immutable,
-    rule_source: convertObjectKeysToSnakeCase(params.ruleSource),
-    related_integrations: params.relatedIntegrations ?? [],
-    required_fields: params.requiredFields ?? [],
-    setup: params.setup ?? '',
-  };
-};
-
-export const internalRuleToAPIResponse = (
-  rule: SanitizedRule<RuleParams> | ResolvedSanitizedRule<RuleParams>
-): RequiredOptional<RuleResponse> => {
-  const executionSummary = createRuleExecutionSummary(rule);
-
-  const isResolvedRule = (obj: unknown): obj is ResolvedSanitizedRule<RuleParams> =>
-    (obj as ResolvedSanitizedRule<RuleParams>).outcome != null;
-
-  const alertActions = rule.actions.map(transformAlertToRuleAction);
-  const throttle = transformFromAlertThrottle(rule);
-  const actions = transformToActionFrequency(alertActions, throttle);
-
-  return {
-    // saved object properties
-    outcome: isResolvedRule(rule) ? rule.outcome : undefined,
-    alias_target_id: isResolvedRule(rule) ? rule.alias_target_id : undefined,
-    alias_purpose: isResolvedRule(rule) ? rule.alias_purpose : undefined,
-    // Alerting framework params
-    id: rule.id,
-    updated_at: rule.updatedAt.toISOString(),
-    updated_by: rule.updatedBy ?? 'elastic',
-    created_at: rule.createdAt.toISOString(),
-    created_by: rule.createdBy ?? 'elastic',
-    name: rule.name,
-    tags: rule.tags,
-    interval: rule.schedule.interval,
-    enabled: rule.enabled,
-    revision: rule.revision,
-    // Security solution shared rule params
-    ...commonParamsCamelToSnake(rule.params),
-    // Type specific security solution rule params
-    ...typeSpecificCamelToSnake(rule.params),
-    // Actions
-    throttle: undefined,
-    actions,
-    // Execution summary
-    execution_summary: executionSummary ?? undefined,
-  };
-};
-
-export const convertPrebuiltRuleAssetToRuleResponse = (
-  prebuiltRuleAsset: PrebuiltRuleAsset
-): RuleResponse => {
-  const prebuiltRuleAssetDefaults = {
-    enabled: false,
-    risk_score_mapping: [],
-    severity_mapping: [],
-    interval: DEFAULT_INTERVAL,
-    to: DEFAULT_TO,
-    from: DEFAULT_FROM,
-    exceptions_list: [],
-    false_positives: [],
-    max_signals: DEFAULT_MAX_SIGNALS,
-    actions: [],
-    related_integrations: [],
-    required_fields: [],
-    setup: '',
-    note: '',
-    references: [],
-    threat: [],
-    tags: [],
-    author: [],
-  };
-
-  const immutable = true;
-
-  const ruleResponseSpecificFields = {
-    id: uuidv4(),
-    updated_at: new Date(0).toISOString(),
-    updated_by: '',
-    created_at: new Date(0).toISOString(),
-    created_by: '',
-    immutable,
-    rule_source: convertObjectKeysToSnakeCase(convertImmutableToRuleSource(immutable)),
-    revision: 1,
-  };
-
-  return RuleResponse.parse({
-    ...prebuiltRuleAssetDefaults,
-    ...prebuiltRuleAsset,
-    required_fields: addEcsToRequiredFields(prebuiltRuleAsset.required_fields),
-    ...ruleResponseSpecificFields,
-  });
-};
-
-export const convertImmutableToRuleSource = (immutable: boolean): RuleSourceCamelCased => {
-  if (immutable) {
-    return {
-      type: 'external',
-      isCustomized: false,
-    };
-  }
-
-  return {
-    type: 'internal',
-  };
-};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
index 61436a04c2675..536a314fa6c09 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.test.ts
@@ -38,7 +38,7 @@ import { getMlRuleParams, getQueryRuleParams, getThreatRuleParams } from '../../
 
 import { createRulesAndExceptionsStreamFromNdJson } from '../logic/import/create_rules_stream_from_ndjson';
 import type { RuleExceptionsPromiseFromStreams } from '../logic/import/import_rules_utils';
-import { internalRuleToAPIResponse } from '../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../logic/detection_rules_client/converters/internal_rule_to_api_response';
 
 type PromiseFromStreams = RuleToImport | Error;
 
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
index 66fa635e768ad..bf6227ddcbfe8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/utils.ts
@@ -17,8 +17,6 @@ import type { SavedObjectsClientContract } from '@kbn/core/server';
 import type { RuleAction } from '@kbn/securitysolution-io-ts-alerting-types';
 
 import type {
-  AlertSuppression,
-  AlertSuppressionCamel,
   InvestigationFields,
   RequiredField,
   RequiredFieldInput,
@@ -33,7 +31,7 @@ import type { BulkError, OutputError } from '../../routes/utils';
 import { createBulkErrorObject } from '../../routes/utils';
 import type { InvestigationFieldsCombined, RuleAlertType, RuleParams } from '../../rule_schema';
 import { hasValidRuleType } from '../../rule_schema';
-import { internalRuleToAPIResponse } from '../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../logic/detection_rules_client/converters/internal_rule_to_api_response';
 
 type PromiseFromStreams = RuleToImport | Error;
 const MAX_CONCURRENT_SEARCHES = 10;
@@ -347,28 +345,6 @@ export const getInvalidConnectors = async (
   return [Array.from(errors.values()), Array.from(rulesAcc.values())];
 };
 
-export const convertAlertSuppressionToCamel = (
-  input: AlertSuppression | undefined
-): AlertSuppressionCamel | undefined =>
-  input
-    ? {
-        groupBy: input.group_by,
-        duration: input.duration,
-        missingFieldsStrategy: input.missing_fields_strategy,
-      }
-    : undefined;
-
-export const convertAlertSuppressionToSnake = (
-  input: AlertSuppressionCamel | undefined
-): AlertSuppression | undefined =>
-  input
-    ? {
-        group_by: input.groupBy,
-        duration: input.duration,
-        missing_fields_strategy: input.missingFieldsStrategy,
-      }
-    : undefined;
-
 /**
  * In ESS 8.10.x "investigation_fields" are mapped as string[].
  * For 8.11+ logic is added on read in our endpoints to migrate
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
index 298b7f62d2973..dd77122ac4560 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_management/utils/validate.ts
@@ -31,7 +31,7 @@ import {
   type UnifiedQueryRuleParams,
 } from '../../rule_schema';
 import { type BulkError, createBulkErrorObject } from '../../routes/utils';
-import { internalRuleToAPIResponse } from '../normalization/rule_converters';
+import { internalRuleToAPIResponse } from '../logic/detection_rules_client/converters/internal_rule_to_api_response';
 
 export const transformValidateBulkError = (
   ruleId: string,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts
index c2faa464b75da..7b48e32bf9962 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_preview/api/preview_rules/route.ts
@@ -23,6 +23,7 @@ import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
 import {
   DEFAULT_PREVIEW_INDEX,
   DETECTION_ENGINE_RULES_PREVIEW,
+  SERVER_APP_ID,
 } from '../../../../../../common/constants';
 import { validateCreateRuleProps } from '../../../../../../common/api/detection_engine/rule_management';
 import { RuleExecutionStatusEnum } from '../../../../../../common/api/detection_engine/rule_monitoring';
@@ -34,7 +35,6 @@ import { PreviewRulesSchema } from '../../../../../../common/api/detection_engin
 
 import type { StartPlugins, SetupPlugins } from '../../../../../plugin';
 import { buildSiemResponse } from '../../../routes/utils';
-import { convertCreateAPIToInternalSchema } from '../../../rule_management';
 import type { RuleParams } from '../../../rule_schema';
 import { createPreviewRuleExecutionLogger } from './preview_rule_execution_logger';
 import { parseInterval } from '../../../rule_types/utils/utils';
@@ -64,6 +64,8 @@ import { createSecurityRuleTypeWrapper } from '../../../rule_types/create_securi
 import { assertUnreachable } from '../../../../../../common/utility_types';
 import { wrapScopedClusterClient } from './wrap_scoped_cluster_client';
 import { wrapSearchSourceClient } from './wrap_search_source_client';
+import { applyRuleDefaults } from '../../../rule_management/logic/detection_rules_client/mergers/apply_rule_defaults';
+import { convertRuleResponseToAlertingRule } from '../../../rule_management/logic/detection_rules_client/converters/convert_rule_response_to_alerting_rule';
 
 const PREVIEW_TIMEOUT_SECONDS = 60;
 const MAX_ROUTE_CONCURRENCY = 10;
@@ -118,7 +120,7 @@ export const previewRulesRoute = (
             });
           }
 
-          const internalRule = convertCreateAPIToInternalSchema(request.body);
+          const internalRule = convertRuleResponseToAlertingRule(applyRuleDefaults(request.body));
           const previewRuleParams = internalRule.params;
 
           const mlAuthz = buildMlAuthz({
@@ -237,6 +239,8 @@ export const previewRulesRoute = (
               createdAt: new Date(),
               createdBy: username ?? 'preview-created-by',
               producer: 'preview-producer',
+              consumer: SERVER_APP_ID,
+              enabled: true,
               revision: 0,
               ruleTypeId,
               ruleTypeName,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_response_actions/endpoint_response_action.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_response_actions/endpoint_response_action.ts
index 6ebc378dfd315..a310cb33497e8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_response_actions/endpoint_response_action.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_response_actions/endpoint_response_action.ts
@@ -12,10 +12,13 @@ import type {
   RuleResponseEndpointAction,
   ProcessesParams,
 } from '../../../../common/api/detection_engine';
-import type { KillOrSuspendProcessRequestBody } from '../../../../common/endpoint/types';
 import { getErrorProcessAlerts, getIsolateAlerts, getProcessAlerts } from './utils';
 import type { AlertsAction, ResponseActionAlerts } from './types';
 import type { EndpointAppContextService } from '../../../endpoint/endpoint_app_context_services';
+import type {
+  ResponseActionParametersWithEntityId,
+  ResponseActionParametersWithPid,
+} from '../../../../common/endpoint/types';
 
 export const endpointResponseAction = async (
   responseAction: RuleResponseEndpointAction,
@@ -115,7 +118,9 @@ export const endpointResponseAction = async (
                     comment,
                     endpoint_ids,
                     alert_ids,
-                    parameters: parameters as KillOrSuspendProcessRequestBody['parameters'],
+                    parameters: parameters as
+                      | ResponseActionParametersWithPid
+                      | ResponseActionParametersWithEntityId,
                   },
                   {
                     hosts,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_schema/model/rule_schemas.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_schema/model/rule_schemas.ts
index b3000edf895dc..5d5065170deff 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_schema/model/rule_schemas.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_schema/model/rule_schemas.ts
@@ -5,11 +5,6 @@
  * 2.0.
  */
 import type { SanitizedRuleConfig } from '@kbn/alerting-plugin/common';
-import type {
-  RuleActionArrayCamel,
-  RuleActionNotifyWhen,
-  RuleActionThrottle,
-} from '@kbn/securitysolution-io-ts-alerting-types';
 import type {
   EQL_RULE_TYPE_ID,
   ESQL_RULE_TYPE_ID,
@@ -22,12 +17,9 @@ import type {
   THRESHOLD_RULE_TYPE_ID,
 } from '@kbn/securitysolution-rules';
 import * as z from 'zod';
+import type { CreateRuleData } from '@kbn/alerting-plugin/server/application/rule/methods/create';
+import type { UpdateRuleData } from '@kbn/alerting-plugin/server/application/rule/methods/update';
 import { RuleResponseAction } from '../../../../../common/api/detection_engine';
-import type {
-  IsRuleEnabled,
-  RuleName,
-  RuleTagArray,
-} from '../../../../../common/api/detection_engine/model/rule_schema';
 import {
   AlertsIndex,
   AlertsIndexNamespace,
@@ -334,29 +326,8 @@ export type AllRuleTypes =
   | typeof THRESHOLD_RULE_TYPE_ID
   | typeof NEW_TERMS_RULE_TYPE_ID;
 
-export interface InternalRuleCreate {
-  name: RuleName;
-  tags: RuleTagArray;
-  alertTypeId: AllRuleTypes;
+export type InternalRuleCreate = CreateRuleData<RuleParams> & {
   consumer: typeof SERVER_APP_ID;
-  schedule: {
-    interval: string;
-  };
-  enabled: IsRuleEnabled;
-  actions: RuleActionArrayCamel;
-  params: RuleParams;
-  throttle?: RuleActionThrottle | null;
-  notifyWhen?: RuleActionNotifyWhen | null;
-}
+};
 
-export interface InternalRuleUpdate {
-  name: RuleName;
-  tags: RuleTagArray;
-  schedule: {
-    interval: string;
-  };
-  actions: RuleActionArrayCamel;
-  params: RuleParams;
-  throttle?: RuleActionThrottle | null;
-  notifyWhen?: RuleActionNotifyWhen | null;
-}
+export type InternalRuleUpdate = UpdateRuleData<RuleParams>;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/es_results.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/es_results.ts
index 57892d65da35f..0867245a40933 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/es_results.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/__mocks__/es_results.ts
@@ -359,6 +359,24 @@ export const sampleDocNoSortIdWithTimestamp = (
   };
 };
 
+export const sampleDocWithNonEcsCompliantFields = (
+  someUuid: string = sampleIdGuid,
+  nonEcsFields: Record<string, string>
+): SignalSourceHit & {
+  _id: Required<SignalSourceHit>['_id'];
+  _source: Required<SignalSourceHit>['_source'] & { '@timestamp': string };
+} => {
+  const doc = sampleDocNoSortId(someUuid);
+  return {
+    ...doc,
+    _source: {
+      ...doc._source,
+      ...nonEcsFields,
+      '@timestamp': new Date().toISOString(),
+    },
+  };
+};
+
 export const sampleAlertDocNoSortIdWithTimestamp = (
   someUuid: string = sampleIdGuid,
   ip?: string
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.test.ts
new file mode 100644
index 0000000000000..b2426ceda9767
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.test.ts
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { sampleDocWithNonEcsCompliantFields } from '../../__mocks__/es_results';
+import { buildBulkBody } from './build_bulk_body';
+import { getCompleteRuleMock, getEsqlRuleParams } from '../../../rule_schema/mocks';
+import { ruleExecutionLogMock } from '../../../rule_monitoring/mocks';
+
+const SPACE_ID = 'space';
+const publicBaseUrl = 'testKibanaBasePath.com';
+const alertUuid = 'test-uuid';
+const docId = 'd5e8eb51-a6a0-456d-8a15-4b79bfec3d71';
+const ruleExecutionLogger = ruleExecutionLogMock.forExecutors.create();
+
+describe('buildBulkBody', () => {
+  test('should strip non-ECS compliant sub-fields of `event.action` field', () => {
+    const doc = sampleDocWithNonEcsCompliantFields(docId, {
+      'event.action': 'process',
+      'event.action.keyword': 'process',
+    });
+    const completeRule = getCompleteRuleMock(getEsqlRuleParams());
+    const buildReasonMessageStub = jest.fn();
+    const alert = buildBulkBody(
+      SPACE_ID,
+      completeRule,
+      doc,
+      'missingFields',
+      [],
+      true,
+      buildReasonMessageStub,
+      [],
+      undefined,
+      ruleExecutionLogger,
+      alertUuid,
+      publicBaseUrl
+    );
+
+    expect(alert['kibana.alert.original_event.action']).toEqual('process');
+    expect(alert['kibana.alert.original_event.action.keyword']).toBeUndefined();
+  });
+});
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.ts
index fb1aa57fdb82d..9294cc7159c12 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rule_types/factories/utils/build_bulk_body.ts
@@ -104,6 +104,7 @@ export const buildBulkBody = (
     mergedDoc,
   });
 
+  const thresholdResult = mergedDoc._source?.threshold_result;
   if (isSourceDoc(mergedDoc)) {
     return {
       ...validatedSource,
@@ -121,7 +122,11 @@ export const buildBulkBody = (
       ),
       ...additionalAlertFields({
         ...mergedDoc,
-        _source: { ...mergedDoc._source, ...validatedEventFields },
+        _source: {
+          ...validatedSource,
+          ...validatedEventFields,
+          threshold_result: thresholdResult,
+        },
       }),
     };
   }
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.test.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.test.ts
index 9cbb6ee9ce2e5..63bcde79cbf9a 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.test.ts
@@ -92,7 +92,21 @@ describe('AssetCriticalityDataClient', () => {
       await subject.search({ query: { match_all: {} } });
 
       expect(esClientMock.search).toHaveBeenCalledWith(
-        expect.objectContaining({ body: { query: { match_all: {} } } })
+        expect.objectContaining({ query: { match_all: {} } })
+      );
+    });
+
+    it('accepts a from parameter', async () => {
+      await subject.search({ query: { match_all: {} }, from: 100 });
+
+      expect(esClientMock.search).toHaveBeenCalledWith(expect.objectContaining({ from: 100 }));
+    });
+
+    it('accepts a sort parameter', async () => {
+      await subject.search({ query: { match_all: {} }, sort: [{ '@timestamp': 'asc' }] });
+
+      expect(esClientMock.search).toHaveBeenCalledWith(
+        expect.objectContaining({ sort: [{ '@timestamp': 'asc' }] })
       );
     });
 
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.ts
index c5abf75b71478..ac22303c09af6 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/asset_criticality_data_client.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 import type { ESFilter } from '@kbn/es-types';
-import type { SearchResponse } from '@elastic/elasticsearch/lib/api/types';
+import type { SearchRequest, SearchResponse } from '@elastic/elasticsearch/lib/api/types';
 import type { Logger, ElasticsearchClient } from '@kbn/core/server';
 import { mappingFromFieldMap } from '@kbn/alerting-plugin/common';
 import type { AuditLogger } from '@kbn/security-plugin-types-server';
+import { fromKueryExpression, toElasticsearchQuery } from '@kbn/es-query';
 import type {
   AssetCriticalityBulkUploadResponse,
   AssetCriticalityUpsert,
@@ -74,20 +75,47 @@ export class AssetCriticalityDataClient {
    */
   public async search({
     query,
-    size,
+    size = DEFAULT_CRITICALITY_RESPONSE_SIZE,
+    from,
+    sort,
   }: {
     query: ESFilter;
     size?: number;
+    from?: number;
+    sort?: SearchRequest['sort'];
   }): Promise<SearchResponse<AssetCriticalityRecord>> {
     const response = await this.options.esClient.search<AssetCriticalityRecord>({
       index: this.getIndex(),
       ignore_unavailable: true,
-      body: { query },
-      size: Math.min(size ?? DEFAULT_CRITICALITY_RESPONSE_SIZE, MAX_CRITICALITY_RESPONSE_SIZE),
+      query,
+      size: Math.min(size, MAX_CRITICALITY_RESPONSE_SIZE),
+      from,
+      sort,
     });
     return response;
   }
 
+  public async searchByKuery({
+    kuery,
+    size,
+    from,
+    sort,
+  }: {
+    kuery?: string;
+    size?: number;
+    from?: number;
+    sort?: SearchRequest['sort'];
+  }) {
+    const query = kuery ? toElasticsearchQuery(fromKueryExpression(kuery)) : { match_all: {} };
+
+    return this.search({
+      query,
+      size,
+      from,
+      sort,
+    });
+  }
+
   private getIndex() {
     return getAssetCriticalityIndex(this.options.namespace);
   }
@@ -251,4 +279,20 @@ export class AssetCriticalityDataClient {
       refresh: refresh ?? false,
     });
   }
+
+  public formatSearchResponse(response: SearchResponse<AssetCriticalityRecord>): {
+    records: AssetCriticalityRecord[];
+    total: number;
+  } {
+    const records = response.hits.hits.map((hit) => hit._source as AssetCriticalityRecord);
+    const total =
+      typeof response.hits.total === 'number'
+        ? response.hits.total
+        : response.hits.total?.value ?? 0;
+
+    return {
+      records,
+      total,
+    };
+  }
 }
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/audit.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/audit.ts
index 3d4a4dfed4c22..eb6ca20bb1847 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/audit.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/audit.ts
@@ -9,6 +9,7 @@ export enum AssetCriticalityAuditActions {
   ASSET_CRITICALITY_INITIALIZE = 'asset_criticality_initialize',
   ASSET_CRITICALITY_UNASSIGN = 'asset_criticality_unassign',
   ASSET_CRITICALITY_GET = 'asset_criticality_get',
+  ASSET_CRITICALITY_SEARCH = 'asset_criticality_search',
   ASSET_CRITICALITY_PRIVILEGE_GET = 'asset_criticality_privilege_get',
   ASSET_CRITICALITY_STATUS_GET = 'asset_criticality_status_get',
   ASSET_CRITICALITY_UPDATE = 'asset_criticality_update',
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
index efc03a4adacd0..e1eb6872d3a33 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/bulk_upload.ts
@@ -87,7 +87,7 @@ export const assetCriticalityPublicBulkUploadRoute = (
 
           const tookMs = end.getTime() - start.getTime();
           logger.debug(
-            `Asset criticality Bulk upload completed in ${tookMs}ms ${JSON.stringify(stats)}`
+            () => `Asset criticality Bulk upload completed in ${tookMs}ms ${JSON.stringify(stats)}`
           );
 
           const resBody: AssetCriticalityBulkUploadResponse = { errors, stats };
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts
new file mode 100644
index 0000000000000..66db32f2bdb17
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/list.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import type { Logger } from '@kbn/core/server';
+import { buildSiemResponse } from '@kbn/lists-plugin/server/routes/utils';
+import { transformError } from '@kbn/securitysolution-es-utils';
+import { buildRouteValidationWithZod } from '@kbn/zod-helpers';
+import {
+  ASSET_CRITICALITY_PUBLIC_LIST_URL,
+  APP_ID,
+  ENABLE_ASSET_CRITICALITY_SETTING,
+  API_VERSIONS,
+} from '../../../../../common/constants';
+import { checkAndInitAssetCriticalityResources } from '../check_and_init_asset_criticality_resources';
+import type { AssetCriticalityListResponse } from '../../../../../common/api/entity_analytics/asset_criticality';
+import { ListAssetCriticalityQueryParams } from '../../../../../common/api/entity_analytics/asset_criticality';
+import { assertAdvancedSettingsEnabled } from '../../utils/assert_advanced_setting_enabled';
+import type { EntityAnalyticsRoutesDeps } from '../../types';
+import { AssetCriticalityAuditActions } from '../audit';
+import { AUDIT_CATEGORY, AUDIT_OUTCOME, AUDIT_TYPE } from '../../audit';
+
+export const assetCriticalityPublicListRoute = (
+  router: EntityAnalyticsRoutesDeps['router'],
+  logger: Logger
+) => {
+  router.versioned
+    .get({
+      access: 'public',
+      path: ASSET_CRITICALITY_PUBLIC_LIST_URL,
+      options: {
+        tags: ['access:securitySolution', `access:${APP_ID}-entity-analytics`],
+      },
+    })
+    .addVersion(
+      {
+        version: API_VERSIONS.public.v1,
+        validate: {
+          request: {
+            query: buildRouteValidationWithZod(ListAssetCriticalityQueryParams),
+          },
+        },
+      },
+      async (context, request, response) => {
+        const siemResponse = buildSiemResponse(response);
+        try {
+          await assertAdvancedSettingsEnabled(await context.core, ENABLE_ASSET_CRITICALITY_SETTING);
+          await checkAndInitAssetCriticalityResources(context, logger);
+          const securitySolution = await context.securitySolution;
+          const assetCriticalityClient = securitySolution.getAssetCriticalityDataClient();
+
+          const {
+            page = 1,
+            per_page: perPage = 10,
+            sort_field: sortField,
+            sort_direction: sortDirection = 'asc',
+            kuery,
+          } = request.query;
+
+          const from = (page - 1) * perPage;
+          const sort = sortField ? [{ [sortField]: sortDirection }] : undefined;
+
+          const searchRes = await assetCriticalityClient.searchByKuery({
+            kuery,
+            from,
+            size: perPage,
+            sort,
+          });
+
+          const { records, total } = assetCriticalityClient.formatSearchResponse(searchRes);
+
+          securitySolution.getAuditLogger()?.log({
+            message: 'User searched criticality levels',
+            event: {
+              action: AssetCriticalityAuditActions.ASSET_CRITICALITY_SEARCH,
+              category: AUDIT_CATEGORY.DATABASE,
+              type: AUDIT_TYPE.ACCESS,
+              outcome: AUDIT_OUTCOME.SUCCESS,
+            },
+          });
+
+          const body: AssetCriticalityListResponse = {
+            records,
+            total,
+            page,
+            per_page: perPage,
+          };
+
+          return response.ok({ body });
+        } catch (e) {
+          const error = transformError(e);
+
+          return siemResponse.error({
+            statusCode: error.statusCode,
+            body: { message: error.message, full_error: JSON.stringify(e) },
+            bypassErrorFormat: true,
+          });
+        }
+      }
+    );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/register_asset_criticality_routes.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/register_asset_criticality_routes.ts
index 1f380de7df300..07899be6b9175 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/register_asset_criticality_routes.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/register_asset_criticality_routes.ts
@@ -13,6 +13,7 @@ import {
   assetCriticalityInternalCSVUploadRoute,
   assetCriticalityPublicCSVUploadRoute,
 } from './upload_csv';
+import { assetCriticalityPublicListRoute } from './list';
 import type { EntityAnalyticsRoutesDeps } from '../../types';
 import { assetCriticalityPublicBulkUploadRoute } from './bulk_upload';
 
@@ -35,5 +36,6 @@ export const registerAssetCriticalityRoutes = ({
   assetCriticalityPublicBulkUploadRoute(router, logger, config);
   assetCriticalityPublicDeleteRoute(router, logger);
   assetCriticalityPublicGetRoute(router, logger);
+  assetCriticalityPublicListRoute(router, logger);
   assetCriticalityPublicUpsertRoute(router, logger);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
index 9c9fa19ca3cbd..28c8333c5f596 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/asset_criticality/routes/upload_csv.ts
@@ -85,7 +85,9 @@ const handler: (
     const end = new Date();
 
     const tookMs = end.getTime() - start.getTime();
-    logger.debug(`Asset criticality CSV upload completed in ${tookMs}ms ${JSON.stringify(stats)}`);
+    logger.debug(
+      () => `Asset criticality CSV upload completed in ${tookMs}ms ${JSON.stringify(stats)}`
+    );
 
     // type assignment here to ensure that the response body stays in sync with the API schema
     const resBody: AssetCriticalityBulkUploadResponse = { errors, stats };
diff --git a/x-pack/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts b/x-pack/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
index 491cb5e61122b..8c97e69e0555a 100644
--- a/x-pack/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
+++ b/x-pack/plugins/security_solution/server/lib/entity_analytics/utils/create_datastream.ts
@@ -147,9 +147,10 @@ export const createDataStream = async ({
     dataStreams = response.data_streams.map((dataStream) => dataStream.name);
 
     logger.debug(
-      `Found ${dataStreams.length} concrete indices for ${indexPatterns.alias} - ${JSON.stringify(
-        dataStreams
-      )}`
+      () =>
+        `Found ${dataStreams.length} concrete indices for ${indexPatterns.alias} - ${JSON.stringify(
+          dataStreams
+        )}`
     );
   } catch (error) {
     // 404 is expected if no datastream have been created
diff --git a/x-pack/plugins/security_solution/server/lib/product_features_service/product_features.ts b/x-pack/plugins/security_solution/server/lib/product_features_service/product_features.ts
index dbe60614d08b3..cee8559d8b693 100644
--- a/x-pack/plugins/security_solution/server/lib/product_features_service/product_features.ts
+++ b/x-pack/plugins/security_solution/server/lib/product_features_service/product_features.ts
@@ -50,7 +50,7 @@ export class ProductFeatures<T extends string = string, S extends string = strin
       Array.from(productFeatureConfig.values())
     );
 
-    this.logger.debug(JSON.stringify(completeProductFeatureConfig));
+    this.logger.debug(() => JSON.stringify(completeProductFeatureConfig));
     this.featuresSetup.registerKibanaFeature(completeProductFeatureConfig);
     this.addRegisteredActions(completeProductFeatureConfig);
   }
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.test.ts b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.test.ts
index 526f3d595d5a0..114d51bfae6a4 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.test.ts
@@ -55,7 +55,6 @@ describe(`installRiskScoresRoute - ${RiskScoreEntity.host}`, () => {
   let server: ReturnType<typeof serverMock.create>;
   let { context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
-  const security = undefined;
   const mockSpaceId = 'mockSpaceId';
 
   beforeAll(async () => {
@@ -71,7 +70,7 @@ describe(`installRiskScoresRoute - ${RiskScoreEntity.host}`, () => {
       },
     });
 
-    installRiskScoresRoute(server.router, logger, security);
+    installRiskScoresRoute(server.router, logger);
     await server.inject(request, requestContextMock.convertContext(context));
   });
 
@@ -120,7 +119,6 @@ describe(`installRiskScoresRoute - ${RiskScoreEntity.user}`, () => {
   let server: ReturnType<typeof serverMock.create>;
   let { context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
-  const security = undefined;
   const mockSpaceId = 'mockSpaceId';
 
   beforeAll(async () => {
@@ -136,7 +134,7 @@ describe(`installRiskScoresRoute - ${RiskScoreEntity.user}`, () => {
       },
     });
 
-    installRiskScoresRoute(server.router, logger, security);
+    installRiskScoresRoute(server.router, logger);
     await server.inject(request, requestContextMock.convertContext(context));
   });
 
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
index 627a9afd4e871..de6675985fc00 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/onboarding/routes/install_risk_scores.ts
@@ -11,18 +11,12 @@ import type { Logger } from '@kbn/core/server';
 import { APP_ID, INTERNAL_RISK_SCORE_URL } from '../../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 
-import type { SetupPlugins } from '../../../../plugin';
-
 import { buildSiemResponse } from '../../../detection_engine/routes/utils';
 
 import { installRiskScoreModule } from '../helpers/install_risk_score_module';
 import { onboardingRiskScoreRequestBody } from '../../../../../common/api/entity_analytics/risk_score';
 
-export const installRiskScoresRoute = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
+export const installRiskScoresRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.versioned
     .post({
       access: 'internal',
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.test.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.test.ts
index bf265e8638de1..300012738134d 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.test.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 import type { Logger } from '@kbn/core/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { PREBUILT_SAVED_OBJECTS_BULK_CREATE } from '../../../../../common/constants';
 import {
   serverMock,
   requestContextMock,
-  mockGetCurrentUser,
   requestMock,
 } from '../../../detection_engine/routes/__mocks__';
 import { getEmptySavedObjectsResponse } from '../../../detection_engine/routes/__mocks__/request_responses';
@@ -52,7 +50,6 @@ const createPrebuiltSavedObjectsRequest = (savedObjectTemplate: string) =>
 
 describe('createPrebuiltSavedObjects', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   let { clients, context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
 
@@ -62,16 +59,9 @@ describe('createPrebuiltSavedObjects', () => {
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
     clients.savedObjectsClient.bulkCreate.mockResolvedValue(getEmptySavedObjectsResponse());
 
-    createPrebuiltSavedObjectsRoute(server.router, logger, securitySetup);
+    createPrebuiltSavedObjectsRoute(server.router, logger);
   });
 
   it.each([['hostRiskScoreDashboards'], ['userRiskScoreDashboards']])(
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
index 568489155707a..a17669af734fe 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/create_prebuilt_saved_objects.ts
@@ -10,8 +10,6 @@ import type { Logger } from '@kbn/core/server';
 import { PREBUILT_SAVED_OBJECTS_BULK_CREATE } from '../../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 
-import type { SetupPlugins } from '../../../../plugin';
-
 import { buildSiemResponse } from '../../../detection_engine/routes/utils';
 
 import { buildFrameworkRequest } from '../../../timeline/utils/common';
@@ -20,8 +18,7 @@ import { createPrebuiltSavedObjectsRequestBody } from '../../../../../common/api
 
 export const createPrebuiltSavedObjectsRoute = (
   router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
+  logger: Logger
 ) => {
   router.versioned
     .post({
@@ -46,7 +43,7 @@ export const createPrebuiltSavedObjectsRoute = (
 
         const spaceId = securitySolution?.getSpaceId();
 
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const savedObjectsClient = (await frameworkRequest.context.core).savedObjects.client;
         const result = await bulkCreateSavedObjects({
           savedObjectsClient,
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.test.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.test.ts
index 363aba02536ea..37c2417340fcd 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.test.ts
@@ -4,12 +4,10 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { PREBUILT_SAVED_OBJECTS_BULK_DELETE } from '../../../../../common/constants';
 import {
   serverMock,
   requestContextMock,
-  mockGetCurrentUser,
   requestMock,
 } from '../../../detection_engine/routes/__mocks__';
 import { deletePrebuiltSavedObjectsRoute } from './delete_prebuilt_saved_objects';
@@ -48,7 +46,6 @@ const deletePrebuiltSavedObjectsRequest = (savedObjectTemplate: string) =>
 
 describe('deletePrebuiltSavedObjects', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   let { clients, context } = requestContextMock.createTools();
 
   beforeEach(() => {
@@ -57,16 +54,9 @@ describe('deletePrebuiltSavedObjects', () => {
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
     clients.savedObjectsClient.delete.mockResolvedValue('');
 
-    deletePrebuiltSavedObjectsRoute(server.router, securitySetup);
+    deletePrebuiltSavedObjectsRoute(server.router);
   });
 
   it('should delete legacy hostRiskScoreDashboards', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
index c78d1f292afe6..bd7ae03191ea5 100644
--- a/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
+++ b/x-pack/plugins/security_solution/server/lib/risk_score/prebuilt_saved_objects/routes/delete_prebuilt_saved_objects.ts
@@ -10,18 +10,13 @@ import { transformError } from '@kbn/securitysolution-es-utils';
 import { PREBUILT_SAVED_OBJECTS_BULK_DELETE } from '../../../../../common/constants';
 import type { SecuritySolutionPluginRouter } from '../../../../types';
 
-import type { SetupPlugins } from '../../../../plugin';
-
 import { buildSiemResponse } from '../../../detection_engine/routes/utils';
 
 import { buildFrameworkRequest } from '../../../timeline/utils/common';
 import { bulkDeleteSavedObjects } from '../helpers/bulk_delete_saved_objects';
 import { deletePrebuiltSavedObjectsRequestBody } from '../../../../../common/api/entity_analytics/risk_score';
 
-export const deletePrebuiltSavedObjectsRoute = (
-  router: SecuritySolutionPluginRouter,
-  security: SetupPlugins['security']
-) => {
+export const deletePrebuiltSavedObjectsRoute = (router: SecuritySolutionPluginRouter) => {
   router.versioned
     .post({
       access: 'internal',
@@ -42,7 +37,7 @@ export const deletePrebuiltSavedObjectsRoute = (
 
           const spaceId = securitySolution?.getSpaceId();
 
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const savedObjectsClient = (await frameworkRequest.context.core).savedObjects.client;
 
           const res = await bulkDeleteSavedObjects({
diff --git a/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.test.ts b/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.test.ts
index c546d2fe63a49..232c09e76ee32 100644
--- a/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.test.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 import type { Logger } from '@kbn/core/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { INTERNAL_TAGS_URL } from '../../../../common/constants';
 import {
   serverMock,
   requestContextMock,
-  mockGetCurrentUser,
   requestMock,
 } from '../../detection_engine/routes/__mocks__';
 import { mockGetTagsResult } from '../__mocks__';
@@ -18,7 +16,6 @@ import { createTagRoute } from './create_tag';
 
 describe('createTagRoute', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   const { context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
 
@@ -34,14 +31,7 @@ describe('createTagRoute', () => {
     jest.clearAllMocks();
     server = serverMock.create();
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    createTagRoute(server.router, logger, securitySetup);
+    createTagRoute(server.router, logger);
   });
 
   it('should return tags with the exact name', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.ts b/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.ts
index 97499b76ae354..1604b4374b984 100644
--- a/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.ts
+++ b/x-pack/plugins/security_solution/server/lib/tags/routes/create_tag.ts
@@ -10,18 +10,13 @@ import { i18n } from '@kbn/i18n';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { createTagRequest } from '../../../../common/api/tags';
 import { INTERNAL_TAGS_URL } from '../../../../common/constants';
-import type { SetupPlugins } from '../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../detection_engine/routes/utils';
 import { buildFrameworkRequest } from '../../timeline/utils/common';
 import { createTag } from '../saved_objects';
 
-export const createTagRoute = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
+export const createTagRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.versioned
     .put({
       path: INTERNAL_TAGS_URL,
@@ -36,7 +31,7 @@ export const createTagRoute = (
         validate: { request: { body: buildRouteValidationWithExcess(createTagRequest) } },
       },
       async (context, request, response) => {
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const savedObjectsClient = (await frameworkRequest.context.core).savedObjects.client;
         const { name: tagName, description, color } = request.body;
         try {
diff --git a/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.test.ts b/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.test.ts
index dd18ad8257867..fab00d4db059b 100644
--- a/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.test.ts
@@ -5,12 +5,10 @@
  * 2.0.
  */
 import type { Logger, SavedObjectsFindResponse } from '@kbn/core/server';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { INTERNAL_TAGS_URL, SECURITY_TAG_NAME } from '../../../../common/constants';
 import {
   serverMock,
   requestContextMock,
-  mockGetCurrentUser,
   requestMock,
 } from '../../detection_engine/routes/__mocks__';
 import { mockGetTagsResult } from '../__mocks__';
@@ -18,7 +16,6 @@ import { getTagsByNameRoute } from './get_tags_by_name';
 
 describe('getTagsByNameRoute', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   const { context } = requestContextMock.createTools();
   const logger = { error: jest.fn() } as unknown as Logger;
 
@@ -36,14 +33,7 @@ describe('getTagsByNameRoute', () => {
     jest.clearAllMocks();
     server = serverMock.create();
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    getTagsByNameRoute(server.router, logger, securitySetup);
+    getTagsByNameRoute(server.router, logger);
   });
 
   it('should return tags with the exact name', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.ts b/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.ts
index cd07a71db5a1c..75ae24d0eacd5 100644
--- a/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.ts
+++ b/x-pack/plugins/security_solution/server/lib/tags/routes/get_tags_by_name.ts
@@ -10,18 +10,13 @@ import { i18n } from '@kbn/i18n';
 import { transformError } from '@kbn/securitysolution-es-utils';
 import { getTagsByNameRequest } from '../../../../common/api/tags';
 import { INTERNAL_TAGS_URL } from '../../../../common/constants';
-import type { SetupPlugins } from '../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { buildRouteValidationWithExcess } from '../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../detection_engine/routes/utils';
 import { buildFrameworkRequest } from '../../timeline/utils/common';
 import { findTagsByName } from '../saved_objects';
 
-export const getTagsByNameRoute = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
+export const getTagsByNameRoute = (router: SecuritySolutionPluginRouter, logger: Logger) => {
   router.versioned
     .get({
       path: INTERNAL_TAGS_URL,
@@ -36,7 +31,7 @@ export const getTagsByNameRoute = (
         validate: { request: { query: buildRouteValidationWithExcess(getTagsByNameRequest) } },
       },
       async (context, request, response) => {
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const savedObjectsClient = (await frameworkRequest.context.core).savedObjects.client;
 
         const { name: tagName } = request.query;
diff --git a/x-pack/plugins/security_solution/server/lib/tags/routes/index.ts b/x-pack/plugins/security_solution/server/lib/tags/routes/index.ts
index bfcdf518ee905..f7677388856a7 100644
--- a/x-pack/plugins/security_solution/server/lib/tags/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/tags/routes/index.ts
@@ -6,16 +6,11 @@
  */
 
 import type { Logger } from '@kbn/core/server';
-import type { SetupPlugins } from '../../../plugin_contract';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { createTagRoute } from './create_tag';
 import { getTagsByNameRoute } from './get_tags_by_name';
 
-export const registerTagsRoutes = (
-  router: SecuritySolutionPluginRouter,
-  logger: Logger,
-  security: SetupPlugins['security']
-) => {
-  getTagsByNameRoute(router, logger, security);
-  createTagRoute(router, logger, security);
+export const registerTagsRoutes = (router: SecuritySolutionPluginRouter, logger: Logger) => {
+  getTagsByNameRoute(router, logger);
+  createTagRoute(router, logger);
 };
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.ts
index 604e9dabe0d62..ae1cff768fded 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/clean_draft_timelines/index.ts
@@ -13,7 +13,6 @@ import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
 
 import { TIMELINE_DRAFT_URL } from '../../../../../../common/constants';
 import { buildFrameworkRequest } from '../../../utils/common';
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import {
   getDraftTimeline,
@@ -24,11 +23,7 @@ import {
 import { draftTimelineDefaults } from '../../../utils/default_timeline';
 import { cleanDraftTimelineSchema, TimelineType } from '../../../../../../common/api/timeline';
 
-export const cleanDraftTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const cleanDraftTimelinesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .post({
       path: TIMELINE_DRAFT_URL,
@@ -45,7 +40,7 @@ export const cleanDraftTimelinesRoute = (
         version: '2023-10-31',
       },
       async (context, request, response) => {
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const siemResponse = buildSiemResponse(response);
 
         try {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.ts
index 93e5d9fe84b00..6619e4a0eb18b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/draft_timelines/get_draft_timelines/index.ts
@@ -12,17 +12,12 @@ import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
 
 import { TIMELINE_DRAFT_URL } from '../../../../../../common/constants';
 import { buildFrameworkRequest } from '../../../utils/common';
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import { getDraftTimeline, persistTimeline } from '../../../saved_object/timelines';
 import { draftTimelineDefaults } from '../../../utils/default_timeline';
 import { getDraftTimelineSchema } from '../../../../../../common/api/timeline';
 
-export const getDraftTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const getDraftTimelinesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .get({
       path: TIMELINE_DRAFT_URL,
@@ -39,7 +34,7 @@ export const getDraftTimelinesRoute = (
         version: '2023-10-31',
       },
       async (context, request, response) => {
-        const frameworkRequest = await buildFrameworkRequest(context, security, request);
+        const frameworkRequest = await buildFrameworkRequest(context, request);
         const siemResponse = buildSiemResponse(response);
 
         try {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/index.ts
index 8fa7e7a8f31d6..6b44496b6c3c4 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/index.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import type { SetupPlugins } from '../../../plugin';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import type { ConfigType } from '../../..';
 import {
@@ -28,30 +27,26 @@ import { persistNoteRoute, deleteNoteRoute, getNotesRoute } from './notes';
 
 import { persistPinnedEventRoute } from './pinned_events';
 
-export function registerTimelineRoutes(
-  router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
-) {
-  createTimelinesRoute(router, config, security);
-  patchTimelinesRoute(router, config, security);
-
-  importTimelinesRoute(router, config, security);
-  exportTimelinesRoute(router, config, security);
-  getDraftTimelinesRoute(router, config, security);
-  getTimelineRoute(router, config, security);
-  resolveTimelineRoute(router, config, security);
-  getTimelinesRoute(router, config, security);
-  cleanDraftTimelinesRoute(router, config, security);
-  deleteTimelinesRoute(router, config, security);
-  persistFavoriteRoute(router, config, security);
-  copyTimelineRoute(router, config, security);
-
-  installPrepackedTimelinesRoute(router, config, security);
-
-  persistNoteRoute(router, config, security);
-  deleteNoteRoute(router, config, security);
-  getNotesRoute(router, config, security);
-
-  persistPinnedEventRoute(router, config, security);
+export function registerTimelineRoutes(router: SecuritySolutionPluginRouter, config: ConfigType) {
+  createTimelinesRoute(router, config);
+  patchTimelinesRoute(router, config);
+
+  importTimelinesRoute(router, config);
+  exportTimelinesRoute(router, config);
+  getDraftTimelinesRoute(router, config);
+  getTimelineRoute(router, config);
+  resolveTimelineRoute(router, config);
+  getTimelinesRoute(router, config);
+  cleanDraftTimelinesRoute(router, config);
+  deleteTimelinesRoute(router, config);
+  persistFavoriteRoute(router, config);
+  copyTimelineRoute(router, config);
+
+  installPrepackedTimelinesRoute(router, config);
+
+  persistNoteRoute(router, config);
+  deleteNoteRoute(router, config);
+  getNotesRoute(router, config);
+
+  persistPinnedEventRoute(router, config);
 }
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/delete_note.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/delete_note.ts
index 6cab82872b924..318d8950bc619 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/delete_note.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/delete_note.ts
@@ -10,7 +10,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../types';
 
 import { NOTE_URL } from '../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../utils/build_validation/route_validation';
 import type { ConfigType } from '../../../..';
 
@@ -20,11 +19,7 @@ import { buildFrameworkRequest } from '../../utils/common';
 import { deleteNoteSchema } from '../../../../../common/api/timeline';
 import { deleteNote } from '../../saved_object/notes';
 
-export const deleteNoteRoute = (
-  router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const deleteNoteRoute = (router: SecuritySolutionPluginRouter, config: ConfigType) => {
   router.versioned
     .delete({
       path: NOTE_URL,
@@ -44,7 +39,7 @@ export const deleteNoteRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const noteId = request.body?.noteId ?? '';
           const noteIds = request.body?.noteIds ?? null;
           if (noteIds != null) {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts
index 97aecc06ef198..f230d0832a96c 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/get_notes.ts
@@ -10,18 +10,13 @@ import type { SecuritySolutionPluginRouter } from '../../../../types';
 import { NOTE_URL } from '../../../../../common/constants';
 
 import type { ConfigType } from '../../../..';
-import type { SetupPlugins } from '../../../../plugin';
 
 import { buildSiemResponse } from '../../../detection_engine/routes/utils';
 import { buildFrameworkRequest, getNotesPaginated } from '../../utils/common';
 import { getAllSavedNote, MAX_UNASSOCIATED_NOTES } from '../../saved_object/notes';
 import { noteSavedObjectType } from '../../saved_object_mappings/notes';
 
-export const getNotesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const getNotesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .get({
       path: NOTE_URL,
@@ -40,7 +35,7 @@ export const getNotesRoute = (
       async (context, request, response) => {
         try {
           const queryParams = request.query;
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const documentIds = queryParams.documentIds ?? null;
           if (documentIds != null) {
             if (Array.isArray(documentIds)) {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/persist_note.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/persist_note.ts
index e4cf4b8a9c777..1bd91306a7419 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/persist_note.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/notes/persist_note.ts
@@ -10,7 +10,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../types';
 
 import { NOTE_URL } from '../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../plugin';
 import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
 import type { ConfigType } from '../../../..';
 
@@ -20,11 +19,7 @@ import { buildFrameworkRequest } from '../../utils/common';
 import { persistNoteWithoutRefSchema } from '../../../../../common/api/timeline';
 import { persistNote } from '../../saved_object/notes';
 
-export const persistNoteRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const persistNoteRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .patch({
       path: NOTE_URL,
@@ -44,7 +39,7 @@ export const persistNoteRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { note } = request.body;
           const noteId = request.body?.noteId ?? null;
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/pinned_events/persist_pinned_event.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/pinned_events/persist_pinned_event.ts
index 529f5d830e803..a5739c49a34ea 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/pinned_events/persist_pinned_event.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/pinned_events/persist_pinned_event.ts
@@ -10,7 +10,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../types';
 
 import { PINNED_EVENT_URL } from '../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../utils/build_validation/route_validation';
 import type { ConfigType } from '../../../..';
 
@@ -22,8 +21,7 @@ import { persistPinnedEventOnTimeline } from '../../saved_object/pinned_events';
 
 export const persistPinnedEventRoute = (
   router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
+  config: ConfigType
 ) => {
   router.versioned
     .patch({
@@ -44,7 +42,7 @@ export const persistPinnedEventRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { eventId } = request.body;
           const pinnedEventId = request.body?.pinnedEventId ?? null;
           const timelineId = request.body?.timelineId ?? null;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
index 763833a0ab4e8..7a4e7a41a1ee7 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/helpers.test.ts
@@ -6,13 +6,11 @@
  */
 
 import { createPromiseFromStreams } from '@kbn/utils';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 import type { FrameworkRequest } from '../../../../framework';
 import {
   createMockConfig,
   requestContextMock,
-  mockGetCurrentUser,
 } from '../../../../detection_engine/routes/__mocks__';
 import {
   addPrepackagedRulesRequest,
@@ -27,7 +25,6 @@ import type { ImportTimelineResultSchema } from '../../../../../../common/api/ti
 jest.mock('../../timelines/import_timelines/helpers');
 
 describe('installPrepackagedTimelines', () => {
-  let securitySetup: SecurityPluginSetup;
   let frameworkRequest: FrameworkRequest;
   const spyInstallPrepackagedTimelines = jest.spyOn(helpers, 'installPrepackagedTimelines');
 
@@ -37,13 +34,6 @@ describe('installPrepackagedTimelines', () => {
   const mockFileName = 'prepackaged_timelines.ndjson';
 
   beforeEach(async () => {
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
     clients.rulesClient.find.mockResolvedValue(getFindResultWithSingleHit());
 
     jest.doMock('./helpers', () => {
@@ -56,7 +46,6 @@ describe('installPrepackagedTimelines', () => {
     const request = addPrepackagedRulesRequest();
     frameworkRequest = await buildFrameworkRequest(
       requestContextMock.convertContext(context),
-      securitySetup,
       request
     );
   });
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
index 17086ca5a317d..9513bd49b4e6d 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.test.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
-
 import {
   serverMock,
   requestContextMock,
@@ -14,7 +12,6 @@ import {
 } from '../../../../detection_engine/routes/__mocks__';
 
 import {
-  mockGetCurrentUser,
   mockCheckTimelinesStatusBeforeInstallResult,
   mockCheckTimelinesStatusAfterInstallResult,
 } from '../../../__mocks__/import_timelines';
@@ -39,7 +36,6 @@ jest.mock('../../../utils/check_timelines_status', () => {
 
 describe('installPrepackagedTimelines', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   let { context } = requestContextMock.createTools();
 
   beforeEach(() => {
@@ -49,14 +45,7 @@ describe('installPrepackagedTimelines', () => {
     server = serverMock.create();
     context = requestContextMock.createTools().context;
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    installPrepackedTimelinesRoute(server.router, createMockConfig(), securitySetup);
+    installPrepackedTimelinesRoute(server.router, createMockConfig());
   });
 
   test('should call installPrepackagedTimelines ', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts
index 88d868968e9bb..0b150b4e47f56 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/prepackaged_timelines/install_prepackaged_timelines/index.ts
@@ -12,7 +12,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 
 import { TIMELINE_PREPACKAGED_URL } from '../../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../../plugin';
 import type { ConfigType } from '../../../../../config';
 
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
@@ -27,8 +26,7 @@ export { installPrepackagedTimelines } from './helpers';
 
 export const installPrepackedTimelinesRoute = (
   router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
+  config: ConfigType
 ) => {
   router.versioned
     .post({
@@ -49,7 +47,7 @@ export const installPrepackedTimelinesRoute = (
       },
       async (context, request, response) => {
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const prepackagedTimelineStatus = await checkTimelinesStatus(frameworkRequest);
           const [validatedprepackagedTimelineStatus, prepackagedTimelineStatusError] = validate(
             prepackagedTimelineStatus,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/copy_timeline/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/copy_timeline/index.ts
index 0e288e0099596..5bdb4e0f93d67 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/copy_timeline/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/copy_timeline/index.ts
@@ -11,17 +11,12 @@ import type { ConfigType } from '../../../../..';
 import { copyTimelineSchema } from '../../../../../../common/api/timeline';
 import { copyTimeline } from '../../../saved_object/timelines';
 import type { SecuritySolutionPluginRouter } from '../../../../../types';
-import type { SetupPlugins } from '../../../../../plugin';
 import { TIMELINE_COPY_URL } from '../../../../../../common/constants';
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
 
 import { buildFrameworkRequest } from '../../../utils/common';
 
-export const copyTimelineRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const copyTimelineRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .post({
       path: TIMELINE_COPY_URL,
@@ -41,7 +36,7 @@ export const copyTimelineRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { timeline, timelineIdToCopy } = request.body;
           const copiedTimeline = await copyTimeline(frameworkRequest, timeline, timelineIdToCopy);
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
index d444983e7b00a..9799d2c6bdf3b 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/helpers.test.ts
@@ -12,7 +12,6 @@ import type { FrameworkRequest } from '../../../../framework';
 import type { SavedTimeline, Note } from '../../../../../../common/api/timeline';
 import { mockTemplate, mockTimeline } from '../../../__mocks__/create_timelines';
 import { buildFrameworkRequest } from '../../../utils/common';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 import { requestContextMock } from '../../../../detection_engine/routes/__mocks__';
 import {
   getCreateTimelinesRequest,
@@ -62,23 +61,14 @@ jest.mock('../../../saved_object/notes/persist_notes', () => ({
 }));
 
 describe('createTimelines', () => {
-  let securitySetup: SecurityPluginSetup;
   let frameworkRequest: FrameworkRequest;
 
   beforeAll(async () => {
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn(),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
     const { context } = requestContextMock.createTools();
     const mockRequest = getCreateTimelinesRequest(createTimelineWithoutTimelineId);
 
     frameworkRequest = await buildFrameworkRequest(
       requestContextMock.convertContext(context),
-      securitySetup,
       mockRequest
     );
     Date.now = jest.fn().mockReturnValue(new Date('2020-11-04T11:37:31.655Z'));
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts
index 91b191c6ead0f..0fcf286661b96 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/create_timelines/index.ts
@@ -12,7 +12,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 import { TIMELINE_URL } from '../../../../../../common/constants';
 
 import type { ConfigType } from '../../../../..';
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
@@ -29,11 +28,7 @@ import type { CreateTimelinesResponse } from '../../../../../../common/api/timel
 
 export * from './helpers';
 
-export const createTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const createTimelinesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .post({
       path: TIMELINE_URL,
@@ -55,7 +50,7 @@ export const createTimelinesRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
 
           const { timelineId, timeline, version } = request.body;
           const { templateTimelineId, templateTimelineVersion, timelineType, title, status } =
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/delete_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/delete_timelines/index.ts
index 602d29ae061ab..7f6339ee25929 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/delete_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/delete_timelines/index.ts
@@ -10,18 +10,13 @@ import { buildRouteValidationWithExcess } from '../../../../../utils/build_valid
 import type { ConfigType } from '../../../../..';
 import { deleteTimelinesSchema } from '../../../../../../common/api/timeline';
 import type { SecuritySolutionPluginRouter } from '../../../../../types';
-import type { SetupPlugins } from '../../../../../plugin';
 import { TIMELINE_URL } from '../../../../../../common/constants';
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
 
 import { buildFrameworkRequest } from '../../../utils/common';
 import { deleteTimeline } from '../../../saved_object/timelines';
 
-export const deleteTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const deleteTimelinesRoute = (router: SecuritySolutionPluginRouter, config: ConfigType) => {
   router.versioned
     .delete({
       path: TIMELINE_URL,
@@ -41,7 +36,7 @@ export const deleteTimelinesRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { savedObjectIds, searchIds } = request.body;
 
           await deleteTimeline(frameworkRequest, savedObjectIds, searchIds);
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
index 044fc77caef80..13b6e0f68fefc 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.test.ts
@@ -23,8 +23,6 @@ import { TIMELINE_EXPORT_URL } from '../../../../../../common/constants';
 import { convertSavedObjectToSavedNote } from '../../../saved_object/notes/saved_object';
 import { convertSavedObjectToSavedPinnedEvent } from '../../../saved_object/pinned_events';
 import { convertSavedObjectToSavedTimeline } from '../../../saved_object/timelines/convert_saved_object_to_savedtimeline';
-import { mockGetCurrentUser } from '../../../__mocks__/import_timelines';
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
 
 jest.mock('../../../saved_object/timelines/convert_saved_object_to_savedtimeline', () => {
   return {
@@ -48,17 +46,10 @@ jest.mock('../../../saved_object/pinned_events', () => {
 describe('export timelines', () => {
   let server: ReturnType<typeof serverMock.create>;
   let { clients, context } = requestContextMock.createTools();
-  let securitySetup: SecurityPluginSetup;
 
   beforeEach(() => {
     server = serverMock.create();
     ({ clients, context } = requestContextMock.createTools());
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
     clients.savedObjectsClient.bulkGet.mockResolvedValue(mockTimelinesSavedObjects());
 
     (convertSavedObjectToSavedTimeline as unknown as jest.Mock).mockReturnValue(mockTimelines());
@@ -66,7 +57,7 @@ describe('export timelines', () => {
     (convertSavedObjectToSavedPinnedEvent as unknown as jest.Mock).mockReturnValue(
       mockPinnedEvents()
     );
-    exportTimelinesRoute(server.router, createMockConfig(), securitySetup);
+    exportTimelinesRoute(server.router, createMockConfig());
   });
 
   describe('status codes', () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.ts
index 6f02c312b7bc7..7af6b7be0cdd0 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/export_timelines/index.ts
@@ -17,17 +17,12 @@ import {
 } from '../../../../../../common/api/timeline';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import { buildFrameworkRequest } from '../../../utils/common';
-import type { SetupPlugins } from '../../../../../plugin';
 
 import { getExportTimelineByObjectIds } from './helpers';
 
 export * from './helpers';
 
-export const exportTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const exportTimelinesRoute = (router: SecuritySolutionPluginRouter, config: ConfigType) => {
   router.versioned
     .post({
       path: TIMELINE_EXPORT_URL,
@@ -49,7 +44,7 @@ export const exportTimelinesRoute = (
       async (context, request, response) => {
         try {
           const siemResponse = buildSiemResponse(response);
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
 
           const exportSizeLimit = config.maxTimelineImportExportSize;
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
index d439bdd300c4b..78df97fa441be 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.test.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
-
 import {
   serverMock,
   requestContextMock,
@@ -14,7 +12,6 @@ import {
 } from '../../../../detection_engine/routes/__mocks__';
 import { getTimelineOrNull, getTimelineTemplateOrNull } from '../../../saved_object/timelines';
 
-import { mockGetCurrentUser } from '../../../__mocks__/import_timelines';
 import { getTimelineRequest } from '../../../__mocks__/request_responses';
 
 import { getTimelineRoute } from '.';
@@ -27,7 +24,6 @@ jest.mock('../../../saved_object/timelines', () => ({
 
 describe('get timeline', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   let { context } = requestContextMock.createTools();
 
   beforeEach(() => {
@@ -37,14 +33,7 @@ describe('get timeline', () => {
     server = serverMock.create();
     context = requestContextMock.createTools().context;
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    getTimelineRoute(server.router, createMockConfig(), securitySetup);
+    getTimelineRoute(server.router, createMockConfig());
   });
 
   test('should call getTimelineTemplateOrNull if templateTimelineId is given', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.ts
index 25cf3c895f291..321e6aafe4903 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timeline/index.ts
@@ -11,7 +11,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 import { TIMELINE_URL } from '../../../../../../common/constants';
 
 import type { ConfigType } from '../../../../..';
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
@@ -24,11 +23,7 @@ import type {
   ResolvedTimelineWithOutcomeSavedObject,
 } from '../../../../../../common/api/timeline';
 
-export const getTimelineRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const getTimelineRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .get({
       path: TIMELINE_URL,
@@ -46,7 +41,7 @@ export const getTimelineRoute = (
       },
       async (context, request, response) => {
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const query = request.query ?? {};
           const { template_timeline_id: templateTimelineId, id } = query;
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
index 012427846f35e..b006b77c9a595 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.test.ts
@@ -5,18 +5,13 @@
  * 2.0.
  */
 
-import type { SecurityPluginSetup } from '@kbn/security-plugin/server';
-
 import {
   serverMock,
   requestContextMock,
   createMockConfig,
 } from '../../../../detection_engine/routes/__mocks__';
 import { getAllTimeline } from '../../../saved_object/timelines';
-
-import { mockGetCurrentUser } from '../../../__mocks__/import_timelines';
 import { getTimelineRequest } from '../../../__mocks__/request_responses';
-
 import { getTimelinesRoute } from '.';
 
 jest.mock('../../../saved_object/timelines', () => ({
@@ -25,7 +20,6 @@ jest.mock('../../../saved_object/timelines', () => ({
 
 describe('get all timelines', () => {
   let server: ReturnType<typeof serverMock.create>;
-  let securitySetup: SecurityPluginSetup;
   let { context } = requestContextMock.createTools();
 
   beforeEach(() => {
@@ -35,14 +29,7 @@ describe('get all timelines', () => {
     server = serverMock.create();
     context = requestContextMock.createTools().context;
 
-    securitySetup = {
-      authc: {
-        getCurrentUser: jest.fn().mockReturnValue(mockGetCurrentUser),
-      },
-      authz: {},
-    } as unknown as SecurityPluginSetup;
-
-    getTimelinesRoute(server.router, createMockConfig(), securitySetup);
+    getTimelinesRoute(server.router, createMockConfig());
   });
 
   test('should get the total count', async () => {
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.ts
index 02cb8ff41f1a3..97d9bf51a0876 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/get_timelines/index.ts
@@ -14,7 +14,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 import { TIMELINES_URL } from '../../../../../../common/constants';
 
 import type { ConfigType } from '../../../../..';
-import type { SetupPlugins } from '../../../../../plugin';
 
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
 
@@ -23,11 +22,7 @@ import { buildFrameworkRequest, escapeHatch, throwErrors } from '../../../utils/
 import { getAllTimeline } from '../../../saved_object/timelines';
 import { getTimelinesQuerySchema } from '../../../../../../common/api/timeline';
 
-export const getTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const getTimelinesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .get({
       path: TIMELINES_URL,
@@ -47,7 +42,7 @@ export const getTimelinesRoute = (
         const customHttpRequestError = (message: string) =>
           new CustomHttpRequestError(message, 400);
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const queryParams = pipe(
             getTimelinesQuerySchema.decode(request.query),
             fold(throwErrors(customHttpRequestError), identity)
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
index 8d6326af6c17c..be5ebc44e7faa 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/import_timelines/index.ts
@@ -13,7 +13,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 
 import { TIMELINE_IMPORT_URL } from '../../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../../plugin';
 import type { ConfigType } from '../../../../../config';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
@@ -24,11 +23,7 @@ import { buildFrameworkRequest } from '../../../utils/common';
 
 export { importTimelines } from './helpers';
 
-export const importTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  config: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const importTimelinesRoute = (router: SecuritySolutionPluginRouter, config: ConfigType) => {
   router.versioned
     .post({
       path: `${TIMELINE_IMPORT_URL}`,
@@ -66,7 +61,7 @@ export const importTimelinesRoute = (
               body: `Invalid file extension ${fileExtension}`,
             });
           }
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
 
           const res = await importTimelines(
             file as unknown as Readable,
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.ts
index c8b9c26536444..1c3cba9fdcb91 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/patch_timelines/index.ts
@@ -11,7 +11,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 
 import { TIMELINE_URL } from '../../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import type { ConfigType } from '../../../../..';
 
@@ -23,11 +22,7 @@ import { createTimelines } from '../create_timelines';
 import { CompareTimelinesStatus } from '../../../utils/compare_timelines_status';
 import type { PatchTimelinesResponse } from '../../../../../../common/api/timeline';
 
-export const patchTimelinesRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const patchTimelinesRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .patch({
       path: TIMELINE_URL,
@@ -47,7 +42,7 @@ export const patchTimelinesRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { timelineId, timeline, version } = request.body;
           const { templateTimelineId, templateTimelineVersion, timelineType, title, status } =
             timeline;
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/persist_favorite/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/persist_favorite/index.ts
index 746987caa3759..3b220ccf57e20 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/persist_favorite/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/persist_favorite/index.ts
@@ -10,7 +10,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 
 import { TIMELINE_FAVORITE_URL } from '../../../../../../common/constants';
 
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 import type { ConfigType } from '../../../../..';
 
@@ -20,11 +19,7 @@ import { buildFrameworkRequest } from '../../../utils/common';
 import { persistFavorite } from '../../../saved_object/timelines';
 import { TimelineType, persistFavoriteSchema } from '../../../../../../common/api/timeline';
 
-export const persistFavoriteRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const persistFavoriteRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .patch({
       path: TIMELINE_FAVORITE_URL,
@@ -44,7 +39,7 @@ export const persistFavoriteRoute = (
         const siemResponse = buildSiemResponse(response);
 
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const { timelineId, templateTimelineId, templateTimelineVersion, timelineType } =
             request.body;
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/resolve_timeline/index.ts b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/resolve_timeline/index.ts
index 7572e72cfb9ac..09549f9b9034f 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/resolve_timeline/index.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/routes/timelines/resolve_timeline/index.ts
@@ -11,7 +11,6 @@ import type { SecuritySolutionPluginRouter } from '../../../../../types';
 import { TIMELINE_RESOLVE_URL } from '../../../../../../common/constants';
 
 import type { ConfigType } from '../../../../..';
-import type { SetupPlugins } from '../../../../../plugin';
 import { buildRouteValidationWithExcess } from '../../../../../utils/build_validation/route_validation';
 
 import { buildSiemResponse } from '../../../../detection_engine/routes/utils';
@@ -24,11 +23,7 @@ import type {
   ResolvedTimelineWithOutcomeSavedObject,
 } from '../../../../../../common/api/timeline';
 
-export const resolveTimelineRoute = (
-  router: SecuritySolutionPluginRouter,
-  _: ConfigType,
-  security: SetupPlugins['security']
-) => {
+export const resolveTimelineRoute = (router: SecuritySolutionPluginRouter, _: ConfigType) => {
   router.versioned
     .get({
       path: TIMELINE_RESOLVE_URL,
@@ -46,7 +41,7 @@ export const resolveTimelineRoute = (
       },
       async (context, request, response) => {
         try {
-          const frameworkRequest = await buildFrameworkRequest(context, security, request);
+          const frameworkRequest = await buildFrameworkRequest(context, request);
           const query = request.query ?? {};
           const { template_timeline_id: templateTimelineId, id } = query;
 
diff --git a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
index b9f1aaafbf969..cfa804b848fcd 100644
--- a/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
+++ b/x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts
@@ -14,17 +14,16 @@ import { schema } from '@kbn/config-schema';
 
 import type { KibanaRequest, RequestHandlerContext } from '@kbn/core/server';
 import { formatErrors } from '@kbn/securitysolution-io-ts-utils';
-import type { SetupPlugins, StartPlugins } from '../../../plugin';
 
 import type { FrameworkRequest } from '../../framework';
 
 export const buildFrameworkRequest = async (
   context: RequestHandlerContext,
-  security: StartPlugins['security'] | SetupPlugins['security'] | undefined,
   request: KibanaRequest
 ): Promise<FrameworkRequest> => {
-  const savedObjectsClient = (await context.core).savedObjects.client;
-  const user = await security?.authc.getCurrentUser(request);
+  const coreContext = await context.core;
+  const savedObjectsClient = coreContext.savedObjects.client;
+  const user = coreContext.security.authc.getCurrentUser();
 
   return set<FrameworkRequest>(
     'user',
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 5b5b833dd2d4b..be4d5ae275d83 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -643,7 +643,7 @@ export class Plugin implements ISecuritySolutionPlugin {
         logger
       ),
       endpointFleetServicesFactory,
-      security: plugins.security,
+      security: core.security,
       alerting: plugins.alerting,
       config,
       cases: plugins.cases,
diff --git a/x-pack/plugins/security_solution/server/request_context_factory.ts b/x-pack/plugins/security_solution/server/request_context_factory.ts
index 1f36f7ecff234..00db7dcb2c3e8 100644
--- a/x-pack/plugins/security_solution/server/request_context_factory.ts
+++ b/x-pack/plugins/security_solution/server/request_context_factory.ts
@@ -65,8 +65,8 @@ export class RequestContextFactory implements IRequestContextFactory {
 
     const { lists, ruleRegistry, security } = plugins;
 
-    const [, startPlugins] = await core.getStartServices();
-    const frameworkRequest = await buildFrameworkRequest(context, security, request);
+    const [_, startPlugins] = await core.getStartServices();
+    const frameworkRequest = await buildFrameworkRequest(context, request);
     const coreContext = await context.core;
     const licensing = await context.licensing;
 
@@ -122,10 +122,11 @@ export class RequestContextFactory implements IRequestContextFactory {
           savedObjectsClient: coreContext.savedObjects.client,
         });
 
-        return createDetectionRulesClient(
-          startPlugins.alerting.getRulesClientWithRequest(request),
-          mlAuthz
-        );
+        return createDetectionRulesClient({
+          rulesClient: startPlugins.alerting.getRulesClientWithRequest(request),
+          savedObjectsClient: coreContext.savedObjects.client,
+          mlAuthz,
+        });
       }),
 
       getDetectionEngineHealthClient: memoize(() =>
@@ -148,7 +149,7 @@ export class RequestContextFactory implements IRequestContextFactory {
           return null;
         }
 
-        const username = security?.authc.getCurrentUser(request)?.username || 'elastic';
+        const username = coreContext.security.authc.getCurrentUser()?.username || 'elastic';
         return lists.getExceptionListClient(coreContext.savedObjects.client, username);
       },
 
diff --git a/x-pack/plugins/security_solution/server/routes/index.ts b/x-pack/plugins/security_solution/server/routes/index.ts
index bc1a26534cd6c..6f245bd04a02b 100644
--- a/x-pack/plugins/security_solution/server/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/routes/index.ts
@@ -80,7 +80,7 @@ export const initRoutes = (
 ) => {
   registerFleetIntegrationsRoutes(router);
   registerLegacyRuleActionsRoutes(router, logger);
-  registerPrebuiltRulesRoutes(router, security);
+  registerPrebuiltRulesRoutes(router);
   registerRuleExceptionsRoutes(router);
   registerManageExceptionsRoutes(router);
   registerRuleManagementRoutes(router, config, ml, logger);
@@ -99,19 +99,19 @@ export const initRoutes = (
 
   registerResolverRoutes(router, getStartServices, config);
 
-  registerTimelineRoutes(router, config, security);
+  registerTimelineRoutes(router, config);
 
   // Detection Engine Signals routes that have the REST endpoints of /api/detection_engine/signals
   // POST /api/detection_engine/signals/status
   // Example usage can be found in security_solution/server/lib/detection_engine/scripts/signals
-  setSignalsStatusRoute(router, logger, telemetrySender, getStartServices);
+  setSignalsStatusRoute(router, logger, telemetrySender);
   setAlertTagsRoute(router);
   setAlertAssigneesRoute(router);
   querySignalsRoute(router, ruleDataClient);
   getSignalsMigrationStatusRoute(router);
-  createSignalsMigrationRoute(router, security);
-  finalizeSignalsMigrationRoute(router, ruleDataService, security);
-  deleteSignalsMigrationRoute(router, security);
+  createSignalsMigrationRoute(router);
+  finalizeSignalsMigrationRoute(router, ruleDataService);
+  deleteSignalsMigrationRoute(router);
   suggestUserProfilesRoute(router, getStartServices);
 
   // Detection Engine index routes that have the REST endpoints of /api/detection_engine/index
@@ -130,14 +130,14 @@ export const initRoutes = (
   createStoredScriptRoute(router, logger);
   deleteStoredScriptRoute(router);
   readPrebuiltDevToolContentRoute(router);
-  createPrebuiltSavedObjectsRoute(router, logger, security);
-  deletePrebuiltSavedObjectsRoute(router, security);
+  createPrebuiltSavedObjectsRoute(router, logger);
+  deletePrebuiltSavedObjectsRoute(router);
   getRiskScoreIndexStatusRoute(router);
-  installRiskScoresRoute(router, logger, security);
+  installRiskScoresRoute(router, logger);
 
   // Dashboards
-  registerDashboardsRoutes(router, logger, security);
-  registerTagsRoutes(router, logger, security);
+  registerDashboardsRoutes(router, logger);
+  registerTagsRoutes(router, logger);
   const { previewTelemetryUrlEnabled } = config.experimentalFeatures;
   if (previewTelemetryUrlEnabled) {
     // telemetry preview endpoint for e2e integration tests only at the moment.
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
index e80cd4aa88a85..c19cb3971380e 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_alerts.ts
@@ -82,7 +82,7 @@ export const getAlerts = async ({
       size: 0,
     };
     logger.debug(
-      `Getting alerts with point in time (PIT) query: ${JSON.stringify(ruleSearchOptions)}`
+      () => `Getting alerts with point in time (PIT) query: ${JSON.stringify(ruleSearchOptions)}`
     );
     const body = await esClient.search<unknown, AlertAggs>(ruleSearchOptions);
     if (body.aggregations?.buckets?.buckets != null) {
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
index f74642507de34..77f4e22b3b162 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_case_comments.ts
@@ -34,7 +34,7 @@ export const getCaseComments = async ({
     namespaces: ['*'],
     filter: `${CASE_COMMENT_SAVED_OBJECT}.attributes.type: alert`,
   };
-  logger.debug(`Getting cases with point in time (PIT) query:', ${JSON.stringify(query)}`);
+  logger.debug(() => `Getting cases with point in time (PIT) query:', ${JSON.stringify(query)}`);
   const finder = savedObjectsClient.createPointInTimeFinder<AttachmentAttributes>(query);
   let responses: Array<SavedObjectsFindResult<AttachmentAttributes>> = [];
   for await (const response of finder.find()) {
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
index ae0cb67e02423..b92cf4fd64f77 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_detection_rules.ts
@@ -57,7 +57,7 @@ export const getDetectionRules = async ({
     filter,
   };
   logger.debug(
-    `Getting detection rules with point in time (PIT) query:', ${JSON.stringify(query)}`
+    () => `Getting detection rules with point in time (PIT) query:', ${JSON.stringify(query)}`
   );
   const finder = savedObjectsClient.createPointInTimeFinder<RuleSearchResult>(query);
   let responses: Array<SavedObjectsFindResult<RuleSearchResult>> = [];
diff --git a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
index 2ec434ec2566b..103fa154115c9 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/get_event_log_by_type_and_status.ts
@@ -107,11 +107,12 @@ const _getEventLogByTypeAndStatus = async ({
   const queryForElasticRules = getSearchForElasticRules({ eventLogIndex, aggs, elasticRuleIds });
   const queryForCustomRules = getSearchForCustomRules({ eventLogIndex, aggs, elasticRuleIds });
   logger.debug(
-    `Getting event logs by type and status with query for total: ${JSON.stringify(
-      queryForTotal
-    )}, elastic_rules: ${JSON.stringify(queryForElasticRules)} custom_rules: ${JSON.stringify(
-      queryForCustomRules
-    )}`
+    () =>
+      `Getting event logs by type and status with query for total: ${JSON.stringify(
+        queryForTotal
+      )}, elastic_rules: ${JSON.stringify(queryForElasticRules)} custom_rules: ${JSON.stringify(
+        queryForCustomRules
+      )}`
   );
 
   const [totalRules, elasticRules, customRules] = await Promise.all([
@@ -121,9 +122,12 @@ const _getEventLogByTypeAndStatus = async ({
   ]);
 
   logger.debug(
-    `Raw search results of event logs by type and status for total: ${JSON.stringify(
-      totalRules
-    )} elastic_rules: ${JSON.stringify(elasticRules)}, custom_rules: ${JSON.stringify(customRules)}`
+    () =>
+      `Raw search results of event logs by type and status for total: ${JSON.stringify(
+        totalRules
+      )} elastic_rules: ${JSON.stringify(elasticRules)}, custom_rules: ${JSON.stringify(
+        customRules
+      )}`
   );
 
   const totalRulesTransformed = transformEventLogTypeStatus({
@@ -145,7 +149,10 @@ const _getEventLogByTypeAndStatus = async ({
     custom_rules: customRulesTransformed,
   };
   logger.debug(
-    `Metrics transformed for event logs of type and status are: ${JSON.stringify(logStatusMetric)}`
+    () =>
+      `Metrics transformed for event logs of type and status are: ${JSON.stringify(
+        logStatusMetric
+      )}`
   );
 
   return logStatusMetric;
diff --git a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
index c4b795b608466..70c4e7d73d0e8 100644
--- a/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
+++ b/x-pack/plugins/security_solution/server/usage/queries/legacy_get_rule_actions.ts
@@ -40,7 +40,7 @@ export const legacyGetRuleActions = async ({
     namespaces: ['*'],
   };
   logger.debug(
-    `Getting legacy rule actions with point in time (PIT) query:', ${JSON.stringify(query)}`
+    () => `Getting legacy rule actions with point in time (PIT) query:', ${JSON.stringify(query)}`
   );
   const finder =
     savedObjectsClient.createPointInTimeFinder<LegacyIRuleActionsAttributesSavedObjectAttributes>(
diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts
index 72568fbd4c8a0..1a5fb8e64a265 100644
--- a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts
+++ b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering.ts
@@ -21,6 +21,15 @@ export const cloudSecurityMetringCallback = async ({
   lastSuccessfulReport,
   config,
 }: MeteringCallbackInput): Promise<MeteringCallBackResponse> => {
+  const projectHasCloudProductLine = config.productTypes.some(
+    (product) => product.product_line === ProductLine.cloud
+  );
+
+  if (!projectHasCloudProductLine) {
+    logger.info('No cloud product line found in the project');
+    return { records: [] };
+  }
+
   const projectId = cloudSetup?.serverless?.projectId || 'missing_project_id';
 
   const tier: Tier = getCloudProductTier(config, logger);
@@ -30,8 +39,8 @@ export const cloudSecurityMetringCallback = async ({
 
     const promiseResults = await Promise.allSettled(
       cloudSecuritySolutions.map((cloudSecuritySolution) => {
-        if (cloudSecuritySolution === CLOUD_DEFEND) {
-          return getCloudDefendUsageRecords({
+        if (cloudSecuritySolution !== CLOUD_DEFEND) {
+          return getCloudSecurityUsageRecord({
             esClient,
             projectId,
             logger,
@@ -41,7 +50,9 @@ export const cloudSecurityMetringCallback = async ({
             tier,
           });
         }
-        return getCloudSecurityUsageRecord({
+
+        // since lastSuccessfulReport is not used by getCloudSecurityUsageRecord, we want to verify if it is used by getCloudDefendUsageRecords before getCloudSecurityUsageRecord.
+        return getCloudDefendUsageRecords({
           esClient,
           projectId,
           logger,
diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts
index f775b91406c4c..6d55e52469283 100644
--- a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts
+++ b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.test.ts
@@ -14,16 +14,23 @@ import {
 } from './cloud_security_metering_task';
 
 import type { ServerlessSecurityConfig } from '../config';
-import type { CloudSecuritySolutions } from './types';
+
 import type { ProductTier } from '../../common/product';
-import { CLOUD_SECURITY_TASK_TYPE, CSPM, KSPM, CNVM, CLOUD_DEFEND } from './constants';
+import {
+  CLOUD_SECURITY_TASK_TYPE,
+  CSPM,
+  KSPM,
+  CNVM,
+  CLOUD_DEFEND,
+  BILLABLE_ASSETS_CONFIG,
+} from './constants';
 import { getCloudDefendUsageRecords } from './defend_for_containers_metering';
 
 const mockEsClient = elasticsearchServiceMock.createStart().client.asInternalUser;
 const logger: ReturnType<typeof loggingSystemMock.createLogger> = loggingSystemMock.createLogger();
 const chance = new Chance();
 
-const cloudSecuritySolutions: CloudSecuritySolutions[] = [CSPM, KSPM, CNVM];
+const cloudSecuritySolutions: Array<typeof CSPM | typeof KSPM> = [CSPM, KSPM];
 
 describe('getCloudSecurityUsageRecord', () => {
   beforeEach(() => {
@@ -54,18 +61,33 @@ describe('getCloudSecurityUsageRecord', () => {
   });
 
   test.each(cloudSecuritySolutions)(
-    'should return usageRecords with correct values for cspm, kspm, and cnvm when Elasticsearch response has aggregations',
+    'should return usageRecords with correct values for cspm and kspm when Elasticsearch response has aggregations',
     async (cloudSecuritySolution) => {
       // @ts-ignore
       mockEsClient.search.mockResolvedValueOnce({
         hits: { hits: [{ _id: 'someRecord', _index: 'mockIndex' }] }, // mocking for indexHasDataInDateRange
       });
+      const randomIndex = Math.floor(
+        Math.random() * BILLABLE_ASSETS_CONFIG[cloudSecuritySolution].values.length
+      );
+      const randomBillableAsset = BILLABLE_ASSETS_CONFIG[cloudSecuritySolution].values[randomIndex];
 
       // @ts-ignore
       mockEsClient.search.mockResolvedValueOnce({
         aggregations: {
-          unique_assets: {
-            value: 10,
+          resource_sub_type: {
+            buckets: [
+              {
+                key: randomBillableAsset,
+                doc_count: 100,
+                unique_assets: { value: 10 },
+              },
+              {
+                key: 'not_billable_asset',
+                doc_count: 50,
+                unique_assets: { value: 11 },
+              },
+            ],
           },
           min_timestamp: {
             value_as_string: '2023-07-30T15:11:41.738Z',
@@ -100,6 +122,10 @@ describe('getCloudSecurityUsageRecord', () => {
             sub_type: cloudSecuritySolution,
             quantity: 10,
             period_seconds: expect.any(Number),
+            metadata: {
+              [randomBillableAsset]: '10',
+              not_billable_asset: '11',
+            },
           },
           source: {
             id: taskId,
@@ -113,6 +139,62 @@ describe('getCloudSecurityUsageRecord', () => {
     }
   );
 
+  it('should return usageRecords with correct values for cnvm when Elasticsearch response has aggregations', async () => {
+    const cloudSecuritySolution = CNVM;
+
+    // @ts-ignore
+    mockEsClient.search.mockResolvedValueOnce({
+      hits: { hits: [{ _id: 'someRecord', _index: 'mockIndex' }] }, // mocking for indexHasDataInDateRange
+    });
+
+    // @ts-ignore
+    mockEsClient.search.mockResolvedValueOnce({
+      aggregations: {
+        unique_assets: {
+          value: 10,
+        },
+        min_timestamp: {
+          value_as_string: '2023-07-30T15:11:41.738Z',
+        },
+      },
+    });
+
+    const projectId = chance.guid();
+    const taskId = chance.guid();
+
+    const tier = 'essentials' as ProductTier;
+    const result = await getCloudSecurityUsageRecord({
+      esClient: mockEsClient,
+      projectId,
+      logger,
+      taskId,
+      lastSuccessfulReport: new Date(),
+      cloudSecuritySolution,
+      tier,
+    });
+
+    expect(result).toEqual([
+      {
+        id: expect.stringContaining(`${CLOUD_SECURITY_TASK_TYPE}_cnvm_${projectId}`),
+        usage_timestamp: '2023-07-30T15:11:41.738Z',
+        creation_timestamp: expect.any(String), // Expect a valid ISO string
+        usage: {
+          type: CLOUD_SECURITY_TASK_TYPE,
+          sub_type: CNVM,
+          quantity: 10,
+          period_seconds: expect.any(Number),
+        },
+        source: {
+          id: taskId,
+          instance_group_id: projectId,
+          metadata: {
+            tier: 'essentials',
+          },
+        },
+      },
+    ]);
+  });
+
   it('should return undefined when Elasticsearch response does not have aggregations', async () => {
     // @ts-ignore
     mockEsClient.search.mockResolvedValue({});
@@ -162,9 +244,7 @@ describe('getCloudSecurityUsageRecord', () => {
 
 describe('getSearchQueryByCloudSecuritySolution', () => {
   it('should return the correct search query for CSPM', () => {
-    const searchFrom = new Date('2023-07-30T15:11:41.738Z');
-
-    const result = getSearchQueryByCloudSecuritySolution('cspm', searchFrom);
+    const result = getSearchQueryByCloudSecuritySolution('cspm');
 
     expect(result).toEqual({
       bool: {
@@ -181,39 +261,13 @@ describe('getSearchQueryByCloudSecuritySolution', () => {
               'rule.benchmark.posture_type': 'cspm',
             },
           },
-          {
-            terms: {
-              'resource.sub_type': [
-                // 'aws-ebs', we can't include EBS volumes until https://github.com/elastic/security-team/issues/9283 is resolved
-                // 'aws-ec2', we can't include EC2 instances until https://github.com/elastic/security-team/issues/9254 is resolved
-                'aws-s3',
-                'aws-rds',
-                'azure-disk',
-                'azure-document-db-database-account',
-                'azure-flexible-mysql-server-db',
-                'azure-flexible-postgresql-server-db',
-                'azure-mysql-server-db',
-                'azure-postgresql-server-db',
-                'azure-sql-server',
-                'azure-storage-account',
-                'azure-vm',
-                'gcp-bigquery-dataset',
-                'gcp-compute-disk',
-                'gcp-compute-instance',
-                'gcp-sqladmin-instance',
-                'gcp-storage-bucket',
-              ],
-            },
-          },
         ],
       },
     });
   });
 
   it('should return the correct search query for KSPM', () => {
-    const searchFrom = new Date('2023-07-30T15:11:41.738Z');
-
-    const result = getSearchQueryByCloudSecuritySolution('kspm', searchFrom);
+    const result = getSearchQueryByCloudSecuritySolution('kspm');
 
     expect(result).toEqual({
       bool: {
@@ -230,20 +284,13 @@ describe('getSearchQueryByCloudSecuritySolution', () => {
               'rule.benchmark.posture_type': 'kspm',
             },
           },
-          {
-            terms: {
-              'resource.sub_type': ['Node', 'node'],
-            },
-          },
         ],
       },
     });
   });
 
   it('should return the correct search query for CNVM', () => {
-    const searchFrom = new Date('2023-07-30T15:11:41.738Z');
-
-    const result = getSearchQueryByCloudSecuritySolution(CNVM, searchFrom);
+    const result = getSearchQueryByCloudSecuritySolution(CNVM);
 
     expect(result).toEqual({
       bool: {
diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts
index 7827c5d25ebe6..6687c3dfed48c 100644
--- a/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts
+++ b/x-pack/plugins/security_solution_serverless/server/cloud_security/cloud_security_metering_task.ts
@@ -15,72 +15,112 @@ import {
   CSPM,
   KSPM,
   METERING_CONFIGS,
-  THRESHOLD_MINUTES,
   BILLABLE_ASSETS_CONFIG,
 } from './constants';
-import type { Tier, UsageRecord } from '../types';
+import type { ResourceSubtypeCounter, Tier, UsageRecord } from '../types';
 import type {
   CloudSecurityMeteringCallbackInput,
   CloudSecuritySolutions,
   AssetCountAggregation,
+  ResourceSubtypeAggregationBucket,
 } from './types';
 
 export const getUsageRecords = (
-  assetCountAggregations: AssetCountAggregation[],
+  assetCountAggregation: AssetCountAggregation,
   cloudSecuritySolution: CloudSecuritySolutions,
   taskId: string,
   tier: Tier,
   projectId: string,
   periodSeconds: number,
   logger: Logger
-): UsageRecord[] => {
-  const usageRecords = assetCountAggregations.map((assetCountAggregation) => {
-    const assetCount = assetCountAggregation.unique_assets.value;
-
-    if (assetCount > AGGREGATION_PRECISION_THRESHOLD) {
-      logger.warn(
-        `The number of unique resources for {${cloudSecuritySolution}} is ${assetCount}, which is higher than the AGGREGATION_PRECISION_THRESHOLD of ${AGGREGATION_PRECISION_THRESHOLD}.`
-      );
-    }
-
-    const minTimestamp = new Date(
-      assetCountAggregation.min_timestamp.value_as_string
-    ).toISOString();
-
-    const creationTimestamp = new Date();
-    const minutes = creationTimestamp.getMinutes();
-    if (minutes >= 30) {
-      creationTimestamp.setMinutes(30, 0, 0);
-    } else {
-      creationTimestamp.setMinutes(0, 0, 0);
-    }
-    const roundedCreationTimestamp = creationTimestamp.toISOString();
-
-    const usageRecord: UsageRecord = {
-      id: `${CLOUD_SECURITY_TASK_TYPE}_${cloudSecuritySolution}_${projectId}_${roundedCreationTimestamp}`,
-      usage_timestamp: minTimestamp,
-      creation_timestamp: creationTimestamp.toISOString(),
-      usage: {
-        type: CLOUD_SECURITY_TASK_TYPE,
-        sub_type: cloudSecuritySolution,
-        quantity: assetCount,
-        period_seconds: periodSeconds,
-      },
-      source: {
-        id: taskId,
-        instance_group_id: projectId,
-        metadata: { tier },
+): UsageRecord => {
+  let assetCount;
+  let resourceSubtypeCounterMap;
+
+  if (cloudSecuritySolution === CSPM || cloudSecuritySolution === KSPM) {
+    const resourceSubtypeBuckets: ResourceSubtypeAggregationBucket[] =
+      assetCountAggregation.resource_sub_type.buckets;
+
+    const billableAssets = BILLABLE_ASSETS_CONFIG[cloudSecuritySolution].values;
+    assetCount = resourceSubtypeBuckets
+      .filter((bucket) => billableAssets.includes(bucket.key))
+      .reduce((acc, bucket) => acc + bucket.unique_assets.value, 0);
+
+    resourceSubtypeCounterMap = assetCountAggregation.resource_sub_type.buckets.reduce(
+      (resourceMap, item) => {
+        // By the usage spec, the resource subtype counter should be a string // https://github.com/elastic/usage-api/blob/main/api/user-v1-spec.yml
+        resourceMap[item.key] = String(item.unique_assets.value);
+        return resourceMap;
       },
-    };
+      {} as ResourceSubtypeCounter
+    );
+  } else {
+    assetCount = assetCountAggregation.unique_assets.value;
+  }
+
+  if (assetCount > AGGREGATION_PRECISION_THRESHOLD) {
+    logger.warn(
+      `The number of unique resources for {${cloudSecuritySolution}} is ${assetCount}, which is higher than the AGGREGATION_PRECISION_THRESHOLD of ${AGGREGATION_PRECISION_THRESHOLD}.`
+    );
+  }
+
+  const minTimestamp = new Date(assetCountAggregation.min_timestamp.value_as_string).toISOString();
+
+  const creationTimestamp = new Date();
+  const minutes = creationTimestamp.getMinutes();
+  if (minutes >= 30) {
+    creationTimestamp.setMinutes(30, 0, 0);
+  } else {
+    creationTimestamp.setMinutes(0, 0, 0);
+  }
+  const roundedCreationTimestamp = creationTimestamp.toISOString();
+
+  const usageRecord: UsageRecord = {
+    id: `${CLOUD_SECURITY_TASK_TYPE}_${cloudSecuritySolution}_${projectId}_${roundedCreationTimestamp}`,
+    usage_timestamp: minTimestamp,
+    creation_timestamp: creationTimestamp.toISOString(),
+    usage: {
+      type: CLOUD_SECURITY_TASK_TYPE,
+      sub_type: cloudSecuritySolution,
+      quantity: assetCount,
+      period_seconds: periodSeconds,
+      ...(resourceSubtypeCounterMap && { metadata: resourceSubtypeCounterMap }),
+    },
+    source: {
+      id: taskId,
+      instance_group_id: projectId,
+      metadata: { tier },
+    },
+  };
 
-    return usageRecord;
-  });
-  return usageRecords;
+  return usageRecord;
 };
 
 export const getAggregationByCloudSecuritySolution = (
   cloudSecuritySolution: CloudSecuritySolutions
 ) => {
+  if (cloudSecuritySolution === CSPM || cloudSecuritySolution === KSPM)
+    return {
+      resource_sub_type: {
+        terms: {
+          field: BILLABLE_ASSETS_CONFIG[cloudSecuritySolution].filter_attribute,
+        },
+        aggs: {
+          unique_assets: {
+            cardinality: {
+              field: METERING_CONFIGS[cloudSecuritySolution].assets_identifier,
+              precision_threshold: AGGREGATION_PRECISION_THRESHOLD,
+            },
+          },
+        },
+      },
+      min_timestamp: {
+        min: {
+          field: '@timestamp',
+        },
+      },
+    };
+
   return {
     unique_assets: {
       cardinality: {
@@ -97,8 +137,7 @@ export const getAggregationByCloudSecuritySolution = (
 };
 
 export const getSearchQueryByCloudSecuritySolution = (
-  cloudSecuritySolution: CloudSecuritySolutions,
-  searchFrom: Date
+  cloudSecuritySolution: CloudSecuritySolutions
 ) => {
   const mustFilters = [];
 
@@ -117,20 +156,11 @@ export const getSearchQueryByCloudSecuritySolution = (
   }
 
   if (cloudSecuritySolution === CSPM || cloudSecuritySolution === KSPM) {
-    const billableAssetsConfig = BILLABLE_ASSETS_CONFIG[cloudSecuritySolution];
-
     mustFilters.push({
       term: {
         'rule.benchmark.posture_type': cloudSecuritySolution,
       },
     });
-
-    // filter in only billable assets
-    mustFilters.push({
-      terms: {
-        [billableAssetsConfig.filter_attribute]: billableAssetsConfig.values,
-      },
-    });
   }
 
   return {
@@ -141,10 +171,9 @@ export const getSearchQueryByCloudSecuritySolution = (
 };
 
 export const getAssetAggQueryByCloudSecuritySolution = (
-  cloudSecuritySolution: CloudSecuritySolutions,
-  searchFrom: Date
+  cloudSecuritySolution: CloudSecuritySolutions
 ) => {
-  const query = getSearchQueryByCloudSecuritySolution(cloudSecuritySolution, searchFrom);
+  const query = getSearchQueryByCloudSecuritySolution(cloudSecuritySolution);
   const aggs = getAggregationByCloudSecuritySolution(cloudSecuritySolution);
 
   return {
@@ -157,28 +186,27 @@ export const getAssetAggQueryByCloudSecuritySolution = (
 
 export const getAssetAggByCloudSecuritySolution = async (
   esClient: ElasticsearchClient,
-  cloudSecuritySolution: CloudSecuritySolutions,
-  searchFrom: Date
-): Promise<AssetCountAggregation[]> => {
-  const assetsAggQuery = getAssetAggQueryByCloudSecuritySolution(cloudSecuritySolution, searchFrom);
+  cloudSecuritySolution: CloudSecuritySolutions
+): Promise<AssetCountAggregation | undefined> => {
+  const assetsAggQuery = getAssetAggQueryByCloudSecuritySolution(cloudSecuritySolution);
 
   const response = await esClient.search<unknown, AssetCountAggregation>(assetsAggQuery);
-  if (!response.aggregations) return [];
 
-  return [response.aggregations];
+  if (!response.aggregations) return;
+
+  return response.aggregations;
 };
 
 const indexHasDataInDateRange = async (
   esClient: ElasticsearchClient,
-  cloudSecuritySolution: CloudSecuritySolutions,
-  searchFrom: Date
+  cloudSecuritySolution: CloudSecuritySolutions
 ) => {
   const response = await esClient.search(
     {
       index: METERING_CONFIGS[cloudSecuritySolution].index,
       size: 1,
       _source: false,
-      query: getSearchQueryByCloudSecuritySolution(cloudSecuritySolution, searchFrom),
+      query: getSearchQueryByCloudSecuritySolution(cloudSecuritySolution),
     },
     { ignore: [404] }
   );
@@ -186,47 +214,29 @@ const indexHasDataInDateRange = async (
   return response.hits?.hits.length > 0;
 };
 
-const getSearchStartDate = (lastSuccessfulReport: Date): Date => {
-  const initialDate = new Date();
-  const thresholdDate = new Date(initialDate.getTime() - THRESHOLD_MINUTES * 60 * 1000);
-
-  if (lastSuccessfulReport) {
-    const lastSuccessfulReportDate = new Date(lastSuccessfulReport);
-
-    const searchFrom =
-      lastSuccessfulReport && lastSuccessfulReportDate > thresholdDate
-        ? lastSuccessfulReportDate
-        : thresholdDate;
-    return searchFrom;
-  }
-  return thresholdDate;
-};
-
 export const getCloudSecurityUsageRecord = async ({
   esClient,
   projectId,
   taskId,
-  lastSuccessfulReport,
   cloudSecuritySolution,
   tier,
   logger,
 }: CloudSecurityMeteringCallbackInput): Promise<UsageRecord[] | undefined> => {
   try {
-    const searchFrom = getSearchStartDate(lastSuccessfulReport);
-
-    if (!(await indexHasDataInDateRange(esClient, cloudSecuritySolution, searchFrom))) return;
+    if (!(await indexHasDataInDateRange(esClient, cloudSecuritySolution))) return;
 
     // const periodSeconds = Math.floor((new Date().getTime() - searchFrom.getTime()) / 1000);
     const periodSeconds = 1800; // Workaround to prevent overbilling by charging for a constant time window. The issue should be resolved in https://github.com/elastic/security-team/issues/9424.
 
-    const assetCountAggregations = await getAssetAggByCloudSecuritySolution(
+    const assetCountAggregation = await getAssetAggByCloudSecuritySolution(
       esClient,
-      cloudSecuritySolution,
-      searchFrom
+      cloudSecuritySolution
     );
 
+    if (!assetCountAggregation) return [];
+
     const usageRecords = await getUsageRecords(
-      assetCountAggregations,
+      assetCountAggregation,
       cloudSecuritySolution,
       taskId,
       tier,
@@ -235,7 +245,7 @@ export const getCloudSecurityUsageRecord = async ({
       logger
     );
 
-    return usageRecords;
+    return [usageRecords];
   } catch (err) {
     logger.error(`Failed to fetch ${cloudSecuritySolution} metering data ${err}`);
   }
diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/defend_for_containers_metering.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/defend_for_containers_metering.ts
index 949eb709ec3a5..61240df94f9b2 100644
--- a/x-pack/plugins/security_solution_serverless/server/cloud_security/defend_for_containers_metering.ts
+++ b/x-pack/plugins/security_solution_serverless/server/cloud_security/defend_for_containers_metering.ts
@@ -76,7 +76,8 @@ export const getUsageRecords = async (
             {
               range: {
                 'event.ingested': {
-                  gt: searchFrom.toISOString(),
+                  //  gt: searchFrom.toISOString(), Tech debt: https://github.com/elastic/security-team/issues/9895
+                  gte: `now-30m`,
                 },
               },
             },
diff --git a/x-pack/plugins/security_solution_serverless/server/cloud_security/types.ts b/x-pack/plugins/security_solution_serverless/server/cloud_security/types.ts
index 62ded11d5ad1e..0ca9a7b5b943a 100644
--- a/x-pack/plugins/security_solution_serverless/server/cloud_security/types.ts
+++ b/x-pack/plugins/security_solution_serverless/server/cloud_security/types.ts
@@ -14,12 +14,24 @@ export interface CloudDefendAssetCountAggregation {
 export interface AssetCountAggregationBucket {
   buckets: AssetCountAggregation[];
 }
+
+export interface ResourceSubtypeAggregationBucket {
+  key: string;
+  doc_count: number;
+  unique_assets: {
+    value: number;
+  };
+}
+
 export interface AssetCountAggregation {
   key_as_string: string;
   min_timestamp: MinTimestamp;
   unique_assets: {
     value: number;
   };
+  resource_sub_type: {
+    buckets: ResourceSubtypeAggregationBucket[];
+  };
 }
 
 export interface MinTimestamp {
diff --git a/x-pack/plugins/security_solution_serverless/server/common/services/usage_reporting_service.ts b/x-pack/plugins/security_solution_serverless/server/common/services/usage_reporting_service.ts
index 994cbfe273304..0e47b982e692e 100644
--- a/x-pack/plugins/security_solution_serverless/server/common/services/usage_reporting_service.ts
+++ b/x-pack/plugins/security_solution_serverless/server/common/services/usage_reporting_service.ts
@@ -19,11 +19,13 @@ export class UsageReportingService {
     records: UsageRecord[],
     url = USAGE_SERVICE_USAGE_URL
   ): Promise<Response> {
+    const isHttps = url.includes('https');
+
     return fetch(url, {
       method: 'post',
       body: JSON.stringify(records),
       headers: { 'Content-Type': 'application/json' },
-      agent,
+      agent: isHttps ? agent : undefined, // Conditionally add agent if URL is HTTPS for supporting integration tests.
     });
   }
 }
diff --git a/x-pack/plugins/security_solution_serverless/server/config.ts b/x-pack/plugins/security_solution_serverless/server/config.ts
index 60336c6f6e5f3..4b9700aaca6b2 100644
--- a/x-pack/plugins/security_solution_serverless/server/config.ts
+++ b/x-pack/plugins/security_solution_serverless/server/config.ts
@@ -17,11 +17,17 @@ export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: false }),
   productTypes,
   /**
-   * Usage Reporting: the interval between runs of the task
+   * Usage Reporting: the interval between runs of the endpoint task
    */
 
   usageReportingTaskInterval: schema.string({ defaultValue: '5m' }),
 
+  /**
+   * Usage Reporting: the interval between runs of the cloud security task
+   */
+
+  cloudSecurityUsageReportingTaskInterval: schema.string({ defaultValue: '30m' }),
+
   /**
    * Usage Reporting: timeout value for how long the task should run.
    */
diff --git a/x-pack/plugins/security_solution_serverless/server/plugin.ts b/x-pack/plugins/security_solution_serverless/server/plugin.ts
index d63152f169490..f81a8e013e290 100644
--- a/x-pack/plugins/security_solution_serverless/server/plugin.ts
+++ b/x-pack/plugins/security_solution_serverless/server/plugin.ts
@@ -113,7 +113,7 @@ export class SecuritySolutionServerlessPlugin
     this.cloudSecurityUsageReportingTask
       ?.start({
         taskManager: pluginsSetup.taskManager,
-        interval: cloudSecurityMetringTaskProperties.interval,
+        interval: this.config.cloudSecurityUsageReportingTaskInterval,
       })
       .catch(() => {});
 
diff --git a/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts b/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts
index 86c94674828ad..8b965cb597153 100644
--- a/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts
+++ b/x-pack/plugins/security_solution_serverless/server/task_manager/usage_reporting_task.ts
@@ -155,7 +155,7 @@ export class SecurityUsageReportingTask {
       return { state: taskInstance.state, runAt: new Date() };
     }
 
-    this.logger.debug(`received usage records: ${JSON.stringify(usageRecords)}`);
+    this.logger.debug(() => `received usage records: ${JSON.stringify(usageRecords)}`);
 
     let usageReportResponse: Response | undefined;
 
diff --git a/x-pack/plugins/security_solution_serverless/server/types.ts b/x-pack/plugins/security_solution_serverless/server/types.ts
index eec8185a28199..8f8d4b36041a1 100644
--- a/x-pack/plugins/security_solution_serverless/server/types.ts
+++ b/x-pack/plugins/security_solution_serverless/server/types.ts
@@ -65,17 +65,13 @@ export interface UsageMetrics {
   quantity: number;
   period_seconds?: number;
   cause?: string;
-  metadata?: unknown;
+  metadata?: ResourceSubtypeCounter;
 }
 
 export interface UsageSource {
   id: string;
   instance_group_id: string;
-  metadata?: UsageSourceMetadata;
-}
-
-export interface UsageSourceMetadata {
-  tier?: Tier;
+  metadata?: { tier?: Tier };
 }
 
 export type Tier = ProductTier | 'none';
@@ -125,3 +121,6 @@ export interface MetringTaskProperties {
   periodSeconds: number;
   version: string;
 }
+export interface ResourceSubtypeCounter {
+  [key: string]: string;
+}
diff --git a/x-pack/plugins/stack_alerts/kibana.jsonc b/x-pack/plugins/stack_alerts/kibana.jsonc
index 9f2f33abf1f6e..4d000228b0e07 100644
--- a/x-pack/plugins/stack_alerts/kibana.jsonc
+++ b/x-pack/plugins/stack_alerts/kibana.jsonc
@@ -22,7 +22,7 @@
     ],
     "requiredBundles": [
       "esUiShared",
-      "textBasedLanguages"
+      "esql"
     ],
     "extraPublicDirs": ["common"]
   }
diff --git a/x-pack/plugins/stack_alerts/public/rule_types/es_query/expression/esql_query_expression.tsx b/x-pack/plugins/stack_alerts/public/rule_types/es_query/expression/esql_query_expression.tsx
index 3ff2b70522e9a..e9ceabf4639b2 100644
--- a/x-pack/plugins/stack_alerts/public/rule_types/es_query/expression/esql_query_expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/rule_types/es_query/expression/esql_query_expression.tsx
@@ -17,7 +17,7 @@ import {
   EuiSpacer,
 } from '@elastic/eui';
 import { getFields, RuleTypeParamsExpressionProps } from '@kbn/triggers-actions-ui-plugin/public';
-import { TextBasedLangEditor } from '@kbn/text-based-languages/public';
+import { TextBasedLangEditor } from '@kbn/esql/public';
 import { fetchFieldsFromESQL } from '@kbn/text-based-editor';
 import { getIndexPatternFromESQLQuery } from '@kbn/esql-utils';
 import type { AggregateQuery } from '@kbn/es-query';
diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.ts
index fdff3356faab7..f1548abb7fcc7 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_es_query.ts
@@ -124,13 +124,14 @@ export async function fetchEsQuery({
   });
 
   logger.debug(
-    `es query rule ${ES_QUERY_ID}:${ruleId} "${name}" query - ${JSON.stringify(sortedQuery)}`
+    () => `es query rule ${ES_QUERY_ID}:${ruleId} "${name}" query - ${JSON.stringify(sortedQuery)}`
   );
 
   const { body: searchResult } = await esClient.search(sortedQuery, { meta: true });
 
   logger.debug(
-    ` es query rule ${ES_QUERY_ID}:${ruleId} "${name}" result - ${JSON.stringify(searchResult)}`
+    () =>
+      ` es query rule ${ES_QUERY_ID}:${ruleId} "${name}" result - ${JSON.stringify(searchResult)}`
   );
 
   const link = `${publicBaseUrl}${spacePrefix}/app/management/insightsAndAlerting/triggersActions/rule/${ruleId}`;
diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.test.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.test.ts
index b23cddc0eaab7..da179ae900528 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.test.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.test.ts
@@ -7,7 +7,11 @@
 
 import { OnlyEsqlQueryRuleParams } from '../types';
 import { Comparator } from '../../../../common/comparator_types';
-import { getEsqlQuery, getSourceFields } from './fetch_esql_query';
+import { fetchEsqlQuery, getEsqlQuery, getSourceFields } from './fetch_esql_query';
+import { getErrorSource, TaskErrorSource } from '@kbn/task-manager-plugin/server/task_running';
+import { SharePluginStart } from '@kbn/share-plugin/server';
+import { loggingSystemMock } from '@kbn/core-logging-server-mocks';
+import { elasticsearchServiceMock } from '@kbn/core-elasticsearch-server-mocks';
 
 const getTimeRange = () => {
   const date = Date.now();
@@ -30,8 +34,43 @@ const defaultParams: OnlyEsqlQueryRuleParams = {
   groupBy: 'all',
   timeField: 'time',
 };
+const logger = loggingSystemMock.create().get();
 
 describe('fetchEsqlQuery', () => {
+  describe('fetch', () => {
+    afterEach(() => {
+      jest.resetAllMocks();
+    });
+    it('should throw a user error when the error is a verification_exception error', async () => {
+      const scopedClusterClient = elasticsearchServiceMock.createScopedClusterClient();
+
+      scopedClusterClient.asCurrentUser.transport.request.mockRejectedValueOnce(
+        new Error(
+          'verification_exception: Found 1 problem line 1:23: Unknown column [user_agent.original]'
+        )
+      );
+
+      try {
+        await fetchEsqlQuery({
+          ruleId: 'testRuleId',
+          alertLimit: 1,
+          params: defaultParams,
+          services: {
+            logger,
+            scopedClusterClient,
+            share: {} as SharePluginStart,
+          },
+          spacePrefix: '',
+          publicBaseUrl: '',
+          dateStart: new Date().toISOString(),
+          dateEnd: new Date().toISOString(),
+        });
+      } catch (e) {
+        expect(getErrorSource(e)).toBe(TaskErrorSource.USER);
+      }
+    });
+  });
+
   describe('getEsqlQuery', () => {
     afterAll(() => {
       jest.resetAllMocks();
diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.ts
index 5ecb258b0579f..2f6a750fc2de6 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_esql_query.ts
@@ -10,6 +10,7 @@ import { parseAggregationResults } from '@kbn/triggers-actions-ui-plugin/common'
 import { SharePluginStart } from '@kbn/share-plugin/server';
 import { IScopedClusterClient, Logger } from '@kbn/core/server';
 import { ecsFieldMap, alertFieldMap } from '@kbn/alerts-as-data-utils';
+import { createTaskRunError, TaskErrorSource } from '@kbn/task-manager-plugin/server';
 import { OnlyEsqlQueryRuleParams } from '../types';
 import { EsqlTable, toEsQueryHits } from '../../../../common';
 
@@ -42,13 +43,22 @@ export async function fetchEsqlQuery({
   const esClient = scopedClusterClient.asCurrentUser;
   const query = getEsqlQuery(params, alertLimit, dateStart, dateEnd);
 
-  logger.debug(`ES|QL query rule (${ruleId}) query: ${JSON.stringify(query)}`);
+  logger.debug(() => `ES|QL query rule (${ruleId}) query: ${JSON.stringify(query)}`);
+
+  let response: EsqlTable;
+  try {
+    response = await esClient.transport.request<EsqlTable>({
+      method: 'POST',
+      path: '/_query',
+      body: query,
+    });
+  } catch (e) {
+    if (e.message?.includes('verification_exception')) {
+      throw createTaskRunError(e, TaskErrorSource.USER);
+    }
+    throw e;
+  }
 
-  const response = await esClient.transport.request<EsqlTable>({
-    method: 'POST',
-    path: '/_query',
-    body: query,
-  });
   const hits = toEsQueryHits(response);
   const sourceFields = getSourceFields(response);
 
diff --git a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts
index e0f6613fb5a10..1a48fbef1adc4 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/es_query/lib/fetch_search_source_query.ts
@@ -70,9 +70,10 @@ export async function fetchSearchSourceQuery({
   );
 
   logger.debug(
-    `search source query rule (${ruleId}) query: ${JSON.stringify(
-      searchSource.getSearchRequestBody()
-    )}`
+    () =>
+      `search source query rule (${ruleId}) query: ${JSON.stringify(
+        searchSource.getSearchRequestBody()
+      )}`
   );
 
   const searchResult = await searchSource.fetch();
diff --git a/x-pack/plugins/stack_alerts/server/rule_types/index_threshold/rule_type.ts b/x-pack/plugins/stack_alerts/server/rule_types/index_threshold/rule_type.ts
index f4d236fe4f995..7a2e0109ea28b 100644
--- a/x-pack/plugins/stack_alerts/server/rule_types/index_threshold/rule_type.ts
+++ b/x-pack/plugins/stack_alerts/server/rule_types/index_threshold/rule_type.ts
@@ -290,7 +290,7 @@ export function getRuleType(
       },
       useCalculatedDateRange: false,
     });
-    logger.debug(`rule ${ID}:${ruleId} "${name}" query result: ${JSON.stringify(result)}`);
+    logger.debug(() => `rule ${ID}:${ruleId} "${name}" query result: ${JSON.stringify(result)}`);
 
     const isGroupAgg = isGroupAggregation(queryParams.termField);
 
@@ -307,9 +307,10 @@ export function getRuleType(
 
       if (value === null || value === undefined) {
         logger.debug(
-          `rule ${ID}:${ruleId} "${name}": no metrics found for group ${alertId}} from groupResult ${JSON.stringify(
-            groupResult
-          )}`
+          () =>
+            `rule ${ID}:${ruleId} "${name}": no metrics found for group ${alertId}} from groupResult ${JSON.stringify(
+              groupResult
+            )}`
         );
         continue;
       }
@@ -348,7 +349,7 @@ export function getRuleType(
           [ALERT_EVALUATION_VALUE]: `${actionContext.value}`,
         },
       });
-      logger.debug(`scheduled actionGroup: ${JSON.stringify(actionContext)}`);
+      logger.debug(() => `scheduled actionGroup: ${JSON.stringify(actionContext)}`);
     }
 
     alertsClient.setAlertLimitReached(result.truncated);
diff --git a/x-pack/plugins/stack_alerts/tsconfig.json b/x-pack/plugins/stack_alerts/tsconfig.json
index b005183198f32..f187bf466e375 100644
--- a/x-pack/plugins/stack_alerts/tsconfig.json
+++ b/x-pack/plugins/stack_alerts/tsconfig.json
@@ -38,7 +38,7 @@
     "@kbn/discover-plugin",
     "@kbn/rule-data-utils",
     "@kbn/alerts-as-data-utils",
-    "@kbn/text-based-languages",
+    "@kbn/esql",
     "@kbn/text-based-editor",
     "@kbn/expressions-plugin",
     "@kbn/core-http-browser",
@@ -51,7 +51,9 @@
     "@kbn/esql-utils",
     "@kbn/data-view-utils",
     "@kbn/search-types",
-    "@kbn/alerting-comparators"
+    "@kbn/alerting-comparators",
+    "@kbn/task-manager-plugin",
+    "@kbn/core-logging-server-mocks"
   ],
   "exclude": [
     "target/**/*",
diff --git a/x-pack/plugins/stack_connectors/common/sentinelone/schema.ts b/x-pack/plugins/stack_connectors/common/sentinelone/schema.ts
index 66a50a42dc419..80f86a5c05ad8 100644
--- a/x-pack/plugins/stack_connectors/common/sentinelone/schema.ts
+++ b/x-pack/plugins/stack_connectors/common/sentinelone/schema.ts
@@ -162,7 +162,10 @@ export const SentinelOneIsolateHostResponseSchema = schema.object({
 
 export const SentinelOneGetRemoteScriptsParamsSchema = schema.object({
   query: schema.nullable(schema.string()),
+  // Possible values (multiples comma delimiter): `linux` or `macos` or `windows`
   osTypes: schema.nullable(schema.string()),
+  // possible values (multiples comma delimiter): `action` or `artifactCollection` or `dataCollection`
+  scriptType: schema.nullable(schema.string()),
 });
 
 export const SentinelOneFetchAgentFilesParamsSchema = schema.object({
diff --git a/x-pack/plugins/stack_connectors/public/common/index.ts b/x-pack/plugins/stack_connectors/public/common/index.ts
index 51c434f7416c7..f4ef0e02d6c37 100644
--- a/x-pack/plugins/stack_connectors/public/common/index.ts
+++ b/x-pack/plugins/stack_connectors/public/common/index.ts
@@ -7,9 +7,13 @@
 
 import OpenAILogo from '../connector_types/openai/logo';
 import BedrockLogo from '../connector_types/bedrock/logo';
+import GeminiLogo from '../connector_types/bedrock/logo';
+
+export { GEMINI_CONNECTOR_ID } from '../../common/gemini/constants';
 
 export { OPENAI_CONNECTOR_ID, OpenAiProviderType } from '../../common/openai/constants';
 export { OpenAILogo };
+export { GeminiLogo };
 
 import SentinelOneLogo from '../connector_types/sentinelone/logo';
 
diff --git a/x-pack/plugins/stack_connectors/public/connector_types/cases_webhook/webhook.tsx b/x-pack/plugins/stack_connectors/public/connector_types/cases_webhook/webhook.tsx
index 6e86df15c09c7..c547553260813 100644
--- a/x-pack/plugins/stack_connectors/public/connector_types/cases_webhook/webhook.tsx
+++ b/x-pack/plugins/stack_connectors/public/connector_types/cases_webhook/webhook.tsx
@@ -27,7 +27,6 @@ export function getConnectorType(): ConnectorTypeModel<
         defaultMessage: 'Send a request to a Case Management web service.',
       }
     ),
-    isExperimental: true,
     actionTypeTitle: i18n.translate(
       'xpack.stackConnectors.components.casesWebhookxpack.stackConnectors.components.casesWebhook.connectorTypeTitle',
       {
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/gemini/gemini.ts b/x-pack/plugins/stack_connectors/server/connector_types/gemini/gemini.ts
index 323b13d3b768e..31ec65bca0859 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/gemini/gemini.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/gemini/gemini.ts
@@ -11,9 +11,8 @@ import { PassThrough } from 'stream';
 import { IncomingMessage } from 'http';
 import { SubActionRequestParams } from '@kbn/actions-plugin/server/sub_action_framework/types';
 import { getGoogleOAuthJwtAccessToken } from '@kbn/actions-plugin/server/lib/get_gcp_oauth_access_token';
-import { Logger } from '@kbn/core/server';
 import { ConnectorTokenClientContract } from '@kbn/actions-plugin/server/types';
-import { ActionsConfigurationUtilities } from '@kbn/actions-plugin/server/actions_config';
+
 import {
   RunActionParamsSchema,
   RunApiResponseSchema,
@@ -39,16 +38,6 @@ import {
   DEFAULT_TOKEN_LIMIT,
 } from '../../../common/gemini/constants';
 import { DashboardActionParamsSchema } from '../../../common/gemini/schema';
-
-export interface GetAxiosInstanceOpts {
-  connectorId: string;
-  logger: Logger;
-  credentials: string;
-  snServiceUrl: string;
-  connectorTokenClient: ConnectorTokenClientContract;
-  configurationUtilities: ActionsConfigurationUtilities;
-}
-
 /** Interfaces to define Gemini model response type */
 
 interface MessagePart {
diff --git a/x-pack/plugins/stack_connectors/server/connector_types/gemini/index.ts b/x-pack/plugins/stack_connectors/server/connector_types/gemini/index.ts
index 6859cb82e672c..d8add7df88177 100644
--- a/x-pack/plugins/stack_connectors/server/connector_types/gemini/index.ts
+++ b/x-pack/plugins/stack_connectors/server/connector_types/gemini/index.ts
@@ -10,10 +10,14 @@ import {
   SubActionConnectorType,
   ValidatorType,
 } from '@kbn/actions-plugin/server/sub_action_framework/types';
-import { GenerativeAIForSecurityConnectorFeatureId } from '@kbn/actions-plugin/common';
+import {
+  GenerativeAIForSearchPlaygroundConnectorFeatureId,
+  GenerativeAIForSecurityConnectorFeatureId,
+} from '@kbn/actions-plugin/common';
 import { urlAllowListValidator } from '@kbn/actions-plugin/server';
 import { ValidatorServices } from '@kbn/actions-plugin/server/types';
 import { assertURL } from '@kbn/actions-plugin/server/sub_action_framework/helpers/validators';
+import { GenerativeAIForObservabilityConnectorFeatureId } from '@kbn/actions-plugin/common/connector_feature_config';
 import { GEMINI_CONNECTOR_ID, GEMINI_TITLE } from '../../../common/gemini/constants';
 import { ConfigSchema, SecretsSchema } from '../../../common/gemini/schema';
 import { Config, Secrets } from '../../../common/gemini/types';
@@ -29,7 +33,11 @@ export const getConnectorType = (): SubActionConnectorType<Config, Secrets> => (
     secrets: SecretsSchema,
   },
   validators: [{ type: ValidatorType.CONFIG, validator: configValidator }],
-  supportedFeatureIds: [GenerativeAIForSecurityConnectorFeatureId],
+  supportedFeatureIds: [
+    GenerativeAIForSecurityConnectorFeatureId,
+    GenerativeAIForSearchPlaygroundConnectorFeatureId,
+    GenerativeAIForObservabilityConnectorFeatureId,
+  ],
   minimumLicenseRequired: 'enterprise' as const,
   renderParameterTemplates,
 });
diff --git a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
index cd9728c1e839e..ea0793b60266b 100644
--- a/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
+++ b/x-pack/plugins/task_manager/server/lib/log_health_metrics.test.ts
@@ -135,7 +135,10 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config, true, docLinks);
 
     const firstDebug = JSON.parse(
-      (logger as jest.Mocked<Logger>).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+      ((logger as jest.Mocked<Logger>).debug.mock.calls[0][0] as string).replace(
+        'Latest Monitored Stats: ',
+        ''
+      )
     );
     expect(firstDebug).toMatchObject(health);
   });
@@ -154,7 +157,10 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config, true, docLinks);
 
     const firstInfo = JSON.parse(
-      (logger as jest.Mocked<Logger>).info.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+      ((logger as jest.Mocked<Logger>).info.mock.calls[0][0] as string).replace(
+        'Latest Monitored Stats: ',
+        ''
+      )
     );
     expect(firstInfo).toMatchObject(health);
   });
@@ -173,7 +179,10 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config, true, docLinks);
 
     const firstDebug = JSON.parse(
-      (logger as jest.Mocked<Logger>).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+      ((logger as jest.Mocked<Logger>).debug.mock.calls[0][0] as string).replace(
+        'Latest Monitored Stats: ',
+        ''
+      )
     );
     expect(firstDebug).toMatchObject(health);
   });
@@ -342,7 +351,10 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config, true, docLinks);
 
     const firstDebug = JSON.parse(
-      (logger as jest.Mocked<Logger>).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+      ((logger as jest.Mocked<Logger>).debug.mock.calls[0][0] as string).replace(
+        'Latest Monitored Stats: ',
+        ''
+      )
     );
     expect(firstDebug).toMatchObject(health);
   });
@@ -379,7 +391,10 @@ describe('logHealthMetrics', () => {
     logHealthMetrics(health, logger, config, false, docLinks);
 
     const firstDebug = JSON.parse(
-      (logger as jest.Mocked<Logger>).debug.mock.calls[0][0].replace('Latest Monitored Stats: ', '')
+      ((logger as jest.Mocked<Logger>).debug.mock.calls[0][0] as string).replace(
+        'Latest Monitored Stats: ',
+        ''
+      )
     );
     expect(firstDebug).toMatchObject(health);
   });
diff --git a/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts b/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
index 1cd9fdf09cfd5..8fb7a32e2987a 100644
--- a/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
+++ b/x-pack/plugins/task_manager/server/metrics/task_run_metrics_aggregator.ts
@@ -102,7 +102,8 @@ export class TaskRunMetricsAggregator implements ITaskMetricsAggregator<TaskRunM
     if (isTaskRunEvent(taskEvent)) {
       this.processTaskRunEvent(taskEvent);
       this.logger.debug(
-        `Collected metrics after processing lifecycle event - ${JSON.stringify(this.collect())}`
+        () =>
+          `Collected metrics after processing lifecycle event - ${JSON.stringify(this.collect())}`
       );
     } else if (isTaskManagerStatEvent(taskEvent)) {
       this.processTaskManagerStatEvent(taskEvent);
diff --git a/x-pack/plugins/task_manager/server/routes/metrics.ts b/x-pack/plugins/task_manager/server/routes/metrics.ts
index 4172e3deb1155..490cb869ba109 100644
--- a/x-pack/plugins/task_manager/server/routes/metrics.ts
+++ b/x-pack/plugins/task_manager/server/routes/metrics.ts
@@ -45,7 +45,7 @@ export function metricsRoute(params: MetricsRouteParams) {
 
   metrics$.subscribe((metrics) => {
     lastMetrics = { process_uuid: taskManagerId, timestamp: new Date().toISOString(), ...metrics };
-    additionalDebugLogger.debug(`subscribed metrics ${JSON.stringify(metrics)}`);
+    additionalDebugLogger.debug(() => `subscribed metrics ${JSON.stringify(metrics)}`);
   });
 
   router.get(
@@ -69,9 +69,10 @@ export function metricsRoute(params: MetricsRouteParams) {
       res: KibanaResponseFactory
     ): Promise<IKibanaResponse> {
       debugLogger.debug(
-        `/api/task_manager/metrics route accessed with reset=${req.query.reset} - metrics ${
-          lastMetrics ? JSON.stringify(lastMetrics) : 'not available'
-        }`
+        () =>
+          `/api/task_manager/metrics route accessed with reset=${req.query.reset} - metrics ${
+            lastMetrics ? JSON.stringify(lastMetrics) : 'not available'
+          }`
       );
       if (req.query.reset) {
         resetMetrics$.next(true);
diff --git a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
index ba97282c6de5f..59b42d97d1fcc 100644
--- a/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
+++ b/x-pack/plugins/timelines/common/search_strategy/index_fields/index.ts
@@ -5,11 +5,9 @@
  * 2.0.
  */
 
-import type { IFieldSubType } from '@kbn/es-query';
 import type { IEsSearchRequest, IEsSearchResponse } from '@kbn/search-types';
 import type { MappingRuntimeFields } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
 import type { FieldSpec } from '@kbn/data-plugin/common';
-import type { RuntimeField } from '@kbn/data-views-plugin/common';
 
 import type { Maybe } from '../common';
 
@@ -73,19 +71,10 @@ export interface IndexFieldsStrategyResponse extends IEsSearchResponse {
  * everything you need via the `fields` property on the data view
  * you are working with? Or perhaps you need a description for a
  * particular field? Consider using the EcsFlat module from `@kbn/ecs`
+ * NOTE: This "Omit" type is necesssary as some places expect the format field to be a string,
+ * this will be aligned with the spec near term.
  */
-export interface BrowserField {
-  aggregatable: boolean;
-  format: string;
-  indexes: string[]; // FIXME: missing in FieldSpec
-  name: string;
-  searchable: boolean;
-  type: string;
-  esTypes?: string[];
-  subType?: IFieldSubType; // not sure
-  readFromDocValues: boolean;
-  runtimeField?: RuntimeField;
-}
+export type BrowserField = Omit<FieldSpec, 'format'> & { format?: string };
 
 type FieldCategoryName = string;
 
@@ -93,6 +82,10 @@ export interface FieldCategory {
   fields: Record<string, Partial<BrowserField>>;
 }
 
+export interface FieldCategory {
+  fields: Record<string, Partial<BrowserField>>;
+}
+
 /**
  * @deprecated use fields list on dataview / "indexPattern"
  * about to use browserFields? Reconsider! Maybe you can accomplish
diff --git a/x-pack/plugins/timelines/public/mock/browser_fields.ts b/x-pack/plugins/timelines/public/mock/browser_fields.ts
index eb7acfd9484c0..9c5cff3c5fe97 100644
--- a/x-pack/plugins/timelines/public/mock/browser_fields.ts
+++ b/x-pack/plugins/timelines/public/mock/browser_fields.ts
@@ -311,7 +311,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.ephemeral_id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.ephemeral_id',
         searchable: true,
         type: 'string',
@@ -319,7 +318,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.hostname': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.hostname',
         searchable: true,
         type: 'string',
@@ -327,7 +325,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.id',
         searchable: true,
         type: 'string',
@@ -335,7 +332,6 @@ export const mockBrowserFields: BrowserFields = {
       'agent.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'agent.name',
         searchable: true,
         type: 'string',
@@ -347,7 +343,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a0': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a0',
         searchable: true,
         type: 'string',
@@ -355,7 +350,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a1': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a1',
         searchable: true,
         type: 'string',
@@ -363,7 +357,6 @@ export const mockBrowserFields: BrowserFields = {
       'auditd.data.a2': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat'],
         name: 'auditd.data.a2',
         searchable: true,
         type: 'string',
@@ -375,7 +368,6 @@ export const mockBrowserFields: BrowserFields = {
       '@timestamp': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: '@timestamp',
         searchable: true,
         type: 'date',
@@ -385,7 +377,6 @@ export const mockBrowserFields: BrowserFields = {
         type: 'string',
         searchable: true,
         aggregatable: false,
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
       message: {
         name: 'message',
@@ -393,7 +384,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: false,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -402,7 +392,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.address',
         searchable: true,
         type: 'string',
@@ -410,7 +399,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.bytes',
         searchable: true,
         type: 'number',
@@ -418,7 +406,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.domain',
         searchable: true,
         type: 'string',
@@ -426,7 +413,6 @@ export const mockBrowserFields: BrowserFields = {
       'client.geo.country_iso_code': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'client.geo.country_iso_code',
         searchable: true,
         type: 'string',
@@ -438,7 +424,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.account.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.account.id',
         searchable: true,
         type: 'string',
@@ -446,7 +431,6 @@ export const mockBrowserFields: BrowserFields = {
       'cloud.availability_zone': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'cloud.availability_zone',
         searchable: true,
         type: 'string',
@@ -458,7 +442,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.id': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.id',
         searchable: true,
         type: 'string',
@@ -466,7 +449,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.name': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.name',
         searchable: true,
         type: 'string',
@@ -474,7 +456,6 @@ export const mockBrowserFields: BrowserFields = {
       'container.image.tag': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'container.image.tag',
         searchable: true,
         type: 'string',
@@ -486,7 +467,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.address': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.address',
         searchable: true,
         type: 'string',
@@ -494,7 +474,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.bytes': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.bytes',
         searchable: true,
         type: 'number',
@@ -502,7 +481,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.domain': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.domain',
         searchable: true,
         type: 'string',
@@ -510,7 +488,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.ip',
         searchable: true,
         type: 'ip',
@@ -518,7 +495,6 @@ export const mockBrowserFields: BrowserFields = {
       'destination.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'destination.port',
         searchable: true,
         type: 'long',
@@ -529,7 +505,6 @@ export const mockBrowserFields: BrowserFields = {
     fields: {
       'event.end': {
         format: '',
-        indexes: DEFAULT_INDEX_PATTERN,
         name: 'event.end',
         searchable: true,
         type: 'date',
@@ -541,7 +516,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.category': {
         name: 'event.category',
@@ -549,7 +523,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
       'event.severity': {
         name: 'event.severity',
@@ -557,7 +530,6 @@ export const mockBrowserFields: BrowserFields = {
         format: 'number',
         searchable: true,
         aggregatable: true,
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -569,7 +541,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: DEFAULT_INDEX_PATTERN,
       },
     },
   },
@@ -578,7 +549,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.ip': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.ip',
         searchable: true,
         type: 'ip',
@@ -586,7 +556,6 @@ export const mockBrowserFields: BrowserFields = {
       'source.port': {
         aggregatable: true,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'source.port',
         searchable: true,
         type: 'long',
@@ -601,7 +570,6 @@ export const mockBrowserFields: BrowserFields = {
         searchable: true,
         aggregatable: true,
         format: 'string',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
       },
     },
   },
@@ -610,7 +578,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.firstAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.firstAttributes',
         searchable: true,
         type: 'string',
@@ -623,7 +590,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.secondAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.secondAttributes',
         searchable: true,
         type: 'string',
@@ -636,7 +602,6 @@ export const mockBrowserFields: BrowserFields = {
       'nestedField.thirdAttributes': {
         aggregatable: false,
         format: '',
-        indexes: ['auditbeat', 'filebeat', 'packetbeat'],
         name: 'nestedField.thirdAttributes',
         searchable: true,
         type: 'date',
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.test.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.test.ts
index cbe68b096e09d..ff502c9fcdc2e 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.test.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.test.ts
@@ -117,6 +117,7 @@ describe('transformHealthServiceProvider', () => {
     expect(esClient.transform.getTransformStats).toHaveBeenCalledTimes(1);
     expect(esClient.transform.getTransformStats).toHaveBeenNthCalledWith(1, {
       basic: true,
+      transform_id: '_all',
     });
 
     const notStarted = result[0];
diff --git a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
index 7ad2fdde6057d..939d4e01a6f1d 100644
--- a/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
+++ b/x-pack/plugins/transform/server/lib/alerting/transform_health_rule_type/transform_health_service.ts
@@ -122,6 +122,7 @@ export function transformHealthServiceProvider({
             await esClient.transform.getTransformStats({
               // @ts-expect-error `basic` query option not yet in @elastic/elasticsearch
               basic: true,
+              transform_id: '_all',
             })
           ).transforms as TransformStats[]
         ).filter((t) => transformIds.has(t.id));
diff --git a/x-pack/plugins/transform/server/routes/api/field_histograms/route_handler.ts b/x-pack/plugins/transform/server/routes/api/field_histograms/route_handler.ts
index 365813860462a..1d3c8183840fb 100644
--- a/x-pack/plugins/transform/server/routes/api/field_histograms/route_handler.ts
+++ b/x-pack/plugins/transform/server/routes/api/field_histograms/route_handler.ts
@@ -23,14 +23,16 @@ export const routeHandler: RequestHandler<
 
   try {
     const esClient = (await ctx.core).elasticsearch.client;
-    const resp = await fetchHistogramsForFields(
-      esClient.asCurrentUser,
-      dataViewTitle,
-      query,
-      fields,
-      samplerShardSize,
-      runtimeMappings
-    );
+    const resp = await fetchHistogramsForFields({
+      esClient: esClient.asCurrentUser,
+      arguments: {
+        indexPattern: dataViewTitle,
+        query,
+        fields,
+        samplerShardSize,
+        runtimeMappings,
+      },
+    });
 
     return res.ok({ body: resp });
   } catch (e) {
diff --git a/x-pack/plugins/translations/translations/fr-FR.json b/x-pack/plugins/translations/translations/fr-FR.json
index 00eb8d11923b2..5d71709681428 100644
--- a/x-pack/plugins/translations/translations/fr-FR.json
+++ b/x-pack/plugins/translations/translations/fr-FR.json
@@ -2525,8 +2525,8 @@
     "unifiedDocViewer.sourceViewer.errorMessage": "Impossible de récupérer les données pour le moment. Actualisez l'onglet et réessayez.",
     "unifiedDocViewer.sourceViewer.errorMessageTitle": "Une erreur s'est produite.",
     "unifiedDocViewer.sourceViewer.refresh": "Actualiser",
-    "textBasedLanguages.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
-    "textBasedLanguages.advancedSettings.enableESQLTitle": "Activer ES|QL",
+    "esql.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
+    "esql.advancedSettings.enableESQLTitle": "Activer ES|QL",
     "domDragDrop.announce.cancelled": "Mouvement annulé. {label} revenu à sa position initiale",
     "domDragDrop.announce.cancelledItem": "Mouvement annulé. {label} revenu au groupe {groupLabel} à la position {position}",
     "domDragDrop.announce.dropped.combineCompatible": "Combinaisons de {label} dans le {groupLabel} vers {dropLabel} dans le groupe {dropGroupLabel} à la position {dropPosition} dans le calque {dropLayerNumber}",
@@ -4253,9 +4253,6 @@
     "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "Sélectionnez un champ d'horodatage.",
     "indexPatternEditor.rollupDataView.createIndex.noMatchError": "Erreur de vue de données de cumul : doit correspondre à un index de cumul",
     "indexPatternEditor.rollupDataView.createIndex.tooManyMatchesError": "Erreur de vue de données de cumul : ne peut correspondre qu’à un index de cumul",
-    "indexPatternEditor.rollupDataView.warning.textParagraphOne": "Kibana propose un support bêta pour les vues de données basées sur les cumuls. Vous pourriez rencontrer des problèmes lors de l'utilisation de ces vues dans les recherches enregistrées, les visualisations et les tableaux de bord. Ils ne sont pas compatibles avec certaines fonctionnalités avancées, telles que Timelion et le Machine Learning.",
-    "indexPatternEditor.rollupDataView.warning.textParagraphTwo": "Vous pouvez mettre une vue de données de cumul en correspondance avec un index de cumul et zéro index régulier ou plus. Une vue de données de cumul dispose d'indicateurs, de champs, d'intervalles et d'agrégations limités. Un index de cumul se limite aux index disposant d'une configuration de tâche ou de plusieurs tâches avec des configurations compatibles.",
-    "indexPatternEditor.rollupIndexPattern.warning.title": "Fonctionnalité bêta",
     "indexPatternEditor.saved": "Enregistré",
     "indexPatternEditor.status.noSystemIndicesLabel": "Aucun flux de données, index ni alias d'index ne correspond à votre modèle d'indexation.",
     "indexPatternEditor.status.noSystemIndicesWithPromptLabel": "Aucun flux de données, index ni alias d'index ne correspond à votre modèle d'indexation.",
@@ -13313,7 +13310,6 @@
     "xpack.elasticAssistant.assistant.settings.knowledgeBasedSettings.knowledgeBaseDescription": "Pour commencer, configurez ELSER dans {machineLearning}. {seeDocs}",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.knowledgeBaseInstalledDescription": "Initialisé sur `{kbIndexPattern}`",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.latestAndRiskiestOpenAlertsLabel": "Envoyez à l'Assistant d'IA des informations sur vos {alertsCount} alertes ouvertes ou confirmées les plus récentes et les plus risquées.",
-    "xpack.elasticAssistant.assistant.technicalPreview.tooltipContent": "Les réponses des systèmes d'IA ne sont pas toujours tout à fait exactes. Pour en savoir plus sur la fonctionnalité d'assistant et son utilisation, consultez {documentationLink}.",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectAllFields": "Sélectionnez l'ensemble des {totalFields} champs",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectedFields": "{selected} champs sélectionnés",
     "xpack.elasticAssistant.dataAnonymizationEditor.stats.allowedStat.allowedTooltip": "{allowed} champs sur {total} dans ce contexte sont autorisés à être inclus dans la conversation",
@@ -13514,9 +13510,6 @@
     "xpack.elasticAssistant.knowledgeBase.setupError": "Erreur lors de la configuration de la base de connaissances",
     "xpack.elasticAssistant.knowledgeBase.statusError": "Erreur lors de la récupération du statut de la base de connaissances",
     "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.enterprisePrompt": "L'assistant d'IA d'Elastic n'est accessible qu'aux entreprises. Veuillez mettre votre licence à niveau pour bénéficier de cette fonctionnalité.",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt": "Avant toute chose, il faut configurer un Connecteur d'intelligence artificielle générative pour lancer cette expérience de chat ! Avec le connecteur d'IA générative, vous pourrez configurer l'accès à un service OpenAI ou à un service Amazon Bedrock, mais sachez que vous serez en mesure de déployer vos propres modèles au sein d'une instance Elastic Cloud et de les y utiliser à l'avenir... 😉",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral3Prompt": "Cliquez sur le bouton \"Ajouter un connecteur\" ci-dessous pour continuer la conversation.",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneralPrompt": "Bienvenue sur votre assistant d’intelligence artificielle Elastic. Je suis votre portail 100 % open-code vers votre vie Elastic. Avec le temps, je serai capable de répondre à vos questions et de vous apporter mon aide concernant l’ensemble de vos informations contenues dans Elastic, et bien plus encore. En attendant, j’espère que cet aperçu anticipé vous donnera une idée de ce que nous pouvons créer en travaillant ensemble, en toute transparence. À bientôt !",
     "xpack.embeddableEnhanced.actions.panelNotifications.manyDrilldowns": "Le panneau comporte {count} recherches",
     "xpack.embeddableEnhanced.actions.panelNotifications.oneDrilldown": "Le panneau comporte 1 recherche",
     "xpack.embeddableEnhanced.Drilldowns": "Explorations",
@@ -17675,7 +17668,6 @@
     "xpack.fleet.agentLogs.downloadLink": "télécharger",
     "xpack.fleet.agentLogs.logDisabledCallOutTitle": "La collecte de logs est désactivée",
     "xpack.fleet.agentLogs.logLevelSelectText": "Niveau du log",
-    "xpack.fleet.agentLogs.openInDiscoverUiLinkText": "Ouvrir dans Discover",
     "xpack.fleet.agentLogs.openInLogsUiLinkText": "Ouvrir dans Logs",
     "xpack.fleet.agentLogs.searchPlaceholderText": "Rechercher dans les logs…",
     "xpack.fleet.agentLogs.selectLogLevel.errorTitleText": "Erreur lors de la mise à jour du niveau de logging de l'agent",
@@ -18181,7 +18173,6 @@
     "xpack.fleet.epm.featuresLabel": "Fonctionnalités",
     "xpack.fleet.epm.InputTemplates.guideLink": "Guide de Fleet et d'Elastic Agent",
     "xpack.fleet.epm.InputTemplates.installCallout": "Installer l'intégration pour utiliser les configurations suivantes.",
-    "xpack.fleet.epm.InputTemplates.loadingErro": "Modèles d'entrée d'erreur",
     "xpack.fleet.epm.integrationPreference.beatsLabel": "Beats uniquement",
     "xpack.fleet.epm.integrationPreference.elasticAgentLabel": "Elastic Agent uniquement",
     "xpack.fleet.epm.integrationPreference.recommendedLabel": "Recommandé",
@@ -20827,7 +20818,6 @@
     "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "La vue de données doit contenir un champ {messageField}.",
     "xpack.infra.logSourceErrorPage.savedObjectNotFoundErrorMessage": "Impossible de localiser ce {savedObjectType} : {savedObjectId}",
     "xpack.infra.metadataEmbeddable.errorMessage": "Une erreur s'est produite lors du chargement des données. Essayez de {refetch} et d'ouvrir à nouveau les détails de l'hôte.",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError": "Il est possible que cette règle signale {matchedGroups} moins que prévu, car la requête de filtre comporte une correspondance pour {groupCount, plural, one {ce champ} other {ces champs}}. Pour en savoir plus, veuillez consulter {filteringAndGroupingLink}.",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.aggregationLabel": "{name} de l'agrégation",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.fieldLabel": "{name} du champ",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.filterLabel": "{name} du filtre KQL",
@@ -21402,7 +21392,6 @@
     "xpack.infra.metrics.alertFlyout.alertDescription": "Alerter lorsque l'agrégation d'indicateurs dépasse le seuil.",
     "xpack.infra.metrics.alertFlyout.alertOnGroupDisappear": "Me prévenir si un groupe cesse de signaler les données",
     "xpack.infra.metrics.alertFlyout.alertOnNoData": "M'alerter s'il n'y a aucune donnée",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError.docsLink": "les documents",
     "xpack.infra.metrics.alertFlyout.conditions": "Conditions",
     "xpack.infra.metrics.alertFlyout.createAlertPerHelpText": "Créer une alerte pour chaque valeur unique. Par exemple : \"host.id\" ou \"cloud.region\".",
     "xpack.infra.metrics.alertFlyout.createAlertPerText": "Regrouper les alertes par (facultatif)",
@@ -23431,7 +23420,7 @@
     "xpack.lens.shared.axisNameLabel": "Titre de l'axe",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "Étiquettes",
     "xpack.lens.shared.chartValueLabelVisibilityTooltip": "Si l'espace est insuffisant, les étiquettes de valeurs pourront être masquées",
-    "xpack.lens.shared.curveLabel": "Options visuelles",
+    "xpack.lens.shared.visualOptionsLabel": "Options visuelles",
     "xpack.lens.shared.legendAlignmentLabel": "Alignement",
     "xpack.lens.shared.legendInsideColumnsLabel": "Nombre de colonnes",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "Alignement",
@@ -29574,7 +29563,6 @@
     "xpack.observability.customThreshold.rule.aggregators.p99": "99e centile de {metric}",
     "xpack.observability.customThreshold.rule.aggregators.rate": "Taux de {metric}",
     "xpack.observability.customThreshold.rule.aggregators.sum": "Somme de {metric}",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError": "Il est possible que cette règle signale {matchedGroups} moins que prévu, car la requête de filtre comporte une correspondance pour {groupCount, plural, one {ce champ} other {ces champs}}. Pour en savoir plus, veuillez consulter {filteringAndGroupingLink}.",
     "xpack.observability.customThreshold.rule.alertFlyout.condition": "Condition {conditionNumber}",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "{name} de l'agrégation",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.filterLabel": "{name} du filtre KQL",
@@ -29699,7 +29687,6 @@
     "xpack.observability.customThreshold.rule.alertFlyout.aggregationText.sum": "Somme",
     "xpack.observability.customThreshold.rule.alertFlyout.alertDescription": "Alerter quand un type de données Observability atteint ou dépasse une valeur donnée.",
     "xpack.observability.customThreshold.rule.alertFlyout.alertOnGroupDisappear": "Me prévenir si un groupe cesse de signaler les données",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "les documents",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerHelpText": "Créer une alerte pour chaque valeur unique. Par exemple : \"host.id\" ou \"cloud.region\".",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerText": "Regrouper les alertes par (facultatif)",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquation": "Équation personnalisée",
@@ -32728,7 +32715,6 @@
     "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "{ errorCount, plural, =1 {Erreur rencontrée} other {Erreurs rencontrées}} :",
     "xpack.securitySolution.enrichment.noInvestigationEnrichment": "Aucun renseignement supplémentaire sur les menaces n'a été détecté sur la période sélectionnée. Sélectionnez une autre plage temporelle ou {link} afin de collecter des renseignements sur les menaces pour les détecter et les comparer.",
     "xpack.securitySolution.entityAnalytics.anomalies.moduleNotCompatibleTitle": "{incompatibleJobCount} {incompatibleJobCount, plural, =1 {tâche est actuellement indisponible} other {tâches sont actuellement indisponibles}}",
-    "xpack.securitySolution.entityAnalytics.riskDashboard.learnMore": "Découvrez plus d'informations sur les risques {riskEntity}",
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "Nom de {riskEntity}",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskLevelTitle": "Score de risque de {riskEntity}",
     "xpack.securitySolution.entityAnalytics.riskEngine.missingClusterPrivilege": "Privilèges de cluster manquants : {privileges}.",
@@ -36237,7 +36223,6 @@
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonAriaLabel": "Afficher le guide d'investigation",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonLabel": "Afficher le guide d'investigation",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideLoadingAriaLabel": "guide d'investigation",
-    "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideTitle": "Guide d'investigation",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataDescription": "Il n'existe pas de guide d'investigation pour cette règle.",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.previewMessage": "Le guide d'investigation n'est pas disponible dans l'aperçu des alertes.",
     "xpack.securitySolution.flyout.right.investigation.sectionTitle": "Investigation",
@@ -37059,7 +37044,6 @@
     "xpack.securitySolution.riskInformation.howOftenTitle": "À quelle fréquence le risque est-il calculé ?",
     "xpack.securitySolution.riskInformation.informationAriaLabel": "Informations",
     "xpack.securitySolution.riskInformation.introText": "L'analyse de risque des entités détecte les hôtes et les utilisateurs risqués à l'intérieur de votre environnement.",
-    "xpack.securitySolution.riskInformation.learnMore": "Découvrez plus d'informations sur les risques des entités",
     "xpack.securitySolution.riskInformation.levelHeader": "Niveau de risque",
     "xpack.securitySolution.riskInformation.riskCalculationStep1": "Uniquement les utilisateurs et les hôtes (entités) de scores associés aux alertes de détection non fermées.",
     "xpack.securitySolution.riskInformation.riskCalculationStep2": "Génère un score de catégorie \"Alerte\" en regroupant les alertes par identificateur d'entité, afin que les alertes ayant des scores de risque plus élevés contribuent davantage que les alertes dont les scores de risque sont moins élevés.",
@@ -40306,7 +40290,6 @@
     "xpack.synthetics.monitor.step.screenshot.unAvailable": "Image indisponible",
     "xpack.synthetics.monitor.step.viewErrorDetails": "Afficher les détails de l'erreur",
     "xpack.synthetics.monitor.step.viewPerformanceBreakdown": "Afficher la répartition des performances",
-    "xpack.synthetics.monitor.step.viewStepDetails": "Afficher les détails de l'étape",
     "xpack.synthetics.monitor.stepName.label": "Nom de l'étape",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom": "(X Mbits/s, Y Mbits/s, Z ms)",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom.label": "Personnalisé",
@@ -40485,7 +40468,6 @@
     "xpack.synthetics.monitorConfig.wait.error": "La durée d'attente n'est pas valide.",
     "xpack.synthetics.monitorConfig.wait.helpText": "Durée d'attente avant l'émission d'une autre requête d'écho ICMP si aucune réponse n'est reçue.",
     "xpack.synthetics.monitorConfig.wait.label": "Attendre",
-    "xpack.synthetics.monitorDetails.action.inspectDocument": "Inspecter le document",
     "xpack.synthetics.monitorDetails.availability.label": "Disponibilité",
     "xpack.synthetics.monitorDetails.brushArea.message": "Brosser une zone pour une plus haute fidélité",
     "xpack.synthetics.monitorDetails.complete.label": "Terminé",
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 7778a86693d86..769db053c18d0 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -2522,8 +2522,8 @@
     "unifiedDocViewer.sourceViewer.errorMessage": "現在データを取得できませんでした。タブを更新して、再試行してください。",
     "unifiedDocViewer.sourceViewer.errorMessageTitle": "エラーが発生しました",
     "unifiedDocViewer.sourceViewer.refresh": "更新",
-    "textBasedLanguages.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
-    "textBasedLanguages.advancedSettings.enableESQLTitle": "ES|QLを有効化",
+    "esql.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
+    "esql.advancedSettings.enableESQLTitle": "ES|QLを有効化",
     "domDragDrop.announce.cancelled": "移動がキャンセルされました。{label}は初期位置に戻りました",
     "domDragDrop.announce.cancelledItem": "移動がキャンセルされました。{label}は位置{position}の{groupLabel}グループに戻りました",
     "domDragDrop.announce.dropped.combineCompatible": "レイヤー{dropLayerNumber}の位置{dropPosition}で、グループ{groupLabel}の{label}をグループ{dropGroupLabel}の{dropLabel}と結合しました",
@@ -4245,9 +4245,6 @@
     "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "タイムスタンプフィールドを選択します。",
     "indexPatternEditor.rollupDataView.createIndex.noMatchError": "ロールアップデータビューエラー：ロールアップインデックスの 1 つと一致している必要があります",
     "indexPatternEditor.rollupDataView.createIndex.tooManyMatchesError": "ロールアップデータビューエラー：ロールアップインデックスの 1 つとのみ一致できます",
-    "indexPatternEditor.rollupDataView.warning.textParagraphOne": "Kibanaではロールアップに基づいてデータビューのデータサポートを提供します。保存された検索、可視化、ダッシュボードでこれらを使用すると問題が発生する場合があります。Timelionや機械学習などの一部の高度な機能ではサポートされていません。",
-    "indexPatternEditor.rollupDataView.warning.textParagraphTwo": "ロールアップデータビューは、1つのロールアップインデックスとゼロ以上の標準インデックスと一致させることができます。ロールアップデータビューでは、メトリック、フィールド、間隔、アグリゲーションが制限されています。ロールアップインデックスは、1つのジョブ構成があるインデックス、または複数のジョブと互換する構成があるインデックスに制限されています。",
-    "indexPatternEditor.rollupIndexPattern.warning.title": "ベータ機能",
     "indexPatternEditor.saved": "保存されました",
     "indexPatternEditor.status.noSystemIndicesLabel": "データストリーム、インデックス、またはインデックスエイリアスがインデックスパターンと一致しません。",
     "indexPatternEditor.status.noSystemIndicesWithPromptLabel": "データストリーム、インデックス、またはインデックスエイリアスがインデックスパターンと一致しません。",
@@ -13292,7 +13289,6 @@
     "xpack.elasticAssistant.assistant.settings.knowledgeBasedSettings.knowledgeBaseDescription": "{machineLearning}内でELSERを構成して開始します。{seeDocs}",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.knowledgeBaseInstalledDescription": "`{kbIndexPattern}`に初期化されました",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.latestAndRiskiestOpenAlertsLabel": "{alertsCount}件の最新の最もリスクが高い未解決または確認済みのアラートに関する情報をAI Assistantに送信します。",
-    "xpack.elasticAssistant.assistant.technicalPreview.tooltipContent": "AIシステムからの応答は、必ずしも完全に正確であるとは限りません。アシスタント機能とその使用方法の詳細については、{documentationLink}を参照してください。",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectAllFields": "すべての{totalFields}フィールドを選択",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectedFields": "選択した{selected}フィールド",
     "xpack.elasticAssistant.dataAnonymizationEditor.stats.allowedStat.allowedTooltip": "このコンテキストの{total}フィールドのうち{allowed}個を会話に含めることができます",
@@ -13493,9 +13489,6 @@
     "xpack.elasticAssistant.knowledgeBase.setupError": "ナレッジベースの設定エラー",
     "xpack.elasticAssistant.knowledgeBase.statusError": "ナレッジベースステータスの取得エラー",
     "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.enterprisePrompt": "Elastic AI Assistantはエンタープライズユーザーのみご利用いただけます。この機能を使用するには、ライセンスをアップグレードしてください。",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt": "まず最初に、このチャットエクスペリエンスを開始するために生成AIコネクターを設定する必要があります。生成AIコネクターを使用すると、OpenAI ServiceまたはAmazon Bedrockサービスへのアクセスを設定できます。しかし、将来的にはElastic Cloudインスタンス内に独自のモデルをデプロイして、それをここで使うことができるようになると考えてください... 😉",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral3Prompt": "会話を続けるには、以下の［コネクターの追加］ボタンをクリックしてください。",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneralPrompt": "Elastic AI Assistantへようこそ！Elasticを活用するための100%オープンコードのポータルです。いずれは、Elasticにあるすべての情報、そしてもっともっと多くのことについて、質問に答えたり、サポートを提供したりできるようになるでしょう。それまでは、この早期プレビューが、オープンな場で協力するときに生み出せるものの可能性を知るきっかけになることを願っています。どうぞよろしくお願いいたします。",
     "xpack.embeddableEnhanced.actions.panelNotifications.manyDrilldowns": "パネルには{count}個のドリルダウンがあります",
     "xpack.embeddableEnhanced.actions.panelNotifications.oneDrilldown": "パネルには 1 個のドリルダウンがあります",
     "xpack.embeddableEnhanced.Drilldowns": "ドリルダウン",
@@ -17653,7 +17646,6 @@
     "xpack.fleet.agentLogs.downloadLink": "ダウンロード",
     "xpack.fleet.agentLogs.logDisabledCallOutTitle": "ログ収集は無効です",
     "xpack.fleet.agentLogs.logLevelSelectText": "ログレベル",
-    "xpack.fleet.agentLogs.openInDiscoverUiLinkText": "Discoverで開く",
     "xpack.fleet.agentLogs.openInLogsUiLinkText": "ログで開く",
     "xpack.fleet.agentLogs.searchPlaceholderText": "ログを検索…",
     "xpack.fleet.agentLogs.selectLogLevel.errorTitleText": "エージェントログレベルの更新エラー",
@@ -18159,7 +18151,6 @@
     "xpack.fleet.epm.featuresLabel": "機能",
     "xpack.fleet.epm.InputTemplates.guideLink": "FleetおよびElasticエージェントガイド",
     "xpack.fleet.epm.InputTemplates.installCallout": "次の構成を使用するために、統合をインストールします。",
-    "xpack.fleet.epm.InputTemplates.loadingErro": "エラー入力テンプレート",
     "xpack.fleet.epm.integrationPreference.beatsLabel": "Beatsのみ",
     "xpack.fleet.epm.integrationPreference.elasticAgentLabel": "Elasticエージェントのみ",
     "xpack.fleet.epm.integrationPreference.recommendedLabel": "推奨",
@@ -20795,7 +20786,6 @@
     "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "データビューには{messageField}フィールドが必要です。",
     "xpack.infra.logSourceErrorPage.savedObjectNotFoundErrorMessage": "{savedObjectType}：{savedObjectId}が見つかりませんでした",
     "xpack.infra.metadataEmbeddable.errorMessage": "データの読み込みエラーが発生しました。{refetch}し、ホスト詳細をもう一度開いてください。",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError": "このルールは想定未満の{matchedGroups}に対してアラートを通知できます。フィルタークエリには{groupCount, plural, one {このフィールド} other {これらのフィールド}}の完全一致が含まれるためです。詳細については、{filteringAndGroupingLink}を参照してください。",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.aggregationLabel": "集約{name}",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.fieldLabel": "フィールド{name}",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.filterLabel": "KQLフィルター{name}",
@@ -21377,7 +21367,6 @@
     "xpack.infra.metrics.alertFlyout.alertDescription": "メトリックアグリゲーションがしきい値を超えたときにアラートを発行します。",
     "xpack.infra.metrics.alertFlyout.alertOnGroupDisappear": "グループがデータのレポートを停止する場合にアラートで通知する",
     "xpack.infra.metrics.alertFlyout.alertOnNoData": "データがない場合に通知する",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError.docsLink": "ドキュメント",
     "xpack.infra.metrics.alertFlyout.conditions": "条件",
     "xpack.infra.metrics.alertFlyout.createAlertPerHelpText": "すべての一意の値についてアラートを作成します。例：「host.id」または「cloud.region」。",
     "xpack.infra.metrics.alertFlyout.createAlertPerText": "アラートのグループ化条件（オプション）",
@@ -23412,7 +23401,7 @@
     "xpack.lens.shared.axisNameLabel": "軸のタイトル",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "ラベル",
     "xpack.lens.shared.chartValueLabelVisibilityTooltip": "十分なスペースがない場合、値ラベルが非表示になることがあります。",
-    "xpack.lens.shared.curveLabel": "視覚オプション",
+    "xpack.lens.shared.visualOptionsLabel": "視覚オプション",
     "xpack.lens.shared.legendAlignmentLabel": "アラインメント",
     "xpack.lens.shared.legendInsideColumnsLabel": "列の数",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "アラインメント",
@@ -29551,7 +29540,6 @@
     "xpack.observability.customThreshold.rule.aggregators.p99": "{metric}の99パーセンタイル",
     "xpack.observability.customThreshold.rule.aggregators.rate": "{metric}の比率",
     "xpack.observability.customThreshold.rule.aggregators.sum": "{metric}の合計",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError": "このルールは想定未満の{matchedGroups}に対してアラートを通知できます。フィルタークエリには{groupCount, plural, one {このフィールド} other {これらのフィールド}}の完全一致が含まれるためです。詳細については、{filteringAndGroupingLink}を参照してください。",
     "xpack.observability.customThreshold.rule.alertFlyout.condition": "条件{conditionNumber}",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "集約{name}",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.filterLabel": "KQLフィルター{name}",
@@ -29677,7 +29665,6 @@
     "xpack.observability.customThreshold.rule.alertFlyout.aggregationText.sum": "合計",
     "xpack.observability.customThreshold.rule.alertFlyout.alertDescription": "オブザーバビリティデータタイプが特定の値以上になったときにアラートを送信します。",
     "xpack.observability.customThreshold.rule.alertFlyout.alertOnGroupDisappear": "グループがデータのレポートを停止する場合にアラートで通知する",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "ドキュメント",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerHelpText": "すべての一意の値についてアラートを作成します。例：「host.id」または「cloud.region」。",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerText": "アラートのグループ化条件（オプション）",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquation": "カスタム等式",
@@ -32701,7 +32688,6 @@
     "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "次の{ errorCount, plural, other {件のエラー}}が発生しました：",
     "xpack.securitySolution.enrichment.noInvestigationEnrichment": "選択した期間内に追加の脅威情報が見つかりませんでした。別の時間枠、または{link}を試して、脅威の検出と照合のための脅威インテリジェンスを収集します。",
     "xpack.securitySolution.entityAnalytics.anomalies.moduleNotCompatibleTitle": "{incompatibleJobCount} {incompatibleJobCount, plural, other {件のジョブ}}が現在使用できません",
-    "xpack.securitySolution.entityAnalytics.riskDashboard.learnMore": "{riskEntity}リスクの詳細",
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "{riskEntity}名",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskLevelTitle": "{riskEntity}リスクレベル",
     "xpack.securitySolution.entityAnalytics.riskEngine.missingClusterPrivilege": "クラスター権限が不足しています：{privileges}。",
@@ -36212,7 +36198,6 @@
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonAriaLabel": "調査ガイドを表示",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonLabel": "調査ガイドを表示",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideLoadingAriaLabel": "調査ガイド",
-    "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideTitle": "調査ガイド",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataDescription": "このルールに関する調査ガイドはありません。",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.previewMessage": "調査ガイドはアラートプレビューでは使用できません。",
     "xpack.securitySolution.flyout.right.investigation.sectionTitle": "調査",
@@ -37034,7 +37019,6 @@
     "xpack.securitySolution.riskInformation.howOftenTitle": "リスクを計算する頻度",
     "xpack.securitySolution.riskInformation.informationAriaLabel": "情報",
     "xpack.securitySolution.riskInformation.introText": "Entity Risk Analyticsは、環境内のリスクのあるホストとユーザーを明らかにします。",
-    "xpack.securitySolution.riskInformation.learnMore": "エンティティリスクの詳細",
     "xpack.securitySolution.riskInformation.levelHeader": "リスクレベル",
     "xpack.securitySolution.riskInformation.riskCalculationStep1": "クローズされていない検出アラートに関連付けられたユーザーとホスト（エンティティ）のみスコア付けします。",
     "xpack.securitySolution.riskInformation.riskCalculationStep2": "エンティティID別にアラートを集約することで、「アラート」カテゴリスコアを生成します。リスクスコアが高いアラートがリスクスコアが低いアラートよりも大きく寄与するように設定されます。",
@@ -40283,7 +40267,6 @@
     "xpack.synthetics.monitor.step.screenshot.unAvailable": "画像がありません",
     "xpack.synthetics.monitor.step.viewErrorDetails": "エラー詳細を表示",
     "xpack.synthetics.monitor.step.viewPerformanceBreakdown": "パフォーマンスの内訳を表示",
-    "xpack.synthetics.monitor.step.viewStepDetails": "ステップ詳細を表示",
     "xpack.synthetics.monitor.stepName.label": "ステップ名",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom": "（X Mbps、Y Mbps、Z ms）",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom.label": "カスタム",
@@ -40462,7 +40445,6 @@
     "xpack.synthetics.monitorConfig.wait.error": "待機期間が無効です。",
     "xpack.synthetics.monitorConfig.wait.helpText": "応答が受信されない場合に、他のICMPエコーリクエストを発行する前に待機する期間。",
     "xpack.synthetics.monitorConfig.wait.label": "待機",
-    "xpack.synthetics.monitorDetails.action.inspectDocument": "ドキュメントを検査",
     "xpack.synthetics.monitorDetails.availability.label": "可用性",
     "xpack.synthetics.monitorDetails.brushArea.message": "信頼度を高めるためにエリアを精査",
     "xpack.synthetics.monitorDetails.complete.label": "完了",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 0257b4d2830a4..c08b0f3665765 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -2526,8 +2526,8 @@
     "unifiedDocViewer.sourceViewer.errorMessage": "当前无法获取数据。请刷新选项卡以重试。",
     "unifiedDocViewer.sourceViewer.errorMessageTitle": "发生错误",
     "unifiedDocViewer.sourceViewer.refresh": "刷新",
-    "textBasedLanguages.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
-    "textBasedLanguages.advancedSettings.enableESQLTitle": "启用 ES|QL",
+    "esql.advancedSettings.enableESQL.discussLinkText": "discuss.elastic.co/c/elastic-stack/kibana",
+    "esql.advancedSettings.enableESQLTitle": "启用 ES|QL",
     "domDragDrop.announce.cancelled": "移动已取消。{label} 将返回至其初始位置",
     "domDragDrop.announce.cancelledItem": "移动已取消。{label} 返回至 {groupLabel} 组中的位置 {position}",
     "domDragDrop.announce.dropped.combineCompatible": "已将组 {groupLabel} 中的 {label} 组合到图层 {dropLayerNumber} 的组 {dropGroupLabel} 中的位置 {dropPosition} 上的 {dropLabel}",
@@ -4254,9 +4254,6 @@
     "indexPatternEditor.requireTimestampOption.ValidationErrorMessage": "选择时间戳字段。",
     "indexPatternEditor.rollupDataView.createIndex.noMatchError": "汇总/打包数据视图错误：必须匹配一个汇总/打包索引",
     "indexPatternEditor.rollupDataView.createIndex.tooManyMatchesError": "汇总/打包数据视图错误：只能匹配一个汇总/打包索引",
-    "indexPatternEditor.rollupDataView.warning.textParagraphOne": "Kibana 基于汇总/打包为数据视图提供公测版支持。将这些视图用于已保存搜索、可视化以及仪表板可能会遇到问题。某些高级功能，如 Timelion 和 Machine Learning，不支持这些模式。",
-    "indexPatternEditor.rollupDataView.warning.textParagraphTwo": "可以根据一个汇总/打包索引和零个或更多常规索引匹配汇总/打包数据视图。汇总/打包数据视图的指标、字段、时间间隔和聚合有限。汇总/打包索引仅限于具有一个作业配置或多个作业配置兼容的索引。",
-    "indexPatternEditor.rollupIndexPattern.warning.title": "公测版功能",
     "indexPatternEditor.saved": "已保存",
     "indexPatternEditor.status.noSystemIndicesLabel": "没有数据流、索引或索引别名匹配您的索引模式。",
     "indexPatternEditor.status.noSystemIndicesWithPromptLabel": "没有数据流、索引或索引别名匹配您的索引模式。",
@@ -13318,7 +13315,6 @@
     "xpack.elasticAssistant.assistant.settings.knowledgeBasedSettings.knowledgeBaseDescription": "在 {machineLearning} 中配置 ELSER 以开始。{seeDocs}",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.knowledgeBaseInstalledDescription": "已初始化为 `{kbIndexPattern}`",
     "xpack.elasticAssistant.assistant.settings.knowledgeBaseSettings.latestAndRiskiestOpenAlertsLabel": "发送有关 {alertsCount} 个最新和风险最高的未决或已确认告警的 AI 助手信息。",
-    "xpack.elasticAssistant.assistant.technicalPreview.tooltipContent": "来自 AI 系统的响应可能不会始终完全准确。有关辅助功能及其用法的详细信息，请参阅 {documentationLink}。",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectAllFields": "选择所有 {totalFields} 个字段",
     "xpack.elasticAssistant.dataAnonymizationEditor.contextEditor.selectedFields": "已选定 {selected} 个字段",
     "xpack.elasticAssistant.dataAnonymizationEditor.stats.allowedStat.allowedTooltip": "允许在对话中包含此上下文中的 {allowed} 个（共 {total} 个）字段",
@@ -13519,9 +13515,6 @@
     "xpack.elasticAssistant.knowledgeBase.setupError": "设置知识库时出错",
     "xpack.elasticAssistant.knowledgeBase.statusError": "提取知识库状态时出错",
     "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.enterprisePrompt": "Elastic AI 助手仅对企业用户可用。请升级许可证以使用此功能。",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral2Prompt": "首先，我们需要设置生成式 AI 连接器以继续这种聊天体验！使用生成式 AI 连接器，您将能够配置 OpenAI 服务或 Amazon Bedrock 服务的访问权限，但请您相信，您将能够在 Elastic Cloud 实例中部署自己的模型，并于未来在此处使用那些模型……😉",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneral3Prompt": "接下来，单击下面的“添加连接器”按钮继续对话！",
-    "xpack.elasticAssistant.securityAssistant.content.prompts.welcome.welcomeGeneralPrompt": "欢迎使用 Elastic AI 助手！我是您的 100% 开放源代码门户，可帮助您熟练使用 Elastic。一段时间后，我将能够回答问题，并利用 Elastic 中的所有信息提供帮助等。到那时，我希望这个早期预览版本将为您打开思路，为我们的公开协作创造各种可能性。加油！",
     "xpack.embeddableEnhanced.actions.panelNotifications.manyDrilldowns": "面板有 {count} 个向下钻取",
     "xpack.embeddableEnhanced.actions.panelNotifications.oneDrilldown": "面板有 1 个向下钻取",
     "xpack.embeddableEnhanced.Drilldowns": "向下钻取",
@@ -17682,7 +17675,6 @@
     "xpack.fleet.agentLogs.downloadLink": "下载",
     "xpack.fleet.agentLogs.logDisabledCallOutTitle": "日志收集已禁用",
     "xpack.fleet.agentLogs.logLevelSelectText": "日志级别",
-    "xpack.fleet.agentLogs.openInDiscoverUiLinkText": "在 Discover 中打开",
     "xpack.fleet.agentLogs.openInLogsUiLinkText": "在日志中打开",
     "xpack.fleet.agentLogs.searchPlaceholderText": "搜索日志……",
     "xpack.fleet.agentLogs.selectLogLevel.errorTitleText": "更新代理日志记录级别时出错",
@@ -18188,7 +18180,6 @@
     "xpack.fleet.epm.featuresLabel": "功能",
     "xpack.fleet.epm.InputTemplates.guideLink": "Fleet 和 Elastic 代理指南",
     "xpack.fleet.epm.InputTemplates.installCallout": "安装集成以使用以下配置。",
-    "xpack.fleet.epm.InputTemplates.loadingErro": "输入模板出错",
     "xpack.fleet.epm.integrationPreference.beatsLabel": "仅限 Beats",
     "xpack.fleet.epm.integrationPreference.elasticAgentLabel": "仅限 Elastic 代理",
     "xpack.fleet.epm.integrationPreference.recommendedLabel": "推荐",
@@ -20834,7 +20825,6 @@
     "xpack.infra.logSourceConfiguration.missingMessageFieldErrorMessage": "数据视图必须包含 {messageField} 字段。",
     "xpack.infra.logSourceErrorPage.savedObjectNotFoundErrorMessage": "无法找到该{savedObjectType}：{savedObjectId}",
     "xpack.infra.metadataEmbeddable.errorMessage": "加载数据时出错。尝试{refetch}并再次打开主机详情。",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError": "此规则可能针对低于预期的 {matchedGroups} 告警，因为筛选查询包含{groupCount, plural, one {此字段} other {这些字段}}的匹配项。有关更多信息，请参阅 {filteringAndGroupingLink}。",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.aggregationLabel": "聚合 {name}",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.fieldLabel": "字段 {name}",
     "xpack.infra.metrics.alertFlyout.customEquationEditor.filterLabel": "KQL 筛选 {name}",
@@ -21409,7 +21399,6 @@
     "xpack.infra.metrics.alertFlyout.alertDescription": "当指标聚合超过阈值时告警。",
     "xpack.infra.metrics.alertFlyout.alertOnGroupDisappear": "组停止报告数据时提醒我",
     "xpack.infra.metrics.alertFlyout.alertOnNoData": "没数据时提醒我",
-    "xpack.infra.metrics.alertFlyout.alertPerRedundantFilterError.docsLink": "文档",
     "xpack.infra.metrics.alertFlyout.conditions": "条件",
     "xpack.infra.metrics.alertFlyout.createAlertPerHelpText": "为每个唯一值创建告警。例如：“host.id”或“cloud.region”。",
     "xpack.infra.metrics.alertFlyout.createAlertPerText": "告警分组依据（可选）",
@@ -23445,7 +23434,7 @@
     "xpack.lens.shared.axisNameLabel": "轴标题",
     "xpack.lens.shared.chartValueLabelVisibilityLabel": "标签",
     "xpack.lens.shared.chartValueLabelVisibilityTooltip": "如果没有足够的空间，可能会隐藏值标签",
-    "xpack.lens.shared.curveLabel": "视觉选项",
+    "xpack.lens.shared.visualOptionsLabel": "视觉选项",
     "xpack.lens.shared.legendAlignmentLabel": "对齐方式",
     "xpack.lens.shared.legendInsideColumnsLabel": "列数目",
     "xpack.lens.shared.legendInsideLocationAlignmentLabel": "对齐方式",
@@ -29591,7 +29580,6 @@
     "xpack.observability.customThreshold.rule.aggregators.p99": "{metric} 的第 99 个百分位",
     "xpack.observability.customThreshold.rule.aggregators.rate": "{metric} 的比率",
     "xpack.observability.customThreshold.rule.aggregators.sum": "{metric} 的总和",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError": "此规则可能针对低于预期的 {matchedGroups} 告警，因为筛选查询包含{groupCount, plural, one {此字段} other {这些字段}}的匹配项。有关更多信息，请参阅 {filteringAndGroupingLink}。",
     "xpack.observability.customThreshold.rule.alertFlyout.condition": "条件 {conditionNumber}",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.aggregationLabel": "聚合 {name}",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquationEditor.filterLabel": "KQL 筛选 {name}",
@@ -29717,7 +29705,6 @@
     "xpack.observability.customThreshold.rule.alertFlyout.aggregationText.sum": "求和",
     "xpack.observability.customThreshold.rule.alertFlyout.alertDescription": "任何 Observability 数据类型到达或超出给定值时告警。",
     "xpack.observability.customThreshold.rule.alertFlyout.alertOnGroupDisappear": "组停止报告数据时提醒我",
-    "xpack.observability.customThreshold.rule.alertFlyout.alertPerRedundantFilterError.docsLink": "文档",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerHelpText": "为每个唯一值创建告警。例如：“host.id”或“cloud.region”。",
     "xpack.observability.customThreshold.rule.alertFlyout.createAlertPerText": "告警分组依据（可选）",
     "xpack.observability.customThreshold.rule.alertFlyout.customEquation": "定制方程",
@@ -32745,7 +32732,6 @@
     "xpack.securitySolution.endpointResponseActions.actionError.errorMessage": "遇到以下{ errorCount, plural, other {错误}}：",
     "xpack.securitySolution.enrichment.noInvestigationEnrichment": "在选定时间范围内未发现其他威胁情报。请尝试不同时间范围，或 {link} 以收集威胁情报用于威胁检测和匹配。",
     "xpack.securitySolution.entityAnalytics.anomalies.moduleNotCompatibleTitle": "{incompatibleJobCount} 个{incompatibleJobCount, plural, other {作业}}当前不可用",
-    "xpack.securitySolution.entityAnalytics.riskDashboard.learnMore": "详细了解 {riskEntity} 风险",
     "xpack.securitySolution.entityAnalytics.riskDashboard.nameTitle": "{riskEntity}名称",
     "xpack.securitySolution.entityAnalytics.riskDashboard.riskLevelTitle": "{riskEntity} 风险级别",
     "xpack.securitySolution.entityAnalytics.riskEngine.missingClusterPrivilege": "缺少集群权限：{privileges}。",
@@ -36255,7 +36241,6 @@
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonAriaLabel": "显示调查指南",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideButtonLabel": "显示调查指南",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideLoadingAriaLabel": "调查指南",
-    "xpack.securitySolution.flyout.right.investigation.investigationGuide.investigationGuideTitle": "调查指南",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.noDataDescription": "没有适用于此规则的调查指南。",
     "xpack.securitySolution.flyout.right.investigation.investigationGuide.previewMessage": "调查指南在告警预览中不可用。",
     "xpack.securitySolution.flyout.right.investigation.sectionTitle": "调查",
@@ -37077,7 +37062,6 @@
     "xpack.securitySolution.riskInformation.howOftenTitle": "多久计算一次风险？",
     "xpack.securitySolution.riskInformation.informationAriaLabel": "信息",
     "xpack.securitySolution.riskInformation.introText": "实体风险分析将显示您的环境中存在的有风险主机和用户。",
-    "xpack.securitySolution.riskInformation.learnMore": "详细了解实体风险",
     "xpack.securitySolution.riskInformation.levelHeader": "风险级别",
     "xpack.securitySolution.riskInformation.riskCalculationStep1": "仅对与尚未关闭的检测告警关联的用户和主机（实体）评分。",
     "xpack.securitySolution.riskInformation.riskCalculationStep2": "通过按实体标识符聚合告警来生成“告警”类别分数，从而使风险分数高的告警贡献高于风险分数低的告警。",
@@ -40329,7 +40313,6 @@
     "xpack.synthetics.monitor.step.screenshot.unAvailable": "图像不可用",
     "xpack.synthetics.monitor.step.viewErrorDetails": "查看错误详情",
     "xpack.synthetics.monitor.step.viewPerformanceBreakdown": "查看性能细目",
-    "xpack.synthetics.monitor.step.viewStepDetails": "查看步骤详情",
     "xpack.synthetics.monitor.stepName.label": "步骤名称",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom": "（X Mbps，Y Mbps，Z ms）",
     "xpack.synthetics.monitorAddEdit.throttling.connectionProfile.custom.label": "定制",
@@ -40508,7 +40491,6 @@
     "xpack.synthetics.monitorConfig.wait.error": "等待持续时间无效。",
     "xpack.synthetics.monitorConfig.wait.helpText": "如果未收到响应，在发出另一个 ICMP 回显请求之前要等待的时长。",
     "xpack.synthetics.monitorConfig.wait.label": "等待",
-    "xpack.synthetics.monitorDetails.action.inspectDocument": "检查文档",
     "xpack.synthetics.monitorDetails.availability.label": "可用性",
     "xpack.synthetics.monitorDetails.brushArea.message": "轻刷某个区域以提高保真度",
     "xpack.synthetics.monitorDetails.complete.label": "已完成",
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.test.tsx
index bf5f487cfafa9..743c475a287b3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.test.tsx
@@ -7,6 +7,7 @@
 
 import React from 'react';
 import { render } from '@testing-library/react';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { __IntlProvider as IntlProvider } from '@kbn/i18n-react';
 import { AlertSummaryWidget } from './alert_summary_widget';
 import { AlertSummaryWidgetDependencies, AlertSummaryWidgetProps } from './types';
@@ -18,10 +19,6 @@ import {
 } from './components/constants';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 
-jest.mock('@kbn/kibana-react-plugin/public/ui_settings/use_ui_setting', () => ({
-  useUiSetting: jest.fn().mockImplementation(() => true),
-}));
-
 jest.mock('../../hooks/use_load_alert_summary', () => ({
   useLoadAlertSummary: jest.fn().mockReturnValue({
     alertSummary: {
@@ -41,6 +38,7 @@ const useLoadAlertSummaryMock = useLoadAlertSummary as jest.Mock;
 
 const dependencies: AlertSummaryWidgetDependencies['dependencies'] = {
   charts: chartPluginMock.createStartContract(),
+  uiSettings: uiSettingsServiceMock.createStartContract(),
 };
 
 describe('AlertSummaryWidget', () => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.tsx
index 3e6b379934398..b3ed78ba43a40 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/alert_summary_widget.tsx
@@ -6,6 +6,7 @@
  */
 
 import React, { useEffect } from 'react';
+import { getTimeZone } from '@kbn/visualization-utils';
 import { useLoadAlertSummary } from '../../hooks/use_load_alert_summary';
 import { AlertSummaryWidgetProps } from '.';
 import {
@@ -26,7 +27,7 @@ export const AlertSummaryWidget = ({
   hideChart,
   hideStats,
   onLoaded,
-  dependencies: { charts },
+  dependencies: { charts, uiSettings },
 }: AlertSummaryWidgetProps & AlertSummaryWidgetDependencies) => {
   const {
     alertSummary: { activeAlertCount, activeAlerts, recoveredAlertCount },
@@ -63,6 +64,7 @@ export const AlertSummaryWidget = ({
         chartProps={chartProps}
         dateFormat={timeRange.dateFormat}
         recoveredAlertCount={recoveredAlertCount}
+        timeZone={getTimeZone(uiSettings)}
         hideChart={hideChart}
         hideStats={hideStats}
         dependencyProps={dependencyProps}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.test.tsx
index 0f9a7fae4f3a1..376d0a6599bf2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.test.tsx
@@ -29,6 +29,7 @@ describe('AlertSummaryWidgetFullSize', () => {
         <AlertSummaryWidgetFullSize
           chartProps={mockedChartProps}
           dependencyProps={dependencyProps}
+          timeZone="UTC"
           {...mockedAlertSummaryResponse}
           {...props}
         />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.tsx
index 19713b02b6faa..cc695fe51aa68 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/components/alert_summary_widget_full_size.tsx
@@ -28,6 +28,7 @@ export interface AlertSummaryWidgetFullSizeProps {
   activeAlerts: Alert[];
   chartProps?: ChartProps;
   recoveredAlertCount: number;
+  timeZone: string;
   dateFormat?: string;
   hideChart?: boolean;
   hideStats?: boolean;
@@ -40,6 +41,7 @@ export const AlertSummaryWidgetFullSize = ({
   chartProps: { themeOverrides, onBrushEnd } = {},
   dateFormat,
   recoveredAlertCount,
+  timeZone,
   hideChart,
   hideStats,
   dependencyProps: { baseTheme },
@@ -134,6 +136,7 @@ export const AlertSummaryWidgetFullSize = ({
                 point: { visible: false },
               }}
               curve={CurveType.CURVE_MONOTONE_X}
+              timeZone={timeZone}
             />
           </Chart>
         </div>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/types.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/types.ts
index 21e663f511b97..2393ff9c16a64 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_summary_widget/types.ts
@@ -7,6 +7,7 @@
 
 import type { BrushEndListener, PartialTheme, SettingsProps, Theme } from '@elastic/charts';
 import { estypes } from '@elastic/elasticsearch';
+import { IUiSettingsClient } from '@kbn/core-ui-settings-browser';
 import { AlertStatus, ValidFeatureId } from '@kbn/rule-data-utils';
 import { ChartsPluginStart } from '@kbn/charts-plugin/public';
 
@@ -37,6 +38,7 @@ interface AlertsCount {
 export interface AlertSummaryWidgetDependencies {
   dependencies: {
     charts: ChartsPluginStart;
+    uiSettings: IUiSettingsClient;
   };
 }
 
diff --git a/x-pack/plugins/triggers_actions_ui/public/mocks.ts b/x-pack/plugins/triggers_actions_ui/public/mocks.ts
index e6d98240d2c5f..7fccc65a2b6b6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/mocks.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/mocks.ts
@@ -8,6 +8,7 @@
 import { RuleAction } from '@kbn/alerting-plugin/common';
 import { chartPluginMock } from '@kbn/charts-plugin/public/mocks';
 import { TypeRegistry } from '@kbn/alerts-ui-shared/src/common/type_registry';
+import { uiSettingsServiceMock } from '@kbn/core/public/mocks';
 import { getAlertsTableDefaultAlertActionsLazy } from './common/get_alerts_table_default_row_actions';
 import type { TriggersAndActionsUIPublicPluginStart } from './plugin';
 
@@ -146,6 +147,7 @@ function createStartMock(): TriggersAndActionsUIPublicPluginStart {
     getAlertSummaryWidget: (props) => {
       const dependencies: AlertSummaryWidgetDependencies['dependencies'] = {
         charts: chartPluginMock.createStartContract(),
+        uiSettings: uiSettingsServiceMock.createStartContract(),
       };
       return getAlertSummaryWidgetLazy({ ...props, dependencies });
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/plugin.ts b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
index f3fd01e66856f..514f77310bb0a 100644
--- a/x-pack/plugins/triggers_actions_ui/public/plugin.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/plugin.ts
@@ -448,7 +448,7 @@ export class Plugin
     };
   }
 
-  public start(_: CoreStart, plugins: PluginsStart): TriggersAndActionsUIPublicPluginStart {
+  public start(core: CoreStart, plugins: PluginsStart): TriggersAndActionsUIPublicPluginStart {
     import('./application/sections/alerts_table/configuration').then(
       ({ createGenericAlertsTableConfigurations }) => {
         createGenericAlertsTableConfigurations(plugins.fieldFormats).forEach((c) =>
@@ -562,6 +562,7 @@ export class Plugin
       getAlertSummaryWidget: (props: AlertSummaryWidgetProps) => {
         const dependencies: AlertSummaryWidgetDependencies['dependencies'] = {
           charts: plugins.charts,
+          uiSettings: core.uiSettings,
         };
         return getAlertSummaryWidgetLazy({ ...props, dependencies });
       },
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
index 74d96112e7abb..c08720991238a 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/lib/time_series_query.ts
@@ -111,7 +111,7 @@ export async function timeSeriesQuery(
   const includeConditionInQuery = !!conditionParams;
 
   const logPrefix = 'indexThreshold timeSeriesQuery: callCluster';
-  logger.debug(`${logPrefix} call: ${JSON.stringify(esQuery)}`);
+  logger.debug(() => `${logPrefix} call: ${JSON.stringify(esQuery)}`);
   let esResult: estypes.SearchResponse<unknown>;
   // note there are some commented out console.log()'s below, which are left
   // in, as they are VERY useful when debugging these queries; debug logging
@@ -127,7 +127,7 @@ export async function timeSeriesQuery(
   }
 
   // console.log('time_series_query.ts response\n', JSON.stringify(esResult, null, 4));
-  logger.debug(`${logPrefix} result: ${JSON.stringify(esResult)}`);
+  logger.debug(() => `${logPrefix} result: ${JSON.stringify(esResult)}`);
   return getResultFromEs({
     isCountAgg,
     isGroupAgg,
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
index bf45b702a84ec..2b18bd4567243 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/fields.ts
@@ -41,7 +41,7 @@ export function createFieldsRoute(logger: Logger, router: IRouter, baseRoute: st
     req: KibanaRequest<unknown, unknown, RequestBody>,
     res: KibanaResponseFactory
   ): Promise<IKibanaResponse> {
-    logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
+    logger.debug(() => `route ${path} request: ${JSON.stringify(req.body)}`);
 
     let rawFields: RawFields;
 
@@ -63,7 +63,7 @@ export function createFieldsRoute(logger: Logger, router: IRouter, baseRoute: st
 
     const result = { fields: getFieldsFromRawFields(rawFields) };
 
-    logger.debug(`route ${path} response: ${JSON.stringify(result)}`);
+    logger.debug(() => `route ${path} response: ${JSON.stringify(result)}`);
     return res.ok({ body: result });
   }
 }
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
index 54d18dbb5d305..a75853be1a3e4 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/indices.ts
@@ -46,7 +46,7 @@ export function createIndicesRoute(logger: Logger, router: IRouter, baseRoute: s
   ): Promise<IKibanaResponse> {
     const pattern = req.body.pattern;
     const esClient = (await ctx.core).elasticsearch.client.asCurrentUser;
-    logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
+    logger.debug(() => `route ${path} request: ${JSON.stringify(req.body)}`);
 
     if (pattern.trim() === '') {
       return res.ok({ body: { indices: [] } });
diff --git a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
index 1fb7f2217d11b..24a0eaf13f771 100644
--- a/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/data/routes/time_series_query.ts
@@ -39,7 +39,7 @@ export function createTimeSeriesQueryRoute(
     req: KibanaRequest<unknown, unknown, TimeSeriesQuery>,
     res: KibanaResponseFactory
   ): Promise<IKibanaResponse> {
-    logger.debug(`route ${path} request: ${JSON.stringify(req.body)}`);
+    logger.debug(() => `route ${path} request: ${JSON.stringify(req.body)}`);
 
     const esClient = (await ctx.core).elasticsearch.client.asCurrentUser;
     const result = await timeSeriesQuery({
@@ -48,7 +48,7 @@ export function createTimeSeriesQueryRoute(
       query: req.body,
     });
 
-    logger.debug(`route ${path} response: ${JSON.stringify(result)}`);
+    logger.debug(() => `route ${path} response: ${JSON.stringify(result)}`);
     return res.ok({ body: result });
   }
 }
diff --git a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
index 1ea2ce9eb04be..679026ab56f2b 100644
--- a/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
+++ b/x-pack/plugins/triggers_actions_ui/server/routes/health.ts
@@ -36,7 +36,7 @@ export function createHealthRoute(
   ): Promise<IKibanaResponse> {
     const result = { isAlertsAvailable };
 
-    logger.debug(`route ${path} response: ${JSON.stringify(result)}`);
+    logger.debug(() => `route ${path} response: ${JSON.stringify(result)}`);
     return res.ok({ body: result });
   }
 }
diff --git a/x-pack/plugins/triggers_actions_ui/tsconfig.json b/x-pack/plugins/triggers_actions_ui/tsconfig.json
index 363c6bc1b2312..abcf5c1e5bf87 100644
--- a/x-pack/plugins/triggers_actions_ui/tsconfig.json
+++ b/x-pack/plugins/triggers_actions_ui/tsconfig.json
@@ -68,7 +68,9 @@
     "@kbn/controls-plugin",
     "@kbn/search-types",
     "@kbn/alerting-comparators",
-    "@kbn/alerting-types"
+    "@kbn/alerting-types",
+    "@kbn/visualization-utils",
+    "@kbn/core-ui-settings-browser"
   ],
   "exclude": ["target/**/*"]
 }
diff --git a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/default/flyout.tsx b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/default/flyout.tsx
index 6ec05b0c4fc99..01cda109cad12 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/default/flyout.tsx
+++ b/x-pack/plugins/upgrade_assistant/public/application/components/es_deprecations/deprecation_types/default/flyout.tsx
@@ -72,9 +72,11 @@ export const DefaultDeprecationFlyout = ({
       <EuiFlyoutBody>
         <EuiText>
           <p className="eui-textBreakWord">{details}</p>
-          <p>
-            <DeprecationFlyoutLearnMoreLink documentationUrl={url} />
-          </p>
+          {url && (
+            <p>
+              <DeprecationFlyoutLearnMoreLink documentationUrl={url} />
+            </p>
+          )}
         </EuiText>
       </EuiFlyoutBody>
       <EuiFlyoutFooter>
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/health_indicators.ts b/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/health_indicators.ts
index 00a3cba013334..cad6e73a092a1 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/health_indicators.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/__fixtures__/health_indicators.ts
@@ -19,6 +19,11 @@ export const diskIndicatorGreen: estypes.HealthReportDiskIndicator = {
   },
 };
 
+export const diskIndicatorUnknown: estypes.HealthReportDiskIndicator = {
+  status: 'unknown',
+  symptom: 'No disk usage data.',
+};
+
 export const diskIndicatorRed: estypes.HealthReportDiskIndicator = {
   status: 'red',
   symptom: 'The cluster does not have enough available disk space.',
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
index 7b4bb04641648..3a373cbffbfe7 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.test.ts
@@ -36,6 +36,24 @@ describe('getHealthIndicators', () => {
     expect(result).toEqual([]);
   });
 
+  it('returns unknown indicators', async () => {
+    esClient.asCurrentUser.healthReport.mockResponse({
+      cluster_name: 'mock',
+      indicators: {
+        disk: healthIndicatorsMock.diskIndicatorUnknown,
+        // @ts-ignore
+        shards_capacity: healthIndicatorsMock.shardCapacityIndicatorGreen,
+      },
+    });
+
+    const result = await getHealthIndicators(esClient);
+    expect(result[0]).toEqual(
+      expect.objectContaining({
+        details: 'No disk usage data.',
+      })
+    );
+  });
+
   it('returns unhealthy shards_capacity indicator', async () => {
     esClient.asCurrentUser.healthReport.mockResponse({
       cluster_name: 'mock',
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
index d343aca07f9f6..05fc4f666f7ba 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_deprecations_status.ts
@@ -22,6 +22,18 @@ export function getShardCapacityDeprecationInfo({
   details: any;
   symptom: any;
 }) {
+  // When we dont have a details field for our indicator, we can only report
+  // the symptom to the user given that's the only information about the deprecation
+  // we have.
+  if (!details) {
+    return {
+      details: symptom,
+      message: symptom,
+      url: null,
+      resolveDuringUpgrade: false,
+    };
+  }
+
   const causes = [];
   if (details.indices_with_readonly_block > 0) {
     causes.push(
diff --git a/x-pack/test/accessibility/apps/group1/dashboard_links.ts b/x-pack/test/accessibility/apps/group1/dashboard_links.ts
index 3ec6df1b880ca..766de0e3d80f3 100644
--- a/x-pack/test/accessibility/apps/group1/dashboard_links.ts
+++ b/x-pack/test/accessibility/apps/group1/dashboard_links.ts
@@ -49,7 +49,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('Empty links editor flyout', async () => {
       await dashboardAddPanel.clickEditorMenuButton();
-      await dashboardAddPanel.clickAddNewEmbeddableLink('links');
+      await dashboardAddPanel.clickAddNewPanelFromUIActionLink('Links');
       await a11y.testAppSnapshot();
     });
 
diff --git a/x-pack/test/accessibility/apps/group3/ml_embeddables_in_dashboard.ts b/x-pack/test/accessibility/apps/group3/ml_embeddables_in_dashboard.ts
index 69a95822be3af..998fe73a98403 100644
--- a/x-pack/test/accessibility/apps/group3/ml_embeddables_in_dashboard.ts
+++ b/x-pack/test/accessibility/apps/group3/ml_embeddables_in_dashboard.ts
@@ -81,8 +81,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     for (const testData of testDataList) {
-      // FLAKY: https://github.com/elastic/kibana/issues/183196
-      describe.skip(testData.suiteSuffix, function () {
+      describe(testData.suiteSuffix, function () {
         before(async () => {
           await ml.api.createAndRunAnomalyDetectionLookbackJob(
             testData.jobConfig,
@@ -98,6 +97,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         it('can open job selection flyout', async () => {
           await PageObjects.dashboard.clickCreateDashboardPrompt();
           await ml.dashboardEmbeddables.assertDashboardIsEmpty();
+          // FIXME remove sleep when https://github.com/elastic/kibana/issues/187587 if fixed
+          await PageObjects.common.sleep(3000);
           await ml.dashboardEmbeddables.openAnomalyJobSelectionFlyout('ml_anomaly_charts');
           await a11y.testAppSnapshot();
         });
diff --git a/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts b/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
index 00bcffd553af1..77dd859bed4d9 100644
--- a/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
+++ b/x-pack/test/api_integration/apis/cloud_security_posture/helper.ts
@@ -145,6 +145,76 @@ export async function createPackagePolicy(
   return postPackageResponse.item;
 }
 
+export async function createCloudDefendPackagePolicy(
+  supertest: SuperTestAgent,
+  agentPolicyId: string,
+  roleAuthc?: RoleCredentials,
+  internalRequestHeader?: { 'x-elastic-internal-origin': string; 'kbn-xsrf': string }
+) {
+  const version = '1.2.5';
+  const installationPayload = {
+    policy_id: agentPolicyId,
+    package: {
+      name: 'cloud_defend',
+      version,
+    },
+    name: 'cloud_defend-1',
+    description: '',
+    namespace: 'default',
+    inputs: {
+      'cloud_defend-cloud_defend/control': {
+        enabled: true,
+        vars: {
+          configuration:
+            'process:\n  selectors:\n    - name: allProcesses\n      operation: [fork, exec]\n  responses:\n    - match: [allProcesses]\n      actions: [log]\nfile:\n  selectors:\n    - name: executableChanges\n      operation: [createExecutable, modifyExecutable]\n  responses:\n    - match: [executableChanges]\n      actions: [alert]\n',
+        },
+        streams: {
+          'cloud_defend.alerts': {
+            enabled: true,
+          },
+          'cloud_defend.file': {
+            enabled: true,
+          },
+          'cloud_defend.heartbeat': {
+            enabled: true,
+            vars: {
+              period: '30m',
+            },
+          },
+          'cloud_defend.metrics': {
+            enabled: true,
+            vars: {
+              period: '24h',
+            },
+          },
+          'cloud_defend.process': {
+            enabled: true,
+          },
+        },
+      },
+    },
+    force: true,
+  };
+
+  const { body: postPackageResponse } =
+    roleAuthc && internalRequestHeader
+      ? await supertest
+          .post(`/api/fleet/package_policies`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+          .set(internalRequestHeader)
+          .set(roleAuthc.apiKeyHeader)
+          .send(installationPayload)
+          .expect(200)
+      : await supertest
+          .post(`/api/fleet/package_policies`)
+          .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+          .set('kbn-xsrf', 'xxxx')
+          .send(installationPayload)
+          .expect(200);
+
+  return postPackageResponse.item;
+}
+
 export const createUser = async (security: SecurityService, userName: string, roleName: string) => {
   await security.user.create(userName, {
     password: 'changeme',
diff --git a/x-pack/test/api_integration/apis/management/index_management/component_templates.ts b/x-pack/test/api_integration/apis/management/index_management/component_templates.ts
index bb37e04941b78..fb57f0813d843 100644
--- a/x-pack/test/api_integration/apis/management/index_management/component_templates.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/component_templates.ts
@@ -81,8 +81,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('all component templates', () => {
         it('should return an array of component templates', async () => {
-          const { body: componentTemplates } = await getAllComponentTemplates().expect(200);
-
+          const { status, body: componentTemplates } = await getAllComponentTemplates();
+          expect(status).to.eql(200);
           const testComponentTemplate = componentTemplates.find(
             ({ name }: { name: string }) => name === COMPONENT_NAME
           );
@@ -101,8 +101,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('one component template', () => {
         it('should return a single component template', async () => {
-          const { body } = await getOneComponentTemplate(COMPONENT_NAME).expect(200);
-
+          const { status, body } = await getOneComponentTemplate(COMPONENT_NAME);
+          expect(status).to.eql(200);
           expect(body).to.eql({
             name: COMPONENT_NAME,
             ...COMPONENT,
@@ -130,7 +130,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should create a component template', async () => {
-        const { body } = await createComponentTemplate(COMPONENT_NAME, {
+        const { status, body } = await createComponentTemplate(COMPONENT_NAME, {
           version: 1,
           template: {
             settings: {
@@ -163,22 +163,23 @@ export default function ({ getService }: FtrProviderContext) {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(200);
-
+        });
+        expect(status).to.eql(200);
         expect(body).to.eql({
           acknowledged: true,
         });
       });
 
       it('should create a component template with only required fields', async () => {
-        const { body } = await createComponentTemplate(REQUIRED_FIELDS_COMPONENT_NAME, {
+        const { status, body } = await createComponentTemplate(REQUIRED_FIELDS_COMPONENT_NAME, {
           // Excludes version and _meta fields
           template: {},
           _kbnMeta: {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(200);
+        });
+        expect(status).to.eql(200);
 
         expect(body).to.eql({
           acknowledged: true,
@@ -186,13 +187,14 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should not allow creation of a component template with the same name of an existing one', async () => {
-        const { body } = await createComponentTemplate(COMPONENT_NAME, {
+        const { status, body } = await createComponentTemplate(COMPONENT_NAME, {
           template: {},
           _kbnMeta: {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(409);
+        });
+        expect(status).to.eql(409);
 
         expect(body).to.eql({
           statusCode: 409,
@@ -239,29 +241,30 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should allow an existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate(COMPONENT_NAME, {
+        const { status, body } = await updateComponentTemplate(COMPONENT_NAME, {
           ...COMPONENT,
           version: 1,
           _kbnMeta: {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(200);
-
+        });
+        expect(status).to.eql(200);
         expect(body).to.eql({
           acknowledged: true,
         });
       });
 
       it('should not allow a non-existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate('component_does_not_exist', {
+        const { status, body } = await updateComponentTemplate('component_does_not_exist', {
           ...COMPONENT,
           version: 1,
           _kbnMeta: {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(404);
+        });
+        expect(status).to.eql(404);
 
         expect(body).to.eql({
           statusCode: 404,
@@ -297,18 +300,17 @@ export default function ({ getService }: FtrProviderContext) {
           log.debug('[Setup error] Error creating component template');
           throw err;
         }
-        const { body } = await updateComponentTemplate(deprecatedTemplateName, {
+        const { status, body } = await updateComponentTemplate(deprecatedTemplateName, {
           ...deprecatedTemplate,
           version: 1,
           _kbnMeta: {
             usedBy: [],
             isManaged: false,
           },
-        }).expect(200);
-
-        expect(body).to.eql({
-          acknowledged: true,
         });
+        expect(status).to.eql(200);
+
+        expect(body).to.eql({ acknowledged: true });
       });
     });
 
@@ -342,7 +344,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should delete a component template', async () => {
         const { name } = componentTemplateA;
-        const { body } = await deleteComponentTemplate(name).expect(200);
+        const { status, body } = await deleteComponentTemplate(name);
+        expect(status).to.eql(200);
 
         expect(body).to.eql({
           itemsDeleted: [name],
@@ -355,10 +358,10 @@ export default function ({ getService }: FtrProviderContext) {
         const { name: componentTemplate2Name } = componentTemplateC;
 
         const {
+          status,
           body: { itemsDeleted, errors },
-        } = await deleteComponentTemplate(
-          `${componentTemplate1Name},${componentTemplate2Name}`
-        ).expect(200);
+        } = await deleteComponentTemplate(`${componentTemplate1Name},${componentTemplate2Name}`);
+        expect(status).to.eql(200);
 
         expect(errors).to.eql([]);
 
@@ -372,9 +375,10 @@ export default function ({ getService }: FtrProviderContext) {
         const COMPONENT_DOES_NOT_EXIST = 'component_does_not_exist';
         const { name: componentTemplateName } = componentTemplateD;
 
-        const { body } = await deleteComponentTemplate(
+        const { status, body } = await deleteComponentTemplate(
           `${componentTemplateName},${COMPONENT_DOES_NOT_EXIST}`
-        ).expect(200);
+        );
+        expect(status).to.eql(200);
         expect(body.itemsDeleted).to.eql([componentTemplateName]);
         expect(body.errors[0].name).to.eql(COMPONENT_DOES_NOT_EXIST);
 
@@ -452,7 +456,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('without datastreams', () => {
         it('should return no datastreams', async () => {
-          const { body } = await getComponentTemplateDatastreams(COMPONENT_NAME).expect(200);
+          const { status, body } = await getComponentTemplateDatastreams(COMPONENT_NAME);
+          expect(status).to.eql(200);
 
           expect(body).to.eql({ data_streams: [] });
         });
@@ -463,7 +468,8 @@ export default function ({ getService }: FtrProviderContext) {
           await addDatastream(DATASTREAM_NAME, CACHE_TEMPLATES);
         });
         it('should return datastreams', async () => {
-          const { body } = await getComponentTemplateDatastreams(COMPONENT_NAME).expect(200);
+          const { status, body } = await getComponentTemplateDatastreams(COMPONENT_NAME);
+          expect(status).to.eql(200);
 
           expect(body).to.eql({ data_streams: ['logs-test-component-template-default'] });
         });
diff --git a/x-pack/test/api_integration/apis/management/index_management/enrich_policies.ts b/x-pack/test/api_integration/apis/management/index_management/enrich_policies.ts
index 9fe4bd67baceb..4cdb5da7a937b 100644
--- a/x-pack/test/api_integration/apis/management/index_management/enrich_policies.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/enrich_policies.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from 'expect';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 import { enrichPoliciesApi } from './lib/enrich_policies.api';
@@ -43,9 +43,10 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should list all policies', async () => {
-      const { body } = await getAllEnrichPolicies().expect(200);
+      const { status, body } = await getAllEnrichPolicies();
+      expect(status).to.eql(200);
 
-      expect(body).toStrictEqual([
+      expect(body).to.eql([
         {
           enrichFields: ['firstName'],
           matchField: 'email',
@@ -57,7 +58,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should be able to execute a policy', async () => {
-      await executeEnrichPolicy(POLICY_NAME).expect(200);
+      const { status } = await executeEnrichPolicy(POLICY_NAME);
+      expect(status).to.eql(200);
 
       // Wait for a little bit for the policy to be executed, so that it can
       // be deleted in the next test.
@@ -69,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       // In the odd case that the policy is somehow still being executed, the delete
       // method might return a 429 so we need to account for that.
-      expect([200, 429]).toContain(status);
+      expect([200, 429]).to.contain(status);
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/management/index_management/inference_endpoints.ts b/x-pack/test/api_integration/apis/management/index_management/inference_endpoints.ts
index ecfcff804d69a..f5d67ba06bc15 100644
--- a/x-pack/test/api_integration/apis/management/index_management/inference_endpoints.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/inference_endpoints.ts
@@ -6,6 +6,7 @@
  */
 
 import expect from '@kbn/expect';
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const API_BASE_PATH = '/api/index_management';
@@ -17,46 +18,48 @@ export default function ({ getService }: FtrProviderContext) {
   const inferenceId = 'my-elser-model';
   const taskType = 'sparse_embedding';
   const service = 'elser';
+  const modelId = '.elser_model_2';
 
   describe('Inference endpoints', function () {
-    before(async () => {
-      log.debug(`Creating inference endpoint`);
-      try {
-        await ml.api.createInferenceEndpoint(inferenceId, taskType, {
-          service,
-          service_settings: {
-            num_allocations: 1,
-            num_threads: 1,
-          },
-        });
-      } catch (err) {
-        log.debug('[Setup error] Error creating inference endpoint');
-        throw err;
-      }
-    });
-
     after(async () => {
-      // Cleanup inference endpoints created for testing purposes
       try {
-        log.debug(`Deleting inference endpoint`);
-        await ml.api.deleteInferenceEndpoint(inferenceId, taskType);
+        log.debug(`Deleting underlying trained model`);
+        await ml.api.deleteTrainedModelES(modelId);
+        await ml.testResources.cleanMLSavedObjects();
       } catch (err) {
-        log.debug('[Cleanup error] Error deleting inference endpoint');
+        log.debug('[Cleanup error] Error deleting trained model or saved ml objects');
         throw err;
       }
     });
-
-    describe('get inference endpoints', () => {
-      it('returns the existing inference endpoints', async () => {
-        const { body: inferenceEndpoints } = await supertest
-          .get(`${API_BASE_PATH}/inference/all`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
-
-        expect(inferenceEndpoints).to.be.ok();
-        expect(inferenceEndpoints[0].model_id).to.eql(inferenceId);
+    it('create inference endpoint', async () => {
+      log.debug(`create inference endpoint`);
+      await ml.api.createInferenceEndpoint(inferenceId, taskType, {
+        service,
+        service_settings: {
+          num_allocations: 1,
+          num_threads: 1,
+          model_id: modelId,
+        },
       });
     });
+    it('get all inference endpoints and confirm inference endpoint exist', async () => {
+      const { body: inferenceEndpoints } = await supertest
+        .get(`${API_BASE_PATH}/inference/all`)
+        .set('kbn-xsrf', 'xxx')
+        .set('x-elastic-internal-origin', 'xxx')
+        .expect(200);
+
+      expect(inferenceEndpoints).to.be.ok();
+      expect(
+        inferenceEndpoints.some(
+          (endpoint: InferenceAPIConfigResponse) => endpoint.model_id === inferenceId
+        )
+      ).to.be(true);
+    });
+    it('can delete inference endpoint', async () => {
+      log.debug(`Deleting inference endpoint`);
+      await ml.api.deleteInferenceEndpoint(inferenceId, taskType);
+      log.debug('> Inference endpoint deleted');
+    });
   });
 }
diff --git a/x-pack/test/api_integration/apis/management/index_management/mapping.ts b/x-pack/test/api_integration/apis/management/index_management/mapping.ts
index 9fd638329d1f5..8515e2be308f0 100644
--- a/x-pack/test/api_integration/apis/management/index_management/mapping.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/mapping.ts
@@ -50,13 +50,17 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should get the index mappings', async () => {
-      const { body } = await getMapping(indexName).expect(200);
+      const { status, body } = await getMapping(indexName);
+      expect(status).to.eql(200);
 
       expect(body.mappings).to.eql(mappings);
     });
     it('show update the index mappings', async () => {
-      await updateMappings(indexName).expect(200);
-      const { body } = await getMapping(indexName).expect(200);
+      const { status } = await updateMappings(indexName);
+      expect(status).to.eql(200);
+      const { status: getStatus, body } = await getMapping(indexName);
+      expect(getStatus).to.eql(200);
+
       expect(body.mappings).to.eql({
         ...mappings,
         properties: { ...mappings.properties, name: { type: 'text' } },
diff --git a/x-pack/test/api_integration/apis/management/index_management/settings.ts b/x-pack/test/api_integration/apis/management/index_management/settings.ts
index 573a0374e9c25..e6986dfca8622 100644
--- a/x-pack/test/api_integration/apis/management/index_management/settings.ts
+++ b/x-pack/test/api_integration/apis/management/index_management/settings.ts
@@ -21,7 +21,8 @@ export default function ({ getService }: FtrProviderContext) {
     it('should fetch an index settings', async () => {
       const index = await createIndex();
 
-      const { body } = await getIndexSettings(index).expect(200);
+      const { status, body } = await getIndexSettings(index);
+      expect(status).to.eql(200);
 
       // Verify we fetch the corret index settings
       expect(body.settings.index.provided_name).to.be(index);
diff --git a/x-pack/test/api_integration/apis/ml/datafeeds/index.ts b/x-pack/test/api_integration/apis/ml/datafeeds/index.ts
index 449a9b2622b8b..e7cd57640f28e 100644
--- a/x-pack/test/api_integration/apis/ml/datafeeds/index.ts
+++ b/x-pack/test/api_integration/apis/ml/datafeeds/index.ts
@@ -12,5 +12,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./get_with_spaces'));
     loadTestFile(require.resolve('./get_stats_with_spaces'));
     loadTestFile(require.resolve('./update'));
+    loadTestFile(require.resolve('./preview'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/ml/datafeeds/preview.ts b/x-pack/test/api_integration/apis/ml/datafeeds/preview.ts
new file mode 100644
index 0000000000000..8fd305fb5b0d5
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/datafeeds/preview.ts
@@ -0,0 +1,75 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { getCommonRequestHeader } from '../../../../functional/services/ml/common_api';
+
+export default ({ getService }: FtrProviderContext) => {
+  const ml = getService('ml');
+  const esArchiver = getService('esArchiver');
+  const spacesService = getService('spaces');
+  const supertest = getService('supertestWithoutAuth');
+
+  const jobIdSpace1 = 'fq_single_space1';
+  const datafeedIdSpace1 = `datafeed-${jobIdSpace1}`;
+  const idSpace1 = 'space1';
+  const idSpace2 = 'space2';
+
+  async function getDatafeedPreview(
+    datafeedId: string,
+    expectedStatusCode: number,
+    space?: string
+  ) {
+    const { body, status } = await supertest
+      .get(`${space ? `/s/${space}` : ''}/internal/ml/datafeeds/${datafeedId}/_preview`)
+      .auth(
+        USER.ML_POWERUSER_ALL_SPACES,
+        ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER_ALL_SPACES)
+      )
+      .set(getCommonRequestHeader('1'));
+    ml.api.assertResponseStatusCode(expectedStatusCode, status, body);
+
+    return body;
+  }
+
+  describe('GET datafeed preview', () => {
+    before(async () => {
+      await spacesService.create({ id: idSpace1, name: 'space_one', disabledFeatures: [] });
+      await spacesService.create({ id: idSpace2, name: 'space_two', disabledFeatures: [] });
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+
+      const jobConfig = ml.commonConfig.getADFqSingleMetricJobConfig(jobIdSpace1);
+      await ml.api.createAnomalyDetectionJob(jobConfig, idSpace1);
+      const datafeedConfig = ml.commonConfig.getADFqDatafeedConfig(jobIdSpace1);
+      await ml.api.createDatafeed(datafeedConfig, idSpace1);
+
+      await ml.testResources.setKibanaTimeZoneToUTC();
+    });
+
+    after(async () => {
+      await spacesService.delete(idSpace1);
+      await spacesService.delete(idSpace2);
+      await ml.api.cleanMlIndices();
+      await ml.testResources.cleanMLSavedObjects();
+    });
+
+    it('should fail with non-existing datafeed', async () => {
+      await getDatafeedPreview('non-existing-datafeed', 404);
+    });
+
+    it('should return datafeed preview with datafeed id from correct space', async () => {
+      const body = await getDatafeedPreview(datafeedIdSpace1, 200, idSpace1);
+      expect(body.length).to.eql(1000, `response length should be 1000 (got ${body.length})`);
+    });
+
+    it('should fail with datafeed from different space', async () => {
+      await getDatafeedPreview(datafeedIdSpace1, 404, idSpace2);
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/system/index.ts b/x-pack/test/api_integration/apis/ml/system/index.ts
index 8b9aef9b813c9..0ddd4b80a0ee5 100644
--- a/x-pack/test/api_integration/apis/ml/system/index.ts
+++ b/x-pack/test/api_integration/apis/ml/system/index.ts
@@ -12,5 +12,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./capabilities'));
     loadTestFile(require.resolve('./space_capabilities'));
     loadTestFile(require.resolve('./index_exists'));
+    loadTestFile(require.resolve('./info'));
+    loadTestFile(require.resolve('./node_count'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/ml/system/info.ts b/x-pack/test/api_integration/apis/ml/system/info.ts
new file mode 100644
index 0000000000000..28d681ad12584
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/system/info.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { getCommonRequestHeader } from '../../../../functional/services/ml/common_api';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+
+  const expectedDefaults = {
+    anomaly_detectors: {
+      model_memory_limit: '1gb',
+      categorization_examples_limit: 4,
+      model_snapshot_retention_days: 10,
+      daily_model_snapshot_retention_after_days: 1,
+      categorization_analyzer: {
+        char_filter: ['first_line_with_letters'],
+        tokenizer: 'ml_standard',
+        filter: [
+          {
+            type: 'stop',
+            stopwords: [
+              'Monday',
+              'Tuesday',
+              'Wednesday',
+              'Thursday',
+              'Friday',
+              'Saturday',
+              'Sunday',
+              'Mon',
+              'Tue',
+              'Wed',
+              'Thu',
+              'Fri',
+              'Sat',
+              'Sun',
+              'January',
+              'February',
+              'March',
+              'April',
+              'May',
+              'June',
+              'July',
+              'August',
+              'September',
+              'October',
+              'November',
+              'December',
+              'Jan',
+              'Feb',
+              'Mar',
+              'Apr',
+              'May',
+              'Jun',
+              'Jul',
+              'Aug',
+              'Sep',
+              'Oct',
+              'Nov',
+              'Dec',
+              'GMT',
+              'UTC',
+            ],
+          },
+          {
+            type: 'limit',
+            max_token_count: '100',
+          },
+        ],
+      },
+    },
+    datafeeds: {
+      scroll_size: 1000,
+    },
+  };
+
+  async function runRequest(user: USER) {
+    const { body, status } = await supertest
+      .get(`/internal/ml/info`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(getCommonRequestHeader('1'));
+    ml.api.assertResponseStatusCode(200, status, body);
+
+    return body;
+  }
+
+  describe('GET ml/info', function () {
+    it('should match expected values', async () => {
+      const resp = await runRequest(USER.ML_POWERUSER);
+
+      expect(resp.upgrade_mode).to.eql(false, 'upgrade_mode should be false');
+
+      // defaults should always be the same
+      expect(resp.defaults).to.eql(expectedDefaults, 'defaults should match expected values');
+
+      // native code should always be present but values depend on the build
+      expect(resp.native_code).to.not.eql(undefined, 'native_code should be present');
+      expect(resp.native_code.version).to.not.eql(
+        undefined,
+        'native_code.version should be present'
+      );
+      expect(resp.native_code.build_hash).to.not.eql(
+        undefined,
+        'native_code.build_hash should be present'
+      );
+
+      // limits should always be present but values depend on hardware
+      expect(resp.limits).to.not.eql(undefined, 'limits should be present');
+      expect(resp.limits.total_ml_memory).to.not.eql(
+        undefined,
+        'total_ml_memory should be present'
+      );
+      expect(resp.limits.total_ml_processors).to.not.eql(
+        undefined,
+        'total_ml_processors should be present'
+      );
+      expect(resp.limits.effective_max_model_memory_limit).to.not.eql(
+        undefined,
+        'effective_max_model_memory_limit should be present'
+      );
+      expect(resp.limits.max_single_ml_node_processors).to.not.eql(
+        undefined,
+        'max_single_ml_node_processors should be present'
+      );
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/system/node_count.ts b/x-pack/test/api_integration/apis/ml/system/node_count.ts
new file mode 100644
index 0000000000000..08fa7abe482ee
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/system/node_count.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { getCommonRequestHeader } from '../../../../functional/services/ml/common_api';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+
+  async function runRequest(user: USER, expectedStatusCode: number) {
+    const { body, status } = await supertest
+      .get(`/internal/ml/ml_node_count`)
+      .auth(user, ml.securityCommon.getPasswordForUser(user))
+      .set(getCommonRequestHeader('1'));
+    ml.api.assertResponseStatusCode(expectedStatusCode, status, body);
+
+    return body;
+  }
+
+  describe('GET ml/ml_node_count', function () {
+    describe('get ml node count', () => {
+      it('should match expected values', async () => {
+        const resp = await runRequest(USER.ML_POWERUSER, 200);
+        expect(resp.count).to.be.greaterThan(0, 'count should be greater than 0');
+        expect(resp.lazyNodeCount).to.be.greaterThan(
+          -1,
+          'lazyNodeCount should be greater or equal to 0'
+        );
+      });
+
+      it('should should fail for a unauthorized user', async () => {
+        await runRequest(USER.ML_UNAUTHORIZED, 403);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/ml/trained_models/index.ts b/x-pack/test/api_integration/apis/ml/trained_models/index.ts
index 1bb92dca1ec56..c9bf98545e2b4 100644
--- a/x-pack/test/api_integration/apis/ml/trained_models/index.ts
+++ b/x-pack/test/api_integration/apis/ml/trained_models/index.ts
@@ -15,5 +15,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./delete_model'));
     loadTestFile(require.resolve('./put_model'));
     loadTestFile(require.resolve('./start_stop_deployment'));
+    loadTestFile(require.resolve('./model_downloads'));
   });
 }
diff --git a/x-pack/test/api_integration/apis/ml/trained_models/model_downloads.ts b/x-pack/test/api_integration/apis/ml/trained_models/model_downloads.ts
new file mode 100644
index 0000000000000..7954a7b31e900
--- /dev/null
+++ b/x-pack/test/api_integration/apis/ml/trained_models/model_downloads.ts
@@ -0,0 +1,136 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { type NodesInfoNodeInfo } from '@elastic/elasticsearch/lib/api/typesWithBodyKey';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+import { USER } from '../../../../functional/services/ml/security_common';
+import { getCommonRequestHeader } from '../../../../functional/services/ml/common_api';
+
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertestWithoutAuth');
+  const ml = getService('ml');
+  const deployment = getService('deployment');
+  const esSupertest = getService('esSupertest');
+
+  describe('GET trained_models/model_downloads', function () {
+    before(async () => {
+      await ml.api.initSavedObjects();
+      await ml.testResources.setKibanaTimeZoneToUTC();
+    });
+
+    after(async () => {
+      await ml.api.cleanMlIndices();
+    });
+
+    it('returns the list of models available for download', async () => {
+      const isCloud = await deployment.isCloud();
+
+      const { body: mlNodesResponse } = await esSupertest.get('/_nodes/ml:true/os');
+
+      // Check that all ML nodes are Intel-based.
+      const areMlNodesIntelBased = Object.values(
+        mlNodesResponse.nodes as Record<string, NodesInfoNodeInfo>
+      ).every((node) => node.os?.name === 'Linux' && node.os?.arch === 'amd64');
+
+      const isIntelBased = isCloud || areMlNodesIntelBased;
+
+      const { body, status } = await supertest
+        .get(`/internal/ml/trained_models/model_downloads`)
+        .auth(USER.ML_POWERUSER, ml.securityCommon.getPasswordForUser(USER.ML_POWERUSER))
+        .set(getCommonRequestHeader('1'));
+      ml.api.assertResponseStatusCode(200, status, body);
+
+      expect(body.length).to.eql(5);
+
+      expect(body).to.eql([
+        {
+          modelName: 'elser',
+          hidden: true,
+          version: 1,
+          config: {
+            input: {
+              field_names: ['text_field'],
+            },
+          },
+          description: 'Elastic Learned Sparse EncodeR v1 (Tech Preview)',
+          type: ['elastic', 'pytorch', 'text_expansion'],
+          model_id: '.elser_model_1',
+        },
+        {
+          modelName: 'elser',
+          version: 2,
+          config: {
+            input: {
+              field_names: ['text_field'],
+            },
+          },
+          description: 'Elastic Learned Sparse EncodeR v2',
+          type: ['elastic', 'pytorch', 'text_expansion'],
+          model_id: '.elser_model_2',
+          ...(isIntelBased ? { default: true } : { recommended: true }),
+        },
+        {
+          modelName: 'elser',
+          version: 2,
+          os: 'Linux',
+          arch: 'amd64',
+          config: {
+            input: {
+              field_names: ['text_field'],
+            },
+          },
+          description: 'Elastic Learned Sparse EncodeR v2, optimized for linux-x86_64',
+          type: ['elastic', 'pytorch', 'text_expansion'],
+          model_id: '.elser_model_2_linux-x86_64',
+          ...(isIntelBased ? { recommended: true } : {}),
+        },
+        {
+          modelName: 'e5',
+          version: 1,
+          config: {
+            input: {
+              field_names: ['text_field'],
+            },
+          },
+          description: 'E5 (EmbEddings from bidirEctional Encoder rEpresentations)',
+          license: 'MIT',
+          licenseUrl: 'https://huggingface.co/elastic/multilingual-e5-small',
+          type: ['pytorch', 'text_embedding'],
+          model_id: '.multilingual-e5-small',
+          ...(isIntelBased ? { default: true } : { recommended: true }),
+        },
+        {
+          modelName: 'e5',
+          version: 1,
+          os: 'Linux',
+          arch: 'amd64',
+          config: {
+            input: {
+              field_names: ['text_field'],
+            },
+          },
+          description:
+            'E5 (EmbEddings from bidirEctional Encoder rEpresentations), optimized for linux-x86_64',
+          license: 'MIT',
+          licenseUrl: 'https://huggingface.co/elastic/multilingual-e5-small_linux-x86_64',
+          type: ['pytorch', 'text_embedding'],
+          model_id: '.multilingual-e5-small_linux-x86_64',
+          ...(isIntelBased ? { recommended: true } : {}),
+        },
+      ]);
+    });
+
+    it('returns an error for unauthorized user', async () => {
+      const { body, status } = await supertest
+        .get(`/internal/ml/trained_models/model_downloads`)
+        .auth(USER.ML_UNAUTHORIZED, ml.securityCommon.getPasswordForUser(USER.ML_UNAUTHORIZED))
+        .set(getCommonRequestHeader('1'));
+      ml.api.assertResponseStatusCode(403, status, body);
+    });
+  });
+};
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json
index 74abc5de82dbf..ccfb82f5212a8 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json
+++ b/x-pack/test/api_integration/apis/monitoring/apm/fixtures/instance.json
@@ -872,7 +872,7 @@
           "metricAgg": "max",
           "label": "Count",
           "title": "Requests Agent Configuration Management",
-          "description": "HTTP Requests received by agent configuration managemen",
+          "description": "HTTP Requests received by agent configuration management",
           "units": "/s",
           "format": "0,0.[00]",
           "hasCalculation": false,
diff --git a/x-pack/test/api_integration/services/security_solution_api.gen.ts b/x-pack/test/api_integration/services/security_solution_api.gen.ts
index 9f6d717ea9dff..7a3ef5cc1f849 100644
--- a/x-pack/test/api_integration/services/security_solution_api.gen.ts
+++ b/x-pack/test/api_integration/services/security_solution_api.gen.ts
@@ -26,7 +26,13 @@ import { BulkPatchRulesRequestBodyInput } from '@kbn/security-solution-plugin/co
 import { BulkUpdateRulesRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_management/bulk_crud/bulk_update_rules/bulk_update_rules_route.gen';
 import { CreateAlertsMigrationRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/signals_migration/create_signals_migration/create_signals_migration.gen';
 import { CreateRuleRequestBodyInput } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_management/crud/create_rule/create_rule_route.gen';
+import {
+  CreateUpdateProtectionUpdatesNoteRequestParamsInput,
+  CreateUpdateProtectionUpdatesNoteRequestBodyInput,
+} from '@kbn/security-solution-plugin/common/api/endpoint/protection_updates_note/protection_updates_note.gen';
 import { DeleteRuleRequestQueryInput } from '@kbn/security-solution-plugin/common/api/detection_engine/rule_management/crud/delete_rule/delete_rule_route.gen';
+import { EndpointIsolateRedirectRequestBodyInput } from '@kbn/security-solution-plugin/common/api/endpoint/actions/isolate_route.gen';
+import { EndpointUnisolateRedirectRequestBodyInput } from '@kbn/security-solution-plugin/common/api/endpoint/actions/unisolate_route.gen';
 import {
   ExportRulesRequestQueryInput,
   ExportRulesRequestBodyInput,
@@ -40,6 +46,7 @@ import {
   GetEndpointSuggestionsRequestBodyInput,
 } from '@kbn/security-solution-plugin/common/api/endpoint/suggestions/get_suggestions.gen';
 import { GetPolicyResponseRequestQueryInput } from '@kbn/security-solution-plugin/common/api/endpoint/policy/policy.gen';
+import { GetProtectionUpdatesNoteRequestParamsInput } from '@kbn/security-solution-plugin/common/api/endpoint/protection_updates_note/protection_updates_note.gen';
 import {
   GetRuleExecutionEventsRequestQueryInput,
   GetRuleExecutionEventsRequestParamsInput,
@@ -153,6 +160,16 @@ after 30 days. It also deletes other artifacts specific to the migration impleme
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
         .send(props.body as object);
     },
+    createUpdateProtectionUpdatesNote(props: CreateUpdateProtectionUpdatesNoteProps) {
+      return supertest
+        .post(
+          replaceParams('/api/endpoint/protection_updates_note/{package_policy_id}', props.params)
+        )
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
+        .send(props.body as object);
+    },
     deleteAlertsIndex() {
       return supertest
         .delete('/api/detection_engine/index')
@@ -171,6 +188,22 @@ after 30 days. It also deletes other artifacts specific to the migration impleme
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
         .query(props.query);
     },
+    endpointIsolateRedirect(props: EndpointIsolateRedirectProps) {
+      return supertest
+        .post('/api/endpoint/isolate')
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
+        .send(props.body as object);
+    },
+    endpointUnisolateRedirect(props: EndpointUnisolateRedirectProps) {
+      return supertest
+        .post('/api/endpoint/unisolate')
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
+        .send(props.body as object);
+    },
     /**
      * Exports rules to an `.ndjson` file. The following configuration items are also included in the `.ndjson` file - Actions, Exception lists. Prebuilt rules cannot be exported.
      */
@@ -254,6 +287,15 @@ finalize it.
         .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
         .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
     },
+    getProtectionUpdatesNote(props: GetProtectionUpdatesNoteProps) {
+      return supertest
+        .get(
+          replaceParams('/api/endpoint/protection_updates_note/{package_policy_id}', props.params)
+        )
+        .set('kbn-xsrf', 'true')
+        .set(ELASTIC_HTTP_VERSION_HEADER, '2023-10-31')
+        .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana');
+    },
     getRuleExecutionEvents(props: GetRuleExecutionEventsProps) {
       return supertest
         .put(
@@ -414,9 +456,19 @@ export interface CreateAlertsMigrationProps {
 export interface CreateRuleProps {
   body: CreateRuleRequestBodyInput;
 }
+export interface CreateUpdateProtectionUpdatesNoteProps {
+  params: CreateUpdateProtectionUpdatesNoteRequestParamsInput;
+  body: CreateUpdateProtectionUpdatesNoteRequestBodyInput;
+}
 export interface DeleteRuleProps {
   query: DeleteRuleRequestQueryInput;
 }
+export interface EndpointIsolateRedirectProps {
+  body: EndpointIsolateRedirectRequestBodyInput;
+}
+export interface EndpointUnisolateRedirectProps {
+  body: EndpointUnisolateRedirectRequestBodyInput;
+}
 export interface ExportRulesProps {
   query: ExportRulesRequestQueryInput;
   body: ExportRulesRequestBodyInput;
@@ -440,6 +492,9 @@ export interface GetEndpointSuggestionsProps {
 export interface GetPolicyResponseProps {
   query: GetPolicyResponseRequestQueryInput;
 }
+export interface GetProtectionUpdatesNoteProps {
+  params: GetProtectionUpdatesNoteRequestParamsInput;
+}
 export interface GetRuleExecutionEventsProps {
   query: GetRuleExecutionEventsRequestQueryInput;
   params: GetRuleExecutionEventsRequestParamsInput;
diff --git a/x-pack/test/apm_api_integration/tests/alerts/error_count_threshold.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/error_count_threshold.spec.ts
index 45a95db642d2f..8b72afc194e35 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/error_count_threshold.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/error_count_threshold.spec.ts
@@ -103,8 +103,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
     after(() => apmSynthtraceEsClient.clean());
 
-    // FLAKY: https://github.com/elastic/kibana/issues/176948
-    describe.skip('create rule without kql filter', () => {
+    describe('create rule without kql filter', () => {
       let ruleId: string;
       let alerts: ApmAlertFields[];
       let actionId: string;
@@ -175,10 +174,10 @@ export default function ApiTest({ getService }: FtrProviderContext) {
             environment: 'production',
             interval: '1 hr',
             reason:
-              'Error count is 30 in the last 1 hr for service: opbeans-php, env: production, name: tx-php, error key: c85df8159a74b47b461d6ddaa6ba7da38cfc3e74019aef66257d10df74adeb99, error name: a php error. Alert when > 1.',
+              'Error count is 30 in the last 1 hr for service: opbeans-php, env: production, name: tx-php, error key: 000000000000000000000a php error, error name: a php error. Alert when > 1.',
             serviceName: 'opbeans-php',
             transactionName: 'tx-php',
-            errorGroupingKey: 'c85df8159a74b47b461d6ddaa6ba7da38cfc3e74019aef66257d10df74adeb99',
+            errorGroupingKey: '000000000000000000000a php error',
             errorGroupingName: 'a php error',
             threshold: '1',
             triggerValue: '30',
@@ -192,8 +191,8 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         const alertReasons = [alerts[0]['kibana.alert.reason'], alerts[1]['kibana.alert.reason']];
 
         expect(alertReasons).to.eql([
-          'Error count is 30 in the last 1 hr for service: opbeans-php, env: production, name: tx-php, error key: c85df8159a74b47b461d6ddaa6ba7da38cfc3e74019aef66257d10df74adeb99, error name: a php error. Alert when > 1.',
-          'Error count is 15 in the last 1 hr for service: opbeans-java, env: production, name: tx-java, error key: b6a4ac83620b34ae44dd98a13e144782f88698f827af7edb10690c5e6e7d8597, error name: a java error. Alert when > 1.',
+          'Error count is 30 in the last 1 hr for service: opbeans-php, env: production, name: tx-php, error key: 000000000000000000000a php error, error name: a php error. Alert when > 1.',
+          'Error count is 15 in the last 1 hr for service: opbeans-java, env: production, name: tx-java, error key: 00000000000000000000a java error, error name: a java error. Alert when > 1.',
         ]);
       });
 
@@ -252,8 +251,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/176964
-    describe.skip('create rule with kql filter for opbeans-php', () => {
+    describe('create rule with kql filter for opbeans-php', () => {
       let ruleId: string;
 
       before(async () => {
diff --git a/x-pack/test/apm_api_integration/tests/alerts/transaction_duration.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/transaction_duration.spec.ts
index 7d4ec54fa52fb..0d7460ff5be50 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/transaction_duration.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/transaction_duration.spec.ts
@@ -75,8 +75,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       await apmSynthtraceEsClient.clean();
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/176996
-    describe.skip('create rule for opbeans-java without kql filter', () => {
+    describe('create rule for opbeans-java without kql filter', () => {
       let ruleId: string;
       let actionId: string;
       let alerts: ApmAlertFields[];
@@ -188,8 +187,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/177061
-    describe.skip('create rule for opbeans-node using kql filter', () => {
+    describe('create rule for opbeans-node using kql filter', () => {
       let ruleId: string;
       let alerts: ApmAlertFields[];
 
diff --git a/x-pack/test/apm_api_integration/tests/alerts/transaction_error_rate.spec.ts b/x-pack/test/apm_api_integration/tests/alerts/transaction_error_rate.spec.ts
index 6416337c3bfc9..509d839ecef6d 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/transaction_error_rate.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/transaction_error_rate.spec.ts
@@ -73,7 +73,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       await apmSynthtraceEsClient.clean();
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/177104
     describe('create rule without kql query', () => {
       let ruleId: string;
       let actionId: string;
@@ -197,7 +196,6 @@ export default function ApiTest({ getService }: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/177108
     describe('create rule with kql query', () => {
       let ruleId: string;
       let alerts: ApmAlertFields[];
diff --git a/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_error_rate_timeseries.spec.ts b/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_error_rate_timeseries.spec.ts
new file mode 100644
index 0000000000000..b880354e1a705
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_error_rate_timeseries.spec.ts
@@ -0,0 +1,175 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import { log, timerange } from '@kbn/apm-synthtrace-client';
+import { first, last } from 'lodash';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { APIClientRequestParamsOf } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+  const apmApiClient = getService('apmApiClient');
+  const logSynthtrace = getService('logSynthtraceEsClient');
+
+  const serviceName = 'synth-go';
+  const start = new Date('2024-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2024-01-01T00:15:00.000Z').getTime() - 1;
+
+  const hostName = 'synth-host';
+
+  async function getLogsErrorRateTimeseries(
+    overrides?: RecursivePartial<
+      APIClientRequestParamsOf<'GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries'>['params']
+    >
+  ) {
+    const response = await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/entities/services/{serviceName}/logs_error_rate_timeseries',
+      params: {
+        path: {
+          serviceName: 'synth-go',
+          ...overrides?.path,
+        },
+        query: {
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          ...overrides?.query,
+        },
+      },
+    });
+    return response;
+  }
+
+  registry.when(
+    'Logs error rate timeseries when data is not loaded',
+    { config: 'basic', archives: [] },
+    () => {
+      describe('Logs error rate api', () => {
+        it('handles the empty state', async () => {
+          const response = await getLogsErrorRateTimeseries();
+          expect(response.status).to.be(200);
+          expect(response.body.currentPeriod).to.empty();
+        });
+      });
+    }
+  );
+
+  registry.when(
+    'Logs error rate timeseries when data loaded',
+    { config: 'basic', archives: [] },
+    () => {
+      describe('Logs without log level field', () => {
+        before(async () => {
+          return logSynthtrace.index([
+            timerange(start, end)
+              .interval('1m')
+              .rate(1)
+              .generator((timestamp) =>
+                log.create().message('This is a log message').timestamp(timestamp).defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': serviceName,
+                  'host.name': hostName,
+                })
+              ),
+          ]);
+        });
+        after(async () => {
+          await logSynthtrace.clean();
+        });
+
+        it('returns {} if log level is not available ', async () => {
+          const response = await getLogsErrorRateTimeseries();
+          expect(response.status).to.be(200);
+        });
+      });
+
+      describe('Logs with log.level=error', () => {
+        before(async () => {
+          return logSynthtrace.index([
+            timerange(start, end)
+              .interval('1m')
+              .rate(1)
+              .generator((timestamp) =>
+                log
+                  .create()
+                  .message('This is a log message')
+                  .logLevel('error')
+                  .timestamp(timestamp)
+                  .defaults({
+                    'log.file.path': '/my-service.log',
+                    'service.name': serviceName,
+                    'host.name': hostName,
+                    'service.environment': 'test',
+                  })
+              ),
+            timerange(start, end)
+              .interval('2m')
+              .rate(1)
+              .generator((timestamp) =>
+                log
+                  .create()
+                  .message('This is an error log message')
+                  .logLevel('error')
+                  .timestamp(timestamp)
+                  .defaults({
+                    'log.file.path': '/my-service.log',
+                    'service.name': 'my-service',
+                    'host.name': hostName,
+                    'service.environment': 'production',
+                  })
+              ),
+            timerange(start, end)
+              .interval('5m')
+              .rate(1)
+              .generator((timestamp) =>
+                log
+                  .create()
+                  .message('This is an info message')
+                  .logLevel('info')
+                  .timestamp(timestamp)
+                  .defaults({
+                    'log.file.path': '/my-service.log',
+                    'service.name': 'my-service',
+                    'host.name': hostName,
+                    'service.environment': 'production',
+                  })
+              ),
+          ]);
+        });
+        after(async () => {
+          await logSynthtrace.clean();
+        });
+
+        it('returns log error rate timeseries', async () => {
+          const response = await getLogsErrorRateTimeseries();
+          expect(response.status).to.be(200);
+          expect(response.body.currentPeriod[serviceName].every(({ y }) => y === 1)).to.be(true);
+        });
+
+        it('handles environment filter', async () => {
+          const response = await getLogsErrorRateTimeseries({ query: { environment: 'foo' } });
+          expect(response.status).to.be(200);
+          expect(response.body.currentPeriod).to.empty();
+        });
+
+        describe('when my-service is selected', () => {
+          it('returns some data', async () => {
+            const response = await getLogsErrorRateTimeseries({
+              path: { serviceName: 'my-service' },
+            });
+
+            expect(response.status).to.be(200);
+            expect(first(response.body.currentPeriod?.['my-service'])?.y).to.be(0.5);
+            expect(last(response.body.currentPeriod?.['my-service'])?.y).to.be(1);
+          });
+        });
+      });
+    }
+  );
+}
diff --git a/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_rate_timeseries.spec.ts b/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_rate_timeseries.spec.ts
new file mode 100644
index 0000000000000..d4717b25bba93
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/entities/logs/service_logs_rate_timeseries.spec.ts
@@ -0,0 +1,173 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import { log, timerange } from '@kbn/apm-synthtrace-client';
+import { RecursivePartial } from '@kbn/apm-plugin/typings/common';
+import { APIClientRequestParamsOf } from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { first, last } from 'lodash';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+  const apmApiClient = getService('apmApiClient');
+  const logSynthtrace = getService('logSynthtraceEsClient');
+
+  const serviceName = 'synth-go';
+  const start = new Date('2024-01-01T00:00:00.000Z').getTime();
+  const end = new Date('2024-01-01T00:15:00.000Z').getTime() - 1;
+
+  const hostName = 'synth-host';
+
+  async function getLogsRateTimeseries(
+    overrides?: RecursivePartial<
+      APIClientRequestParamsOf<'GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries'>['params']
+    >
+  ) {
+    const response = await apmApiClient.readUser({
+      endpoint: 'GET /internal/apm/entities/services/{serviceName}/logs_rate_timeseries',
+      params: {
+        path: {
+          serviceName: 'synth-go',
+          ...overrides?.path,
+        },
+        query: {
+          start: new Date(start).toISOString(),
+          end: new Date(end).toISOString(),
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          ...overrides?.query,
+        },
+      },
+    });
+    return response;
+  }
+
+  registry.when(
+    'Logs rate timeseries when data is not loaded',
+    { config: 'basic', archives: [] },
+    () => {
+      describe('Logs rate api', () => {
+        it('handles the empty state', async () => {
+          const response = await getLogsRateTimeseries();
+          expect(response.status).to.be(200);
+          expect(response.body.currentPeriod).to.empty();
+        });
+      });
+    }
+  );
+
+  registry.when('Logs rate timeseries when data loaded', { config: 'basic', archives: [] }, () => {
+    describe('Logs without log level field', () => {
+      before(async () => {
+        return logSynthtrace.index([
+          timerange(start, end)
+            .interval('1m')
+            .rate(1)
+            .generator((timestamp) =>
+              log.create().message('This is a log message').timestamp(timestamp).defaults({
+                'log.file.path': '/my-service.log',
+                'service.name': serviceName,
+                'host.name': hostName,
+              })
+            ),
+        ]);
+      });
+      after(async () => {
+        await logSynthtrace.clean();
+      });
+
+      it('returns {} if log level is not available ', async () => {
+        const response = await getLogsRateTimeseries();
+        expect(response.status).to.be(200);
+      });
+    });
+
+    describe('Logs with log.level=error', () => {
+      before(async () => {
+        return logSynthtrace.index([
+          timerange(start, end)
+            .interval('1m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is a log message')
+                .logLevel('error')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': serviceName,
+                  'host.name': hostName,
+                  'service.environment': 'test',
+                })
+            ),
+          timerange(start, end)
+            .interval('2m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is an error log message')
+                .logLevel('error')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': 'my-service',
+                  'host.name': hostName,
+                  'service.environment': 'production',
+                })
+            ),
+          timerange(start, end)
+            .interval('5m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is an info message')
+                .logLevel('info')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': 'my-service',
+                  'host.name': hostName,
+                  'service.environment': 'production',
+                })
+            ),
+        ]);
+      });
+      after(async () => {
+        await logSynthtrace.clean();
+      });
+
+      it('returns log rate timeseries', async () => {
+        const response = await getLogsRateTimeseries();
+        expect(response.status).to.be(200);
+        expect(
+          response.body.currentPeriod[serviceName].every(({ y }) => y === 0.06666666666666667)
+        ).to.be(true);
+      });
+
+      it('handles environment filter', async () => {
+        const response = await getLogsRateTimeseries({ query: { environment: 'foo' } });
+        expect(response.status).to.be(200);
+        expect(response.body.currentPeriod).to.empty();
+      });
+
+      describe('when my-service is selected', () => {
+        it('returns some data', async () => {
+          const response = await getLogsRateTimeseries({
+            path: { serviceName: 'my-service' },
+          });
+
+          expect(response.status).to.be(200);
+          expect(first(response.body.currentPeriod?.['my-service'])?.y).to.be(0.18181818181818182);
+          expect(last(response.body.currentPeriod?.['my-service'])?.y).to.be(0.09090909090909091);
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/test/apm_api_integration/tests/entities/services/services_entities_detailed_statistics.spec.ts b/x-pack/test/apm_api_integration/tests/entities/services/services_entities_detailed_statistics.spec.ts
new file mode 100644
index 0000000000000..9e4cc209c6b92
--- /dev/null
+++ b/x-pack/test/apm_api_integration/tests/entities/services/services_entities_detailed_statistics.spec.ts
@@ -0,0 +1,191 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import {
+  APIClientRequestParamsOf,
+  APIReturnType,
+} from '@kbn/apm-plugin/public/services/rest/create_call_apm_api';
+import { ApmDocumentType } from '@kbn/apm-plugin/common/document_type';
+import { RollupInterval } from '@kbn/apm-plugin/common/rollup';
+import { apm, log, timerange } from '@kbn/apm-synthtrace-client';
+import { uniq, map } from 'lodash';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+type ServicesEntitiesDetailedStatisticsReturn =
+  APIReturnType<'POST /internal/apm/entities/services/detailed_statistics'>;
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const registry = getService('registry');
+
+  const apmApiClient = getService('apmApiClient');
+  const synthtrace = getService('apmSynthtraceEsClient');
+  const logSynthtrace = getService('logSynthtraceEsClient');
+
+  const start = '2024-01-01T00:00:00.000Z';
+  const end = '2024-01-01T00:59:59.999Z';
+
+  const serviceNames = ['my-service', 'synth-go'];
+  const hostName = 'synth-host';
+  const serviceName = 'synth-go';
+
+  const EXPECTED_TPM = 5;
+  const EXPECTED_LATENCY = 1000;
+  const EXPECTED_FAILURE_RATE = 0.25;
+  const EXPECTED_LOG_RATE = 0.016666666666666666;
+  const EXPECTED_LOG_ERROR_RATE = 1;
+
+  async function getStats(
+    overrides?: Partial<
+      APIClientRequestParamsOf<'POST /internal/apm/entities/services/detailed_statistics'>['params']['query']
+    >
+  ) {
+    const response = await apmApiClient.readUser({
+      endpoint: `POST /internal/apm/entities/services/detailed_statistics`,
+      params: {
+        query: {
+          start,
+          end,
+          environment: 'ENVIRONMENT_ALL',
+          kuery: '',
+          probability: 1,
+          documentType: ApmDocumentType.TransactionMetric,
+          rollupInterval: RollupInterval.OneMinute,
+          bucketSizeInSeconds: 60,
+          ...overrides,
+        },
+        body: {
+          serviceNames: JSON.stringify(serviceNames),
+        },
+      },
+    });
+
+    return response.body;
+  }
+
+  registry.when(
+    'Services entities detailed statistics when data is generated',
+    { config: 'basic', archives: [] },
+    () => {
+      let servicesEntitiesDetailedStatistics: ServicesEntitiesDetailedStatisticsReturn;
+
+      const instance = apm.service('my-service', 'production', 'java').instance('instance');
+
+      before(async () => {
+        const interval = timerange(new Date(start).getTime(), new Date(end).getTime() - 1).interval(
+          '1m'
+        );
+
+        await logSynthtrace.index([
+          timerange(start, end)
+            .interval('1m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is a log message')
+                .logLevel('error')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': serviceName,
+                  'host.name': hostName,
+                  'service.environment': 'test',
+                })
+            ),
+          timerange(start, end)
+            .interval('2m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is an error log message')
+                .logLevel('error')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': 'my-service',
+                  'host.name': hostName,
+                  'service.environment': 'production',
+                })
+            ),
+          timerange(start, end)
+            .interval('5m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is an info message')
+                .logLevel('info')
+                .timestamp(timestamp)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': 'my-service',
+                  'host.name': hostName,
+                  'service.environment': 'production',
+                })
+            ),
+        ]);
+
+        await synthtrace.index([
+          interval.rate(3).generator((timestamp) => {
+            return instance
+              .transaction('GET /api')
+              .duration(EXPECTED_LATENCY)
+              .outcome('success')
+              .timestamp(timestamp);
+          }),
+          interval.rate(1).generator((timestamp) => {
+            return instance
+              .transaction('GET /api')
+              .duration(EXPECTED_LATENCY)
+              .outcome('failure')
+              .timestamp(timestamp);
+          }),
+          interval.rate(1).generator((timestamp) => {
+            return instance
+              .transaction('GET /api')
+              .duration(EXPECTED_LATENCY)
+              .outcome('unknown')
+              .timestamp(timestamp);
+          }),
+        ]);
+      });
+
+      after(() => synthtrace.clean());
+
+      describe('and transaction metrics are used', () => {
+        before(async () => {
+          servicesEntitiesDetailedStatistics = await getStats();
+        });
+
+        it('returns the expected statistics for apm', () => {
+          const stats = servicesEntitiesDetailedStatistics.currentPeriod.apm['my-service'];
+
+          expect(stats).not.empty();
+          expect(uniq(map(stats.throughput, 'y'))).eql([EXPECTED_TPM], 'tpm');
+
+          expect(uniq(map(stats.latency, 'y'))).eql([EXPECTED_LATENCY * 1000], 'latency');
+
+          expect(uniq(map(stats.transactionErrorRate, 'y'))).eql(
+            [EXPECTED_FAILURE_RATE],
+            'errorRate'
+          );
+        });
+
+        it('returns the expected statistics for logs', () => {
+          const statsLogErrorRate =
+            servicesEntitiesDetailedStatistics.currentPeriod.logErrorRate[serviceName];
+          const statsLogRate =
+            servicesEntitiesDetailedStatistics.currentPeriod.logRate[serviceName];
+
+          expect(statsLogErrorRate.every(({ y }) => y === EXPECTED_LOG_ERROR_RATE)).to.be(true);
+          expect(statsLogRate.every(({ y }) => y === EXPECTED_LOG_RATE)).to.be(true);
+        });
+      });
+    }
+  );
+}
diff --git a/x-pack/test/apm_api_integration/tests/environment/generate_data.ts b/x-pack/test/apm_api_integration/tests/environment/generate_data.ts
index af71533bf3e0d..3cfd5d92e00f1 100644
--- a/x-pack/test/apm_api_integration/tests/environment/generate_data.ts
+++ b/x-pack/test/apm_api_integration/tests/environment/generate_data.ts
@@ -63,5 +63,5 @@ export async function generateData({
       return [...loopGeneratedDocs, customDoc];
     });
 
-  await apmSynthtraceEsClient.index(docs);
+  return apmSynthtraceEsClient.index(docs);
 }
diff --git a/x-pack/test/apm_api_integration/tests/environment/get_environment.spec.ts b/x-pack/test/apm_api_integration/tests/environment/get_environment.spec.ts
index 8a717e735b0f2..e67c601e7713c 100644
--- a/x-pack/test/apm_api_integration/tests/environment/get_environment.spec.ts
+++ b/x-pack/test/apm_api_integration/tests/environment/get_environment.spec.ts
@@ -19,15 +19,14 @@ export default function environmentsAPITests({ getService }: FtrProviderContext)
   const apmApiClient = getService('apmApiClient');
   const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/177305
   registry.when('environments when data is loaded', { config: 'basic', archives: [] }, async () => {
-    before(async () => {
-      await generateData({
+    before(async () =>
+      generateData({
         apmSynthtraceEsClient,
         start: startNumber,
         end: endNumber,
-      });
-    });
+      })
+    );
 
     after(() => apmSynthtraceEsClient.clean());
 
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
index 5ccf9015839c7..b5a760f6ae9b0 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
@@ -85,46 +85,48 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     it('should return a configuration with templates', async () => {
-      const templates = {
-        templates: [
-          {
-            key: 'test_template_1',
-            name: 'First test template',
-            description: 'This is a first test template',
-            tags: [],
-            caseFields: null,
-          },
-          {
-            key: 'test_template_2',
-            name: 'Second test template',
-            description: 'This is a second test template',
-            tags: ['foobar'],
-            caseFields: {
-              title: 'Case with sample template 2',
-              description: 'case desc',
-              severity: CaseSeverity.LOW,
-              category: null,
-              tags: ['sample-4'],
-              assignees: [],
-              customFields: [],
-              connector: {
-                id: 'none',
-                name: 'My Connector',
-                type: ConnectorTypes.none,
-                fields: null,
-              },
+      const mockTemplates = [
+        {
+          key: 'test_template_1',
+          name: 'First test template',
+          description: 'This is a first test template',
+          tags: [],
+          caseFields: null,
+        },
+        {
+          key: 'test_template_2',
+          name: 'Second test template',
+          description: 'This is a second test template',
+          tags: ['foobar'],
+          caseFields: {
+            title: 'Case with sample template 2',
+            description: 'case desc',
+            severity: CaseSeverity.LOW,
+            category: null,
+            tags: ['sample-4'],
+            assignees: [],
+            customFields: [],
+            connector: {
+              id: 'none',
+              name: 'My Connector',
+              type: ConnectorTypes.none,
+              fields: null,
             },
           },
-          {
-            key: 'test_template_3',
-            name: 'Third test template',
-            description: 'This is a third test template',
-            caseFields: {
-              title: 'Case with sample template 3',
-              tags: ['sample-3'],
-            },
+        },
+        {
+          key: 'test_template_3',
+          name: 'Third test template',
+          description: 'This is a third test template',
+          caseFields: {
+            title: 'Case with sample template 3',
+            tags: ['sample-3'],
           },
-        ],
+        },
+      ];
+
+      const templates = {
+        templates: mockTemplates,
       };
 
       await createConfiguration(
@@ -136,7 +138,11 @@ export default ({ getService }: FtrProviderContext): void => {
       const configuration = await getConfiguration({ supertest });
 
       const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
-      expect(data).to.eql(getConfigurationOutput(false, templates));
+      expect(data).to.eql(
+        getConfigurationOutput(false, {
+          templates: mockTemplates,
+        })
+      );
     });
 
     it('should get a single configuration', async () => {
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
index 114182a1ad20d..05719a5d02ed0 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
@@ -147,7 +147,7 @@ export default ({ getService }: FtrProviderContext): void => {
         },
       ];
 
-      const templates = [
+      const mockTemplates = [
         {
           key: 'test_template_1',
           name: 'First test template',
@@ -196,23 +196,61 @@ export default ({ getService }: FtrProviderContext): void => {
             tags: ['sample-3'],
           },
         },
-      ] as ConfigurationPatchRequest['templates'];
+      ];
 
       const configuration = await createConfiguration(supertest, {
         ...getConfigurationRequest(),
         customFields: customFieldsConfiguration as ConfigurationPatchRequest['customFields'],
       });
+
       const newConfiguration = await updateConfiguration(supertest, configuration.id, {
         version: configuration.version,
         customFields: customFieldsConfiguration,
-        templates,
+        templates: mockTemplates as ConfigurationPatchRequest['templates'],
       });
 
       const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
       expect(data).to.eql({
         ...getConfigurationOutput(true),
         customFields: customFieldsConfiguration as ConfigurationPatchRequest['customFields'],
-        templates,
+        templates: [
+          {
+            ...mockTemplates[0],
+            caseFields: {
+              customFields: [
+                {
+                  key: 'text_field_1',
+                  type: CustomFieldTypes.TEXT,
+                  value: null,
+                },
+                {
+                  key: 'toggle_field_1',
+                  value: false,
+                  type: CustomFieldTypes.TOGGLE,
+                },
+              ],
+            },
+          },
+          { ...mockTemplates[1] },
+          {
+            ...mockTemplates[2],
+            caseFields: {
+              ...mockTemplates[2].caseFields,
+              customFields: [
+                {
+                  key: 'text_field_1',
+                  type: CustomFieldTypes.TEXT,
+                  value: null,
+                },
+                {
+                  key: 'toggle_field_1',
+                  value: false,
+                  type: CustomFieldTypes.TOGGLE,
+                },
+              ],
+            },
+          },
+        ] as ConfigurationPatchRequest['templates'],
       });
     });
 
@@ -432,35 +470,6 @@ export default ({ getService }: FtrProviderContext): void => {
         );
       });
 
-      it("should not update a configuration with templates with custom fields that don't exist in the configuration", async () => {
-        const configuration = await createConfiguration(supertest);
-
-        await updateConfiguration(
-          supertest,
-          configuration.id,
-          {
-            version: configuration.version,
-            templates: [
-              {
-                key: 'test_template_1',
-                name: 'First test template',
-                description: 'This is a first test template',
-                caseFields: {
-                  customFields: [
-                    {
-                      key: 'random_key',
-                      type: CustomFieldTypes.TEXT,
-                      value: 'Test',
-                    },
-                  ],
-                },
-              },
-            ],
-          },
-          400
-        );
-      });
-
       it('should not patch a configuration with duplicated template keys', async () => {
         const configuration = await createConfiguration(supertest);
         await updateConfiguration(
diff --git a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
index 8a81214f009d6..493b8745df891 100644
--- a/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
+++ b/x-pack/test/cases_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
@@ -123,7 +123,20 @@ export default ({ getService }: FtrProviderContext): void => {
           key: 'test_template_1',
           name: 'First test template',
           description: 'This is a first test template',
-          caseFields: null,
+          caseFields: {
+            customFields: [
+              {
+                key: 'text_field_1',
+                type: CustomFieldTypes.TEXT,
+                value: null,
+              },
+              {
+                key: 'toggle_field_1',
+                value: false,
+                type: CustomFieldTypes.TOGGLE,
+              },
+            ],
+          },
         },
         {
           key: 'test_template_2',
@@ -165,6 +178,18 @@ export default ({ getService }: FtrProviderContext): void => {
           caseFields: {
             title: 'Case with sample template 3',
             tags: ['sample-3'],
+            customFields: [
+              {
+                key: 'text_field_1',
+                type: CustomFieldTypes.TEXT,
+                value: null,
+              },
+              {
+                key: 'toggle_field_1',
+                value: false,
+                type: CustomFieldTypes.TOGGLE,
+              },
+            ],
           },
         },
       ];
@@ -177,7 +202,11 @@ export default ({ getService }: FtrProviderContext): void => {
       );
 
       const data = removeServerGeneratedPropertiesFromSavedObject(configuration);
-      expect(data).to.eql({ ...getConfigurationOutput(false), customFields, templates });
+      expect(data).to.eql({
+        ...getConfigurationOutput(false),
+        customFields,
+        templates,
+      });
     });
 
     it('should keep only the latest configuration', async () => {
@@ -493,11 +522,40 @@ export default ({ getService }: FtrProviderContext): void => {
         );
       });
 
-      it("should not create a configuration with templates with custom fields that don't exist in the configuration", async () => {
+      it('should not create a configuration with duplicated template keys', async () => {
+        await createConfiguration(
+          supertest,
+          getConfigurationRequest({
+            overrides: {
+              templates: [
+                {
+                  key: 'test_template_1',
+                  name: 'First test template',
+                  description: 'This is a first test template',
+                  caseFields: null,
+                },
+                {
+                  key: 'test_template_1',
+                  name: 'Third test template',
+                  description: 'This is a third test template',
+                  caseFields: {
+                    title: 'Case with sample template 3',
+                    tags: ['sample-3'],
+                  },
+                },
+              ],
+            },
+          }),
+          400
+        );
+      });
+
+      it("should not create a configuration when templates have custom fields and custom fields don't exist in the configuration", async () => {
         await createConfiguration(
           supertest,
           getConfigurationRequest({
             overrides: {
+              customFields: [],
               templates: [
                 {
                   key: 'test_template_1',
@@ -520,11 +578,20 @@ export default ({ getService }: FtrProviderContext): void => {
         );
       });
 
-      it('should not create a configuration with duplicated template keys', async () => {
+      it('should not create a configuration when templates do not have custom fields and custom fields exist in the configuration', async () => {
         await createConfiguration(
           supertest,
           getConfigurationRequest({
             overrides: {
+              customFields: [
+                {
+                  key: 'random_key',
+                  type: CustomFieldTypes.TEXT,
+                  label: 'New custom field',
+                  defaultValue: 'Test',
+                  required: true,
+                },
+              ],
               templates: [
                 {
                   key: 'test_template_1',
@@ -532,15 +599,6 @@ export default ({ getService }: FtrProviderContext): void => {
                   description: 'This is a first test template',
                   caseFields: null,
                 },
-                {
-                  key: 'test_template_1',
-                  name: 'Third test template',
-                  description: 'This is a third test template',
-                  caseFields: {
-                    title: 'Case with sample template 3',
-                    tags: ['sample-3'],
-                  },
-                },
               ],
             },
           }),
diff --git a/x-pack/test/cloud_security_posture_api/routes/benchmarks.ts b/x-pack/test/cloud_security_posture_api/routes/benchmarks.ts
index f8d6275655d36..65a3ec42fc37d 100644
--- a/x-pack/test/cloud_security_posture_api/routes/benchmarks.ts
+++ b/x-pack/test/cloud_security_posture_api/routes/benchmarks.ts
@@ -31,15 +31,20 @@ export default function (providerContext: FtrProviderContext) {
   const log = getService('log');
 
   const getCspBenchmarkRules = async (benchmarkId: string): Promise<CspBenchmarkRule[]> => {
-    const cspBenchmarkRules = await kibanaServer.savedObjects.find<CspBenchmarkRule>({
-      type: CSP_BENCHMARK_RULE_SAVED_OBJECT_TYPE,
-    });
-    const requestedBenchmarkRules = cspBenchmarkRules.saved_objects.filter(
-      (cspBenchmarkRule) => cspBenchmarkRule.attributes.metadata.benchmark.id === benchmarkId
-    );
-    expect(requestedBenchmarkRules.length).greaterThan(0);
+    let cspBenchmarkRules: CspBenchmarkRule[] = [];
+    await retry.try(async () => {
+      const cspBenchmarkRulesSavedObjects = await kibanaServer.savedObjects.find<CspBenchmarkRule>({
+        type: CSP_BENCHMARK_RULE_SAVED_OBJECT_TYPE,
+      });
 
-    return requestedBenchmarkRules.map((item) => item.attributes);
+      const requestedBenchmarkRules = cspBenchmarkRulesSavedObjects.saved_objects.filter(
+        (cspBenchmarkRule: any) => cspBenchmarkRule.attributes.metadata.benchmark.id === benchmarkId
+      );
+
+      expect(requestedBenchmarkRules.length).greaterThan(0);
+      cspBenchmarkRules = requestedBenchmarkRules.map((item) => item.attributes);
+    });
+    return cspBenchmarkRules;
   };
 
   const getMockFinding = (rule: CspBenchmarkRule, evaluation: string) => ({
@@ -143,8 +148,7 @@ export default function (providerContext: FtrProviderContext) {
     },
   };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/179815
-  describe.skip('GET /internal/cloud_security_posture/benchmarks', () => {
+  describe('GET /internal/cloud_security_posture/benchmarks', () => {
     describe('Get Benchmark API', async () => {
       beforeEach(async () => {
         await index.removeFindings();
@@ -158,10 +162,9 @@ export default function (providerContext: FtrProviderContext) {
         const benchmark = 'cis_aws';
         const benchmarkRules = await getCspBenchmarkRules(benchmark);
 
-        const cspmFinding1 = getMockFinding(benchmarkRules[0], 'passed');
-        const cspmFinding2 = getMockFinding(benchmarkRules[1], 'failed');
+        const cspmFinding = getMockFinding(benchmarkRules[0], 'passed');
 
-        await index.addFindings([cspmFinding1, cspmFinding2]);
+        await index.addFindings([cspmFinding]);
 
         const { body: benchmarksBeforeMute } = await supertest
           .get('/internal/cloud_security_posture/benchmarks')
@@ -174,7 +177,7 @@ export default function (providerContext: FtrProviderContext) {
           (item: { id: string }) => item.id === benchmark
         );
 
-        expect(scoreBeforeMute.score.postureScore).to.equal(50);
+        expect(scoreBeforeMute.score.postureScore).to.equal(100);
 
         await supertest
           .post(`/internal/cloud_security_posture/rules/_bulk_action`)
@@ -185,10 +188,10 @@ export default function (providerContext: FtrProviderContext) {
             action: 'mute',
             rules: [
               {
-                benchmark_id: cspmFinding2.rule.benchmark.id,
-                benchmark_version: cspmFinding2.rule.benchmark.version,
-                rule_number: cspmFinding2.rule.benchmark.rule_number || '',
-                rule_id: cspmFinding2.rule.id,
+                benchmark_id: cspmFinding.rule.benchmark.id,
+                benchmark_version: cspmFinding.rule.benchmark.version,
+                rule_number: cspmFinding.rule.benchmark.rule_number || '',
+                rule_id: cspmFinding.rule.id,
               },
             ],
           })
@@ -205,17 +208,16 @@ export default function (providerContext: FtrProviderContext) {
           (item: { id: string }) => item.id === benchmark
         );
 
-        expect(scoreAfterMute.score.postureScore).to.equal(100);
+        expect(scoreAfterMute.score.postureScore).to.equal(0);
       });
 
       it('Verify kspm benchmark score is updated when muting rules', async () => {
         const benchmark = 'cis_k8s';
         const benchmarkRules = await getCspBenchmarkRules(benchmark);
 
-        const kspmFinding1 = getMockFinding(benchmarkRules[0], 'passed');
-        const kspmFinding2 = getMockFinding(benchmarkRules[1], 'failed');
+        const kspmFinding = getMockFinding(benchmarkRules[0], 'passed');
 
-        await index.addFindings([kspmFinding1, kspmFinding2]);
+        await index.addFindings([kspmFinding]);
         const { body: benchmarksBeforeMute } = await supertest
           .get('/internal/cloud_security_posture/benchmarks')
           .set(ELASTIC_HTTP_VERSION_HEADER, '2')
@@ -227,7 +229,7 @@ export default function (providerContext: FtrProviderContext) {
           (item: { id: string }) => item.id === benchmark
         );
 
-        expect(scoreBeforeMute.score.postureScore).to.equal(50);
+        expect(scoreBeforeMute.score.postureScore).to.equal(100);
 
         await supertest
           .post(`/internal/cloud_security_posture/rules/_bulk_action`)
@@ -238,10 +240,10 @@ export default function (providerContext: FtrProviderContext) {
             action: 'mute',
             rules: [
               {
-                benchmark_id: kspmFinding2.rule.benchmark.id,
-                benchmark_version: kspmFinding2.rule.benchmark.version,
-                rule_number: kspmFinding2.rule.benchmark.rule_number || '',
-                rule_id: kspmFinding2.rule.id,
+                benchmark_id: kspmFinding.rule.benchmark.id,
+                benchmark_version: kspmFinding.rule.benchmark.version,
+                rule_number: kspmFinding.rule.benchmark.rule_number || '',
+                rule_id: kspmFinding.rule.id,
               },
             ],
           })
@@ -258,7 +260,7 @@ export default function (providerContext: FtrProviderContext) {
           (item: { id: string }) => item.id === benchmark
         );
 
-        expect(scoreAfterMute.score.postureScore).to.equal(100);
+        expect(scoreAfterMute.score.postureScore).to.equal(0);
       });
     });
   });
diff --git a/x-pack/test/cloud_security_posture_api/routes/vulnerabilities_dashboard.ts b/x-pack/test/cloud_security_posture_api/routes/vulnerabilities_dashboard.ts
index aa2887a04da21..8f2a2fa2693d4 100644
--- a/x-pack/test/cloud_security_posture_api/routes/vulnerabilities_dashboard.ts
+++ b/x-pack/test/cloud_security_posture_api/routes/vulnerabilities_dashboard.ts
@@ -186,16 +186,13 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Vulnerability Dashboard API', async () => {
     beforeEach(async () => {
+      await index.removeFindings();
+      await index.removeScores();
       await waitForPluginInitialized();
       await index.addScores(scoresVulnerabilitiesMock);
       await index.addFindings(vulnerabilitiesLatestMock);
     });
 
-    afterEach(async () => {
-      await index.removeFindings();
-      await index.removeScores();
-    });
-
     it('responds with a 200 status code and matching data mock', async () => {
       const { body } = await supertest
         .get(`/internal/cloud_security_posture/vulnerabilities_dashboard`)
diff --git a/x-pack/test/cloud_security_posture_functional/cloud_tests/basic_ui_sanity.ts b/x-pack/test/cloud_security_posture_functional/cloud_tests/basic_ui_sanity.ts
deleted file mode 100644
index 495105017e5c2..0000000000000
--- a/x-pack/test/cloud_security_posture_functional/cloud_tests/basic_ui_sanity.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getPageObjects, getService }: FtrProviderContext) => {
-  const retry = getService('retry');
-  const pageObjects = getPageObjects(['common', 'cloudPostureDashboard', 'header']);
-
-  describe('Cloud Posture Dashboard Page', function () {
-    this.tags(['cloud_security_posture_ui_sanity']);
-    let cspDashboard: typeof pageObjects.cloudPostureDashboard;
-    let dashboard: typeof pageObjects.cloudPostureDashboard.dashboard;
-
-    before(async () => {
-      cspDashboard = pageObjects.cloudPostureDashboard;
-      dashboard = pageObjects.cloudPostureDashboard.dashboard;
-      await cspDashboard.waitForPluginInitialized();
-      await cspDashboard.navigateToComplianceDashboardPage();
-      await retry.waitFor(
-        'Cloud posture integration dashboard to be displayed',
-        async () => !!dashboard.getIntegrationDashboardContainer()
-      );
-    });
-
-    describe('Cloud Dashboard', () => {
-      it('displays compliance score greater than 40', async () => {
-        await pageObjects.header.waitUntilLoadingHasFinished();
-        const scoreElement = await dashboard.getCloudComplianceScore();
-        const score = parseInt((await scoreElement.getVisibleText()).replace('%', ''), 10);
-        expect(score).to.be.greaterThan(40);
-      });
-
-      it('displays all compliance scores', async () => {
-        const scoresElements = await dashboard.getAllCloudComplianceScores();
-        const scores: string[] = [];
-        for (const scoreElement of scoresElements) {
-          scores.push(await scoreElement.getVisibleText());
-        }
-        // 3 scores for each cloud provider + 1 summary score
-        expect(scores.length).to.be(4);
-      });
-
-      it('displays a number of resources evaluated greater than 3000', async () => {
-        const resourcesEvaluated = await dashboard.getCloudResourcesEvaluated();
-        const visibleText = await resourcesEvaluated.getVisibleText();
-        const resourcesEvaluatedCount = parseInt(visibleText.replace(/,/g, ''), 10);
-        expect(resourcesEvaluatedCount).greaterThan(3000);
-      });
-    });
-
-    describe('Kubernetes Dashboard', () => {
-      it('displays compliance score greater than 80', async () => {
-        await pageObjects.header.waitUntilLoadingHasFinished();
-        const scoreElement = await dashboard.getKubernetesComplianceScore();
-        const score = parseInt((await scoreElement.getVisibleText()).replace('%', ''), 10);
-        expect(score).to.be.greaterThan(80);
-      });
-
-      it('displays a number of resources evaluated greater than 150', async () => {
-        const resourcesEvaluated = await dashboard.getKubernetesResourcesEvaluated();
-        const resourcesEvaluatedCount = parseInt(
-          (await resourcesEvaluated.getVisibleText()).replace(/,/g, ''),
-          10
-        );
-        expect(resourcesEvaluatedCount).greaterThan(150);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/cloud_security_posture_functional/cloud_tests/benchmark_sanity.ts b/x-pack/test/cloud_security_posture_functional/cloud_tests/benchmark_sanity.ts
new file mode 100644
index 0000000000000..277c1038e51ae
--- /dev/null
+++ b/x-pack/test/cloud_security_posture_functional/cloud_tests/benchmark_sanity.ts
@@ -0,0 +1,50 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const pageObjects = getPageObjects(['common', 'benchmark']);
+
+  describe('Benchmark Page - Sanity Tests', function () {
+    this.tags(['cloud_security_posture_ui_sanity']);
+    let benchmark: typeof pageObjects.benchmark;
+
+    before(async () => {
+      benchmark = pageObjects.benchmark;
+      await benchmark.navigateToBenchnmarkPage();
+      await benchmark.waitForPluginInitialized();
+    });
+
+    it('Benchmark table exists', async () => {
+      expect(await benchmark.benchmarkPage.doesBenchmarkTableExists());
+    });
+
+    it('Benchmarks count is more than 0', async () => {
+      const benchmarksRows = await benchmark.benchmarkPage.getBenchmarkTableRows();
+      expect(benchmarksRows.length).to.be.greaterThan(0);
+    });
+
+    it('For each benchmark, evaluation and complience are not empty', async () => {
+      const benchmarksRows = await benchmark.benchmarkPage.getBenchmarkTableRows();
+      for (const row of benchmarksRows) {
+        const benchmarkName = await benchmark.benchmarkPage.getCisNameCellData(row);
+        const evaluated = await benchmark.benchmarkPage.getEvaluatedCellData(row);
+        const compliance = await benchmark.benchmarkPage.getComplianceCellData(row);
+        expect(await evaluated).to.not.contain(
+          'Add',
+          `The ${benchmarkName} does not have evaluated data`
+        );
+        expect(await compliance).to.not.contain(
+          'No',
+          `The ${benchmarkName} does not have compliance data`
+        );
+      }
+    });
+  });
+};
diff --git a/x-pack/test/cloud_security_posture_functional/cloud_tests/dashboard_sanity.ts b/x-pack/test/cloud_security_posture_functional/cloud_tests/dashboard_sanity.ts
new file mode 100644
index 0000000000000..6eaafcb154134
--- /dev/null
+++ b/x-pack/test/cloud_security_posture_functional/cloud_tests/dashboard_sanity.ts
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const retry = getService('retry');
+  const pageObjects = getPageObjects(['common', 'cloudPostureDashboard', 'header', 'findings']);
+
+  describe('Cloud Posture Dashboard Page - Sanity Tests', function () {
+    this.tags(['cloud_security_posture_ui_sanity']);
+    let cspDashboard: typeof pageObjects.cloudPostureDashboard;
+    let dashboard: typeof pageObjects.cloudPostureDashboard.dashboard;
+    let findings: typeof pageObjects.findings;
+    let TAB_TYPES: typeof pageObjects.cloudPostureDashboard.TAB_TYPES;
+
+    before(async () => {
+      cspDashboard = pageObjects.cloudPostureDashboard;
+      dashboard = pageObjects.cloudPostureDashboard.dashboard;
+      findings = pageObjects.findings;
+      TAB_TYPES = pageObjects.cloudPostureDashboard.TAB_TYPES;
+      await cspDashboard.waitForPluginInitialized();
+      await cspDashboard.navigateToComplianceDashboardPage();
+      await retry.waitFor(
+        'Cloud posture integration dashboard to be displayed',
+        async () => !!dashboard.getIntegrationDashboardContainer()
+      );
+    });
+
+    describe('Cloud Dashboard', () => {
+      it('displays compliance score greater than 40', async () => {
+        await pageObjects.header.waitUntilLoadingHasFinished();
+        const scoreElement = await dashboard.getCloudComplianceScore();
+        const score = parseInt((await scoreElement.getVisibleText()).replace('%', ''), 10);
+        expect(score).to.be.greaterThan(40);
+      });
+
+      it('displays all compliance scores', async () => {
+        const scoresElements = await dashboard.getAllCloudComplianceScores();
+        const scores: string[] = [];
+        for (const scoreElement of scoresElements) {
+          scores.push(await scoreElement.getVisibleText());
+        }
+        // 3 scores for each cloud provider + 1 summary score
+        expect(scores.length).to.be(4);
+      });
+
+      it('displays a number of resources evaluated greater than 1500', async () => {
+        const resourcesEvaluated = await dashboard.getCloudResourcesEvaluated();
+        const visibleText = await resourcesEvaluated.getVisibleText();
+        const resourcesEvaluatedCount = parseInt(visibleText.replace(/,/g, ''), 10);
+        expect(resourcesEvaluatedCount).greaterThan(1500);
+      });
+
+      it('Compliance By CIS sections have non empty values', async () => {
+        const complianceScoresChartPanel = await dashboard.getAllComplianceScoresByCisSection(
+          TAB_TYPES.CLOUD
+        );
+        expect(complianceScoresChartPanel.length).to.be.greaterThan(0);
+        for (const score of complianceScoresChartPanel) {
+          const scoreValue = await score.getVisibleText();
+          // Check if the score is a percentage
+          expect(scoreValue).to.match(/^\d+%$/);
+        }
+      });
+
+      it('Navigation to Findings page', async () => {
+        const findingsLinkCount = await dashboard.getFindingsLinksCount(TAB_TYPES.CLOUD);
+        for (let i = 0; i < findingsLinkCount; i++) {
+          const link = await dashboard.getFindingsLinkAtIndex(TAB_TYPES.CLOUD, i);
+          // for (const link of findingsLink) {
+          await link.click();
+          await pageObjects.header.waitUntilLoadingHasFinished();
+          const groupSelector = await findings.groupSelector();
+          await groupSelector.openDropDown();
+          await groupSelector.setValue('None');
+          expect(
+            await findings.createDataTableObject('latest_findings_table').getRowsCount()
+          ).to.be.greaterThan(0);
+          await cspDashboard.navigateToComplianceDashboardPage();
+          await pageObjects.header.waitUntilLoadingHasFinished();
+        }
+      });
+    });
+
+    describe('Kubernetes Dashboard', () => {
+      it('displays compliance score greater than 80', async () => {
+        await pageObjects.header.waitUntilLoadingHasFinished();
+        const scoreElement = await dashboard.getKubernetesComplianceScore();
+        const score = parseInt((await scoreElement.getVisibleText()).replace('%', ''), 10);
+        expect(score).to.be.greaterThan(80);
+      });
+
+      it('displays a number of resources evaluated greater than 150', async () => {
+        const resourcesEvaluated = await dashboard.getKubernetesResourcesEvaluated();
+        const resourcesEvaluatedCount = parseInt(
+          (await resourcesEvaluated.getVisibleText()).replace(/,/g, ''),
+          10
+        );
+        expect(resourcesEvaluatedCount).greaterThan(150);
+      });
+
+      it('Compliance By CIS sections have non empty values', async () => {
+        const complianceScoresChartPanel = await dashboard.getAllComplianceScoresByCisSection(
+          'Kubernetes'
+        );
+        expect(complianceScoresChartPanel.length).to.be.greaterThan(0);
+        for (const score of complianceScoresChartPanel) {
+          const scoreValue = await score.getVisibleText();
+          // Check if the score is a percentage
+          expect(scoreValue).to.match(/^\d+%$/);
+        }
+      });
+
+      it('Navigation to Findings page', async () => {
+        const findingsLinkCount = await dashboard.getFindingsLinksCount(TAB_TYPES.KUBERNETES);
+        for (let i = 0; i < findingsLinkCount; i++) {
+          const link = await dashboard.getFindingsLinkAtIndex(TAB_TYPES.KUBERNETES, i);
+          await link.click();
+          await pageObjects.header.waitUntilLoadingHasFinished();
+          const groupSelector = await findings.groupSelector();
+          await groupSelector.openDropDown();
+          await groupSelector.setValue('None');
+          expect(
+            await findings.createDataTableObject('latest_findings_table').getRowsCount()
+          ).to.be.greaterThan(0);
+          await cspDashboard.navigateToComplianceDashboardPage();
+          await pageObjects.header.waitUntilLoadingHasFinished();
+          await dashboard.getKubernetesDashboard();
+        }
+      });
+    });
+  });
+};
diff --git a/x-pack/test/cloud_security_posture_functional/cloud_tests/findings_sanity.ts b/x-pack/test/cloud_security_posture_functional/cloud_tests/findings_sanity.ts
new file mode 100644
index 0000000000000..fd8c8a956b1d5
--- /dev/null
+++ b/x-pack/test/cloud_security_posture_functional/cloud_tests/findings_sanity.ts
@@ -0,0 +1,175 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getPageObjects, getService }: FtrProviderContext) => {
+  const pageObjects = getPageObjects(['common', 'findings', 'header']);
+  const queryBar = getService('queryBar');
+  const testSubjects = getService('testSubjects');
+
+  describe('Findings Page - Sanity Tests', function () {
+    this.tags(['cloud_security_posture_ui_sanity']);
+    let findings: typeof pageObjects.findings;
+    let latestFindingsTable: typeof findings.latestFindingsTable;
+
+    before(async () => {
+      findings = pageObjects.findings;
+      latestFindingsTable = pageObjects.findings.latestFindingsTable;
+      await findings.navigateToLatestFindingsPage();
+      await findings.waitForPluginInitialized();
+    });
+
+    describe('Findings - Querying data', () => {
+      afterEach(async () => {
+        // Reset the group selector to None
+        const groupSelector = await findings.groupSelector();
+        await groupSelector.openDropDown();
+        await groupSelector.setValue('None');
+        // Reset search query
+        await queryBar.clearQuery();
+        await queryBar.submitQuery();
+      });
+
+      const testCases = [
+        {
+          searchQuery:
+            'cloud.provider : "aws" and cloud.region : "eu-west-3" and result.evaluation : "failed"  and rule.tags : "CIS 5.4"',
+          provider: 'aws',
+          expectedRowsCount: 3,
+          expectedGroupCount: '1 cloud account',
+          expectedUnitCount: '3 findings',
+        },
+        {
+          searchQuery:
+            'cloud.provider : "gcp" and rule.benchmark.rule_number : "3.1" and result.evaluation : "failed"',
+          provider: 'gcp',
+          expectedRowsCount: 1,
+          expectedGroupCount: '1 cloud account',
+          expectedUnitCount: '1 finding',
+        },
+        {
+          searchQuery:
+            'cloud.provider : "azure" and rule.benchmark.rule_number : "7.1" and result.evaluation : "failed"',
+          provider: 'azure',
+          expectedRowsCount: 1,
+          expectedGroupCount: '1 cloud account',
+          expectedUnitCount: '1 finding',
+        },
+        {
+          searchQuery:
+            'rule.benchmark.id : "cis_k8s" and rule.benchmark.rule_number : "4.2.4" and result.evaluation : "failed"',
+          provider: 'k8s',
+          expectedRowsCount: 2,
+          expectedGroupCount: '0 cloud accounts',
+          expectedUnitCount: '2 findings',
+        },
+        {
+          searchQuery: 'rule.benchmark.id : "cis_eks" and rule.benchmark.rule_number : "3.1.1"',
+          provider: 'eks',
+          expectedRowsCount: 2,
+          expectedGroupCount: '0 cloud accounts',
+          expectedUnitCount: '2 findings',
+        },
+      ];
+
+      testCases.forEach(
+        ({ searchQuery, provider, expectedRowsCount, expectedGroupCount, expectedUnitCount }) => {
+          it(`Querying ${provider} provider data`, async () => {
+            // Execute the query
+            await queryBar.setQuery(searchQuery);
+            await queryBar.submitQuery();
+            // Get the number of rows in the data table
+            const rowsCount = await findings
+              .createDataTableObject('latest_findings_table')
+              .getRowsCount();
+
+            // Check that the number of rows matches the expected count
+            expect(rowsCount).to.be(expectedRowsCount);
+            const groupSelector = await findings.groupSelector();
+            await groupSelector.openDropDown();
+            await groupSelector.setValue('Cloud account');
+            const grouping = await findings.findingsGrouping();
+            // Check that the group count and unit count matches the expected values
+            const groupCount = await grouping.getGroupCount();
+            expect(groupCount).to.be(expectedGroupCount);
+
+            const unitCount = await grouping.getUnitCount();
+            expect(unitCount).to.be(expectedUnitCount);
+          });
+        }
+      );
+    });
+
+    describe('Findings - Sorting data', () => {
+      afterEach(async () => {
+        const paginationBtn = await testSubjects.find('tablePaginationPopoverButton');
+        await paginationBtn.click();
+        const pageSizeOption = await testSubjects.find('tablePagination-50-rows');
+        await pageSizeOption.click();
+      });
+
+      type SortDirection = 'asc' | 'desc';
+      const paginationAndsortingTestCases: Array<{
+        searchQuery: string;
+        paginationRowsCount: string;
+        columnName: string;
+        sortType: SortDirection;
+        expectedResult: string;
+      }> = [
+        {
+          searchQuery:
+            'cloud.provider : "aws" and resource.sub_type : "aws-iam-user" and result.evaluation : "passed"',
+          paginationRowsCount: '250',
+          columnName: 'rule.benchmark.rule_number',
+          sortType: 'desc',
+          expectedResult: '1.7',
+        },
+        {
+          searchQuery: 'cloud.provider : "azure" and result.evaluation : "failed"',
+          paginationRowsCount: '500',
+          columnName: 'rule.benchmark.rule_number',
+          sortType: 'asc',
+          expectedResult: '1.23',
+        },
+        {
+          searchQuery: 'cloud.provider : "gcp" and result.evaluation : "passed"',
+          paginationRowsCount: '500',
+          columnName: 'resource.sub_type',
+          sortType: 'desc',
+          expectedResult: 'gcp-storage-bucket',
+        },
+      ];
+
+      paginationAndsortingTestCases.forEach(
+        ({ searchQuery, paginationRowsCount, columnName, sortType, expectedResult }) => {
+          it(`Paginating and sorting data`, async () => {
+            // Run query
+            await queryBar.clearQuery();
+            await queryBar.setQuery(searchQuery);
+            await queryBar.submitQuery();
+            // Update latest findings table pagination
+            const paginationBtn = await testSubjects.find('tablePaginationPopoverButton');
+            await paginationBtn.click();
+            const pageSizeOption = await testSubjects.find(
+              `tablePagination-${paginationRowsCount}-rows`
+            );
+            await pageSizeOption.click();
+            // Sort by column
+            await latestFindingsTable.toggleColumnSort(columnName, sortType);
+            await pageObjects.header.waitUntilLoadingHasFinished();
+            const values = (await latestFindingsTable.getColumnValues(columnName)).filter(Boolean);
+            // Check that the first value matches the expected result
+            // Whole sorting logic functionality is checked in the findings.ts
+            expect(values[0]).to.equal(expectedResult);
+          });
+        }
+      );
+    });
+  });
+};
diff --git a/x-pack/test/cloud_security_posture_functional/cloud_tests/index.ts b/x-pack/test/cloud_security_posture_functional/cloud_tests/index.ts
index b08970ccaed13..80afb04563326 100644
--- a/x-pack/test/cloud_security_posture_functional/cloud_tests/index.ts
+++ b/x-pack/test/cloud_security_posture_functional/cloud_tests/index.ts
@@ -10,6 +10,8 @@ import { FtrProviderContext } from '../ftr_provider_context';
 // eslint-disable-next-line import/no-default-export
 export default function ({ loadTestFile }: FtrProviderContext) {
   describe('Cloud Security Posture', function () {
-    loadTestFile(require.resolve('./basic_ui_sanity'));
+    loadTestFile(require.resolve('./dashboard_sanity'));
+    loadTestFile(require.resolve('./benchmark_sanity'));
+    loadTestFile(require.resolve('./findings_sanity'));
   });
 }
diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
index 1b2eda553dba2..75ba76b067cc9 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/add_cis_integration_form_page.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { v4 as uuidv4 } from 'uuid';
 import type { FtrProviderContext } from '../ftr_provider_context';
 
 export function AddCisIntegrationFormPageProvider({
@@ -282,6 +283,17 @@ export function AddCisIntegrationFormPageProvider({
     return await testSubjects.find(`button-replace-${secretField}`);
   };
 
+  const inputUniqueIntegrationName = async () => {
+    const flyout = await testSubjects.find('createPackagePolicy_page');
+    const nameField = await flyout.findAllByCssSelector('input[id="name"]');
+    await nameField[0].type(uuidv4());
+  };
+
+  const getSecretComponentReplaceButton = async (secretButtonSelector: string) => {
+    const secretComponentReplaceButton = await testSubjects.find(secretButtonSelector);
+    return secretComponentReplaceButton;
+  };
+
   return {
     cisAzure,
     cisAws,
@@ -316,5 +328,7 @@ export function AddCisIntegrationFormPageProvider({
     isOptionChecked,
     checkIntegrationPliAuthBlockExists,
     getReplaceSecretButton,
+    getSecretComponentReplaceButton,
+    inputUniqueIntegrationName,
   };
 }
diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/benchmark_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/benchmark_page.ts
index 39856fa34d3fb..25ae1181f38b5 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/benchmark_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/benchmark_page.ts
@@ -40,6 +40,28 @@ export function BenchmarkPagePageProvider({ getService, getPageObjects }: FtrPro
     doesBenchmarkTableExists: async () => {
       return await testSubjects.find('csp_benchmarks_table');
     },
+
+    getBenchmarkTableRows: async () => {
+      const benchmarkTable = await testSubjects.find(CSP_BECNHMARK_TABLE);
+      return await benchmarkTable.findAllByXpath(`//tbody//tr`);
+    },
+
+    getCellData: async (row: any, cellDataTestSubj: string) => {
+      const cell = await row.findByTestSubject(cellDataTestSubj);
+      return await cell.getVisibleText();
+    },
+
+    getEvaluatedCellData: async (row: any) => {
+      return await benchmarkPage.getCellData(row, 'benchmark-table-column-evaluated');
+    },
+
+    getComplianceCellData: async (row: any) => {
+      return await benchmarkPage.getCellData(row, 'benchmark-table-column-compliance');
+    },
+
+    getCisNameCellData: async (row: any) => {
+      return await benchmarkPage.getCellData(row, 'benchmark-table-column-cis-name');
+    },
   };
 
   const navigateToBenchnmarkPage = async () => {
diff --git a/x-pack/test/cloud_security_posture_functional/page_objects/csp_dashboard_page.ts b/x-pack/test/cloud_security_posture_functional/page_objects/csp_dashboard_page.ts
index 4343662e32efd..6f40f7b07003d 100644
--- a/x-pack/test/cloud_security_posture_functional/page_objects/csp_dashboard_page.ts
+++ b/x-pack/test/cloud_security_posture_functional/page_objects/csp_dashboard_page.ts
@@ -52,6 +52,11 @@ export function CspDashboardPageProvider({ getService, getPageObjects }: FtrProv
     },
   };
 
+  const TAB_TYPES = {
+    CLOUD: 'Cloud',
+    KUBERNETES: 'Kubernetes',
+  } as const;
+
   const dashboard = {
     getDashboardPageHeader: () => testSubjects.find('cloud-posture-dashboard-page-header'),
 
@@ -63,31 +68,65 @@ export function CspDashboardPageProvider({ getService, getPageObjects }: FtrProv
 
     getCloudTab: async () => {
       const tabs = await dashboard.getDashboardTabs();
-      return await tabs.findByXpath(`//span[text()="Cloud"]`);
+      return await tabs.findByXpath(`//span[text()="${TAB_TYPES.CLOUD}"]`);
     },
 
     getKubernetesTab: async () => {
       const tabs = await dashboard.getDashboardTabs();
-      return await tabs.findByXpath(`//span[text()="Kubernetes"]`);
+      return await tabs.findByXpath(`//span[text()="${TAB_TYPES.KUBERNETES}"]`);
     },
 
-    clickTab: async (tab: 'Cloud' | 'Kubernetes') => {
-      if (tab === 'Cloud') {
+    clickTab: async (tab: typeof TAB_TYPES[keyof typeof TAB_TYPES]) => {
+      if (tab === TAB_TYPES.CLOUD) {
         const cloudTab = await dashboard.getCloudTab();
         await cloudTab.click();
       }
-      if (tab === 'Kubernetes') {
+      if (tab === TAB_TYPES.KUBERNETES) {
         const k8sTab = await dashboard.getKubernetesTab();
         await k8sTab.click();
       }
     },
 
+    getAllComplianceScoresByCisSection: async (tab: typeof TAB_TYPES[keyof typeof TAB_TYPES]) => {
+      await dashboard.getDashoard(tab);
+      const pageContainer = await testSubjects.find('pageContainer');
+      return await pageContainer.findAllByTestSubject('cloudSecurityFindingsComplianceScore');
+    },
+
+    getDashoard: async (tab: typeof TAB_TYPES[keyof typeof TAB_TYPES]) => {
+      if (tab === TAB_TYPES.CLOUD) {
+        return await dashboard.getCloudDashboard();
+      }
+      if (tab === TAB_TYPES.KUBERNETES) {
+        return await dashboard.getKubernetesDashboard();
+      }
+    },
+
+    getFindingsLinks: async (tab: typeof TAB_TYPES[keyof typeof TAB_TYPES]) => {
+      await dashboard.getDashoard(tab);
+      const pageContainer = await testSubjects.find('pageContainer');
+      return await pageContainer.findAllByXpath(`//button[contains(@class, 'euiLink')]`);
+    },
+
+    getFindingsLinkAtIndex: async (
+      tab: typeof TAB_TYPES[keyof typeof TAB_TYPES],
+      linkIndex = 0
+    ) => {
+      const allLinks = await dashboard.getFindingsLinks(tab);
+      return await allLinks[linkIndex];
+    },
+
+    getFindingsLinksCount: async (tab: typeof TAB_TYPES[keyof typeof TAB_TYPES]) => {
+      const allLinks = await dashboard.getFindingsLinks(tab);
+      return await allLinks.length;
+    },
+
     getIntegrationDashboardContainer: () => testSubjects.find('dashboard-container'),
 
     // Cloud Dashboard
 
     getCloudDashboard: async () => {
-      await dashboard.clickTab('Cloud');
+      await dashboard.clickTab(TAB_TYPES.CLOUD);
       return await testSubjects.find('cloud-dashboard-container');
     },
 
@@ -119,7 +158,7 @@ export function CspDashboardPageProvider({ getService, getPageObjects }: FtrProv
     // Kubernetes Dashboard
 
     getKubernetesDashboard: async () => {
-      await dashboard.clickTab('Kubernetes');
+      await dashboard.clickTab(TAB_TYPES.KUBERNETES);
       return await testSubjects.find('kubernetes-dashboard-container');
     },
 
@@ -161,5 +200,6 @@ export function CspDashboardPageProvider({ getService, getPageObjects }: FtrProv
     navigateToComplianceDashboardPage,
     dashboard,
     index,
+    TAB_TYPES,
   };
 }
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cnvm/cis_integration_cnvm.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cnvm/cis_integration_cnvm.ts
index 1b57e9a65d41e..a91d35ea668be 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cnvm/cis_integration_cnvm.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cnvm/cis_integration_cnvm.ts
@@ -23,12 +23,13 @@ export default function (providerContext: FtrProviderContext) {
       await cisIntegration.navigateToAddIntegrationCspmPage();
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/186302
-    describe.skip('CNVM AWS', () => {
+    describe('CNVM AWS', () => {
       it('Hyperlink on PostInstallation Modal should have the correct URL', async () => {
         await cisIntegration.navigateToAddIntegrationCnvmPage();
+        await cisIntegration.inputUniqueIntegrationName();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegration.getUrlOnPostInstallModal()) ===
             'https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-whatis-howdoesitwork.html'
@@ -50,8 +51,10 @@ export default function (providerContext: FtrProviderContext) {
 
       it('Clicking on Launch CloudFormation on post intall modal should lead user to Cloud Formation page', async () => {
         await cisIntegration.navigateToAddIntegrationCnvmPage();
+        await cisIntegration.inputUniqueIntegrationName();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (
             await cisIntegration.clickLaunchAndGetCurrentUrl(
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_aws.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_aws.ts
index 5523e05120912..10c2f0560237c 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_aws.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_aws.ts
@@ -48,11 +48,11 @@ export default function (providerContext: FtrProviderContext) {
       it('Hyperlink on PostInstallation Modal should have the correct URL', async () => {
         await cisIntegration.clickOptionButton(CIS_AWS_OPTION_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationAws.getPostInstallCloudFormationModal()) !== undefined).to.be(
           true
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegration.getUrlOnPostInstallModal()) ===
             'https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-whatis-howdoesitwork.html'
@@ -73,7 +73,7 @@ export default function (providerContext: FtrProviderContext) {
       it('Clicking on Launch CloudFormation on post intall modal should lead user to Cloud Formation page', async () => {
         await cisIntegration.clickOptionButton(CIS_AWS_OPTION_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (
             await cisIntegration.clickLaunchAndGetCurrentUrl(
@@ -92,7 +92,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(ROLE_ARN_TEST_ID, roleArn);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect((await cisIntegration.getFieldValueInEditPage(ROLE_ARN_TEST_ID)) === roleArn).to.be(
@@ -109,7 +109,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'direct_access_keys');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(DIRECT_ACCESS_KEY_ID_TEST_ID, directAccessKeyId);
         await cisIntegration.fillInTextField(
@@ -117,7 +117,7 @@ export default function (providerContext: FtrProviderContext) {
           directAccessSecretKey
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect(
@@ -137,7 +137,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'temporary_keys');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(TEMP_ACCESS_KEY_ID_TEST_ID, accessKeyId);
         await cisIntegration.fillInTextField(
@@ -149,7 +149,7 @@ export default function (providerContext: FtrProviderContext) {
           tempAccessSessionToken
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -172,7 +172,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'shared_credentials');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(SHARED_CREDENTIALS_FILE_TEST_ID, sharedCredentialFile);
         await cisIntegration.fillInTextField(
@@ -180,7 +180,7 @@ export default function (providerContext: FtrProviderContext) {
           sharedCredentialProfileName
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -200,7 +200,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(CIS_AWS_OPTION_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_SINGLE_ACCOUNT_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegration.getUrlOnPostInstallModal()) ===
             'https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-whatis-howdoesitwork.html'
@@ -216,7 +216,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(ROLE_ARN_TEST_ID, roleArn);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect((await cisIntegration.getFieldValueInEditPage(ROLE_ARN_TEST_ID)) === roleArn).to.be(
@@ -234,7 +234,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'direct_access_keys');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(DIRECT_ACCESS_KEY_ID_TEST_ID, directAccessKeyId);
         await cisIntegration.fillInTextField(
@@ -242,7 +242,7 @@ export default function (providerContext: FtrProviderContext) {
           directAccessSecretKey
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect(
@@ -263,7 +263,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'temporary_keys');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(TEMP_ACCESS_KEY_ID_TEST_ID, accessKeyId);
         await cisIntegration.fillInTextField(
@@ -275,7 +275,7 @@ export default function (providerContext: FtrProviderContext) {
           tempAccessSessionToken
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -299,7 +299,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.clickOptionButton(AWS_CREDENTIAL_SELECTOR);
         await cisIntegration.selectValue(AWS_CREDENTIAL_SELECTOR, 'shared_credentials');
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(AWS_MANUAL_TEST_ID);
         await cisIntegration.fillInTextField(SHARED_CREDENTIALS_FILE_TEST_ID, sharedCredentialFile);
         await cisIntegration.fillInTextField(
@@ -307,7 +307,7 @@ export default function (providerContext: FtrProviderContext) {
           sharedCredentialProfileName
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_azure.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_azure.ts
index 99cc57905d46e..4415ec5a34160 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_azure.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_azure.ts
@@ -53,7 +53,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(CIS_AZURE_OPTION_TEST_ID);
         await cisIntegration.clickOptionButton(CIS_AZURE_SETUP_FORMAT_TEST_SUBJECTS.ARM_TEMPLATE);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationAzure.getPostInstallArmTemplateModal()) !== undefined).to.be(
           true
         );
@@ -70,7 +70,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(CIS_AZURE_SETUP_FORMAT_TEST_SUBJECTS.MANUAL);
         await cisIntegration.selectValue(AZURE_CREDENTIAL_SELECTOR, 'managed_identity');
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
       });
     });
@@ -83,7 +83,7 @@ export default function (providerContext: FtrProviderContext) {
           AZURE_CREDENTIAL_SELECTOR,
           'service_principal_with_client_secret'
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.fillInTextField(
           CIS_AZURE_INPUT_FIELDS_TEST_SUBJECTS.CLIENT_ID,
           clientId
@@ -97,7 +97,7 @@ export default function (providerContext: FtrProviderContext) {
           clientSecret
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -123,7 +123,7 @@ export default function (providerContext: FtrProviderContext) {
           AZURE_CREDENTIAL_SELECTOR,
           'service_principal_with_client_certificate'
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.fillInTextField(
           CIS_AZURE_INPUT_FIELDS_TEST_SUBJECTS.CLIENT_ID,
           clientId
@@ -137,7 +137,7 @@ export default function (providerContext: FtrProviderContext) {
           clientCertificatePath
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -164,7 +164,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(CIS_AZURE_OPTION_TEST_ID);
         await cisIntegration.clickOptionButton(CIS_AZURE_SINGLE_SUB_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationAzure.getPostInstallArmTemplateModal()) !== undefined).to.be(
           true
         );
@@ -182,7 +182,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(CIS_AZURE_SETUP_FORMAT_TEST_SUBJECTS.MANUAL);
         await cisIntegration.selectValue(AZURE_CREDENTIAL_SELECTOR, 'managed_identity');
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
       });
     });
@@ -195,7 +195,7 @@ export default function (providerContext: FtrProviderContext) {
           AZURE_CREDENTIAL_SELECTOR,
           'service_principal_with_client_secret'
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.fillInTextField(
           CIS_AZURE_INPUT_FIELDS_TEST_SUBJECTS.CLIENT_ID,
           clientId
@@ -209,7 +209,7 @@ export default function (providerContext: FtrProviderContext) {
           clientSecret
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -235,7 +235,7 @@ export default function (providerContext: FtrProviderContext) {
           AZURE_CREDENTIAL_SELECTOR,
           'service_principal_with_client_certificate'
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.fillInTextField(
           CIS_AZURE_INPUT_FIELDS_TEST_SUBJECTS.CLIENT_ID,
           clientId
@@ -249,7 +249,7 @@ export default function (providerContext: FtrProviderContext) {
           clientCertificatePath
         );
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_gcp.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_gcp.ts
index 121bf7cc2e574..e8d1dcda1f430 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_gcp.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/cspm/cis_integration_gcp.ts
@@ -17,7 +17,7 @@ const PRJ_ID_TEST_ID = 'project_id_test_id';
 const ORG_ID_TEST_ID = 'organization_id_test_id';
 const CREDENTIALS_TYPE_TEST_ID = 'credentials_type_test_id';
 const CREDENTIALS_FILE_TEST_ID = 'credentials_file_test_id';
-const CREDENTIALS_JSON_TEST_ID = 'credentials_json_test_id';
+const CREDENTIALS_JSON_TEST_ID = 'textAreaInput-credentials-json';
 
 // eslint-disable-next-line import/no-default-export
 export default function (providerContext: FtrProviderContext) {
@@ -63,7 +63,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(GCP_ORGANIZATION_TEST_ID);
         await cisIntegration.clickOptionButton(GCP_CLOUD_SHELL_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationGcp.isPostInstallGoogleCloudShellModal(true)) === true).to.be(
           true
         );
@@ -79,7 +79,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.fillInTextField('organization_id_test_id', organizationName);
 
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegrationGcp.isPostInstallGoogleCloudShellModal(
             true,
@@ -102,7 +102,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(GCP_CLOUD_SHELL_TEST_ID);
 
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationGcp.isPostInstallGoogleCloudShellModal(false)) === true).to.be(
           true
         );
@@ -111,7 +111,7 @@ export default function (providerContext: FtrProviderContext) {
       it('Hyperlink on PostInstallation Modal should have the correct URL', async () => {
         await cisIntegration.clickOptionButton(CIS_GCP_OPTION_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegration.getUrlOnPostInstallModal()) ===
             'https://cloud.google.com/shell/docs'
@@ -121,7 +121,7 @@ export default function (providerContext: FtrProviderContext) {
       it('Clicking on Launch CloudShell on post intall modal should lead user to CloudShell page', async () => {
         await cisIntegration.clickOptionButton(CIS_GCP_OPTION_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (
             await cisIntegration.clickLaunchAndGetCurrentUrl(
@@ -143,7 +143,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.fillInTextField(PRJ_ID_TEST_ID, projectName);
         await cisIntegration.fillInTextField(CREDENTIALS_FILE_TEST_ID, credentialFileName);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect(
@@ -167,12 +167,14 @@ export default function (providerContext: FtrProviderContext) {
         );
         await cisIntegration.fillInTextField(CREDENTIALS_JSON_TEST_ID, credentialJsonName);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
+        await cisIntegration.clickFirstElementOnIntegrationTable();
         expect(
-          (await cisIntegration.getFieldValueInEditPage(CREDENTIALS_JSON_TEST_ID)) ===
-            credentialJsonName
+          (await cisIntegration.getSecretComponentReplaceButton(
+            'button-replace-credentials-json'
+          )) !== undefined
         ).to.be(true);
       });
     });
@@ -183,7 +185,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(GCP_SINGLE_ACCOUNT_TEST_ID);
         await cisIntegration.clickOptionButton(GCP_CLOUD_SHELL_TEST_ID);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegrationGcp.isPostInstallGoogleCloudShellModal(false)) === true).to.be(
           true
         );
@@ -195,7 +197,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.clickOptionButton(GCP_CLOUD_SHELL_TEST_ID);
         await cisIntegration.fillInTextField('project_id_test_id', projectName);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(
           (await cisIntegrationGcp.isPostInstallGoogleCloudShellModal(false, '', projectName)) ===
             true
@@ -230,7 +232,7 @@ export default function (providerContext: FtrProviderContext) {
         await cisIntegration.fillInTextField(PRJ_ID_TEST_ID, projectName);
         await cisIntegration.fillInTextField(CREDENTIALS_FILE_TEST_ID, credentialFileName);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect(
@@ -248,7 +250,7 @@ export default function (providerContext: FtrProviderContext) {
         );
         await cisIntegration.fillInTextField(CREDENTIALS_JSON_TEST_ID, credentialJsonName);
         await cisIntegration.clickSaveIntegrationButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.navigateToIntegrationCspList();
         expect(
           (await cisIntegration.getFieldValueInEditPage(CREDENTIALS_JSON_TEST_ID)) ===
@@ -268,12 +270,14 @@ export default function (providerContext: FtrProviderContext) {
         );
         await cisIntegration.fillInTextField(CREDENTIALS_JSON_TEST_ID, credentialJsonName);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
+        await cisIntegration.clickFirstElementOnIntegrationTable();
         expect(
-          (await cisIntegration.getFieldValueInEditPage(CREDENTIALS_JSON_TEST_ID)) ===
-            credentialJsonName
+          (await cisIntegration.getSecretComponentReplaceButton(
+            'button-replace-credentials-json'
+          )) !== undefined
         ).to.be(true);
       });
       it('Users are able to switch credentials_type from/to Credential File fields ', async () => {
@@ -286,7 +290,7 @@ export default function (providerContext: FtrProviderContext) {
         );
         await cisIntegration.fillInTextField(CREDENTIALS_FILE_TEST_ID, credentialFileName);
         await cisIntegration.clickSaveIntegrationButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.navigateToIntegrationCspList();
         expect(
           (await cisIntegration.getFieldValueInEditPage(CREDENTIALS_FILE_TEST_ID)) ===
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_eks.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_eks.ts
index db567d335b0ff..f8d7736938f92 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_eks.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_eks.ts
@@ -35,14 +35,14 @@ export default function (providerContext: FtrProviderContext) {
       await cisIntegration.navigateToAddIntegrationKspmPage();
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/186306
-    describe.skip('KSPM EKS Assume Role', async () => {
+    describe('KSPM EKS Assume Role', async () => {
       it('KSPM EKS Assume Role workflow', async () => {
         const roleArn = 'RoleArnTestValue';
         await cisIntegration.clickOptionButton(CIS_EKS_OPTION_TEST_ID);
+        await cisIntegration.inputUniqueIntegrationName();
         await cisIntegration.fillInTextField(ROLE_ARN_TEST_ID, roleArn);
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect((await cisIntegration.getFieldValueInEditPage(ROLE_ARN_TEST_ID)) === roleArn).to.be(
@@ -51,22 +51,23 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/186315
-    describe.skip('KSPM EKS Direct Access', async () => {
+    describe('KSPM EKS Direct Access', async () => {
       it('KSPM EKS Direct Access Workflow', async () => {
         const directAccessKeyId = 'directAccessKeyIdTest';
         const directAccessSecretKey = 'directAccessSecretKeyTest';
         await cisIntegration.clickOptionButton(CIS_EKS_OPTION_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(EKS_DIRECT_ACCESS_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
+        await cisIntegration.inputUniqueIntegrationName();
         await cisIntegration.fillInTextField(DIRECT_ACCESS_KEY_ID_TEST_ID, directAccessKeyId);
         await cisIntegration.fillInTextField(
           DIRECT_ACCESS_SECRET_KEY_TEST_ID,
           directAccessSecretKey
         );
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         expect(
@@ -77,16 +78,16 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/186389
-    describe.skip('KSPM EKS Temporary Keys', () => {
+    describe('KSPM EKS Temporary Keys', () => {
       it('KSPM EKS Temporary Keys Workflow', async () => {
         const accessKeyId = 'accessKeyIdTest';
         const accessKeySecretKey = 'accessKeySecretKeyTest';
         const tempAccessSessionToken = 'tempAccessSessionTokenTest';
         await cisIntegration.clickOptionButton(CIS_EKS_OPTION_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(EKS_TEMPORARY_KEYS_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
+        await cisIntegration.inputUniqueIntegrationName();
         await cisIntegration.fillInTextField(TEMP_ACCESS_KEY_ID_TEST_ID, accessKeyId);
         await cisIntegration.fillInTextField(
           TEMP_ACCESS_KEY_SECRET_KEY_TEST_ID,
@@ -96,8 +97,9 @@ export default function (providerContext: FtrProviderContext) {
           TEMP_ACCESS_SESSION_TOKEN_TEST_ID,
           tempAccessSessionToken
         );
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
@@ -112,22 +114,23 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/186387
-    describe.skip('KSPM EKS Shared Credentials', () => {
+    describe('KSPM EKS Shared Credentials', () => {
       it('KSPM EKS Shared Credentials Workflow', async () => {
         const sharedCredentialFile = 'sharedCredentialFileTest';
         const sharedCredentialProfileName = 'sharedCredentialProfileNameTest';
         await cisIntegration.clickOptionButton(CIS_EKS_OPTION_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickOptionButton(EKS_SHARED_CREDENTIAL_TEST_ID);
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
+        await cisIntegration.inputUniqueIntegrationName();
         await cisIntegration.fillInTextField(SHARED_CREDENTIALS_FILE_TEST_ID, sharedCredentialFile);
         await cisIntegration.fillInTextField(
           SHARED_CREDETIALS_PROFILE_NAME_TEST_ID,
           sharedCredentialProfileName
         );
+        await pageObjects.header.waitUntilLoadingHasFinished();
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
diff --git a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_k8s.ts b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_k8s.ts
index ae2ede4046d11..872c786e3ce28 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_k8s.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/cis_integrations/kspm/cis_integration_k8s.ts
@@ -25,7 +25,7 @@ export default function (providerContext: FtrProviderContext) {
     describe('KSPM K8S', () => {
       it('KSPM K8S Workflow', async () => {
         await cisIntegration.clickSaveButton();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect((await cisIntegration.getPostInstallModal()) !== undefined).to.be(true);
         await cisIntegration.navigateToIntegrationCspList();
         await cisIntegration.clickFirstElementOnIntegrationTable();
diff --git a/x-pack/test/cloud_security_posture_functional/pages/findings.ts b/x-pack/test/cloud_security_posture_functional/pages/findings.ts
index 16e63fac3491e..3ea3475b85763 100644
--- a/x-pack/test/cloud_security_posture_functional/pages/findings.ts
+++ b/x-pack/test/cloud_security_posture_functional/pages/findings.ts
@@ -139,7 +139,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         'Findings table to be loaded',
         async () => (await latestFindingsTable.getRowsCount()) === data.length
       );
-      pageObjects.header.waitUntilLoadingHasFinished();
+      await pageObjects.header.waitUntilLoadingHasFinished();
     });
 
     afterEach(async () => {
@@ -172,7 +172,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         for (const [columnName, dir, sortingMethod] of testCases) {
           await latestFindingsTable.toggleColumnSort(columnName, dir);
           /* This sleep or delay is added to allow some time for the column to settle down before we get the value and to prevent the test from getting the wrong value*/
-          pageObjects.header.waitUntilLoadingHasFinished();
+          await pageObjects.header.waitUntilLoadingHasFinished();
           const values = (await latestFindingsTable.getColumnValues(columnName)).filter(Boolean);
           expect(values).to.not.be.empty();
           const sorted = values
@@ -297,7 +297,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           'Findings table to be loaded',
           async () => (await latestFindingsTable.getRowsCount()) === data.length + 1
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await distributionBar.filterBy('passed');
 
@@ -328,7 +328,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           'Findings table to be loaded',
           async () => (await latestFindingsTable.getRowsCount()) === data.length
         );
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
 
         await distributionBar.filterBy('passed');
 
@@ -346,7 +346,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await cspSecurity.logout();
         await cspSecurity.login('csp_read_user');
         await findings.navigateToLatestFindingsPage();
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(await latestFindingsTable.getRowsCount()).to.be.greaterThan(0);
       });
 
@@ -356,7 +356,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         await findings.navigateToLatestFindingsPage();
 
-        pageObjects.header.waitUntilLoadingHasFinished();
+        await pageObjects.header.waitUntilLoadingHasFinished();
         expect(await findings.getUnprivilegedPrompt());
       });
     });
diff --git a/x-pack/test/common/services/security_solution/endpoint_data_stream_helpers.ts b/x-pack/test/common/services/security_solution/endpoint_data_stream_helpers.ts
new file mode 100644
index 0000000000000..a5682ace379b0
--- /dev/null
+++ b/x-pack/test/common/services/security_solution/endpoint_data_stream_helpers.ts
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Client } from '@elastic/elasticsearch';
+import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
+import {
+  alertsIndexPattern,
+  eventsIndexPattern,
+  METADATA_DATASTREAM,
+  METADATA_UNITED_INDEX,
+  metadataCurrentIndexPattern,
+  metadataIndexPattern,
+  policyIndexPattern,
+  telemetryIndexPattern,
+} from '@kbn/security-solution-plugin/common/endpoint/constants';
+
+export function SecuritySolutionEndpointDataStreamHelpers() {
+  function deleteDataStream(getService: (serviceName: 'es') => Client, index: string) {
+    const client = getService('es');
+    return client.transport.request(
+      {
+        method: 'DELETE',
+        path: `_data_stream/${index}`,
+      },
+      {
+        ignore: [404],
+      }
+    );
+  }
+
+  async function deleteAllDocsFromIndex(getService: (serviceName: 'es') => Client, index: string) {
+    const client = getService('es');
+    await client.deleteByQuery(
+      {
+        query: {
+          match_all: {},
+        },
+        index,
+        wait_for_completion: true,
+        refresh: true,
+      },
+      {
+        ignore: [404],
+      }
+    );
+  }
+
+  async function deleteIndex(getService: (serviceName: 'es') => Client, index: string) {
+    const client = getService('es');
+    await client.indices.delete({ index, ignore_unavailable: true });
+  }
+
+  async function deleteMetadataStream(getService: (serviceName: 'es') => Client) {
+    await deleteDataStream(getService, metadataIndexPattern);
+  }
+
+  async function deleteAllDocsFromMetadataDatastream(getService: (serviceName: 'es') => Client) {
+    await deleteAllDocsFromIndex(getService, METADATA_DATASTREAM);
+  }
+
+  async function deleteAllDocsFromMetadataCurrentIndex(getService: (serviceName: 'es') => Client) {
+    await deleteAllDocsFromIndex(getService, metadataCurrentIndexPattern);
+  }
+
+  async function deleteAllDocsFromMetadataUnitedIndex(getService: (serviceName: 'es') => Client) {
+    await deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
+  }
+
+  async function deleteEventsStream(getService: (serviceName: 'es') => Client) {
+    await deleteDataStream(getService, eventsIndexPattern);
+  }
+
+  async function deleteAlertsStream(getService: (serviceName: 'es') => Client) {
+    await deleteDataStream(getService, alertsIndexPattern);
+  }
+
+  async function deletePolicyStream(getService: (serviceName: 'es') => Client) {
+    await deleteDataStream(getService, policyIndexPattern);
+  }
+
+  async function deleteTelemetryStream(getService: (serviceName: 'es') => Client) {
+    await deleteDataStream(getService, telemetryIndexPattern);
+  }
+
+  function deleteAllDocsFromFleetAgents(getService: (serviceName: 'es') => Client) {
+    return deleteAllDocsFromIndex(getService, AGENTS_INDEX);
+  }
+
+  function stopTransform(getService: (serviceName: 'es') => Client, transformId: string) {
+    const client = getService('es');
+    const stopRequest = {
+      transform_id: transformId,
+      force: true,
+      wait_for_completion: true,
+      allow_no_match: true,
+    };
+    return client.transform.stopTransform(stopRequest);
+  }
+
+  async function startTransform(getService: (serviceName: 'es') => Client, transformId: string) {
+    const client = getService('es');
+    const transformsResponse = await client.transform.getTransform({
+      transform_id: `${transformId}*`,
+    });
+    return Promise.all(
+      transformsResponse.transforms.map((transform) => {
+        const t = transform as unknown as { id: string };
+        return client.transform.startTransform({ transform_id: t.id });
+      })
+    );
+  }
+
+  function bulkIndex(getService: (serviceName: 'es') => Client, index: string, docs: unknown[]) {
+    const operations = docs.flatMap((doc) => [{ create: { _index: index } }, doc]);
+    const client = getService('es');
+
+    return client.bulk({
+      index,
+      refresh: 'wait_for',
+      operations,
+    });
+  }
+
+  return {
+    deleteDataStream,
+    deleteAllDocsFromIndex,
+    deleteIndex,
+    deleteMetadataStream,
+    deleteAllDocsFromMetadataDatastream,
+    deleteAllDocsFromMetadataCurrentIndex,
+    deleteAllDocsFromMetadataUnitedIndex,
+    deleteEventsStream,
+    deleteAlertsStream,
+    deletePolicyStream,
+    deleteTelemetryStream,
+    deleteAllDocsFromFleetAgents,
+    stopTransform,
+    startTransform,
+    bulkIndex,
+  };
+}
diff --git a/x-pack/test/common/services/security_solution/endpoint_registry_helpers.ts b/x-pack/test/common/services/security_solution/endpoint_registry_helpers.ts
new file mode 100644
index 0000000000000..0866042696eed
--- /dev/null
+++ b/x-pack/test/common/services/security_solution/endpoint_registry_helpers.ts
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import path from 'path';
+
+import { defineDockerServersConfig } from '@kbn/test';
+import { dockerImage as ingestDockerImage } from '../../../fleet_api_integration/config.base';
+
+export function SecuritySolutionEndpointRegistryHelpers() {
+  /**
+   * This is used by CI to set the docker registry port
+   * you can also define this environment variable locally when running tests which
+   * will spin up a local docker package registry locally for you
+   * if this is defined it takes precedence over the `packageRegistryOverride` variable
+   */
+  const dockerRegistryPort: string | undefined = process.env.FLEET_PACKAGE_REGISTRY_PORT;
+
+  /**
+   * If you don't want to use the docker image version pinned below and instead want to run your own
+   * registry or use an external registry you can define this environment variable when running
+   * the tests to use that registry url instead.
+   *
+   * This is particularly useful when a developer needs to test a new package against the kibana
+   * integration or functional tests. Instead of having to publish a whole new docker image we
+   * can set this environment variable which will point to the location of where your package registry
+   * is serving the updated package.
+   *
+   * This variable will not and should not be used by CI. CI should always use the pinned docker image below.
+   */
+  const packageRegistryOverride: string | undefined = process.env.PACKAGE_REGISTRY_URL_OVERRIDE;
+
+  const defaultRegistryConfigPath = path.join(__dirname, './fixtures/package_registry_config.yml');
+
+  const getRegistryUrlFromTestEnv = () => {
+    let registryUrl: string | undefined;
+    if (dockerRegistryPort !== undefined) {
+      registryUrl = `--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`;
+    } else if (packageRegistryOverride !== undefined) {
+      registryUrl = `--xpack.fleet.registryUrl=${packageRegistryOverride}`;
+    }
+    return registryUrl;
+  };
+
+  const isRegistryEnabled = () => {
+    return getRegistryUrlFromTestEnv() !== undefined;
+  };
+
+  return {
+    createEndpointDockerConfig(
+      packageRegistryConfig: string = defaultRegistryConfigPath,
+      dockerImage: string = ingestDockerImage,
+      dockerArgs: string[] = []
+    ) {
+      const args: string[] = [
+        '-v',
+        `${packageRegistryConfig}:/package-registry/config.yml`,
+        ...dockerArgs,
+      ];
+      return defineDockerServersConfig({
+        registry: {
+          enabled: !!dockerRegistryPort,
+          image: dockerImage,
+          portInContainer: 8080,
+          port: dockerRegistryPort,
+          args,
+          waitForLogLine: 'package manifests loaded',
+          waitForLogLineTimeoutMs: 60 * 2 * 10000, // 2 minutes,
+        },
+      });
+    },
+
+    getRegistryUrlFromTestEnv,
+
+    getRegistryUrlAsArray(): string[] {
+      const registryUrl: string | undefined = getRegistryUrlFromTestEnv();
+      return registryUrl !== undefined ? [registryUrl] : [];
+    },
+
+    isRegistryEnabled,
+  };
+}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/fixtures/package_registry_config.yml b/x-pack/test/common/services/security_solution/fixtures/package_registry_config.yml
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/fixtures/package_registry_config.yml
rename to x-pack/test/common/services/security_solution/fixtures/package_registry_config.yml
diff --git a/x-pack/test/common/services/security_solution/index.ts b/x-pack/test/common/services/security_solution/index.ts
index 657f336155cbd..de6e933f804f1 100644
--- a/x-pack/test/common/services/security_solution/index.ts
+++ b/x-pack/test/common/services/security_solution/index.ts
@@ -6,3 +6,5 @@
  */
 
 export * from './roles_users_utils';
+export * from './endpoint_data_stream_helpers';
+export * from './endpoint_registry_helpers';
diff --git a/x-pack/test/dataset_quality_api_integration/common/config.ts b/x-pack/test/dataset_quality_api_integration/common/config.ts
index e5a45b72d7f06..e297d8eaf0354 100644
--- a/x-pack/test/dataset_quality_api_integration/common/config.ts
+++ b/x-pack/test/dataset_quality_api_integration/common/config.ts
@@ -22,6 +22,7 @@ import {
 import { createDatasetQualityApiClient } from './dataset_quality_api_supertest';
 import { RegistryProvider } from './registry';
 import { DatasetQualityFtrConfigName } from '../configs';
+import { PackageService } from './package_service';
 
 export interface DatasetQualityFtrConfig {
   name: DatasetQualityFtrConfigName;
@@ -70,6 +71,7 @@ export interface CreateTest {
       context: InheritedFtrProviderContext
     ) => Promise<LogsSynthtraceEsClient>;
     datasetQualityApiClient: (context: InheritedFtrProviderContext) => DatasetQualityApiClient;
+    packageService: ({ getService }: FtrProviderContext) => ReturnType<typeof PackageService>;
   };
   junit: { reportName: string };
   esTestCluster: any;
@@ -98,6 +100,7 @@ export function createTestConfig(
       servicesRequiredForTestAnalysis: ['datasetQualityFtrConfig', 'registry'],
       services: {
         ...services,
+        packageService: PackageService,
         datasetQualityFtrConfig: () => config,
         registry: RegistryProvider,
         logSynthtraceEsClient: (context: InheritedFtrProviderContext) =>
diff --git a/x-pack/test/dataset_quality_api_integration/common/ftr_provider_context.ts b/x-pack/test/dataset_quality_api_integration/common/ftr_provider_context.ts
index 69de63c48402c..f48da8f57c18f 100644
--- a/x-pack/test/dataset_quality_api_integration/common/ftr_provider_context.ts
+++ b/x-pack/test/dataset_quality_api_integration/common/ftr_provider_context.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { GenericFtrProviderContext } from '@kbn/test';
+import { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
 import { FtrProviderContext as InheritedFtrProviderContext } from '../../api_integration/ftr_provider_context';
 import { DatasetQualityServices } from './config';
 
@@ -18,3 +18,4 @@ export type InheritedServices = InheritedFtrProviderContext extends GenericFtrPr
 
 export type { InheritedFtrProviderContext };
 export type FtrProviderContext = GenericFtrProviderContext<DatasetQualityServices, {}>;
+export class FtrService extends GenericFtrService<FtrProviderContext> {}
diff --git a/x-pack/test/dataset_quality_api_integration/common/package_service.ts b/x-pack/test/dataset_quality_api_integration/common/package_service.ts
new file mode 100644
index 0000000000000..0449fd9f921dd
--- /dev/null
+++ b/x-pack/test/dataset_quality_api_integration/common/package_service.ts
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from './ftr_provider_context';
+
+interface IntegrationPackage {
+  name: string;
+  version: string;
+}
+
+export function PackageService({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  function uninstallPackage({ name, version }: IntegrationPackage) {
+    return supertest.delete(`/api/fleet/epm/packages/${name}/${version}`).set('kbn-xsrf', 'xxxx');
+  }
+
+  function installPackage({ name, version }: IntegrationPackage) {
+    return supertest
+      .post(`/api/fleet/epm/packages/${name}/${version}`)
+      .set('kbn-xsrf', 'xxxx')
+      .send({ force: true });
+  }
+
+  return { uninstallPackage, installPackage };
+}
diff --git a/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_settings.spec.ts b/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_settings.spec.ts
index e6f75d53b6c77..e5b38d2463cb0 100644
--- a/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_settings.spec.ts
+++ b/x-pack/test/dataset_quality_api_integration/tests/data_streams/data_stream_settings.spec.ts
@@ -21,13 +21,19 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   const synthtrace = getService('logSynthtraceEsClient');
   const esClient = getService('es');
   const datasetQualityApiClient = getService('datasetQualityApiClient');
+  const pkgService = getService('packageService');
   const start = '2023-12-11T18:00:00.000Z';
   const end = '2023-12-11T18:01:00.000Z';
   const type = 'logs';
-  const dataset = 'nginx.access';
+  const dataset = 'synth.1';
+  const integrationDataset = 'apache.access';
   const namespace = 'default';
   const serviceName = 'my-service';
   const hostName = 'synth-host';
+  const pkg = {
+    name: 'apache',
+    version: '1.14.0',
+  };
 
   async function callApiAs(user: DatasetQualityApiClientKey, dataStream: string) {
     return await datasetQualityApiClient[user]({
@@ -43,6 +49,27 @@ export default function ApiTest({ getService }: FtrProviderContext) {
   registry.when('DataStream Settings', { config: 'basic' }, () => {
     describe('gets the data stream settings', () => {
       before(async () => {
+        // Install Integration and ingest logs for it
+        await pkgService.installPackage(pkg);
+        await synthtrace.index([
+          timerange(start, end)
+            .interval('1m')
+            .rate(1)
+            .generator((timestamp) =>
+              log
+                .create()
+                .message('This is a log message')
+                .timestamp(timestamp)
+                .dataset(integrationDataset)
+                .namespace(namespace)
+                .defaults({
+                  'log.file.path': '/my-service.log',
+                  'service.name': serviceName,
+                  'host.name': hostName,
+                })
+            ),
+        ]);
+        // Ingest basic logs
         await synthtrace.index([
           timerange(start, end)
             .interval('1m')
@@ -98,8 +125,22 @@ export default function ApiTest({ getService }: FtrProviderContext) {
         expect(resp.body.createdOn).to.be(Number(dataStreamSettings?.index?.creation_date));
       });
 
+      it('returns "createdOn" and "integration" correctly when available', async () => {
+        const dataStreamSettings = await getDataStreamSettingsOfEarliestIndex(
+          esClient,
+          `${type}-${integrationDataset}-${namespace}`
+        );
+        const resp = await callApiAs(
+          'datasetQualityLogsUser',
+          `${type}-${integrationDataset}-${namespace}`
+        );
+        expect(resp.body.createdOn).to.be(Number(dataStreamSettings?.index?.creation_date));
+        expect(resp.body.integration).to.be('apache');
+      });
+
       after(async () => {
         await synthtrace.clean();
+        await pkgService.uninstallPackage(pkg);
       });
     });
   });
diff --git a/x-pack/test/fleet_api_integration/apis/agents/privileges.ts b/x-pack/test/fleet_api_integration/apis/agents/privileges.ts
index 82999acd9f7c6..b244500a9463f 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/privileges.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/privileges.ts
@@ -10,12 +10,18 @@ import {
   AGENTS_INDEX,
   PACKAGE_POLICY_SAVED_OBJECT_TYPE,
 } from '@kbn/fleet-plugin/common';
+import {
+  FILE_STORAGE_DATA_AGENT_INDEX,
+  FILE_STORAGE_METADATA_AGENT_INDEX,
+} from '@kbn/fleet-plugin/server/constants';
 
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { generateAgent } from '../../helpers';
 import { runPrivilegeTests } from '../../privileges_helpers';
 import { testUsers } from '../test_users';
 
+const ES_INDEX_OPTIONS = { headers: { 'X-elastic-product-origin': 'fleet' } };
+
 export default function (providerContext: FtrProviderContext) {
   const { getService } = providerContext;
   const esArchiver = getService('esArchiver');
@@ -177,6 +183,66 @@ export default function (providerContext: FtrProviderContext) {
       });
     };
 
+    const createFileBeforeEach = async () => {
+      await es.index(
+        {
+          id: 'file1.0',
+          refresh: 'wait_for',
+          op_type: 'create',
+          index: FILE_STORAGE_DATA_AGENT_INDEX,
+          document: {
+            bid: 'file1',
+            '@timestamp': new Date().toISOString(),
+            last: true,
+            data: 'test',
+          },
+        },
+        ES_INDEX_OPTIONS
+      );
+
+      await es.index(
+        {
+          index: FILE_STORAGE_METADATA_AGENT_INDEX,
+          id: 'file1',
+          refresh: true,
+          op_type: 'create',
+          body: {
+            '@timestamp': new Date().toISOString(),
+            upload_id: 'file1',
+            action_id: `fleet_uploads_test-file1-action`,
+            agent_id: 'agent1',
+            file: {
+              ChunkSize: 4194304,
+              extension: 'zip',
+              hash: {},
+              mime_type: 'application/zip',
+              mode: '0644',
+              name: `elastic-agent-diagnostics-file-name.zip`,
+              path: `/agent/elastic-agent-diagnostics-file-name.zip`,
+              size: 24917,
+              Status: 'READY',
+              type: 'file',
+            },
+          },
+        },
+        ES_INDEX_OPTIONS
+      );
+    };
+
+    const deleteFileAfterEach = async () => {
+      await es.deleteByQuery(
+        {
+          index: `${FILE_STORAGE_DATA_AGENT_INDEX},${FILE_STORAGE_METADATA_AGENT_INDEX}`,
+          refresh: true,
+          ignore_unavailable: true,
+          query: {
+            match_all: {},
+          },
+        },
+        ES_INDEX_OPTIONS
+      );
+    };
+
     const ROUTES = [
       // READ scenarios
       {
@@ -204,6 +270,13 @@ export default function (providerContext: FtrProviderContext) {
         path: '/api/fleet/agents/agent1/request_diagnostics',
         scenarios: READ_SCENARIOS,
       },
+      {
+        method: 'GET',
+        path: '/api/fleet/agents/files/file1/elastic-agent-diagnostics-file-name.zip',
+        scenarios: READ_SCENARIOS,
+        beforeEach: createFileBeforeEach,
+        afterEach: deleteFileAfterEach,
+      },
 
       // ALL scenarios
       {
@@ -238,6 +311,13 @@ export default function (providerContext: FtrProviderContext) {
         beforeEach: updateAgentBeforeEach,
         afterEach: updateAgentAfterEach,
       },
+      {
+        method: 'DELETE',
+        path: '/api/fleet/agents/files/file1',
+        scenarios: ALL_SCENARIOS,
+        beforeEach: createFileBeforeEach,
+        afterEach: deleteFileAfterEach,
+      },
     ];
     before(async () => {
       // Make agent 1 upgradeable
diff --git a/x-pack/test/fleet_api_integration/apis/integrations/inputs_with_standalone_docker_agent.ts b/x-pack/test/fleet_api_integration/apis/integrations/inputs_with_standalone_docker_agent.ts
index ca1d8c0c3f312..a79dde78d7e88 100644
--- a/x-pack/test/fleet_api_integration/apis/integrations/inputs_with_standalone_docker_agent.ts
+++ b/x-pack/test/fleet_api_integration/apis/integrations/inputs_with_standalone_docker_agent.ts
@@ -25,7 +25,9 @@ export default function (providerContext: FtrProviderContext) {
   const config = getService('config');
   const log = getService('log');
 
-  describe('inputs_with_standalone_docker_agent', () => {
+  // Failing: See https://github.com/elastic/kibana/issues/184681
+  // Failing: See https://github.com/elastic/kibana/issues/184681
+  describe.skip('inputs_with_standalone_docker_agent', () => {
     skipIfNoDockerRegistry(providerContext);
     let apiKey: string;
     let agent: AgentProcess;
diff --git a/x-pack/test/fleet_api_integration/apis/policy_secrets.ts b/x-pack/test/fleet_api_integration/apis/policy_secrets.ts
index 226c22d6ca924..d8e641b7af0a5 100644
--- a/x-pack/test/fleet_api_integration/apis/policy_secrets.ts
+++ b/x-pack/test/fleet_api_integration/apis/policy_secrets.ts
@@ -847,6 +847,8 @@ export default function (providerContext: FtrProviderContext) {
       it('should not store secrets if fleet server does not meet minimum version', async () => {
         const { fleetServerAgentPolicy } = await createFleetServerAgentPolicy();
         await createFleetServerAgent(fleetServerAgentPolicy.id, 'server_1', '7.0.0');
+        const { fleetServerAgentPolicy: fleetServerPolicy2 } = await createFleetServerAgentPolicy(); // extra policy to verify `or` condition
+        await createFleetServerAgent(fleetServerPolicy2.id, 'server_1', '8.12.0');
 
         await callFleetSetup();
 
@@ -865,7 +867,10 @@ export default function (providerContext: FtrProviderContext) {
       });
 
       it('should not store secrets if there are no fleet servers', async () => {
+        await createFleetServerAgentPolicy();
         const agentPolicy = await createAgentPolicy();
+        // agent with new version shouldn't make storage secrets enabled
+        await createFleetServerAgent(agentPolicy.id, 'server_2', '8.12.0');
         const packagePolicyWithSecrets = await createPackagePolicyWithSecrets(agentPolicy.id);
 
         // secret should be in plain text i.e not a secret refrerence
diff --git a/x-pack/test/fleet_cypress/artifact_manager.ts b/x-pack/test/fleet_cypress/artifact_manager.ts
index 0fe6609f28efc..23efabe2d976a 100644
--- a/x-pack/test/fleet_cypress/artifact_manager.ts
+++ b/x-pack/test/fleet_cypress/artifact_manager.ts
@@ -15,6 +15,10 @@ export async function getLatestVersion(): Promise<string> {
   return pRetry(() => axios('https://artifacts-api.elastic.co/v1/versions'), {
     maxRetryTime: 60 * 1000, // 1 minute
   })
-    .then((response) => last(response.data.versions as string[]) || DEFAULT_VERSION)
+    .then(
+      (response) =>
+        last((response.data.versions as string[]).filter((v) => v.includes('-SNAPSHOT'))) ||
+        DEFAULT_VERSION
+    )
     .catch(() => DEFAULT_VERSION);
 }
diff --git a/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts b/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
index 6aa16cf806fe5..52ccfad201a53 100644
--- a/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
+++ b/x-pack/test/functional/apps/dataset_quality/dataset_quality_flyout.ts
@@ -149,17 +149,19 @@ export default function ({ getService, getPageObjects }: DatasetQualityFtrProvid
       it('should shows the integration section for integrations', async () => {
         await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
 
-        const integrationNameElements = await PageObjects.datasetQuality.getFlyoutElementsByText(
-          '[data-test-subj=datasetQualityFlyoutFieldValue]',
-          apacheIntegrationId
-        );
-
         await testSubjects.existOrFail(
           PageObjects.datasetQuality.testSubjectSelectors
             .datasetQualityFlyoutFieldsListIntegrationDetails
         );
 
-        expect(integrationNameElements.length).to.eql(1);
+        await retry.tryForTime(5000, async () => {
+          const integrationNameExists = await PageObjects.datasetQuality.doesTextExist(
+            PageObjects.datasetQuality.testSubjectSelectors
+              .datasetQualityFlyoutFieldsListIntegrationDetails,
+            apacheIntegrationId
+          );
+          expect(integrationNameExists).to.be(true);
+        });
 
         await PageObjects.datasetQuality.closeFlyout();
       });
diff --git a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
index 571594a8b94b6..f8ba7904280b9 100644
--- a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
@@ -31,20 +31,16 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const kibanaServer = getService('kibanaServer');
 
   describe('Infrastructure Source Configuration', function () {
-    before(async () => {
-      await kibanaServer.savedObjects.cleanStandardList();
-    });
-    after(async () => {
-      await kibanaServer.savedObjects.cleanStandardList();
-    });
+    before(async () => kibanaServer.savedObjects.cleanStandardList());
+    after(async () => kibanaServer.savedObjects.cleanStandardList());
 
     describe('with metrics present', () => {
-      before(async () => {
-        await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
-      });
-      after(async () => {
-        await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
-      });
+      before(async () =>
+        esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs')
+      );
+      after(async () =>
+        esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')
+      );
 
       it('renders the waffle map', async () => {
         await pageObjects.common.navigateToApp('infraOps');
diff --git a/x-pack/test/functional/apps/lens/group2/fields_list.ts b/x-pack/test/functional/apps/lens/group2/fields_list.ts
index 50f55eae3c342..14151f481913f 100644
--- a/x-pack/test/functional/apps/lens/group2/fields_list.ts
+++ b/x-pack/test/functional/apps/lens/group2/fields_list.ts
@@ -125,6 +125,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
         it('should show stats for a numeric runtime field', async () => {
           await PageObjects.lens.searchField('runtime');
+          await PageObjects.lens.waitForMissingField('Records');
           await PageObjects.lens.waitForField('runtime_number');
           const [fieldId] = await PageObjects.lens.findFieldIdsByType('number');
           await log.debug(`Opening field stats for ${fieldId}`);
diff --git a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts
index 24fac3f726bc9..e5a2a8f6a8971 100644
--- a/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts
+++ b/x-pack/test/functional/apps/lens/open_in_lens/tsvb/dashboard.ts
@@ -28,7 +28,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const dashboardAddPanel = getService('dashboardAddPanel');
   const filterBar = getService('filterBar');
 
-  describe('Dashboard to TSVB to Lens', function describeIndexTests() {
+  // FLAKY: https://github.com/elastic/kibana/issues/179307
+  describe.skip('Dashboard to TSVB to Lens', function describeIndexTests() {
     before(async () => {
       await visualize.initTests();
     });
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection_result_views/forecasts.ts b/x-pack/test/functional/apps/ml/anomaly_detection_result_views/forecasts.ts
index bdd3052f54c0a..3a60e8fca97c2 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection_result_views/forecasts.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection_result_views/forecasts.ts
@@ -39,8 +39,7 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const ml = getService('ml');
 
-  // Failing: See https://github.com/elastic/kibana/issues/164381
-  describe.skip('forecasts', function () {
+  describe('forecasts', function () {
     this.tags(['ml']);
 
     describe('with single metric job', function () {
diff --git a/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
index 1974a48e77841..d6729e7bef923 100644
--- a/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
+++ b/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
@@ -10,8 +10,9 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 import { USER } from '../../../services/ml/security_common';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['common', 'error']);
+  const PageObjects = getPageObjects(['common', 'error', 'dashboard']);
   const ml = getService('ml');
+  const esArchiver = getService('esArchiver');
 
   const testUsers = [{ user: USER.ML_UNAUTHORIZED, discoverAvailable: true }];
 
@@ -56,5 +57,28 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
     }
+
+    describe('for user with no ML access and Kibana features access', function () {
+      before(async () => {
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+        await ml.testResources.createDataViewIfNeeded('ft_farequote', '@timestamp');
+        await ml.securityUI.loginAs(USER.ML_DISABLED);
+        await ml.api.cleanMlIndices();
+      });
+
+      after(async () => {
+        // NOTE: Logout needs to happen before anything else to avoid flaky behavior
+        await ml.securityUI.logout();
+      });
+
+      it('should not register ML embeddables in the dashboard', async () => {
+        await ml.testExecution.logTestStep(
+          'should not contain ML embeddable in the Add panel list'
+        );
+        await PageObjects.dashboard.navigateToApp();
+        await PageObjects.dashboard.clickCreateDashboardPrompt();
+        await ml.dashboardEmbeddables.assertMlSectionExists(false);
+      });
+    });
   });
 }
diff --git a/x-pack/test/functional/apps/ml/short_tests/model_management/model_list.ts b/x-pack/test/functional/apps/ml/short_tests/model_management/model_list.ts
index b7180fcefdc31..315b8590a80d1 100644
--- a/x-pack/test/functional/apps/ml/short_tests/model_management/model_list.ts
+++ b/x-pack/test/functional/apps/ml/short_tests/model_management/model_list.ts
@@ -477,7 +477,8 @@ export default function ({ getService }: FtrProviderContext) {
         await ml.navigation.navigateToTrainedModels();
       });
 
-      describe('with imported models', function () {
+      // FLAKY: https://github.com/elastic/kibana/issues/175443
+      describe.skip('with imported models', function () {
         before(async () => {
           await ml.navigation.navigateToTrainedModels();
         });
diff --git a/x-pack/test/functional/apps/search_playground/playground_overview.ess.ts b/x-pack/test/functional/apps/search_playground/playground_overview.ess.ts
index 0afa2979a6c15..0fb7675882016 100644
--- a/x-pack/test/functional/apps/search_playground/playground_overview.ess.ts
+++ b/x-pack/test/functional/apps/search_playground/playground_overview.ess.ts
@@ -15,7 +15,6 @@ import {
   LlmProxy,
 } from '../../../observability_ai_assistant_api_integration/common/create_llm_proxy';
 
-const indexName = 'basic_index';
 const esArchiveIndex = 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index';
 
 export default function (ftrContext: FtrProviderContext) {
@@ -56,6 +55,7 @@ export default function (ftrContext: FtrProviderContext) {
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundHeaderComponentsToExist();
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundHeaderComponentsToDisabled();
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundStartChatPageComponentsToExist();
+        await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundStartChatPageIndexButtonExists();
       });
 
       describe('with gen ai connectors', () => {
@@ -68,8 +68,8 @@ export default function (ftrContext: FtrProviderContext) {
           await removeOpenAIConnector?.();
           await browser.refresh();
         });
-        it('hide gen ai panel', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectHideGenAIPanelConnector();
+        it('show success llm button', async () => {
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectShowSuccessLLMButton();
         });
       });
 
@@ -80,7 +80,7 @@ export default function (ftrContext: FtrProviderContext) {
 
         it('creates a connector successfully', async () => {
           await pageObjects.searchPlayground.PlaygroundStartChatPage.expectOpenConnectorPagePlayground();
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectHideGenAIPanelConnectorAfterCreatingConnector(
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectSuccessButtonAfterCreatingConnector(
             createConnector
           );
         });
@@ -92,18 +92,16 @@ export default function (ftrContext: FtrProviderContext) {
       });
 
       describe('without any indices', () => {
-        it('show no index callout', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectNoIndexCalloutExists();
+        it('show create index button', async () => {
           await pageObjects.searchPlayground.PlaygroundStartChatPage.expectCreateIndexButtonToExists();
         });
 
-        it('hide no index callout when index added', async () => {
+        it('show success button when index added', async () => {
           await createIndex();
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectSelectIndex(indexName);
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectOpenFlyoutAndSelectIndex();
         });
 
         after(async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.removeIndexFromComboBox();
           await esArchiver.unload(esArchiveIndex);
           await browser.refresh();
         });
@@ -116,14 +114,8 @@ export default function (ftrContext: FtrProviderContext) {
           await browser.refresh();
         });
 
-        it('dropdown shows up', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectIndicesInDropdown();
-        });
-
-        it('can select index from dropdown and navigate to chat window', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectToSelectIndicesAndStartButtonEnabled(
-            indexName
-          );
+        it('can select index from dropdown and load chat page', async () => {
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectToSelectIndicesAndLoadChat();
         });
 
         after(async () => {
@@ -139,7 +131,7 @@ export default function (ftrContext: FtrProviderContext) {
         await createConnector();
         await createIndex();
         await browser.refresh();
-        await pageObjects.searchPlayground.PlaygroundChatPage.navigateToChatPage(indexName);
+        await pageObjects.searchPlayground.PlaygroundChatPage.navigateToChatPage();
       });
       it('loads successfully', async () => {
         await pageObjects.searchPlayground.PlaygroundChatPage.expectChatWindowLoaded();
diff --git a/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json b/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json
index ea4f271af0ffc..7a76d0da64667 100644
--- a/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/ecs_non_compliant/mappings.json
@@ -42,6 +42,15 @@
             "properties": {
               "created": {
                 "type": "keyword"
+              },
+              "action": {
+                "type": "text",
+                "fields": {
+                  "keyword": {
+                    "type": "keyword",
+                    "ignore_above": 256
+                  }
+                }
               }
             }
           },
diff --git a/x-pack/test/functional/page_objects/dataset_quality.ts b/x-pack/test/functional/page_objects/dataset_quality.ts
index dc580d2951c6a..7f918ce3ba76f 100644
--- a/x-pack/test/functional/page_objects/dataset_quality.ts
+++ b/x-pack/test/functional/page_objects/dataset_quality.ts
@@ -96,6 +96,7 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
     datasetQualityFlyoutFieldValue: 'datasetQualityFlyoutFieldValue',
     datasetQualityFlyoutFieldsListIntegrationDetails:
       'datasetQualityFlyoutFieldsList-integration_details',
+    datasetQualityFlyoutIntegrationLoading: 'datasetQualityFlyoutIntegrationLoading',
     datasetQualityFlyoutIntegrationActionsButton: 'datasetQualityFlyoutIntegrationActionsButton',
     datasetQualityFlyoutIntegrationAction: (action: string) =>
       `datasetQualityFlyoutIntegrationAction${action}`,
@@ -163,6 +164,13 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       await find.waitForDeletedByCssSelector('.euiFlyoutBody .euiBasicTable-loading', 20 * 1000);
     },
 
+    async waitUntilIntegrationsInFlyoutLoaded() {
+      await find.waitForDeletedByCssSelector(
+        '.euiSkeletonTitle .datasetQualityFlyoutIntegrationLoading',
+        10 * 1000
+      );
+    },
+
     async waitUntilSummaryPanelLoaded(isStateful: boolean = true) {
       await testSubjects.missingOrFail(`datasetQuality-${texts.activeDatasets}-loading`);
       if (isStateful) {
@@ -321,6 +329,8 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       if (isCollapsed) {
         await datasetExpandButton.click();
       }
+
+      await this.waitUntilIntegrationsInFlyoutLoaded();
     },
 
     async closeFlyout() {
@@ -337,12 +347,14 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       return refreshButton.click();
     },
 
-    async getFlyoutElementsByText(selector: string, text: string) {
-      const flyoutContainer: WebElementWrapper = await testSubjects.find(
-        testSubjectSelectors.datasetQualityFlyout
-      );
+    async doesTextExist(selector: string, text: string) {
+      const textValues = await testSubjects.getVisibleTextAll(selector);
+      if (textValues && textValues.length > 0) {
+        const values = textValues[0].split('\n');
+        return values.includes(text);
+      }
 
-      return getAllByText(flyoutContainer, selector, text);
+      return false;
     },
 
     getFlyoutLogsExplorerButton() {
@@ -363,15 +375,6 @@ export function DatasetQualityPageObject({ getPageObjects, getService }: FtrProv
       );
     },
 
-    async doestTextExistInFlyout(text: string, elementSelector: string) {
-      const flyoutContainer: WebElementWrapper = await testSubjects.find(
-        testSubjectSelectors.datasetQualityFlyoutBody
-      );
-
-      const elements = await getAllByText(flyoutContainer, elementSelector, text);
-      return elements.length > 0;
-    },
-
     // `excludeKeys` needed to circumvent `_stats` not available in Serverless  https://github.com/elastic/kibana/issues/178954
     // TODO: Remove `excludeKeys` when `_stats` is available in Serverless
     async parseFlyoutKpis(excludeKeys: string[] = []): Promise<FlyoutKpi> {
@@ -544,28 +547,3 @@ async function getDatasetTableHeaderTexts(tableWrapper: WebElementWrapper) {
     headerElementWrappers.map((headerElementWrapper) => headerElementWrapper.getVisibleText())
   );
 }
-
-/**
- * Get all elements matching the given selector and text
- * @example
- * const container = await testSubjects.find('myContainer');
- * const elements = await getAllByText(container, 'button', 'Click me');
- *
- * @param container { WebElementWrapper } The container to search within
- * @param selector { string } The selector to search for (or filter elements by)
- * @param text { string } The text to search for within the filtered elements
- */
-export async function getAllByText(container: WebElementWrapper, selector: string, text: string) {
-  const elements = await container.findAllByCssSelector(selector);
-  const matchingElements: WebElementWrapper[] = [];
-
-  for (let i = 0; i < elements.length; i++) {
-    const element = elements[i];
-    const elementText = await element.getVisibleText();
-    if (elementText === text) {
-      matchingElements.push(element);
-    }
-  }
-
-  return matchingElements;
-}
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index 7256e92ca829e..b52ccbdd456f7 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -319,6 +319,10 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       await testSubjects.existOrFail(`lnsFieldListPanelField-${field}`);
     },
 
+    async waitForMissingField(field: string) {
+      await testSubjects.missingOrFail(`lnsFieldListPanelField-${field}`);
+    },
+
     async waitForMissingDataViewWarning() {
       await retry.try(async () => {
         await testSubjects.existOrFail(`missing-refs-failure`);
diff --git a/x-pack/test/functional/page_objects/search_playground_page.ts b/x-pack/test/functional/page_objects/search_playground_page.ts
index 89bffc8bbd841..01f50245a1a90 100644
--- a/x-pack/test/functional/page_objects/search_playground_page.ts
+++ b/x-pack/test/functional/page_objects/search_playground_page.ts
@@ -10,16 +10,28 @@ import { FtrProviderContext } from '../ftr_provider_context';
 
 export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
-  const comboBox = getService('comboBox');
   const browser = getService('browser');
+  const selectIndex = async () => {
+    await testSubjects.existOrFail('addDataSourcesButton');
+    await testSubjects.click('addDataSourcesButton');
+    await testSubjects.existOrFail('selectIndicesFlyout');
+    await testSubjects.click('sourceIndex-0');
+    await testSubjects.click('saveButton');
+  };
 
   return {
     PlaygroundStartChatPage: {
       async expectPlaygroundStartChatPageComponentsToExist() {
-        await testSubjects.existOrFail('startChatPage');
-        await testSubjects.existOrFail('connectToLLMChatPanel');
-        await testSubjects.existOrFail('selectIndicesChatPanel');
-        await testSubjects.existOrFail('startChatButton');
+        await testSubjects.existOrFail('setupPage');
+        await testSubjects.existOrFail('connectLLMButton');
+      },
+
+      async expectPlaygroundStartChatPageIndexButtonExists() {
+        await testSubjects.existOrFail('createIndexButton');
+      },
+
+      async expectPlaygroundStartChatPageIndexCalloutExists() {
+        await testSubjects.existOrFail('createIndexCallout');
       },
 
       async expectPlaygroundHeaderComponentsToExist() {
@@ -28,8 +40,8 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
       },
 
       async expectPlaygroundHeaderComponentsToDisabled() {
-        expect(await testSubjects.isEnabled('editContextActionButton')).to.be(false);
-        expect(await testSubjects.isEnabled('viewQueryActionButton')).to.be(false);
+        expect(await testSubjects.getAttribute('viewModeSelector', 'disabled')).to.be('true');
+        expect(await testSubjects.isEnabled('dataSourceActionButton')).to.be(false);
         expect(await testSubjects.isEnabled('viewCodeActionButton')).to.be(false);
       },
 
@@ -37,66 +49,45 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
         await testSubjects.existOrFail('createIndexButton');
       },
 
-      async expectNoIndexCalloutExists() {
-        await testSubjects.existOrFail('createIndexCallout');
-      },
-
-      async expectSelectIndex(indexName: string) {
+      async expectOpenFlyoutAndSelectIndex() {
         await browser.refresh();
-        await testSubjects.missingOrFail('createIndexCallout');
-        await testSubjects.existOrFail('selectIndicesComboBox');
-        await comboBox.setCustom('selectIndicesComboBox', indexName);
+        await selectIndex();
+        await testSubjects.existOrFail('dataSourcesSuccessButton');
       },
 
-      async expectIndicesInDropdown() {
-        await testSubjects.existOrFail('selectIndicesComboBox');
-      },
-
-      async removeIndexFromComboBox() {
-        await testSubjects.click('removeIndexButton');
-      },
-
-      async expectToSelectIndicesAndStartButtonEnabled(indexName: string) {
-        await comboBox.setCustom('selectIndicesComboBox', indexName);
-        expect(await testSubjects.isEnabled('startChatButton')).to.be(true);
-        expect(await testSubjects.isEnabled('editContextActionButton')).to.be(true);
-        expect(await testSubjects.isEnabled('viewQueryActionButton')).to.be(true);
-        expect(await testSubjects.isEnabled('viewCodeActionButton')).to.be(true);
-
-        await testSubjects.click('startChatButton');
+      async expectToSelectIndicesAndLoadChat() {
+        await selectIndex();
         await testSubjects.existOrFail('chatPage');
       },
 
       async expectAddConnectorButtonExists() {
-        await testSubjects.existOrFail('setupGenAIConnectorButton');
+        await testSubjects.existOrFail('connectLLMButton');
       },
 
       async expectOpenConnectorPagePlayground() {
-        await testSubjects.click('setupGenAIConnectorButton');
+        await testSubjects.click('connectLLMButton');
         await testSubjects.existOrFail('create-connector-flyout');
       },
 
-      async expectHideGenAIPanelConnectorAfterCreatingConnector(
-        createConnector: () => Promise<void>
-      ) {
+      async expectSuccessButtonAfterCreatingConnector(createConnector: () => Promise<void>) {
         await createConnector();
         await browser.refresh();
-        await testSubjects.missingOrFail('connectToLLMChatPanel');
+        await testSubjects.existOrFail('successConnectLLMButton');
       },
 
-      async expectHideGenAIPanelConnector() {
-        await testSubjects.missingOrFail('connectToLLMChatPanel');
+      async expectShowSuccessLLMButton() {
+        await testSubjects.existOrFail('successConnectLLMButton');
       },
     },
     PlaygroundChatPage: {
-      async navigateToChatPage(indexName: string) {
-        await comboBox.setCustom('selectIndicesComboBox', indexName);
-        await testSubjects.click('startChatButton');
+      async navigateToChatPage() {
+        await selectIndex();
+        await testSubjects.existOrFail('chatPage');
       },
 
       async expectChatWindowLoaded() {
-        expect(await testSubjects.isEnabled('editContextActionButton')).to.be(true);
-        expect(await testSubjects.isEnabled('viewQueryActionButton')).to.be(true);
+        expect(await testSubjects.getAttribute('viewModeSelector', 'disabled')).to.be(null);
+        expect(await testSubjects.isEnabled('dataSourceActionButton')).to.be(true);
         expect(await testSubjects.isEnabled('viewCodeActionButton')).to.be(true);
 
         expect(await testSubjects.isEnabled('regenerateActionButton')).to.be(false);
@@ -114,9 +105,8 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
           await (await testSubjects.find('manageConnectorsLink')).getAttribute('href')
         ).to.contain('/app/management/insightsAndAlerting/triggersActionsConnectors/connectors/');
 
-        await testSubjects.click('sourcesAccordion');
-
-        expect(await testSubjects.findAll('indicesInAccordian')).to.have.length(1);
+        await testSubjects.existOrFail('editContextPanel');
+        await testSubjects.existOrFail('summarizationPanel');
       },
 
       async sendQuestion() {
@@ -145,9 +135,9 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
       },
 
       async expectViewQueryHasFields() {
-        await testSubjects.click('viewQueryActionButton');
-        await testSubjects.existOrFail('viewQueryFlyout');
-        const fields = await testSubjects.findAll('queryField');
+        await testSubjects.existOrFail('queryMode');
+        await testSubjects.click('queryMode');
+        const fields = await testSubjects.findAll('fieldName');
 
         expect(fields.length).to.be(1);
 
@@ -156,18 +146,16 @@ export function SearchPlaygroundPageProvider({ getService }: FtrProviderContext)
         expect(code.replace(/ /g, '')).to.be(
           '{\n"retriever":{\n"standard":{\n"query":{\n"multi_match":{\n"query":"{query}",\n"fields":[\n"baz"\n]\n}\n}\n}\n}\n}'
         );
-        await testSubjects.click('euiFlyoutCloseButton');
       },
 
       async expectEditContextOpens() {
-        await testSubjects.click('editContextActionButton');
-        await testSubjects.existOrFail('editContextFlyout');
-        await testSubjects.click('contextFieldsSelectable_basic_index');
+        await testSubjects.click('chatMode');
+        await testSubjects.existOrFail('contextFieldsSelectable-0');
+        await testSubjects.click('contextFieldsSelectable-0');
         await testSubjects.existOrFail('contextField');
         const fields = await testSubjects.findAll('contextField');
 
         expect(fields.length).to.be(1);
-        await testSubjects.click('euiFlyoutCloseButton');
       },
     },
   };
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index 452abe6a54ea5..c9d97825f381c 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -247,18 +247,22 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
         log.debug(`Inference endpoint '${inferenceId}' already exists. Nothing to create.`);
         return;
       }
-      const { body, status } = await esSupertest
-        .put(`/_inference/${taskType}/${inferenceId}`)
+      const response = await kbnSupertest
+        .put(`/internal/ml/_inference/${taskType}/${inferenceId}`)
+        .set(getCommonRequestHeader('1'))
         .send(requestBody);
-      this.assertResponseStatusCode(200, status, body);
 
-      return body;
+      this.assertResponseStatusCode(200, response.status, response.body);
+      log.debug('> Inference endpoint created');
+      return response;
     },
 
     async deleteInferenceEndpoint(inferenceId: string, taskType: string) {
       const { body, status } = await esSupertest.delete(`/_inference/${taskType}/${inferenceId}`);
       this.assertResponseStatusCode(200, status, body);
-
+      expect(body)
+        .to.have.property('acknowledged')
+        .eql(true, 'Response for delete inference endpoint should be acknowledged');
       return body;
     },
 
diff --git a/x-pack/test/functional/services/ml/dashboard_embeddables.ts b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
index b22622ead61d0..3d88b3b9fd9c8 100644
--- a/x-pack/test/functional/services/ml/dashboard_embeddables.ts
+++ b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
@@ -114,6 +114,13 @@ export function MachineLearningDashboardEmbeddablesProvider(
       });
     },
 
+    async assertMlSectionExists(expectExist = true) {
+      await retry.tryForTime(60 * 1000, async () => {
+        await dashboardAddPanel.clickEditorMenuButton();
+        await dashboardAddPanel.verifyEmbeddableFactoryGroupExists('ml', expectExist);
+      });
+    },
+
     async openAnomalyJobSelectionFlyout(
       mlEmbeddableType: 'ml_anomaly_swimlane' | 'ml_anomaly_charts' | 'ml_single_metric_viewer'
     ) {
diff --git a/x-pack/test/functional/services/ml/security_common.ts b/x-pack/test/functional/services/ml/security_common.ts
index 6952183e7bdef..6d9aee298beaa 100644
--- a/x-pack/test/functional/services/ml/security_common.ts
+++ b/x-pack/test/functional/services/ml/security_common.ts
@@ -21,6 +21,7 @@ export enum USER {
   ML_VIEWER_SPACE1 = 'ft_ml_viewer_space1',
   ML_VIEWER_ALL_SPACES = 'ft_ml_viewer_all_spaces',
   ML_UNAUTHORIZED = 'ft_ml_unauthorized',
+  ML_DISABLED = 'ft_ml_disabled',
 }
 
 export function MachineLearningSecurityCommonProvider({ getService }: FtrProviderContext) {
@@ -133,6 +134,29 @@ export function MachineLearningSecurityCommonProvider({ getService }: FtrProvide
       elasticsearch: { cluster: [], indices: [], run_as: [] },
       kibana: [{ base: [], feature: { discover: ['read'] }, spaces: ['default'] }],
     },
+    {
+      name: 'ft_ml_disabled',
+      elasticsearch: { cluster: [], indices: [], run_as: [] },
+      kibana: [
+        {
+          base: [],
+          feature: {
+            // FIXME: We need permission to save search in Discover to test the data viz embeddable
+            // change permission back to read once tests are moved out of ML
+            discover: ['all'],
+            visualize: ['add'],
+            dashboard: ['all'],
+            actions: ['all'],
+            savedObjectsManagement: ['all'],
+            advancedSettings: ['all'],
+            indexPatterns: ['all'],
+            generalCases: ['all'],
+            ml: ['none'],
+          },
+          spaces: ['*'],
+        },
+      ],
+    },
     {
       name: 'ft_all_space_ml_none',
       elasticsearch: { cluster: [], indices: [], run_as: [] },
@@ -230,6 +254,12 @@ export function MachineLearningSecurityCommonProvider({ getService }: FtrProvide
       password: 'mlu001',
       roles: ['ft_default_space_ml_none', 'ft_ml_source_readonly'],
     },
+    {
+      name: 'ft_ml_disabled',
+      full_name: 'ML Disabled',
+      password: 'mlud001',
+      roles: ['ft_ml_disabled'],
+    },
   ];
 
   return {
diff --git a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts
index c04cf14322ef4..300aa0fb0a8a1 100644
--- a/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/discover_ml_uptime/discover/search_source_alert.ts
@@ -121,12 +121,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   };
 
   const deleteIndexes = (indexes: string[]) => {
-    indexes.forEach((current) => {
-      es.transport.request({
-        path: `/${current}`,
-        method: 'DELETE',
-      });
-    });
+    return Promise.all(
+      indexes.map((current) =>
+        es.transport.request({
+          path: `/${current}`,
+          method: 'DELETE',
+        })
+      )
+    );
   };
 
   const createConnector = async (): Promise<string> => {
@@ -164,6 +166,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       return await testSubjects.exists('alertActionAccordion-0');
     });
 
+    await monacoEditor.waitCodeEditorReady('kibanaCodeEditor');
     await monacoEditor.setCodeEditorValue(`{
       "rule_id": "{{rule.id}}",
       "rule_name": "{{rule.name}}",
@@ -215,7 +218,19 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     }
 
     await filterBar.addFilter({ field: 'rule_id', operation: 'is', value: ruleId });
-    await PageObjects.discover.waitUntilSearchingHasFinished();
+
+    await retry.waitFor('results', async () => {
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.discover.waitUntilSearchingHasFinished();
+
+      const alreadyHasData = await testSubjects.exists('docTable');
+
+      if (!alreadyHasData) {
+        await testSubjects.click('querySubmitButton');
+      }
+
+      return alreadyHasData;
+    });
 
     const link = await getResultsLink();
     await filterBar.removeFilter('rule_id'); // clear filter bar
@@ -233,10 +248,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     await testSubjects.click('triggersActions');
     await PageObjects.header.waitUntilLoadingHasFinished();
 
-    const rulesList = await testSubjects.find('rulesList');
-    const alertRule = await rulesList.findByCssSelector(`[title="${ruleName}"]`);
-    await alertRule.click();
-    await PageObjects.header.waitUntilLoadingHasFinished();
+    let retries = 0;
+
+    await retry.try(async () => {
+      retries = retries + 1;
+      if (retries > 1) {
+        // It might take time for a rule to get created. Waiting for it.
+        await browser.refresh();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+      }
+      const rulesList = await testSubjects.find('rulesList');
+      const alertRule = await rulesList.findByCssSelector(`[title="${ruleName}"]`);
+      await alertRule.click();
+      await PageObjects.header.waitUntilLoadingHasFinished();
+    });
   };
 
   const clickViewInApp = async (ruleName: string) => {
@@ -317,11 +342,28 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      deleteIndexes([OUTPUT_DATA_VIEW, SOURCE_DATA_VIEW]);
-      const [{ id: adhocRuleId }] = await getAlertsByName(ADHOC_RULE_NAME);
-      await deleteAlerts([adhocRuleId]);
-      await deleteDataView(outputDataViewId);
-      await deleteConnector(connectorId);
+      // clean up what we can in case of failures in some tests which blocked the creation of the following objects
+      try {
+        await deleteIndexes([OUTPUT_DATA_VIEW, SOURCE_DATA_VIEW]);
+      } catch {
+        // continue
+      }
+      try {
+        const [{ id: adhocRuleId }] = await getAlertsByName(ADHOC_RULE_NAME);
+        await deleteAlerts([adhocRuleId]);
+      } catch {
+        // continue
+      }
+      try {
+        await deleteDataView(outputDataViewId);
+      } catch {
+        // continue
+      }
+      try {
+        await deleteConnector(connectorId);
+      } catch {
+        // continue
+      }
       await security.testUser.restoreDefaults();
       await kibanaServer.savedObjects.cleanStandardList();
     });
@@ -351,10 +393,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await defineSearchSourceAlert(RULE_NAME);
       await testSubjects.click('selectDataViewExpression');
 
+      await testSubjects.existOrFail('indexPattern-switcher--input');
       await testSubjects.click('indexPattern-switcher--input');
       const input = await find.activeElement();
       // search-source-alert-output index does not have time field
       await input.type('search-source-alert-o*');
+      await testSubjects.existOrFail('explore-matching-indices-button');
       await testSubjects.click('explore-matching-indices-button');
 
       await retry.waitFor('selection to happen', async () => {
@@ -371,9 +415,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should navigate to alert results via view in app link', async () => {
       await testSubjects.click('selectDataViewExpression');
+      await testSubjects.existOrFail('indexPattern-switcher--input');
       await testSubjects.click('indexPattern-switcher--input');
       if (await testSubjects.exists('clearSearchButton')) {
         await testSubjects.click('clearSearchButton');
+        await testSubjects.missingOrFail('clearSearchButton');
       }
       const dataViewsElem = await testSubjects.find('euiSelectableList');
       const sourceDataViewOption = await dataViewsElem.findByCssSelector(
@@ -381,7 +427,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       );
       await sourceDataViewOption.click();
 
+      await retry.waitFor('selection to happen', async () => {
+        const dataViewSelector = await testSubjects.find('selectDataViewExpression');
+        return (await dataViewSelector.getVisibleText()) === `DATA VIEW\n${SOURCE_DATA_VIEW}`;
+      });
+
       await testSubjects.click('saveRuleButton');
+      await retry.try(async () => {
+        await testSubjects.missingOrFail('saveRuleButton');
+      });
 
       await PageObjects.header.waitUntilLoadingHasFinished();
 
@@ -477,6 +531,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await openDiscoverAlertFlyout();
       await defineSearchSourceAlert('test-adhoc-alert');
       await testSubjects.click('saveRuleButton');
+      await retry.try(async () => {
+        await testSubjects.missingOrFail('saveRuleButton');
+      });
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       await openAlertResults(ADHOC_RULE_NAME);
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/maintenance_windows/maintenance_windows_table.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/maintenance_windows/maintenance_windows_table.ts
index 0b228be252ca3..3b01650a9c6e8 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/maintenance_windows/maintenance_windows_table.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/maintenance_windows/maintenance_windows_table.ts
@@ -20,7 +20,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   let objectRemover: ObjectRemover;
   const browser = getService('browser');
 
-  describe('Maintenance windows table', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/187818
+  describe.skip('Maintenance windows table', function () {
     before(async () => {
       objectRemover = await createObjectRemover({ getService });
     });
diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/stack_alerts_page.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/stack_alerts_page.ts
index 26bee6fc4a5cf..0c3d801e29371 100644
--- a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/stack_alerts_page.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/stack_alerts_page.ts
@@ -90,7 +90,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
     });
 
-    describe('Loads the page', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/187667
+    describe.skip('Loads the page', () => {
       beforeEach(async () => {
         await security.testUser.restoreDefaults();
         await pageObjects.common.navigateToUrl(
diff --git a/x-pack/test/monitoring_api_integration/fixtures/apm/instance.json b/x-pack/test/monitoring_api_integration/fixtures/apm/instance.json
index a8294f495166f..43d078b2b5b40 100644
--- a/x-pack/test/monitoring_api_integration/fixtures/apm/instance.json
+++ b/x-pack/test/monitoring_api_integration/fixtures/apm/instance.json
@@ -1 +1 @@
-{"metrics":{"apm_cpu":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cpu.total.value","metricAgg":"max","label":"Total","title":"CPU Utilization","description":"Percentage of CPU time spent executing (user+kernel mode) for the APM process","units":"%","format":"0.[00]","hasCalculation":true,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0.6],[1679500660000,0.6],[1679500670000,0.6],[1679500680000,0.7000000000000001],[1679500690000,0.6],[1679500700000,0.8],[1679500710000,1],[1679500720000,0.6],[1679500730000,0.5],[1679500740000,0.8],[1679500750000,0.6],[1679500760000,0.6],[1679500770000,0.6],[1679500780000,1],[1679500790000,0.7000000000000001],[1679500800000,0.5],[1679500810000,0.6],[1679500820000,0.6],[1679500830000,0.5],[1679500840000,0.7000000000000001],[1679500850000,1],[1679500860000,0.7000000000000001],[1679500870000,0.8]]}],"apm_os_load":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.1","metricAgg":"max","label":"1m","title":"System Load","description":"Load average over the last 1 minute","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,2.54],[1679500650000,3.03],[1679500660000,2.71],[1679500670000,2.44],[1679500680000,2.22],[1679500690000,2.03],[1679500700000,2.35],[1679500710000,2.06],[1679500720000,1.98],[1679500730000,1.75],[1679500740000,1.64],[1679500750000,1.39],[1679500760000,1.17],[1679500770000,1.07],[1679500780000,0.91],[1679500790000,1.08],[1679500800000,1.14],[1679500810000,0.96],[1679500820000,0.81],[1679500830000,1.06],[1679500840000,1.05],[1679500850000,1.13],[1679500860000,1.35],[1679500870000,1.14]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.5","metricAgg":"max","label":"5m","title":"System Load","description":"Load average over the last 5 minutes","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,2.05],[1679500650000,2.17],[1679500660000,2.13],[1679500670000,2.09],[1679500680000,2.05],[1679500690000,2.02],[1679500700000,2.08],[1679500710000,2.03],[1679500720000,2.01],[1679500730000,1.96],[1679500740000,1.93],[1679500750000,1.87],[1679500760000,1.8],[1679500770000,1.76],[1679500780000,1.7],[1679500790000,1.71],[1679500800000,1.71],[1679500810000,1.65],[1679500820000,1.59],[1679500830000,1.62],[1679500840000,1.6],[1679500850000,1.6],[1679500860000,1.63],[1679500870000,1.57]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.15","metricAgg":"max","label":"15m","title":"System Load","description":"Load average over the last 15 minutes","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,1.47],[1679500650000,1.51],[1679500660000,1.5],[1679500670000,1.5],[1679500680000,1.49],[1679500690000,1.49],[1679500700000,1.51],[1679500710000,1.5],[1679500720000,1.5],[1679500730000,1.49],[1679500740000,1.49],[1679500750000,1.47],[1679500760000,1.45],[1679500770000,1.44],[1679500780000,1.43],[1679500790000,1.43],[1679500800000,1.43],[1679500810000,1.42],[1679500820000,1.4],[1679500830000,1.41],[1679500840000,1.41],[1679500850000,1.41],[1679500860000,1.42],[1679500870000,1.41]]}],"apm_memory":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.memory_alloc","metricAgg":"max","label":"Allocated Memory","title":"Memory","description":"Allocated memory","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,37395216],[1679500650000,41615536],[1679500660000,45549872],[1679500670000,48639824],[1679500680000,52503144],[1679500690000,55889632],[1679500700000,59721688],[1679500710000,38234784],[1679500720000,41191920],[1679500730000,45048264],[1679500740000,49664736],[1679500750000,53688584],[1679500760000,57633520],[1679500770000,61293528],[1679500780000,39092008],[1679500790000,43694136],[1679500800000,46895384],[1679500810000,50130024],[1679500820000,53510976],[1679500830000,57166128],[1679500840000,61012360],[1679500850000,39088512],[1679500860000,43863416],[1679500870000,47825208]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.rss","metricAgg":"max","label":"Process Total","title":"Memory","description":"Resident set size of memory reserved by the APM service from the OS","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,62275584],[1679500650000,62472192],[1679500660000,62685184],[1679500670000,65806336],[1679500680000,70074368],[1679500690000,73576448],[1679500700000,77508608],[1679500710000,80875520],[1679500720000,80875520],[1679500730000,80875520],[1679500740000,81080320],[1679500750000,81289216],[1679500760000,81289216],[1679500770000,81289216],[1679500780000,81502208],[1679500790000,81502208],[1679500800000,81502208],[1679500810000,81502208],[1679500820000,81502208],[1679500830000,81502208],[1679500840000,81653760],[1679500850000,81653760],[1679500860000,81653760],[1679500870000,82456576]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.gc_next","metricAgg":"max","label":"GC Next","title":"Memory","description":"Limit of allocated memory at which garbage collection will occur","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,73697880],[1679500650000,73697880],[1679500660000,73697880],[1679500670000,73697880],[1679500680000,73697880],[1679500690000,73697880],[1679500700000,73697880],[1679500710000,74066896],[1679500720000,74066896],[1679500730000,74066896],[1679500740000,74066896],[1679500750000,74066896],[1679500760000,74066896],[1679500770000,74066896],[1679500780000,73968024],[1679500790000,73968024],[1679500800000,73968024],[1679500810000,73968024],[1679500820000,73968024],[1679500830000,73968024],[1679500840000,73968024],[1679500850000,73963784],[1679500860000,73963784],[1679500870000,73963784]]}],"apm_memory_cgroup":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes","metricAgg":"max","label":"Memory Utilization (cgroup)","title":"Memory","description":"Memory usage of the container","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,32874496],[1679500650000,33325056],[1679500660000,33345536],[1679500670000,36667392],[1679500680000,40730624],[1679500690000,44462080],[1679500700000,48246784],[1679500710000,51675136],[1679500720000,51695616],[1679500730000,51720192],[1679500740000,51822592],[1679500750000,52109312],[1679500760000,52174848],[1679500770000,52101120],[1679500780000,52178944],[1679500790000,52215808],[1679500800000,52228096],[1679500810000,52248576],[1679500820000,52264960],[1679500830000,52400128],[1679500840000,52289536],[1679500850000,52518912],[1679500860000,52428800],[1679500870000,52580352]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes","metricAgg":"max","label":"Memory Limit","title":"Memory","description":"Memory limit of the container","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,1073741824],[1679500650000,1073741824],[1679500660000,1073741824],[1679500670000,1073741824],[1679500680000,1073741824],[1679500690000,1073741824],[1679500700000,1073741824],[1679500710000,1073741824],[1679500720000,1073741824],[1679500730000,1073741824],[1679500740000,1073741824],[1679500750000,1073741824],[1679500760000,1073741824],[1679500770000,1073741824],[1679500780000,1073741824],[1679500790000,1073741824],[1679500800000,1073741824],[1679500810000,1073741824],[1679500820000,1073741824],[1679500830000,1073741824],[1679500840000,1073741824],[1679500850000,1073741824],[1679500860000,1073741824],[1679500870000,1073741824]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.gc_next","metricAgg":"max","label":"GC Next","title":"Memory","description":"Limit of allocated memory at which garbage collection will occur","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,73697880],[1679500650000,73697880],[1679500660000,73697880],[1679500670000,73697880],[1679500680000,73697880],[1679500690000,73697880],[1679500700000,73697880],[1679500710000,74066896],[1679500720000,74066896],[1679500730000,74066896],[1679500740000,74066896],[1679500750000,74066896],[1679500760000,74066896],[1679500770000,74066896],[1679500780000,73968024],[1679500790000,73968024],[1679500800000,73968024],[1679500810000,73968024],[1679500820000,73968024],[1679500830000,73968024],[1679500840000,73968024],[1679500850000,73963784],[1679500860000,73963784],[1679500870000,73963784]]}],"apm_output_events_rate_success":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.total","metricAgg":"max","label":"Total","title":"Output Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,8.4],[1679500660000,8.8],[1679500670000,6.8],[1679500680000,7.7],[1679500690000,7.6],[1679500700000,8],[1679500710000,8.4],[1679500720000,6.4],[1679500730000,8.4],[1679500740000,10.5],[1679500750000,8.4],[1679500760000,8.4],[1679500770000,7.6],[1679500780000,8],[1679500790000,10],[1679500800000,6.5],[1679500810000,6.8],[1679500820000,7.2],[1679500830000,7.6],[1679500840000,8.4],[1679500850000,8],[1679500860000,10.5],[1679500870000,9.2]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.active","metricAgg":"max","label":"Active","title":"Output Active Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,null],[1679500660000,0.8],[1679500670000,0],[1679500680000,null],[1679500690000,0.4],[1679500700000,0.4],[1679500710000,0.8],[1679500720000,null],[1679500730000,0.8],[1679500740000,0.4],[1679500750000,null],[1679500760000,0],[1679500770000,null],[1679500780000,0.8],[1679500790000,null],[1679500800000,0],[1679500810000,null],[1679500820000,0],[1679500830000,1.6],[1679500840000,null],[1679500850000,null],[1679500860000,0.8],[1679500870000,null]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.acked","metricAgg":"max","label":"Acked","title":"Output Acked Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,9.2],[1679500660000,8],[1679500670000,6.8],[1679500680000,8.5],[1679500690000,7.2],[1679500700000,7.6],[1679500710000,7.6],[1679500720000,8],[1679500730000,7.6],[1679500740000,10.1],[1679500750000,9.2],[1679500760000,8.4],[1679500770000,8],[1679500780000,7.2],[1679500790000,10.4],[1679500800000,6.5],[1679500810000,7.2],[1679500820000,7.2],[1679500830000,6],[1679500840000,9.6],[1679500850000,8.4],[1679500860000,9.7],[1679500870000,10]]}],"apm_output_events_rate_failure":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.failed","metricAgg":"max","label":"Failed","title":"Output Failed Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.dropped","metricAgg":"max","label":"Dropped","title":"Output Dropped Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_responses_valid":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.count","metricAgg":"max","label":"Total","title":"Response Count Intake API","description":"HTTP Requests responded to by server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.valid.ok","metricAgg":"max","label":"Ok","title":"Ok","description":"200 OK response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.valid.accepted","metricAgg":"max","label":"Accepted","title":"Accepted","description":"HTTP Requests successfully reporting new events","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]}],"apm_responses_errors":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.toolarge","metricAgg":"max","label":"Too large","title":"Response Errors Intake API","description":"HTTP Requests rejected due to excessive payload size","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.validate","metricAgg":"max","label":"Validate","title":"Validate","description":"HTTP Requests rejected due to payload validation error","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.method","metricAgg":"max","label":"Method","title":"Method","description":"HTTP Requests rejected due to incorrect HTTP method","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.unauthorized","metricAgg":"max","label":"Unauthorized","title":"Unauthorized","description":"HTTP Requests rejected due to invalid secret token","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.ratelimit","metricAgg":"max","label":"Rate limit","title":"Rate limit","description":"HTTP Requests rejected to due excessive rate limit","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.queue","metricAgg":"max","label":"Queue","title":"Queue","description":"HTTP Requests rejected to due internal queue filling up","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.decode","metricAgg":"max","label":"Decode","title":"Decode","description":"HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.forbidden","metricAgg":"max","label":"Forbidden","title":"Forbidden","description":"Forbidden HTTP Requests rejected - CORS violation, disabled enpoint","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.concurrency","metricAgg":"max","label":"Concurrency","title":"Concurrency","description":"HTTP Requests rejected due to overall concurrency limit breach","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.closed","metricAgg":"max","label":"Closed","title":"Closed","description":"HTTP Requests rejected during server shutdown","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.internal","metricAgg":"max","label":"Internal","title":"Internal","description":"HTTP Requests rejected due to a miscellaneous internal error","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_requests":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.request.count","metricAgg":"max","label":"Requested","title":"Request Count Intake API","description":"HTTP Requests received by server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]}],"apm_transformations":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.transaction.transformations","metricAgg":"max","label":"Transaction","title":"Processed Events","description":"Transaction events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.span.transformations","metricAgg":"max","label":"Span","title":"Transformations","description":"Span events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.error.transformations","metricAgg":"max","label":"Error","title":"Transformations","description":"Error events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.metric.transformations","metricAgg":"max","label":"Metric","title":"Transformations","description":"Metric events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,2.3],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,3],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,2],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,3],[1679500870000,2.3]]}],"apm_acm_response":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.count","metricAgg":"max","label":"Count","title":"Response Count Agent Configuration Management","description":"HTTP requests responded to by APM Server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.count","metricAgg":"max","label":"Error Count","title":"Response Error Count Agent Configuration Management","description":"HTTP errors count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.valid.ok","metricAgg":"max","label":"OK","title":"Response OK Count Agent Configuration Management","description":"200 OK response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.valid.notmodified","metricAgg":"max","label":"Not Modified","title":"Response Not Modified Agent Configuration Management","description":"304 Not modified response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_acm_response_errors":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.forbidden","metricAgg":"max","label":"Count","title":"Response Errors Agent Configuration Management","description":"Forbidden HTTP requests rejected count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.unauthorized","metricAgg":"max","label":"Unauthorized","title":"Response Unauthorized Errors Agent Configuration Management","description":"Unauthorized HTTP requests rejected count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.unavailable","metricAgg":"max","label":"Unavailable","title":"Response Unavailable Errors Agent Configuration Management","description":"Unavailable HTTP response count. Possible misconfiguration or unsupported version of Kibana","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.method","metricAgg":"max","label":"Method","title":"Response Method Errors Agent Configuration Management","description":"HTTP requests rejected due to incorrect HTTP method","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.invalidquery","metricAgg":"max","label":"Invalid Query","title":"Response Invalid Query Errors Agent Configuration Management","description":"Invalid HTTP query","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_acm_request_count":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.request.count","metricAgg":"max","label":"Count","title":"Requests Agent Configuration Management","description":"HTTP Requests received by agent configuration managemen","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}]},"apmSummary":{"uuid":"ccf6c4d9-37bc-4dd0-bf57-2ae3ee296a39","transportAddress":"3031a4a32eea","version":"8.7.0","name":"3031a4a32eea","type":"Apm-server","output":"Elasticsearch","configReloads":null,"uptime":271879,"eventsTotal":2020,"eventsEmitted":null,"eventsDropped":null,"bytesWritten":739360,"config":{"container":false},"timeOfLastEvent":"2023-03-22T16:01:37.064Z"}}
+{"metrics":{"apm_cpu":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cpu.total.value","metricAgg":"max","label":"Total","title":"CPU Utilization","description":"Percentage of CPU time spent executing (user+kernel mode) for the APM process","units":"%","format":"0.[00]","hasCalculation":true,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0.6],[1679500660000,0.6],[1679500670000,0.6],[1679500680000,0.7000000000000001],[1679500690000,0.6],[1679500700000,0.8],[1679500710000,1],[1679500720000,0.6],[1679500730000,0.5],[1679500740000,0.8],[1679500750000,0.6],[1679500760000,0.6],[1679500770000,0.6],[1679500780000,1],[1679500790000,0.7000000000000001],[1679500800000,0.5],[1679500810000,0.6],[1679500820000,0.6],[1679500830000,0.5],[1679500840000,0.7000000000000001],[1679500850000,1],[1679500860000,0.7000000000000001],[1679500870000,0.8]]}],"apm_os_load":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.1","metricAgg":"max","label":"1m","title":"System Load","description":"Load average over the last 1 minute","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,2.54],[1679500650000,3.03],[1679500660000,2.71],[1679500670000,2.44],[1679500680000,2.22],[1679500690000,2.03],[1679500700000,2.35],[1679500710000,2.06],[1679500720000,1.98],[1679500730000,1.75],[1679500740000,1.64],[1679500750000,1.39],[1679500760000,1.17],[1679500770000,1.07],[1679500780000,0.91],[1679500790000,1.08],[1679500800000,1.14],[1679500810000,0.96],[1679500820000,0.81],[1679500830000,1.06],[1679500840000,1.05],[1679500850000,1.13],[1679500860000,1.35],[1679500870000,1.14]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.5","metricAgg":"max","label":"5m","title":"System Load","description":"Load average over the last 5 minutes","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,2.05],[1679500650000,2.17],[1679500660000,2.13],[1679500670000,2.09],[1679500680000,2.05],[1679500690000,2.02],[1679500700000,2.08],[1679500710000,2.03],[1679500720000,2.01],[1679500730000,1.96],[1679500740000,1.93],[1679500750000,1.87],[1679500760000,1.8],[1679500770000,1.76],[1679500780000,1.7],[1679500790000,1.71],[1679500800000,1.71],[1679500810000,1.65],[1679500820000,1.59],[1679500830000,1.62],[1679500840000,1.6],[1679500850000,1.6],[1679500860000,1.63],[1679500870000,1.57]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.system.load.15","metricAgg":"max","label":"15m","title":"System Load","description":"Load average over the last 15 minutes","units":"","format":"0,0.[00]","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,1.47],[1679500650000,1.51],[1679500660000,1.5],[1679500670000,1.5],[1679500680000,1.49],[1679500690000,1.49],[1679500700000,1.51],[1679500710000,1.5],[1679500720000,1.5],[1679500730000,1.49],[1679500740000,1.49],[1679500750000,1.47],[1679500760000,1.45],[1679500770000,1.44],[1679500780000,1.43],[1679500790000,1.43],[1679500800000,1.43],[1679500810000,1.42],[1679500820000,1.4],[1679500830000,1.41],[1679500840000,1.41],[1679500850000,1.41],[1679500860000,1.42],[1679500870000,1.41]]}],"apm_memory":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.memory_alloc","metricAgg":"max","label":"Allocated Memory","title":"Memory","description":"Allocated memory","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,37395216],[1679500650000,41615536],[1679500660000,45549872],[1679500670000,48639824],[1679500680000,52503144],[1679500690000,55889632],[1679500700000,59721688],[1679500710000,38234784],[1679500720000,41191920],[1679500730000,45048264],[1679500740000,49664736],[1679500750000,53688584],[1679500760000,57633520],[1679500770000,61293528],[1679500780000,39092008],[1679500790000,43694136],[1679500800000,46895384],[1679500810000,50130024],[1679500820000,53510976],[1679500830000,57166128],[1679500840000,61012360],[1679500850000,39088512],[1679500860000,43863416],[1679500870000,47825208]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.rss","metricAgg":"max","label":"Process Total","title":"Memory","description":"Resident set size of memory reserved by the APM service from the OS","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,62275584],[1679500650000,62472192],[1679500660000,62685184],[1679500670000,65806336],[1679500680000,70074368],[1679500690000,73576448],[1679500700000,77508608],[1679500710000,80875520],[1679500720000,80875520],[1679500730000,80875520],[1679500740000,81080320],[1679500750000,81289216],[1679500760000,81289216],[1679500770000,81289216],[1679500780000,81502208],[1679500790000,81502208],[1679500800000,81502208],[1679500810000,81502208],[1679500820000,81502208],[1679500830000,81502208],[1679500840000,81653760],[1679500850000,81653760],[1679500860000,81653760],[1679500870000,82456576]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.gc_next","metricAgg":"max","label":"GC Next","title":"Memory","description":"Limit of allocated memory at which garbage collection will occur","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,73697880],[1679500650000,73697880],[1679500660000,73697880],[1679500670000,73697880],[1679500680000,73697880],[1679500690000,73697880],[1679500700000,73697880],[1679500710000,74066896],[1679500720000,74066896],[1679500730000,74066896],[1679500740000,74066896],[1679500750000,74066896],[1679500760000,74066896],[1679500770000,74066896],[1679500780000,73968024],[1679500790000,73968024],[1679500800000,73968024],[1679500810000,73968024],[1679500820000,73968024],[1679500830000,73968024],[1679500840000,73968024],[1679500850000,73963784],[1679500860000,73963784],[1679500870000,73963784]]}],"apm_memory_cgroup":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cgroup.memory.mem.usage.bytes","metricAgg":"max","label":"Memory Utilization (cgroup)","title":"Memory","description":"Memory usage of the container","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,32874496],[1679500650000,33325056],[1679500660000,33345536],[1679500670000,36667392],[1679500680000,40730624],[1679500690000,44462080],[1679500700000,48246784],[1679500710000,51675136],[1679500720000,51695616],[1679500730000,51720192],[1679500740000,51822592],[1679500750000,52109312],[1679500760000,52174848],[1679500770000,52101120],[1679500780000,52178944],[1679500790000,52215808],[1679500800000,52228096],[1679500810000,52248576],[1679500820000,52264960],[1679500830000,52400128],[1679500840000,52289536],[1679500850000,52518912],[1679500860000,52428800],[1679500870000,52580352]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.cgroup.memory.mem.limit.bytes","metricAgg":"max","label":"Memory Limit","title":"Memory","description":"Memory limit of the container","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,1073741824],[1679500650000,1073741824],[1679500660000,1073741824],[1679500670000,1073741824],[1679500680000,1073741824],[1679500690000,1073741824],[1679500700000,1073741824],[1679500710000,1073741824],[1679500720000,1073741824],[1679500730000,1073741824],[1679500740000,1073741824],[1679500750000,1073741824],[1679500760000,1073741824],[1679500770000,1073741824],[1679500780000,1073741824],[1679500790000,1073741824],[1679500800000,1073741824],[1679500810000,1073741824],[1679500820000,1073741824],[1679500830000,1073741824],[1679500840000,1073741824],[1679500850000,1073741824],[1679500860000,1073741824],[1679500870000,1073741824]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.beat.memstats.gc_next","metricAgg":"max","label":"GC Next","title":"Memory","description":"Limit of allocated memory at which garbage collection will occur","units":"B","format":"0,0.0 b","hasCalculation":false,"isDerivative":false},"data":[[1679500640000,73697880],[1679500650000,73697880],[1679500660000,73697880],[1679500670000,73697880],[1679500680000,73697880],[1679500690000,73697880],[1679500700000,73697880],[1679500710000,74066896],[1679500720000,74066896],[1679500730000,74066896],[1679500740000,74066896],[1679500750000,74066896],[1679500760000,74066896],[1679500770000,74066896],[1679500780000,73968024],[1679500790000,73968024],[1679500800000,73968024],[1679500810000,73968024],[1679500820000,73968024],[1679500830000,73968024],[1679500840000,73968024],[1679500850000,73963784],[1679500860000,73963784],[1679500870000,73963784]]}],"apm_output_events_rate_success":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.total","metricAgg":"max","label":"Total","title":"Output Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,8.4],[1679500660000,8.8],[1679500670000,6.8],[1679500680000,7.7],[1679500690000,7.6],[1679500700000,8],[1679500710000,8.4],[1679500720000,6.4],[1679500730000,8.4],[1679500740000,10.5],[1679500750000,8.4],[1679500760000,8.4],[1679500770000,7.6],[1679500780000,8],[1679500790000,10],[1679500800000,6.5],[1679500810000,6.8],[1679500820000,7.2],[1679500830000,7.6],[1679500840000,8.4],[1679500850000,8],[1679500860000,10.5],[1679500870000,9.2]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.active","metricAgg":"max","label":"Active","title":"Output Active Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,null],[1679500660000,0.8],[1679500670000,0],[1679500680000,null],[1679500690000,0.4],[1679500700000,0.4],[1679500710000,0.8],[1679500720000,null],[1679500730000,0.8],[1679500740000,0.4],[1679500750000,null],[1679500760000,0],[1679500770000,null],[1679500780000,0.8],[1679500790000,null],[1679500800000,0],[1679500810000,null],[1679500820000,0],[1679500830000,1.6],[1679500840000,null],[1679500850000,null],[1679500860000,0.8],[1679500870000,null]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.acked","metricAgg":"max","label":"Acked","title":"Output Acked Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,9.2],[1679500660000,8],[1679500670000,6.8],[1679500680000,8.5],[1679500690000,7.2],[1679500700000,7.6],[1679500710000,7.6],[1679500720000,8],[1679500730000,7.6],[1679500740000,10.1],[1679500750000,9.2],[1679500760000,8.4],[1679500770000,8],[1679500780000,7.2],[1679500790000,10.4],[1679500800000,6.5],[1679500810000,7.2],[1679500820000,7.2],[1679500830000,6],[1679500840000,9.6],[1679500850000,8.4],[1679500860000,9.7],[1679500870000,10]]}],"apm_output_events_rate_failure":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.failed","metricAgg":"max","label":"Failed","title":"Output Failed Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.libbeat.output.events.dropped","metricAgg":"max","label":"Dropped","title":"Output Dropped Events Rate","description":"Events processed by the output (including retries)","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_responses_valid":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.count","metricAgg":"max","label":"Total","title":"Response Count Intake API","description":"HTTP Requests responded to by server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.valid.ok","metricAgg":"max","label":"Ok","title":"Ok","description":"200 OK response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.valid.accepted","metricAgg":"max","label":"Accepted","title":"Accepted","description":"HTTP Requests successfully reporting new events","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]}],"apm_responses_errors":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.toolarge","metricAgg":"max","label":"Too large","title":"Response Errors Intake API","description":"HTTP Requests rejected due to excessive payload size","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.validate","metricAgg":"max","label":"Validate","title":"Validate","description":"HTTP Requests rejected due to payload validation error","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.method","metricAgg":"max","label":"Method","title":"Method","description":"HTTP Requests rejected due to incorrect HTTP method","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.unauthorized","metricAgg":"max","label":"Unauthorized","title":"Unauthorized","description":"HTTP Requests rejected due to invalid secret token","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.ratelimit","metricAgg":"max","label":"Rate limit","title":"Rate limit","description":"HTTP Requests rejected to due excessive rate limit","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.queue","metricAgg":"max","label":"Queue","title":"Queue","description":"HTTP Requests rejected to due internal queue filling up","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.decode","metricAgg":"max","label":"Decode","title":"Decode","description":"HTTP Requests rejected to due decoding errors - invalid json, incorrect data type for entity","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.forbidden","metricAgg":"max","label":"Forbidden","title":"Forbidden","description":"Forbidden HTTP Requests rejected - CORS violation, disabled enpoint","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.concurrency","metricAgg":"max","label":"Concurrency","title":"Concurrency","description":"HTTP Requests rejected due to overall concurrency limit breach","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.closed","metricAgg":"max","label":"Closed","title":"Closed","description":"HTTP Requests rejected during server shutdown","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.response.errors.internal","metricAgg":"max","label":"Internal","title":"Internal","description":"HTTP Requests rejected due to a miscellaneous internal error","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_requests":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.server.request.count","metricAgg":"max","label":"Requested","title":"Request Count Intake API","description":"HTTP Requests received by server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]}],"apm_transformations":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.transaction.transformations","metricAgg":"max","label":"Transaction","title":"Processed Events","description":"Transaction events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.span.transformations","metricAgg":"max","label":"Span","title":"Transformations","description":"Span events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.error.transformations","metricAgg":"max","label":"Error","title":"Transformations","description":"Error events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,1.8],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,2.5],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,1.5],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,2.5],[1679500870000,2.3]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.processor.metric.transformations","metricAgg":"max","label":"Metric","title":"Transformations","description":"Metric events processed","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,2.1],[1679500660000,2.2],[1679500670000,1.7],[1679500680000,2.3],[1679500690000,1.9],[1679500700000,2],[1679500710000,2.1],[1679500720000,1.6],[1679500730000,2.1],[1679500740000,3],[1679500750000,2.1],[1679500760000,2.1],[1679500770000,1.9],[1679500780000,2],[1679500790000,2.5],[1679500800000,2],[1679500810000,1.7],[1679500820000,1.8],[1679500830000,1.9],[1679500840000,2.1],[1679500850000,2],[1679500860000,3],[1679500870000,2.3]]}],"apm_acm_response":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.count","metricAgg":"max","label":"Count","title":"Response Count Agent Configuration Management","description":"HTTP requests responded to by APM Server","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.count","metricAgg":"max","label":"Error Count","title":"Response Error Count Agent Configuration Management","description":"HTTP errors count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.valid.ok","metricAgg":"max","label":"OK","title":"Response OK Count Agent Configuration Management","description":"200 OK response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.valid.notmodified","metricAgg":"max","label":"Not Modified","title":"Response Not Modified Agent Configuration Management","description":"304 Not modified response count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_acm_response_errors":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.forbidden","metricAgg":"max","label":"Count","title":"Response Errors Agent Configuration Management","description":"Forbidden HTTP requests rejected count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.unauthorized","metricAgg":"max","label":"Unauthorized","title":"Response Unauthorized Errors Agent Configuration Management","description":"Unauthorized HTTP requests rejected count","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.unavailable","metricAgg":"max","label":"Unavailable","title":"Response Unavailable Errors Agent Configuration Management","description":"Unavailable HTTP response count. Possible misconfiguration or unsupported version of Kibana","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.method","metricAgg":"max","label":"Method","title":"Response Method Errors Agent Configuration Management","description":"HTTP requests rejected due to incorrect HTTP method","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]},{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.response.errors.invalidquery","metricAgg":"max","label":"Invalid Query","title":"Response Invalid Query Errors Agent Configuration Management","description":"Invalid HTTP query","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}],"apm_acm_request_count":[{"bucket_size":"10 seconds","timeRange":{"min":1679500640000,"max":1679500880000},"metric":{"app":"apm","field":"beats_stats.metrics.apm-server.acm.request.count","metricAgg":"max","label":"Count","title":"Requests Agent Configuration Management","description":"HTTP Requests received by agent configuration management","units":"/s","format":"0,0.[00]","hasCalculation":false,"isDerivative":true},"data":[[1679500640000,null],[1679500650000,0],[1679500660000,0],[1679500670000,0],[1679500680000,0],[1679500690000,0],[1679500700000,0],[1679500710000,0],[1679500720000,0],[1679500730000,0],[1679500740000,0],[1679500750000,0],[1679500760000,0],[1679500770000,0],[1679500780000,0],[1679500790000,0],[1679500800000,0],[1679500810000,0],[1679500820000,0],[1679500830000,0],[1679500840000,0],[1679500850000,0],[1679500860000,0],[1679500870000,0]]}]},"apmSummary":{"uuid":"ccf6c4d9-37bc-4dd0-bf57-2ae3ee296a39","transportAddress":"3031a4a32eea","version":"8.7.0","name":"3031a4a32eea","type":"Apm-server","output":"Elasticsearch","configReloads":null,"uptime":271879,"eventsTotal":2020,"eventsEmitted":null,"eventsDropped":null,"bytesWritten":739360,"config":{"container":false},"timeOfLastEvent":"2023-03-22T16:01:37.064Z"}}
diff --git a/x-pack/test/observability_ai_assistant_api_integration/common/config.ts b/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
index 559bb5d65dd2a..acd6a6287d446 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/common/config.ts
@@ -10,10 +10,7 @@ import { UrlObject } from 'url';
 import { ObservabilityAIAssistantFtrConfigName } from '../configs';
 import { getApmSynthtraceEsClient } from './create_synthtrace_client';
 import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
-import {
-  getScopedApiClient,
-  ObservabilityAIAssistantAPIClient,
-} from './observability_ai_assistant_api_client';
+import { getScopedApiClient } from './observability_ai_assistant_api_client';
 import { editorUser, viewerUser } from './users/users';
 
 export interface ObservabilityAIAssistantFtrConfig {
@@ -24,20 +21,13 @@ export interface ObservabilityAIAssistantFtrConfig {
 
 export type CreateTestConfig = ReturnType<typeof createTestConfig>;
 
-export interface CreateTest {
-  testFiles: string[];
-  servers: any;
-  services: InheritedServices & {
-    observabilityAIAssistantAPIClient: () => Promise<{
-      adminUser: ObservabilityAIAssistantAPIClient;
-      viewerUser: ObservabilityAIAssistantAPIClient;
-      editorUser: ObservabilityAIAssistantAPIClient;
-    }>;
-  };
-  junit: { reportName: string };
-  esTestCluster: any;
-  kbnTestServer: any;
-}
+export type CreateTest = ReturnType<typeof createObservabilityAIAssistantAPIConfig>;
+
+export type ObservabilityAIAssistantAPIClient = Awaited<
+  ReturnType<CreateTest['services']['observabilityAIAssistantAPIClient']>
+>;
+
+export type ObservabilityAIAssistantServices = Awaited<ReturnType<CreateTestConfig>>['services'];
 
 export function createObservabilityAIAssistantAPIConfig({
   config,
@@ -49,14 +39,15 @@ export function createObservabilityAIAssistantAPIConfig({
   license: 'basic' | 'trial';
   name: string;
   kibanaConfig?: Record<string, any>;
-}): Omit<CreateTest, 'testFiles'> {
+}) {
   const services = config.get('services') as InheritedServices;
   const servers = config.get('servers');
   const kibanaServer = servers.kibana as UrlObject;
   const apmSynthtraceKibanaClient = services.apmSynthtraceKibanaClient();
+  const allConfigs = config.getAll() as Record<string, any>;
 
-  const createTest: Omit<CreateTest, 'testFiles'> = {
-    ...config.getAll(),
+  return {
+    ...allConfigs,
     servers,
     services: {
       ...services,
@@ -89,13 +80,9 @@ export function createObservabilityAIAssistantAPIConfig({
       ],
     },
   };
-
-  return createTest;
 }
 
-export function createTestConfig(
-  config: ObservabilityAIAssistantFtrConfig
-): ({ readConfigFile }: FtrConfigProviderContext) => Promise<CreateTest> {
+export function createTestConfig(config: ObservabilityAIAssistantFtrConfig) {
   const { license, name, kibanaConfig } = config;
 
   return async ({ readConfigFile }: FtrConfigProviderContext) => {
@@ -114,5 +101,3 @@ export function createTestConfig(
     };
   };
 }
-
-export type ObservabilityAIAssistantServices = Awaited<ReturnType<CreateTestConfig>>['services'];
diff --git a/x-pack/test/observability_ai_assistant_api_integration/common/create_llm_proxy.ts b/x-pack/test/observability_ai_assistant_api_integration/common/create_llm_proxy.ts
index cce12d2c1b958..2d01c7692e54f 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/common/create_llm_proxy.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/common/create_llm_proxy.ts
@@ -98,7 +98,7 @@ export class LlmProxy {
         waitForIntercept: () => Promise<LlmResponseSimulator>;
       }
     : {
-        waitAndComplete: () => Promise<void>;
+        completeAfterIntercept: () => Promise<void>;
       } {
     const waitForInterceptPromise = Promise.race([
       new Promise<LlmResponseSimulator>((outerResolve) => {
@@ -162,7 +162,7 @@ export class LlmProxy {
       : responseChunks.split(' ').map((token, i) => (i === 0 ? token : ` ${token}`));
 
     return {
-      waitAndComplete: async () => {
+      completeAfterIntercept: async () => {
         const simulator = await waitForInterceptPromise;
         for (const chunk of parsedChunks) {
           await simulator.next(chunk);
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
index 6be64a1daf3ff..e159475f50523 100644
--- a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/complete.spec.ts
@@ -414,11 +414,11 @@ export default function ApiTest({ getService }: FtrProviderContext) {
               },
             },
           ])
-          .waitAndComplete();
+          .completeAfterIntercept();
 
         proxy
           .intercept('conversation', (body) => !isFunctionTitleRequest(body), 'Good morning, sir!')
-          .waitAndComplete();
+          .completeAfterIntercept();
 
         const createResponse = await observabilityAIAssistantAPIClient
           .editorUser({
@@ -450,7 +450,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
         proxy
           .intercept('conversation', (body) => !isFunctionTitleRequest(body), 'Good night, sir!')
-          .waitAndComplete();
+          .completeAfterIntercept();
 
         const updatedResponse = await observabilityAIAssistantAPIClient
           .editorUser({
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/elasticsearch.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/elasticsearch.spec.ts
new file mode 100644
index 0000000000000..559f21e944011
--- /dev/null
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/elasticsearch.spec.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { MessageAddEvent, MessageRole } from '@kbn/observability-ai-assistant-plugin/common';
+import expect from '@kbn/expect';
+import { apm, timerange } from '@kbn/apm-synthtrace-client';
+import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
+import { ELASTICSEARCH_FUNCTION_NAME } from '@kbn/observability-ai-assistant-plugin/server/functions/elasticsearch';
+import { LlmProxy } from '../../../common/create_llm_proxy';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  createLLMProxyConnector,
+  deleteLLMProxyConnector,
+  getMessageAddedEvents,
+  invokeChatCompleteWithFunctionRequest,
+} from './helpers';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const log = getService('log');
+  const apmSynthtraceEsClient = getService('apmSynthtraceEsClient');
+  const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
+
+  describe('when calling elasticsearch', () => {
+    let proxy: LlmProxy;
+    let connectorId: string;
+    let events: MessageAddEvent[];
+
+    before(async () => {
+      ({ connectorId, proxy } = await createLLMProxyConnector({ log, supertest }));
+      await generateApmData(apmSynthtraceEsClient);
+
+      const responseBody = await invokeChatCompleteWithFunctionRequest({
+        connectorId,
+        observabilityAIAssistantAPIClient,
+        functionCall: {
+          name: ELASTICSEARCH_FUNCTION_NAME,
+          trigger: MessageRole.User,
+          arguments: JSON.stringify({
+            method: 'POST',
+            path: 'traces*/_search',
+            body: {
+              size: 0,
+              aggs: {
+                services: {
+                  terms: {
+                    field: 'service.name',
+                  },
+                },
+              },
+            },
+          }),
+        },
+      });
+
+      await proxy.waitForAllInterceptorsSettled();
+
+      events = getMessageAddedEvents(responseBody);
+    });
+
+    after(async () => {
+      await deleteLLMProxyConnector({ supertest, connectorId, proxy });
+      await apmSynthtraceEsClient.clean();
+    });
+
+    it('returns elasticsearch function response', async () => {
+      const esFunctionResponse = events[0];
+      const parsedEsResponse = JSON.parse(esFunctionResponse.message.message.content!).response;
+
+      expect(esFunctionResponse.message.message.name).to.be('elasticsearch');
+      expect(parsedEsResponse.hits.total.value).to.be(15);
+      expect(parsedEsResponse.aggregations.services.buckets).to.eql([
+        { key: 'java-backend', doc_count: 15 },
+      ]);
+      expect(events.length).to.be(2);
+    });
+  });
+}
+
+export async function generateApmData(apmSynthtraceEsClient: ApmSynthtraceEsClient) {
+  const serviceA = apm
+    .service({ name: 'java-backend', environment: 'production', agentName: 'java' })
+    .instance('a');
+
+  const events = timerange('now-15m', 'now')
+    .interval('1m')
+    .rate(1)
+    .generator((timestamp) => {
+      return serviceA.transaction({ transactionName: 'tx' }).timestamp(timestamp).duration(1000);
+    });
+
+  return apmSynthtraceEsClient.index(events);
+}
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
new file mode 100644
index 0000000000000..f4323c96e3eff
--- /dev/null
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/helpers.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  Message,
+  MessageAddEvent,
+  MessageRole,
+  StreamingChatResponseEvent,
+} from '@kbn/observability-ai-assistant-plugin/common';
+import { ToolingLog } from '@kbn/tooling-log';
+import { Agent } from 'supertest';
+import { Readable } from 'stream';
+import { CreateTest } from '../../../common/config';
+import { createLlmProxy, LlmProxy } from '../../../common/create_llm_proxy';
+
+function decodeEvents(body: Readable | string) {
+  return String(body)
+    .split('\n')
+    .map((line) => line.trim())
+    .filter(Boolean)
+    .map((line) => JSON.parse(line) as StreamingChatResponseEvent);
+}
+
+export function getMessageAddedEvents(body: Readable | string) {
+  return decodeEvents(body).filter(
+    (event): event is MessageAddEvent => event.type === 'messageAdd'
+  );
+}
+
+export async function createLLMProxyConnector({
+  log,
+  supertest,
+}: {
+  log: ToolingLog;
+  supertest: Agent;
+}) {
+  const proxy = await createLlmProxy(log);
+
+  // intercept the LLM request and return a fixed response
+  proxy.intercept('conversation', () => true, 'Hello from LLM Proxy').completeAfterIntercept();
+
+  const response = await supertest
+    .post('/api/actions/connector')
+    .set('kbn-xsrf', 'foo')
+    .send({
+      name: 'OpenAI Proxy',
+      connector_type_id: '.gen-ai',
+      config: {
+        apiProvider: 'OpenAI',
+        apiUrl: `http://localhost:${proxy.getPort()}`,
+      },
+      secrets: {
+        apiKey: 'my-api-key',
+      },
+    })
+    .expect(200);
+
+  return {
+    proxy,
+    connectorId: response.body.id,
+  };
+}
+
+export async function deleteLLMProxyConnector({
+  supertest,
+  connectorId,
+  proxy,
+}: {
+  supertest: Agent;
+  connectorId: string;
+  proxy: LlmProxy;
+}) {
+  await supertest
+    .delete(`/api/actions/connector/${connectorId}`)
+    .set('kbn-xsrf', 'foo')
+    .expect(204);
+
+  proxy.close();
+}
+
+export async function invokeChatCompleteWithFunctionRequest({
+  connectorId,
+  observabilityAIAssistantAPIClient,
+  functionCall,
+}: {
+  connectorId: string;
+  observabilityAIAssistantAPIClient: Awaited<
+    ReturnType<CreateTest['services']['observabilityAIAssistantAPIClient']>
+  >;
+  functionCall: Message['message']['function_call'];
+}) {
+  const { body } = await observabilityAIAssistantAPIClient
+    .editorUser({
+      endpoint: 'POST /internal/observability_ai_assistant/chat/complete',
+      params: {
+        body: {
+          messages: [
+            {
+              '@timestamp': new Date().toISOString(),
+              message: {
+                role: MessageRole.Assistant,
+                content: '',
+                function_call: functionCall,
+              },
+            },
+          ],
+          connectorId,
+          persist: false,
+          screenContexts: [],
+        },
+      },
+    })
+    .expect(200);
+
+  return body;
+}
diff --git a/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts
new file mode 100644
index 0000000000000..0cda45a1a4253
--- /dev/null
+++ b/x-pack/test/observability_ai_assistant_api_integration/tests/complete/functions/summarize.spec.ts
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { MessageRole } from '@kbn/observability-ai-assistant-plugin/common';
+import expect from '@kbn/expect';
+import { LlmProxy } from '../../../common/create_llm_proxy';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  createLLMProxyConnector,
+  deleteLLMProxyConnector,
+  invokeChatCompleteWithFunctionRequest,
+} from './helpers';
+
+export default function ApiTest({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const log = getService('log');
+  const observabilityAIAssistantAPIClient = getService('observabilityAIAssistantAPIClient');
+
+  // Skipped until Elser is available in tests
+  describe.skip('when calling summarize function', () => {
+    let proxy: LlmProxy;
+    let connectorId: string;
+
+    before(async () => {
+      ({ connectorId, proxy } = await createLLMProxyConnector({ log, supertest }));
+
+      await invokeChatCompleteWithFunctionRequest({
+        connectorId,
+        observabilityAIAssistantAPIClient,
+        functionCall: {
+          name: 'summarize',
+          trigger: MessageRole.User,
+          arguments: JSON.stringify({
+            id: 'my-id',
+            text: 'Hello world',
+            is_correction: false,
+            confidence: 1,
+            public: false,
+          }),
+        },
+      });
+
+      await proxy.waitForAllInterceptorsSettled();
+    });
+
+    after(async () => {
+      await deleteLLMProxyConnector({ supertest, connectorId, proxy });
+    });
+
+    it('persists entry in knowledge base', async () => {
+      const res = await observabilityAIAssistantAPIClient.editorUser({
+        endpoint: 'GET /internal/observability_ai_assistant/kb/entries',
+        params: {
+          query: {
+            query: '',
+            sortBy: 'doc_id',
+            sortDirection: 'asc',
+          },
+        },
+      });
+
+      expect(res.body.entries).to.have.length(1);
+    });
+  });
+}
diff --git a/x-pack/test/observability_ai_assistant_functional/common/config.ts b/x-pack/test/observability_ai_assistant_functional/common/config.ts
index e92bf3729cb40..e80597cc2b2b0 100644
--- a/x-pack/test/observability_ai_assistant_functional/common/config.ts
+++ b/x-pack/test/observability_ai_assistant_functional/common/config.ts
@@ -8,8 +8,6 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 import { merge } from 'lodash';
 import { UrlObject } from 'url';
-import type { EBTHelpersContract } from '@kbn/analytics-ftr-helpers-plugin/common/types';
-import { ApmSynthtraceEsClient } from '@kbn/apm-synthtrace';
 import {
   editorUser,
   viewerUser,
@@ -20,75 +18,65 @@ import {
 } from '../../../../test/analytics/services/kibana_ebt';
 import {
   ObservabilityAIAssistantFtrConfig,
-  CreateTest as CreateTestAPI,
   createObservabilityAIAssistantAPIConfig,
 } from '../../observability_ai_assistant_api_integration/common/config';
-import {
-  getScopedApiClient,
-  ObservabilityAIAssistantAPIClient,
-} from '../../observability_ai_assistant_api_integration/common/observability_ai_assistant_api_client';
+import { getScopedApiClient } from '../../observability_ai_assistant_api_integration/common/observability_ai_assistant_api_client';
 import { InheritedFtrProviderContext, InheritedServices } from '../ftr_provider_context';
-import { ObservabilityAIAssistantUIProvider, ObservabilityAIAssistantUIService } from './ui';
-
-export interface TestConfig extends CreateTestAPI {
-  services: Omit<CreateTestAPI['services'], 'observabilityAIAssistantAPIClient'> &
-    InheritedServices & {
-      observabilityAIAssistantUI: (
-        context: InheritedFtrProviderContext
-      ) => Promise<ObservabilityAIAssistantUIService>;
-      observabilityAIAssistantAPIClient: () => Promise<{
-        adminUser: ObservabilityAIAssistantAPIClient;
-        viewerUser: ObservabilityAIAssistantAPIClient;
-        editorUser: ObservabilityAIAssistantAPIClient;
-      }>;
-      kibana_ebt_server: (context: InheritedFtrProviderContext) => EBTHelpersContract;
-      kibana_ebt_ui: (context: InheritedFtrProviderContext) => EBTHelpersContract;
-      apmSynthtraceEsClient: (
-        context: InheritedFtrProviderContext
-      ) => Promise<ApmSynthtraceEsClient>;
-    };
-}
+import { ObservabilityAIAssistantUIProvider } from './ui';
 
 export type CreateTestConfig = ReturnType<typeof createTestConfig>;
+export type TestConfig = Awaited<ReturnType<typeof getTestConfig>>;
 
-export function createTestConfig(
-  config: ObservabilityAIAssistantFtrConfig
-): ({ readConfigFile }: FtrConfigProviderContext) => Promise<TestConfig> {
-  const { license, name, kibanaConfig } = config;
-
-  return async ({ readConfigFile, log, esVersion }: FtrConfigProviderContext) => {
-    const testConfig = await readConfigFile(require.resolve('../../functional/config.base.js'));
+async function getTestConfig({
+  license,
+  name,
+  kibanaConfig,
+  readConfigFile,
+}: {
+  license: 'basic' | 'trial';
+  name: string;
+  kibanaConfig: Record<string, any> | undefined;
+  readConfigFile: FtrConfigProviderContext['readConfigFile'];
+}) {
+  const testConfig = await readConfigFile(require.resolve('../../functional/config.base.js'));
 
-    const baseConfig = createObservabilityAIAssistantAPIConfig({
-      config: testConfig,
-      license,
-      name,
-      kibanaConfig,
-    });
+  const baseConfig = createObservabilityAIAssistantAPIConfig({
+    config: testConfig,
+    license,
+    name,
+    kibanaConfig,
+  });
 
-    const kibanaServer = baseConfig.servers.kibana as UrlObject;
+  const kibanaServer = baseConfig.servers.kibana as UrlObject;
 
-    return merge(
-      {
-        services: testConfig.get('services'),
-      },
-      baseConfig,
-      {
-        testFiles: [require.resolve('../tests')],
-        services: {
-          observabilityAIAssistantUI: (context: InheritedFtrProviderContext) =>
-            ObservabilityAIAssistantUIProvider(context),
-          observabilityAIAssistantAPIClient: async (context: InheritedFtrProviderContext) => {
-            return {
-              adminUser: await getScopedApiClient(kibanaServer, 'elastic'),
-              viewerUser: await getScopedApiClient(kibanaServer, viewerUser.username),
-              editorUser: await getScopedApiClient(kibanaServer, editorUser.username),
-            };
-          },
-          kibana_ebt_server: KibanaEBTServerProvider,
-          kibana_ebt_ui: KibanaEBTUIProvider,
+  return merge(
+    {
+      services: testConfig.get('services') as InheritedServices,
+    },
+    baseConfig,
+    {
+      testFiles: [require.resolve('../tests')],
+      services: {
+        observabilityAIAssistantUI: (context: InheritedFtrProviderContext) =>
+          ObservabilityAIAssistantUIProvider(context),
+        observabilityAIAssistantAPIClient: async (context: InheritedFtrProviderContext) => {
+          return {
+            adminUser: await getScopedApiClient(kibanaServer, 'elastic'),
+            viewerUser: await getScopedApiClient(kibanaServer, viewerUser.username),
+            editorUser: await getScopedApiClient(kibanaServer, editorUser.username),
+          };
         },
-      }
-    );
+        kibana_ebt_server: KibanaEBTServerProvider,
+        kibana_ebt_ui: KibanaEBTUIProvider,
+      },
+    }
+  );
+}
+
+export function createTestConfig(config: ObservabilityAIAssistantFtrConfig) {
+  const { license, name, kibanaConfig } = config;
+
+  return async ({ readConfigFile }: FtrConfigProviderContext) => {
+    return getTestConfig({ license, name, kibanaConfig, readConfigFile });
   };
 }
diff --git a/x-pack/test/observability_ai_assistant_functional/tests/contextual_insights/index.spec.ts b/x-pack/test/observability_ai_assistant_functional/tests/contextual_insights/index.spec.ts
index aff0d91173dd3..41ad6f793ee93 100644
--- a/x-pack/test/observability_ai_assistant_functional/tests/contextual_insights/index.spec.ts
+++ b/x-pack/test/observability_ai_assistant_functional/tests/contextual_insights/index.spec.ts
@@ -159,7 +159,7 @@ export default function ApiTest({ getService, getPageObjects }: FtrProviderConte
 
         await openContextualInsights();
 
-        await interceptor.waitAndComplete();
+        await interceptor.completeAfterIntercept();
 
         await retry.tryForTime(5 * 1000, async () => {
           const llmResponse = await testSubjects.getVisibleText(ui.pages.contextualInsights.text);
diff --git a/x-pack/test/security_api_integration/tests/audit/audit_log.ts b/x-pack/test/security_api_integration/tests/audit/audit_log.ts
index fba60de2ffadd..e8c5d03bfc562 100644
--- a/x-pack/test/security_api_integration/tests/audit/audit_log.ts
+++ b/x-pack/test/security_api_integration/tests/audit/audit_log.ts
@@ -23,23 +23,27 @@ export default function ({ getService }: FtrProviderContext) {
       await logFile.reset();
     });
 
-    // FLAKY: https://github.com/elastic/kibana/issues/119267
-    it.skip('logs audit events when reading and writing saved objects', async () => {
+    it('logs audit events when reading and writing saved objects', async () => {
       await supertest.get('/audit_log?query=param').set('kbn-xsrf', 'foo').expect(204);
       await logFile.isWritten();
       const content = await logFile.readJSON();
 
-      const httpEvent = content.find((c) => c.event.action === 'http_request');
+      const httpEvent = content.find(
+        (c) => c.event.action === 'http_request' && c.url.path === '/audit_log'
+      );
       expect(httpEvent).to.be.ok();
       expect(httpEvent.trace.id).to.be.ok();
 
       expect(httpEvent.user.name).to.be(username);
       expect(httpEvent.kibana.space_id).to.be('default');
       expect(httpEvent.http.request.method).to.be('get');
-      expect(httpEvent.url.path).to.be('/audit_log');
       expect(httpEvent.url.query).to.be('query=param');
 
-      const createEvent = content.find((c) => c.event.action === 'saved_object_create');
+      const createEvent = content.find(
+        (c) =>
+          c.event.action === 'saved_object_create' && c.kibana.saved_object.type === 'dashboard'
+      );
+
       expect(createEvent).to.be.ok();
       expect(createEvent.trace.id).to.be.ok();
       expect(createEvent.user.name).to.be(username);
diff --git a/x-pack/test/security_functional/tests/oidc/url_capture.ts b/x-pack/test/security_functional/tests/oidc/url_capture.ts
index 359034681b6d3..6553ef193fc3b 100644
--- a/x-pack/test/security_functional/tests/oidc/url_capture.ts
+++ b/x-pack/test/security_functional/tests/oidc/url_capture.ts
@@ -16,8 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common']);
 
-  // Failing: See https://github.com/elastic/kibana/issues/186780
-  describe.skip('URL capture', function () {
+  describe('URL capture', function () {
     this.tags('includeFirefox');
 
     before(async () => {
diff --git a/x-pack/test/security_functional/tests/saml/url_capture.ts b/x-pack/test/security_functional/tests/saml/url_capture.ts
index 71b62eb2b2aa3..0193d3d870701 100644
--- a/x-pack/test/security_functional/tests/saml/url_capture.ts
+++ b/x-pack/test/security_functional/tests/saml/url_capture.ts
@@ -16,8 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common']);
 
-  // Failing: See https://github.com/elastic/kibana/issues/186675
-  describe.skip('URL capture', function () {
+  describe('URL capture', function () {
     this.tags('includeFirefox');
 
     before(async () => {
diff --git a/x-pack/test/security_solution_api_integration/README.md b/x-pack/test/security_solution_api_integration/README.md
index 450558737b1e9..cc547b20469c6 100644
--- a/x-pack/test/security_solution_api_integration/README.md
+++ b/x-pack/test/security_solution_api_integration/README.md
@@ -22,7 +22,7 @@ we have introduced the `detection_response` directory to consolidate all the int
 
    * `@serverless`: Runs in the first quality gate and in the periodic pipeline.
 
-   * `@serverlessQA`: Runs in the second quality gate.
+   * `@serverlessQA`: Runs in the Kibana QA quality gate.
 
    * `@skipInEss`: Skipped for ESS environment.
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
index 9406964106170..a1708cf4d6ae0 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/exceptions/workflows/basic_license_essentials_tier/create_rule_exceptions_ess.ts
@@ -14,7 +14,6 @@ import {
   getRuleSOById,
   createRuleThroughAlertingEndpoint,
   getRuleSavedObjectWithLegacyInvestigationFields,
-  checkInvestigationFieldSoValue,
 } from '../../../../utils';
 import {
   createAlertsIndex,
@@ -79,25 +78,15 @@ export default ({ getService }: FtrProviderContext) => {
           })
           .expect(200);
 
-        /**
-         * Confirm type on SO so that it's clear in the tests whether it's expected that
-         * the SO itself is migrated to the inteded object type, or if the transformation is
-         * happening just on the response. In this case, change will
-         * NOT include a migration on SO.
-         */
         const {
           hits: {
             hits: [{ _source: ruleSO }],
           },
         } = await getRuleSOById(es, ruleWithLegacyInvestigationField.id);
-        const isInvestigationFieldMigratedInSo = await checkInvestigationFieldSoValue(ruleSO, {
-          field_names: ['client.address', 'agent.name'],
-        });
 
         expect(
           ruleSO?.alert.params.exceptionsList.some((list) => list.type === 'rule_default')
         ).to.eql(true);
-        expect(isInvestigationFieldMigratedInSo).to.eql(false);
       });
     });
   });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts
index cbc7f43cfe6cc..69795e04cd351 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/esql.ts
@@ -1103,6 +1103,40 @@ export default ({ getService }: FtrProviderContext) => {
             'random non-ecs field'
           );
         });
+
+        it('creates alert if `event.action` ECS field has non-ECS sub-field', async () => {
+          // The issue was found by customer and reported in
+          // https://github.com/elastic/sdh-security-team/issues/1015
+          const id = uuidv4();
+          const interval: [string, string] = [
+            '2020-10-28T06:00:00.000Z',
+            '2020-10-28T06:10:00.000Z',
+          ];
+          const doc1 = {
+            'event.action': 'process',
+          };
+
+          const rule: EsqlRuleCreateProps = {
+            ...getCreateEsqlRulesSchemaMock('rule-1', true),
+            query: `from ecs_non_compliant metadata _id ${internalIdPipe(id)}`,
+            from: 'now-1h',
+            interval: '1h',
+          };
+
+          await indexEnhancedDocumentsToNonEcs({
+            documents: [doc1],
+            interval,
+            id,
+          });
+
+          const { logs } = await previewRule({
+            supertest,
+            rule,
+            timeframeEnd: new Date('2020-10-28T06:30:00.000Z'),
+          });
+
+          expect(logs[0].errors.length).toEqual(0);
+        });
       });
     });
   });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts
index b29ce8abbb8ef..dc26aa96348a6 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/detection_engine/rule_execution_logic/trial_license_complete_tier/execution_logic/machine_learning_alert_suppression.ts
@@ -112,7 +112,8 @@ export default ({ getService }: FtrProviderContext) => {
         await deleteAllAnomalies(log, es);
       });
 
-      describe('with per-execution suppression duration', () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/187478
+      describe.skip('with per-execution suppression duration', () => {
         beforeEach(() => {
           ruleProps = {
             ...baseRuleProps,
@@ -244,7 +245,8 @@ export default ({ getService }: FtrProviderContext) => {
         });
       });
 
-      describe('with interval suppression duration', () => {
+      // FLAKY: https://github.com/elastic/kibana/issues/187614
+      describe.skip('with interval suppression duration', () => {
         beforeEach(() => {
           ruleProps = {
             ...baseRuleProps,
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/index.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/index.ts
index 0656288e2b4ce..31c7cdd30374f 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/index.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/index.ts
@@ -16,6 +16,8 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     loadTestFile(require.resolve('./upgrade_prebuilt_rules'));
     loadTestFile(require.resolve('./upgrade_prebuilt_rules_with_historical_versions'));
     loadTestFile(require.resolve('./fleet_integration'));
-    loadTestFile(require.resolve('./upgrade_review_prebuilt_rules'));
+    loadTestFile(require.resolve('./upgrade_review_prebuilt_rules.number_fields'));
+    loadTestFile(require.resolve('./upgrade_review_prebuilt_rules.single_line_string_fields'));
+    loadTestFile(require.resolve('./upgrade_review_prebuilt_rules.scalar_array_fields'));
   });
 };
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.number_fields.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.number_fields.ts
new file mode 100644
index 0000000000000..79d29a29c0cd3
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.number_fields.ts
@@ -0,0 +1,376 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from 'expect';
+import {
+  ThreeWayDiffOutcome,
+  ThreeWayMergeOutcome,
+} from '@kbn/security-solution-plugin/common/api/detection_engine';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import {
+  deleteAllTimelines,
+  deleteAllPrebuiltRuleAssets,
+  createRuleAssetSavedObject,
+  installPrebuiltRules,
+  createPrebuiltRuleAssetSavedObjects,
+  reviewPrebuiltRulesToUpgrade,
+  patchRule,
+  createHistoricalPrebuiltRuleAssetSavedObjects,
+} from '../../../../utils';
+import { deleteAllRules } from '../../../../../../../common/utils/security_solution';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+  const supertest = getService('supertest');
+  const log = getService('log');
+
+  describe('@ess @serverless @skipInServerlessMKI review prebuilt rules updates from package with mock rule assets', () => {
+    beforeEach(async () => {
+      await deleteAllRules(supertest, log);
+      await deleteAllTimelines(es, log);
+      await deleteAllPrebuiltRuleAssets(es, log);
+    });
+
+    describe(`number fields`, () => {
+      const getRuleAssetSavedObjects = () => [
+        createRuleAssetSavedObject({ rule_id: 'rule-1', version: 1, risk_score: 1 }),
+      ];
+
+      describe("when rule field doesn't have an update and has no custom value - scenario AAA", () => {
+        it('should not show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Increment the version of the installed rule, do NOT update the related number field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              risk_score: 1,
+              version: 2,
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that there is 1 rule eligable for update but number field is NOT returned
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+      });
+
+      describe("when rule field doesn't have an update but has a custom value - scenario ABA", () => {
+        it('should show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Customize a number field on the installed rule
+          await patchRule(supertest, log, {
+            rule_id: 'rule-1',
+            risk_score: 2,
+          });
+
+          // Increment the version of the installed rule, do NOT update the related number field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              risk_score: 1,
+              version: 2,
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that number diff field is returned but field does not have an update
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            risk_score: {
+              base_version: 1,
+              current_version: 2,
+              target_version: 1,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.CustomizedValueNoUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Current,
+              has_conflict: false,
+              has_update: false,
+            },
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+      });
+
+      describe('when rule field has an update but does not have a custom value - scenario AAB', () => {
+        it('should show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Increment the version of the installed rule, update a number field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              version: 2,
+              risk_score: 2,
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            risk_score: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+
+        describe('when rule field has an update and a custom value that are the same - scenario ABB', () => {
+          it('should show in the upgrade/_review API response', async () => {
+            // Install base prebuilt detection rule
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+            await installPrebuiltRules(es, supertest);
+
+            // Customize a number field on the installed rule
+            await patchRule(supertest, log, {
+              rule_id: 'rule-1',
+              risk_score: 2,
+            });
+
+            // Increment the version of the installed rule, update a number field, and create the new rule assets
+            const updatedRuleAssetSavedObjects = [
+              createRuleAssetSavedObject({
+                rule_id: 'rule-1',
+                version: 2,
+                risk_score: 2,
+              }),
+            ];
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update and contains number field
+            const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+            expect(reviewResponse.rules[0].diff.fields).toEqual({
+              risk_score: {
+                base_version: 1,
+                current_version: 2,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueSameUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Current,
+                has_conflict: false,
+                has_update: false,
+              },
+              version: {
+                base_version: 1,
+                current_version: 1,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Target,
+                has_conflict: false,
+                has_update: true,
+              },
+            });
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+            expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+          });
+        });
+
+        describe('when rule field has an update and a custom value that are different - scenario ABC', () => {
+          it('should show in the upgrade/_review API response', async () => {
+            // Install base prebuilt detection rule
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+            await installPrebuiltRules(es, supertest);
+
+            // Customize a number field on the installed rule
+            await patchRule(supertest, log, {
+              rule_id: 'rule-1',
+              risk_score: 2,
+            });
+
+            // Increment the version of the installed rule, update a number field, and create the new rule assets
+            const updatedRuleAssetSavedObjects = [
+              createRuleAssetSavedObject({
+                rule_id: 'rule-1',
+                version: 2,
+                risk_score: 3,
+              }),
+            ];
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            // and number field update has conflict
+            const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+            expect(reviewResponse.rules[0].diff.fields).toEqual({
+              risk_score: {
+                base_version: 1,
+                current_version: 2,
+                target_version: 3,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Conflict,
+                has_conflict: true,
+                has_update: true,
+              },
+              version: {
+                base_version: 1,
+                current_version: 1,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Target,
+                has_conflict: false,
+                has_update: true,
+              },
+            });
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(true);
+            expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+          });
+        });
+
+        describe('when rule base version does not exist', () => {
+          describe('when rule field has an update and a custom value that are the same - scenario -AA', () => {
+            it('should not show in the upgrade/_review API response', async () => {
+              // Install base prebuilt detection rule
+              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+              await installPrebuiltRules(es, supertest);
+
+              // Clear previous rule assets
+              await deleteAllPrebuiltRuleAssets(es, log);
+
+              // Customize a number field on the installed rule
+              await patchRule(supertest, log, {
+                rule_id: 'rule-1',
+                risk_score: 2,
+              });
+
+              // Increment the version of the installed rule, update a number field, and create the new rule assets
+              const updatedRuleAssetSavedObjects = [
+                createRuleAssetSavedObject({
+                  rule_id: 'rule-1',
+                  version: 2,
+                  risk_score: 2,
+                }),
+              ];
+              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+              // but does NOT contain number field
+              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+              expect(reviewResponse.rules[0].diff.fields).toEqual({
+                version: {
+                  current_version: 1,
+                  target_version: 2,
+                  merged_version: 2,
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+              });
+              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            });
+          });
+
+          describe('when rule field has an update and a custom value that are different - scenario -AB', () => {
+            it('should show in the upgrade/_review API response', async () => {
+              // Install base prebuilt detection rule
+              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+              await installPrebuiltRules(es, supertest);
+
+              // Clear previous rule assets
+              await deleteAllPrebuiltRuleAssets(es, log);
+
+              // Customize a number field on the installed rule
+              await patchRule(supertest, log, {
+                rule_id: 'rule-1',
+                risk_score: 2,
+              });
+
+              // Increment the version of the installed rule, update a number field, and create the new rule assets
+              const updatedRuleAssetSavedObjects = [
+                createRuleAssetSavedObject({
+                  rule_id: 'rule-1',
+                  version: 2,
+                  risk_score: 3,
+                }),
+              ];
+              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+              // and number field update does not have a conflict
+              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+              expect(reviewResponse.rules[0].diff.fields).toEqual({
+                risk_score: {
+                  current_version: 2,
+                  target_version: 3,
+                  merged_version: 3,
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+                version: {
+                  current_version: 1,
+                  target_version: 2,
+                  merged_version: 2,
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+              });
+              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            });
+          });
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.scalar_array_fields.ts
similarity index 54%
rename from x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.ts
rename to x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.scalar_array_fields.ts
index 9ad266e20740d..ecbd1711dc52d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.scalar_array_fields.ts
@@ -34,28 +34,32 @@ export default ({ getService }: FtrProviderContext): void => {
       await deleteAllPrebuiltRuleAssets(es, log);
     });
 
-    describe(`single line string fields`, () => {
+    describe(`scalar array fields`, () => {
       const getRuleAssetSavedObjects = () => [
-        createRuleAssetSavedObject({ rule_id: 'rule-1', version: 1, name: 'A' }),
+        createRuleAssetSavedObject({
+          rule_id: 'rule-1',
+          version: 1,
+          tags: ['one', 'two', 'three'],
+        }),
       ];
 
-      describe("when rule field doesn't have an update and has no custom value", () => {
+      describe("when rule field doesn't have an update and has no custom value - scenario AAA", () => {
         it('should not show in the upgrade/_review API response', async () => {
           // Install base prebuilt detection rule
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
           await installPrebuiltRules(es, supertest);
 
-          // Increment the version of the installed rule, do NOT update the related single line string field, and create the new rule assets
+          // Increment the version of the installed rule, do NOT update the related scalar array field, and create the new rule assets
           const updatedRuleAssetSavedObjects = [
             createRuleAssetSavedObject({
               rule_id: 'rule-1',
-              name: 'A',
+              tags: ['one', 'three', 'two'],
               version: 2,
             }),
           ];
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
-          // Call the upgrade review prebuilt rules endpoint and check that there is 1 rule eligable for update but single line string field is NOT returned
+          // Call the upgrade review prebuilt rules endpoint and check that there is 1 rule eligable for update but scalar array field is NOT returned
           const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
           expect(reviewResponse.rules[0].diff.fields).toEqual({
             version: {
@@ -74,36 +78,36 @@ export default ({ getService }: FtrProviderContext): void => {
         });
       });
 
-      describe("when rule field doesn't have an update but has a custom value", () => {
-        it('should not show in the upgrade/_review API response', async () => {
+      describe("when rule field doesn't have an update but has a custom value - scenario ABA", () => {
+        it('should show in the upgrade/_review API response', async () => {
           // Install base prebuilt detection rule
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
           await installPrebuiltRules(es, supertest);
 
-          // Customize a single line string field on the installed rule
+          // Customize a scalar array field on the installed rule
           await patchRule(supertest, log, {
             rule_id: 'rule-1',
-            name: 'B',
+            tags: ['one', 'two', 'four'],
           });
 
-          // Increment the version of the installed rule, do NOT update the related single line string field, and create the new rule assets
+          // Increment the version of the installed rule, do NOT update the related scalar array field, and create the new rule assets
           const updatedRuleAssetSavedObjects = [
             createRuleAssetSavedObject({
               rule_id: 'rule-1',
-              name: 'A',
+              tags: ['one', 'two', 'three'],
               version: 2,
             }),
           ];
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
-          // Call the upgrade review prebuilt rules endpoint and check that single line string diff field is returned but field does not have an update
+          // Call the upgrade review prebuilt rules endpoint and check that scalar array diff field is returned but field does not have an update
           const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
           expect(reviewResponse.rules[0].diff.fields).toEqual({
-            name: {
-              base_version: 'A',
-              current_version: 'B',
-              target_version: 'A',
-              merged_version: 'B',
+            tags: {
+              base_version: ['one', 'two', 'three'],
+              current_version: ['one', 'two', 'four'],
+              target_version: ['one', 'two', 'three'],
+              merged_version: ['one', 'two', 'four'],
               diff_outcome: ThreeWayDiffOutcome.CustomizedValueNoUpdate,
               merge_outcome: ThreeWayMergeOutcome.Current,
               has_conflict: false,
@@ -125,18 +129,18 @@ export default ({ getService }: FtrProviderContext): void => {
         });
       });
 
-      describe('when rule field has an update but does not have a custom value', () => {
+      describe('when rule field has an update but does not have a custom value - scenario AAB', () => {
         it('should show in the upgrade/_review API response', async () => {
           // Install base prebuilt detection rule
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
           await installPrebuiltRules(es, supertest);
 
-          // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+          // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
           const updatedRuleAssetSavedObjects = [
             createRuleAssetSavedObject({
               rule_id: 'rule-1',
               version: 2,
-              name: 'B',
+              tags: ['one', 'two', 'four'],
             }),
           ];
           await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
@@ -144,11 +148,11 @@ export default ({ getService }: FtrProviderContext): void => {
           // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
           const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
           expect(reviewResponse.rules[0].diff.fields).toEqual({
-            name: {
-              base_version: 'A',
-              current_version: 'A',
-              target_version: 'B',
-              merged_version: 'B',
+            tags: {
+              base_version: ['one', 'two', 'three'],
+              current_version: ['one', 'two', 'three'],
+              target_version: ['one', 'two', 'four'],
+              merged_version: ['one', 'two', 'four'],
               diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
               merge_outcome: ThreeWayMergeOutcome.Target,
               has_conflict: false,
@@ -169,36 +173,36 @@ export default ({ getService }: FtrProviderContext): void => {
           expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
         });
 
-        describe('when rule field has an update and a custom value that are the same', () => {
+        describe('when rule field has an update and a custom value that are the same - scenario ABB', () => {
           it('should show in the upgrade/_review API response', async () => {
             // Install base prebuilt detection rule
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
             await installPrebuiltRules(es, supertest);
 
-            // Customize a single line string field on the installed rule
+            // Customize a scalar array field on the installed rule
             await patchRule(supertest, log, {
               rule_id: 'rule-1',
-              name: 'B',
+              tags: ['one', 'two', 'four'],
             });
 
-            // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+            // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
             const updatedRuleAssetSavedObjects = [
               createRuleAssetSavedObject({
                 rule_id: 'rule-1',
                 version: 2,
-                name: 'B',
+                tags: ['one', 'two', 'four'],
               }),
             ];
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
-            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update and contains scalar array field
             const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
             expect(reviewResponse.rules[0].diff.fields).toEqual({
-              name: {
-                base_version: 'A',
-                current_version: 'B',
-                target_version: 'B',
-                merged_version: 'B',
+              tags: {
+                base_version: ['one', 'two', 'three'],
+                current_version: ['one', 'two', 'four'],
+                target_version: ['one', 'two', 'four'],
+                merged_version: ['one', 'two', 'four'],
                 diff_outcome: ThreeWayDiffOutcome.CustomizedValueSameUpdate,
                 merge_outcome: ThreeWayMergeOutcome.Current,
                 has_conflict: false,
@@ -220,40 +224,40 @@ export default ({ getService }: FtrProviderContext): void => {
           });
         });
 
-        describe('when rule field has an update and a custom value that are different', () => {
+        describe('when rule field has an update and a custom value that are different - scenario ABC', () => {
           it('should show in the upgrade/_review API response', async () => {
             // Install base prebuilt detection rule
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
             await installPrebuiltRules(es, supertest);
 
-            // Customize a single line string field on the installed rule
+            // Customize a scalar array field on the installed rule
             await patchRule(supertest, log, {
               rule_id: 'rule-1',
-              name: 'B',
+              tags: ['one', 'two', 'four'],
             });
 
-            // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+            // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
             const updatedRuleAssetSavedObjects = [
               createRuleAssetSavedObject({
                 rule_id: 'rule-1',
                 version: 2,
-                name: 'C',
+                tags: ['one', 'two', 'five'],
               }),
             ];
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
             // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-            // and single line string field update has conflict
+            // and scalar array field update has conflict
             const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
             expect(reviewResponse.rules[0].diff.fields).toEqual({
-              name: {
-                base_version: 'A',
-                current_version: 'B',
-                target_version: 'C',
-                merged_version: 'B',
+              tags: {
+                base_version: ['one', 'two', 'three'],
+                current_version: ['one', 'two', 'four'],
+                target_version: ['one', 'two', 'five'],
+                merged_version: ['one', 'two', 'four', 'five'],
                 diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
-                merge_outcome: ThreeWayMergeOutcome.Conflict,
-                has_conflict: true,
+                merge_outcome: ThreeWayMergeOutcome.Merged,
+                has_conflict: false,
                 has_update: true,
               },
               version: {
@@ -267,281 +271,106 @@ export default ({ getService }: FtrProviderContext): void => {
                 has_update: true,
               },
             });
-            expect(reviewResponse.rules[0].diff.has_conflict).toBe(true);
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
             expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
           });
-        });
-
-        describe('when rule base version does not exist', () => {
-          describe('when rule field has an update and a custom value that are the same', () => {
-            it('should not show in the upgrade/_review API response', async () => {
-              // Install base prebuilt detection rule
-              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
-              await installPrebuiltRules(es, supertest);
 
-              // Clear previous rule assets
-              await deleteAllPrebuiltRuleAssets(es, log);
-
-              // Customize a single line string field on the installed rule
-              await patchRule(supertest, log, {
+          it('should compare values after deduplication', async () => {
+            // Install base prebuilt detection rule
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, [
+              createRuleAssetSavedObject({
                 rule_id: 'rule-1',
-                name: 'B',
-              });
-
-              // Increment the version of the installed rule, update a single line string field, and create the new rule assets
-              const updatedRuleAssetSavedObjects = [
-                createRuleAssetSavedObject({
-                  rule_id: 'rule-1',
-                  version: 2,
-                  name: 'B',
-                }),
-              ];
-              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+                version: 1,
+                tags: ['one', 'two', 'two'],
+              }),
+            ]);
+            await installPrebuiltRules(es, supertest);
 
-              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-              // but does NOT contain single line string field
-              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
-              expect(reviewResponse.rules[0].diff.fields).toEqual({
-                version: {
-                  current_version: 1,
-                  target_version: 2,
-                  merged_version: 2,
-                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-                  merge_outcome: ThreeWayMergeOutcome.Target,
-                  has_conflict: false,
-                  has_update: true,
-                },
-              });
-              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
-              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            // Customize a scalar array field on the installed rule
+            await patchRule(supertest, log, {
+              rule_id: 'rule-1',
+              tags: ['two', 'one', 'three'],
             });
-          });
 
-          describe('when rule field has an update and a custom value that are different', () => {
-            it('should show in the upgrade/_review API response', async () => {
-              // Install base prebuilt detection rule
-              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
-              await installPrebuiltRules(es, supertest);
-
-              // Clear previous rule assets
-              await deleteAllPrebuiltRuleAssets(es, log);
-
-              // Customize a single line string field on the installed rule
-              await patchRule(supertest, log, {
+            // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
+            const updatedRuleAssetSavedObjects = [
+              createRuleAssetSavedObject({
                 rule_id: 'rule-1',
-                name: 'B',
-              });
-
-              // Increment the version of the installed rule, update a single line string field, and create the new rule assets
-              const updatedRuleAssetSavedObjects = [
-                createRuleAssetSavedObject({
-                  rule_id: 'rule-1',
-                  version: 2,
-                  name: 'C',
-                }),
-              ];
-              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+                version: 2,
+                tags: ['three', 'three', 'one'],
+              }),
+            ];
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
-              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-              // and single line string field update does not have a conflict
-              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
-              expect(reviewResponse.rules[0].diff.fields).toEqual({
-                name: {
-                  current_version: 'B',
-                  target_version: 'C',
-                  merged_version: 'C',
-                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-                  merge_outcome: ThreeWayMergeOutcome.Target,
-                  has_conflict: false,
-                  has_update: true,
-                },
-                version: {
-                  current_version: 1,
-                  target_version: 2,
-                  merged_version: 2,
-                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-                  merge_outcome: ThreeWayMergeOutcome.Target,
-                  has_conflict: false,
-                  has_update: true,
-                },
-              });
-              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
-              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            // and scalar array field update has conflict
+            const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+            expect(reviewResponse.rules[0].diff.fields).toEqual({
+              tags: {
+                base_version: ['one', 'two', 'two'],
+                current_version: ['two', 'one', 'three'],
+                target_version: ['three', 'three', 'one'],
+                merged_version: ['one', 'three'],
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Merged,
+                has_conflict: false,
+                has_update: true,
+              },
+              version: {
+                base_version: 1,
+                current_version: 1,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Target,
+                has_conflict: false,
+                has_update: true,
+              },
             });
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+            expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
           });
-        });
-      });
-    });
-
-    describe(`number fields`, () => {
-      const getRuleAssetSavedObjects = () => [
-        createRuleAssetSavedObject({ rule_id: 'rule-1', version: 1, risk_score: 1 }),
-      ];
-
-      describe("when rule field doesn't have an update and has no custom value", () => {
-        it('should not show in the upgrade/_review API response', async () => {
-          // Install base prebuilt detection rule
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
-          await installPrebuiltRules(es, supertest);
-
-          // Increment the version of the installed rule, do NOT update the related number field, and create the new rule assets
-          const updatedRuleAssetSavedObjects = [
-            createRuleAssetSavedObject({
-              rule_id: 'rule-1',
-              risk_score: 1,
-              version: 2,
-            }),
-          ];
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
-
-          // Call the upgrade review prebuilt rules endpoint and check that there is 1 rule eligable for update but number field is NOT returned
-          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
-          expect(reviewResponse.rules[0].diff.fields).toEqual({
-            version: {
-              base_version: 1,
-              current_version: 1,
-              target_version: 2,
-              merged_version: 2,
-              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-              merge_outcome: ThreeWayMergeOutcome.Target,
-              has_conflict: false,
-              has_update: true,
-            },
-          });
-          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
-          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
-        });
-      });
-
-      describe("when rule field doesn't have an update but has a custom value", () => {
-        it('should not show in the upgrade/_review API response', async () => {
-          // Install base prebuilt detection rule
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
-          await installPrebuiltRules(es, supertest);
-
-          // Customize a number field on the installed rule
-          await patchRule(supertest, log, {
-            rule_id: 'rule-1',
-            risk_score: 2,
-          });
-
-          // Increment the version of the installed rule, do NOT update the related number field, and create the new rule assets
-          const updatedRuleAssetSavedObjects = [
-            createRuleAssetSavedObject({
-              rule_id: 'rule-1',
-              risk_score: 1,
-              version: 2,
-            }),
-          ];
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
-
-          // Call the upgrade review prebuilt rules endpoint and check that number diff field is returned but field does not have an update
-          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
-          expect(reviewResponse.rules[0].diff.fields).toEqual({
-            risk_score: {
-              base_version: 1,
-              current_version: 2,
-              target_version: 1,
-              merged_version: 2,
-              diff_outcome: ThreeWayDiffOutcome.CustomizedValueNoUpdate,
-              merge_outcome: ThreeWayMergeOutcome.Current,
-              has_conflict: false,
-              has_update: false,
-            },
-            version: {
-              base_version: 1,
-              current_version: 1,
-              target_version: 2,
-              merged_version: 2,
-              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-              merge_outcome: ThreeWayMergeOutcome.Target,
-              has_conflict: false,
-              has_update: true,
-            },
-          });
-          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
-          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
-        });
-      });
-
-      describe('when rule field has an update but does not have a custom value', () => {
-        it('should show in the upgrade/_review API response', async () => {
-          // Install base prebuilt detection rule
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
-          await installPrebuiltRules(es, supertest);
-
-          // Increment the version of the installed rule, update a number field, and create the new rule assets
-          const updatedRuleAssetSavedObjects = [
-            createRuleAssetSavedObject({
-              rule_id: 'rule-1',
-              version: 2,
-              risk_score: 2,
-            }),
-          ];
-          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
-
-          // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
-          expect(reviewResponse.rules[0].diff.fields).toEqual({
-            risk_score: {
-              base_version: 1,
-              current_version: 1,
-              target_version: 2,
-              merged_version: 2,
-              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-              merge_outcome: ThreeWayMergeOutcome.Target,
-              has_conflict: false,
-              has_update: true,
-            },
-            version: {
-              base_version: 1,
-              current_version: 1,
-              target_version: 2,
-              merged_version: 2,
-              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
-              merge_outcome: ThreeWayMergeOutcome.Target,
-              has_conflict: false,
-              has_update: true,
-            },
-          });
-          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
-          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
-        });
 
-        describe('when rule field has an update and a custom value that are the same', () => {
-          it('should show in the upgrade/_review API response', async () => {
+          it('should compare values sensitive of case', async () => {
             // Install base prebuilt detection rule
-            await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, [
+              createRuleAssetSavedObject({
+                rule_id: 'rule-1',
+                version: 1,
+                tags: ['ONE', 'TWO'],
+              }),
+            ]);
             await installPrebuiltRules(es, supertest);
 
-            // Customize a number field on the installed rule
+            // Customize a scalar array field on the installed rule
             await patchRule(supertest, log, {
               rule_id: 'rule-1',
-              risk_score: 2,
+              tags: ['one', 'ONE'],
             });
 
-            // Increment the version of the installed rule, update a number field, and create the new rule assets
+            // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
             const updatedRuleAssetSavedObjects = [
               createRuleAssetSavedObject({
                 rule_id: 'rule-1',
                 version: 2,
-                risk_score: 2,
+                tags: ['ONE', 'THREE'],
               }),
             ];
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
-            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update and contains number field
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            // and scalar array field update has conflict
             const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
             expect(reviewResponse.rules[0].diff.fields).toEqual({
-              risk_score: {
-                base_version: 1,
-                current_version: 2,
-                target_version: 2,
-                merged_version: 2,
-                diff_outcome: ThreeWayDiffOutcome.CustomizedValueSameUpdate,
-                merge_outcome: ThreeWayMergeOutcome.Current,
+              tags: {
+                base_version: ['ONE', 'TWO'],
+                current_version: ['one', 'ONE'],
+                target_version: ['ONE', 'THREE'],
+                merged_version: ['ONE', 'one', 'THREE'],
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Merged,
                 has_conflict: false,
-                has_update: false,
+                has_update: true,
               },
               version: {
                 base_version: 1,
@@ -557,42 +386,40 @@ export default ({ getService }: FtrProviderContext): void => {
             expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
             expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
           });
-        });
 
-        describe('when rule field has an update and a custom value that are different', () => {
-          it('should show in the upgrade/_review API response', async () => {
+          it('should handle empty arrays', async () => {
             // Install base prebuilt detection rule
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
             await installPrebuiltRules(es, supertest);
 
-            // Customize a number field on the installed rule
+            // Customize a scalar array field on the installed rule
             await patchRule(supertest, log, {
               rule_id: 'rule-1',
-              risk_score: 2,
+              tags: [],
             });
 
-            // Increment the version of the installed rule, update a number field, and create the new rule assets
+            // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
             const updatedRuleAssetSavedObjects = [
               createRuleAssetSavedObject({
                 rule_id: 'rule-1',
                 version: 2,
-                risk_score: 3,
+                tags: ['one', 'two', 'five'],
               }),
             ];
             await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
             // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-            // and number field update has conflict
+            // and scalar array field update has conflict
             const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
             expect(reviewResponse.rules[0].diff.fields).toEqual({
-              risk_score: {
-                base_version: 1,
-                current_version: 2,
-                target_version: 3,
-                merged_version: 2,
+              tags: {
+                base_version: ['one', 'two', 'three'],
+                current_version: [],
+                target_version: ['one', 'two', 'five'],
+                merged_version: ['five'],
                 diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
-                merge_outcome: ThreeWayMergeOutcome.Conflict,
-                has_conflict: true,
+                merge_outcome: ThreeWayMergeOutcome.Merged,
+                has_conflict: false,
                 has_update: true,
               },
               version: {
@@ -606,13 +433,13 @@ export default ({ getService }: FtrProviderContext): void => {
                 has_update: true,
               },
             });
-            expect(reviewResponse.rules[0].diff.has_conflict).toBe(true);
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
             expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
           });
         });
 
         describe('when rule base version does not exist', () => {
-          describe('when rule field has an update and a custom value that are the same', () => {
+          describe('when rule field has an update and a custom value that are the same - scenario -AA', () => {
             it('should not show in the upgrade/_review API response', async () => {
               // Install base prebuilt detection rule
               await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
@@ -621,24 +448,24 @@ export default ({ getService }: FtrProviderContext): void => {
               // Clear previous rule assets
               await deleteAllPrebuiltRuleAssets(es, log);
 
-              // Customize a number field on the installed rule
+              // Customize a scalar array field on the installed rule
               await patchRule(supertest, log, {
                 rule_id: 'rule-1',
-                risk_score: 2,
+                tags: ['one', 'three', 'two'],
               });
 
-              // Increment the version of the installed rule, update a number field, and create the new rule assets
+              // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
               const updatedRuleAssetSavedObjects = [
                 createRuleAssetSavedObject({
                   rule_id: 'rule-1',
                   version: 2,
-                  risk_score: 2,
+                  tags: ['one', 'three', 'two'],
                 }),
               ];
               await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
               // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-              // but does NOT contain number field
+              // but does NOT contain scalar array field
               const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
               expect(reviewResponse.rules[0].diff.fields).toEqual({
                 version: {
@@ -656,7 +483,7 @@ export default ({ getService }: FtrProviderContext): void => {
             });
           });
 
-          describe('when rule field has an update and a custom value that are different', () => {
+          describe('when rule field has an update and a custom value that are different - scenario -AB', () => {
             it('should show in the upgrade/_review API response', async () => {
               // Install base prebuilt detection rule
               await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
@@ -665,30 +492,30 @@ export default ({ getService }: FtrProviderContext): void => {
               // Clear previous rule assets
               await deleteAllPrebuiltRuleAssets(es, log);
 
-              // Customize a number field on the installed rule
+              // Customize a scalar array field on the installed rule
               await patchRule(supertest, log, {
                 rule_id: 'rule-1',
-                risk_score: 2,
+                tags: ['one', 'two', 'four'],
               });
 
-              // Increment the version of the installed rule, update a number field, and create the new rule assets
+              // Increment the version of the installed rule, update a scalar array field, and create the new rule assets
               const updatedRuleAssetSavedObjects = [
                 createRuleAssetSavedObject({
                   rule_id: 'rule-1',
                   version: 2,
-                  risk_score: 3,
+                  tags: ['one', 'two', 'five'],
                 }),
               ];
               await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
 
               // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
-              // and number field update does not have a conflict
+              // and scalar array field update does not have a conflict
               const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
               expect(reviewResponse.rules[0].diff.fields).toEqual({
-                risk_score: {
-                  current_version: 2,
-                  target_version: 3,
-                  merged_version: 3,
+                tags: {
+                  current_version: ['one', 'two', 'four'],
+                  target_version: ['one', 'two', 'five'],
+                  merged_version: ['one', 'two', 'five'],
                   diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
                   merge_outcome: ThreeWayMergeOutcome.Target,
                   has_conflict: false,
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.single_line_string_fields.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.single_line_string_fields.ts
new file mode 100644
index 0000000000000..f814d6725885a
--- /dev/null
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/prebuilt_rules/management/trial_license_complete_tier/upgrade_review_prebuilt_rules.single_line_string_fields.ts
@@ -0,0 +1,376 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import expect from 'expect';
+import {
+  ThreeWayDiffOutcome,
+  ThreeWayMergeOutcome,
+} from '@kbn/security-solution-plugin/common/api/detection_engine';
+import { FtrProviderContext } from '../../../../../../ftr_provider_context';
+import {
+  deleteAllTimelines,
+  deleteAllPrebuiltRuleAssets,
+  createRuleAssetSavedObject,
+  installPrebuiltRules,
+  createPrebuiltRuleAssetSavedObjects,
+  reviewPrebuiltRulesToUpgrade,
+  patchRule,
+  createHistoricalPrebuiltRuleAssetSavedObjects,
+} from '../../../../utils';
+import { deleteAllRules } from '../../../../../../../common/utils/security_solution';
+
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+  const supertest = getService('supertest');
+  const log = getService('log');
+
+  describe('@ess @serverless @skipInServerlessMKI review prebuilt rules updates from package with mock rule assets', () => {
+    beforeEach(async () => {
+      await deleteAllRules(supertest, log);
+      await deleteAllTimelines(es, log);
+      await deleteAllPrebuiltRuleAssets(es, log);
+    });
+
+    describe(`single line string fields`, () => {
+      const getRuleAssetSavedObjects = () => [
+        createRuleAssetSavedObject({ rule_id: 'rule-1', version: 1, name: 'A' }),
+      ];
+
+      describe("when rule field doesn't have an update and has no custom value - scenario AAA", () => {
+        it('should not show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Increment the version of the installed rule, do NOT update the related single line string field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              name: 'A',
+              version: 2,
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that there is 1 rule eligable for update but single line string field is NOT returned
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+      });
+
+      describe("when rule field doesn't have an update but has a custom value - scenario ABA", () => {
+        it('should show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Customize a single line string field on the installed rule
+          await patchRule(supertest, log, {
+            rule_id: 'rule-1',
+            name: 'B',
+          });
+
+          // Increment the version of the installed rule, do NOT update the related single line string field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              name: 'A',
+              version: 2,
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that single line string diff field is returned but field does not have an update
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            name: {
+              base_version: 'A',
+              current_version: 'B',
+              target_version: 'A',
+              merged_version: 'B',
+              diff_outcome: ThreeWayDiffOutcome.CustomizedValueNoUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Current,
+              has_conflict: false,
+              has_update: false,
+            },
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+      });
+
+      describe('when rule field has an update but does not have a custom value - scenario AAB', () => {
+        it('should show in the upgrade/_review API response', async () => {
+          // Install base prebuilt detection rule
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+          await installPrebuiltRules(es, supertest);
+
+          // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+          const updatedRuleAssetSavedObjects = [
+            createRuleAssetSavedObject({
+              rule_id: 'rule-1',
+              version: 2,
+              name: 'B',
+            }),
+          ];
+          await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+          // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+          const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+          expect(reviewResponse.rules[0].diff.fields).toEqual({
+            name: {
+              base_version: 'A',
+              current_version: 'A',
+              target_version: 'B',
+              merged_version: 'B',
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+            version: {
+              base_version: 1,
+              current_version: 1,
+              target_version: 2,
+              merged_version: 2,
+              diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+              merge_outcome: ThreeWayMergeOutcome.Target,
+              has_conflict: false,
+              has_update: true,
+            },
+          });
+          expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+          expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+        });
+
+        describe('when rule field has an update and a custom value that are the same - scenario ABB', () => {
+          it('should show in the upgrade/_review API response', async () => {
+            // Install base prebuilt detection rule
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+            await installPrebuiltRules(es, supertest);
+
+            // Customize a single line string field on the installed rule
+            await patchRule(supertest, log, {
+              rule_id: 'rule-1',
+              name: 'B',
+            });
+
+            // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+            const updatedRuleAssetSavedObjects = [
+              createRuleAssetSavedObject({
+                rule_id: 'rule-1',
+                version: 2,
+                name: 'B',
+              }),
+            ];
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+            expect(reviewResponse.rules[0].diff.fields).toEqual({
+              name: {
+                base_version: 'A',
+                current_version: 'B',
+                target_version: 'B',
+                merged_version: 'B',
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueSameUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Current,
+                has_conflict: false,
+                has_update: false,
+              },
+              version: {
+                base_version: 1,
+                current_version: 1,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Target,
+                has_conflict: false,
+                has_update: true,
+              },
+            });
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+            expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+          });
+        });
+
+        describe('when rule field has an update and a custom value that are different - scenario ABC', () => {
+          it('should show in the upgrade/_review API response', async () => {
+            // Install base prebuilt detection rule
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+            await installPrebuiltRules(es, supertest);
+
+            // Customize a single line string field on the installed rule
+            await patchRule(supertest, log, {
+              rule_id: 'rule-1',
+              name: 'B',
+            });
+
+            // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+            const updatedRuleAssetSavedObjects = [
+              createRuleAssetSavedObject({
+                rule_id: 'rule-1',
+                version: 2,
+                name: 'C',
+              }),
+            ];
+            await createHistoricalPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+            // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+            // and single line string field update has conflict
+            const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+            expect(reviewResponse.rules[0].diff.fields).toEqual({
+              name: {
+                base_version: 'A',
+                current_version: 'B',
+                target_version: 'C',
+                merged_version: 'B',
+                diff_outcome: ThreeWayDiffOutcome.CustomizedValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Conflict,
+                has_conflict: true,
+                has_update: true,
+              },
+              version: {
+                base_version: 1,
+                current_version: 1,
+                target_version: 2,
+                merged_version: 2,
+                diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                merge_outcome: ThreeWayMergeOutcome.Target,
+                has_conflict: false,
+                has_update: true,
+              },
+            });
+            expect(reviewResponse.rules[0].diff.has_conflict).toBe(true);
+            expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+          });
+        });
+
+        describe('when rule base version does not exist', () => {
+          describe('when rule field has an update and a custom value that are the same - scenario -AA', () => {
+            it('should not show in the upgrade/_review API response', async () => {
+              // Install base prebuilt detection rule
+              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+              await installPrebuiltRules(es, supertest);
+
+              // Clear previous rule assets
+              await deleteAllPrebuiltRuleAssets(es, log);
+
+              // Customize a single line string field on the installed rule
+              await patchRule(supertest, log, {
+                rule_id: 'rule-1',
+                name: 'B',
+              });
+
+              // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+              const updatedRuleAssetSavedObjects = [
+                createRuleAssetSavedObject({
+                  rule_id: 'rule-1',
+                  version: 2,
+                  name: 'B',
+                }),
+              ];
+              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+              // but does NOT contain single line string field
+              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+              expect(reviewResponse.rules[0].diff.fields).toEqual({
+                version: {
+                  current_version: 1,
+                  target_version: 2,
+                  merged_version: 2,
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+              });
+              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            });
+          });
+
+          describe('when rule field has an update and a custom value that are different - scenario -AB', () => {
+            it('should show in the upgrade/_review API response', async () => {
+              // Install base prebuilt detection rule
+              await createPrebuiltRuleAssetSavedObjects(es, getRuleAssetSavedObjects());
+              await installPrebuiltRules(es, supertest);
+
+              // Clear previous rule assets
+              await deleteAllPrebuiltRuleAssets(es, log);
+
+              // Customize a single line string field on the installed rule
+              await patchRule(supertest, log, {
+                rule_id: 'rule-1',
+                name: 'B',
+              });
+
+              // Increment the version of the installed rule, update a single line string field, and create the new rule assets
+              const updatedRuleAssetSavedObjects = [
+                createRuleAssetSavedObject({
+                  rule_id: 'rule-1',
+                  version: 2,
+                  name: 'C',
+                }),
+              ];
+              await createPrebuiltRuleAssetSavedObjects(es, updatedRuleAssetSavedObjects);
+
+              // Call the upgrade review prebuilt rules endpoint and check that one rule is eligible for update
+              // and single line string field update does not have a conflict
+              const reviewResponse = await reviewPrebuiltRulesToUpgrade(supertest);
+              expect(reviewResponse.rules[0].diff.fields).toEqual({
+                name: {
+                  current_version: 'B',
+                  target_version: 'C',
+                  merged_version: 'C',
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+                version: {
+                  current_version: 1,
+                  target_version: 2,
+                  merged_version: 2,
+                  diff_outcome: ThreeWayDiffOutcome.StockValueCanUpdate,
+                  merge_outcome: ThreeWayMergeOutcome.Target,
+                  has_conflict: false,
+                  has_update: true,
+                },
+              });
+              expect(reviewResponse.rules[0].diff.has_conflict).toBe(false);
+              expect(reviewResponse.stats.num_rules_to_upgrade_total).toBe(1);
+            });
+          });
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts
index 7e496ea73194d..947b191469e3d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_bulk.ts
@@ -532,7 +532,7 @@ export default ({ getService }: FtrProviderContext) => {
         );
       });
 
-      it('should patch a rule with a legacy investigation field and transform field in response', async () => {
+      it('should patch a rule with a legacy investigation field and migrate field', async () => {
         // patch a simple rule's name
         const { body } = await securitySolutionApi
           .bulkPatchRules({
@@ -548,19 +548,13 @@ export default ({ getService }: FtrProviderContext) => {
         });
         expect(bodyToCompareLegacyField.name).to.eql('some other name');
 
-        /**
-         * Confirm type on SO so that it's clear in the tests whether it's expected that
-         * the SO itself is migrated to the inteded object type, or if the transformation is
-         * happening just on the response. In this case, change should
-         * NOT include a migration on SO.
-         */
         const isInvestigationFieldMigratedInSo = await checkInvestigationFieldSoValue(
           undefined,
           { field_names: ['client.address', 'agent.name'] },
           es,
           body[0].id
         );
-        expect(isInvestigationFieldMigratedInSo).to.eql(false);
+        expect(isInvestigationFieldMigratedInSo).to.eql(true);
       });
 
       it('should patch a rule with a legacy investigation field - empty array - and transform field in response', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_ess.ts b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_ess.ts
index 30398cd2cd1e9..d28358519e307 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_ess.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/detections_response/rules_management/rule_patch/trial_license_complete_tier/patch_rules_ess.ts
@@ -137,7 +137,7 @@ export default ({ getService }: FtrProviderContext) => {
           );
         });
 
-        it('should patch a rule with a legacy investigation field and transform response', async () => {
+        it('should patch a rule with a legacy investigation field and migrate field', async () => {
           const { body } = await supertest
             .patch(DETECTION_ENGINE_RULES_URL)
             .set('kbn-xsrf', 'true')
@@ -152,12 +152,7 @@ export default ({ getService }: FtrProviderContext) => {
           expect(bodyToCompare.investigation_fields).to.eql({
             field_names: ['client.address', 'agent.name'],
           });
-          /**
-           * Confirm type on SO so that it's clear in the tests whether it's expected that
-           * the SO itself is migrated to the inteded object type, or if the transformation is
-           * happening just on the response. In this case, change should
-           * NOT include a migration on SO.
-           */
+
           const isInvestigationFieldMigratedInSo = await checkInvestigationFieldSoValue(
             undefined,
             {
@@ -166,7 +161,7 @@ export default ({ getService }: FtrProviderContext) => {
             es,
             body.id
           );
-          expect(isInvestigationFieldMigratedInSo).to.eql(false);
+          expect(isInvestigationFieldMigratedInSo).to.eql(true);
         });
 
         it('should patch a rule with a legacy investigation field - empty array - and transform response', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts
index fa3f3e0e67f38..1464f8089c55c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/risk_engine/trial_license_complete_tier/asset_criticality.ts
@@ -7,6 +7,8 @@
 
 import expect from '@kbn/expect';
 import { omit } from 'lodash';
+import { AssetCriticalityRecord } from '@kbn/security-solution-plugin/common/api/entity_analytics';
+import _ from 'lodash';
 import { CreateAssetCriticalityRecord } from '@kbn/security-solution-plugin/common/api/entity_analytics';
 import {
   cleanRiskEngine,
@@ -16,6 +18,7 @@ import {
   getAssetCriticalityIndex,
   enableAssetCriticalityAdvancedSetting,
   disableAssetCriticalityAdvancedSetting,
+  createAssetCriticalityRecords,
 } from '../../utils';
 import { FtrProviderContext } from '../../../../ftr_provider_context';
 
@@ -146,7 +149,7 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
-    describe('read', () => {
+    describe('get', () => {
       it('should correctly get asset criticality', async () => {
         const assetCriticality = {
           id_field: 'host.name',
@@ -179,6 +182,132 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
+    describe('list', () => {
+      const TEST_DATA_LENGTH = 40;
+      const LEVELS = ['low_impact', 'medium_impact', 'high_impact', 'extreme_impact'] as const;
+      const startTime = Date.now() - 1000 * TEST_DATA_LENGTH;
+      const records: AssetCriticalityRecord[] = Array.from(
+        { length: TEST_DATA_LENGTH },
+        (__, i) => ({
+          id_field: 'host.name',
+          id_value: `host-${i}`,
+          criticality_level: LEVELS[Math.floor(i / 10)],
+          '@timestamp': new Date(startTime + i * 1000).toISOString(),
+        })
+      );
+
+      const createRecords = () => createAssetCriticalityRecords(records, es);
+
+      before(async () => {
+        enableAssetCriticalityAdvancedSetting(kibanaServer, log);
+      });
+
+      it('should return the first 10 asset criticality records if no args provided', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list();
+
+        expect(omit(body, 'records')).to.eql({
+          total: TEST_DATA_LENGTH,
+          page: 1,
+          per_page: 10,
+        });
+
+        expect(body.records.map((record: AssetCriticalityRecord) => record.id_value)).to.eql(
+          records.slice(0, 10).map((record) => record.id_value)
+        );
+      });
+
+      it('should return the last 10 asset criticality records if sorting by timestamp desc', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list({
+          sort_field: '@timestamp',
+          sort_direction: 'desc',
+        });
+
+        expect(omit(body, 'records')).to.eql({
+          total: TEST_DATA_LENGTH,
+          page: 1,
+          per_page: 10,
+        });
+
+        expect(body.records.map((record: AssetCriticalityRecord) => record.id_value)).to.eql(
+          _.reverse(records.slice(-10)).map((record) => record.id_value)
+        );
+      });
+
+      it('should only return 1 asset criticality record if per_page=1', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list({ per_page: 1 });
+
+        expect(omit(body, 'records')).to.eql({
+          total: TEST_DATA_LENGTH,
+          page: 1,
+          per_page: 1,
+        });
+
+        expect(body.records[0].id_value).to.eql(records[0].id_value);
+      });
+
+      it('should return the next 10 asset criticality records if page=2', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list({ page: 2 });
+
+        expect(omit(body, 'records')).to.eql({
+          total: TEST_DATA_LENGTH,
+          page: 2,
+          per_page: 10,
+        });
+
+        expect(body.records.map((record: AssetCriticalityRecord) => record.id_value)).to.eql(
+          records.slice(10, 20).map((record) => record.id_value)
+        );
+      });
+
+      it('should return 20 records if filtering by criticality_level low_impact and medium_impact', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list({
+          kuery: 'criticality_level:low_impact OR criticality_level:medium_impact',
+        });
+
+        expect(omit(body, 'records')).to.eql({
+          total: 20,
+          page: 1,
+          per_page: 10,
+        });
+      });
+
+      it('should return all records if filtering by id_field = host.name', async () => {
+        await createRecords();
+
+        const { body } = await assetCriticalityRoutes.list({
+          kuery: 'id_field:host.name',
+        });
+
+        expect(omit(body, 'records')).to.eql({
+          total: TEST_DATA_LENGTH,
+          page: 1,
+          per_page: 10,
+        });
+      });
+
+      it('should return a 400 if page is 0', async () => {
+        await assetCriticalityRoutes.list({ page: 0 }, { expectStatusCode: 400 });
+      });
+
+      it('should return a 400 if per_page is 0', async () => {
+        await assetCriticalityRoutes.list({ per_page: 0 }, { expectStatusCode: 400 });
+      });
+
+      it('should return a 400 if per_page is greater than 10000', async () => {
+        await assetCriticalityRoutes.list({ per_page: 10001 }, { expectStatusCode: 400 });
+      });
+    });
+
     describe('update', () => {
       it('should correctly update asset criticality', async () => {
         const assetCriticality = {
@@ -261,7 +390,6 @@ export default ({ getService }: FtrProviderContext) => {
           id_value: 'host-1',
           criticality_level: 'high_impact',
         };
-
         const { body } = await assetCriticalityRoutes.bulkUpload([validRecord]);
         expect(body.errors).to.eql([]);
         expect(body.stats).to.eql({
@@ -274,11 +402,14 @@ export default ({ getService }: FtrProviderContext) => {
       });
 
       it('should correctly upload valid records for multiple entities', async () => {
-        const validRecords: CreateAssetCriticalityRecord[] = Array.from({ length: 50 }, (_, i) => ({
-          id_field: 'host.name',
-          id_value: `host-${i}`,
-          criticality_level: 'high_impact',
-        }));
+        const validRecords: CreateAssetCriticalityRecord[] = Array.from(
+          { length: 50 },
+          (__, i) => ({
+            id_field: 'host.name',
+            id_value: `host-${i}`,
+            criticality_level: 'high_impact',
+          })
+        );
 
         const { body } = await assetCriticalityRoutes.bulkUpload(validRecords);
         expect(body.errors).to.eql([]);
diff --git a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/utils/asset_criticality.ts b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/utils/asset_criticality.ts
index ac7dfd170e412..9ae70f540f897 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/utils/asset_criticality.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/entity_analytics/utils/asset_criticality.ts
@@ -13,6 +13,7 @@ import {
 import {
   ASSET_CRITICALITY_PUBLIC_URL,
   ASSET_CRITICALITY_PUBLIC_CSV_UPLOAD_URL,
+  ASSET_CRITICALITY_PUBLIC_LIST_URL,
   ASSET_CRITICALITY_INTERNAL_STATUS_URL,
   ASSET_CRITICALITY_INTERNAL_PRIVILEGES_URL,
   ENABLE_ASSET_CRITICALITY_SETTING,
@@ -22,6 +23,7 @@ import {
 import type {
   AssetCriticalityRecord,
   CreateAssetCriticalityRecord,
+  ListAssetCriticalityQueryParams,
 } from '@kbn/security-solution-plugin/common/api/entity_analytics';
 import type { Client } from '@elastic/elasticsearch';
 import type { ToolingLog } from '@kbn/tooling-log';
@@ -184,6 +186,19 @@ export const assetCriticalityRouteHelpersFactory = (
       .attach('file', file, { filename: 'asset_criticality.csv' })
       .expect(expectStatusCode);
   },
+  list: async (
+    opts: ListAssetCriticalityQueryParams = {},
+    { expectStatusCode }: { expectStatusCode: number } = { expectStatusCode: 200 }
+  ) => {
+    const qs = querystring.stringify(opts);
+    const route = `${routeWithNamespace(ASSET_CRITICALITY_PUBLIC_LIST_URL, namespace)}?${qs}`;
+    return supertest
+      .get(route)
+      .set('kbn-xsrf', 'true')
+      .set(ELASTIC_HTTP_VERSION_HEADER, API_VERSIONS.public.v1)
+      .set(X_ELASTIC_INTERNAL_ORIGIN_REQUEST, 'kibana')
+      .expect(expectStatusCode);
+  },
 });
 
 export const assetCriticalityRouteHelpersFactoryNoAuth = (
@@ -219,6 +234,32 @@ export const readAssetCriticality = async (
   return results.hits.hits.map((hit) => hit._source as AssetCriticalityRecord);
 };
 
+export const createAssetCriticalityRecords = async (
+  records: CreateAssetCriticalityRecord[],
+  es: Client
+) => {
+  const ops = records.flatMap((record) => [
+    {
+      index: {
+        _index: getAssetCriticalityIndex(),
+        _id: `${record.id_field}:${record.id_value}`,
+      },
+    },
+    record,
+  ]);
+
+  const res = await es.bulk({
+    body: ops,
+    refresh: 'wait_for',
+  });
+
+  if (res.errors) {
+    throw new Error(`Error creating asset criticality: ${JSON.stringify(res)}`);
+  }
+
+  return res;
+};
+
 /**
  * Function to read asset criticality from ES and wait for them to be
  * present/readable. By default, it reads from the asset criticality index in the
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_details.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_details.ts
deleted file mode 100644
index 5e1107e69bdbc..0000000000000
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_details.ts
+++ /dev/null
@@ -1,460 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
-import { PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_settings_form/protection_notice_supported_endpoint_version';
-import { getPolicySettingsFormTestSubjects } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_settings_form/mocks';
-import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
-
-export default function ({ getPageObjects, getService }: FtrProviderContext) {
-  const browser = getService('browser');
-  const pageObjects = getPageObjects([
-    'common',
-    'endpoint',
-    'policy',
-    'endpointPageUtils',
-    'ingestManagerCreatePackagePolicy',
-    'trustedApps',
-  ]);
-  const testSubjects = getService('testSubjects');
-  const policyTestResources = getService('policyTestResources');
-  const endpointTestResources = getService('endpointTestResources');
-  const retry = getService('retry');
-  const timeout = 150000;
-  describe('@ess @serverless When on the Endpoint Policy Details Page', function () {
-    let indexedData: IndexedHostsAndAlertsResponse;
-    const formTestSubjects = getPolicySettingsFormTestSubjects();
-
-    before(async () => {
-      indexedData = await endpointTestResources.loadEndpointData();
-      await browser.refresh();
-    });
-
-    after(async () => {
-      await endpointTestResources.unloadEndpointData(indexedData);
-    });
-
-    describe('with an invalid policy id', () => {
-      it('should display an error', async () => {
-        await pageObjects.policy.navigateToPolicyDetails('invalid-id');
-        await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
-        expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
-          'Package policy invalid-id not found'
-        );
-      });
-    });
-
-    describe('with a valid policy id', () => {
-      let policyInfo: PolicyTestResourceInfo;
-
-      before(async () => {
-        policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
-      });
-
-      after(async () => {
-        if (policyInfo) {
-          await policyInfo.cleanup();
-        }
-      });
-
-      it(
-        'should display policy view',
-        async () => {
-          await retry.waitForWithTimeout('policy title is not empty', 120_000, async () => {
-            return (await testSubjects.getVisibleText('header-page-title')) !== '';
-          });
-          expect(await testSubjects.getVisibleText('header-page-title')).to.equal(
-            policyInfo.packagePolicy.name
-          );
-        },
-        timeout
-      );
-
-      describe('@skipInServerless side navigation', function () {
-        it(
-          'should not hide the side navigation',
-          async function () {
-            await testSubjects.scrollIntoView('solutionSideNavItemLink-get_started');
-            // ensure center of button is visible and not hidden by sticky bottom bar
-            await testSubjects.click('solutionSideNavItemLink-administration', 1000, 15);
-            // test cleanup: go back to policy details page
-            await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
-          },
-          timeout
-        );
-      });
-
-      it(
-        'Should show/hide advanced section when button is clicked',
-        async () => {
-          await testSubjects.missingOrFail(formTestSubjects.advancedSection.settingsContainer);
-
-          // Expand
-          await pageObjects.policy.showAdvancedSettingsSection();
-          await testSubjects.existOrFail(formTestSubjects.advancedSection.settingsContainer);
-
-          // Collapse
-          await pageObjects.policy.hideAdvancedSettingsSection();
-          await testSubjects.missingOrFail(formTestSubjects.advancedSection.settingsContainer);
-        },
-        timeout
-      );
-    });
-
-    ['malware', 'ransomware'].forEach((protection) => {
-      describe(`on the ${protection} protections card`, () => {
-        let policyInfo: PolicyTestResourceInfo;
-        const cardTestSubj:
-          | typeof formTestSubjects['ransomware']
-          | typeof formTestSubjects['malware'] =
-          formTestSubjects[
-            protection as keyof Pick<typeof formTestSubjects, 'malware' | 'ransomware'>
-          ];
-
-        beforeEach(async () => {
-          policyInfo = await policyTestResources.createPolicy();
-          await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
-        }, timeout);
-
-        afterEach(async () => {
-          if (policyInfo) {
-            await policyInfo.cleanup();
-
-            // @ts-expect-error forcing to undefined
-            policyInfo = undefined;
-          }
-        }, timeout);
-
-        it(
-          'should show the supported Endpoint version for user notification',
-          async () => {
-            expect(await testSubjects.getVisibleText(cardTestSubj.notifySupportedVersion)).to.equal(
-              'Agent version ' +
-                PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION[
-                  protection as keyof typeof PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION
-                ]
-            );
-          },
-          timeout
-        );
-
-        it(
-          'should show the custom message text area when the Notify User checkbox is checked',
-          async () => {
-            expect(await testSubjects.isChecked(cardTestSubj.notifyUserCheckbox)).to.be(true);
-            await testSubjects.existOrFail(cardTestSubj.notifyCustomMessage);
-          },
-          timeout
-        );
-
-        it(
-          'should not show the custom message text area when the Notify User checkbox is unchecked',
-          async () => {
-            await pageObjects.endpointPageUtils.clickOnEuiCheckbox(cardTestSubj.notifyUserCheckbox);
-            expect(await testSubjects.isChecked(cardTestSubj.notifyUserCheckbox)).to.be(false);
-            await testSubjects.missingOrFail(cardTestSubj.notifyCustomMessage);
-          },
-          timeout
-        );
-
-        it(
-          'should show a sample custom message',
-          async () => {
-            expect(await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessage)).equal(
-              'Elastic Security {action} {filename}'
-            );
-          },
-          timeout
-        );
-
-        it(
-          'should show a tooltip on hover',
-          async () => {
-            await testSubjects.moveMouseTo(cardTestSubj.notifyCustomMessageTooltipIcon);
-
-            await retry.waitFor(
-              'should show a tooltip on hover',
-              async () =>
-                (await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessageTooltipInfo)) ===
-                `Selecting the user notification option will display a notification to the host user when ${protection} is prevented or detected.\nThe user notification can be customized in the text box below. Bracketed tags can be used to dynamically populate the applicable action (such as prevented or detected) and the filename.`
-            );
-          },
-          timeout
-        );
-
-        it(
-          'should preserve a custom notification message upon saving',
-          async () => {
-            await testSubjects.setValue(cardTestSubj.notifyCustomMessage, '', {
-              clearWithKeyboard: true,
-            });
-            await testSubjects.setValue(
-              cardTestSubj.notifyCustomMessage,
-              'a custom notification message @$% 123',
-              { typeCharByChar: true }
-            );
-
-            await pageObjects.policy.confirmAndSave();
-            await testSubjects.existOrFail('policyDetailsSuccessMessage');
-            expect(await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessage)).to.equal(
-              'a custom notification message @$% 123'
-            );
-          },
-          timeout
-        );
-      });
-    });
-
-    describe('and the save button is clicked', () => {
-      let policyInfo: PolicyTestResourceInfo;
-
-      beforeEach(async () => {
-        policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
-      }, timeout);
-
-      afterEach(async () => {
-        if (policyInfo) {
-          await policyInfo.cleanup();
-
-          // @ts-expect-error forcing to undefined
-          policyInfo = undefined;
-        }
-      }, timeout);
-
-      it(
-        'should display success toast on successful save',
-        async () => {
-          await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-            formTestSubjects.windowsEvents.dnsCheckbox
-          );
-          await pageObjects.policy.confirmAndSave();
-
-          await testSubjects.existOrFail('policyDetailsSuccessMessage');
-          expect(await testSubjects.getVisibleText('policyDetailsSuccessMessage')).to.equal(
-            `Success!\nIntegration ${policyInfo.packagePolicy.name} has been updated.`
-          );
-        },
-        timeout
-      );
-
-      it(
-        'should persist update on the screen',
-        async () => {
-          await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-            formTestSubjects.windowsEvents.processCheckbox
-          );
-          await pageObjects.policy.confirmAndSave();
-
-          await testSubjects.existOrFail('policyDetailsSuccessMessage');
-          await testSubjects.existOrFail('toastCloseButton');
-          await pageObjects.endpoint.navigateToEndpointList();
-          await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
-
-          expect(
-            await (
-              await testSubjects.find(formTestSubjects.windowsEvents.processCheckbox)
-            ).isSelected()
-          ).to.equal(false);
-        },
-        timeout
-      );
-
-      it(
-        'should have updated policy data in overall Agent Policy',
-        async () => {
-          // This test ensures that updates made to the Endpoint Policy are carried all the way through
-          // to the generated Agent Policy that is dispatch down to the Elastic Agent.
-
-          await Promise.all([
-            pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-              formTestSubjects.windowsEvents.fileCheckbox
-            ),
-            pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-              formTestSubjects.linuxEvents.fileCheckbox
-            ),
-            pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-              formTestSubjects.macEvents.fileCheckbox
-            ),
-          ]);
-
-          await pageObjects.policy.showAdvancedSettingsSection();
-
-          const advancedPolicyField = await pageObjects.policy.findAdvancedPolicyField();
-          await advancedPolicyField.clearValue();
-          await advancedPolicyField.click();
-          await advancedPolicyField.type('true');
-          await pageObjects.policy.confirmAndSave();
-
-          await testSubjects.existOrFail('policyDetailsSuccessMessage');
-          await testSubjects.waitForDeleted('toastCloseButton');
-
-          const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
-            policyInfo.agentPolicy.id
-          );
-
-          expect(agentFullPolicy.inputs[0].id).to.eql(policyInfo.packagePolicy.id);
-          expect(agentFullPolicy.inputs[0].policy.linux.advanced.agent.connection_delay).to.eql(
-            'true'
-          );
-          expect(agentFullPolicy.inputs[0].policy.linux.events.file).to.eql(false);
-          expect(agentFullPolicy.inputs[0].policy.mac.events.file).to.eql(false);
-          expect(agentFullPolicy.inputs[0].policy.windows.events.file).to.eql(false);
-        },
-        timeout
-      );
-
-      it(
-        'should have cleared the advanced section when the user deletes the value',
-        async () => {
-          await pageObjects.policy.showAdvancedSettingsSection();
-
-          const advancedPolicyField = await pageObjects.policy.findAdvancedPolicyField();
-          await advancedPolicyField.clearValue();
-          await advancedPolicyField.click();
-          await advancedPolicyField.type('true');
-          await pageObjects.policy.confirmAndSave();
-
-          await testSubjects.existOrFail('policyDetailsSuccessMessage');
-
-          const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
-            policyInfo.agentPolicy.id
-          );
-
-          expect(agentFullPolicy.inputs[0].policy.linux.advanced.agent.connection_delay).to.eql(
-            'true'
-          );
-
-          // Clear the value
-          await advancedPolicyField.click();
-          await advancedPolicyField.clearValueWithKeyboard();
-
-          // Make sure the toast button closes so the save button on the sticky footer is visible
-          await testSubjects.waitForDeleted('toastCloseButton');
-          await pageObjects.policy.confirmAndSave();
-
-          await testSubjects.existOrFail('policyDetailsSuccessMessage');
-
-          const agentFullPolicyUpdated = await policyTestResources.getFullAgentPolicy(
-            policyInfo.agentPolicy.id
-          );
-
-          expect(agentFullPolicyUpdated.inputs[0].policy.linux.advanced).to.eql({
-            capture_env_vars: 'LD_PRELOAD,LD_LIBRARY_PATH',
-          });
-        },
-        timeout
-      );
-    });
-
-    describe('when on Ingest Policy Edit Package Policy page', async () => {
-      let policyInfo: PolicyTestResourceInfo;
-
-      beforeEach(async () => {
-        // Create a policy and navigate to Ingest app
-        policyInfo = await policyTestResources.createPolicy();
-        await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
-          policyInfo.agentPolicy.id,
-          policyInfo.packagePolicy.id
-        );
-      }, timeout);
-
-      afterEach(async () => {
-        if (policyInfo) {
-          await policyInfo.cleanup();
-        }
-      }, timeout);
-
-      it(
-        'should show the endpoint policy form',
-        async () => {
-          await testSubjects.existOrFail(formTestSubjects.form);
-        },
-        timeout
-      );
-
-      it(
-        'should allow updates to policy items',
-        async () => {
-          const winDnsEventingCheckbox = await testSubjects.find(
-            formTestSubjects.windowsEvents.dnsCheckbox
-          );
-          await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(
-            winDnsEventingCheckbox
-          );
-          expect(await winDnsEventingCheckbox.isSelected()).to.be(true);
-          await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-            formTestSubjects.windowsEvents.dnsCheckbox
-          );
-          await pageObjects.policy.waitForCheckboxSelectionChange(
-            formTestSubjects.windowsEvents.dnsCheckbox,
-            false
-          );
-        },
-        timeout
-      );
-
-      it(
-        'should include updated endpoint data when saved',
-        async () => {
-          await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(
-            await testSubjects.find(formTestSubjects.windowsEvents.dnsCheckbox)
-          );
-          await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
-            formTestSubjects.windowsEvents.dnsCheckbox
-          );
-          const updatedCheckboxValue = await testSubjects.isSelected(
-            formTestSubjects.windowsEvents.dnsCheckbox
-          );
-
-          await pageObjects.policy.waitForCheckboxSelectionChange(
-            formTestSubjects.windowsEvents.dnsCheckbox,
-            false
-          );
-
-          await (await pageObjects.ingestManagerCreatePackagePolicy.findSaveButton(true)).click();
-          await pageObjects.ingestManagerCreatePackagePolicy.waitForSaveSuccessNotification(true);
-
-          await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
-            policyInfo.agentPolicy.id,
-            policyInfo.packagePolicy.id
-          );
-
-          await pageObjects.policy.waitForCheckboxSelectionChange(
-            formTestSubjects.windowsEvents.dnsCheckbox,
-            updatedCheckboxValue
-          );
-        },
-        timeout
-      );
-
-      ['trustedApps', 'eventFilters', 'blocklists', 'hostIsolationExceptions'].forEach(
-        (cardName) => {
-          it(
-            `should show ${cardName} card and link should go back to policy`,
-            async () => {
-              await testSubjects.existOrFail(`${cardName}-fleet-integration-card`);
-
-              const card = await testSubjects.find(`${cardName}-fleet-integration-card`);
-              await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(card);
-              await (await testSubjects.find(`${cardName}-link-to-exceptions`)).click();
-
-              await testSubjects.existOrFail('policyDetailsPage');
-
-              await (await testSubjects.find('policyDetailsBackLink')).click();
-              await testSubjects.existOrFail('endpointIntegrationPolicyForm');
-            },
-            timeout
-          );
-        }
-      );
-    });
-  });
-}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/data_stream_helper.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/data_stream_helper.ts
deleted file mode 100644
index 67115c1610157..0000000000000
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/data_stream_helper.ts
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Client } from '@elastic/elasticsearch';
-import { AGENTS_INDEX } from '@kbn/fleet-plugin/common';
-import {
-  alertsIndexPattern,
-  eventsIndexPattern,
-  METADATA_DATASTREAM,
-  METADATA_UNITED_INDEX,
-  metadataCurrentIndexPattern,
-  metadataIndexPattern,
-  policyIndexPattern,
-  telemetryIndexPattern,
-} from '@kbn/security-solution-plugin/common/endpoint/constants';
-
-export function deleteDataStream(getService: (serviceName: 'es') => Client, index: string) {
-  const client = getService('es');
-  return client.transport.request(
-    {
-      method: 'DELETE',
-      path: `_data_stream/${index}`,
-    },
-    {
-      ignore: [404],
-    }
-  );
-}
-
-export async function deleteAllDocsFromIndex(
-  getService: (serviceName: 'es') => Client,
-  index: string
-) {
-  const client = getService('es');
-  await client.deleteByQuery(
-    {
-      query: {
-        match_all: {},
-      },
-      index,
-      wait_for_completion: true,
-      refresh: true,
-    },
-    {
-      ignore: [404],
-    }
-  );
-}
-
-export async function deleteIndex(getService: (serviceName: 'es') => Client, index: string) {
-  const client = getService('es');
-  await client.indices.delete({ index, ignore_unavailable: true });
-}
-
-export async function deleteMetadataStream(getService: (serviceName: 'es') => Client) {
-  await deleteDataStream(getService, metadataIndexPattern);
-}
-
-export async function deleteAllDocsFromMetadataDatastream(
-  getService: (serviceName: 'es') => Client
-) {
-  await deleteAllDocsFromIndex(getService, METADATA_DATASTREAM);
-}
-
-export async function deleteAllDocsFromMetadataCurrentIndex(
-  getService: (serviceName: 'es') => Client
-) {
-  await deleteAllDocsFromIndex(getService, metadataCurrentIndexPattern);
-}
-
-export async function deleteAllDocsFromMetadataUnitedIndex(
-  getService: (serviceName: 'es') => Client
-) {
-  await deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
-}
-
-export async function deleteEventsStream(getService: (serviceName: 'es') => Client) {
-  await deleteDataStream(getService, eventsIndexPattern);
-}
-
-export async function deleteAlertsStream(getService: (serviceName: 'es') => Client) {
-  await deleteDataStream(getService, alertsIndexPattern);
-}
-
-export async function deletePolicyStream(getService: (serviceName: 'es') => Client) {
-  await deleteDataStream(getService, policyIndexPattern);
-}
-
-export async function deleteTelemetryStream(getService: (serviceName: 'es') => Client) {
-  await deleteDataStream(getService, telemetryIndexPattern);
-}
-
-export function deleteAllDocsFromFleetAgents(getService: (serviceName: 'es') => Client) {
-  return deleteAllDocsFromIndex(getService, AGENTS_INDEX);
-}
-
-export function stopTransform(getService: (serviceName: 'es') => Client, transformId: string) {
-  const client = getService('es');
-  const stopRequest = {
-    transform_id: transformId,
-    force: true,
-    wait_for_completion: true,
-    allow_no_match: true,
-  };
-  return client.transform.stopTransform(stopRequest);
-}
-
-export async function startTransform(
-  getService: (serviceName: 'es') => Client,
-  transformId: string
-) {
-  const client = getService('es');
-  const transformsResponse = await client.transform.getTransform({
-    transform_id: `${transformId}*`,
-  });
-  return Promise.all(
-    transformsResponse.transforms.map((transform) => {
-      const t = transform as unknown as { id: string };
-      return client.transform.startTransform({ transform_id: t.id });
-    })
-  );
-}
-
-export function bulkIndex(
-  getService: (serviceName: 'es') => Client,
-  index: string,
-  docs: unknown[]
-) {
-  const operations = docs.flatMap((doc) => [{ create: { _index: index } }, doc]);
-  const client = getService('es');
-
-  return client.bulk({
-    index,
-    refresh: 'wait_for',
-    operations,
-  });
-}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
index 12ad4fd57a040..99b92012eb12e 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/blocklists.ts
@@ -14,8 +14,8 @@ import {
 } from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
 import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
+import { PolicyTestResourceInfo } from '../../../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../../../security_solution_endpoint/services/endpoint_artifacts';
 import { ROLE } from '../../services/roles_users';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
index 456010cea0756..59bdc19c36f65 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/event_filters.ts
@@ -15,8 +15,8 @@ import {
   toNdJsonString,
 } from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
+import { PolicyTestResourceInfo } from '../../../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../../../security_solution_endpoint/services/endpoint_artifacts';
 import { ROLE } from '../../services/roles_users';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
index 427b27172bd51..e58ffb299c1e2 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/host_isolation_exceptions.ts
@@ -18,8 +18,8 @@ import {
 } from '@kbn/lists-plugin/common/schemas/request/import_exceptions_schema.mock';
 import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
+import { PolicyTestResourceInfo } from '../../../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../../../security_solution_endpoint/services/endpoint_artifacts';
 import { ROLE } from '../../services/roles_users';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
index 852d0c1a8529e..4dd4cff64806c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_artifacts/trusted_apps.ts
@@ -14,8 +14,8 @@ import {
 } from '@kbn/security-solution-plugin/common/endpoint/service/artifacts';
 import { ExceptionsListItemGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/exceptions_list_item_generator';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import { PolicyTestResourceInfo } from '../../../security_solution_endpoint/services/endpoint_policy';
-import { ArtifactTestData } from '../../../security_solution_endpoint/services/endpoint_artifacts';
+import { PolicyTestResourceInfo } from '../../../../../security_solution_endpoint/services/endpoint_policy';
+import { ArtifactTestData } from '../../../../../security_solution_endpoint/services/endpoint_artifacts';
 import { ROLE } from '../../services/roles_users';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_authz.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_authz.ts
index 3f69edf091707..a9aa7af829225 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_authz.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/endpoint_authz.ts
@@ -36,7 +36,7 @@ export default function ({ getService }: FtrProviderContext) {
     method: keyof Pick<typeof supertest, 'post' | 'get'>;
     path: string;
     version?: string;
-    body: Record<string, unknown> | undefined;
+    body: Record<string, unknown> | (() => Record<string, unknown>) | undefined;
   }
 
   describe('@ess @serverless When attempting to call an endpoint api', function () {
@@ -92,13 +92,13 @@ export default function ({ getService }: FtrProviderContext) {
       {
         method: 'post',
         path: ISOLATE_HOST_ROUTE_V2,
-        body: { endpoint_ids: ['one'] },
+        body: () => ({ endpoint_ids: [agentId] }),
         version: '2023-10-31',
       },
       {
         method: 'post',
         path: UNISOLATE_HOST_ROUTE_V2,
-        body: { endpoint_ids: ['one'] },
+        body: () => ({ endpoint_ids: [agentId] }),
         version: '2023-10-31',
       },
     ];
@@ -107,19 +107,19 @@ export default function ({ getService }: FtrProviderContext) {
       {
         method: 'post',
         path: GET_PROCESSES_ROUTE,
-        body: { endpoint_ids: ['one'] },
+        body: () => ({ endpoint_ids: [agentId] }),
         version: '2023-10-31',
       },
       {
         method: 'post',
         path: KILL_PROCESS_ROUTE,
-        body: { endpoint_ids: ['one'], parameters: { entity_id: 'abc123' } },
+        body: () => ({ endpoint_ids: [agentId], parameters: { entity_id: 'abc123' } }),
         version: '2023-10-31',
       },
       {
         method: 'post',
         path: SUSPEND_PROCESS_ROUTE,
-        body: { endpoint_ids: ['one'], parameters: { entity_id: 'abc123' } },
+        body: () => ({ endpoint_ids: [agentId], parameters: { entity_id: 'abc123' } }),
         version: '2023-10-31',
       },
     ];
@@ -128,7 +128,7 @@ export default function ({ getService }: FtrProviderContext) {
       {
         method: 'post',
         path: GET_FILE_ROUTE,
-        body: { endpoint_ids: ['one'], parameters: { path: '/opt/file/doc.txt' } },
+        body: () => ({ endpoint_ids: [agentId], parameters: { path: '/opt/file/doc.txt' } }),
         version: '2023-10-31',
       },
     ];
@@ -138,7 +138,7 @@ export default function ({ getService }: FtrProviderContext) {
         method: 'post',
         path: EXECUTE_ROUTE,
         version: '2023-10-31',
-        body: { endpoint_ids: ['one'], parameters: { command: 'ls -la' } },
+        body: () => ({ endpoint_ids: [agentId], parameters: { command: 'ls -la' } }),
       },
     ];
 
@@ -155,6 +155,10 @@ export default function ({ getService }: FtrProviderContext) {
       return path.replace('{action_id}', actionId).replace('{agentId}', agentId);
     }
 
+    function getBodyPayload(apiCall: ApiCallsInterface): ApiCallsInterface['body'] {
+      return typeof apiCall.body === 'function' ? apiCall.body() : apiCall.body;
+    }
+
     before(async () => {
       indexedData = await endpointTestResources.loadEndpointData();
       agentId = indexedData.hosts[0].agent.id;
@@ -179,7 +183,7 @@ export default function ({ getService }: FtrProviderContext) {
             .auth(ROLE.t1_analyst, 'changeme')
             .set('kbn-xsrf', 'xxx')
             .set(apiListItem.version ? 'Elastic-Api-Version' : 'foo', '2023-10-31')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(403, {
               statusCode: 403,
               error: 'Forbidden',
@@ -196,7 +200,7 @@ export default function ({ getService }: FtrProviderContext) {
           await supertestWithoutAuth[apiListItem.method](replacePathIds(apiListItem.path))
             .auth(ROLE.t1_analyst, 'changeme')
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(200);
         });
       }
@@ -214,7 +218,7 @@ export default function ({ getService }: FtrProviderContext) {
           await supertestWithoutAuth[apiListItem.method](replacePathIds(apiListItem.path))
             .auth(ROLE.platform_engineer, 'changeme')
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(403, {
               statusCode: 403,
               error: 'Forbidden',
@@ -234,7 +238,7 @@ export default function ({ getService }: FtrProviderContext) {
           await supertestWithoutAuth[apiListItem.method](replacePathIds(apiListItem.path))
             .auth(ROLE.platform_engineer, 'changeme')
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(200);
         });
       }
@@ -248,7 +252,7 @@ export default function ({ getService }: FtrProviderContext) {
           await supertestWithoutAuth[apiListItem.method](replacePathIds(apiListItem.path))
             .auth(ROLE.endpoint_operations_analyst, 'changeme')
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(403, {
               statusCode: 403,
               error: 'Forbidden',
@@ -270,7 +274,7 @@ export default function ({ getService }: FtrProviderContext) {
           await supertestWithoutAuth[apiListItem.method](replacePathIds(apiListItem.path))
             .auth(ROLE.endpoint_operations_analyst, 'changeme')
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(200);
         });
       }
@@ -291,7 +295,7 @@ export default function ({ getService }: FtrProviderContext) {
         }]`, async () => {
           await supertest[apiListItem.method](replacePathIds(apiListItem.path))
             .set('kbn-xsrf', 'xxx')
-            .send(apiListItem.body)
+            .send(getBodyPayload(apiListItem))
             .expect(200);
         });
       }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/index.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/index.ts
index 112fe140642b0..70c94c9ef3c4c 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/index.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/index.ts
@@ -7,27 +7,28 @@
 import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { isServerlessKibanaFlavor } from '@kbn/security-solution-plugin/scripts/endpoint/common/stack_services';
 import { FtrProviderContext } from '../configs/ftr_provider_context';
-import { getRegistryUrlFromTestEnv, isRegistryEnabled } from '../registry';
 import { ROLE } from '../services/roles_users';
 
 export default function endpointAPIIntegrationTests(providerContext: FtrProviderContext) {
   const { loadTestFile, getService } = providerContext;
 
-  describe('Endpoint plugin', function () {
+  describe('Endpoint plugin', async function () {
     const ingestManager = getService('ingestManager');
     const rolesUsersProvider = getService('rolesUsersProvider');
     const kbnClient = getService('kibanaServer');
     const log = getService('log');
-
-    if (!isRegistryEnabled()) {
-      log.warning('These tests are being run with an external package registry');
-    }
-
-    const registryUrl = getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
-    log.info(`Package registry URL for tests: ${registryUrl}`);
+    const endpointRegistryHelpers = getService('endpointRegistryHelpers');
 
     const roles = Object.values(ROLE);
     before(async () => {
+      if (!endpointRegistryHelpers.isRegistryEnabled()) {
+        log.warning('These tests are being run with an external package registry');
+      }
+
+      const registryUrl =
+        endpointRegistryHelpers.getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
+      log.info(`Package registry URL for tests: ${registryUrl}`);
+
       try {
         await ingestManager.setup();
       } catch (err) {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/metadata.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/metadata.ts
index 8587a88ee7227..5653b7a3c0df4 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/metadata.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/metadata.ts
@@ -30,21 +30,14 @@ import {
   MetadataListResponse,
 } from '@kbn/security-solution-plugin/common/endpoint/types';
 import { generateAgentDocs, generateMetadataDocs } from './metadata.fixtures';
-import {
-  bulkIndex,
-  deleteAllDocsFromFleetAgents,
-  deleteAllDocsFromIndex,
-  deleteAllDocsFromMetadataCurrentIndex,
-  deleteAllDocsFromMetadataDatastream,
-  startTransform,
-  stopTransform,
-} from './data_stream_helper';
+
 import { FtrProviderContext } from '../configs/ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const endpointTestResources = getService('endpointTestResources');
   const log = getService('log');
+  const endpointDataStreamHelpers = getService('endpointDataStreamHelpers');
 
   describe('@ess @serverless test metadata apis', function () {
     describe('list endpoints GET route', () => {
@@ -54,11 +47,11 @@ export default function ({ getService }: FtrProviderContext) {
       let metadataTimestamp: number;
 
       before(async () => {
-        await deleteAllDocsFromFleetAgents(getService);
-        await deleteAllDocsFromMetadataDatastream(getService);
-        await deleteAllDocsFromMetadataCurrentIndex(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromFleetAgents(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataDatastream(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataCurrentIndex(getService);
         try {
-          await deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
+          await endpointDataStreamHelpers.deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
         } catch (err) {
           log.warning(`Unable to delete index: ${err}`);
         }
@@ -80,8 +73,8 @@ export default function ({ getService }: FtrProviderContext) {
           const metadataDocs = generateMetadataDocs(metadataTimestamp);
 
           await Promise.all([
-            bulkIndex(getService, AGENTS_INDEX, agentDocs),
-            bulkIndex(getService, METADATA_DATASTREAM, metadataDocs),
+            endpointDataStreamHelpers.bulkIndex(getService, AGENTS_INDEX, agentDocs),
+            endpointDataStreamHelpers.bulkIndex(getService, METADATA_DATASTREAM, metadataDocs),
           ]);
 
           return {
@@ -94,10 +87,10 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       after(async () => {
-        await deleteAllDocsFromFleetAgents(getService);
-        await deleteAllDocsFromMetadataDatastream(getService);
-        await deleteAllDocsFromMetadataCurrentIndex(getService);
-        await deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
+        await endpointDataStreamHelpers.deleteAllDocsFromFleetAgents(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataDatastream(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataCurrentIndex(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromIndex(getService, METADATA_UNITED_INDEX);
       });
 
       it('should return one entry for each host with default paging', async () => {
@@ -427,8 +420,8 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('correctly returns stopped transform stats', async () => {
-        await stopTransform(getService, `${currentTransformName}*`);
-        await stopTransform(getService, `${unitedTransformName}*`);
+        await endpointDataStreamHelpers.stopTransform(getService, `${currentTransformName}*`);
+        await endpointDataStreamHelpers.stopTransform(getService, `${unitedTransformName}*`);
 
         const { body } = await supertest
           .get(METADATA_TRANSFORMS_STATUS_ROUTE)
@@ -453,8 +446,8 @@ export default function ({ getService }: FtrProviderContext) {
         );
         expect(unitedTransform).to.be.ok();
 
-        await startTransform(getService, currentTransformName);
-        await startTransform(getService, unitedTransformName);
+        await endpointDataStreamHelpers.startTransform(getService, currentTransformName);
+        await endpointDataStreamHelpers.startTransform(getService, unitedTransformName);
       });
 
       it('correctly returns started transform stats', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/package.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/package.ts
index fb7232bcd6701..745fc8ac85337 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/package.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/package.ts
@@ -17,7 +17,6 @@ import {
 } from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 import { FtrProviderContext } from '../configs/ftr_provider_context';
 import { InsertedEvents, processEventsIndex } from '../services/resolver';
-import { deleteEventsStream } from './data_stream_helper';
 
 interface EventIngested {
   event: {
@@ -46,6 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
   const resolver = getService('resolverGenerator');
   const es = getService('es');
   const generator = new EndpointDocGenerator('data');
+  const endpointDataStreamHelpers = getService('endpointDataStreamHelpers');
 
   const searchForID = async <T>(id: string) => {
     return es.search<T>(
@@ -106,7 +106,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       after(async () => {
-        await deleteEventsStream(getService);
+        await endpointDataStreamHelpers.deleteEventsStream(getService);
       });
 
       it('does not set dns.question.type if it is already populated', async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/policy.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/policy.ts
index aea40c843a6dc..e41154944f183 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/policy.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/apis/policy.ts
@@ -7,11 +7,12 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../configs/ftr_provider_context';
-import { deletePolicyStream } from './data_stream_helper';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
+  const endpointDataStreamHelpers = getService('endpointDataStreamHelpers');
+
   describe('@ess @serverless Endpoint policy api', function () {
     describe('GET /api/endpoint/policy_response', () => {
       before(
@@ -23,7 +24,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       // the endpoint uses data streams and es archiver does not support deleting them at the moment so we need
       // to do it manually
-      after(async () => await deletePolicyStream(getService));
+      after(async () => await endpointDataStreamHelpers.deletePolicyStream(getService));
 
       it('should return one policy response for an id', async () => {
         const expectedAgentId = 'a10ac658-a3bc-4ac6-944a-68d9bd1c5a5e';
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.base.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.base.ts
index c1ab15953d77f..08adb40b48646 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.base.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/configs/config.base.ts
@@ -6,8 +6,8 @@
  */
 
 import { Config } from '@kbn/test';
-import { getRegistryUrlAsArray, createEndpointDockerConfig } from '../registry';
-import { SUITE_TAGS } from '../../security_solution_endpoint/configs/config.base';
+import { SecuritySolutionEndpointRegistryHelpers } from '../../../../common/services/security_solution';
+import { SUITE_TAGS } from '../../../../security_solution_endpoint/configs/config.base';
 
 export const generateConfig = async ({
   baseConfig,
@@ -22,6 +22,9 @@ export const generateConfig = async ({
   target: keyof typeof SUITE_TAGS;
   services: any;
 }): Promise<Config> => {
+  // services are not ready yet, so we need to import them here
+  const { createEndpointDockerConfig, getRegistryUrlAsArray } =
+    SecuritySolutionEndpointRegistryHelpers();
   return {
     ...baseConfig.getAll(),
     testFiles: [require.resolve('../apis')],
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/registry.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/registry.ts
deleted file mode 100644
index fac96b8221ea9..0000000000000
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/registry.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import path from 'path';
-
-import { defineDockerServersConfig } from '@kbn/test';
-import { dockerImage as ingestDockerImage } from '../../../fleet_api_integration/config.base';
-
-/**
- * This is used by CI to set the docker registry port
- * you can also define this environment variable locally when running tests which
- * will spin up a local docker package registry locally for you
- * if this is defined it takes precedence over the `packageRegistryOverride` variable
- */
-const dockerRegistryPort: string | undefined = process.env.FLEET_PACKAGE_REGISTRY_PORT;
-
-/**
- * If you don't want to use the docker image version pinned below and instead want to run your own
- * registry or use an external registry you can define this environment variable when running
- * the tests to use that registry url instead.
- *
- * This is particularly useful when a developer needs to test a new package against the kibana
- * integration or functional tests. Instead of having to publish a whole new docker image we
- * can set this environment variable which will point to the location of where your package registry
- * is serving the updated package.
- *
- * This variable will not and should not be used by CI. CI should always use the pinned docker image below.
- */
-const packageRegistryOverride: string | undefined = process.env.PACKAGE_REGISTRY_URL_OVERRIDE;
-
-const defaultRegistryConfigPath = path.join(
-  __dirname,
-  './apis/fixtures/package_registry_config.yml'
-);
-
-export function createEndpointDockerConfig(
-  packageRegistryConfig: string = defaultRegistryConfigPath,
-  dockerImage: string = ingestDockerImage,
-  dockerArgs: string[] = []
-) {
-  const args: string[] = [
-    '-v',
-    `${packageRegistryConfig}:/package-registry/config.yml`,
-    ...dockerArgs,
-  ];
-  return defineDockerServersConfig({
-    registry: {
-      enabled: !!dockerRegistryPort,
-      image: dockerImage,
-      portInContainer: 8080,
-      port: dockerRegistryPort,
-      args,
-      waitForLogLine: 'package manifests loaded',
-      waitForLogLineTimeoutMs: 60 * 2 * 10000, // 2 minutes,
-    },
-  });
-}
-
-export function getRegistryUrlFromTestEnv(): string | undefined {
-  let registryUrl: string | undefined;
-  if (dockerRegistryPort !== undefined) {
-    registryUrl = `--xpack.fleet.registryUrl=http://localhost:${dockerRegistryPort}`;
-  } else if (packageRegistryOverride !== undefined) {
-    registryUrl = `--xpack.fleet.registryUrl=${packageRegistryOverride}`;
-  }
-  return registryUrl;
-}
-
-export function getRegistryUrlAsArray(): string[] {
-  const registryUrl: string | undefined = getRegistryUrlFromTestEnv();
-  return registryUrl !== undefined ? [registryUrl] : [];
-}
-
-export function isRegistryEnabled() {
-  return getRegistryUrlFromTestEnv() !== undefined;
-}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/services/index.ts b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/services/index.ts
index ff97d7e20f299..fc46bc5587bc6 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/services/index.ts
+++ b/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint_api_int/services/index.ts
@@ -8,13 +8,15 @@
 import {
   KibanaSupertestWithCertProvider,
   KibanaSupertestWithCertWithoutAuthProvider,
-} from '../../security_solution_endpoint/services/supertest_with_cert';
+} from '../../../../security_solution_endpoint/services/supertest_with_cert';
 import { services as xPackAPIServices } from '../../../../api_integration/services';
 import { ResolverGeneratorProvider } from './resolver';
 import { RolesUsersProvider } from './roles_users';
-import { EndpointTestResources } from '../../security_solution_endpoint/services/endpoint';
-import { EndpointPolicyTestResourcesProvider } from '../../security_solution_endpoint/services/endpoint_policy';
-import { EndpointArtifactsTestResources } from '../../security_solution_endpoint/services/endpoint_artifacts';
+import { EndpointTestResources } from '../../../../security_solution_endpoint/services/endpoint';
+import { EndpointPolicyTestResourcesProvider } from '../../../../security_solution_endpoint/services/endpoint_policy';
+import { EndpointArtifactsTestResources } from '../../../../security_solution_endpoint/services/endpoint_artifacts';
+import { SecuritySolutionEndpointDataStreamHelpers } from '../../../../common/services/security_solution/endpoint_data_stream_helpers';
+import { SecuritySolutionEndpointRegistryHelpers } from '../../../../common/services/security_solution/endpoint_registry_helpers';
 
 export const services = {
   ...xPackAPIServices,
@@ -23,6 +25,8 @@ export const services = {
   endpointPolicyTestResources: EndpointPolicyTestResourcesProvider,
   endpointArtifactTestResources: EndpointArtifactsTestResources,
   rolesUsersProvider: RolesUsersProvider,
+  endpointDataStreamHelpers: SecuritySolutionEndpointDataStreamHelpers,
+  endpointRegistryHelpers: SecuritySolutionEndpointRegistryHelpers,
 };
 
 export const svlServices = {
diff --git a/x-pack/test/security_solution_api_integration/tsconfig.json b/x-pack/test/security_solution_api_integration/tsconfig.json
index c9bcdf8ccde2b..8584cebd03edb 100644
--- a/x-pack/test/security_solution_api_integration/tsconfig.json
+++ b/x-pack/test/security_solution_api_integration/tsconfig.json
@@ -45,8 +45,6 @@
     "@kbn/task-manager-plugin",
     "@kbn/utility-types",
     "@kbn/timelines-plugin",
-    "@kbn/ftr-common-functional-ui-services",
-    "@kbn/test-subj-selector",
     "@kbn/dev-cli-runner",
   ]
 }
diff --git a/x-pack/test/security_solution_cypress/cypress/README.md b/x-pack/test/security_solution_cypress/cypress/README.md
index e58ace3933690..bf153cb3be5e0 100644
--- a/x-pack/test/security_solution_cypress/cypress/README.md
+++ b/x-pack/test/security_solution_cypress/cypress/README.md
@@ -45,11 +45,11 @@ Please, before opening a PR with the new test, please make sure that the test fa
 Note that we use tags in order to select which tests we want to execute:
 
 - `@serverless` includes a test in the Serverless test suite for PRs (the so-called first quality gate) and QA environment for the periodic pipeline. You need to explicitly add this tag to any test you want to run in CI for serverless. 
-- `@serverlessQA` includes a test in the Serverless test suite for the Kibana release process of serverless. You need to explicitly add this tag to any test you want you run in CI for the second quality gate. These tests should be stable, otherwise they will be blocking the release pipeline. They should be also critical enough, so that when they fail, there's a high chance of an SDH or blocker issue to be reported.
+- `@serverlessQA` includes a test in the Serverless test suite for the Kibana release process of serverless. You need to explicitly add this tag to any test you want you run in CI for the Kibana QA quality gate. These tests should be stable, otherwise they will be blocking the release pipeline. They should be also critical enough, so that when they fail, there's a high chance of an SDH or blocker issue to be reported.
 - `@ess` includes a test in the normal, non-Serverless test suite. You need to explicitly add this tag to any test you want to run against a non-Serverless environment.
 - `@skipInEss` excludes a test from the non-Serverless test suite. The test will not be executed as part for the PR process. All the skipped tests should have a link to a ticket describing the reason why the test got skipped.
 - `@skipInServerlessMKI` excludes a test from the execution on any MKI environment (even if it's tagged as `@serverless` or `@serverlessQA`). Could indicate many things, e.g. "the test is flaky in Serverless MKI", "the test has been temporarily excluded, see the comment above why". All the skipped tests should have a link to a ticket describing the reason why the test got skipped.
-- `@skipInServerless` excludes a test from the Serverless test suite and Serverless QA environment for both, periodic pipeline and second quality gate (even if it's tagged as `@serverless`). Could indicate many things, e.g. "the test is flaky in Serverless", "the test is Flaky in any type of environment", "the test has been temporarily excluded, see the comment above why". All the skipped tests should have a link to a ticket describing the reason why the test got skipped.
+- `@skipInServerless` excludes a test from the Serverless test suite and Serverless QA environment for both, periodic pipeline and Kibana QA quality gate (even if it's tagged as `@serverless`). Could indicate many things, e.g. "the test is flaky in Serverless", "the test is Flaky in any type of environment", "the test has been temporarily excluded, see the comment above why". All the skipped tests should have a link to a ticket describing the reason why the test got skipped.
 
 Please, before opening a PR with a new test, make sure that the test fails. If you never see your test fail you don’t know if your test is actually testing the right thing, or testing anything at all.
 
@@ -304,7 +304,7 @@ Per the way we set the environment during the execution process on CI, the above
 For test developing or test debugging purposes, you need to modify the configuration but without committing and pushing the changes in `x-pack/test/security_solution_cypress/serverless_config.ts`.
 
 
-### Running serverless tests locally pointing to a MKI project created in QA environment (Second Quality Gate)
+### Running serverless tests locally pointing to a MKI project created in QA environment (Kibana QA quality gate)
 
 Note that when using any of the below scripts, the tests are going to be executed through an MKI project with the version that is currently available in QA. If you need to use
 a specific commit (i.e. debugging a failing tests on the periodic pipeline), check the section: `Running serverless tests locally pointing to a MKI project created in QA environment with an overridden image`.
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/custom_saved_query_rule.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/custom_saved_query_rule.cy.ts
index 913218797fd76..48f2bd4002f3b 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/custom_saved_query_rule.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/custom_saved_query_rule.cy.ts
@@ -132,22 +132,27 @@ describe('Saved query rules', { tags: ['@ess', '@serverless'] }, () => {
           cy.get(TOASTER).should('contain', FAILED_TO_LOAD_ERROR);
         });
 
-        it('Allows to update saved_query rule with non-existent query', () => {
-          cy.get(LOAD_QUERY_DYNAMICALLY_CHECKBOX).should('exist');
-
-          cy.intercept('PUT', '/api/detection_engine/rules').as('editedRule');
-          saveEditedRule();
-
-          cy.wait('@editedRule').then(({ response }) => {
-            // updated rule type shouldn't change
-            cy.wrap(response?.body.type).should('equal', 'saved_query');
-          });
-
-          cy.get(DEFINE_RULE_PANEL_PROGRESS).should('not.exist');
-
-          assertDetailsNotExist(SAVED_QUERY_NAME_DETAILS);
-          assertDetailsNotExist(SAVED_QUERY_DETAILS);
-        });
+        // https://github.com/elastic/kibana/issues/187623
+        it(
+          'Allows to update saved_query rule with non-existent query',
+          { tags: ['@skipInServerlessMKI'] },
+          () => {
+            cy.get(LOAD_QUERY_DYNAMICALLY_CHECKBOX).should('exist');
+
+            cy.intercept('PUT', '/api/detection_engine/rules').as('editedRule');
+            saveEditedRule();
+
+            cy.wait('@editedRule').then(({ response }) => {
+              // updated rule type shouldn't change
+              cy.wrap(response?.body.type).should('equal', 'saved_query');
+            });
+
+            cy.get(DEFINE_RULE_PANEL_PROGRESS).should('not.exist');
+
+            assertDetailsNotExist(SAVED_QUERY_NAME_DETAILS);
+            assertDetailsNotExist(SAVED_QUERY_DETAILS);
+          }
+        );
       });
     });
 
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/machine_learning_rule.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/machine_learning_rule.cy.ts
index 57c0c39f8a8f9..50ca504e7a125 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/machine_learning_rule.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_creation/machine_learning_rule.cy.ts
@@ -54,7 +54,8 @@ import { CREATE_RULE_URL } from '../../../../urls/navigation';
 import { forceStopAndCloseJob } from '../../../../support/machine_learning';
 import { deleteAlertsAndRules } from '../../../../tasks/api_calls/common';
 
-describe('Machine Learning rules', { tags: ['@ess', '@serverless'] }, () => {
+// https://github.com/elastic/kibana/issues/187622
+describe('Machine Learning rules', { tags: ['@ess', '@serverless, @skipInServerlessMKI'] }, () => {
   const expectedUrls = (getMachineLearningRule().references ?? []).join('');
   const expectedFalsePositives = (getMachineLearningRule().false_positives ?? []).join('');
   const expectedTags = (getMachineLearningRule().tags ?? []).join('');
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/indicator_match_rule.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/indicator_match_rule.cy.ts
index 7d5a21b6f7c82..378bcedf835f6 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/indicator_match_rule.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/detection_response/detection_engine/rule_edit/indicator_match_rule.cy.ts
@@ -56,7 +56,9 @@ describe(
       login();
       deleteAlertsAndRules();
     });
-    describe('without suppression', () => {
+
+    // https://github.com/elastic/kibana/issues/187621
+    describe('without suppression', { tags: ['@skipInServerlessMKI'] }, () => {
       beforeEach(() => {
         createRule(rule);
       });
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
index 813560274fcee..8a1be034a444f 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/entity_analytics/enrichments.cy.ts
@@ -33,109 +33,95 @@ import { mockRiskEngineEnabled } from '../../tasks/entity_analytics';
 const CURRENT_HOST_RISK_LEVEL = 'Current host risk level';
 const ORIGINAL_HOST_RISK_LEVEL = 'Original host risk level';
 
-describe(
-  'Enrichment',
-  {
-    tags: ['@ess'],
-    env: {
-      ftrConfig: {
-        kbnServerArgs: [
-          `--xpack.securitySolution.enableExperimental=${JSON.stringify([
-            'expandableFlyoutDisabled',
-          ])}`,
-        ],
-      },
-    },
-  },
-  () => {
-    before(() => {
-      cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
-      cy.task('esArchiverUnload', { archiveName: 'risk_scores_new_updated' });
-      cy.task('esArchiverLoad', { archiveName: 'risk_users' });
-    });
+// this whole suite is failing on main
+describe.skip('Enrichment', { tags: ['@ess'] }, () => {
+  before(() => {
+    cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
+    cy.task('esArchiverUnload', { archiveName: 'risk_scores_new_updated' });
+    cy.task('esArchiverLoad', { archiveName: 'risk_users' });
+  });
 
-    after(() => {
-      cy.task('esArchiverUnload', { archiveName: 'risk_users' });
-    });
+  after(() => {
+    cy.task('esArchiverUnload', { archiveName: 'risk_users' });
+  });
 
-    describe('Custom query rule', () => {
-      // FLAKY: https://github.com/elastic/kibana/issues/176965
-      describe.skip('from legacy risk scores', () => {
-        beforeEach(() => {
-          cy.task('esArchiverLoad', { archiveName: 'risk_hosts' });
-          deleteAlertsAndRules();
-          createRule(getNewRule({ rule_id: 'rule1' }));
-          login();
-          visitWithTimeRange(ALERTS_URL);
-          waitForAlertsToPopulate();
-        });
+  describe('Custom query rule', () => {
+    // FLAKY: https://github.com/elastic/kibana/issues/176965
+    describe.skip('from legacy risk scores', () => {
+      beforeEach(() => {
+        cy.task('esArchiverLoad', { archiveName: 'risk_hosts' });
+        deleteAlertsAndRules();
+        createRule(getNewRule({ rule_id: 'rule1' }));
+        login();
+        visitWithTimeRange(ALERTS_URL);
+        waitForAlertsToPopulate();
+      });
 
-        afterEach(() => {
-          cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
-          cy.task('esArchiverUnload', { archiveName: 'risk_hosts_updated' });
-        });
+      afterEach(() => {
+        cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
+        cy.task('esArchiverUnload', { archiveName: 'risk_hosts_updated' });
+      });
 
-        it('Should has enrichment fields from legacy risk', function () {
-          cy.get(HOST_RISK_HEADER_COLUMN).contains('Host Risk Level');
-          cy.get(USER_RISK_HEADER_COLUMN).contains('User Risk Level');
-          scrollAlertTableColumnIntoView(HOST_RISK_COLUMN);
-          cy.get(HOST_RISK_COLUMN).contains('Low');
-          scrollAlertTableColumnIntoView(USER_RISK_COLUMN);
-          cy.get(USER_RISK_COLUMN).contains('Low');
-          scrollAlertTableColumnIntoView(ACTION_COLUMN);
-          expandFirstAlert();
-          cy.get(ENRICHED_DATA_ROW).contains('Low');
-          cy.get(ENRICHED_DATA_ROW).contains(CURRENT_HOST_RISK_LEVEL);
-          cy.get(ENRICHED_DATA_ROW).contains('Critical').should('not.exist');
-          cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL).should('not.exist');
+      it('Should has enrichment fields from legacy risk', function () {
+        cy.get(HOST_RISK_HEADER_COLUMN).contains('Host Risk Level');
+        cy.get(USER_RISK_HEADER_COLUMN).contains('User Risk Level');
+        scrollAlertTableColumnIntoView(HOST_RISK_COLUMN);
+        cy.get(HOST_RISK_COLUMN).contains('Low');
+        scrollAlertTableColumnIntoView(USER_RISK_COLUMN);
+        cy.get(USER_RISK_COLUMN).contains('Low');
+        scrollAlertTableColumnIntoView(ACTION_COLUMN);
+        expandFirstAlert();
+        cy.get(ENRICHED_DATA_ROW).contains('Low');
+        cy.get(ENRICHED_DATA_ROW).contains(CURRENT_HOST_RISK_LEVEL);
+        cy.get(ENRICHED_DATA_ROW).contains('Critical').should('not.exist');
+        cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL).should('not.exist');
 
-          closeAlertFlyout();
-          cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
-          cy.task('esArchiverLoad', { archiveName: 'risk_hosts_updated' });
-          expandFirstAlert();
-          cy.get(ENRICHED_DATA_ROW).contains('Critical');
-          cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL);
-        });
+        closeAlertFlyout();
+        cy.task('esArchiverUnload', { archiveName: 'risk_hosts' });
+        cy.task('esArchiverLoad', { archiveName: 'risk_hosts_updated' });
+        expandFirstAlert();
+        cy.get(ENRICHED_DATA_ROW).contains('Critical');
+        cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL);
       });
+    });
 
-      describe('from new risk scores', () => {
-        beforeEach(() => {
-          cy.task('esArchiverLoad', { archiveName: 'risk_scores_new' });
-          deleteAlertsAndRules();
-          createRule(getNewRule({ rule_id: 'rule1' }));
-          login();
-          mockRiskEngineEnabled();
-          visitWithTimeRange(ALERTS_URL);
-          waitForAlertsToPopulate();
-        });
+    describe('from new risk scores', () => {
+      beforeEach(() => {
+        cy.task('esArchiverLoad', { archiveName: 'risk_scores_new' });
+        deleteAlertsAndRules();
+        createRule(getNewRule({ rule_id: 'rule1' }));
+        login();
+        mockRiskEngineEnabled();
+        visitWithTimeRange(ALERTS_URL);
+        waitForAlertsToPopulate();
+      });
 
-        afterEach(() => {
-          cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
-          cy.task('esArchiverUnload', { archiveName: 'risk_scores_new_updated' });
-        });
+      afterEach(() => {
+        cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
+        cy.task('esArchiverUnload', { archiveName: 'risk_scores_new_updated' });
+      });
 
-        it('Should has enrichment fields from legacy risk', function () {
-          cy.get(HOST_RISK_HEADER_COLUMN).contains('Host Risk Level');
-          cy.get(USER_RISK_HEADER_COLUMN).contains('User Risk Level');
-          scrollAlertTableColumnIntoView(HOST_RISK_COLUMN);
-          cy.get(HOST_RISK_COLUMN).contains('Critical');
-          scrollAlertTableColumnIntoView(USER_RISK_COLUMN);
-          cy.get(USER_RISK_COLUMN).contains('High');
-          scrollAlertTableColumnIntoView(ACTION_COLUMN);
-          expandFirstAlert();
-          cy.get(ENRICHED_DATA_ROW).contains('Critical');
-          cy.get(ENRICHED_DATA_ROW).contains(CURRENT_HOST_RISK_LEVEL);
-          cy.get(ENRICHED_DATA_ROW).contains('Low').should('not.exist');
-          cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL).should('not.exist');
+      it('Should has enrichment fields from legacy risk', function () {
+        cy.get(HOST_RISK_HEADER_COLUMN).contains('Host Risk Level');
+        cy.get(USER_RISK_HEADER_COLUMN).contains('User Risk Level');
+        scrollAlertTableColumnIntoView(HOST_RISK_COLUMN);
+        cy.get(HOST_RISK_COLUMN).contains('Critical');
+        scrollAlertTableColumnIntoView(USER_RISK_COLUMN);
+        cy.get(USER_RISK_COLUMN).contains('High');
+        scrollAlertTableColumnIntoView(ACTION_COLUMN);
+        expandFirstAlert();
+        cy.get(ENRICHED_DATA_ROW).contains('Critical');
+        cy.get(ENRICHED_DATA_ROW).contains(CURRENT_HOST_RISK_LEVEL);
+        cy.get(ENRICHED_DATA_ROW).contains('Low').should('not.exist');
+        cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL).should('not.exist');
 
-          closeAlertFlyout();
-          cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
-          cy.task('esArchiverLoad', { archiveName: 'risk_scores_new_updated' });
-          expandFirstAlert();
-          cy.get(ENRICHED_DATA_ROW).contains('Low');
-          cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL);
-        });
+        closeAlertFlyout();
+        cy.task('esArchiverUnload', { archiveName: 'risk_scores_new' });
+        cy.task('esArchiverLoad', { archiveName: 'risk_scores_new_updated' });
+        expandFirstAlert();
+        cy.get(ENRICHED_DATA_ROW).contains('Low');
+        cy.get(ENRICHED_DATA_ROW).contains(ORIGINAL_HOST_RISK_LEVEL);
       });
     });
-  }
-);
+  });
+});
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/explore/cases/connectors.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/explore/cases/connectors.cy.ts
index 9c84a9067fbfe..db4e1defd4876 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/explore/cases/connectors.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/explore/cases/connectors.cy.ts
@@ -18,7 +18,8 @@ import { visit } from '../../../tasks/navigation';
 
 import { CASES_URL } from '../../../urls/navigation';
 
-describe('Cases connectors', { tags: ['@ess', '@serverless'] }, () => {
+// FLAKY: https://github.com/elastic/kibana/issues/187701
+describe.skip('Cases connectors', { tags: ['@ess', '@serverless'] }, () => {
   const configureResult = {
     connector: {
       id: 'e271c3b8-f702-4fbc-98e0-db942b573bbd',
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/alerts_details.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/alerts_details.cy.ts
deleted file mode 100644
index b9655de8eab03..0000000000000
--- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/alerts/alerts_details.cy.ts
+++ /dev/null
@@ -1,248 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  ALERT_FLYOUT,
-  CELL_TEXT,
-  COPY_ALERT_FLYOUT_LINK,
-  JSON_TEXT,
-  OVERVIEW_RULE,
-  SUMMARY_VIEW,
-  TABLE_CONTAINER,
-  TABLE_ROWS,
-} from '../../../screens/alerts_details';
-import { closeAlertFlyout, expandFirstAlert } from '../../../tasks/alerts';
-import {
-  changeAlertStatusTo,
-  filterBy,
-  openJsonView,
-  openTable,
-} from '../../../tasks/alerts_details';
-import { createRule } from '../../../tasks/api_calls/rules';
-import { deleteAlertsAndRules } from '../../../tasks/api_calls/common';
-import { waitForAlertsToPopulate } from '../../../tasks/create_new_rule';
-import { login } from '../../../tasks/login';
-import { visit, visitWithTimeRange } from '../../../tasks/navigation';
-import { getNewRule, getUnmappedRule } from '../../../objects/rule';
-import { ALERTS_URL } from '../../../urls/navigation';
-import { tablePageSelector } from '../../../screens/table_pagination';
-import { ALERTS_TABLE_COUNT } from '../../../screens/timeline';
-import { ALERT_SUMMARY_SEVERITY_DONUT_CHART } from '../../../screens/alerts';
-import {
-  visitRuleDetailsPage,
-  waitForPageToBeLoaded as waitForRuleDetailsPageToBeLoaded,
-} from '../../../tasks/rule_details';
-
-// this functionality is now not used anymore (though still accessible if customers turn the `expandableFlyoutDisabled` feature flag on
-// the code will be removed entirely for `8.16 (see https://github.com/elastic/security-team/issues/7462)
-describe.skip('Alert details flyout', { tags: ['@ess', '@serverless'] }, () => {
-  describe('Basic functions', () => {
-    beforeEach(() => {
-      deleteAlertsAndRules();
-      createRule(getNewRule());
-      login();
-      visit(ALERTS_URL);
-      waitForAlertsToPopulate();
-      expandFirstAlert();
-    });
-
-    it('should update the table when status of the alert is updated', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-      cy.get(ALERTS_TABLE_COUNT).should('have.text', '1 alert');
-      cy.get(ALERT_SUMMARY_SEVERITY_DONUT_CHART).should('contain.text', '1alert');
-      expandFirstAlert();
-      changeAlertStatusTo('acknowledged');
-      cy.get(ALERTS_TABLE_COUNT).should('have.text', '1 alert');
-      cy.get(ALERT_SUMMARY_SEVERITY_DONUT_CHART).should('contain.text', '1alert');
-    });
-  });
-
-  describe('With unmapped fields', () => {
-    before(() => {
-      cy.task('esArchiverLoad', { archiveName: 'unmapped_fields' });
-    });
-
-    beforeEach(() => {
-      deleteAlertsAndRules();
-      createRule({ ...getUnmappedRule(), investigation_fields: { field_names: ['event.kind'] } });
-      login();
-      visit(ALERTS_URL);
-      waitForAlertsToPopulate();
-      expandFirstAlert();
-    });
-
-    after(() => {
-      cy.task('esArchiverUnload', { archiveName: 'unmapped_fields' });
-    });
-
-    it.skip('should display user and system defined highlighted fields', () => {
-      cy.get(SUMMARY_VIEW)
-        .should('be.visible')
-        .and('contain.text', 'event.kind')
-        .and('contain.text', 'Rule type');
-    });
-
-    it('should display the unmapped field on the JSON view', () => {
-      const expectedUnmappedValue = 'This is the unmapped field';
-
-      openJsonView();
-
-      cy.get(JSON_TEXT).then((x) => {
-        const parsed = JSON.parse(x.text());
-        expect(parsed.fields.unmapped[0]).to.equal(expectedUnmappedValue);
-      });
-    });
-
-    it('should displays the unmapped field on the table', () => {
-      const expectedUnmappedField = {
-        field: 'unmapped',
-        text: 'This is the unmapped field',
-      };
-
-      openTable();
-      cy.get(ALERT_FLYOUT).find(tablePageSelector(6)).click({ force: true });
-      cy.get(ALERT_FLYOUT)
-        .find(TABLE_ROWS)
-        .last()
-        .within(() => {
-          cy.get(CELL_TEXT).should('contain', expectedUnmappedField.field);
-          cy.get(CELL_TEXT).should('contain', expectedUnmappedField.text);
-        });
-    });
-
-    // This test makes sure that the table does not overflow horizontally
-    it('table should not scroll horizontally', () => {
-      openTable();
-
-      cy.get(ALERT_FLYOUT)
-        .find(TABLE_CONTAINER)
-        .within(($tableContainer) => {
-          expect($tableContainer[0].scrollLeft).to.equal(0);
-
-          // Due to the introduction of pagination on the table, a slight horizontal overflow has been introduced.
-          // scroll ignores the `overflow-x:hidden` attribute and will still scroll the element if there is a hidden overflow
-          // Updated the below to < 5 to account for this and keep a test to make sure it doesn't grow
-          $tableContainer[0].scroll({ left: 1000 });
-
-          expect($tableContainer[0].scrollLeft).to.be.lessThan(5);
-        });
-    });
-  });
-
-  describe('Url state management', () => {
-    before(() => {
-      cy.task('esArchiverLoad', { archiveName: 'query_alert', useCreate: true, docsOnly: true });
-    });
-
-    beforeEach(() => {
-      deleteAlertsAndRules();
-      createRule(getNewRule());
-      login();
-      visitWithTimeRange(ALERTS_URL);
-      waitForAlertsToPopulate();
-      expandFirstAlert();
-    });
-
-    it('should store the flyout state in the url when it is opened and remove it when closed', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-      cy.url().should('include', 'flyout=');
-
-      closeAlertFlyout();
-
-      cy.url().should('not.include', 'flyout=');
-    });
-
-    it.skip('should open the alert flyout when the page is refreshed', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-      cy.reload();
-      cy.get(OVERVIEW_RULE).should('be.visible');
-      cy.get(OVERVIEW_RULE).should('contain', 'Endpoint Security');
-    });
-
-    it('should show the copy link button for the flyout', () => {
-      cy.get(COPY_ALERT_FLYOUT_LINK).should('be.visible');
-    });
-
-    it.skip('should have the `kibana.alert.url` field set', () => {
-      openTable();
-      filterBy('kibana.alert.url');
-      cy.get('[data-test-subj="formatted-field-kibana.alert.url"]').should(
-        'have.text',
-        'http://localhost:5601/app/security/alerts/redirect/eabbdefc23da981f2b74ab58b82622a97bb9878caa11bc914e2adfacc94780f1?index=.alerts-security.alerts-default&timestamp=2023-04-27T11:03:57.906Z'
-      );
-    });
-  });
-
-  describe('Localstorage management', () => {
-    const ARCHIVED_RULE_ID = '7015a3e2-e4ea-11ed-8c11-49608884878f';
-    const ARCHIVED_RULE_NAME = 'Endpoint Security';
-
-    before(() => {
-      deleteAlertsAndRules();
-      // It just imports an alert without a rule but rule details page should work anyway
-      cy.task('esArchiverLoad', { archiveName: 'query_alert', useCreate: true, docsOnly: true });
-    });
-
-    after(() => {
-      cy.task('esArchiverUnload', { archiveName: 'query_alert' });
-    });
-
-    beforeEach(() => {
-      createRule(getNewRule());
-      login();
-      visitWithTimeRange(ALERTS_URL);
-      waitForAlertsToPopulate();
-      expandFirstAlert();
-    });
-
-    /**
-     * Localstorage is updated after a delay here x-pack/plugins/security_solution/public/common/store/data_table/epic_local_storage.ts
-     * We create this config to re-check localStorage 3 times, every 500ms to avoid any potential flakyness from that delay
-     */
-
-    it('should store the flyout state in localstorage', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-
-      cy.window().then((win) => {
-        const securityDataTableStorage = win.localStorage.getItem('securityDataTable');
-        cy.wrap(securityDataTableStorage).should('contain', '"panelView":"eventDetail"');
-      });
-    });
-
-    it('should remove the flyout details from local storage when closed', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-      closeAlertFlyout();
-
-      cy.window().then((win) => {
-        const securityDataTableStorage = win.localStorage.getItem('securityDataTable');
-        cy.wrap(securityDataTableStorage).should('not.contain', '"panelView"');
-      });
-    });
-
-    it('should remove the flyout state from localstorage when navigating away without closing the flyout', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-
-      visitRuleDetailsPage(ARCHIVED_RULE_ID);
-      waitForRuleDetailsPageToBeLoaded(ARCHIVED_RULE_NAME);
-
-      cy.window().then((win) => {
-        const securityDataTableStorage = win.localStorage.getItem('securityDataTable');
-        cy.wrap(securityDataTableStorage).should('not.contain', '"panelView"');
-      });
-    });
-
-    it('should not reopen the flyout when navigating away from the alerts page and returning to it', () => {
-      cy.get(OVERVIEW_RULE).should('be.visible');
-
-      visitRuleDetailsPage(ARCHIVED_RULE_ID);
-      waitForRuleDetailsPageToBeLoaded(ARCHIVED_RULE_NAME);
-
-      visit(ALERTS_URL);
-      cy.get(OVERVIEW_RULE).should('not.exist');
-    });
-  });
-});
diff --git a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/export.cy.ts b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/export.cy.ts
index 86a7010763436..c28f0ed90d8c5 100644
--- a/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/export.cy.ts
+++ b/x-pack/test/security_solution_cypress/cypress/e2e/investigations/timelines/export.cy.ts
@@ -22,7 +22,8 @@ import { createTimeline } from '../../../tasks/api_calls/timelines';
 import { expectedExportedTimeline } from '../../../objects/timeline';
 import { closeToast } from '../../../tasks/common/toast';
 
-describe('Export timelines', { tags: ['@ess', '@serverless'] }, () => {
+// FLAKY: https://github.com/elastic/kibana/issues/187550
+describe.skip('Export timelines', { tags: ['@ess', '@serverless'] }, () => {
   beforeEach(() => {
     login();
     deleteTimelines();
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_list.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
similarity index 93%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_list.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
index ed288844959f7..f9dfe5eea4c79 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_list.ts
@@ -9,11 +9,7 @@ import expect from '@kbn/expect';
 import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
 
-import {
-  deleteMetadataStream,
-  deleteAllDocsFromMetadataCurrentIndex,
-  deleteAllDocsFromMetadataUnitedIndex,
-} from '../../../security_solution_endpoint_api_int/apis/data_stream_helper';
+import { targetTags } from '../../target_tags';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'endpoint', 'header', 'endpointPageUtils']);
@@ -22,6 +18,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const retry = getService('retry');
   const endpointTestResources = getService('endpointTestResources');
   const policyTestResources = getService('policyTestResources');
+  const endpointDataStreamHelpers = getService('endpointDataStreamHelpers');
 
   const expectedData = [
     [
@@ -84,13 +81,15 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     return tableData;
   };
 
-  describe('@ess @serverless endpoint list', function () {
+  describe('endpoint list', function () {
+    targetTags(this, ['@ess', '@serverless']);
+
     let indexedData: IndexedHostsAndAlertsResponse;
     describe('when initially navigating to page', () => {
       before(async () => {
-        await deleteMetadataStream(getService);
-        await deleteAllDocsFromMetadataCurrentIndex(getService);
-        await deleteAllDocsFromMetadataUnitedIndex(getService);
+        await endpointDataStreamHelpers.deleteMetadataStream(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataCurrentIndex(getService);
+        await endpointDataStreamHelpers.deleteAllDocsFromMetadataUnitedIndex(getService);
         await pageObjects.endpoint.navigateToEndpointList();
       });
       it('finds no data in list and prompts onboarding to add policy', async () => {
@@ -125,8 +124,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           );
         });
         after(async () => {
-          await deleteAllDocsFromMetadataCurrentIndex(getService);
-          await deleteAllDocsFromMetadataUnitedIndex(getService);
+          await endpointDataStreamHelpers.deleteAllDocsFromMetadataCurrentIndex(getService);
+          await endpointDataStreamHelpers.deleteAllDocsFromMetadataUnitedIndex(getService);
           if (indexedData) {
             await endpointTestResources.unloadEndpointData(indexedData);
           }
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
similarity index 94%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
index 615d05b9c563b..ed5b7b44bb98b 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_permissions.ts
@@ -9,17 +9,17 @@ import expect from '@kbn/expect';
 import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { SecurityRoleName } from '@kbn/security-solution-plugin/common/test';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import {
-  createUserAndRole,
-  deleteUserAndRole,
-} from '../../../../../common/services/security_solution';
+import { createUserAndRole, deleteUserAndRole } from '../../../common/services/security_solution';
+import { targetTags } from '../../target_tags';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const PageObjects = getPageObjects(['security', 'endpoint', 'detections', 'hosts']);
   const testSubjects = getService('testSubjects');
   const endpointTestResources = getService('endpointTestResources');
 
-  describe('@ess Endpoint permissions:', function () {
+  describe('Endpoint permissions:', function () {
+    targetTags(this, ['@ess']);
+
     let indexedData: IndexedHostsAndAlertsResponse;
 
     before(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts
similarity index 94%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts
index e2dd0c1a16095..d051500293682 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_solution_integrations.ts
@@ -7,9 +7,11 @@
 
 import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { TimelineResponse } from '@kbn/security-solution-plugin/common/api/timeline';
+// @ts-expect-error we have to check types with "allowJs: false" for now, causing this import to fail
 import { kibanaPackageJson } from '@kbn/repo-info';
 import { type IndexedEndpointRuleAlerts } from '@kbn/security-solution-plugin/common/endpoint/data_loaders/index_endpoint_rule_alerts';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
+import { targetTags } from '../../target_tags';
 
 /**
  * Test suite is meant to cover usages of endpoint functionality or access to endpoint
@@ -23,7 +25,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const testSubjects = getService('testSubjects');
   const pageObjects = getPageObjects(['common', 'timeline']);
 
-  describe('@ess App level Endpoint functionality', function () {
+  describe('App level Endpoint functionality', function () {
+    targetTags(this, ['@ess']);
+
     let indexedData: IndexedHostsAndAlertsResponse;
     let indexedAlerts: IndexedEndpointRuleAlerts;
     let endpointAgentId: string;
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
similarity index 98%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
index 373ab34b42b34..f4ce2de236bd1 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
@@ -7,6 +7,7 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
+import { targetTags } from '../../target_tags';
 
 export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
@@ -15,7 +16,9 @@ export default function ({ getService }: FtrProviderContext) {
 
   // The source of the data for these tests have changed and need to be updated
   // There are currently tests in the security_solution application being maintained
-  describe.skip('@ess security solution endpoint telemetry', function () {
+  describe.skip('security solution endpoint telemetry', function () {
+    targetTags(this, ['@ess']);
+
     after(async () => {
       await kibanaServer.savedObjects.cleanStandardList();
     });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/index.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
similarity index 80%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/index.ts
rename to x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
index fffd4b65e1907..032865c4ad1ed 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/endpoint/index.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/index.ts
@@ -8,10 +8,6 @@
 import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { isServerlessKibanaFlavor } from '@kbn/security-solution-plugin/scripts/endpoint/common/stack_services';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import {
-  getRegistryUrlFromTestEnv,
-  isRegistryEnabled,
-} from '../../../security_solution_endpoint_api_int/registry';
 
 export default function (providerContext: FtrProviderContext) {
   const { loadTestFile, getService, getPageObjects } = providerContext;
@@ -22,15 +18,17 @@ export default function (providerContext: FtrProviderContext) {
     const log = getService('log');
     const endpointTestResources = getService('endpointTestResources');
     const kbnClient = getService('kibanaServer');
+    const endpointRegistryHelpers = getService('endpointRegistryHelpers');
 
-    if (!isRegistryEnabled()) {
-      log.warning('These tests are being run with an external package registry');
-    }
+    before(async () => {
+      if (!endpointRegistryHelpers.isRegistryEnabled()) {
+        log.warning('These tests are being run with an external package registry');
+      }
 
-    const registryUrl = getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
-    log.info(`Package registry URL for tests: ${registryUrl}`);
+      const registryUrl =
+        endpointRegistryHelpers.getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
+      log.info(`Package registry URL for tests: ${registryUrl}`);
 
-    before(async () => {
       log.info('calling Fleet setup');
       await ingestManager.setup();
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/artifact_entries_list.ts b/x-pack/test/security_solution_endpoint/apps/integrations/artifact_entries_list.ts
similarity index 69%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/artifact_entries_list.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/artifact_entries_list.ts
index 1c184502244c3..9cb093b6edae8 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/artifact_entries_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/artifact_entries_list.ts
@@ -24,6 +24,7 @@ import {
   MultipleArtifactActionsType,
 } from './mocks';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
+import { targetTags } from '../../target_tags';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'artifactEntriesList']);
@@ -38,7 +39,6 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const toasts = getService('toasts');
   const policyTestResources = getService('policyTestResources');
   const unzipPromisify = promisify(unzip);
-  const timeout = 60000; // ms
 
   const removeAllArtifacts = async () => {
     for (const listId of ENDPOINT_ARTIFACT_LIST_IDS) {
@@ -54,7 +54,12 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   // Failing: See https://github.com/elastic/kibana/issues/187314
   // Failing: See https://github.com/elastic/kibana/issues/187383
-  describe.skip('@ess @serverless For each artifact list under management', function () {
+  // Failing: See https://github.com/elastic/kibana/issues/188131
+  // Failing: See https://github.com/elastic/kibana/issues/188125
+  describe.skip('For each artifact list under management', function () {
+    targetTags(this, ['@ess', '@skipInServerless']);
+    this.timeout(60_000 * 5);
+
     let indexedData: IndexedHostsAndAlertsResponse;
     let policyInfo: PolicyTestResourceInfo;
 
@@ -224,99 +229,83 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
           await removeAllArtifacts();
           await browser.refresh();
           await pageObjects.artifactEntriesList.navigateToList(testData.urlPath);
-        }, timeout);
+        });
 
         afterEach(async () => {
           await removeAllArtifacts();
           if (policyInfo) {
             await policyInfo.cleanup();
           }
-        }, timeout);
+        });
 
-        it(
-          `should not show page title if there is no ${testData.title} entry`,
-          async () => {
-            await testSubjects.missingOrFail('header-page-title');
-          },
-          timeout
-        );
+        it(`should not show page title if there is no ${testData.title} entry`, async () => {
+          await testSubjects.missingOrFail('header-page-title');
+        });
 
-        it(
-          `should be able to add a new ${testData.title} entry`,
-          async () => {
-            await createArtifact(testData, { policyId: policyInfo.packagePolicy.id });
-            // Check new artifact is in the list
-            for (const checkResult of testData.create.checkResults) {
-              expect(await testSubjects.getVisibleText(checkResult.selector)).to.equal(
-                checkResult.value
-              );
-            }
-            await toasts.dismiss();
+        it(`should be able to add a new ${testData.title} entry`, async () => {
+          await createArtifact(testData, { policyId: policyInfo.packagePolicy.id });
+          // Check new artifact is in the list
+          for (const checkResult of testData.create.checkResults) {
+            expect(await testSubjects.getVisibleText(checkResult.selector)).to.equal(
+              checkResult.value
+            );
+          }
+          await toasts.dismiss();
 
-            // Title is shown after adding an item
-            expect(await testSubjects.getVisibleText('header-page-title')).to.equal(testData.title);
+          // Title is shown after adding an item
+          expect(await testSubjects.getVisibleText('header-page-title')).to.equal(testData.title);
 
-            // Checks if fleet artifact has been updated correctly
-            await checkFleetArtifacts(
-              testData.fleetArtifact.identifier,
-              testData.fleetArtifact.getExpectedUpdatedtArtifactWhenCreate(),
-              testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreate(),
-              policyInfo
+          // Checks if fleet artifact has been updated correctly
+          await checkFleetArtifacts(
+            testData.fleetArtifact.identifier,
+            testData.fleetArtifact.getExpectedUpdatedtArtifactWhenCreate(),
+            testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreate(),
+            policyInfo
+          );
+        });
+
+        it(`should be able to update an existing ${testData.title} entry`, async () => {
+          await createArtifact(testData);
+          await updateArtifact(testData, { policyId: policyInfo.packagePolicy.id });
+
+          // Check edited artifact is in the list with new values (wait for list to be updated)
+          await retry.waitForWithTimeout('entry is updated in list', 20000, async () => {
+            const currentValue = await testSubjects.getVisibleText(
+              `${testData.pagePrefix}-card-criteriaConditions${
+                testData.pagePrefix === 'EventFiltersListPage' ? '-condition' : ''
+              }`
             );
-          },
-          timeout
-        );
+            return currentValue === testData.update.waitForValue;
+          });
 
-        it(
-          `should be able to update an existing ${testData.title} entry`,
-          async () => {
-            await createArtifact(testData);
-            await updateArtifact(testData, { policyId: policyInfo.packagePolicy.id });
-
-            // Check edited artifact is in the list with new values (wait for list to be updated)
-            await retry.waitForWithTimeout('entry is updated in list', 20000, async () => {
-              const currentValue = await testSubjects.getVisibleText(
-                `${testData.pagePrefix}-card-criteriaConditions${
-                  testData.pagePrefix === 'EventFiltersListPage' ? '-condition' : ''
-                }`
-              );
-              return currentValue === testData.update.waitForValue;
-            });
-
-            for (const checkResult of testData.update.checkResults) {
-              expect(await testSubjects.getVisibleText(checkResult.selector)).to.equal(
-                checkResult.value
-              );
-            }
+          for (const checkResult of testData.update.checkResults) {
+            expect(await testSubjects.getVisibleText(checkResult.selector)).to.equal(
+              checkResult.value
+            );
+          }
 
-            await toasts.dismiss();
+          await toasts.dismiss();
 
-            // Title still shown after editing an item
-            expect(await testSubjects.getVisibleText('header-page-title')).to.equal(testData.title);
+          // Title still shown after editing an item
+          expect(await testSubjects.getVisibleText('header-page-title')).to.equal(testData.title);
 
-            // Checks if fleet artifact has been updated correctly
-            await checkFleetArtifacts(
-              testData.fleetArtifact.identifier,
-              testData.fleetArtifact.getExpectedUpdatedArtifactWhenUpdate(),
-              testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenUpdate(),
-              policyInfo
-            );
-          },
-          timeout
-        );
+          // Checks if fleet artifact has been updated correctly
+          await checkFleetArtifacts(
+            testData.fleetArtifact.identifier,
+            testData.fleetArtifact.getExpectedUpdatedArtifactWhenUpdate(),
+            testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenUpdate(),
+            policyInfo
+          );
+        });
 
-        it(
-          `should be able to delete the existing ${testData.title} entry`,
-          async () => {
-            await createArtifact(testData);
-            await deleteArtifact(testData);
-            // We only expect one artifact to have been visible
-            await testSubjects.missingOrFail(testData.delete.card);
-            // Header has gone because there is no artifact
-            await testSubjects.missingOrFail('header-page-title');
-          },
-          timeout
-        );
+        it(`should be able to delete the existing ${testData.title} entry`, async () => {
+          await createArtifact(testData);
+          await deleteArtifact(testData);
+          // We only expect one artifact to have been visible
+          await testSubjects.missingOrFail(testData.delete.card);
+          // Header has gone because there is no artifact
+          await testSubjects.missingOrFail('header-page-title');
+        });
       });
     }
 
@@ -334,7 +323,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         await removeAllArtifacts();
         await browser.refresh();
         await pageObjects.artifactEntriesList.navigateToList(testData.urlPath);
-      }, timeout);
+      });
 
       afterEach(async () => {
         await removeAllArtifacts();
@@ -344,55 +333,51 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         if (secondPolicy) {
           await secondPolicy.cleanup();
         }
-      }, timeout);
+      });
 
       const testData = getCreateMultipleData();
-      it(
-        `should get correct atifact when multiple entries are created`,
-        async () => {
-          // Create first trusted app
-          await createArtifact(testData, {
-            policyId: firstPolicy.packagePolicy.id,
-            suffix: firstSuffix,
-          });
-          await toasts.dismiss();
-
-          // Create second trusted app
-          await createArtifact(testData, {
-            policyId: secondPolicy.packagePolicy.id,
-            suffix: secondSuffix,
-            createButton: 'pageAddButton',
-          });
-          await toasts.dismiss();
-
-          // Create third trusted app
-          await createArtifact(testData, { suffix: thirdSuffix, createButton: 'pageAddButton' });
-          await toasts.dismiss();
+      it(`should get correct atifact when multiple entries are created`, async () => {
+        // Create first trusted app
+        await createArtifact(testData, {
+          policyId: firstPolicy.packagePolicy.id,
+          suffix: firstSuffix,
+        });
+        await toasts.dismiss();
 
-          // Checks if fleet artifact has been updated correctly
-          await checkFleetArtifacts(
-            testData.fleetArtifact.identifier,
-            testData.fleetArtifact.getExpectedUpdatedArtifactWhenCreateMultipleFirst(),
-            testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreateMultipleFirst(
-              thirdSuffix,
-              firstSuffix
-            ),
-            firstPolicy
-          );
+        // Create second trusted app
+        await createArtifact(testData, {
+          policyId: secondPolicy.packagePolicy.id,
+          suffix: secondSuffix,
+          createButton: 'pageAddButton',
+        });
+        await toasts.dismiss();
+
+        // Create third trusted app
+        await createArtifact(testData, { suffix: thirdSuffix, createButton: 'pageAddButton' });
+        await toasts.dismiss();
+
+        // Checks if fleet artifact has been updated correctly
+        await checkFleetArtifacts(
+          testData.fleetArtifact.identifier,
+          testData.fleetArtifact.getExpectedUpdatedArtifactWhenCreateMultipleFirst(),
+          testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreateMultipleFirst(
+            thirdSuffix,
+            firstSuffix
+          ),
+          firstPolicy
+        );
 
-          // Checks if fleet artifact has been updated correctly
-          await checkFleetArtifacts(
-            testData.fleetArtifact.identifier,
-            testData.fleetArtifact.getExpectedUpdatedArtifactWhenCreateMultipleSecond(),
-            testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreateMultipleSecond(
-              thirdSuffix,
-              secondSuffix
-            ),
-            secondPolicy
-          );
-        },
-        timeout
-      );
+        // Checks if fleet artifact has been updated correctly
+        await checkFleetArtifacts(
+          testData.fleetArtifact.identifier,
+          testData.fleetArtifact.getExpectedUpdatedArtifactWhenCreateMultipleSecond(),
+          testData.fleetArtifact.getExpectedUpdatedArtifactBodyWhenCreateMultipleSecond(
+            thirdSuffix,
+            secondSuffix
+          ),
+          secondPolicy
+        );
+      });
     });
   });
 };
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts b/x-pack/test/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts
similarity index 65%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts
index e85325f63d096..252df75b83d99 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/endpoint_exceptions.ts
@@ -13,6 +13,7 @@ import { ArtifactElasticsearchProperties } from '@kbn/fleet-plugin/server/servic
 import { FoundExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { WebElementWrapper } from '@kbn/ftr-common-functional-ui-services';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
+import { targetTags } from '../../target_tags';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'header', 'timePicker']);
@@ -29,7 +30,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const toasts = getService('toasts');
   const MINUTES = 60 * 1000 * 10;
 
-  describe('@ess @serverless Endpoint Exceptions', function () {
+  describe('Endpoint Exceptions', function () {
+    targetTags(this, ['@ess', '@serverless']);
+
+    this.timeout(10 * MINUTES);
+
     const clearPrefilledEntries = async () => {
       const entriesContainer = await testSubjects.find('exceptionEntriesContainer');
 
@@ -144,6 +149,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     });
 
     beforeEach(async () => {
+      this.timeout(MINUTES);
+
       const deleteEndpointExceptions = async () => {
         const { body } = await supertest
           .get(`${EXCEPTION_LIST_ITEM_URL}/_find?list_id=endpoint_list&namespace_type=agnostic`)
@@ -157,97 +164,89 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       };
 
       await deleteEndpointExceptions();
-    }, MINUTES);
-
-    it(
-      'should add `event.module=endpoint` to entry if only wildcard operator is present',
-      async () => {
-        await pageObjects.common.navigateToUrlWithBrowserHistory('security', `/alerts`);
-        await pageObjects.timePicker.setCommonlyUsedTime('Last_24 hours');
-
-        await openNewEndpointExceptionFlyout();
-        await clearPrefilledEntries();
-
-        await testSubjects.setValue('exceptionFlyoutNameInput', 'test exception');
-        await setLastEntry({ field: 'file.path', operator: 'matches', value: '*/cheese/*' });
-        await testSubjects.click('exceptionsAndButton');
-        await setLastEntry({ field: 'process.executable', operator: 'matches', value: 'ex*' });
-
-        await testSubjects.click('addExceptionConfirmButton');
-        await toasts.dismiss();
-
-        await checkArtifact({
-          entries: [
-            {
-              type: 'simple',
-              entries: [
-                {
-                  field: 'file.path',
-                  operator: 'included',
-                  type: 'wildcard_cased',
-                  value: '*/cheese/*',
-                },
-                {
-                  field: 'process.executable',
-                  operator: 'included',
-                  type: 'wildcard_cased',
-                  value: 'ex*',
-                },
-                {
-                  // this additional entry should be added
-                  field: 'event.module',
-                  operator: 'included',
-                  type: 'exact_cased',
-                  value: 'endpoint',
-                },
-              ],
-            },
-          ],
-        });
-      },
-      MINUTES
-    );
+    });
 
-    it(
-      'should NOT add `event.module=endpoint` to entry if there is another operator',
-      async () => {
-        await pageObjects.common.navigateToUrlWithBrowserHistory('security', `/alerts`);
-        await pageObjects.timePicker.setCommonlyUsedTime('Last_24 hours');
+    it('should add `event.module=endpoint` to entry if only wildcard operator is present', async () => {
+      await pageObjects.common.navigateToUrlWithBrowserHistory('security', `/alerts`);
+      await pageObjects.timePicker.setCommonlyUsedTime('Last_24 hours');
+
+      await openNewEndpointExceptionFlyout();
+      await clearPrefilledEntries();
+
+      await testSubjects.setValue('exceptionFlyoutNameInput', 'test exception');
+      await setLastEntry({ field: 'file.path', operator: 'matches', value: '*/cheese/*' });
+      await testSubjects.click('exceptionsAndButton');
+      await setLastEntry({ field: 'process.executable', operator: 'matches', value: 'ex*' });
+
+      await testSubjects.click('addExceptionConfirmButton');
+      await toasts.dismiss();
+
+      await checkArtifact({
+        entries: [
+          {
+            type: 'simple',
+            entries: [
+              {
+                field: 'file.path',
+                operator: 'included',
+                type: 'wildcard_cased',
+                value: '*/cheese/*',
+              },
+              {
+                field: 'process.executable',
+                operator: 'included',
+                type: 'wildcard_cased',
+                value: 'ex*',
+              },
+              {
+                // this additional entry should be added
+                field: 'event.module',
+                operator: 'included',
+                type: 'exact_cased',
+                value: 'endpoint',
+              },
+            ],
+          },
+        ],
+      });
+    });
 
-        await openNewEndpointExceptionFlyout();
-        await clearPrefilledEntries();
-
-        await testSubjects.setValue('exceptionFlyoutNameInput', 'test exception');
-        await setLastEntry({ field: 'file.path', operator: 'matches', value: '*/cheese/*' });
-        await testSubjects.click('exceptionsAndButton');
-        await setLastEntry({ field: 'process.executable', operator: 'is', value: 'something' });
-
-        await testSubjects.click('addExceptionConfirmButton');
-        await toasts.dismiss();
-
-        await checkArtifact({
-          entries: [
-            {
-              type: 'simple',
-              entries: [
-                {
-                  field: 'file.path',
-                  operator: 'included',
-                  type: 'wildcard_cased',
-                  value: '*/cheese/*',
-                },
-                {
-                  field: 'process.executable',
-                  operator: 'included',
-                  type: 'exact_cased',
-                  value: 'something',
-                },
-              ],
-            },
-          ],
-        });
-      },
-      MINUTES
-    );
+    it('should NOT add `event.module=endpoint` to entry if there is another operator', async () => {
+      await pageObjects.common.navigateToUrlWithBrowserHistory('security', `/alerts`);
+      await pageObjects.timePicker.setCommonlyUsedTime('Last_24 hours');
+
+      await openNewEndpointExceptionFlyout();
+      await clearPrefilledEntries();
+
+      await testSubjects.setValue('exceptionFlyoutNameInput', 'test exception');
+      await setLastEntry({ field: 'file.path', operator: 'matches', value: '*/cheese/*' });
+      await testSubjects.click('exceptionsAndButton');
+      await setLastEntry({ field: 'process.executable', operator: 'is', value: 'something' });
+
+      await testSubjects.click('addExceptionConfirmButton');
+      await toasts.dismiss();
+
+      await checkArtifact({
+        entries: [
+          {
+            type: 'simple',
+            entries: [
+              {
+                field: 'file.path',
+                operator: 'included',
+                type: 'wildcard_cased',
+                value: '*/cheese/*',
+              },
+              {
+                field: 'process.executable',
+                operator: 'included',
+                type: 'exact_cased',
+                value: 'something',
+              },
+            ],
+          },
+        ],
+      });
+    });
   });
 };
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/fleet_integrations.ts b/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
similarity index 82%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/fleet_integrations.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
index 41b4141621aeb..5da579041252d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/fleet_integrations.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/fleet_integrations.ts
@@ -5,10 +5,7 @@
  * 2.0.
  */
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import {
-  deleteMetadataStream,
-  deleteAllDocsFromMetadataCurrentIndex,
-} from '../../../security_solution_endpoint_api_int/apis/data_stream_helper';
+import { targetTags } from '../../target_tags';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const { fleetIntegrations, trustedApps } = getPageObjects(['trustedApps', 'fleetIntegrations']);
@@ -16,8 +13,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const esArchiver = getService('esArchiver');
   const browser = getService('browser');
+  const endpointDataStreamHelpers = getService('endpointDataStreamHelpers');
+
+  describe('When in the Fleet application', function () {
+    targetTags(this, ['@ess', '@serverless']);
 
-  describe('@ess @serverless When in the Fleet application', function () {
     before(async () => {
       await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature', {
         useCreate: true,
@@ -25,8 +25,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await browser.refresh();
     });
     after(async () => {
-      await deleteMetadataStream(getService);
-      await deleteAllDocsFromMetadataCurrentIndex(getService);
+      await endpointDataStreamHelpers.deleteMetadataStream(getService);
+      await endpointDataStreamHelpers.deleteAllDocsFromMetadataCurrentIndex(getService);
     });
     describe('and on the Endpoint Integration details page', () => {
       beforeEach(async () => {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/index.ts b/x-pack/test/security_solution_endpoint/apps/integrations/index.ts
similarity index 79%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/index.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/index.ts
index 5f62b8c0f97cb..7f5cfa4641471 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/index.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/index.ts
@@ -8,29 +8,26 @@
 import { getRegistryUrl as getRegistryUrlFromIngest } from '@kbn/fleet-plugin/server';
 import { isServerlessKibanaFlavor } from '@kbn/security-solution-plugin/scripts/endpoint/common/stack_services';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
-import {
-  getRegistryUrlFromTestEnv,
-  isRegistryEnabled,
-} from '../../../security_solution_endpoint_api_int/registry';
 
 export default function (providerContext: FtrProviderContext) {
   const { loadTestFile, getService, getPageObjects } = providerContext;
 
   // Flaky: https://github.com/elastic/kibana/issues/186086
-  describe('@skipInServerless endpoint', function () {
+  describe('endpoint', function () {
     const ingestManager = getService('ingestManager');
     const log = getService('log');
     const endpointTestResources = getService('endpointTestResources');
     const kbnClient = getService('kibanaServer');
-
-    if (!isRegistryEnabled()) {
-      log.warning('These tests are being run with an external package registry');
-    }
-
-    const registryUrl = getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
-    log.info(`Package registry URL for tests: ${registryUrl}`);
+    const endpointRegistryHelpers = getService('endpointRegistryHelpers');
 
     before(async () => {
+      if (!endpointRegistryHelpers.isRegistryEnabled()) {
+        log.warning('These tests are being run with an external package registry');
+      }
+
+      const registryUrl =
+        endpointRegistryHelpers.getRegistryUrlFromTestEnv() ?? getRegistryUrlFromIngest();
+      log.info(`Package registry URL for tests: ${registryUrl}`);
       log.info('calling Fleet setup');
       await ingestManager.setup();
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/mocks.ts b/x-pack/test/security_solution_endpoint/apps/integrations/mocks.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/mocks.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/mocks.ts
diff --git a/x-pack/test/security_solution_endpoint/apps/integrations/policy_details.ts b/x-pack/test/security_solution_endpoint/apps/integrations/policy_details.ts
new file mode 100644
index 0000000000000..6555e76f501b3
--- /dev/null
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/policy_details.ts
@@ -0,0 +1,397 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
+import { PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_settings_form/protection_notice_supported_endpoint_version';
+import { getPolicySettingsFormTestSubjects } from '@kbn/security-solution-plugin/public/management/pages/policy/view/policy_settings_form/mocks';
+import { FtrProviderContext } from '../../configs/ftr_provider_context';
+import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
+import { targetTags } from '../../target_tags';
+
+export default function ({ getPageObjects, getService }: FtrProviderContext) {
+  const browser = getService('browser');
+  const pageObjects = getPageObjects([
+    'common',
+    'endpoint',
+    'policy',
+    'endpointPageUtils',
+    'ingestManagerCreatePackagePolicy',
+    'trustedApps',
+  ]);
+  const testSubjects = getService('testSubjects');
+  const policyTestResources = getService('policyTestResources');
+  const endpointTestResources = getService('endpointTestResources');
+  const retry = getService('retry');
+  const timeout = 150_000;
+  describe('When on the Endpoint Policy Details Page', function () {
+    targetTags(this, ['@ess', '@serverless']);
+
+    let indexedData: IndexedHostsAndAlertsResponse;
+    const formTestSubjects = getPolicySettingsFormTestSubjects();
+
+    before(async () => {
+      indexedData = await endpointTestResources.loadEndpointData();
+      await browser.refresh();
+    });
+
+    after(async () => {
+      await endpointTestResources.unloadEndpointData(indexedData);
+    });
+
+    describe('with an invalid policy id', () => {
+      it('should display an error', async () => {
+        await pageObjects.policy.navigateToPolicyDetails('invalid-id');
+        await testSubjects.existOrFail('policyDetailsIdNotFoundMessage');
+        expect(await testSubjects.getVisibleText('policyDetailsIdNotFoundMessage')).to.equal(
+          'Package policy invalid-id not found'
+        );
+      });
+    });
+
+    describe('with a valid policy id', () => {
+      let policyInfo: PolicyTestResourceInfo;
+
+      before(async () => {
+        policyInfo = await policyTestResources.createPolicy();
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+      });
+
+      after(async () => {
+        if (policyInfo) {
+          await policyInfo.cleanup();
+        }
+      });
+
+      it('should display policy view', async () => {
+        this.timeout(timeout);
+
+        await retry.waitForWithTimeout('policy title is not empty', 120_000, async () => {
+          return (await testSubjects.getVisibleText('header-page-title')) !== '';
+        });
+        expect(await testSubjects.getVisibleText('header-page-title')).to.equal(
+          policyInfo.packagePolicy.name
+        );
+      });
+
+      describe('side navigation', function () {
+        targetTags(this, ['@skipInServerless']);
+
+        it('should not hide the side navigation', async function () {
+          await testSubjects.scrollIntoView('solutionSideNavItemLink-get_started');
+          // ensure center of button is visible and not hidden by sticky bottom bar
+          await testSubjects.click('solutionSideNavItemLink-administration', 1000, 15);
+          // test cleanup: go back to policy details page
+          await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+        });
+      });
+
+      it('Should show/hide advanced section when button is clicked', async () => {
+        await testSubjects.missingOrFail(formTestSubjects.advancedSection.settingsContainer);
+
+        // Expand
+        await pageObjects.policy.showAdvancedSettingsSection();
+        await testSubjects.existOrFail(formTestSubjects.advancedSection.settingsContainer);
+
+        // Collapse
+        await pageObjects.policy.hideAdvancedSettingsSection();
+        await testSubjects.missingOrFail(formTestSubjects.advancedSection.settingsContainer);
+      });
+    });
+
+    ['malware', 'ransomware'].forEach((protection) => {
+      describe(`on the ${protection} protections card`, () => {
+        let policyInfo: PolicyTestResourceInfo;
+        const cardTestSubj:
+          | typeof formTestSubjects['ransomware']
+          | typeof formTestSubjects['malware'] =
+          formTestSubjects[
+            protection as keyof Pick<typeof formTestSubjects, 'malware' | 'ransomware'>
+          ];
+
+        beforeEach(async () => {
+          policyInfo = await policyTestResources.createPolicy();
+          await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+        });
+
+        afterEach(async () => {
+          if (policyInfo) {
+            await policyInfo.cleanup();
+
+            // @ts-expect-error forcing to undefined
+            policyInfo = undefined;
+          }
+        });
+
+        it('should show the supported Endpoint version for user notification', async () => {
+          expect(await testSubjects.getVisibleText(cardTestSubj.notifySupportedVersion)).to.equal(
+            'Agent version ' +
+              PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION[
+                protection as keyof typeof PROTECTION_NOTICE_SUPPORTED_ENDPOINT_VERSION
+              ]
+          );
+        });
+
+        it('should show the custom message text area when the Notify User checkbox is checked', async () => {
+          expect(await testSubjects.isChecked(cardTestSubj.notifyUserCheckbox)).to.be(true);
+          await testSubjects.existOrFail(cardTestSubj.notifyCustomMessage);
+        });
+
+        it('should not show the custom message text area when the Notify User checkbox is unchecked', async () => {
+          await pageObjects.endpointPageUtils.clickOnEuiCheckbox(cardTestSubj.notifyUserCheckbox);
+          expect(await testSubjects.isChecked(cardTestSubj.notifyUserCheckbox)).to.be(false);
+          await testSubjects.missingOrFail(cardTestSubj.notifyCustomMessage);
+        });
+
+        it('should show a sample custom message', async () => {
+          expect(await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessage)).equal(
+            'Elastic Security {action} {filename}'
+          );
+        });
+
+        it('should show a tooltip on hover', async () => {
+          await testSubjects.moveMouseTo(cardTestSubj.notifyCustomMessageTooltipIcon);
+
+          await retry.waitFor(
+            'should show a tooltip on hover',
+            async () =>
+              (await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessageTooltipInfo)) ===
+              `Selecting the user notification option will display a notification to the host user when ${protection} is prevented or detected.\nThe user notification can be customized in the text box below. Bracketed tags can be used to dynamically populate the applicable action (such as prevented or detected) and the filename.`
+          );
+        });
+
+        it('should preserve a custom notification message upon saving', async () => {
+          await testSubjects.setValue(cardTestSubj.notifyCustomMessage, '', {
+            clearWithKeyboard: true,
+          });
+          await testSubjects.setValue(
+            cardTestSubj.notifyCustomMessage,
+            'a custom notification message @$% 123',
+            { typeCharByChar: true }
+          );
+
+          await pageObjects.policy.confirmAndSave();
+          await testSubjects.existOrFail('policyDetailsSuccessMessage');
+          expect(await testSubjects.getVisibleText(cardTestSubj.notifyCustomMessage)).to.equal(
+            'a custom notification message @$% 123'
+          );
+        });
+      });
+    });
+
+    describe('and the save button is clicked', () => {
+      let policyInfo: PolicyTestResourceInfo;
+
+      beforeEach(async () => {
+        policyInfo = await policyTestResources.createPolicy();
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+      });
+
+      afterEach(async () => {
+        if (policyInfo) {
+          await policyInfo.cleanup();
+
+          // @ts-expect-error forcing to undefined
+          policyInfo = undefined;
+        }
+      });
+
+      it('should display success toast on successful save', async () => {
+        await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+          formTestSubjects.windowsEvents.dnsCheckbox
+        );
+        await pageObjects.policy.confirmAndSave();
+
+        await testSubjects.existOrFail('policyDetailsSuccessMessage');
+        expect(await testSubjects.getVisibleText('policyDetailsSuccessMessage')).to.equal(
+          `Success!\nIntegration ${policyInfo.packagePolicy.name} has been updated.`
+        );
+      });
+
+      it('should persist update on the screen', async () => {
+        await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+          formTestSubjects.windowsEvents.processCheckbox
+        );
+        await pageObjects.policy.confirmAndSave();
+
+        await testSubjects.existOrFail('policyDetailsSuccessMessage');
+        await testSubjects.existOrFail('toastCloseButton');
+        await pageObjects.endpoint.navigateToEndpointList();
+        await pageObjects.policy.navigateToPolicyDetails(policyInfo.packagePolicy.id);
+
+        expect(
+          await (
+            await testSubjects.find(formTestSubjects.windowsEvents.processCheckbox)
+          ).isSelected()
+        ).to.equal(false);
+      });
+
+      it('should have updated policy data in overall Agent Policy', async () => {
+        // This test ensures that updates made to the Endpoint Policy are carried all the way through
+        // to the generated Agent Policy that is dispatch down to the Elastic Agent.
+
+        await Promise.all([
+          pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+            formTestSubjects.windowsEvents.fileCheckbox
+          ),
+          pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+            formTestSubjects.linuxEvents.fileCheckbox
+          ),
+          pageObjects.endpointPageUtils.clickOnEuiCheckbox(formTestSubjects.macEvents.fileCheckbox),
+        ]);
+
+        await pageObjects.policy.showAdvancedSettingsSection();
+
+        const advancedPolicyField = await pageObjects.policy.findAdvancedPolicyField();
+        await advancedPolicyField.clearValue();
+        await advancedPolicyField.click();
+        await advancedPolicyField.type('true');
+        await pageObjects.policy.confirmAndSave();
+
+        await testSubjects.existOrFail('policyDetailsSuccessMessage');
+        await testSubjects.waitForDeleted('toastCloseButton');
+
+        const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
+          policyInfo.agentPolicy.id
+        );
+
+        expect(agentFullPolicy.inputs[0].id).to.eql(policyInfo.packagePolicy.id);
+        expect(agentFullPolicy.inputs[0].policy.linux.advanced.agent.connection_delay).to.eql(
+          'true'
+        );
+        expect(agentFullPolicy.inputs[0].policy.linux.events.file).to.eql(false);
+        expect(agentFullPolicy.inputs[0].policy.mac.events.file).to.eql(false);
+        expect(agentFullPolicy.inputs[0].policy.windows.events.file).to.eql(false);
+      });
+
+      it('should have cleared the advanced section when the user deletes the value', async () => {
+        await pageObjects.policy.showAdvancedSettingsSection();
+
+        const advancedPolicyField = await pageObjects.policy.findAdvancedPolicyField();
+        await advancedPolicyField.clearValue();
+        await advancedPolicyField.click();
+        await advancedPolicyField.type('true');
+        await pageObjects.policy.confirmAndSave();
+
+        await testSubjects.existOrFail('policyDetailsSuccessMessage');
+
+        const agentFullPolicy = await policyTestResources.getFullAgentPolicy(
+          policyInfo.agentPolicy.id
+        );
+
+        expect(agentFullPolicy.inputs[0].policy.linux.advanced.agent.connection_delay).to.eql(
+          'true'
+        );
+
+        // Clear the value
+        await advancedPolicyField.click();
+        await advancedPolicyField.clearValueWithKeyboard();
+
+        // Make sure the toast button closes so the save button on the sticky footer is visible
+        await testSubjects.waitForDeleted('toastCloseButton');
+        await pageObjects.policy.confirmAndSave();
+
+        await testSubjects.existOrFail('policyDetailsSuccessMessage');
+
+        const agentFullPolicyUpdated = await policyTestResources.getFullAgentPolicy(
+          policyInfo.agentPolicy.id
+        );
+
+        expect(agentFullPolicyUpdated.inputs[0].policy.linux.advanced).to.eql({
+          capture_env_vars: 'LD_PRELOAD,LD_LIBRARY_PATH',
+        });
+      });
+    });
+
+    describe('when on Ingest Policy Edit Package Policy page', async () => {
+      let policyInfo: PolicyTestResourceInfo;
+
+      beforeEach(async () => {
+        // Create a policy and navigate to Ingest app
+        policyInfo = await policyTestResources.createPolicy();
+        await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
+          policyInfo.agentPolicy.id,
+          policyInfo.packagePolicy.id
+        );
+      });
+
+      afterEach(async () => {
+        if (policyInfo) {
+          await policyInfo.cleanup();
+        }
+      });
+
+      it('should show the endpoint policy form', async () => {
+        await testSubjects.existOrFail(formTestSubjects.form);
+      });
+
+      it('should allow updates to policy items', async () => {
+        const winDnsEventingCheckbox = await testSubjects.find(
+          formTestSubjects.windowsEvents.dnsCheckbox
+        );
+        await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(
+          winDnsEventingCheckbox
+        );
+        expect(await winDnsEventingCheckbox.isSelected()).to.be(true);
+        await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+          formTestSubjects.windowsEvents.dnsCheckbox
+        );
+        await pageObjects.policy.waitForCheckboxSelectionChange(
+          formTestSubjects.windowsEvents.dnsCheckbox,
+          false
+        );
+      });
+
+      it('should include updated endpoint data when saved', async () => {
+        await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(
+          await testSubjects.find(formTestSubjects.windowsEvents.dnsCheckbox)
+        );
+        await pageObjects.endpointPageUtils.clickOnEuiCheckbox(
+          formTestSubjects.windowsEvents.dnsCheckbox
+        );
+        const updatedCheckboxValue = await testSubjects.isSelected(
+          formTestSubjects.windowsEvents.dnsCheckbox
+        );
+
+        await pageObjects.policy.waitForCheckboxSelectionChange(
+          formTestSubjects.windowsEvents.dnsCheckbox,
+          false
+        );
+
+        await (await pageObjects.ingestManagerCreatePackagePolicy.findSaveButton(true)).click();
+        await pageObjects.ingestManagerCreatePackagePolicy.waitForSaveSuccessNotification(true);
+
+        await pageObjects.ingestManagerCreatePackagePolicy.navigateToAgentPolicyEditPackagePolicy(
+          policyInfo.agentPolicy.id,
+          policyInfo.packagePolicy.id
+        );
+
+        await pageObjects.policy.waitForCheckboxSelectionChange(
+          formTestSubjects.windowsEvents.dnsCheckbox,
+          updatedCheckboxValue
+        );
+      });
+
+      ['trustedApps', 'eventFilters', 'blocklists', 'hostIsolationExceptions'].forEach(
+        (cardName) => {
+          it(`should show ${cardName} card and link should go back to policy`, async () => {
+            await testSubjects.existOrFail(`${cardName}-fleet-integration-card`);
+
+            const card = await testSubjects.find(`${cardName}-fleet-integration-card`);
+            await pageObjects.ingestManagerCreatePackagePolicy.scrollToCenterOfWindow(card);
+            await (await testSubjects.find(`${cardName}-link-to-exceptions`)).click();
+
+            await testSubjects.existOrFail('policyDetailsPage');
+
+            await (await testSubjects.find('policyDetailsBackLink')).click();
+            await testSubjects.existOrFail('endpointIntegrationPolicyForm');
+          });
+        }
+      );
+    });
+  });
+}
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_list.ts b/x-pack/test/security_solution_endpoint/apps/integrations/policy_list.ts
similarity index 96%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_list.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/policy_list.ts
index 27b1ef012c1b1..16a16e192d16b 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/policy_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/policy_list.ts
@@ -9,6 +9,7 @@ import expect from '@kbn/expect';
 import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
 import { PolicyTestResourceInfo } from '../../services/endpoint_policy';
+import { targetTags } from '../../target_tags';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const browser = getService('browser');
@@ -24,7 +25,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const policyTestResources = getService('policyTestResources');
   const endpointTestResources = getService('endpointTestResources');
 
-  describe('@ess @serverless When on the Endpoint Policy List Page', function () {
+  describe('When on the Endpoint Policy List Page', function () {
+    targetTags(this, ['@ess', '@serverless']);
+
     before(async () => {
       await browser.refresh();
     });
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/trusted_apps_list.ts b/x-pack/test/security_solution_endpoint/apps/integrations/trusted_apps_list.ts
similarity index 95%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/trusted_apps_list.ts
rename to x-pack/test/security_solution_endpoint/apps/integrations/trusted_apps_list.ts
index cbc983ed8691f..616ae47fe7374 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/apps/integrations/trusted_apps_list.ts
+++ b/x-pack/test/security_solution_endpoint/apps/integrations/trusted_apps_list.ts
@@ -8,6 +8,7 @@
 import expect from '@kbn/expect';
 import { IndexedHostsAndAlertsResponse } from '@kbn/security-solution-plugin/common/endpoint/index_data';
 import { FtrProviderContext } from '../../configs/ftr_provider_context';
+import { targetTags } from '../../target_tags';
 
 export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const pageObjects = getPageObjects(['common', 'trustedApps']);
@@ -16,7 +17,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const endpointTestResources = getService('endpointTestResources');
   const toasts = getService('toasts');
 
-  describe('@ess @serverless When on the Trusted Apps list', function () {
+  describe('When on the Trusted Apps list', function () {
+    targetTags(this, ['@ess', '@serverless']);
+
     let indexedData: IndexedHostsAndAlertsResponse;
     before(async () => {
       indexedData = await endpointTestResources.loadEndpointData();
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/config.base.ts b/x-pack/test/security_solution_endpoint/configs/config.base.ts
similarity index 81%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/config.base.ts
rename to x-pack/test/security_solution_endpoint/configs/config.base.ts
index c7c43bb8c39de..684dbf0e9510b 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/config.base.ts
+++ b/x-pack/test/security_solution_endpoint/configs/config.base.ts
@@ -7,11 +7,8 @@
 
 import { Config } from '@kbn/test';
 import { FtrConfigProviderContext } from '@kbn/test';
+import { SecuritySolutionEndpointRegistryHelpers } from '../../common/services/security_solution';
 import { pageObjects } from '../page_objects';
-import {
-  getRegistryUrlAsArray,
-  createEndpointDockerConfig,
-} from '../../security_solution_endpoint_api_int/registry';
 import type { TargetTags } from '../target_tags';
 
 export const SUITE_TAGS: Record<
@@ -46,9 +43,11 @@ export const generateConfig = async ({
   services: any;
 }): Promise<Config> => {
   const { readConfigFile } = ftrConfigProviderContext;
-
+  // services are not ready yet, so we need to import them here
+  const { createEndpointDockerConfig, getRegistryUrlAsArray } =
+    SecuritySolutionEndpointRegistryHelpers();
   const xpackFunctionalConfig = await readConfigFile(
-    require.resolve('../../../../functional/config.base.js')
+    require.resolve('../../functional/config.base.js')
   );
 
   return {
@@ -91,12 +90,10 @@ export const generateConfig = async ({
     layout: {
       fixedHeaderHeight: 200,
     },
-    mochaOpts: {
-      ...baseConfig.get('mochaOpts'),
-      grep:
-        target === 'serverless'
-          ? '/^(?!.*@(skipInServerless|brokenInServerless)).*@serverless/'
-          : '/^(?!.*@skipInEss).*@ess.*/',
+    suiteTags: {
+      ...baseConfig.get('suiteTags'),
+      include: [...baseConfig.get('suiteTags.include'), ...SUITE_TAGS[target].include],
+      exclude: [...baseConfig.get('suiteTags.exclude'), ...SUITE_TAGS[target].exclude],
     },
   };
 };
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/endpoint.config.ts b/x-pack/test/security_solution_endpoint/configs/endpoint.config.ts
similarity index 89%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/endpoint.config.ts
rename to x-pack/test/security_solution_endpoint/configs/endpoint.config.ts
index b84f2a498ea88..b7fed05f12656 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/endpoint.config.ts
+++ b/x-pack/test/security_solution_endpoint/configs/endpoint.config.ts
@@ -10,11 +10,12 @@ import { resolve } from 'path';
 import { generateConfig } from './config.base';
 import { services } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default async function (ftrConfigProviderContext: FtrConfigProviderContext) {
   const { readConfigFile } = ftrConfigProviderContext;
 
   const xpackFunctionalConfig = await readConfigFile(
-    require.resolve('../../../../functional/config.base.js')
+    require.resolve('../../functional/config.base.js')
   );
 
   return generateConfig({
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/ftr_provider_context.d.ts b/x-pack/test/security_solution_endpoint/configs/ftr_provider_context.d.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/ftr_provider_context.d.ts
rename to x-pack/test/security_solution_endpoint/configs/ftr_provider_context.d.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/integrations.config.ts b/x-pack/test/security_solution_endpoint/configs/integrations.config.ts
similarity index 91%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/integrations.config.ts
rename to x-pack/test/security_solution_endpoint/configs/integrations.config.ts
index 23ae2ef3fd6ea..bed24d7741724 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/integrations.config.ts
+++ b/x-pack/test/security_solution_endpoint/configs/integrations.config.ts
@@ -10,11 +10,12 @@ import { FtrConfigProviderContext } from '@kbn/test';
 import { generateConfig } from './config.base';
 import { services } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default async function (ftrConfigProviderContext: FtrConfigProviderContext) {
   const { readConfigFile } = ftrConfigProviderContext;
 
   const xpackFunctionalConfig = await readConfigFile(
-    require.resolve('../../../../functional/config.base.js')
+    require.resolve('../../functional/config.base.js')
   );
 
   return generateConfig({
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.endpoint.config.ts b/x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
similarity index 88%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.endpoint.config.ts
rename to x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
index a1e548c4cc8b6..db90a134d41b7 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.endpoint.config.ts
+++ b/x-pack/test/security_solution_endpoint/configs/serverless.endpoint.config.ts
@@ -10,11 +10,12 @@ import { resolve } from 'path';
 import { generateConfig } from './config.base';
 import { svlServices } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default async function (ftrConfigProviderContext: FtrConfigProviderContext) {
   const { readConfigFile } = ftrConfigProviderContext;
 
   const svlBaseConfig = await readConfigFile(
-    require.resolve('../../../../../test_serverless/shared/config.base.ts')
+    require.resolve('../../../test_serverless/shared/config.base.ts')
   );
 
   return generateConfig({
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.integrations.config.ts b/x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
similarity index 90%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.integrations.config.ts
rename to x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
index c47d8553dfbeb..0bed29d11d519 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/configs/serverless.integrations.config.ts
+++ b/x-pack/test/security_solution_endpoint/configs/serverless.integrations.config.ts
@@ -10,11 +10,12 @@ import { FtrConfigProviderContext } from '@kbn/test';
 import { generateConfig } from './config.base';
 import { svlServices } from '../services';
 
+// eslint-disable-next-line import/no-default-export
 export default async function (ftrConfigProviderContext: FtrConfigProviderContext) {
   const { readConfigFile } = ftrConfigProviderContext;
 
   const svlBaseConfig = await readConfigFile(
-    require.resolve('../../../../../test_serverless/shared/config.base.ts')
+    require.resolve('../../../test_serverless/shared/config.base.ts')
   );
 
   return generateConfig({
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/artifact_entries_list_page.ts b/x-pack/test/security_solution_endpoint/page_objects/artifact_entries_list_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/artifact_entries_list_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/artifact_entries_list_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/endpoint_page.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/endpoint_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/endpoint_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/endpoint_responder.ts b/x-pack/test/security_solution_endpoint/page_objects/endpoint_responder.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/endpoint_responder.ts
rename to x-pack/test/security_solution_endpoint/page_objects/endpoint_responder.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/fleet_integrations_page.ts b/x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/fleet_integrations_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/fleet_integrations_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/index.ts b/x-pack/test/security_solution_endpoint/page_objects/index.ts
similarity index 82%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/index.ts
rename to x-pack/test/security_solution_endpoint/page_objects/index.ts
index ccd799a0fff63..d7fb55608226f 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/index.ts
+++ b/x-pack/test/security_solution_endpoint/page_objects/index.ts
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { pageObjects as xpackFunctionalPageObjects } from '../../../../functional/page_objects';
+import { pageObjects as xpackFunctionalPageObjects } from '../../functional/page_objects';
 import { EndpointPageProvider } from './endpoint_page';
 import { EndpointPageUtils } from './page_utils';
 import { IngestManagerCreatePackagePolicy } from './ingest_manager_create_package_policy_page';
-import { DetectionsPageObject } from '../../../../security_solution_ftr/page_objects/detections';
-import { HostsPageObject } from '../../../../security_solution_ftr/page_objects/hosts';
+import { DetectionsPageObject } from '../../security_solution_ftr/page_objects/detections';
+import { HostsPageObject } from '../../security_solution_ftr/page_objects/hosts';
 import { EndpointResponderPageObjects } from './endpoint_responder';
-import { TimelinePageObject } from '../../../../security_solution_ftr/page_objects/timeline';
+import { TimelinePageObject } from '../../security_solution_ftr/page_objects/timeline';
 import { EndpointPolicyPageProvider } from './policy_page';
 import { TrustedAppsPageProvider } from './trusted_apps_page';
 import { FleetIntegrations } from './fleet_integrations_page';
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/ingest_manager_create_package_policy_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/page_utils.ts b/x-pack/test/security_solution_endpoint/page_objects/page_utils.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/page_utils.ts
rename to x-pack/test/security_solution_endpoint/page_objects/page_utils.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/policy_page.ts b/x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/policy_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/policy_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/svl_common_page.ts b/x-pack/test/security_solution_endpoint/page_objects/svl_common_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/svl_common_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/svl_common_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/trusted_apps_page.ts b/x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/page_objects/trusted_apps_page.ts
rename to x-pack/test/security_solution_endpoint/page_objects/trusted_apps_page.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint.ts b/x-pack/test/security_solution_endpoint/services/endpoint.ts
similarity index 98%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint.ts
rename to x-pack/test/security_solution_endpoint/services/endpoint.ts
index df8dee3493ec0..c2df3a155377d 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint.ts
@@ -35,10 +35,10 @@ import { HostInfo, HostMetadata } from '@kbn/security-solution-plugin/common/end
 import { EndpointDocGenerator } from '@kbn/security-solution-plugin/common/endpoint/generate_data';
 import { EndpointMetadataGenerator } from '@kbn/security-solution-plugin/common/endpoint/data_generators/endpoint_metadata_generator';
 import { merge } from 'lodash';
-
+// @ts-expect-error we have to check types with "allowJs: false" for now, causing this import to fail
 import { kibanaPackageJson } from '@kbn/repo-info';
 import seedrandom from 'seedrandom';
-import { FtrService } from '../../../../functional/ftr_provider_context';
+import { FtrService } from '../../functional/ftr_provider_context';
 
 // Document Generator override that uses a custom Endpoint Metadata generator and sets the
 // `agent.version` to the current version
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_artifacts.ts b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
similarity index 98%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_artifacts.ts
rename to x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
index 118c097a2f003..6f24f543c89ef 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_artifacts.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_artifacts.ts
@@ -19,7 +19,7 @@ import { EVENT_FILTER_LIST_DEFINITION } from '@kbn/security-solution-plugin/publ
 import { HOST_ISOLATION_EXCEPTIONS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/host_isolation_exceptions/constants';
 import { BLOCKLISTS_LIST_DEFINITION } from '@kbn/security-solution-plugin/public/management/pages/blocklist/constants';
 import { ManifestConstants } from '@kbn/security-solution-plugin/server/endpoint/lib/artifacts';
-import { FtrService } from '../../../../functional/ftr_provider_context';
+import { FtrService } from '../../functional/ftr_provider_context';
 import { InternalUnifiedManifestSchemaResponseType } from '../apps/integrations/mocks';
 
 export interface ArtifactTestData {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_policy.ts b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_policy.ts
rename to x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
similarity index 97%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_telemetry.ts
rename to x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
index d4706595090cf..d786a0df14b9a 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/endpoint_telemetry.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_telemetry.ts
@@ -7,7 +7,7 @@
 
 import fs from 'fs';
 import Path from 'path';
-
+// @ts-expect-error we have to check types with "allowJs: false" for now, causing this import to fail
 import { REPO_ROOT as KIBANA_ROOT } from '@kbn/repo-info';
 import { FtrProviderContext } from '../configs/ftr_provider_context';
 
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/index.ts b/x-pack/test/security_solution_endpoint/services/index.ts
similarity index 62%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/index.ts
rename to x-pack/test/security_solution_endpoint/services/index.ts
index d74b5913934e9..bf1c3a7c85c25 100644
--- a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/index.ts
+++ b/x-pack/test/security_solution_endpoint/services/index.ts
@@ -5,18 +5,20 @@
  * 2.0.
  */
 
-import { services as xPackFunctionalServices } from '../../../../functional/services';
-import { IngestManagerProvider } from '../../../../common/services/ingest_manager';
+import { services as xPackFunctionalServices } from '../../functional/services';
+import { IngestManagerProvider } from '../../common/services/ingest_manager';
 import { EndpointTelemetryTestResourcesProvider } from './endpoint_telemetry';
 import { EndpointTestResources } from './endpoint';
-import { TimelineTestService } from '../../../../security_solution_ftr/services/timeline';
-import { DetectionsTestService } from '../../../../security_solution_ftr/services/detections';
+import { TimelineTestService } from '../../security_solution_ftr/services/timeline';
+import { DetectionsTestService } from '../../security_solution_ftr/services/detections';
 import { EndpointPolicyTestResourcesProvider } from './endpoint_policy';
 import { EndpointArtifactsTestResources } from './endpoint_artifacts';
 import {
   KibanaSupertestWithCertProvider,
   KibanaSupertestWithCertWithoutAuthProvider,
 } from './supertest_with_cert';
+import { SecuritySolutionEndpointDataStreamHelpers } from '../../common/services/security_solution/endpoint_data_stream_helpers';
+import { SecuritySolutionEndpointRegistryHelpers } from '../../common/services/security_solution/endpoint_registry_helpers';
 
 export const services = {
   ...xPackFunctionalServices,
@@ -28,6 +30,8 @@ export const services = {
   detections: DetectionsTestService,
   endpointArtifactTestResources: EndpointArtifactsTestResources,
   policyTestResources: EndpointPolicyTestResourcesProvider,
+  endpointDataStreamHelpers: SecuritySolutionEndpointDataStreamHelpers,
+  endpointRegistryHelpers: SecuritySolutionEndpointRegistryHelpers,
 };
 
 export const svlServices = {
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/supertest_with_cert.ts b/x-pack/test/security_solution_endpoint/services/supertest_with_cert.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/services/supertest_with_cert.ts
rename to x-pack/test/security_solution_endpoint/services/supertest_with_cert.ts
diff --git a/x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/target_tags.ts b/x-pack/test/security_solution_endpoint/target_tags.ts
similarity index 100%
rename from x-pack/test/security_solution_api_integration/test_suites/security_solution_endpoint/target_tags.ts
rename to x-pack/test/security_solution_endpoint/target_tags.ts
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 13e3d0634cd40..7c5161a915227 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -168,10 +168,11 @@
     "@kbn/apm-data-view",
     "@kbn/core-saved-objects-api-server",
     "@kbn/search-types",
-    "@kbn/analytics-ftr-helpers-plugin",
     "@kbn/alerting-comparators",
     "@kbn/alerting-state-types",
     "@kbn/reporting-server",
-    "@kbn/data-quality-plugin"
+    "@kbn/data-quality-plugin",
+    "@kbn/securitysolution-io-ts-list-types",
+    "@kbn/ml-trained-models-utils"
   ]
 }
diff --git a/x-pack/test_serverless/README.md b/x-pack/test_serverless/README.md
index 6fb7551859e5b..2ea645c1d9ae2 100644
--- a/x-pack/test_serverless/README.md
+++ b/x-pack/test_serverless/README.md
@@ -54,9 +54,10 @@ configurations.
 
 **If you add a new `api_integration` or `functional` `common` sub-directory, remember to add it to the corresponding `common_configs` of all projects (`x-pack/test_serverless/[api_integration|functional]/test_suites/[observability|search|security]/common_configs`).**
 
-In case a common test needs to be skipped for one of the projects, there are the following
-suite tags available to do so: `skipSvlOblt`, `skipSvlSearch`, `skipSvlSec`, which can be
-added like this to a test suite:
+In case a common test needs to be skipped for one of the projects 
+(in both regular pipelines that start KBN in serverless mode [against serverless ES] & pipelines creating serverless projects in MKI [Cloud]),
+there are the following suite tags available to do so: 
+`skipSvlOblt`, `skipSvlSearch`, `skipSvlSec`, which can be added like this to a test suite:
 
 ```
 describe('my test suite', function () {
@@ -258,4 +259,4 @@ describe("my test suite", async function() {
 });
 ```
 
-If you are running tests from your local against MKI projects, make sure to add `--exclude-tag=skipMKI` to your FTR command.
+If you are running tests from your local against MKI projects, make sure to add `--exclude-tag=skipMKI` to your FTR command.
\ No newline at end of file
diff --git a/x-pack/test_serverless/api_integration/services/index.ts b/x-pack/test_serverless/api_integration/services/index.ts
index 69040d96218f3..347fc1f68b0ca 100644
--- a/x-pack/test_serverless/api_integration/services/index.ts
+++ b/x-pack/test_serverless/api_integration/services/index.ts
@@ -14,7 +14,20 @@ import { SamlToolsProvider } from './saml_tools';
 import { SvlCasesServiceProvider } from './svl_cases';
 import { SloApiProvider } from './slo_api';
 import { TransformProvider } from './transform';
+
+import { SvlEnrichPoliciesApi } from './index_management/svl_enrich_policies.api';
+import { SvlSettingsApi } from './index_management/svl_settings.api';
+import { SvlIndicesApi } from './index_management/svl_indices.api';
+import { SvlIndicesHelpers } from './index_management/svl_indices.helpers';
+import { SvlEnrichPoliciesHelpers } from './index_management/svl_enrich_policies.helpers';
+import { SvlDatastreamsHelpers } from './index_management/svl_datastreams.helpers';
+import { SvlComponentTemplatesApi } from './index_management/svl_component_templates.api';
+import { SvlComponentTemplateHelpers } from './index_management/svl_component_templates.helpers';
+import { SvlTemplatesHelpers } from './index_management/svl_templates.helpers';
+import { SvlTemplatesApi } from './index_management/svl_templates.api';
+import { SvlMappingsApi } from './index_management/svl_mappings.api';
 import { SynthtraceProvider } from './synthtrace';
+import { SvlClusterNodesApi } from './index_management/svl_cluster_nodes.api';
 
 export const services = {
   // deployment agnostic FTR services
@@ -28,6 +41,18 @@ export const services = {
   sloApi: SloApiProvider,
   transform: TransformProvider,
   synthtrace: SynthtraceProvider,
+  svlEnrichPoliciesApi: SvlEnrichPoliciesApi,
+  svlSettingsApi: SvlSettingsApi,
+  svlIndicesApi: SvlIndicesApi,
+  svlIndicesHelpers: SvlIndicesHelpers,
+  svlEnrichPoliciesHelpers: SvlEnrichPoliciesHelpers,
+  svlDatastreamsHelpers: SvlDatastreamsHelpers,
+  svlComponentTemplatesApi: SvlComponentTemplatesApi,
+  svlComponentTemplateHelpers: SvlComponentTemplateHelpers,
+  svlTemplatesHelpers: SvlTemplatesHelpers,
+  svlTemplatesApi: SvlTemplatesApi,
+  svlMappingsApi: SvlMappingsApi,
+  svlClusterNodesApi: SvlClusterNodesApi,
 };
 
 export type InheritedFtrProviderContext = GenericFtrProviderContext<typeof services, {}>;
diff --git a/x-pack/test_serverless/api_integration/services/index_management/constants.ts b/x-pack/test_serverless/api_integration/services/index_management/constants.ts
new file mode 100644
index 0000000000000..6d080a1eb95ff
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/constants.ts
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const API_BASE_PATH = '/api/index_management';
+export const INTERNAL_API_BASE_PATH = '/internal/index_management';
+
+export const INDEX_PATTERNS = ['test*'];
+
+const expectedIndexKeys = [
+  'health',
+  'hidden',
+  'status',
+  'name',
+  'uuid',
+  'primary',
+  'replica',
+  'documents',
+  'documents_deleted',
+  'size',
+  'primary_size',
+  'isFrozen',
+  'aliases',
+  // Cloud disables CCR, so wouldn't expect follower indices.
+  'isFollowerIndex', // data enricher
+  'ilm', // data enricher
+  'isRollupIndex', // data enricher
+];
+// We need to sort the keys before comparing then, because race conditions
+// can cause enrichers to register in non-deterministic order.
+export const sortedExpectedIndexKeys = expectedIndexKeys.sort();
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_cluster_nodes.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_cluster_nodes.api.ts
new file mode 100644
index 0000000000000..f66876ba70e9b
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_cluster_nodes.api.ts
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { API_BASE_PATH } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { RoleCredentials } from '../../../shared/services';
+
+export function SvlClusterNodesApi({ getService }: FtrProviderContext) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlCommonApi = getService('svlCommonApi');
+
+  const getNodesPlugins = (roleAuthc: RoleCredentials) =>
+    supertestWithoutAuth
+      .get(`${API_BASE_PATH}/nodes/plugins`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  return {
+    getNodesPlugins,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.api.ts
new file mode 100644
index 0000000000000..21d197d27209b
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.api.ts
@@ -0,0 +1,77 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ClusterPutComponentTemplateRequest } from '@elastic/elasticsearch/lib/api/types';
+
+import { API_BASE_PATH } from './constants';
+import { RoleCredentials } from '../../../shared/services';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+type Options = Partial<ClusterPutComponentTemplateRequest> | { _kbnMeta: Record<string, any> };
+
+export function SvlComponentTemplatesApi({ getService }: FtrProviderContext) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlCommonApi = getService('svlCommonApi');
+
+  const createComponentTemplate = async (
+    name: string,
+    options: Options,
+    roleAuthc: RoleCredentials
+  ) =>
+    await supertestWithoutAuth
+      .post(`${API_BASE_PATH}/component_templates`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send({ name, ...options });
+
+  const getAllComponentTemplates = async (roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/component_templates`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const getOneComponentTemplate = async (name: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/component_templates/${name}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const updateComponentTemplate = async (
+    name: string,
+    options: Options,
+    roleAuthc: RoleCredentials
+  ) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/component_templates/${name}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send({
+        name,
+        ...options,
+      });
+
+  const deleteComponentTemplate = async (name: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .delete(`${API_BASE_PATH}/component_templates/${name}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const getComponentTemplateDatastreams = async (name: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/component_templates/${name}/datastreams`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  return {
+    createComponentTemplate,
+    getAllComponentTemplates,
+    getOneComponentTemplate,
+    updateComponentTemplate,
+    deleteComponentTemplate,
+    getComponentTemplateDatastreams,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.helpers.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.helpers.ts
new file mode 100644
index 0000000000000..32ad2b7181cc2
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_component_templates.helpers.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlComponentTemplateHelpers({ getService }: FtrProviderContext) {
+  const log = getService('log');
+  const es = getService('es');
+
+  let componentTemplatesCreated: string[] = [];
+  let indexTemplatesCreated: string[] = [];
+  let datastreamCreated: string[] = [];
+
+  const removeComponentTemplate = (name: string) => es.cluster.deleteComponentTemplate({ name });
+
+  const removeDatastream = (datastream: string) =>
+    es.indices.deleteDataStream({ name: datastream });
+
+  const removeIndexTemplate = (name: string) =>
+    es.indices.deleteIndexTemplate({ name }, { meta: true });
+
+  const addComponentTemplate = (componentTemplate: any, shouldCacheTemplate: boolean) => {
+    if (shouldCacheTemplate) {
+      componentTemplatesCreated.push(componentTemplate.name);
+    }
+
+    return es.cluster.putComponentTemplate(componentTemplate, { meta: true });
+  };
+
+  const addIndexTemplate = (indexTemplate: any, shouldCacheTemplate: boolean) => {
+    if (shouldCacheTemplate) {
+      indexTemplatesCreated.push(indexTemplate.name);
+    }
+
+    return es.indices.putIndexTemplate(indexTemplate, { meta: true });
+  };
+
+  const addDatastream = (datastream: string, shouldCacheTemplate: boolean) => {
+    if (shouldCacheTemplate) {
+      datastreamCreated.push(datastream);
+    }
+
+    return es.indices.createDataStream({ name: datastream });
+  };
+
+  const cleanUpComponentTemplates = () =>
+    Promise.all(componentTemplatesCreated.map(removeComponentTemplate))
+      .then(() => {
+        componentTemplatesCreated = [];
+      })
+      .catch((err) => {
+        log.debug(`[Cleanup error] Error deleting ES resources: ${err.message}`);
+      });
+
+  const cleanUpIndexTemplates = () =>
+    Promise.all(indexTemplatesCreated.map(removeIndexTemplate))
+      .then(() => {
+        indexTemplatesCreated = [];
+      })
+      .catch((err) => {
+        log.debug(`[Cleanup error] Error deleting ES resources: ${err.message}`);
+      });
+
+  const cleanupDatastreams = () =>
+    Promise.all(datastreamCreated.map(removeDatastream))
+      .then(() => {
+        datastreamCreated = [];
+      })
+      .catch((err) => {
+        log.debug(`[Cleanup error] Error deleting ES resources: ${err.message}`);
+      });
+
+  return {
+    addDatastream,
+    addIndexTemplate,
+    addComponentTemplate,
+
+    removeDatastream,
+    removeIndexTemplate,
+    removeComponentTemplate,
+
+    cleanupDatastreams,
+    cleanUpIndexTemplates,
+    cleanUpComponentTemplates,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_datastreams.helpers.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_datastreams.helpers.ts
new file mode 100644
index 0000000000000..2ec16de0efd2e
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_datastreams.helpers.ts
@@ -0,0 +1,96 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlDatastreamsHelpers({ getService }: FtrProviderContext) {
+  const es = getService('es');
+
+  const createDataStream = async (name: string) => {
+    // A data stream requires an index template before it can be created.
+    await es.indices.putIndexTemplate({
+      name,
+      body: {
+        // We need to match the names of backing indices with this template.
+        index_patterns: [name + '*'],
+        template: {
+          mappings: {
+            properties: {
+              '@timestamp': {
+                type: 'date',
+              },
+            },
+          },
+          lifecycle: {
+            // @ts-expect-error @elastic/elasticsearch enabled prop is not typed yet
+            enabled: true,
+          },
+        },
+        data_stream: {},
+      },
+    });
+
+    await es.indices.createDataStream({ name });
+  };
+
+  const updateIndexTemplateMappings = async (name: string, mappings: any) => {
+    await es.indices.putIndexTemplate({
+      name,
+      body: {
+        // We need to match the names of backing indices with this template.
+        index_patterns: [name + '*'],
+        template: {
+          mappings,
+        },
+        data_stream: {},
+      },
+    });
+  };
+
+  const getDatastream = async (name: string) => {
+    const {
+      data_streams: [datastream],
+    } = await es.indices.getDataStream({ name });
+    return datastream;
+  };
+
+  const getMapping = async (name: string) => {
+    const res = await es.indices.getMapping({ index: name });
+
+    return Object.values(res)[0]!.mappings;
+  };
+
+  const deleteComposableIndexTemplate = async (name: string) => {
+    await es.indices.deleteIndexTemplate({ name });
+  };
+
+  const deleteDataStream = async (name: string) => {
+    await es.indices.deleteDataStream({ name });
+    await deleteComposableIndexTemplate(name);
+  };
+
+  const assertDataStreamStorageSizeExists = (storageSize: string, storageSizeBytes: number) => {
+    // Storage size of a document doesn't look like it would be deterministic (could vary depending
+    // on how ES, Lucene, and the file system interact), so we'll just assert its presence and
+    // type.
+    expect(storageSize).to.be.ok();
+    expect(typeof storageSize).to.be('string');
+    expect(storageSizeBytes).to.be.ok();
+    expect(typeof storageSizeBytes).to.be('number');
+  };
+
+  return {
+    createDataStream,
+    updateIndexTemplateMappings,
+    getDatastream,
+    getMapping,
+    deleteComposableIndexTemplate,
+    deleteDataStream,
+    assertDataStreamStorageSizeExists,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.api.ts
new file mode 100644
index 0000000000000..3ec9faa1c533b
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.api.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { INTERNAL_API_BASE_PATH } from './constants';
+import { RoleCredentials } from '../../../shared/services';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlEnrichPoliciesApi({ getService }: FtrProviderContext) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlCommonApi = getService('svlCommonApi');
+
+  const getAllEnrichPolicies = async (roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${INTERNAL_API_BASE_PATH}/enrich_policies`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const executeEnrichPolicy = async (name: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .put(`${INTERNAL_API_BASE_PATH}/enrich_policies/${name}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const removeEnrichPolicy = async (name: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .delete(`${INTERNAL_API_BASE_PATH}/enrich_policies/${name}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  return {
+    getAllEnrichPolicies,
+    removeEnrichPolicy,
+    executeEnrichPolicy,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.helpers.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.helpers.ts
new file mode 100644
index 0000000000000..53f498f2fe53b
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_enrich_policies.helpers.ts
@@ -0,0 +1,51 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlEnrichPoliciesHelpers({ getService }: FtrProviderContext) {
+  const es = getService('es');
+
+  const createEnrichPolicy = async (policyName: string, indexName: string) => {
+    await es.enrich.putPolicy({
+      name: policyName,
+      match: {
+        match_field: 'email',
+        enrich_fields: ['firstName'],
+        indices: [indexName],
+      },
+    });
+  };
+
+  const createIndex = async (indexName: string) => {
+    await es.indices.create({
+      index: indexName,
+      body: {
+        mappings: {
+          properties: {
+            email: {
+              type: 'text',
+            },
+            firstName: {
+              type: 'text',
+            },
+          },
+        },
+      },
+    });
+  };
+
+  const deleteIndex = async (indexName: string) => {
+    await es.indices.delete({ index: indexName });
+  };
+
+  return {
+    createEnrichPolicy,
+    createIndex,
+    deleteIndex,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_indices.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_indices.api.ts
new file mode 100644
index 0000000000000..93f523494a2dc
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_indices.api.ts
@@ -0,0 +1,88 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { API_BASE_PATH } from './constants';
+import { RoleCredentials } from '../../../shared/services';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlIndicesApi({ getService }: FtrProviderContext) {
+  const svlCommonApi = getService('svlCommonApi');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  const executeActionOnIndices =
+    (roleAuthc: RoleCredentials) =>
+    async ({
+      index,
+      urlParam,
+      args,
+    }: {
+      index?: string | string[];
+      urlParam: string;
+      args?: any;
+    }) => {
+      const indices = Array.isArray(index) ? index : [index];
+
+      return await supertestWithoutAuth
+        .post(`${API_BASE_PATH}/indices/${urlParam}`)
+        .set(svlCommonApi.getInternalRequestHeader())
+        .set(roleAuthc.apiKeyHeader)
+        .send({ indices, ...args });
+    };
+
+  const closeIndex = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'close' });
+
+  const openIndex = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'open' });
+
+  const deleteIndex = async (roleAuthc: RoleCredentials, index?: string) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'delete' });
+
+  const flushIndex = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'flush' });
+
+  const refreshIndex = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'refresh' });
+
+  const forceMerge = async (
+    index: string,
+    roleAuthc: RoleCredentials,
+    args?: { maxNumSegments: number }
+  ) => await executeActionOnIndices(roleAuthc)({ index, urlParam: 'forcemerge', args });
+
+  const unfreeze = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'unfreeze' });
+
+  const clearCache = async (index: string, roleAuthc: RoleCredentials) =>
+    await executeActionOnIndices(roleAuthc)({ index, urlParam: 'clear_cache' });
+
+  const list = async (roleAuthc: RoleCredentials) =>
+    supertestWithoutAuth
+      .get(`${API_BASE_PATH}/indices`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const reload = async (roleAuthc: RoleCredentials, indexNames?: string[]) =>
+    await supertestWithoutAuth
+      .post(`${API_BASE_PATH}/indices/reload`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send({ indexNames });
+
+  return {
+    closeIndex,
+    openIndex,
+    deleteIndex,
+    flushIndex,
+    refreshIndex,
+    forceMerge,
+    unfreeze,
+    list,
+    reload,
+    clearCache,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_indices.helpers.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_indices.helpers.ts
new file mode 100644
index 0000000000000..4be1d12d0619a
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_indices.helpers.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { getRandomString } from './svl_random';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlIndicesHelpers({ getService }: FtrProviderContext) {
+  const es = getService('es');
+  const esDeleteAllIndices = getService('esDeleteAllIndices');
+
+  let indicesCreated: string[] = [];
+
+  const createIndex = async (index: string = getRandomString(), mappings?: any) => {
+    indicesCreated.push(index);
+    await es.indices.create({ index, mappings });
+    return index;
+  };
+
+  const deleteAllIndices = async () => {
+    await esDeleteAllIndices(indicesCreated);
+    indicesCreated = [];
+  };
+
+  const catIndex = (index?: string, h?: any) =>
+    es.cat.indices({ index, format: 'json', h }, { meta: true });
+
+  const indexStats = (index: string, metric: string) =>
+    es.indices.stats({ index, metric }, { meta: true });
+
+  return { createIndex, deleteAllIndices, catIndex, indexStats };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_mappings.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_mappings.api.ts
new file mode 100644
index 0000000000000..7c82319eebb1b
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_mappings.api.ts
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { API_BASE_PATH } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+import { RoleCredentials } from '../../../shared/services';
+
+export function SvlMappingsApi({ getService }: FtrProviderContext) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlCommonApi = getService('svlCommonApi');
+
+  const getMapping = async (index: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/mapping/${index}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const updateMappings = async (index: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .put(`${API_BASE_PATH}/mapping/${index}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send({ name: { type: 'text' } });
+
+  return {
+    getMapping,
+    updateMappings,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_random.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_random.ts
new file mode 100644
index 0000000000000..9c8a4cc5ff9d3
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_random.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import Chance from 'chance';
+
+const chance = new Chance();
+const CHARS_POOL = 'abcdefghijklmnopqrstuvwxyz';
+
+export const getRandomString = () => `${chance.string({ pool: CHARS_POOL })}-${Date.now()}`;
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_settings.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_settings.api.ts
new file mode 100644
index 0000000000000..aca8c659c7952
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_settings.api.ts
@@ -0,0 +1,38 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { IndexSettings } from '@kbn/index-management-plugin/common';
+import { RoleCredentials } from '../../../shared/services';
+import { API_BASE_PATH } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlSettingsApi({ getService }: FtrProviderContext) {
+  const svlCommonApi = getService('svlCommonApi');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  const getIndexSettings = async (index: string, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .get(`${API_BASE_PATH}/settings/${index}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader);
+
+  const updateIndexSettings = async (
+    index: string,
+    settings: IndexSettings,
+    roleAuthc: RoleCredentials
+  ) =>
+    await supertestWithoutAuth
+      .put(`${API_BASE_PATH}/settings/${index}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send(settings);
+
+  return {
+    getIndexSettings,
+    updateIndexSettings,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_templates.api.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_templates.api.ts
new file mode 100644
index 0000000000000..10a95efbcd9f8
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_templates.api.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { TemplateDeserialized, TemplateSerialized } from '@kbn/index-management-plugin/common';
+import { API_BASE_PATH } from './constants';
+import { InternalRequestHeader, RoleCredentials } from '../../../shared/services';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export function SvlTemplatesApi({ getService }: FtrProviderContext) {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlCommonApi = getService('svlCommonApi');
+
+  let templatesCreated: Array<{ name: string; isLegacy?: boolean }> = [];
+
+  const getAllTemplates = (internalReqHeader: InternalRequestHeader, roleAuthc: RoleCredentials) =>
+    supertestWithoutAuth.get(`${API_BASE_PATH}/index_templates`).set(roleAuthc.apiKeyHeader);
+
+  const getOneTemplate = (name: string, isLegacy: boolean = false) =>
+    supertestWithoutAuth.get(`${API_BASE_PATH}/index_templates/${name}?legacy=${isLegacy}`);
+
+  const createTemplate = (template: TemplateDeserialized, roleAuthc: RoleCredentials) => {
+    templatesCreated.push({ name: template.name, isLegacy: template._kbnMeta.isLegacy });
+    return supertestWithoutAuth
+      .post(`${API_BASE_PATH}/index_templates`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send(template);
+  };
+
+  const deleteTemplates = async (
+    templates: Array<{ name: string; isLegacy?: boolean }>,
+    roleAuthc: RoleCredentials
+  ) =>
+    await supertestWithoutAuth
+      .post(`${API_BASE_PATH}/delete_index_templates`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send({ templates });
+
+  const updateTemplate = async (
+    payload: TemplateDeserialized,
+    templateName: string,
+    roleAuthc: RoleCredentials
+  ) =>
+    await supertestWithoutAuth
+      .put(`${API_BASE_PATH}/index_templates/${templateName}`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send(payload);
+
+  // Delete all templates created during tests
+  const cleanUpTemplates = async (roleAuthc: RoleCredentials) => {
+    try {
+      await deleteTemplates(templatesCreated, roleAuthc);
+      templatesCreated = [];
+    } catch (e) {
+      // Silently swallow errors
+    }
+  };
+
+  const simulateTemplate = async (payload: TemplateSerialized, roleAuthc: RoleCredentials) =>
+    await supertestWithoutAuth
+      .post(`${API_BASE_PATH}/index_templates/simulate`)
+      .set(svlCommonApi.getInternalRequestHeader())
+      .set(roleAuthc.apiKeyHeader)
+      .send(payload);
+
+  return {
+    getAllTemplates,
+    getOneTemplate,
+    createTemplate,
+    updateTemplate,
+    deleteTemplates,
+    cleanUpTemplates,
+    simulateTemplate,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/services/index_management/svl_templates.helpers.ts b/x-pack/test_serverless/api_integration/services/index_management/svl_templates.helpers.ts
new file mode 100644
index 0000000000000..16e453e10edf5
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/services/index_management/svl_templates.helpers.ts
@@ -0,0 +1,95 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { TemplateDeserialized, TemplateSerialized } from '@kbn/index-management-plugin/common';
+import { INDEX_PATTERNS } from './constants';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+const templateMock = {
+  settings: {
+    number_of_shards: 1,
+  },
+  mappings: {
+    properties: {
+      host_name: {
+        type: 'keyword',
+      },
+      created_at: {
+        type: 'date',
+        format: 'EEE MMM dd HH:mm:ss Z yyyy',
+      },
+    },
+  },
+  aliases: {
+    alias1: {},
+  },
+};
+
+const getTemplateMock = (isMappingsSourceFieldEnabled: boolean) => {
+  if (isMappingsSourceFieldEnabled) {
+    return {
+      ...templateMock,
+      mappings: {
+        ...templateMock.mappings,
+        _source: {
+          enabled: false,
+        },
+      },
+    };
+  }
+  return templateMock;
+};
+
+export function SvlTemplatesHelpers({ getService }: FtrProviderContext) {
+  const es = getService('es');
+
+  const catTemplate = (name: string) => es.cat.templates({ name, format: 'json' }, { meta: true });
+
+  const getTemplatePayload = (
+    name: string,
+    indexPatterns: string[] = INDEX_PATTERNS,
+    isLegacy: boolean = false,
+    isMappingsSourceFieldEnabled: boolean = true
+  ) => {
+    const baseTemplate: TemplateDeserialized = {
+      name,
+      indexPatterns,
+      version: 1,
+      template: { ...getTemplateMock(isMappingsSourceFieldEnabled) },
+      _kbnMeta: {
+        isLegacy,
+        type: 'default',
+        hasDatastream: false,
+      },
+      allowAutoCreate: 'NO_OVERWRITE',
+    };
+
+    if (isLegacy) {
+      baseTemplate.order = 1;
+    } else {
+      baseTemplate.priority = 1;
+    }
+
+    return baseTemplate;
+  };
+
+  const getSerializedTemplate = (
+    indexPatterns: string[] = INDEX_PATTERNS,
+    isMappingsSourceFieldEnabled: boolean = true
+  ): TemplateSerialized => {
+    return {
+      index_patterns: indexPatterns,
+      template: { ...getTemplateMock(isMappingsSourceFieldEnabled) },
+    };
+  };
+
+  return {
+    catTemplate,
+    getTemplatePayload,
+    getSerializedTemplate,
+  };
+}
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/cluster_nodes.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/cluster_nodes.ts
index 60110dd5af3fc..fda205cf3b781 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/cluster_nodes.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/cluster_nodes.ts
@@ -8,25 +8,27 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
 
 export default function ({ getService }: FtrProviderContext) {
-  const indexManagementService = getService('indexManagement');
+  const svlClusterNodesApi = getService('svlClusterNodesApi');
+  const svlUserManager = getService('svlUserManager');
 
-  describe('nodes', () => {
-    let getNodesPlugins: typeof indexManagementService['clusterNodes']['api']['getNodesPlugins'];
+  let roleAuthc: RoleCredentials;
 
+  describe('nodes', () => {
     before(async () => {
-      ({
-        clusterNodes: {
-          api: { getNodesPlugins },
-        },
-      } = indexManagementService);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+    });
+    after(async () => {
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
-    it('should fetch the nodes plugins', async () => {
-      const { body } = await getNodesPlugins().expect(200);
+    it('should NOT fetch the nodes plugins in serverless', async () => {
+      const { body, status } = await svlClusterNodesApi.getNodesPlugins(roleAuthc);
+      expect(status).to.eql(410);
 
-      expect(Array.isArray(body)).to.be(true);
+      expect(Array.isArray(body)).to.be(false);
     });
   });
 }
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/create_enrich_policies.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/create_enrich_policies.ts
index e2bfa9cdb35ef..a4cfd731f9a79 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/create_enrich_policies.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/create_enrich_policies.ts
@@ -7,20 +7,28 @@
 
 import expect from 'expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
 
 const INTERNAL_API_BASE_PATH = '/internal/index_management';
 
 export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
   const es = getService('es');
   const log = getService('log');
 
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
+
   describe('Create enrich policy', function () {
     const INDEX_A_NAME = `index-${Math.random()}`;
     const INDEX_B_NAME = `index-${Math.random()}`;
     const POLICY_NAME = `policy-${Math.random()}`;
 
     before(async () => {
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalReqHeader = svlCommonApi.getInternalRequestHeader();
       try {
         await es.indices.create({
           index: INDEX_A_NAME,
@@ -66,13 +74,14 @@ export default function ({ getService }: FtrProviderContext) {
         log.debug('[Cleanup error] Error deleting test index');
         throw err;
       }
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     it('Allows to create an enrich policy', async () => {
-      const { body } = await supertest
+      const { body } = await supertestWithoutAuth
         .post(`${INTERNAL_API_BASE_PATH}/enrich_policies`)
-        .set('kbn-xsrf', 'xxx')
-        .set('x-elastic-internal-origin', 'xxx')
+        .set(internalReqHeader)
+        .set(roleAuthc.apiKeyHeader)
         .send({
           policy: {
             name: POLICY_NAME,
@@ -88,10 +97,10 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('Can retrieve fields from indices', async () => {
-      const { body } = await supertest
+      const { body } = await supertestWithoutAuth
         .post(`${INTERNAL_API_BASE_PATH}/enrich_policies/get_fields_from_indices`)
-        .set('kbn-xsrf', 'xxx')
-        .set('x-elastic-internal-origin', 'xxx')
+        .set(internalReqHeader)
+        .set(roleAuthc.apiKeyHeader)
         .send({ indices: [INDEX_A_NAME, INDEX_B_NAME] })
         .expect(200);
 
@@ -117,12 +126,12 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('Can retrieve matching indices', async () => {
-      const { body } = await supertest
+      const { body, status } = await supertestWithoutAuth
         .post(`${INTERNAL_API_BASE_PATH}/enrich_policies/get_matching_indices`)
-        .set('kbn-xsrf', 'xxx')
-        .set('x-elastic-internal-origin', 'xxx')
-        .send({ pattern: 'index-' })
-        .expect(200);
+        .set(internalReqHeader)
+        .set(roleAuthc.apiKeyHeader)
+        .send({ pattern: 'index-' });
+      svlCommonApi.assertResponseStatusCode(200, status, body);
 
       expect(
         body.indices.every((value: string) => [INDEX_A_NAME, INDEX_B_NAME].includes(value))
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/datastreams.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/datastreams.ts
index 7c3f56f9c190d..5e0a5baedb280 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/datastreams.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/datastreams.ts
@@ -9,46 +9,41 @@ import expect from '@kbn/expect';
 
 import { DataStream } from '@kbn/index-management-plugin/common';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
 
 const API_BASE_PATH = '/api/index_management';
 
 export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const indexManagementService = getService('indexManagement');
-  let helpers: typeof indexManagementService['datastreams']['helpers'];
-  let createDataStream: typeof helpers['createDataStream'];
-  let deleteDataStream: typeof helpers['deleteDataStream'];
-  let deleteComposableIndexTemplate: typeof helpers['deleteComposableIndexTemplate'];
-  let updateIndexTemplateMappings: typeof helpers['updateIndexTemplateMappings'];
-  let getMapping: typeof helpers['getMapping'];
-  let getDatastream: typeof helpers['getDatastream'];
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
+  const svlDatastreamsHelpers = getService('svlDatastreamsHelpers');
 
   describe('Data streams', function () {
+    // see details: https://github.com/elastic/kibana/issues/187372
+    this.tags(['failsOnMKI']);
     before(async () => {
-      ({
-        datastreams: { helpers },
-      } = indexManagementService);
-      ({
-        createDataStream,
-        deleteDataStream,
-        deleteComposableIndexTemplate,
-        updateIndexTemplateMappings,
-        getMapping,
-        getDatastream,
-      } = helpers);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalReqHeader = svlCommonApi.getInternalRequestHeader();
+    });
+    after(async () => {
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
     describe('Get', () => {
       const testDataStreamName = 'test-data-stream';
 
-      before(async () => await createDataStream(testDataStreamName));
-      after(async () => await deleteDataStream(testDataStreamName));
+      before(async () => await svlDatastreamsHelpers.createDataStream(testDataStreamName));
+      after(async () => await svlDatastreamsHelpers.deleteDataStream(testDataStreamName));
 
       it('returns an array of data streams', async () => {
-        const { body: dataStreams } = await supertest
+        const { body: dataStreams, status } = await supertestWithoutAuth
           .get(`${API_BASE_PATH}/data_streams`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader);
+
+        svlCommonApi.assertResponseStatusCode(200, status, dataStreams);
 
         expect(dataStreams).to.be.an('array');
 
@@ -89,11 +84,12 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('returns a single data stream by ID', async () => {
-        const { body: dataStream } = await supertest
+        const { body: dataStream, status } = await supertestWithoutAuth
           .get(`${API_BASE_PATH}/data_streams/${testDataStreamName}`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader);
+
+        svlCommonApi.assertResponseStatusCode(200, status, dataStream);
 
         // ES determines these values so we'll just echo them back.
         const { name: indexName, uuid } = dataStream.indices[0];
@@ -129,49 +125,35 @@ export default function ({ getService }: FtrProviderContext) {
     describe('Update', () => {
       const testDataStreamName = 'test-data-stream';
 
-      before(async () => await createDataStream(testDataStreamName));
-      after(async () => await deleteDataStream(testDataStreamName));
+      before(async () => await svlDatastreamsHelpers.createDataStream(testDataStreamName));
+      after(async () => await svlDatastreamsHelpers.deleteDataStream(testDataStreamName));
 
       it('updates the data retention of a DS', async () => {
-        const { body } = await supertest
+        const { body, status } = await supertestWithoutAuth
           .put(`${API_BASE_PATH}/data_streams/${testDataStreamName}/data_retention`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .send({
             dataRetention: '7d',
-          })
-          .expect(200);
+          });
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         expect(body).to.eql({ success: true });
       });
 
       it('sets data retention to infinite', async () => {
-        const { body } = await supertest
+        const { body, status } = await supertestWithoutAuth
           .put(`${API_BASE_PATH}/data_streams/${testDataStreamName}/data_retention`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .send({})
-          .expect(200);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
+          .send({});
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         // Providing an infinite retention might not be allowed for a given project,
         // due to it having an existing max retention period. Because of this
         // we will only check whether the request was recieved by ES.
         expect(body.success).to.eql(true);
       });
-
-      it('can disable lifecycle for a given policy', async () => {
-        const { body } = await supertest
-          .put(`${API_BASE_PATH}/data_streams/${testDataStreamName}/data_retention`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .send({ enabled: false })
-          .expect(200);
-
-        expect(body).to.eql({ success: true });
-
-        const datastream = await getDatastream(testDataStreamName);
-        expect(datastream.lifecycle).to.be(undefined);
-      });
     });
 
     describe('Delete', () => {
@@ -180,8 +162,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       before(async () => {
         await Promise.all([
-          createDataStream(testDataStreamName1),
-          createDataStream(testDataStreamName2),
+          svlDatastreamsHelpers.createDataStream(testDataStreamName1),
+          svlDatastreamsHelpers.createDataStream(testDataStreamName2),
         ]);
       });
 
@@ -189,32 +171,32 @@ export default function ({ getService }: FtrProviderContext) {
         // The Delete API only deletes the data streams, so we still need to manually delete their
         // related index patterns to clean up.
         await Promise.all([
-          deleteComposableIndexTemplate(testDataStreamName1),
-          deleteComposableIndexTemplate(testDataStreamName2),
+          svlDatastreamsHelpers.deleteComposableIndexTemplate(testDataStreamName1),
+          svlDatastreamsHelpers.deleteComposableIndexTemplate(testDataStreamName2),
         ]);
       });
 
       it('deletes multiple data streams', async () => {
-        await supertest
+        const { body: b1, status: s1 } = await supertestWithoutAuth
           .post(`${API_BASE_PATH}/delete_data_streams`)
-          .set('x-elastic-internal-origin', 'xxx')
-          .set('kbn-xsrf', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .send({
             dataStreams: [testDataStreamName1, testDataStreamName2],
-          })
-          .expect(200);
+          });
+        svlCommonApi.assertResponseStatusCode(200, s1, b1);
 
-        await supertest
+        const { body: b2, status: s2 } = await supertestWithoutAuth
           .get(`${API_BASE_PATH}/data_streams/${testDataStreamName1}`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(404);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader);
+        svlCommonApi.assertResponseStatusCode(404, s2, b2);
 
-        await supertest
+        const { body: b3, status: s3 } = await supertestWithoutAuth
           .get(`${API_BASE_PATH}/data_streams/${testDataStreamName2}`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(404);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader);
+        svlCommonApi.assertResponseStatusCode(404, s3, b3);
       });
     });
 
@@ -222,30 +204,31 @@ export default function ({ getService }: FtrProviderContext) {
       const testDataStreamName1 = 'test-data-stream-mappings-1';
 
       before(async () => {
-        await createDataStream(testDataStreamName1);
+        await svlDatastreamsHelpers.createDataStream(testDataStreamName1);
       });
 
       after(async () => {
-        await deleteDataStream(testDataStreamName1);
+        await svlDatastreamsHelpers.deleteDataStream(testDataStreamName1);
       });
 
       it('Apply mapping from index template', async () => {
-        const beforeMapping = await getMapping(testDataStreamName1);
+        const beforeMapping = await svlDatastreamsHelpers.getMapping(testDataStreamName1);
         expect(beforeMapping.properties).eql({
           '@timestamp': { type: 'date' },
         });
-        await updateIndexTemplateMappings(testDataStreamName1, {
+        await svlDatastreamsHelpers.updateIndexTemplateMappings(testDataStreamName1, {
           properties: {
             test: { type: 'integer' },
           },
         });
-        await supertest
+        const { body, status } = await supertestWithoutAuth
           .post(`${API_BASE_PATH}/data_streams/${testDataStreamName1}/mappings_from_template`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader);
+
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
-        const afterMapping = await getMapping(testDataStreamName1);
+        const afterMapping = await svlDatastreamsHelpers.getMapping(testDataStreamName1);
         expect(afterMapping.properties).eql({
           '@timestamp': { type: 'date' },
           test: { type: 'integer' },
@@ -257,21 +240,22 @@ export default function ({ getService }: FtrProviderContext) {
       const testDataStreamName1 = 'test-data-stream-rollover-1';
 
       before(async () => {
-        await createDataStream(testDataStreamName1);
+        await svlDatastreamsHelpers.createDataStream(testDataStreamName1);
       });
 
       after(async () => {
-        await deleteDataStream(testDataStreamName1);
+        await svlDatastreamsHelpers.deleteDataStream(testDataStreamName1);
       });
 
       it('Rollover datastreams', async () => {
-        await supertest
+        const { body, status } = await supertestWithoutAuth
           .post(`${API_BASE_PATH}/data_streams/${testDataStreamName1}/rollover`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .expect(200);
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
-        const datastream = await getDatastream(testDataStreamName1);
+        const datastream = await svlDatastreamsHelpers.getDatastream(testDataStreamName1);
 
         expect(datastream.generation).equal(2);
       });
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/enrich_policies.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/enrich_policies.ts
index d3b8f655cab2c..3762f5b87adcf 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/enrich_policies.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/enrich_policies.ts
@@ -7,34 +7,26 @@
 
 import expect from 'expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
 
 export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
-  const indexManagementService = getService('indexManagement');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const svlEnrichPoliciesApi = getService('svlEnrichPoliciesApi');
+  const svlEnrichPoliciesHelpers = getService('svlEnrichPoliciesHelpers');
+  let roleAuthc: RoleCredentials;
 
   describe('Enrich policies', function () {
     const INDEX_NAME = `index-${Math.random()}`;
     const POLICY_NAME = `policy-${Math.random()}`;
 
-    let createIndex: typeof indexManagementService['enrichPolicies']['helpers']['createIndex'];
-    let deleteIndex: typeof indexManagementService['enrichPolicies']['helpers']['deleteIndex'];
-    let createEnrichPolicy: typeof indexManagementService['enrichPolicies']['helpers']['createEnrichPolicy'];
-
-    let getAllEnrichPolicies: typeof indexManagementService['enrichPolicies']['api']['getAllEnrichPolicies'];
-    let removeEnrichPolicy: typeof indexManagementService['enrichPolicies']['api']['removeEnrichPolicy'];
-    let executeEnrichPolicy: typeof indexManagementService['enrichPolicies']['api']['executeEnrichPolicy'];
-
     before(async () => {
-      ({
-        enrichPolicies: {
-          helpers: { createIndex, deleteIndex, createEnrichPolicy },
-          api: { getAllEnrichPolicies, removeEnrichPolicy, executeEnrichPolicy },
-        },
-      } = indexManagementService);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
 
       try {
-        await createIndex(INDEX_NAME);
-        await createEnrichPolicy(POLICY_NAME, INDEX_NAME);
+        await svlEnrichPoliciesHelpers.createIndex(INDEX_NAME);
+        await svlEnrichPoliciesHelpers.createEnrichPolicy(POLICY_NAME, INDEX_NAME);
       } catch (err) {
         log.debug('[Setup error] Error creating test index and policy');
         throw err;
@@ -43,15 +35,18 @@ export default function ({ getService }: FtrProviderContext) {
 
     after(async () => {
       try {
-        await deleteIndex(INDEX_NAME);
+        await svlEnrichPoliciesHelpers.deleteIndex(INDEX_NAME);
       } catch (err) {
         log.debug('[Cleanup error] Error deleting test index');
         throw err;
       }
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     it('should list all policies', async () => {
-      const { body } = await getAllEnrichPolicies().expect(200);
+      const { status, body } = await svlEnrichPoliciesApi.getAllEnrichPolicies(roleAuthc);
+
+      svlCommonApi.assertResponseStatusCode(200, status, body);
 
       expect(body).toContainEqual({
         enrichFields: ['firstName'],
@@ -63,7 +58,12 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should be able to execute a policy', async () => {
-      await executeEnrichPolicy(POLICY_NAME).expect(200);
+      const { status, body } = await svlEnrichPoliciesApi.executeEnrichPolicy(
+        POLICY_NAME,
+        roleAuthc
+      );
+
+      svlCommonApi.assertResponseStatusCode(200, status, body);
 
       // Wait for a little bit for the policy to be executed, so that it can
       // be deleted in the next test.
@@ -71,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should be able to delete a policy', async () => {
-      const { status } = await removeEnrichPolicy(POLICY_NAME);
+      const { status } = await svlEnrichPoliciesApi.removeEnrichPolicy(POLICY_NAME, roleAuthc);
 
       // In the odd case that the policy is somehow still being executed, the delete
       // method might return a 429 so we need to account for that.
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts
index 608530a51e72a..db96dbf0e80c7 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index.ts
@@ -8,7 +8,7 @@
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 export default function ({ loadTestFile }: FtrProviderContext) {
-  describe('Index Management APIs', function () {
+  describe('Serverless Index Management APIs', function () {
     this.tags(['esGate']);
 
     loadTestFile(require.resolve('./index_templates'));
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_component_templates.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_component_templates.ts
index b1f26ac562414..a5b72736a11c4 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_component_templates.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_component_templates.ts
@@ -8,57 +8,31 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
 
 const CACHE_TEMPLATES = true;
 
 export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
-  const indexManagementService = getService('indexManagement');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  let roleAuthc: RoleCredentials;
+  const svlComponentTemplatesApi = getService('svlComponentTemplatesApi');
+  const svlComponentTemplateHelpers = getService('svlComponentTemplateHelpers');
 
   // Failing: See https://github.com/elastic/kibana/issues/182792
   // Failing: See https://github.com/elastic/kibana/issues/182797
   // Failing: See https://github.com/elastic/kibana/issues/182791
   describe.skip('component templates', () => {
-    // Api methods
-    let getAllComponentTemplates: typeof indexManagementService['componentTemplates']['api']['getAllComponentTemplates'];
-    let getOneComponentTemplate: typeof indexManagementService['componentTemplates']['api']['getOneComponentTemplate'];
-    let updateComponentTemplate: typeof indexManagementService['componentTemplates']['api']['updateComponentTemplate'];
-    let deleteComponentTemplate: typeof indexManagementService['componentTemplates']['api']['deleteComponentTemplate'];
-    let getComponentTemplateDatastreams: typeof indexManagementService['componentTemplates']['api']['getComponentTemplateDatastreams'];
-    // Helpers
-    let addDatastream: typeof indexManagementService['componentTemplates']['helpers']['addDatastream'];
-    let addIndexTemplate: typeof indexManagementService['componentTemplates']['helpers']['addIndexTemplate'];
-    let addComponentTemplate: typeof indexManagementService['componentTemplates']['helpers']['addComponentTemplate'];
-    let cleanupDatastreams: typeof indexManagementService['componentTemplates']['helpers']['cleanupDatastreams'];
-    let cleanUpIndexTemplates: typeof indexManagementService['componentTemplates']['helpers']['cleanUpIndexTemplates'];
-    let cleanUpComponentTemplates: typeof indexManagementService['componentTemplates']['helpers']['cleanUpComponentTemplates'];
-
     before(async () => {
-      ({
-        componentTemplates: {
-          api: {
-            getAllComponentTemplates,
-            getOneComponentTemplate,
-            updateComponentTemplate,
-            deleteComponentTemplate,
-            getComponentTemplateDatastreams,
-          },
-          helpers: {
-            addDatastream,
-            addIndexTemplate,
-            addComponentTemplate,
-            cleanupDatastreams,
-            cleanUpIndexTemplates,
-            cleanUpComponentTemplates,
-          },
-        },
-      } = indexManagementService);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
     });
 
     after(async () => {
-      await cleanUpIndexTemplates();
-      await cleanUpComponentTemplates();
-      await cleanupDatastreams();
+      await svlComponentTemplateHelpers.cleanUpIndexTemplates();
+      await svlComponentTemplateHelpers.cleanUpComponentTemplates();
+      await svlComponentTemplateHelpers.cleanupDatastreams();
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     describe('Get', () => {
@@ -87,7 +61,10 @@ export default function ({ getService }: FtrProviderContext) {
       // Create component template to verify GET requests
       before(async () => {
         try {
-          await addComponentTemplate({ body: COMPONENT, name: COMPONENT_NAME }, CACHE_TEMPLATES);
+          await svlComponentTemplateHelpers.addComponentTemplate(
+            { body: COMPONENT, name: COMPONENT_NAME },
+            CACHE_TEMPLATES
+          );
         } catch (err) {
           log.debug('[Setup error] Error creating component template');
           throw err;
@@ -96,7 +73,10 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('all component templates', () => {
         it('should return an array of component templates', async () => {
-          const { body: componentTemplates } = await getAllComponentTemplates().expect(200);
+          const { body: componentTemplates, status } =
+            await svlComponentTemplatesApi.getAllComponentTemplates(roleAuthc);
+
+          svlCommonApi.assertResponseStatusCode(200, status, { componentTemplates });
 
           const testComponentTemplate = componentTemplates.find(
             ({ name }: { name: string }) => name === COMPONENT_NAME
@@ -116,7 +96,12 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('one component template', () => {
         it('should return a single component template', async () => {
-          const { body } = await getOneComponentTemplate(COMPONENT_NAME).expect(200);
+          const { body, status } = await svlComponentTemplatesApi.getOneComponentTemplate(
+            COMPONENT_NAME,
+            roleAuthc
+          );
+
+          svlCommonApi.assertResponseStatusCode(200, status, body);
 
           expect(body).to.eql({
             name: COMPONENT_NAME,
@@ -156,7 +141,10 @@ export default function ({ getService }: FtrProviderContext) {
       before(async () => {
         // Create component template that can be used to test PUT request
         try {
-          await addComponentTemplate({ body: COMPONENT, name: COMPONENT_NAME }, CACHE_TEMPLATES);
+          await svlComponentTemplateHelpers.addComponentTemplate(
+            { body: COMPONENT, name: COMPONENT_NAME },
+            CACHE_TEMPLATES
+          );
         } catch (err) {
           log.debug('[Setup error] Error creating component template');
           throw err;
@@ -164,14 +152,20 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should allow an existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate(COMPONENT_NAME, {
-          ...COMPONENT,
-          version: 1,
-          _kbnMeta: {
-            usedBy: [],
-            isManaged: false,
+        const { body, status } = await svlComponentTemplatesApi.updateComponentTemplate(
+          COMPONENT_NAME,
+          {
+            ...COMPONENT,
+            version: 1,
+            _kbnMeta: {
+              usedBy: [],
+              isManaged: false,
+            },
           },
-        }).expect(200);
+          roleAuthc
+        );
+
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         expect(body).to.eql({
           acknowledged: true,
@@ -179,14 +173,20 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should not allow a non-existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate('component_does_not_exist', {
-          ...COMPONENT,
-          version: 1,
-          _kbnMeta: {
-            usedBy: [],
-            isManaged: false,
+        const { body, status } = await svlComponentTemplatesApi.updateComponentTemplate(
+          'component_does_not_exist',
+          {
+            ...COMPONENT,
+            version: 1,
+            _kbnMeta: {
+              usedBy: [],
+              isManaged: false,
+            },
           },
-        }).expect(404);
+          roleAuthc
+        );
+
+        svlCommonApi.assertResponseStatusCode(400, status, body);
 
         expect(body).to.eql({
           statusCode: 404,
@@ -234,7 +234,10 @@ export default function ({ getService }: FtrProviderContext) {
       before(async () => {
         // Create component template that can be used to test PUT request
         try {
-          await addComponentTemplate({ body: COMPONENT, name: COMPONENT_NAME }, CACHE_TEMPLATES);
+          await svlComponentTemplateHelpers.addComponentTemplate(
+            { body: COMPONENT, name: COMPONENT_NAME },
+            CACHE_TEMPLATES
+          );
         } catch (err) {
           log.debug('[Setup error] Error creating component template');
           throw err;
@@ -242,14 +245,20 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should allow an existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate(COMPONENT_NAME, {
-          ...COMPONENT,
-          version: 1,
-          _kbnMeta: {
-            usedBy: [],
-            isManaged: false,
+        const { body, status } = await svlComponentTemplatesApi.updateComponentTemplate(
+          COMPONENT_NAME,
+          {
+            ...COMPONENT,
+            version: 1,
+            _kbnMeta: {
+              usedBy: [],
+              isManaged: false,
+            },
           },
-        }).expect(200);
+          roleAuthc
+        );
+
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         expect(body).to.eql({
           acknowledged: true,
@@ -257,14 +266,19 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('should not allow a non-existing component template to be updated', async () => {
-        const { body } = await updateComponentTemplate('component_does_not_exist', {
-          ...COMPONENT,
-          version: 1,
-          _kbnMeta: {
-            usedBy: [],
-            isManaged: false,
+        const { body, status } = await svlComponentTemplatesApi.updateComponentTemplate(
+          'component_does_not_exist',
+          {
+            ...COMPONENT,
+            version: 1,
+            _kbnMeta: {
+              usedBy: [],
+              isManaged: false,
+            },
           },
-        }).expect(404);
+          roleAuthc
+        );
+        svlCommonApi.assertResponseStatusCode(404, status, body);
 
         expect(body).to.eql({
           statusCode: 404,
@@ -306,7 +320,8 @@ export default function ({ getService }: FtrProviderContext) {
         // Create several component templates that can be used to test deletion
         await Promise.all(
           [componentTemplateA, componentTemplateB, componentTemplateC, componentTemplateD].map(
-            (template) => addComponentTemplate(template, !CACHE_TEMPLATES)
+            (template) =>
+              svlComponentTemplateHelpers.addComponentTemplate(template, !CACHE_TEMPLATES)
           )
         ).catch((err) => {
           log.debug(`[Setup error] Error creating component templates: ${err.message}`);
@@ -316,7 +331,11 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should delete a component template', async () => {
         const { name } = componentTemplateA;
-        const { body } = await deleteComponentTemplate(name).expect(200);
+        const { status, body } = await svlComponentTemplatesApi.deleteComponentTemplate(
+          name,
+          roleAuthc
+        );
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         expect(body).to.eql({
           itemsDeleted: [name],
@@ -329,10 +348,13 @@ export default function ({ getService }: FtrProviderContext) {
         const { name: componentTemplate2Name } = componentTemplateC;
 
         const {
+          status,
           body: { itemsDeleted, errors },
-        } = await deleteComponentTemplate(
-          `${componentTemplate1Name},${componentTemplate2Name}`
-        ).expect(200);
+        } = await svlComponentTemplatesApi.deleteComponentTemplate(
+          `${componentTemplate1Name},${componentTemplate2Name}`,
+          roleAuthc
+        );
+        svlCommonApi.assertResponseStatusCode(200, status, { itemsDeleted, errors });
 
         expect(errors).to.eql([]);
 
@@ -346,9 +368,12 @@ export default function ({ getService }: FtrProviderContext) {
         const COMPONENT_DOES_NOT_EXIST = 'component_does_not_exist';
         const { name: componentTemplateName } = componentTemplateD;
 
-        const { body } = await deleteComponentTemplate(
-          `${componentTemplateName},${COMPONENT_DOES_NOT_EXIST}`
-        ).expect(200);
+        const { body, status } = await svlComponentTemplatesApi.deleteComponentTemplate(
+          `${componentTemplateName},${COMPONENT_DOES_NOT_EXIST}`,
+          roleAuthc
+        );
+        svlCommonApi.assertResponseStatusCode(200, status, body);
+
         expect(body.itemsDeleted).to.eql([componentTemplateName]);
         expect(body.errors[0].name).to.eql(COMPONENT_DOES_NOT_EXIST);
 
@@ -398,8 +423,14 @@ export default function ({ getService }: FtrProviderContext) {
       // Create component template to verify GET requests
       before(async () => {
         try {
-          await addComponentTemplate({ body: COMPONENT, name: COMPONENT_NAME }, CACHE_TEMPLATES);
-          await addIndexTemplate({ body: TEMPLATE, name: TEMPLATE_NAME }, CACHE_TEMPLATES);
+          await svlComponentTemplateHelpers.addComponentTemplate(
+            { body: COMPONENT, name: COMPONENT_NAME },
+            CACHE_TEMPLATES
+          );
+          await svlComponentTemplateHelpers.addIndexTemplate(
+            { body: TEMPLATE, name: TEMPLATE_NAME },
+            CACHE_TEMPLATES
+          );
         } catch (err) {
           log.debug('[Setup error] Error creating component template');
           throw err;
@@ -408,7 +439,11 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('without datastreams', () => {
         it('should return no datastreams', async () => {
-          const { body } = await getComponentTemplateDatastreams(COMPONENT_NAME).expect(200);
+          const { body, status } = await svlComponentTemplatesApi.getComponentTemplateDatastreams(
+            COMPONENT_NAME,
+            roleAuthc
+          );
+          svlCommonApi.assertResponseStatusCode(200, status, body);
 
           expect(body).to.eql({ data_streams: [] });
         });
@@ -416,10 +451,14 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('with datastreams', () => {
         before(async () => {
-          await addDatastream(DATASTREAM_NAME, CACHE_TEMPLATES);
+          await svlComponentTemplateHelpers.addDatastream(DATASTREAM_NAME, CACHE_TEMPLATES);
         });
         it('should return datastreams', async () => {
-          const { body } = await getComponentTemplateDatastreams(COMPONENT_NAME).expect(200);
+          const { body, status } = await svlComponentTemplatesApi.getComponentTemplateDatastreams(
+            COMPONENT_NAME,
+            roleAuthc
+          );
+          svlCommonApi.assertResponseStatusCode(200, status, body);
 
           expect(body).to.eql({ data_streams: ['logs-test-component-template-default'] });
         });
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_templates.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_templates.ts
index 6509512171320..923d9818d0ff1 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_templates.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/index_templates.ts
@@ -7,44 +7,36 @@
 
 import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import type { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
 
 const API_BASE_PATH = '/api/index_management';
 
 export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const svlTemplatesHelpers = getService('svlTemplatesHelpers');
+  const svlTemplatesApi = getService('svlTemplatesApi');
+
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
+
   const es = getService('es');
   const log = getService('log');
   const randomness = getService('randomness');
-  const indexManagementService = getService('indexManagement');
-  let getTemplatePayload: typeof indexManagementService['templates']['helpers']['getTemplatePayload'];
-  let catTemplate: typeof indexManagementService['templates']['helpers']['catTemplate'];
-  let getSerializedTemplate: typeof indexManagementService['templates']['helpers']['getSerializedTemplate'];
-  let createTemplate: typeof indexManagementService['templates']['api']['createTemplate'];
-  let updateTemplate: typeof indexManagementService['templates']['api']['updateTemplate'];
-  let deleteTemplates: typeof indexManagementService['templates']['api']['deleteTemplates'];
-  let simulateTemplate: typeof indexManagementService['templates']['api']['simulateTemplate'];
-  let cleanUpTemplates: typeof indexManagementService['templates']['api']['cleanUpTemplates'];
-
-  let getRandomString: () => string;
-  describe('Index templates', function () {
+
+  const getRandomString: () => string = () => randomness.string({ casing: 'lower', alpha: true });
+
+  // see details: https://github.com/elastic/kibana/issues/187368
+  describe.skip('Index templates', function () {
     before(async () => {
-      ({
-        templates: {
-          helpers: { getTemplatePayload, catTemplate, getSerializedTemplate },
-          api: {
-            createTemplate,
-            updateTemplate,
-            deleteTemplates,
-            simulateTemplate,
-            cleanUpTemplates,
-          },
-        },
-      } = indexManagementService);
-      getRandomString = () => randomness.string({ casing: 'lower', alpha: true });
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalReqHeader = svlCommonApi.getInternalRequestHeader();
     });
 
     after(async () => {
-      await cleanUpTemplates({ 'x-elastic-internal-origin': 'xxx' });
+      await svlTemplatesApi.cleanUpTemplates(roleAuthc);
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     describe('get', () => {
@@ -81,11 +73,11 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('all', () => {
         it('should list all the index templates with the expected parameters', async () => {
-          const { body: allTemplates } = await supertest
+          const { status, body: allTemplates } = await supertestWithoutAuth
             .get(`${API_BASE_PATH}/index_templates`)
-            .set('kbn-xsrf', 'xxx')
-            .set('x-elastic-internal-origin', 'xxx')
-            .expect(200);
+            .set(internalReqHeader)
+            .set(roleAuthc.apiKeyHeader);
+          expect(status).to.eql(200);
 
           // Legacy templates are not applicable on serverless
           expect(allTemplates.legacyTemplates.length).to.eql(0);
@@ -114,11 +106,11 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('one', () => {
         it('should return an index template with the expected parameters', async () => {
-          const { body } = await supertest
+          const { body, status } = await supertestWithoutAuth
             .get(`${API_BASE_PATH}/index_templates/${templateName}`)
-            .set('kbn-xsrf', 'xxx')
-            .set('x-elastic-internal-origin', 'xxx')
-            .expect(200);
+            .set(internalReqHeader)
+            .set(roleAuthc.apiKeyHeader);
+          expect(status).to.eql(200);
 
           const expectedKeys = [
             'name',
@@ -138,28 +130,36 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('create', () => {
       it('should create an index template', async () => {
-        const payload = getTemplatePayload(
+        const payload = svlTemplatesHelpers.getTemplatePayload(
           `template-${getRandomString()}`,
           [getRandomString()],
           undefined,
           false
         );
-        await createTemplate(payload).set('x-elastic-internal-origin', 'xxx').expect(200);
+        const { status } = await svlTemplatesApi.createTemplate(payload, roleAuthc);
+        expect(status).to.eql(200);
       });
 
       it('should throw a 409 conflict when trying to create 2 templates with the same name', async () => {
         const templateName = `template-${getRandomString()}`;
-        const payload = getTemplatePayload(templateName, [getRandomString()], undefined, false);
+        const payload = svlTemplatesHelpers.getTemplatePayload(
+          templateName,
+          [getRandomString()],
+          undefined,
+          false
+        );
 
-        await createTemplate(payload).set('x-elastic-internal-origin', 'xxx');
+        await svlTemplatesApi.createTemplate(payload, roleAuthc);
 
-        await createTemplate(payload).set('x-elastic-internal-origin', 'xxx').expect(409);
+        const { status } = await svlTemplatesApi.createTemplate(payload, roleAuthc);
+
+        expect(status).to.eql(409);
       });
 
       it('should validate the request payload', async () => {
         const templateName = `template-${getRandomString()}`;
         // need to cast as any to avoid errors after deleting index patterns
-        const payload = getTemplatePayload(
+        const payload = svlTemplatesHelpers.getTemplatePayload(
           templateName,
           [getRandomString()],
           undefined,
@@ -168,7 +168,7 @@ export default function ({ getService }: FtrProviderContext) {
 
         delete payload.indexPatterns; // index patterns are required
 
-        const { body } = await createTemplate(payload).set('x-elastic-internal-origin', 'xxx');
+        const { body } = await svlTemplatesApi.createTemplate(payload, roleAuthc);
         expect(body.message).to.contain(
           '[request body.indexPatterns]: expected value of type [array] '
         );
@@ -176,7 +176,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should parse the ES error and return the cause', async () => {
         const templateName = `template-create-parse-es-error`;
-        const payload = getTemplatePayload(
+        const payload = svlTemplatesHelpers.getTemplatePayload(
           templateName,
           ['create-parse-es-error'],
           undefined,
@@ -191,9 +191,8 @@ export default function ({ getService }: FtrProviderContext) {
           },
         };
         payload.template!.mappings = { ...payload.template!.mappings, runtime };
-        const { body } = await createTemplate(payload)
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(400);
+        const { body, status } = await svlTemplatesApi.createTemplate(payload, roleAuthc);
+        expect(status).to.eql(400);
 
         expect(body.attributes).an('object');
         expect(body.attributes.error.reason).contain('template after composition is invalid');
@@ -205,30 +204,33 @@ export default function ({ getService }: FtrProviderContext) {
     describe('update', () => {
       it('should update an index template', async () => {
         const templateName = `template-${getRandomString()}`;
-        const indexTemplate = getTemplatePayload(
+        const indexTemplate = svlTemplatesHelpers.getTemplatePayload(
           templateName,
           [getRandomString()],
           undefined,
           false
         );
 
-        await createTemplate(indexTemplate).set('x-elastic-internal-origin', 'xxx').expect(200);
+        const { status } = await svlTemplatesApi.createTemplate(indexTemplate, roleAuthc);
+        expect(status).to.eql(200);
 
-        let { body: catTemplateResponse } = await catTemplate(templateName);
+        let { body: catTemplateResponse } = await svlTemplatesHelpers.catTemplate(templateName);
 
         const { name, version } = indexTemplate;
-
         expect(
           catTemplateResponse.find(({ name: catTemplateName }) => catTemplateName === name)?.version
         ).to.equal(version?.toString());
 
         // Update template with new version
         const updatedVersion = 2;
-        await updateTemplate({ ...indexTemplate, version: updatedVersion }, templateName)
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
+        const { status: updateStatus } = await svlTemplatesApi.updateTemplate(
+          { ...indexTemplate, version: updatedVersion },
+          templateName,
+          roleAuthc
+        );
+        expect(updateStatus).to.eql(200);
 
-        ({ body: catTemplateResponse } = await catTemplate(templateName));
+        ({ body: catTemplateResponse } = await svlTemplatesHelpers.catTemplate(templateName));
 
         expect(
           catTemplateResponse.find(({ name: catTemplateName }) => catTemplateName === name)?.version
@@ -237,7 +239,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('should parse the ES error and return the cause', async () => {
         const templateName = `template-update-parse-es-error`;
-        const payload = getTemplatePayload(
+        const payload = svlTemplatesHelpers.getTemplatePayload(
           templateName,
           ['update-parse-es-error'],
           undefined,
@@ -255,13 +257,17 @@ export default function ({ getService }: FtrProviderContext) {
         // Add runtime field
         payload.template!.mappings = { ...payload.template!.mappings, runtime };
 
-        await createTemplate(payload).set('x-elastic-internal-origin', 'xxx').expect(200);
+        const { status: createStatus } = await svlTemplatesApi.createTemplate(payload, roleAuthc);
+        expect(createStatus).to.eql(200);
 
         // Update template with an error in the runtime field script
         payload.template!.mappings.runtime.myRuntimeField.script = 'emit("hello with error';
-        const { body } = await updateTemplate(payload, templateName)
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(400);
+        const { status: updateStatus, body } = await svlTemplatesApi.updateTemplate(
+          payload,
+          templateName,
+          roleAuthc
+        );
+        expect(updateStatus).to.eql(404);
 
         expect(body.attributes).an('object');
         // one of the item of the cause array should point to our script
@@ -272,35 +278,39 @@ export default function ({ getService }: FtrProviderContext) {
     describe('delete', () => {
       it('should delete an index template', async () => {
         const templateName = `template-${getRandomString()}`;
-        const payload = getTemplatePayload(templateName, [getRandomString()], undefined, false);
+        const payload = svlTemplatesHelpers.getTemplatePayload(
+          templateName,
+          [getRandomString()],
+          undefined,
+          false
+        );
 
-        const { status: createStatus, body: createBody } = await createTemplate(payload).set(
-          'x-elastic-internal-origin',
-          'xxx'
+        const { status: createStatus, body: createBody } = await svlTemplatesApi.createTemplate(
+          payload,
+          roleAuthc
         );
-        if (createStatus !== 200) {
+        if (createStatus !== 200)
           throw new Error(`Error creating template: ${createStatus} ${createBody.message}`);
-        }
 
-        let { body: catTemplateResponse } = await catTemplate(templateName);
+        const { body: catTemplateResponse } = await svlTemplatesHelpers.catTemplate(templateName);
 
         expect(
           catTemplateResponse.find((template) => template.name === payload.name)?.name
         ).to.equal(templateName);
 
-        const { status: deleteStatus, body: deleteBody } = await deleteTemplates([
-          { name: templateName },
-        ]).set('x-elastic-internal-origin', 'xxx');
-        if (deleteStatus !== 200) {
-          throw new Error(`Error deleting template: ${deleteBody.message}`);
-        }
+        const { status: deleteStatus, body: deleteBody } = await svlTemplatesApi.deleteTemplates(
+          [{ name: templateName }],
+          roleAuthc
+        );
+
+        if (deleteStatus !== 200) throw new Error(`Error deleting template: ${deleteBody.message}`);
 
         expect(deleteBody.errors).to.be.empty();
         expect(deleteBody.templatesDeleted[0]).to.equal(templateName);
 
-        ({ body: catTemplateResponse } = await catTemplate(templateName));
+        const { body: catTemplateResponse2 } = await svlTemplatesHelpers.catTemplate(templateName);
 
-        expect(catTemplateResponse.find((template) => template.name === payload.name)).to.equal(
+        expect(catTemplateResponse2.find((template) => template.name === payload.name)).to.equal(
           undefined
         );
       });
@@ -308,11 +318,10 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('simulate', () => {
       it('should simulate an index template', async () => {
-        const payload = getSerializedTemplate([getRandomString()], false);
+        const payload = svlTemplatesHelpers.getSerializedTemplate([getRandomString()], false);
 
-        const { body } = await simulateTemplate(payload)
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
+        const { status, body } = await svlTemplatesApi.simulateTemplate(payload, roleAuthc);
+        expect(status).to.eql(200);
         expect(body.template).to.be.ok();
       });
     });
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/indices.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/indices.ts
index 70de83c949cf5..6f279ac0838ff 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/indices.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/indices.ts
@@ -6,36 +6,32 @@
  */
 
 import expect from '@kbn/expect';
+import { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const INTERNAL_API_BASE_PATH = '/internal/index_management';
-const expectedKeys = ['aliases', 'hidden', 'isFrozen', 'primary', 'replica', 'name'].sort();
 
 export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
   const es = getService('es');
   const log = getService('log');
-  const indexManagementService = getService('indexManagement');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const svlIndicesApi = getService('svlIndicesApi');
+  const svlIndicesHelpers = getService('svlIndicesHelpers');
+
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
 
   describe('Indices', function () {
     let indexName: string;
-    let reload: typeof indexManagementService['indices']['api']['reload'];
-    let list: typeof indexManagementService['indices']['api']['list'];
-    let deleteIndex: typeof indexManagementService['indices']['api']['deleteIndex'];
-    let createIndex: typeof indexManagementService['indices']['helpers']['createIndex'];
-    let deleteAllIndices: typeof indexManagementService['indices']['helpers']['deleteAllIndices'];
-    let catIndex: typeof indexManagementService['indices']['helpers']['catIndex'];
 
     before(async () => {
-      ({
-        indices: {
-          api: { reload, list, deleteIndex },
-          helpers: { createIndex, deleteAllIndices, catIndex },
-        },
-      } = indexManagementService);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalReqHeader = svlCommonApi.getInternalRequestHeader();
       log.debug(`Creating index: '${indexName}'`);
       try {
-        indexName = await createIndex();
+        indexName = await svlIndicesHelpers.createIndex();
       } catch (err) {
         log.debug('[Setup error] Error creating index');
         throw err;
@@ -45,48 +41,50 @@ export default function ({ getService }: FtrProviderContext) {
     after(async () => {
       // Cleanup index created for testing purposes
       try {
-        await deleteAllIndices();
+        await svlIndicesHelpers.deleteAllIndices();
       } catch (err) {
         log.debug('[Cleanup error] Error deleting index');
         throw err;
       }
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     describe('list', () => {
       it('should list all the indices with the expected properties', async function () {
         // Create an index that we can assert against
-        await createIndex('test_index');
+        await svlIndicesHelpers.createIndex('test_index');
 
         // Verify indices request
-        const { body: indices } = await list().set('x-elastic-internal-origin', 'xxx').expect(200);
+        const { status, body: indices } = await svlIndicesApi.list(roleAuthc);
+        expect(status).to.eql(200);
 
         // Find the "test_index" created to verify expected keys
         const indexCreated = indices.find((index: { name: string }) => index.name === 'test_index');
 
         const sortedReceivedKeys = Object.keys(indexCreated).sort();
 
-        expect(sortedReceivedKeys).to.eql(expectedKeys);
+        expect(sortedReceivedKeys).to.eql(['aliases', 'hidden', 'isFrozen', 'name']);
       });
     });
 
     describe('get index', () => {
       it('returns index details for the specified index name', async () => {
-        const { body: index } = await supertest
+        const { body: index } = await supertestWithoutAuth
           .get(`${INTERNAL_API_BASE_PATH}/indices/${indexName}`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .expect(200);
 
         expect(index).to.be.ok();
 
-        expect(Object.keys(index).sort()).to.eql(expectedKeys);
+        expect(Object.keys(index).sort()).to.eql(['aliases', 'hidden', 'isFrozen', 'name']);
       });
 
       it('throws 404 for a non-existent index', async () => {
-        await supertest
+        await supertestWithoutAuth
           .get(`${INTERNAL_API_BASE_PATH}/indices/non_existent`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .expect(404);
       });
     });
@@ -106,31 +104,31 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('can create a new index', async () => {
-        await supertest
+        await supertestWithoutAuth
           .put(`${INTERNAL_API_BASE_PATH}/indices/create`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .send({
             indexName: createIndexName,
           })
           .expect(200);
 
-        const { body: index } = await supertest
+        const { body: index } = await supertestWithoutAuth
           .get(`${INTERNAL_API_BASE_PATH}/indices/${createIndexName}`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .expect(200);
 
         expect(index).to.be.ok();
 
-        expect(Object.keys(index).sort()).to.eql(expectedKeys);
+        expect(Object.keys(index).sort()).to.eql(['aliases', 'hidden', 'isFrozen', 'name']);
       });
 
       it('fails to re-create the same index', async () => {
-        await supertest
+        await supertestWithoutAuth
           .put(`${INTERNAL_API_BASE_PATH}/indices/create`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
+          .set(internalReqHeader)
+          .set(roleAuthc.apiKeyHeader)
           .send({
             indexName: createIndexName,
           })
@@ -141,20 +139,21 @@ export default function ({ getService }: FtrProviderContext) {
     describe('reload', function () {
       it('should list all the indices with the expected properties', async function () {
         // create an index to assert against, otherwise the test is flaky
-        await createIndex('reload-test-index');
-        const { body } = await reload().set('x-elastic-internal-origin', 'xxx').expect(200);
+        await svlIndicesHelpers.createIndex('reload-test-index');
+        const { status, body } = await svlIndicesApi.reload(roleAuthc);
+        svlCommonApi.assertResponseStatusCode(200, status, body);
 
         const indexCreated = body.find(
           (index: { name: string }) => index.name === 'reload-test-index'
         );
         const sortedReceivedKeys = Object.keys(indexCreated).sort();
-        expect(sortedReceivedKeys).to.eql(expectedKeys);
+        expect(sortedReceivedKeys).to.eql(['aliases', 'hidden', 'isFrozen', 'name']);
         expect(body.length > 1).to.be(true); // to contrast it with the next test
       });
 
       it('should allow reloading only certain indices', async () => {
-        const index = await createIndex();
-        const { body } = await reload([index]).set('x-elastic-internal-origin', 'xxx');
+        const index = await svlIndicesHelpers.createIndex();
+        const { body } = await svlIndicesApi.reload(roleAuthc, [index]);
 
         expect(body.length === 1).to.be(true);
         expect(body[0].name).to.be(index);
@@ -163,19 +162,21 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('delete indices', () => {
       it('should delete an index', async () => {
-        const index = await createIndex();
+        const index = await svlIndicesHelpers.createIndex();
 
-        const { body: indices1 } = await catIndex(undefined, 'i');
+        const { body: indices1 } = await svlIndicesHelpers.catIndex(undefined, 'i');
         expect(indices1.map((indexItem) => indexItem.i)).to.contain(index);
 
-        await deleteIndex(index).set('x-elastic-internal-origin', 'xxx').expect(200);
+        const { status } = await svlIndicesApi.deleteIndex(roleAuthc, index);
+        expect(status).to.eql(200);
 
-        const { body: indices2 } = await catIndex(undefined, 'i');
+        const { body: indices2 } = await svlIndicesHelpers.catIndex(undefined, 'i');
         expect(indices2.map((indexItem) => indexItem.i)).not.to.contain(index);
       });
 
       it('should require index or indices to be provided', async () => {
-        const { body } = await deleteIndex().set('x-elastic-internal-origin', 'xxx').expect(400);
+        const { status, body } = await svlIndicesApi.deleteIndex(roleAuthc);
+        expect(status).to.eql(400);
         expect(body.message).to.contain('expected value of type [string]');
       });
     });
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/inference_endpoints.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/inference_endpoints.ts
index 87b760d84540c..1ed61be9abac9 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/inference_endpoints.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/inference_endpoints.ts
@@ -6,60 +6,72 @@
  */
 
 import expect from '@kbn/expect';
+import { InferenceAPIConfigResponse } from '@kbn/ml-trained-models-utils';
+import { InternalRequestHeader, RoleCredentials } from '../../../../shared/services';
 import { FtrProviderContext } from '../../../ftr_provider_context';
 
 const API_BASE_PATH = '/api/index_management';
 
 export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
   const log = getService('log');
   const ml = getService('ml');
   const inferenceId = 'my-elser-model';
   const taskType = 'sparse_embedding';
   const service = 'elser';
 
-  // FLAKY: https://github.com/elastic/kibana/issues/185216
-  describe.skip('Inference endpoints', function () {
-    // test adds new trained model '.elser_model_2_linux-x86_64', but does not clean it. Follow up tests are affected
-    this.tags(['failsOnMKI']);
+  const modelId = '.elser_model_2';
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  let roleAuthc: RoleCredentials;
+  let internalReqHeader: InternalRequestHeader;
+
+  describe('Inference endpoints', function () {
     before(async () => {
-      log.debug(`Creating inference endpoint`);
-      try {
-        await ml.api.createInferenceEndpoint(inferenceId, taskType, {
-          service,
-          service_settings: {
-            num_allocations: 1,
-            num_threads: 1,
-          },
-        });
-      } catch (err) {
-        log.debug('[Setup error] Error creating inference endpoint');
-        throw err;
-      }
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalReqHeader = svlCommonApi.getInternalRequestHeader();
     });
-
     after(async () => {
-      // Cleanup inference endpoints created for testing purposes
       try {
-        log.debug(`Deleting inference endpoint`);
-        await ml.api.deleteInferenceEndpoint(inferenceId, taskType);
+        log.debug(`Deleting underlying trained model`);
+        await ml.api.deleteTrainedModelES(modelId);
+        await ml.testResources.cleanMLSavedObjects();
       } catch (err) {
-        log.debug('[Cleanup error] Error deleting inference endpoint');
+        log.debug('[Cleanup error] Error deleting trained model and saved ml objects');
         throw err;
       }
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
-    describe('get inference endpoints', () => {
-      it('returns the existing inference endpoints', async () => {
-        const { body: inferenceEndpoints } = await supertest
-          .get(`${API_BASE_PATH}/inference/all`)
-          .set('kbn-xsrf', 'xxx')
-          .set('x-elastic-internal-origin', 'xxx')
-          .expect(200);
-
-        expect(inferenceEndpoints).to.be.ok();
-        expect(inferenceEndpoints[0].model_id).to.eql(inferenceId);
+    it('create inference endpoint', async () => {
+      log.debug(`create inference endpoint`);
+      await ml.api.createInferenceEndpoint(inferenceId, taskType, {
+        service,
+        service_settings: {
+          num_allocations: 1,
+          num_threads: 1,
+          model_id: modelId,
+        },
       });
     });
+    it('get all inference endpoints and confirm inference endpoint exist', async () => {
+      const { body: inferenceEndpoints } = await supertestWithoutAuth
+        .get(`${API_BASE_PATH}/inference/all`)
+        .set(internalReqHeader)
+        .set(roleAuthc.apiKeyHeader)
+        .expect(200);
+
+      expect(inferenceEndpoints).to.be.ok();
+      expect(
+        inferenceEndpoints.some(
+          (endpoint: InferenceAPIConfigResponse) => endpoint.model_id === inferenceId
+        )
+      ).to.be(true);
+    });
+    it('can delete inference endpoint', async () => {
+      log.debug(`Deleting inference endpoint`);
+      await ml.api.deleteInferenceEndpoint(inferenceId, taskType);
+      log.debug('> Inference endpoint deleted');
+    });
   });
 }
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/mappings.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/mappings.ts
index eb28c77fc4409..f3eb908babbb3 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/mappings.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/mappings.ts
@@ -8,16 +8,18 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
 
 export default function ({ getService }: FtrProviderContext) {
   const log = getService('log');
-  const indexManagementService = getService('indexManagement');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  let roleAuthc: RoleCredentials;
+  const svlMappingsApi = getService('svlMappingsApi');
+  const svlIndicesHelpers = getService('svlIndicesHelpers');
 
   describe('mappings', () => {
     let indexName: string;
-    let getMapping: typeof indexManagementService['mappings']['api']['getMapping'];
-    let createIndex: typeof indexManagementService['indices']['helpers']['createIndex'];
-    let deleteAllIndices: typeof indexManagementService['indices']['helpers']['deleteAllIndices'];
 
     const mappings = {
       properties: {
@@ -28,18 +30,10 @@ export default function ({ getService }: FtrProviderContext) {
     };
 
     before(async () => {
-      ({
-        indices: {
-          helpers: { createIndex, deleteAllIndices },
-        },
-        mappings: {
-          api: { getMapping },
-        },
-      } = indexManagementService);
-
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
       log.debug('Creating index');
       try {
-        indexName = await createIndex(undefined, mappings);
+        indexName = await svlIndicesHelpers.createIndex(undefined, mappings);
       } catch (err) {
         log.debug('[Setup error] Error creating index');
         throw err;
@@ -48,15 +42,17 @@ export default function ({ getService }: FtrProviderContext) {
 
     after(async () => {
       try {
-        await deleteAllIndices();
+        await svlIndicesHelpers.deleteAllIndices();
       } catch (err) {
         log.debug('[Cleanup error] Error deleting index');
         throw err;
       }
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
     });
 
     it('should get the index mappings', async () => {
-      const { body } = await getMapping(indexName).expect(200);
+      const { body, status } = await svlMappingsApi.getMapping(indexName, roleAuthc);
+      svlCommonApi.assertResponseStatusCode(200, status, body);
 
       expect(body.mappings).to.eql(mappings);
     });
diff --git a/x-pack/test_serverless/api_integration/test_suites/common/index_management/settings.ts b/x-pack/test_serverless/api_integration/test_suites/common/index_management/settings.ts
index d5cd93060737c..733104d33b6a4 100644
--- a/x-pack/test_serverless/api_integration/test_suites/common/index_management/settings.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/common/index_management/settings.ts
@@ -8,33 +8,31 @@
 import expect from '@kbn/expect';
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
+import { RoleCredentials } from '../../../../shared/services';
 
 export default function ({ getService }: FtrProviderContext) {
-  const indexManagementService = getService('indexManagement');
-
-  describe('settings', () => {
-    let getIndexSettings: typeof indexManagementService['settings']['api']['getIndexSettings'];
-    let updateIndexSettings: typeof indexManagementService['settings']['api']['updateIndexSettings'];
-    let createIndex: typeof indexManagementService['indices']['helpers']['createIndex'];
-    let deleteAllIndices: typeof indexManagementService['indices']['helpers']['deleteAllIndices'];
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const svlSettingsApi = getService('svlSettingsApi');
+  const svlIndicesHelpers = getService('svlIndicesHelpers');
+  let roleAuthc: RoleCredentials;
 
+  // see details: https://github.com/elastic/kibana/issues/187369
+  describe.skip('settings', function () {
     before(async () => {
-      ({
-        settings: {
-          api: { getIndexSettings, updateIndexSettings },
-        },
-        indices: {
-          helpers: { createIndex, deleteAllIndices },
-        },
-      } = indexManagementService);
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
     });
 
-    after(async () => await deleteAllIndices());
+    after(async () => {
+      await svlIndicesHelpers.deleteAllIndices();
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+    });
 
     it('should fetch an index settings', async () => {
-      const index = await createIndex();
+      const index = await svlIndicesHelpers.createIndex();
 
-      const { body } = await getIndexSettings(index).expect(200);
+      const { status, body } = await svlSettingsApi.getIndexSettings(index, roleAuthc);
+      svlCommonApi.assertResponseStatusCode(200, status, body);
 
       // Verify we fetch the corret index settings
       expect(body.settings.index.provided_name).to.be(index);
@@ -96,7 +94,7 @@ export default function ({ getService }: FtrProviderContext) {
       // Make sure none of the settings have been removed from ES API
       expectedSettings.forEach((setting) => {
         try {
-          expect(body.defaults.index.hasOwnProperty(setting)).to.be(true);
+          expect(body.defaults.index.hasOwnProperty(setting)).to.eql(true);
         } catch {
           throw new Error(`Expected setting "${setting}" not found.`);
         }
@@ -104,9 +102,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     it('should update an index settings', async () => {
-      const index = await createIndex();
+      const index = await svlIndicesHelpers.createIndex();
 
-      const { body: body1 } = await getIndexSettings(index);
+      const { body: body1 } = await svlSettingsApi.getIndexSettings(index, roleAuthc);
       expect(body1.settings.index.number_of_replicas).to.be('1');
 
       const settings = {
@@ -114,9 +112,9 @@ export default function ({ getService }: FtrProviderContext) {
           number_of_replicas: 2,
         },
       };
-      await updateIndexSettings(index, settings);
+      await svlSettingsApi.updateIndexSettings(index, settings, roleAuthc);
 
-      const { body: body2 } = await getIndexSettings(index);
+      const { body: body2 } = await svlSettingsApi.getIndexSettings(index, roleAuthc);
       expect(body2.settings.index.number_of_replicas).to.be('2');
     });
   });
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/index.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/index.ts
index 460f4ac43bb43..f3bc56e16a5ae 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/index.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/index.ts
@@ -17,6 +17,7 @@ export default function ({ loadTestFile }: FtrProviderContext) {
     loadTestFile(require.resolve('./benchmark/v2'));
     loadTestFile(require.resolve('./find_csp_benchmark_rule'));
     loadTestFile(require.resolve('./telemetry'));
+    loadTestFile(require.resolve('./serverless_metering/cloud_security_metering'));
 
     // TODO: migrate status_unprivileged tests from stateful, if it feasible in serverless with the new security model
     // loadTestFile(require.resolve('./status/status_unprivileged'));
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts
new file mode 100644
index 0000000000000..78f7ae579d318
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/cloud_security_metering.ts
@@ -0,0 +1,363 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import {
+  LATEST_FINDINGS_INDEX_DEFAULT_NS,
+  LATEST_VULNERABILITIES_INDEX_DEFAULT_NS,
+} from '@kbn/cloud-security-posture-plugin/common/constants';
+import * as http from 'http';
+import { RoleCredentials } from '../../../../../shared/services';
+import { getMockFindings, getMockDefendForContainersHeartbeats } from './mock_data'; // eslint-disable-line @kbn/imports/no_boundary_crossing
+import type { FtrProviderContext } from '../../../../ftr_provider_context';
+import {
+  deleteIndex,
+  addIndex,
+  createPackagePolicy,
+  createCloudDefendPackagePolicy,
+} from '../../../../../../test/api_integration/apis/cloud_security_posture/helper'; // eslint-disable-line @kbn/imports/no_boundary_crossing
+import { UsageRecord, getInterceptedRequestPayload, setupMockServer } from './mock_usage_server'; // eslint-disable-line @kbn/imports/no_boundary_crossing
+
+const CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS = 'metrics-cloud_defend.heartbeat-default';
+
+export default function (providerContext: FtrProviderContext) {
+  const mockUsageApiApp = setupMockServer();
+  const { getService } = providerContext;
+  const retry = getService('retry');
+  const kibanaServer = getService('kibanaServer');
+  const esArchiver = getService('esArchiver');
+  const es = getService('es');
+  const svlCommonApi = getService('svlCommonApi');
+  const svlUserManager = getService('svlUserManager');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  /*
+  This test aims to intercept the usage API request sent by the metering background task manager.
+  The task manager is running by default in security serverless project in the background and sending usage API requests to the usage API.
+   This test mocks the usage API server and intercepts the usage API request sent by the metering background task manager.
+  */
+  describe('Intercept the usage API request sent by the metering background task manager', function () {
+    this.tags(['skipMKI']);
+
+    let mockUsageApiServer: http.Server;
+    let agentPolicyId: string;
+    let roleAuthc: RoleCredentials;
+    let internalRequestHeader: { 'x-elastic-internal-origin': string; 'kbn-xsrf': string };
+    before(async () => {
+      mockUsageApiServer = mockUsageApiApp.listen(8081); // Start the usage api mock server on port 8081
+    });
+
+    beforeEach(async () => {
+      roleAuthc = await svlUserManager.createApiKeyForRole('admin');
+      internalRequestHeader = svlCommonApi.getInternalRequestHeader();
+
+      await kibanaServer.savedObjects.cleanStandardList();
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+
+      const { body: agentPolicyResponse } = await supertestWithoutAuth
+        .post(`/api/fleet/agent_policies`)
+        .set(internalRequestHeader)
+        .set(roleAuthc.apiKeyHeader)
+        .send({
+          name: 'Test policy',
+          namespace: 'default',
+        });
+
+      agentPolicyId = agentPolicyResponse.item.id;
+
+      await deleteIndex(es, [
+        LATEST_FINDINGS_INDEX_DEFAULT_NS,
+        LATEST_VULNERABILITIES_INDEX_DEFAULT_NS,
+        CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS,
+      ]);
+    });
+
+    afterEach(async () => {
+      await deleteIndex(es, [
+        LATEST_FINDINGS_INDEX_DEFAULT_NS,
+        LATEST_VULNERABILITIES_INDEX_DEFAULT_NS,
+      ]);
+      await kibanaServer.savedObjects.cleanStandardList();
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+      await deleteIndex(es, [
+        LATEST_FINDINGS_INDEX_DEFAULT_NS,
+        LATEST_VULNERABILITIES_INDEX_DEFAULT_NS,
+        CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS,
+      ]);
+    });
+    after(async () => {
+      await svlUserManager.invalidateApiKeyForRole(roleAuthc);
+      mockUsageApiServer.close();
+    });
+
+    it('Should intercept usage API request for CSPM', async () => {
+      await createPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        'cspm',
+        'cloudbeat/cis_aws',
+        'aws',
+        'cspm',
+        'CSPM-1',
+        roleAuthc,
+        internalRequestHeader
+      );
+      const billableFindings = getMockFindings({
+        postureType: 'cspm',
+        isBillableAsset: true,
+        numberOfFindings: 5,
+      });
+
+      const notBillableFindings = getMockFindings({
+        postureType: 'cspm',
+        isBillableAsset: false,
+        numberOfFindings: 10,
+      });
+
+      await addIndex(
+        es,
+        [...billableFindings, ...notBillableFindings],
+        LATEST_FINDINGS_INDEX_DEFAULT_NS
+      );
+
+      let interceptedRequestBody: UsageRecord[] = [];
+      await retry.try(async () => {
+        interceptedRequestBody = getInterceptedRequestPayload();
+        expect(interceptedRequestBody.length).to.greaterThan(0);
+        if (interceptedRequestBody.length > 0) {
+          const usageSubTypes = interceptedRequestBody.map((record) => record.usage.sub_type);
+          expect(usageSubTypes).to.contain('cspm');
+        }
+      });
+
+      expect(interceptedRequestBody[0].usage.type).to.be('cloud_security');
+      expect(interceptedRequestBody[0].usage.quantity).to.be(billableFindings.length);
+    });
+
+    it('Should intercept usage API request for KSPM', async () => {
+      await createPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        'kspm',
+        'cloudbeat/cis_k8s',
+        'vanilla',
+        'kspm',
+        'KSPM-1',
+        roleAuthc,
+        internalRequestHeader
+      );
+      const billableFindings = getMockFindings({
+        postureType: 'kspm',
+        isBillableAsset: true,
+        numberOfFindings: 3,
+      });
+
+      const notBillableFindings = getMockFindings({
+        postureType: 'kspm',
+        isBillableAsset: false,
+        numberOfFindings: 11,
+      });
+
+      await addIndex(
+        es,
+        [...billableFindings, ...notBillableFindings],
+        LATEST_FINDINGS_INDEX_DEFAULT_NS
+      );
+
+      let interceptedRequestBody: UsageRecord[] = [];
+
+      await retry.try(async () => {
+        interceptedRequestBody = getInterceptedRequestPayload();
+        expect(interceptedRequestBody.length).to.greaterThan(0);
+        if (interceptedRequestBody.length > 0) {
+          const usageSubTypes = interceptedRequestBody.map((record) => record.usage.sub_type);
+          expect(usageSubTypes).to.contain('kspm');
+        }
+      });
+
+      expect(interceptedRequestBody[0].usage.type).to.be('cloud_security');
+      expect(interceptedRequestBody[0].usage.quantity).to.be(billableFindings.length);
+    });
+
+    it('Should intercept usage API request for CNVM', async () => {
+      await createPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        'vuln_mgmt',
+        'cloudbeat/vuln_mgmt_aws',
+        'aws',
+        'vuln_mgmt',
+        'CNVM-1',
+        roleAuthc,
+        internalRequestHeader
+      );
+
+      const billableFindings = getMockFindings({
+        postureType: 'cnvm',
+        numberOfFindings: 2,
+      });
+
+      await addIndex(es, billableFindings, LATEST_VULNERABILITIES_INDEX_DEFAULT_NS);
+
+      let interceptedRequestBody: UsageRecord[] = [];
+
+      await retry.try(async () => {
+        interceptedRequestBody = getInterceptedRequestPayload();
+        expect(interceptedRequestBody.length).to.greaterThan(0);
+        if (interceptedRequestBody.length > 0) {
+          const usageSubTypes = interceptedRequestBody.map((record) => record.usage.sub_type);
+          expect(usageSubTypes).to.contain('cnvm');
+        }
+      });
+
+      expect(interceptedRequestBody[0].usage.type).to.be('cloud_security');
+      expect(interceptedRequestBody[0].usage.quantity).to.be(billableFindings.length);
+    });
+
+    it('Should intercept usage API request for Defend for Containers', async () => {
+      await createCloudDefendPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        roleAuthc,
+        internalRequestHeader
+      );
+
+      const blockActionEnabledHeartbeats = getMockDefendForContainersHeartbeats({
+        isBlockActionEnables: true,
+        numberOfHearbeats: 2,
+      });
+
+      const blockActionDisabledHeartbeats = getMockDefendForContainersHeartbeats({
+        isBlockActionEnables: false,
+        numberOfHearbeats: 2,
+      });
+      await addIndex(
+        es,
+        [...blockActionEnabledHeartbeats, ...blockActionDisabledHeartbeats],
+        CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS
+      );
+
+      let interceptedRequestBody: UsageRecord[] = [];
+
+      await retry.try(async () => {
+        interceptedRequestBody = getInterceptedRequestPayload();
+        expect(interceptedRequestBody.length).to.greaterThan(0);
+        if (interceptedRequestBody.length > 0) {
+          const usageSubTypes = interceptedRequestBody.map((record) => record.usage.sub_type);
+          expect(usageSubTypes).to.contain('cloud_defend');
+        }
+      });
+
+      expect(interceptedRequestBody.length).to.be(blockActionEnabledHeartbeats.length);
+      expect(interceptedRequestBody[0].usage.type).to.be('cloud_security');
+    });
+
+    it('Should intercept usage API request with all integrations usage records', async () => {
+      // Create one package policy - it takes care forCSPM, KSMP and CNVM
+      await createPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        'cspm',
+        'cloudbeat/cis_aws',
+        'aws',
+        'cspm',
+        'CSPM-1',
+        roleAuthc,
+        internalRequestHeader
+      );
+
+      // Create Defend for Containers package policy
+      await createCloudDefendPackagePolicy(
+        supertestWithoutAuth,
+        agentPolicyId,
+        roleAuthc,
+        internalRequestHeader
+      );
+      const billableFindingsCSPM = getMockFindings({
+        postureType: 'cspm',
+        isBillableAsset: true,
+        numberOfFindings: 5,
+      });
+
+      const notBillableFindingsCSPM = getMockFindings({
+        postureType: 'cspm',
+        isBillableAsset: false,
+        numberOfFindings: 10,
+      });
+
+      const billableFindingsKSPM = getMockFindings({
+        postureType: 'kspm',
+        isBillableAsset: true,
+        numberOfFindings: 3,
+      });
+
+      const billableFindingsCNVM = getMockFindings({
+        postureType: 'cnvm',
+        numberOfFindings: 2,
+      });
+
+      const notBillableFindingsKSPM = getMockFindings({
+        postureType: 'kspm',
+        isBillableAsset: false,
+        numberOfFindings: 11,
+      });
+
+      const blockActionEnabledHeartbeats = getMockDefendForContainersHeartbeats({
+        isBlockActionEnables: true,
+        numberOfHearbeats: 2,
+      });
+
+      const blockActionDisabledHeartbeats = getMockDefendForContainersHeartbeats({
+        isBlockActionEnables: false,
+        numberOfHearbeats: 2,
+      });
+
+      await Promise.all([
+        addIndex(
+          es,
+          [
+            ...billableFindingsCSPM,
+            ...notBillableFindingsCSPM,
+            ...billableFindingsKSPM,
+            ...notBillableFindingsKSPM,
+          ],
+          LATEST_FINDINGS_INDEX_DEFAULT_NS
+        ),
+        addIndex(es, [...billableFindingsCNVM], LATEST_VULNERABILITIES_INDEX_DEFAULT_NS),
+        addIndex(
+          es,
+          [...blockActionEnabledHeartbeats, ...blockActionDisabledHeartbeats],
+          CLOUD_DEFEND_HEARTBEAT_INDEX_DEFAULT_NS
+        ),
+      ]);
+
+      // Intercept and verify usage API request
+      let interceptedRequestBody: UsageRecord[] = [];
+
+      await retry.try(async () => {
+        interceptedRequestBody = getInterceptedRequestPayload();
+        const usageSubTypes = interceptedRequestBody.map((record) => record.usage.sub_type);
+
+        expect(usageSubTypes).to.contain('cspm');
+        expect(usageSubTypes).to.contain('kspm');
+        expect(usageSubTypes).to.contain('cnvm');
+        expect(usageSubTypes).to.contain('cloud_defend');
+      });
+
+      const totalUsageQuantity = interceptedRequestBody.reduce(
+        (acc, record) => acc + record.usage.quantity,
+        0
+      );
+      expect(totalUsageQuantity).to.be(
+        billableFindingsCSPM.length +
+          billableFindingsKSPM.length +
+          billableFindingsCNVM.length +
+          blockActionEnabledHeartbeats.length
+      );
+    });
+  });
+}
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts
new file mode 100644
index 0000000000000..2455c8e1762cc
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_data.ts
@@ -0,0 +1,110 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import Chance from 'chance';
+
+const chance = new Chance();
+
+// see https://github.com/elastic/security-team/issues/8970 for billable asset definition
+export const BILLABLE_ASSETS_CONFIG = {
+  cspm: [
+    // 'aws-ebs', we can't include EBS volumes until https://github.com/elastic/security-team/issues/9283 is resolved
+    // 'aws-ec2', we can't include EC2 instances until https://github.com/elastic/security-team/issues/9254 is resolved
+    'aws-s3',
+    'aws-rds',
+    'azure-disk',
+    'azure-document-db-database-account',
+    'azure-flexible-mysql-server-db',
+    'azure-flexible-postgresql-server-db',
+    'azure-mysql-server-db',
+    'azure-postgresql-server-db',
+    'azure-sql-server',
+    'azure-storage-account',
+    'azure-vm',
+    'gcp-bigquery-dataset',
+    'gcp-compute-disk',
+    'gcp-compute-instance',
+    'gcp-sqladmin-instance',
+    'gcp-storage-bucket',
+  ],
+  kspm: ['Node', 'node'],
+};
+export const getMockFindings = ({
+  postureType,
+  isBillableAsset,
+  numberOfFindings,
+}: {
+  postureType: string;
+  isBillableAsset?: boolean;
+  numberOfFindings: number;
+}) => {
+  return Array.from({ length: numberOfFindings }, () => mockFiniding(postureType, isBillableAsset));
+};
+
+const mockFiniding = (postureType: string, isBillableAsset?: boolean) => {
+  if (postureType === 'cspm') {
+    const randomAsset = isBillableAsset
+      ? chance.pickone(BILLABLE_ASSETS_CONFIG.cspm)
+      : 'not-billable-asset';
+    return {
+      resource: { id: chance.guid(), sub_type: randomAsset },
+      rule: {
+        benchmark: {
+          posture_type: 'cspm',
+        },
+      },
+    };
+  }
+  if (postureType === 'kspm') {
+    const randomAsset = isBillableAsset
+      ? chance.pickone(BILLABLE_ASSETS_CONFIG.kspm)
+      : 'not-billable-asset';
+
+    return {
+      resource: { id: chance.guid(), sub_type: randomAsset },
+      rule: {
+        benchmark: {
+          posture_type: 'kspm',
+        },
+      },
+      agent: { id: chance.guid() },
+    };
+  }
+  if (postureType === 'cnvm') {
+    return {
+      cloud: {
+        instance: {
+          id: chance.guid(),
+        },
+      },
+    };
+  }
+};
+
+export const getMockDefendForContainersHeartbeats = ({
+  isBlockActionEnables,
+  numberOfHearbeats,
+}: {
+  isBlockActionEnables: boolean;
+  numberOfHearbeats: number;
+}) => {
+  return Array.from({ length: numberOfHearbeats }, () =>
+    mockDefendForContainersHeartbeats(isBlockActionEnables)
+  );
+};
+const mockDefendForContainersHeartbeats = (isBlockActionEnables: boolean) => {
+  return {
+    agent: {
+      id: chance.guid(),
+    },
+    cloud_defend: {
+      block_action_enabled: isBlockActionEnables,
+    },
+    event: {
+      ingested: new Date().toISOString(),
+    },
+  };
+};
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_usage_server.ts b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_usage_server.ts
new file mode 100644
index 0000000000000..1ed5e8d7ff09e
--- /dev/null
+++ b/x-pack/test_serverless/api_integration/test_suites/security/cloud_security_posture/serverless_metering/mock_usage_server.ts
@@ -0,0 +1,62 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createServer } from '@mswjs/http-middleware';
+
+import { http, HttpResponse, StrictResponse } from 'msw';
+
+export const setupMockServer = () => {
+  const server = createServer(usageAPIHandler);
+
+  return server;
+};
+export interface UsageRecord {
+  id: string;
+  usage_timestamp: string;
+  creation_timestamp: string;
+  usage: UsageMetrics;
+  source: UsageSource;
+}
+
+export interface UsageMetrics {
+  type: string;
+  sub_type?: string;
+  quantity: number;
+  period_seconds?: number;
+  cause?: string;
+  metadata?: unknown;
+}
+
+export interface UsageSource {
+  id: string;
+  instance_group_id: string;
+  metadata?: UsageSourceMetadata;
+}
+
+export interface UsageSourceMetadata {
+  tier?: string;
+}
+
+interface UsageResponse {
+  response: UsageRecord[];
+}
+
+let interceptedRequestPayload: UsageRecord[] = [];
+
+const usageAPIHandler = http.post(
+  'api/v1/usage',
+  async ({ request }): Promise<StrictResponse<UsageResponse>> => {
+    const payload = (await request.clone().json()) as UsageRecord[];
+    interceptedRequestPayload = payload;
+
+    return HttpResponse.json({
+      response: payload,
+    });
+  }
+);
+
+export const getInterceptedRequestPayload = (): UsageRecord[] => interceptedRequestPayload;
diff --git a/x-pack/test_serverless/api_integration/test_suites/security/config.ts b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
index 4de07d59ea56a..b97ed38960561 100644
--- a/x-pack/test_serverless/api_integration/test_suites/security/config.ts
+++ b/x-pack/test_serverless/api_integration/test_suites/security/config.ts
@@ -23,5 +23,7 @@ export default createTestConfig({
     `--xpack.task_manager.unsafe.exclude_task_types=${JSON.stringify(['Fleet-Metrics-Task'])}`,
     // useful for testing (also enabled in MKI QA)
     '--coreApp.allowDynamicConfigOverrides=true',
+    `--xpack.securitySolutionServerless.cloudSecurityUsageReportingTaskInterval=5s`,
+    `--xpack.securitySolutionServerless.usageReportingApiUrl=http://localhost:8081/api/v1/usage`,
   ],
 });
diff --git a/x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts b/x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts
index eeb1b6de731f9..44bdd417330a3 100644
--- a/x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts
+++ b/x-pack/test_serverless/functional/page_objects/svl_search_homepage.ts
@@ -22,5 +22,47 @@ export function SvlSearchHomePageProvider({ getService }: FtrProviderContext) {
     async expectHomepageHeader() {
       await testSubjects.existOrFail('search-homepage-header', { timeout: 2000 });
     },
+    async expectConsoleLinkExists() {
+      await testSubjects.existOrFail('searchHomepageEmbeddedConsoleButton');
+    },
+    async clickConsoleLink() {
+      await testSubjects.click('searchHomepageEmbeddedConsoleButton');
+    },
+    async expectEndpointsLinkExists() {
+      await testSubjects.existOrFail('searchHomepageEndpointsHeaderActionEndpointsApiKeysButton');
+    },
+    async clickEndpointsLink() {
+      await testSubjects.click('searchHomepageEndpointsHeaderActionEndpointsApiKeysButton');
+    },
+    async expectConnectionDetailsFlyoutToBeOpen() {
+      await testSubjects.existOrFail('connectionDetailsModalTitle');
+    },
+    async closeConnectionDetailsFlyout() {
+      await testSubjects.existOrFail('euiFlyoutCloseButton');
+      await testSubjects.click('euiFlyoutCloseButton');
+    },
+    async expectEndpointsTabIsAvailable() {
+      await testSubjects.existOrFail('connectionDetailsTabBtn-endpoints');
+      await testSubjects.click('connectionDetailsTabBtn-endpoints');
+      await testSubjects.existOrFail('connectionDetailsEsUrl');
+      await testSubjects.existOrFail('connectionDetailsCloudIdSwitch');
+    },
+    async expectAPIKeyTabIsAvailable() {
+      await testSubjects.existOrFail('connectionDetailsTabBtn-apiKeys');
+      await testSubjects.click('connectionDetailsTabBtn-apiKeys');
+      await testSubjects.existOrFail('connectionDetailsApiKeyNameInput');
+      await testSubjects.existOrFail('connectionDetailsApiKeySubmitBtn');
+    },
+    async createApiKeyInFlyout(keyName: string) {
+      await testSubjects.existOrFail('connectionDetailsApiKeyNameInput');
+      await testSubjects.existOrFail('connectionDetailsApiKeySubmitBtn');
+      await testSubjects.setValue('connectionDetailsApiKeyNameInput', keyName);
+      await testSubjects.click('connectionDetailsApiKeySubmitBtn');
+      await testSubjects.existOrFail('connectionDetailsApiKeySuccessForm');
+      await testSubjects.existOrFail('connectionDetailsApiKeyValueRow');
+      expect(await testSubjects.getVisibleText('connectionDetailsApiKeySuccessForm')).contain(
+        keyName
+      );
+    },
   };
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts b/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
index 317835958b0a9..9ce2e79d8f586 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/context_awareness/_data_source_profile.ts
@@ -13,6 +13,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'timePicker', 'discover', 'unifiedFieldList']);
   const testSubjects = getService('testSubjects');
   const dataViews = getService('dataViews');
+  const dataGrid = getService('dataGrid');
 
   describe('data source profile', () => {
     describe('ES|QL mode', () => {
@@ -53,6 +54,40 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await logLevels[2].getVisibleText()).to.be('Info');
         });
       });
+
+      describe('doc viewer extension', () => {
+        it('should not render custom doc viewer view', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-* | sort @timestamp desc' },
+          });
+          await PageObjects.common.navigateToApp('discover', {
+            hash: `/?_a=${state}`,
+          });
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Result');
+        });
+
+        it('should render custom doc viewer view', async () => {
+          const state = kbnRison.encode({
+            dataSource: { type: 'esql' },
+            query: { esql: 'from my-example-logs | sort @timestamp desc' },
+          });
+          await PageObjects.common.navigateToApp('discover', {
+            hash: `/?_a=${state}`,
+          });
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Record #0');
+        });
+      });
     });
 
     describe('data view mode', () => {
@@ -83,6 +118,32 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           expect(await logLevels[2].getVisibleText()).to.be('Info');
         });
       });
+
+      describe('doc viewer extension', () => {
+        it('should not render custom doc viewer view', async () => {
+          await PageObjects.common.navigateToApp('discover');
+          await dataViews.switchTo('my-example-*');
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.missingOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be('Document');
+        });
+
+        it('should render custom doc viewer view', async () => {
+          await PageObjects.common.navigateToApp('discover');
+          await dataViews.switchTo('my-example-logs');
+          await PageObjects.discover.waitUntilSearchingHasFinished();
+          await dataGrid.clickRowToggle({ rowIndex: 0 });
+          await testSubjects.existOrFail('docViewerTab-doc_view_table');
+          await testSubjects.existOrFail('docViewerTab-doc_view_source');
+          await testSubjects.existOrFail('docViewerTab-doc_view_logs_overview');
+          expect(await testSubjects.getVisibleText('docViewerRowDetailsTitle')).to.be(
+            'Record #my-example-logs::XdQFDpABfGznVC1bCHLo::'
+          );
+        });
+      });
     });
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
index 600ce61167c74..561f8903ba94e 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/esql/_esql_view.ts
@@ -84,7 +84,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await testSubjects.existOrFail('discoverQueryHits');
         await testSubjects.existOrFail('discoverAlertsButton');
         await testSubjects.existOrFail('shareTopNavButton');
-        await testSubjects.existOrFail('dataGridColumnSortingButton');
+        await testSubjects.missingOrFail('dataGridColumnSortingButton');
         await testSubjects.existOrFail('docTableExpandToggleColumn');
         await testSubjects.existOrFail('fieldListFiltersFieldTypeFilterToggle');
         await testSubjects.click('field-@message-showDetails');
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group2/_data_grid_doc_table.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group2/_data_grid_doc_table.ts
index 5b66781ff2ba7..ddff169433ed6 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group2/_data_grid_doc_table.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group2/_data_grid_doc_table.ts
@@ -221,7 +221,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('add and remove columns', function () {
       const extraColumns = ['phpmemory', 'ip'];
-
+      const expectedFieldLength: Record<string, number> = {
+        phpmemory: 1,
+        ip: 4,
+      };
       afterEach(async function () {
         for (const column of extraColumns) {
           await PageObjects.unifiedFieldList.clickFieldListItemRemove(column);
@@ -233,6 +236,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         for (const column of extraColumns) {
           await PageObjects.unifiedFieldList.clearFieldSearchInput();
           await PageObjects.unifiedFieldList.findFieldByName(column);
+          await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+            expectedFieldLength[column]
+          );
           await PageObjects.unifiedFieldList.clickFieldListItemAdd(column);
           await PageObjects.header.waitUntilLoadingHasFinished();
           // test the header now
@@ -245,6 +251,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         for (const column of extraColumns) {
           await PageObjects.unifiedFieldList.clearFieldSearchInput();
           await PageObjects.unifiedFieldList.findFieldByName(column);
+          await PageObjects.unifiedFieldList.waitUntilFieldlistHasCountOfFields(
+            expectedFieldLength[column]
+          );
           await PageObjects.unifiedFieldList.clickFieldListItemAdd(column);
           await PageObjects.header.waitUntilLoadingHasFinished();
         }
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts b/x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts
index 8e9b33ffa1beb..5c8fd77347abd 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover/group6/_sidebar.ts
@@ -176,6 +176,23 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         );
       });
 
+      it('should be able to search with fuzzy search (1 typo)', async function () {
+        await PageObjects.unifiedFieldList.findFieldByName('rel4tedContent.art');
+
+        await retry.waitFor('updates', async () => {
+          return (
+            (await PageObjects.unifiedFieldList.getSidebarAriaDescription()) ===
+            '4 available fields. 0 meta fields.'
+          );
+        });
+
+        expect(
+          (await PageObjects.unifiedFieldList.getSidebarSectionFieldNames('available')).join(', ')
+        ).to.be(
+          'relatedContent.article:modified_time, relatedContent.article:published_time, relatedContent.article:section, relatedContent.article:tag'
+        );
+      });
+
       it('should ignore empty search', async function () {
         await PageObjects.unifiedFieldList.findFieldByName('   '); // only spaces
 
diff --git a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
index 22e64db2c4068..c0db1ecd0ff74 100644
--- a/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
+++ b/x-pack/test_serverless/functional/test_suites/common/discover_ml_uptime/discover/search_source_alert.ts
@@ -6,7 +6,6 @@
  */
 
 import expect from '@kbn/expect';
-import { INGEST_SAVED_OBJECT_INDEX } from '@kbn/fleet-plugin/common/constants';
 import { asyncForEach } from '@kbn/std';
 import { FtrProviderContext } from '../../../../ftr_provider_context';
 
@@ -149,12 +148,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   };
 
   const deleteIndexes = (indexes: string[]) => {
-    indexes.forEach((current) => {
-      es.transport.request({
-        path: `/${current}`,
-        method: 'DELETE',
-      });
-    });
+    return Promise.all(
+      indexes.map((current) =>
+        es.transport.request({
+          path: `/${current}`,
+          method: 'DELETE',
+        })
+      )
+    );
   };
 
   const createConnector = async (): Promise<string> => {
@@ -203,6 +204,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       return await testSubjects.exists('alertActionAccordion-0');
     });
 
+    await monacoEditor.waitCodeEditorReady('kibanaCodeEditor');
     await monacoEditor.setCodeEditorValue(`{
       "rule_id": "{{rule.id}}",
       "rule_name": "{{rule.name}}",
@@ -273,24 +275,31 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     // follow url provided by alert to see documents triggered the alert
     const baseUrl = deployment.getHostPort();
-    // TODO: In Serverless `link` is a full URL instead of just a path as in stateful
-    const fullLink = link.startsWith(baseUrl) ? link : baseUrl + link;
+    // In Serverless `link` is a full URL instead of just a path as in stateful
+    const fullLink = link.startsWith('http') ? link : baseUrl + link;
     await browser.navigateTo(fullLink);
     await PageObjects.discover.waitUntilSearchingHasFinished();
   };
 
   const openAlertRuleInManagement = async (ruleName: string) => {
-    await PageObjects.common.navigateToApp('management');
-    await PageObjects.header.waitUntilLoadingHasFinished();
-
-    // TODO: Navigation to Rule Management is different in Serverless
+    // Navigation to Rule Management is different in Serverless
     await PageObjects.common.navigateToApp('triggersActions');
     await PageObjects.header.waitUntilLoadingHasFinished();
 
-    const rulesList = await testSubjects.find('rulesList');
-    const alertRule = await rulesList.findByCssSelector(`[title="${ruleName}"]`);
-    await alertRule.click();
-    await PageObjects.header.waitUntilLoadingHasFinished();
+    let retries = 0;
+
+    await retry.try(async () => {
+      retries = retries + 1;
+      if (retries > 1) {
+        // It might take time for a rule to get created. Waiting for it.
+        await browser.refresh();
+        await PageObjects.header.waitUntilLoadingHasFinished();
+      }
+      const rulesList = await testSubjects.find('rulesList');
+      const alertRule = await rulesList.findByCssSelector(`[title="${ruleName}"]`);
+      await alertRule.click();
+      await PageObjects.header.waitUntilLoadingHasFinished();
+    });
   };
 
   const clickViewInApp = async (ruleName: string) => {
@@ -355,9 +364,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   };
 
   describe('Search source Alert', function () {
-    // fails on MKI, see https://github.com/elastic/kibana/issues/187069
-    this.tags(['failsOnMKI']);
-
     before(async () => {
       await security.testUser.setRoles(['discover_alert']);
       await PageObjects.svlCommonPage.loginAsAdmin();
@@ -373,20 +379,31 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       log.debug('create connector');
       connectorId = await createConnector();
-
-      // TODO: fetching connectors fails server side in Serverless with
-      // "index_not_found_exception: no such index [.kibana_ingest]"
-      if (!(await es.indices.exists({ index: INGEST_SAVED_OBJECT_INDEX }))) {
-        await es.indices.create({ index: INGEST_SAVED_OBJECT_INDEX });
-      }
     });
 
     after(async () => {
-      deleteIndexes([OUTPUT_DATA_VIEW, SOURCE_DATA_VIEW]);
-      const [{ id: adhocRuleId }] = await getAlertsByName(ADHOC_RULE_NAME);
-      await deleteAlerts([adhocRuleId]);
-      await deleteDataView(outputDataViewId);
-      await deleteConnector(connectorId);
+      // clean up what we can in case of failures in some tests which blocked the creation of the following objects
+      try {
+        await deleteIndexes([OUTPUT_DATA_VIEW, SOURCE_DATA_VIEW]);
+      } catch {
+        // continue
+      }
+      try {
+        const [{ id: adhocRuleId }] = await getAlertsByName(ADHOC_RULE_NAME);
+        await deleteAlerts([adhocRuleId]);
+      } catch {
+        // continue
+      }
+      try {
+        await deleteDataView(outputDataViewId);
+      } catch {
+        // continue
+      }
+      try {
+        await deleteConnector(connectorId);
+      } catch {
+        // continue
+      }
       await security.testUser.restoreDefaults();
       await kibanaServer.savedObjects.cleanStandardList();
     });
@@ -394,17 +411,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('should create an alert when there is no data view', async () => {
       await openManagementAlertFlyout();
 
-      // should not have data view selected by default
-      const dataViewSelector = await testSubjects.find('selectDataViewExpression');
-      // TODO: Serverless Security and Search have an existing data view by default
-      const dataViewSelectorText = await dataViewSelector.getVisibleText();
-      if (
-        !dataViewSelectorText.includes('.alerts-security') &&
-        !dataViewSelectorText.includes('default:all-data')
-      ) {
-        expect(await dataViewSelector.getVisibleText()).to.eql('DATA VIEW\nSelect a data view');
-      }
-
       log.debug('create data views');
       const sourceDataViewResponse = await createDataView(SOURCE_DATA_VIEW);
       const outputDataViewResponse = await createDataView(OUTPUT_DATA_VIEW);
@@ -423,10 +429,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await defineSearchSourceAlert(RULE_NAME);
       await testSubjects.click('selectDataViewExpression');
 
+      await testSubjects.existOrFail('indexPattern-switcher--input');
       await testSubjects.click('indexPattern-switcher--input');
       const input = await find.activeElement();
       // search-source-alert-output index does not have time field
       await input.type('search-source-alert-o*');
+      await testSubjects.existOrFail('explore-matching-indices-button');
       await testSubjects.click('explore-matching-indices-button');
 
       await retry.waitFor('selection to happen', async () => {
@@ -443,9 +451,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     it('should navigate to alert results via view in app link', async () => {
       await testSubjects.click('selectDataViewExpression');
+      await testSubjects.existOrFail('indexPattern-switcher--input');
       await testSubjects.click('indexPattern-switcher--input');
       if (await testSubjects.exists('clearSearchButton')) {
         await testSubjects.click('clearSearchButton');
+        await testSubjects.missingOrFail('clearSearchButton');
       }
       const dataViewsElem = await testSubjects.find('euiSelectableList');
       const sourceDataViewOption = await dataViewsElem.findByCssSelector(
@@ -453,7 +463,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       );
       await sourceDataViewOption.click();
 
+      await retry.waitFor('selection to happen', async () => {
+        const dataViewSelector = await testSubjects.find('selectDataViewExpression');
+        return (await dataViewSelector.getVisibleText()) === `DATA VIEW\n${SOURCE_DATA_VIEW}`;
+      });
+
       await testSubjects.click('saveRuleButton');
+      await retry.try(async () => {
+        await testSubjects.missingOrFail('saveRuleButton');
+      });
 
       await PageObjects.header.waitUntilLoadingHasFinished();
 
@@ -549,6 +567,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await openDiscoverAlertFlyout();
       await defineSearchSourceAlert('test-adhoc-alert');
       await testSubjects.click('saveRuleButton');
+      await retry.try(async () => {
+        await testSubjects.missingOrFail('saveRuleButton');
+      });
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       await openAlertResults(ADHOC_RULE_NAME);
@@ -610,10 +631,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       const newAlert = 'New Alert for checking its status';
       await createDataView('search-source*');
 
-      await PageObjects.common.navigateToApp('management');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-
-      // TODO: Navigation to Rule Management is different in Serverless
+      // Navigation to Rule Management is different in Serverless
       await PageObjects.common.navigateToApp('triggersActions');
       await PageObjects.header.waitUntilLoadingHasFinished();
 
diff --git a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
index 9d20aefcebd28..2751abf569746 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/dataset_quality_flyout.ts
@@ -155,17 +155,19 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       it('should shows the integration section for integrations', async () => {
         await PageObjects.datasetQuality.openDatasetFlyout(apacheAccessDatasetHumanName);
 
-        const integrationNameElements = await PageObjects.datasetQuality.getFlyoutElementsByText(
-          '[data-test-subj=datasetQualityFlyoutFieldValue]',
-          apacheIntegrationId
-        );
-
         await testSubjects.existOrFail(
           PageObjects.datasetQuality.testSubjectSelectors
             .datasetQualityFlyoutFieldsListIntegrationDetails
         );
 
-        expect(integrationNameElements.length).to.eql(1);
+        await retry.tryForTime(5000, async () => {
+          const integrationNameExists = await PageObjects.datasetQuality.doesTextExist(
+            PageObjects.datasetQuality.testSubjectSelectors
+              .datasetQualityFlyoutFieldsListIntegrationDetails,
+            apacheIntegrationId
+          );
+          expect(integrationNameExists).to.be(true);
+        });
 
         await PageObjects.datasetQuality.closeFlyout();
       });
diff --git a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/home.ts b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/home.ts
index 7deeeff7e9bc1..a1c285146e5e5 100644
--- a/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/home.ts
+++ b/x-pack/test_serverless/functional/test_suites/observability/dataset_quality/home.ts
@@ -49,6 +49,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('dataset quality table exists', async () => {
         await PageObjects.datasetQuality.navigateTo();
+        await PageObjects.datasetQuality.waitUntilTableLoaded();
         await testSubjects.existOrFail(
           PageObjects.datasetQuality.testSubjectSelectors.datasetQualityTable
         );
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts b/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
index f05b5975c90cb..c4b29fdfb443d 100644
--- a/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/config.feature_flags.ts
@@ -19,9 +19,11 @@ export default createTestConfig({
   suiteTags: { exclude: ['skipSvlSearch'] },
   // add feature flags
   kbnServerArgs: [
-    `--xpack.security.roleManagementEnabled=true`,
+    `--xpack.cloud.id='ES3_FTR_TESTS:ZmFrZS1kb21haW4uY2xkLmVsc3RjLmNvJGZha2Vwcm9qZWN0aWQuZXMkZmFrZXByb2plY3RpZC5rYg=='`,
+    `--xpack.cloud.serverless.project_id='fakeprojectid'`,
     `--xpack.cloud.base_url='https://cloud.elastic.co'`,
     `--xpack.cloud.organization_url='/account/members'`,
+    `--xpack.security.roleManagementEnabled=true`,
   ],
   // load tests in the index file
   testFiles: [require.resolve('./index.feature_flags.ts')],
diff --git a/x-pack/test_serverless/functional/test_suites/search/config.ts b/x-pack/test_serverless/functional/test_suites/search/config.ts
index c2171c532bf23..6853e75d987b8 100644
--- a/x-pack/test_serverless/functional/test_suites/search/config.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/config.ts
@@ -18,4 +18,8 @@ export default createTestConfig({
   // include settings from project controller
   // https://github.com/elastic/project-controller/blob/main/internal/project/esproject/config/elasticsearch.yml
   esServerArgs: [],
+  kbnServerArgs: [
+    `--xpack.cloud.id='ES3_FTR_TESTS:ZmFrZS1kb21haW4uY2xkLmVsc3RjLmNvJGZha2Vwcm9qZWN0aWQuZXMkZmFrZXByb2plY3RpZC5rYg=='`,
+    `--xpack.cloud.serverless.project_id='fakeprojectid'`,
+  ],
 });
diff --git a/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts b/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts
index 1f627921d1592..93af4de797cfa 100644
--- a/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/search_homepage.ts
@@ -36,22 +36,48 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     });
 
     it('has search homepage with Home sidenav', async () => {
-      pageObjects.svlSearchHomePage.expectToBeOnHomepage();
-      pageObjects.svlSearchHomePage.expectHomepageHeader();
+      await pageObjects.svlSearchHomePage.expectToBeOnHomepage();
+      await pageObjects.svlSearchHomePage.expectHomepageHeader();
       // Navigate to another page
       await pageObjects.svlCommonNavigation.sidenav.clickLink({
         deepLinkId: 'serverlessConnectors',
       });
-      pageObjects.svlSearchHomePage.expectToNotBeOnHomepage();
+      await pageObjects.svlSearchHomePage.expectToNotBeOnHomepage();
       // Click Home in Side nav
       await pageObjects.svlCommonNavigation.sidenav.clickLink({
         deepLinkId: 'searchHomepage',
       });
-      pageObjects.svlSearchHomePage.expectToBeOnHomepage();
+      await pageObjects.svlSearchHomePage.expectToBeOnHomepage();
     });
 
     it('has embedded dev console', async () => {
       await testHasEmbeddedConsole(pageObjects);
     });
+
+    it('has console quickstart link on page', async () => {
+      await pageObjects.svlSearchHomePage.expectConsoleLinkExists();
+      await pageObjects.svlCommonNavigation.devConsole.expectEmbeddedConsoleToBeClosed();
+      await pageObjects.svlSearchHomePage.clickConsoleLink();
+      await pageObjects.svlCommonNavigation.devConsole.expectEmbeddedConsoleToBeOpen();
+      await pageObjects.svlCommonNavigation.devConsole.clickEmbeddedConsoleControlBar();
+      await pageObjects.svlCommonNavigation.devConsole.expectEmbeddedConsoleToBeClosed();
+    });
+
+    it('has endpoints link and flyout', async () => {
+      await pageObjects.svlSearchHomePage.expectEndpointsLinkExists();
+      await pageObjects.svlSearchHomePage.clickEndpointsLink();
+      await pageObjects.svlSearchHomePage.expectConnectionDetailsFlyoutToBeOpen();
+      await pageObjects.svlSearchHomePage.expectEndpointsTabIsAvailable();
+      await pageObjects.svlSearchHomePage.closeConnectionDetailsFlyout();
+    });
+
+    it('can create an API key', async () => {
+      await pageObjects.svlSearchHomePage.expectEndpointsLinkExists();
+      await pageObjects.svlSearchHomePage.clickEndpointsLink();
+      await pageObjects.svlSearchHomePage.expectConnectionDetailsFlyoutToBeOpen();
+      await pageObjects.svlSearchHomePage.expectAPIKeyTabIsAvailable();
+      await pageObjects.svlSearchHomePage.createApiKeyInFlyout('ftr-test-key');
+      await pageObjects.svlSearchHomePage.closeConnectionDetailsFlyout();
+    });
   });
 }
diff --git a/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts b/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts
index 33e2e9883b38b..b600da8ae4343 100644
--- a/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts
+++ b/x-pack/test_serverless/functional/test_suites/search/search_playground/playground_overview.ts
@@ -12,7 +12,6 @@ import { RoleCredentials } from '../../../../shared/services';
 import { createOpenAIConnector } from './utils/create_openai_connector';
 import { createLlmProxy, LlmProxy } from './utils/create_llm_proxy';
 
-const indexName = 'basic_index';
 const esArchiveIndex = 'test/api_integration/fixtures/es_archiver/index_patterns/basic_index';
 
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
@@ -66,6 +65,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundHeaderComponentsToExist();
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundHeaderComponentsToDisabled();
         await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundStartChatPageComponentsToExist();
+        await pageObjects.searchPlayground.PlaygroundStartChatPage.expectPlaygroundStartChatPageIndexCalloutExists();
       });
 
       describe('with gen ai connectors', () => {
@@ -78,8 +78,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           await removeOpenAIConnector?.();
           await browser.refresh();
         });
-        it('hide gen ai panel', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectHideGenAIPanelConnector();
+        it('show success llm button', async () => {
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectShowSuccessLLMButton();
         });
       });
 
@@ -90,7 +90,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
         it('creates a connector successfully', async () => {
           await pageObjects.searchPlayground.PlaygroundStartChatPage.expectOpenConnectorPagePlayground();
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectHideGenAIPanelConnectorAfterCreatingConnector(
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectSuccessButtonAfterCreatingConnector(
             createConnector
           );
         });
@@ -102,17 +102,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       describe('without any indices', () => {
-        it('show no index callout', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectNoIndexCalloutExists();
-        });
-
         it('hide no index callout when index added', async () => {
           await createIndex();
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectSelectIndex(indexName);
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectOpenFlyoutAndSelectIndex();
         });
 
         after(async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.removeIndexFromComboBox();
           await esArchiver.unload(esArchiveIndex);
           await browser.refresh();
         });
@@ -125,14 +120,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           await browser.refresh();
         });
 
-        it('dropdown shows up', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectIndicesInDropdown();
-        });
-
-        it('can select index from dropdown and navigate to chat window', async () => {
-          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectToSelectIndicesAndStartButtonEnabled(
-            indexName
-          );
+        it('can select index from dropdown and load chat page', async () => {
+          await pageObjects.searchPlayground.PlaygroundStartChatPage.expectToSelectIndicesAndLoadChat();
         });
 
         after(async () => {
@@ -148,7 +137,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await createConnector();
         await createIndex();
         await browser.refresh();
-        await pageObjects.searchPlayground.PlaygroundChatPage.navigateToChatPage(indexName);
+        await pageObjects.searchPlayground.PlaygroundChatPage.navigateToChatPage();
       });
       it('loads successfully', async () => {
         await pageObjects.searchPlayground.PlaygroundChatPage.expectChatWindowLoaded();
diff --git a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts
index 9c263cf4c198e..844c2de320534 100644
--- a/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts
+++ b/x-pack/test_serverless/functional/test_suites/security/common_configs/config.group6.ts
@@ -15,9 +15,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     testFiles: [
       require.resolve('../../common/discover/embeddable'),
       require.resolve('../../common/discover/x_pack'),
-      // flaky for Security project, should be checked with Admin role permissions.
-      // https://github.com/elastic/kibana/issues/172365
-      // require.resolve('../../common/discover_ml_uptime/discover'),
+      require.resolve('../../common/discover_ml_uptime/discover'),
       require.resolve('../../common/context'),
       require.resolve('../../common/discover/esql'),
     ],
diff --git a/x-pack/test_serverless/tsconfig.json b/x-pack/test_serverless/tsconfig.json
index ebc11815da754..d5fb5a12f9b1d 100644
--- a/x-pack/test_serverless/tsconfig.json
+++ b/x-pack/test_serverless/tsconfig.json
@@ -75,7 +75,6 @@
     "@kbn/cloud-security-posture-plugin",
     "@kbn/reporting-plugin",
     "@kbn/management-settings-ids",
-    "@kbn/fleet-plugin",
     "@kbn/apm-synthtrace",
     "@kbn/apm-synthtrace-client",
     "@kbn/reporting-export-types-csv-common",
@@ -105,5 +104,6 @@
     "@kbn/config-schema",
     "@kbn/features-plugin",
     "@kbn/observability-ai-assistant-plugin",
+    "@kbn/ml-trained-models-utils",
   ]
 }
diff --git a/yarn.lock b/yarn.lock
index 17882dae4ca64..f922a093b906d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1723,19 +1723,18 @@
     "@elastic/transport" "^8.6.0"
     tslib "^2.4.0"
 
-"@elastic/ems-client@8.5.1":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-8.5.1.tgz#60c179e53ad81f5e26680e7e1c6cbffe4fb64aed"
-  integrity sha512-lc65i/cW6fGuRMt3pUte35sL8HxXM7TbYJwx1bHWcWn4aN3zv8i5RhPKFz+Wr/1ubfFOTrIoFYCP4h1uq2O/dQ==
+"@elastic/ems-client@8.5.3":
+  version "8.5.3"
+  resolved "https://registry.yarnpkg.com/@elastic/ems-client/-/ems-client-8.5.3.tgz#e36db4afff10d142e64f3a0e13cd98da38ab9cb3"
+  integrity sha512-3bCUpl1/hlK9ZlRsX6vG/GMqeV7wgDqTmqEdT34kObrYD4JhrRyOP3b1tgpV0QCI9vS76Rj6dFQXHqb9w75XFA==
   dependencies:
-    "@types/geojson" "^7946.0.10"
-    "@types/lru-cache" "^5.1.0"
-    "@types/topojson-client" "^3.1.1"
-    "@types/topojson-specification" "^1.0.1"
+    "@types/geojson" "^7946.0.14"
+    "@types/topojson-client" "^3.1.4"
+    "@types/topojson-specification" "^1.0.5"
     chroma-js "^2.1.0"
-    lodash "^4.17.15"
-    lru-cache "^6.0.0"
-    semver "7.5.4"
+    lodash "^4.17.21"
+    lru-cache "^4.1.5"
+    semver "^7.6.2"
     topojson-client "^3.1.0"
 
 "@elastic/eslint-plugin-eui@0.0.2":
@@ -3313,6 +3312,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/alerts-grouping@link:packages/kbn-alerts-grouping":
+  version "0.0.0"
+  uid ""
+
 "@kbn/alerts-restricted-fixtures-plugin@link:x-pack/test/alerting_api_integration/common/plugins/alerts_restricted":
   version "0.0.0"
   uid ""
@@ -4849,6 +4852,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/esql@link:src/plugins/esql":
+  version "0.0.0"
+  uid ""
+
 "@kbn/event-annotation-common@link:packages/kbn-event-annotation-common":
   version "0.0.0"
   uid ""
@@ -5829,6 +5836,10 @@
   version "0.0.0"
   uid ""
 
+"@kbn/recently-accessed@link:packages/kbn-recently-accessed":
+  version "0.0.0"
+  uid ""
+
 "@kbn/remote-clusters-plugin@link:x-pack/plugins/remote_clusters":
   version "0.0.0"
   uid ""
@@ -6657,10 +6668,6 @@
   version "0.0.0"
   uid ""
 
-"@kbn/text-based-languages@link:src/plugins/text_based_languages":
-  version "0.0.0"
-  uid ""
-
 "@kbn/third-party-lens-navigation-prompt-plugin@link:x-pack/examples/third_party_lens_navigation_prompt":
   version "0.0.0"
   uid ""
@@ -7055,10 +7062,10 @@
     "@launchdarkly/js-sdk-common" "2.5.0"
     semver "7.5.4"
 
-"@launchdarkly/node-server-sdk@^9.4.6":
-  version "9.4.6"
-  resolved "https://registry.yarnpkg.com/@launchdarkly/node-server-sdk/-/node-server-sdk-9.4.6.tgz#e1a1614e05eab2515090c7862764498a2f9b2b1e"
-  integrity sha512-IcQqiaYrAgmCvh1LsfjEVRa4Wk97PWirHnbVu6fRc97kt8WCKDlVo2O+IbOcC6scJVGDJU4aXVehTkfbhUq1Lg==
+"@launchdarkly/node-server-sdk@^9.4.7":
+  version "9.4.7"
+  resolved "https://registry.yarnpkg.com/@launchdarkly/node-server-sdk/-/node-server-sdk-9.4.7.tgz#d8f923943b1750efa4c0f80baad079103ac5f700"
+  integrity sha512-9blKdS4c/ZGR0XjB8EqifDTdk08WBX/KZ91lZIc3ND3WA9D3qagysynaVkpBo3FiymHyCYyvwq4ZjiSMOIkrPw==
   dependencies:
     "@launchdarkly/js-server-sdk-common" "2.4.4"
     https-proxy-agent "^5.0.1"
@@ -7398,6 +7405,14 @@
   resolved "https://registry.yarnpkg.com/@mswjs/cookies/-/cookies-1.1.0.tgz#1528eb43630caf83a1d75d5332b30e75e9bb1b5b"
   integrity sha512-0ZcCVQxifZmhwNBoQIrystCb+2sWBY2Zw8lpfJBPCHGCA/HWqehITeCRVIv4VMy8MPlaHo2w2pTHFV2pFfqKPw==
 
+"@mswjs/http-middleware@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@mswjs/http-middleware/-/http-middleware-0.10.1.tgz#7ff38c5398ba01efe98e16a0da24d612ffd69ccc"
+  integrity sha512-I58RDHXzwKjMjaSO7aV7X0zUzbAvUEEDYsL9+I6Ro0zF5LgjnNdpZoMufG/WoYEenhDCgv7K+HMpLxGuhlfjKA==
+  dependencies:
+    express "^4.18.2"
+    strict-event-emitter "^0.5.1"
+
 "@mswjs/interceptors@^0.29.0":
   version "0.29.1"
   resolved "https://registry.yarnpkg.com/@mswjs/interceptors/-/interceptors-0.29.1.tgz#e77fc58b5188569041d0440b25c9e9ebb1ccd60a"
@@ -8096,12 +8111,12 @@
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-"@redocly/cli@^1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@redocly/cli/-/cli-1.16.0.tgz#c8885ad46bb9993792e4266535692ce0ceb3895f"
-  integrity sha512-REmwkNHOd4e50vPeL6mDgHVdyUQ8e+y0cggi/cNXQzGpkZEk17Z+WFL8UFlcM+WebMWDXulJE712jT2lGYS9Zg==
+"@redocly/cli@^1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@redocly/cli/-/cli-1.17.1.tgz#a6b5523e98ff84530b7c2654a897414b16dcf6b5"
+  integrity sha512-a7OIlsGQT8OBRMPswqcJzCoub/nvm1zYvOCOBnaLt1cYeYK9nRzYCXA6Bnx0I7wMCXf5YmL7rVTMG8RJTC+3mA==
   dependencies:
-    "@redocly/openapi-core" "1.16.0"
+    "@redocly/openapi-core" "1.17.1"
     abort-controller "^3.0.0"
     chokidar "^3.5.1"
     colorette "^1.2.0"
@@ -8120,18 +8135,18 @@
     styled-components "^6.0.7"
     yargs "17.0.1"
 
-"@redocly/config@^0.6.0":
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/@redocly/config/-/config-0.6.1.tgz#931da21d6cbf8e73a873ca12ae690902d848cbb5"
-  integrity sha512-p4mlj+CD3Byec3wOxDlDln0B0gOcNvEkpl4jn3/e9y8h11ogzXnWxnlJAtE5Kcr1ByujS/7Mbt01df9z1xfMbg==
+"@redocly/config@^0.6.2":
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/@redocly/config/-/config-0.6.2.tgz#b5180ccb407673ee048b818c3be9a4f9d0636a64"
+  integrity sha512-c3K5u64eMnr2ootPcpEI0ioIRLE8QP8ptvLxG9MwAmb2sU8HMRfVwXDU3AZiMVY2w4Ts0mDc+Xv4HTIk8DRqFw==
 
-"@redocly/openapi-core@1.16.0", "@redocly/openapi-core@^1.4.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.16.0.tgz#95afcf822890af3fe8f1bde97018370b5cadb8ca"
-  integrity sha512-z06h+svyqbUcdAaePq8LPSwTPlm6Ig7j2VlL8skPBYnJvyaQ2IN7x/JkOvRL4ta+wcOCBdAex5JWnZbKaNktJg==
+"@redocly/openapi-core@1.17.1", "@redocly/openapi-core@^1.4.0":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@redocly/openapi-core/-/openapi-core-1.17.1.tgz#d18c5223e5b578d64d789c4101b96cbb589162dc"
+  integrity sha512-PQxDLLNk5cBatJBBxvfk49HFw/nVozw1XZ6Dw/GX0Tviq+WxeEjEuLAKfnLVvb5L0wgs4TNmVG4Y+JyofSPu1A==
   dependencies:
     "@redocly/ajv" "^8.11.0"
-    "@redocly/config" "^0.6.0"
+    "@redocly/config" "^0.6.2"
     colorette "^1.2.0"
     https-proxy-agent "^7.0.4"
     js-levenshtein "^1.1.6"
@@ -10152,6 +10167,11 @@
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.10.tgz#6dfbf5ea17142f7f9a043809f1cd4c448cb68249"
   integrity sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA==
 
+"@types/geojson@^7946.0.14":
+  version "7946.0.14"
+  resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.14.tgz#319b63ad6df705ee2a65a73ef042c8271e696613"
+  integrity sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg==
+
 "@types/getos@^3.0.0":
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/@types/getos/-/getos-3.0.0.tgz#582c758e99e9d634f31f471faf7ce59cf1c39a71"
@@ -10371,11 +10391,6 @@
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.2.6.tgz#f1a1cb35aff47bc5cfb05cb0c441ca91e914c26f"
   integrity sha512-+oY0FDTO2GYKEV0YPvSshGq9t7YozVkgvXLty7zogQNuCxBhT9/3INX9Q7H1aRZ4SUDRXAKlJuA4EA5nTt7SNw==
 
-"@types/js-levenshtein@^1.1.0":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@types/js-levenshtein/-/js-levenshtein-1.1.0.tgz#9541eec4ad6e3ec5633270a3a2b55d981edc44a9"
-  integrity sha512-14t0v1ICYRtRVcHASzes0v/O+TIeASb8aD55cWF1PidtInhFWSXcmhzhHqGjUWf9SUq1w70cvd1cWKUULubAfQ==
-
 "@types/js-search@^1.4.0":
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/@types/js-search/-/js-search-1.4.0.tgz#f2d4afa176a4fc7b17fb46a1593847887fa1fb7b"
@@ -11140,21 +11155,28 @@
   resolved "https://registry.yarnpkg.com/@types/tinycolor2/-/tinycolor2-1.4.2.tgz#721ca5c5d1a2988b4a886e35c2ffc5735b6afbdf"
   integrity sha512-PeHg/AtdW6aaIO2a+98Xj7rWY4KC1E6yOy7AFknJQ7VXUGNrMlyxDFxJo7HqLtjQms/ZhhQX52mLVW/EX3JGOw==
 
-"@types/topojson-client@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@types/topojson-client/-/topojson-client-3.1.1.tgz#d1396b2e79f530ef69bb162523cddf94576bd5a9"
-  integrity sha512-E4/Z2Xg56kVLRzYWem/6uOKVcVNqqxEqlWM9qCG2tCV1BxuzvvXC02/ELoGJWgtKkQhfycBPlMFEuTFdA/YiTg==
+"@types/topojson-client@^3.1.4":
+  version "3.1.4"
+  resolved "https://registry.yarnpkg.com/@types/topojson-client/-/topojson-client-3.1.4.tgz#81b83f9ecd6542dc5c3df21967f992e3fe192c33"
+  integrity sha512-Ntf3ZSetMYy7z3PrVCvcqmdRoVhgKA9UKN0ZuuZf8Ts2kcyL4qK34IXBs6qO5fem62EK4k03PtkJPVoroVu4/w==
   dependencies:
     "@types/geojson" "*"
     "@types/topojson-specification" "*"
 
-"@types/topojson-specification@*", "@types/topojson-specification@^1.0.1":
+"@types/topojson-specification@*":
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/@types/topojson-specification/-/topojson-specification-1.0.1.tgz#a80cb294290b79f2d674d3f5938c544ed2bd9d80"
   integrity sha512-ZZYZUgkmUls9Uhxx2WZNt9f/h2+H3abUUjOVmq+AaaDFckC5oAwd+MDp95kBirk+XCXrYj0hfpI6DSUiJMrpYQ==
   dependencies:
     "@types/geojson" "*"
 
+"@types/topojson-specification@^1.0.5":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/topojson-specification/-/topojson-specification-1.0.5.tgz#bf0009b2e0debb2d97237b124c00b9ea92570375"
+  integrity sha512-C7KvcQh+C2nr6Y2Ub4YfgvWvWCgP2nOQMtfhlnwsRL4pYmmwzBS7HclGiS87eQfDOU/DLQpX6GEscviaz4yLIQ==
+  dependencies:
+    "@types/geojson" "*"
+
 "@types/tough-cookie@*", "@types/tough-cookie@^4.0.5":
   version "4.0.5"
   resolved "https://registry.yarnpkg.com/@types/tough-cookie/-/tough-cookie-4.0.5.tgz#cb6e2a691b70cb177c6e3ae9c1d2e8b2ea8cd304"
@@ -17504,7 +17526,7 @@ expr-eval@^2.0.2:
   resolved "https://registry.yarnpkg.com/expr-eval/-/expr-eval-2.0.2.tgz#fa6f044a7b0c93fde830954eb9c5b0f7fbc7e201"
   integrity sha512-4EMSHGOPSwAfBiibw3ndnP0AvjDWLsMvGOvWEZ2F96IGk0bIVdjQisOHxReSkE13mHcfbuCiXw+G4y0zv6N8Eg==
 
-express@^4.17.1, express@^4.17.3:
+express@^4.17.1, express@^4.17.3, express@^4.18.2:
   version "4.19.2"
   resolved "https://registry.yarnpkg.com/express/-/express-4.19.2.tgz#e25437827a3aa7f2a827bc8171bbbb664a356465"
   integrity sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==
@@ -28238,7 +28260,7 @@ semver@^6.0.0, semver@^6.1.0, semver@^6.1.2, semver@^6.3.0, semver@^6.3.1:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4:
+semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.5.0, semver@^7.5.2, semver@^7.5.3, semver@^7.5.4, semver@^7.6.2:
   version "7.6.2"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.2.tgz#1e3b34759f896e8f14d6134732ce798aeb0c6e13"
   integrity sha512-FNAIBWCx9qcRhoHcgcJ0gvU7SN1lYU2ZXuSfl04bSC5OpvDHFyJCjdNHomPXxjQlCBU67YW64PzY7/VIEH7F2w==